December 2014 - 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

[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

CPU discussion (RE: psutil.NUM_CPUS)
by Christy Perez 29 Jan '15

29 Jan '15

After my confusion on Paulo's patch a few weeks ago, I thought I had just gotten confused, and so I put psutil.NUM_CPUS in my SMT/HT patch. However, testing now on x86, I'm noticing a difference in the way Power and x86 report CPUS. On my laptop: <cpu> <arch>x86_64</arch> <model>SandyBridge</model> <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='2'/> psutil.NUM_CPUS returns 4 On a Power7 system with 16 cores, 4 threads/core (so 64 total threads), psutil.NUM_CPUS returns 16. And this is, it turns out, because (and this sounds odd) for *guests* to be able to do SMT on Power, SMT has to be disabled. So, psutil.NUM_CPUS will not report the number of vCPUs that are available to guests. The same change would happen on x86 if you disabled HT, I assume. So, revisiting this difference that I noticed but wasn't able to articulate very well last time, do we want to make a change to the host code to use ppc64_cpu if the arch is Power, instead of psutil.NUM_CPUS? SMT *is* off, so, technically this isn't correct, but I think we should provide this information with guests in mind since we are a virtualization platform. Regards, - Christy

2 1

[PATCH] Delete reference count when deleting storage volume
by lvroyce＠linux.vnet.ibm.com 13 Jan '15

13 Jan '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> If ref count remains in system after volume delete, it will cause side effect in creating a volume of same name. Fix this by deleting reference count when deleting storage volume. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/diskutils.py | 13 +++++++++++++ src/kimchi/model/storagevolumes.py | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/diskutils.py b/src/kimchi/model/diskutils.py index 1d575cb..7eb24d2 100644 --- a/src/kimchi/model/diskutils.py +++ b/src/kimchi/model/diskutils.py @@ -73,3 +73,16 @@ def set_disk_ref_cnt(objstore, path, new_count): session.store('storagevolume', path, {'ref_cnt': new_count}) except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) + + +def clean_disk_ref_cnt(objstore, path): + try: + with objstore as session: + session.delete('storagevolume', path) + except NotFoundError: + pass + except Exception as e: + kimchi_log.error('Unable to delete storage volume in' + ' objectstore due error: %s', + e.message) + raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 406b38b..cf83b0e 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -30,7 +30,7 @@ from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter, IsoFormatError from kimchi.exception import MissingParameter, NotFoundError, OperationFailed from kimchi.isoinfo import IsoImage -from kimchi.model.diskutils import get_disk_ref_cnt +from kimchi.model.diskutils import get_disk_ref_cnt, clean_disk_ref_cnt from kimchi.model.storagepools import StoragePoolModel from kimchi.model.tasks import TaskModel from kimchi.utils import add_task, get_next_clone_name, kimchi_log @@ -306,6 +306,7 @@ class StorageVolumeModel(object): raise InvalidParameter("KCHVOL0012E", {'type': pool_info['type']}) volume = self._get_storagevolume(pool, name) + clean_disk_ref_cnt(self.objstore, volume.path()) try: volume.delete(0) except libvirt.libvirtError as e: -- 1.9.3

3 3

[PATCH 0/3] Issue #544
by Crístian Viana 08 Jan '15

08 Jan '15

This is the first patchset which fixes the issue #544. After applying these patches, the user can now download image files to a logical storage pool. However, they cannot create a template with it because (1) the UI filters the storage volumes and only displays the ones with format='iso' and storage volumes stored in a logical pool always have format='raw', and (2) the template classes fail to identify logical volumes as files because they're symlinks. Editing an existing VM's XML to use the storage volume downloaded to a logical pool works, though. Crístian Viana (3): Change "_get_storagevolume" to static Use 'bytes' as volume capacity and allocation unit issue #544: Refactor storage volume download docs/API.md | 4 +- src/kimchi/model/storagevolumes.py | 75 +++++++++++++++++++++++++++++++------- tests/test_model.py | 19 +++++----- tests/test_rest.py | 12 +++--- 4 files changed, 78 insertions(+), 32 deletions(-) -- 2.1.0

3 8

Kimchi UI Design Update
by Don S. Spangler 08 Jan '15

08 Jan '15

All -- I have updated the Kimchi UI design wiki page (UI Design <https://github.com/kimchi-project/kimchi/wiki/UI-Design-Proposals>) with the latest design covering blueprints (icons / graphics, font, color, layout) and interactions for all tabs. Included as well are specific task panels with the design style applied (more panels will be included as we go and can work on specific ones earlier on request). There is ongoing work which will cover responsiveness which will be posted separately when it is completed. Thanks again to everyone for their feedback on the initial version and we look forward to your thoughts on these updates. Don Spangler

5 7

[PATCH 0/5] Bug fixes and network tests
by Aline Manera 07 Jan '15

07 Jan '15

Aline Manera (5): Add message to KCHNET0010E code Bug fix: Allow deleting VLAN tagging bridged network Network API: Update docs/API.md Move rollback_wrapper function to a common place Reorganize the network tests docs/API.md | 11 ++-- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 6 +- tests/test_model.py | 86 ++----------------------- tests/test_network.py | 147 +++++++++++++++++++++++++++++++++++++++++++ tests/test_rest.py | 64 ------------------- tests/utils.py | 15 ++++- 7 files changed, 175 insertions(+), 155 deletions(-) create mode 100644 tests/test_network.py -- 2.1.0

3 15

[PATCH] <Fix problems of edit a guest contains snapshots>
by gouzongmei＠ourfuture.cn 06 Jan '15

06 Jan '15

From: Zongmei Gou <gouzongmei(a)ourfuture.cn> --- src/kimchi/control/base.py | 13 ++++++++++--- src/kimchi/model/vms.py | 24 ++++++++++++++++++------ src/kimchi/model/vmsnapshots.py | 8 ++++++-- src/kimchi/xmlutils/utils.py | 5 +++++ 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 60db1df..ff31d47 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -58,10 +58,17 @@ class Resource(object): self.role_key = None self.admin_methods = [] - def _redirect(self, ident, code=303): - if ident is not None and ident != self.ident: + def _redirect(self, action_result, code=303): + if isinstance(action_result, list): + uri_params = [] + for arg in action_result: + if arg is None: + arg = '' + uri_params.append(urllib2.quote(arg.encode('utf-8'),safe="")) + raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) + elif action_result is not None and action_result != self.ident: uri_params = list(self.model_args[:-1]) - uri_params += [urllib2.quote(ident.encode('utf-8'), safe="")] + uri_params += [urllib2.quote(action_result.encode('utf-8'), safe="")] raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) def generate_action_handler(self, action_name, action_args=None): diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3aa1145..0caa1fd 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -668,22 +668,34 @@ class VMModel(object): new_xml = self._update_graphics(dom, new_xml, params) conn = self.conn.get() + snapshot_xmls = [] try: if 'name' in params: - if state == 'running': - msg_args = {'name': dom.name(), 'new_name': params['name']} - raise InvalidParameter("KCHVM0003E", msg_args) - - # Undefine old vm, only if name is going to change - dom.undefine() + new_name = params['name'] + name = dom.name() + if new_name != name: + if state == 'running': + raise InvalidParameter("KCHVM0003E", {'name': name, 'new_name': new_name}) + + # get snapshots before vm undefine, original snapshots will be created in the new named vm + snapshot_names = dom.snapshotListNames(0) + for snapshot_name in snapshot_names: + vir_snap = self.vmsnapshot.get_vmsnapshot(name, snapshot_name) + snapshot_xmls.append(vir_snap.getXMLDesc(0)) + # Undefine old vm, only if name is going to change + dom.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA) root = ET.fromstring(new_xml) currentMem = root.find('.currentMemory') if currentMem is not None: root.remove(currentMem) dom = conn.defineXML(ET.tostring(root, encoding="utf-8")) + for snapshot_xml in snapshot_xmls: + dom.snapshotCreateXML(snapshot_xml, 1) except libvirt.libvirtError as e: dom = conn.defineXML(old_xml) + for snapshot_xml in snapshot_xmls: + dom.snapshotCreateXML(snapshot_xml, 1) raise OperationFailed("KCHVM0008E", {'name': dom.name(), 'err': e.get_error_message()}) return dom diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py index 725770d..569c7ad 100644 --- a/src/kimchi/model/vmsnapshots.py +++ b/src/kimchi/model/vmsnapshots.py @@ -29,7 +29,7 @@ from kimchi.model.tasks import TaskModel from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.vmstorages import VMStorageModel, VMStoragesModel from kimchi.utils import add_task - +from kimchi.xmlutils.utils import xml_item_get class VMSnapshotsModel(object): def __init__(self, **kargs): @@ -155,7 +155,11 @@ class VMSnapshotModel(object): try: vir_dom = VMModel.get_vm(vm_name, self.conn) vir_snap = self.get_vmsnapshot(vm_name, name) - vir_dom.revertToSnapshot(vir_snap, 0) + ret = vir_dom.revertToSnapshot(vir_snap, 0) + if ret == 0: + xmlObj = vir_snap.getXMLDesc(0) + new_vmname = xml_item_get(xmlObj, 'domain/name') + return [new_vmname, name] except libvirt.libvirtError, e: raise OperationFailed('KCHSNAP0009E', {'name': name, 'vm': vm_name, diff --git a/src/kimchi/xmlutils/utils.py b/src/kimchi/xmlutils/utils.py index be08a14..843a113 100644 --- a/src/kimchi/xmlutils/utils.py +++ b/src/kimchi/xmlutils/utils.py @@ -65,3 +65,8 @@ def _dictize(e): else: d[child.tag] = _dictize(child) return d + +def xml_item_get(xml, xpath): + root = ET.fromstring(xml) + item = root.find(xpath) + return item.text -- 1.7.1

2 1

[PATCH V2] Po support: translation for Chinese
by Wen Wang 04 Jan '15

04 Jan '15

V1 -> V2: Minor wording changes. Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..0766585 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: 2014-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-18 17:08+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机设备%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "不能访问文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "default storage pool. The same will happen when the target pool does not " "have enough space to clone the volumes. Do you want to continue?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 1.9.3

2 3

Re: [Kimchi-devel] [PATCH] <Fix problems of edit a guest contains snapshots>
by Aline Manera 29 Dec '14

29 Dec '14

The patch seems good for me. I will just wait for a reply from Cristian as he was working on it. On 20/12/2014 04:26, gouzongmei(a)ourfuture.cn wrote: > From: Zongmei Gou <gouzongmei(a)ourfuture.cn> > > --- > src/kimchi/control/base.py | 13 ++++++++++--- > src/kimchi/model/vms.py | 24 ++++++++++++++++++------ > src/kimchi/model/vmsnapshots.py | 8 ++++++-- > src/kimchi/xmlutils/utils.py | 5 +++++ > 4 files changed, 39 insertions(+), 11 deletions(-) > > diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py > index 60db1df..ff31d47 100644 > --- a/src/kimchi/control/base.py > +++ b/src/kimchi/control/base.py > @@ -58,10 +58,17 @@ class Resource(object): > self.role_key = None > self.admin_methods = [] > > - def _redirect(self, ident, code=303): > - if ident is not None and ident != self.ident: > + def _redirect(self, action_result, code=303): > + if isinstance(action_result, list): > + uri_params = [] > + for arg in action_result: > + if arg is None: > + arg = '' > + uri_params.append(urllib2.quote(arg.encode('utf-8'),safe="")) > + raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) > + elif action_result is not None and action_result != self.ident: > uri_params = list(self.model_args[:-1]) > - uri_params += [urllib2.quote(ident.encode('utf-8'), safe="")] > + uri_params += [urllib2.quote(action_result.encode('utf-8'), safe="")] > raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) > > def generate_action_handler(self, action_name, action_args=None): > diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py > index 3aa1145..0caa1fd 100644 > --- a/src/kimchi/model/vms.py > +++ b/src/kimchi/model/vms.py > @@ -668,22 +668,34 @@ class VMModel(object): > new_xml = self._update_graphics(dom, new_xml, params) > > conn = self.conn.get() > + snapshot_xmls = [] > try: > if 'name' in params: > - if state == 'running': > - msg_args = {'name': dom.name(), 'new_name': params['name']} > - raise InvalidParameter("KCHVM0003E", msg_args) > - > - # Undefine old vm, only if name is going to change > - dom.undefine() > + new_name = params['name'] > + name = dom.name() > + if new_name != name: > + if state == 'running': > + raise InvalidParameter("KCHVM0003E", {'name': name, 'new_name': new_name}) > + > + # get snapshots before vm undefine, original snapshots will be created in the new named vm > + snapshot_names = dom.snapshotListNames(0) > + for snapshot_name in snapshot_names: > + vir_snap = self.vmsnapshot.get_vmsnapshot(name, snapshot_name) > + snapshot_xmls.append(vir_snap.getXMLDesc(0)) > + # Undefine old vm, only if name is going to change > + dom.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA) > > root = ET.fromstring(new_xml) > currentMem = root.find('.currentMemory') > if currentMem is not None: > root.remove(currentMem) > dom = conn.defineXML(ET.tostring(root, encoding="utf-8")) > + for snapshot_xml in snapshot_xmls: > + dom.snapshotCreateXML(snapshot_xml, 1) > except libvirt.libvirtError as e: > dom = conn.defineXML(old_xml) > + for snapshot_xml in snapshot_xmls: > + dom.snapshotCreateXML(snapshot_xml, 1) > raise OperationFailed("KCHVM0008E", {'name': dom.name(), > 'err': e.get_error_message()}) > return dom > diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py > index 725770d..569c7ad 100644 > --- a/src/kimchi/model/vmsnapshots.py > +++ b/src/kimchi/model/vmsnapshots.py > @@ -29,7 +29,7 @@ from kimchi.model.tasks import TaskModel > from kimchi.model.vms import DOM_STATE_MAP, VMModel > from kimchi.model.vmstorages import VMStorageModel, VMStoragesModel > from kimchi.utils import add_task > - > +from kimchi.xmlutils.utils import xml_item_get > > class VMSnapshotsModel(object): > def __init__(self, **kargs): > @@ -155,7 +155,11 @@ class VMSnapshotModel(object): > try: > vir_dom = VMModel.get_vm(vm_name, self.conn) > vir_snap = self.get_vmsnapshot(vm_name, name) > - vir_dom.revertToSnapshot(vir_snap, 0) > + ret = vir_dom.revertToSnapshot(vir_snap, 0) > + if ret == 0: > + xmlObj = vir_snap.getXMLDesc(0) > + new_vmname = xml_item_get(xmlObj, 'domain/name') > + return [new_vmname, name] > except libvirt.libvirtError, e: > raise OperationFailed('KCHSNAP0009E', {'name': name, > 'vm': vm_name, > diff --git a/src/kimchi/xmlutils/utils.py b/src/kimchi/xmlutils/utils.py > index be08a14..843a113 100644 > --- a/src/kimchi/xmlutils/utils.py > +++ b/src/kimchi/xmlutils/utils.py > @@ -65,3 +65,8 @@ def _dictize(e): > else: > d[child.tag] = _dictize(child) > return d > + > +def xml_item_get(xml, xpath): > + root = ET.fromstring(xml) > + item = root.find(xpath) > + return item.text

1 0

[PATCH 0/3] Bugfix #496 System leftovers after uninstalling Kimchi
by Ramon Medeiros 29 Dec '14

29 Dec '14

Ramon Medeiros (3): Remove empty directories after rpm -e kimchi on fedora Don't let empty directories left on suse Remove directories under /var/lib/kimchi if empty on ubuntu contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++- contrib/kimchi.spec.suse.in | 20 +++++++++++++++++++- contrib/make-deb.sh.in | 4 ++++ 3 files changed, 43 insertions(+), 2 deletions(-) -- 1.8.3.1

2 11

[PATCH 0/3] Bugfix #496 System leftovers after uninstalling Kimchi v3
by Ramon Medeiros 29 Dec '14

29 Dec '14

v2: Fix suse based on fedora v3: Put ubuntu changes on Makefile Use the variables instead path Ramon Medeiros (3): Remove empty directories after rpm -e kimchi on fedora Don't let empty directories left on suse Remove directories under /var/lib/kimchi if empty on ubuntu Makefile.am | 5 +++++ contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++- contrib/kimchi.spec.suse.in | 20 +++++++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) -- 1.8.3.1

2 4

[PATCH v3 0/2] Issue #543
by Crístian Viana 29 Dec '14

29 Dec '14

The differences between this and the previous patchset are: - Patch "Support different "tags" when generating a new name in "get_next_clone_name"" has been discarded. - Patch 2/2 has been updated to generate unique names in the form "index.html (1)". Crístian Viana (2): bugfix: Fix regexp in "kimchi.utils.get_next_clone_name" issue #543: Generate unique names when creating volumes without name src/kimchi/model/storagevolumes.py | 9 +++++++-- src/kimchi/utils.py | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) -- 1.9.3

2 3

[PATCHv2] Issue#536: raise proper error message when disk os info absent
by lvroyce＠linux.vnet.ibm.com 29 Dec '14

29 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When disk os cannot be decided by libguestfs, it will leave it to 'unknown' distro and version. But if no boot information available, ImageFormatError is left unhandled and this will introduce 500 error when disk os info is absent. Handle this error to fix this. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 6 +++++- tests/test_model.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 8582d48..3266e7b 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi import imageinfo from kimchi import osinfo from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter +from kimchi.exception import ImageFormatError, OperationFailed from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri from kimchi.xmlutils.disk import get_disk_xml @@ -51,7 +52,10 @@ class VMTemplate(object): self.fc_host_support = args.get('fc_host_support') # Fetch defaults based on the os distro and version - distro, version = self._get_os_info(args, scan) + try: + distro, version = self._get_os_info(args, scan) + except ImageFormatError as e: + raise OperationFailed('KCHTMPL0020E', {'err': e.message}) os_distro = args.get('os_distro', distro) os_version = args.get('os_version', version) entry = osinfo.lookup(os_distro, os_version) diff --git a/tests/test_model.py b/tests/test_model.py index aa2a1bb..2bcb075 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -196,7 +196,7 @@ class ModelTests(unittest.TestCase): vol_path = inst.storagevolume_lookup('default', vol)['path'] params = {'name': 'test', 'disks': [{'base': vol_path}]} - self.assertRaises(ImageFormatError, inst.templates_create, params) + self.assertRaises(OperationFailed, inst.templates_create, params) # Hack the model objstore to add a new template # It is needed as the image file must be a bootable image when -- 1.8.3.2

3 2

[PATCH] Po support: translation for Chinese
by Wen Wang 29 Dec '14

29 Dec '14

Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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: 2014-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "default storage pool. The same will happen when the target pool does not " "have enough space to clone the volumes. Do you want to continue?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 1.9.3

3 3

[v7 1/1] Virtual machine migration
by simonjin＠linux.vnet.ibm.com 22 Dec '14

22 Dec '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> v7-v6: Add migrate check in API.json. Add abstract a helper function task_is_running. Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> Signed-off-by: yuntong <yuntongjin(a)gmail.com> --- docs/API.md | 5 ++ src/kimchi/API.json | 27 ++++++++ src/kimchi/control/vms.py | 3 + src/kimchi/i18n.py | 12 ++++ src/kimchi/model/utils.py | 18 ++++++ src/kimchi/model/vms.py | 159 +++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 222 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index 210a036..349c950 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,11 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: User of the remote server. + * passwd: Passwd of user on remote server. + * secure *(optional)*: Migrate in P2P secure tunel mode. * clone: Create a new VM identical to this VM. The new VM's name, UUID and network MAC addresses will be generated automatically. Each existing diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c5d7bdb..f6aff5e 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -305,6 +305,33 @@ } } }, + "vm_migrate": { + "type": "object", + "properties": { + "remoteHost": { + "description": "IP address or hostname of the remote server", + "type": "string", + "minLength": 1, + "error": "KCHVM0044E" + }, + "user": { + "description": "User of the remote server", + "type": "string", + "minLength": 1, + "error": "KCHVM0045E" + }, + "passwd": { + "description": "Passwd of user on remote server", + "type": "string", + "error": "KCHVM0046E" + }, + "secure": { + "description": "Migrate in P2P secure tunel mode(optional)", + "type": "boolean", + "error": "KCHVM0047E" + } + } + }, "networks_create": { "type": "object", "error": "KCHNET0016E", diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index a1589ef..3638b3a 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,9 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', + ['remoteHost', 'user', + 'passwd', 'secure']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e3a051c..90eae92 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -107,6 +107,18 @@ messages = { "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Migrate %(name)s to localhost %(remoteHost)s is not allowed."), + "KCHVM0037E": _("vm %(name)s is already in migrating, can not perform migrate on it again."), + "KCHVM0038E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0039E": _("Can't migrate %(name)s from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0040E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0041E": _("Can not migrate vm %(name)s when its in %(state)s state."), + "KCHVM0042E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0043E": _("Failed to destroy vm %(name)s from migration recover. Details: %(err)s"), + "KCHVM0044E": _("Migrate remoteHost must be a string"), + "KCHVM0045E": _("User name of the remote server must be a string"), + "KCHVM0046E": _("The passwd of remote server must be a string"), + "KCHVM0047E": _("Migrate secure must be a boolean value."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index 9896289..8c67943 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -24,7 +24,9 @@ from lxml import etree, objectify from lxml.builder import E, ElementMaker from kimchi.exception import OperationFailed +from kimchi.exception import NotFoundError from kimchi.model.featuretests import FeatureTests +from kimchi.utils import kimchi_log KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi" KIMCHI_NAMESPACE = "kimchi" @@ -161,3 +163,19 @@ def get_metadata_node(dom, tag, metadata_support, mode="current"): if node is not None: return etree.tostring(node) return "" + + +def task_is_running(tasks, task, target_uri): + try: + alltasks = tasks.get_list() + for taskid in alltasks: + taskobj = task.lookup(taskid) + if taskobj['target_uri'] == target_uri \ + and taskobj['status'] == "running": + kimchi_log.debug('task with target_uri %s is running.' + % target_uri) + return True + except NotFoundError: + kimchi_log.debug('task with target_uri %s is not running.' + % target_uri) + return False diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3aa1145..94412e8 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -33,13 +33,15 @@ from cherrypy.process.plugins import BackgroundTask from kimchi import model, vnc from kimchi.config import READONLY_POOL_TYPE, config from kimchi.exception import InvalidOperation, InvalidParameter -from kimchi.exception import NotFoundError, OperationFailed +from kimchi.exception import NotFoundError, OperationFailed, KimchiException from kimchi.model.config import CapabilitiesModel -from kimchi.model.tasks import TaskModel +from kimchi.model.libvirtconnection import LibvirtConnection +from kimchi.model.tasks import TaskModel, TasksModel from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name from kimchi.model.utils import get_metadata_node from kimchi.model.utils import set_metadata_node +from kimchi.model.utils import task_is_running from kimchi.rollbackcontext import RollbackContext from kimchi.screenshot import VMScreenshot from kimchi.utils import add_task, get_next_clone_name, import_class @@ -268,6 +270,7 @@ class VMModel(object): self.groups = import_class('kimchi.model.groups.GroupsModel')(**kargs) self.vms = VMsModel(**kargs) self.task = TaskModel(**kargs) + self.tasks = TasksModel(**kargs) self.storagepool = model.storagepools.StoragePoolModel(**kargs) self.storagevolume = model.storagevolumes.StorageVolumeModel(**kargs) self.storagevolumes = model.storagevolumes.StorageVolumesModel(**kargs) @@ -850,6 +853,158 @@ class VMModel(object): raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + def _preCheck(self, name, destConn, remoteHost): + """Pre check before migration""" + + kimchi_log.debug('precheck migrate %s' % name) + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s Can not migrate to localhost.' % name) + raise OperationFailed("KCHVM0036E", {'name': name, + 'remoteHost': remoteHost}) + # check if the vm already in migration + if task_is_running(self.tasks, self.task, "/vms/%s/migrate" % name): + raise OperationFailed("KCHVM0037E", {'name': name}) + + srcarch = self.conn.get().getInfo()[0] + destarch = _destConn.getInfo()[0] + if srcarch != destarch: + kimchi_log.debug('vm %s can not migrate to different arch server.' + % (name, destarch)) + raise OperationFailed("KCHVM0038E", {'name': name, + 'srcarch': srcarch, + 'destarch': destarch}) + srchyp = self.conn.get().getType() + desthyp = _destConn.getType() + if srchyp != desthyp: + kimchi_log.debug('vm %s can not migrate to a different hypervisor' + % name) + raise OperationFailed("KCHVM0039E", {'name': name, + 'srchyp': srchyp, + 'desthyp': desthyp}) + + # model.host import DOM_STATE_MAP, vmhostdevs import host, + # to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + # check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn=self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM0040E", {'name': name, + 'hostdevs': hostdevs}) + + @staticmethod + def _getRemoteConn(remoteHost, user, passwd, transport='ssh'): + """open destination connect to migrate""" + + duri = 'qemu+%s://%s@%s/system' % (transport, user, remoteHost) + conn = LibvirtConnection(duri) + return conn + + def _do_migrate(self, cb, params): + """Asynchronous function which performs the migrate operation. + + Arguments: + cb -- A callback function to signal the Task's progress. + params -- A dict with the following values: + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + "remoteHost": The migration destination server. + "secure": Migrate in P2P secure tunel mode.(optional) + """ + + name = params['name'].decode('utf-8') + destConn = params['destConn'] + remoteHost = params['remoteHost'] + secure = params['secure'] + _destConn = destConn.get() + + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + dom = self.get_vm(name, self.conn) + flag = 0 + if secure: + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state in ['running', 'paused']: + flag |= libvirt.VIR_MIGRATE_LIVE + elif state == 'shutoff': + flag |= (libvirt.VIR_MIGRATE_OFFLINE | + libvirt.VIR_MIGRATE_PERSIST_DEST) + else: + kimchi_log.debug('Can not migrate vm %s when its in %s.' + % (name, state)) + raise OperationFailed("KCHVM0041E", {'name': name, + 'state': state}) + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, remoteHost)) + self._recover(name, destConn, cb) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', False) + raise OperationFailed('KCHVM0042E', {'err': e.message, + 'name': name}) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', True) + + def migrate(self, name, remoteHost, user, passwd=None, secure=False): + """Migrate a virtual machine to a remote server. + + Arguments: + name -- The name of the virtual machine to be migrated. + remoteHost -- Remote server that the VM will be migrated to. + user -- Login user on remote server,prefer root. + passwd -- The password of the user on remote server, + if the local server + has ssk key exchanged, then this param can be NULL. + secure -- Migrate in P2P secure tunel mode.(optional) + + Return: + A Task running the clone operation. + """ + name = name.decode('utf-8') + remoteHost = remoteHost.decode('utf-8') + user = user.decode('utf-8') + + destConn = self._getRemoteConn(remoteHost, user, passwd) + self._preCheck(name, destConn, remoteHost) + + params = {'name': name, + 'destConn': destConn, + 'remoteHost': remoteHost, + 'secure': secure} + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, + self.objstore, params) + + return self.task.lookup(task_id) + + def _recover(self, name, destconn, cb): + """Recover from a failed migration. + + Arguments: + "cb": A callback function to signal the Task's progress. + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + """ + try: + destvm = self.get_vm(name, destconn) + except KimchiException as e: + if type(e) == NotFoundError: + return + + cb('recover from a failed migration', False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("Failed to destory migrate vm %s on \ + destination server" % name) + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0043E', {'name': name, + 'err': e.message}) + def poweroff(self, name): dom = self.get_vm(name, self.conn) try: -- 1.8.3.1

1 0

[v6 1/1] Virtual machine migration
by simonjin＠linux.vnet.ibm.com 22 Dec '14

22 Dec '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> v6-v5:Fix pep8, delete migratation finish func. Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- docs/API.md | 5 ++ src/kimchi/control/vms.py | 3 + src/kimchi/i18n.py | 8 +++ src/kimchi/model/vms.py | 166 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 180 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index 210a036..4408764 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,11 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: User of the remote server. + * passwd: Passwd of user on remote server. + * secure: Migrate in P2P secure tunel mode.(optional) * clone: Create a new VM identical to this VM. The new VM's name, UUID and network MAC addresses will be generated automatically. Each existing diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index a1589ef..3638b3a 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,9 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', + ['remoteHost', 'user', + 'passwd', 'secure']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e3a051c..81a6dbb 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -107,6 +107,14 @@ messages = { "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Migrate %(name)s to localhost %(remoteHost)s is not allowed."), + "KCHVM0037E": _("vm %(name)s is already in migrating, can not perform migrate on it again."), + "KCHVM0038E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0039E": _("Can't migrate %(name)s from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0040E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0041E": _("Can not migrate vm %(name)s when its in %(state)s state."), + "KCHVM0042E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0043E": _("Failed to destroy vm %(name)s from migration recover. Details: %(err)s"), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3aa1145..023bd10 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -33,9 +33,10 @@ from cherrypy.process.plugins import BackgroundTask from kimchi import model, vnc from kimchi.config import READONLY_POOL_TYPE, config from kimchi.exception import InvalidOperation, InvalidParameter -from kimchi.exception import NotFoundError, OperationFailed +from kimchi.exception import NotFoundError, OperationFailed, KimchiException from kimchi.model.config import CapabilitiesModel -from kimchi.model.tasks import TaskModel +from kimchi.model.libvirtconnection import LibvirtConnection +from kimchi.model.tasks import TaskModel, TasksModel from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name from kimchi.model.utils import get_metadata_node @@ -268,6 +269,7 @@ class VMModel(object): self.groups = import_class('kimchi.model.groups.GroupsModel')(**kargs) self.vms = VMsModel(**kargs) self.task = TaskModel(**kargs) + self.tasks = TasksModel(**kargs) self.storagepool = model.storagepools.StoragePoolModel(**kargs) self.storagevolume = model.storagevolumes.StorageVolumeModel(**kargs) self.storagevolumes = model.storagevolumes.StorageVolumesModel(**kargs) @@ -850,6 +852,166 @@ class VMModel(object): raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + def _preCheck(self, name, destConn, remoteHost): + """Pre check before migration""" + + kimchi_log.debug('precheck migrate %s' % name) + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s Can not migrate to localhost.' % name) + raise OperationFailed("KCHVM0036E", {'name': name, + 'remoteHost': remoteHost}) + # check if the vm already in migration + try: + alltasks = self.tasks.get_list() + for taskid in alltasks: + taskobj = self.task.lookup(taskid) + if taskobj['target_uri'] == "/vms/%s/migrate" % name \ + and taskobj['status'] == "running": + kimchi_log.debug('vm %s is already in migrating.' % name) + raise OperationFailed("KCHVM0037E", {'name': name}) + except NotFoundError: + kimchi_log.debug('No previous migrate on vm %s.' % name) + + srcarch = self.conn.get().getInfo()[0] + destarch = _destConn.getInfo()[0] + if srcarch != destarch: + kimchi_log.debug('vm %s can not migrate to different arch server.' + % (name, destarch)) + raise OperationFailed("KCHVM0038E", {'name': name, + 'srcarch': srcarch, + 'destarch': destarch}) + srchyp = self.conn.get().getType() + desthyp = _destConn.getType() + if srchyp != desthyp: + kimchi_log.debug('vm %s can not migrate to a different hypervisor' + % name) + raise OperationFailed("KCHVM0039E", {'name': name, + 'srchyp': srchyp, + 'desthyp': desthyp}) + + # model.host import DOM_STATE_MAP, vmhostdevs import host, + # to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + # check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn=self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM0040E", {'name': name, + 'hostdevs': hostdevs}) + + @staticmethod + def _getRemoteConn(remoteHost, user, passwd, transport='ssh'): + """open destination connect to migrate""" + + duri = 'qemu+%s://%s@%s/system' % (transport, user, remoteHost) + conn = LibvirtConnection(duri) + return conn + + def _do_migrate(self, cb, params): + """Asynchronous function which performs the migrate operation. + + Arguments: + cb -- A callback function to signal the Task's progress. + params -- A dict with the following values: + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + "remoteHost": The migration destination server. + "secure": Migrate in P2P secure tunel mode.(optional) + """ + + name = params['name'].decode('utf-8') + destConn = params['destConn'] + remoteHost = params['remoteHost'] + secure = params['secure'] + _destConn = destConn.get() + + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + dom = self.get_vm(name, self.conn) + flag = 0 + if secure: + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state in ['running', 'paused']: + flag |= libvirt.VIR_MIGRATE_LIVE + elif state == 'shutoff': + flag |= (libvirt.VIR_MIGRATE_OFFLINE | + libvirt.VIR_MIGRATE_PERSIST_DEST) + else: + kimchi_log.debug('Can not migrate vm %s when its in %s.' + % (name, state)) + raise OperationFailed("KCHVM0041E", {'name': name, + 'state': state}) + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, remoteHost)) + self._recover(name, destConn, cb) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', False) + raise OperationFailed('KCHVM0042E', {'err': e.message, + 'name': name}) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', True) + + def migrate(self, name, remoteHost, user, passwd=None, secure=False): + """Migrate a virtual machine to a remote server. + + Arguments: + name -- The name of the virtual machine to be migrated. + remoteHost -- Remote server that the VM will be migrated to. + user -- Login user on remote server,prefer root. + passwd -- The password of the user on remote server, + if the local server + has ssk key exchanged, then this param can be NULL. + secure -- Migrate in P2P secure tunel mode.(optional) + + Return: + A Task running the clone operation. + """ + name = name.decode('utf-8') + remoteHost = remoteHost.decode('utf-8') + user = user.decode('utf-8') + + destConn = self._getRemoteConn(remoteHost, user, passwd) + self._preCheck(name, destConn, remoteHost) + + params = {'name': name, + 'destConn': destConn, + 'remoteHost': remoteHost, + 'secure': secure} + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, + self.objstore, params) + + return self.task.lookup(task_id) + + def _recover(self, name, destconn, cb): + """Recover from a failed migration. + + Arguments: + "cb": A callback function to signal the Task's progress. + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + """ + try: + destvm = self.get_vm(name, destconn) + except KimchiException as e: + if type(e) == NotFoundError: + return + + cb('recover from a failed migration', False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("Failed to destory migrate vm %s on \ + destination server" % name) + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0043E', {'name': name, + 'err': e.message}) + def poweroff(self, name): dom = self.get_vm(name, self.conn) try: -- 1.8.3.1

3 2

Scrum meetings during the holidays
by Aline Manera 22 Dec '14

22 Dec '14

Hi all, Specially in the next two weeks, the scrum meeting will be on Tuesdays at the usual time (11AM BRST) due the holidays. So instead of Dec 24th, the scrum meeting will be on Dec 23th; and instead of Dec 31st, it will be on Dec 30th. See you there. Regards, Aline Manera

1 0

Kimchi 1.4 is released!
by Aline Manera 19 Dec '14

19 Dec '14

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Kimchi 1.4*! This release adds many new features including: ✔ Guest PCI passthrough devices ✔ Guest disk hot plug ✔ Guest cloning ✔ Snapshot support ✔ SMT support on Templates ✔ LDAP authentication We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 20, Ubuntu 14.10, openSUSE 13.2, and RHEL7. Kimchi uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔ https://github.com/kimchi-project/kimchi/archive/1.4.0.tar.gz ✔ git clone https://github.com/kimchi-project/kimchi.git There are also some packages available at: ✔ http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

1 0

Re: [Kimchi-devel] Problem of edit a guest while the guest has asnapshot
by Zongmei Gou 18 Dec '14

18 Dec '14

1 0

Problem of edit a guest while the guest has a snapshot
by 苟宗梅 17 Dec '14

17 Dec '14

2 1

[PATCH] Po support: translation for Chinese
by Aline Manera 17 Dec '14

17 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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: 2014-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "default storage pool. The same will happen when the target pool does not " "have enough space to clone the volumes. Do you want to continue?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 2.1.0

1 0

[PATCH] Po support: translation for Chinese
by Aline Manera 17 Dec '14

17 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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: 2014-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "default storage pool. The same will happen when the target pool does not " "have enough space to clone the volumes. Do you want to continue?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 2.1.0

1 0

[PATCH] Po support: translation for Chinese
by Aline Manera 17 Dec '14

17 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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: 2014-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "default storage pool. The same will happen when the target pool does not " "have enough space to clone the volumes. Do you want to continue?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 2.1.0

1 0

kimchi sos plugin accepted upstream
by Christy Perez 16 Dec '14

16 Dec '14

Hi team, FYI: There's now a small plugin for kimchi upstream: https://github.com/sosreport/sos/commit/3aabd18b2666dbbeb86871ac4b9f025e468… If you want to read the discussion, it's under https://www.redhat.com/archives/sos-devel/2014-December/thread.html I also spoke with Bryn offline about pulling in the nginx config, but he said that that should be in a separate nginx plugin. Thanks, - Christy

2 2

[PATCH 0/2] Update po files for 1.4 release
by Aline Manera 16 Dec '14

16 Dec '14

2 4

[PATCH V3] Bugfix#527 Reverting a snapshot doesn't change initial state of "Edit Guest"
by Wen Wang 16 Dec '14

16 Dec '14

V2 -> V3: List VMs before closing the dialogue so that VM current status match the reverted status. Close dialogue when reverting a VM finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..9c088aa 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -564,6 +564,8 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.listVmsAuto(); + kimchi.window.close(); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

3 2

[PATCH] Bugfix#527 Refresh "Edit Guest" after reverting a snapshot
by Wen Wang 16 Dec '14

16 Dec '14

Fix the issue that reverting a snapshot doesn't change the initial state of the dialog "Edit Guest" by refeshing the dialogue when finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..aa953dc 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -30,9 +30,10 @@ kimchi.guest_edit_main = function() { if(display_list.indexOf($(deactivated).attr('id')) >= 0) { $(buttonContainer).removeClass('hidden'); } - } + }, + active: kimchi.snapshotIndex === "undefined" ? 0 : kimchi.snapshotIndex }); - + kimchi.snapshotIndex = "undefined"; var guestEditForm = $('#form-guest-edit-general'); var saveButton = $('#guest-edit-button-save'); var authType; @@ -564,6 +565,14 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.snapshotIndex = $('#guest-edit-tabs').tabs("option", "active"); + kimchi.window.close(); + kimchi.window.open({ + url: 'guest-edit.html', + close: function() { + kimchi.clearGuestEdit(); + } + }); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

2 2

[PATCH V2] Bugfix#527 Reverting a snapshot doesn't change initial state of "Edit Guest"
by Wen Wang 16 Dec '14

16 Dec '14

Close dialogue when reverting a VM finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..5c2def6 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -564,6 +564,7 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.window.close(); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

2 2

[PATCH] issue #553: Use required parameter in "snapshotLookupByName"
by Crístian Viana 15 Dec '14

15 Dec '14

The function "snapshotLookupByName" has a required parameter in older versions of libvirt. On newer versions, however, this parameter is optional and it was causing an error on RHEL because it uses an old version of libvirt. Always use the parameter in function "snapshotLookupByName" with its default value (0). Fix issue #553 ("Get snapshots of vm raise 500 error"). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/vmsnapshots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py index bb9bfaa..725770d 100644 --- a/src/kimchi/model/vmsnapshots.py +++ b/src/kimchi/model/vmsnapshots.py @@ -165,7 +165,7 @@ class VMSnapshotModel(object): vir_dom = VMModel.get_vm(vm_name, self.conn) try: - return vir_dom.snapshotLookupByName(name) + return vir_dom.snapshotLookupByName(name, 0) except libvirt.libvirtError, e: code = e.get_error_code() if code == libvirt.VIR_ERR_NO_DOMAIN_SNAPSHOT: -- 1.9.3

3 2

[PATCH] Bug 461 Fix: (UI)Support Repository Meta Link
by huoyuxin＠linux.vnet.ibm.com 15 Dec '14

15 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.repository_add_main.js | 10 +++------- ui/pages/repository-add.html.tmpl | 6 +++++- ui/pages/repository-edit.html.tmpl | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ui/js/src/kimchi.repository_add_main.js b/ui/js/src/kimchi.repository_add_main.js index 2a277fd..d572c69 100644 --- a/ui/js/src/kimchi.repository_add_main.js +++ b/ui/js/src/kimchi.repository_add_main.js @@ -57,17 +57,13 @@ kimchi.repository_add_main = function() { } var formData = $(addForm).serializeObject(); - - if (formData && formData.isMirror!=undefined) { - formData.isMirror=(String(formData.isMirror).toLowerCase() === 'true'); - } - if(formData.isMirror) { + if(formData.linkType) { if(formData.config==undefined) { formData.config=new Object(); } - formData.config.mirrorlist=formData.baseurl; + formData.config[formData.linkType]=formData.baseurl; delete formData.baseurl; - delete formData.isMirror; + delete formData.linkType; } weedObject(formData); if(formData.config && formData.config.comps) { diff --git a/ui/pages/repository-add.html.tmpl b/ui/pages/repository-add.html.tmpl index 6de4f76..96cf6f6 100644 --- a/ui/pages/repository-add.html.tmpl +++ b/ui/pages/repository-add.html.tmpl @@ -63,9 +63,13 @@ </div> <div class="field yum"> <p class="yum"> - <input type="checkbox" name="isMirror" value="true" id="isMirror" /> + <input type="radio" name="linkType" value="mirrorlist" id="isMirror" /> <label for="isMirror">$_("Repository is a mirror")</label> </p> + <p class="yum"> + <input type="radio" name="linkType" value="metalink" id="isMeta" /> + <label for="isMeta">$_("Repository is a meta link")</label> + </p> </div> </section> <section class="form-section repository-dist deb"> diff --git a/ui/pages/repository-edit.html.tmpl b/ui/pages/repository-edit.html.tmpl index f13cb90..4467ca8 100644 --- a/ui/pages/repository-edit.html.tmpl +++ b/ui/pages/repository-edit.html.tmpl @@ -71,6 +71,14 @@ <input id="repository-edit-urlargs-textbox" class="yum" name="config[mirrorlist]" type="text" /> </div> </div> + <div class="yum"> + <div class="repository-edit-wrapper-label"> + <label for="repository-edit-urlargs-textbox">$_("Meta Link URL")</label> + </div> + <div class="repository-edit-wrapper-controls"> + <input id="repository-edit-urlargs-textbox" class="yum" name="config[metalink]" type="text" /> + </div> + </div> <div class="repository-comps deb"> <div class="repository-edit-wrapper-label"> <label for="repository-edit-urlargs-textbox">$_("Components")</label> -- 1.7.1

1 0

[PATCH] Bugfix#527 Reverting a snapshot doesn't change initial state of "Edit Guest"
by wenwang＠linux.vnet.ibm.com 15 Dec '14

15 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Close diaguage when reverting a VM finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..5c2def6 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -564,6 +564,7 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.window.close(); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

3 2

[PATCH] Bugfix#428: Host stats graphics are not aligned in Italian
by Wen Wang 12 Dec '14

12 Dec '14

Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 9e9cb01..93ae524 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -117,7 +117,7 @@ .host-panel .info-container { padding-top: 16px; - width: 890px; + width: 892px; } .host-panel .section-header { -- 1.9.3

1 0

[PATCH 0/3] Issue #543
by Crístian Viana 12 Dec '14

12 Dec '14

Crístian Viana (3): bugfix: Fix regexp in "kimchi.utils.get_next_clone_name" Support different "tags" when generating a new name in "get_next_clone_name" issue #543: Generate unique vol names when downloading files with same name src/kimchi/model/storagevolumes.py | 12 ++++++++++-- src/kimchi/utils.py | 17 ++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) -- 1.9.3

3 14

[PATCH] Bug fix #463: Allow add networks with non-ASCII characters to template and guest
by Aline Manera 11 Dec '14

11 Dec '14

Kimchi uses unicode internally but libvirt stores its data encoded with utf-8. So we also need to encode the given value to utf-8 to compare it properly to libvirt results. Also add test cases to cover this scenario. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/networks.py | 4 ++-- src/kimchi/model/templates.py | 6 +++--- src/kimchi/model/vmifaces.py | 1 + src/kimchi/vmtemplate.py | 4 ++-- src/kimchi/xmlutils/utils.py | 9 ++++++++- tests/test_model.py | 21 ++++++++++++++++++++- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index f3ea099..1e94fd2 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -293,8 +293,8 @@ class NetworkModel(object): conn = self.conn.get() for dom in conn.listAllDomains(0): networks = self._vm_get_networks(dom) - if network in networks and (state is None or - state == dom.state(0)[0]): + if network.encode('utf-8') in networks and \ + (state is None or state == dom.state(0)[0]): vms.append(dom.name()) return vms diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 2ca80ba..85f0839 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -83,7 +83,7 @@ class TemplatesModel(object): for net_name in params.get(u'networks', []): try: - conn.networkLookupByName(net_name) + conn.networkLookupByName(net_name.encode('utf-8')) except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) @@ -200,7 +200,7 @@ class TemplateModel(object): for net_name in params.get(u'networks', []): try: - conn.networkLookupByName(net_name) + conn.networkLookupByName(net_name.encode('utf-8')) except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) @@ -260,7 +260,7 @@ class LibvirtVMTemplate(VMTemplate): for name in names: try: conn = self.conn.get() - network = conn.networkLookupByName(name) + network = conn.networkLookupByName(name.encode('utf-8')) except libvirt.libvirtError: raise InvalidParameter("KCHTMPL0003E", {'network': name, 'template': self.name}) diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 1206cde..0c10fa9 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -42,6 +42,7 @@ class VMIfacesModel(object): def create(self, vm, params): conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() + networks = map(lambda x: x.decode('utf-8'), networks) if params["type"] == "network" and params["network"] not in networks: raise InvalidParameter("KCHVMIF0002E", diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 8582d48..5e4a6a8 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -184,7 +184,7 @@ class VMTemplate(object): disks_xml += get_disk_xml(params)[1] - return disks_xml + return unicode(disks_xml, 'utf-8') def to_volume_list(self, vm_uuid): storage_path = self._get_storage_path() @@ -232,7 +232,7 @@ class VMTemplate(object): networks += get_iface_xml(params, self.info['arch'], self.info['os_distro'], self.info['os_version']) - return networks + return unicode(networks, 'utf-8') def _get_input_output_xml(self): sound = """ diff --git a/src/kimchi/xmlutils/utils.py b/src/kimchi/xmlutils/utils.py index 4863bb5..be08a14 100644 --- a/src/kimchi/xmlutils/utils.py +++ b/src/kimchi/xmlutils/utils.py @@ -23,7 +23,14 @@ from lxml import objectify def xpath_get_text(xml, expr): doc = ET.fromstring(xml) - res = [x.text if not isinstance(x, str) else x for x in doc.xpath(expr)] + + res = [] + for x in doc.xpath(expr): + if isinstance(x, unicode): + x = x.encode('utf-8') + elif not isinstance(x, str): + x = x.text + res.append(x) return res diff --git a/tests/test_model.py b/tests/test_model.py index aa2a1bb..acaa711 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -889,6 +889,17 @@ class ModelTests(unittest.TestCase): 'subnet': '127.0.100.0/24'} inst.networks_create(net_args) rollback.prependDefer(inst.network_delete, net_name) + inst.network_activate(net_name) + rollback.prependDefer(inst.network_deactivate, net_name) + + net_name = u'kīмсhī-пet' + net_args = {'name': net_name, + 'connection': 'nat', + 'subnet': '127.0.20.0/24'} + inst.networks_create(net_args) + rollback.prependDefer(inst.network_delete, net_name) + inst.network_activate(net_name) + rollback.prependDefer(inst.network_deactivate, net_name) orig_params = {'name': 'test', 'memory': 1024, 'cpus': 1, 'cdrom': self.kimchi_iso} @@ -908,7 +919,7 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", info["networks"][0]) params = {'name': 'new-test', 'memory': 1024, 'cpus': 1, - 'networks': ['default', 'test-network']} + 'networks': ['default', 'test-network', u'kīмсhī-пet']} inst.template_update('new-test', params) info = inst.template_lookup('new-test') for key in params.keys(): @@ -932,6 +943,14 @@ class ModelTests(unittest.TestCase): self.assertRaises(InvalidParameter, inst.template_update, 'new-test', params) + params = {'name': 'some-vm', 'template': '/templates/new-test'} + self.assertEquals('some-vm', inst.vms_create(params)) + rollback.prependDefer(inst.vm_delete, 'some-vm') + + iface_args = {'type': 'network', 'network': u'kīмсhī-пet'} + mac = inst.vmifaces_create('some-vm', iface_args) + self.assertEquals(17, len(mac)) + def test_vm_edit(self): config.set("authentication", "method", "pam") inst = model.Model(None, -- 1.9.3

2 3

[PATCH] Issue#536: raise proper error message when disk os info absent
by lvroyce0210＠gmail.com 11 Dec '14

11 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When disk os cannot be decided by libguestfs, it will leave it to 'unknown' distro and version. But if no boot information available, ImageFormatError is left unhandled and this will introduce 500 error when disk os info is absent. Handle this error to fix this. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 8582d48..3266e7b 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi import imageinfo from kimchi import osinfo from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter +from kimchi.exception import ImageFormatError, OperationFailed from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri from kimchi.xmlutils.disk import get_disk_xml @@ -51,7 +52,10 @@ class VMTemplate(object): self.fc_host_support = args.get('fc_host_support') # Fetch defaults based on the os distro and version - distro, version = self._get_os_info(args, scan) + try: + distro, version = self._get_os_info(args, scan) + except ImageFormatError as e: + raise OperationFailed('KCHTMPL0020E', {'err': e.message}) os_distro = args.get('os_distro', distro) os_version = args.get('os_version', version) entry = osinfo.lookup(os_distro, os_version) -- 1.8.3.2

3 3

[PATCH v2 0/3] Issue #543
by Crístian Viana 11 Dec '14

11 Dec '14

The differences between this and the previous patchset (v1) are: - Patch 3/3 has been updated: generate unique name for all types of storage volumes (not just 'url'); rebased to the latest commit (a378799); reworded commit message. Crístian Viana (3): bugfix: Fix regexp in "kimchi.utils.get_next_clone_name" Support different "tags" when generating a new name in "get_next_clone_name" issue #543: Generate unique names when creating volumes without name src/kimchi/model/storagevolumes.py | 9 ++++++++- src/kimchi/utils.py | 17 ++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) -- 1.9.3

2 4

[PATCH] Bug 539 Partial Fix: Enhance Error Handling
by huoyuxin＠linux.vnet.ibm.com 11 Dec '14

11 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 21caf1b..611d8c7 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -211,6 +211,7 @@ kimchi.listVmsAuto = function() { if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) kimchi.trackTask(tasks[i].id, null, function(err){ kimchi.message.error(err.message); + kimchi.listVmsAuto(); }, null); } }, null, true); @@ -345,7 +346,12 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }, function() { - kimchi.cloneGuest(guest, function(data){ + kimchi.cloneGuest(guest, function(task){ + if(kimchi.trackingTasks.indexOf(task.id)==-1) + kimchi.trackTask(task.id, null, function(err){ + kimchi.message.error(err.message); + kimchi.listVmsAuto(); + }, null); kimchi.listVmsAuto(); }); }, null); -- 1.7.1

1 0

Bug list updated for hard code freeze week
by Aline Manera 11 Dec '14

11 Dec '14

Hi all, You can check the bug list at: https://github.com/kimchi-project/kimchi/milestones/1.4%20GA Hopefully we can close all or almost all those bugs in this final week before Kimchi 1.4 GA I'd also want to ask your help to update the translations files. Regards, Aline Manera

1 0

[PATCH 0/2] Bugfix #496 System leftovers after uninstalling Kimchi
by Ramon Medeiros 10 Dec '14

10 Dec '14

Remove directories and some files on kimchi package removal Ramon Medeiros (2): Remove empty directories after rpm -e kimchi on fedora Remove empty directories on dpkg -e contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++- contrib/make-deb.sh.in | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) -- 1.8.3.1

2 4

[PATCH] Bug 482 Fix: Interfaces stacked in template edit
by huoyuxin＠linux.vnet.ibm.com 10 Dec '14

10 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/pages/template-edit.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 7177bf0..499d45d 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -151,7 +151,7 @@ </div> </script> <script id="template-interface-tmpl" type="text/html"> - <div class="item" id={networkID}> + <div id={networkID}> <span class="template-interface-cell"> <select></select> </span> -- 1.7.1

2 2

[PATCH] Bug 485 Fix: Label alignement in guest edit
by huoyuxin＠linux.vnet.ibm.com 10 Dec '14

10 Dec '14

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/guest-edit.css | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 6815ecf..9eadc6a 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -34,6 +34,7 @@ #form-guest-edit-general .edit-general-inline { display: inline-block; + vertical-align: top; } #form-guest-edit-storage input[readonly] { @@ -47,10 +48,8 @@ } .guest-edit-wrapper-label { - height: 38px; - line-height: 38px; - margin-top: 5px; - vertical-align: top; + line-height: 42px; + margin-bottom: 1px; min-width: 100px; } @@ -60,6 +59,7 @@ .guest-edit-wrapper-controls { width: 470px; + margin-bottom: 1px; } #form-guest-edit-storage .guest-edit-wrapper-controls { @@ -73,9 +73,8 @@ -webkit-border-radius: 5px; border-radius: 5px; box-shadow: 2px 2px 2px #eee inset; - border-top: 1px solid #bbb; - border-left: 1px solid #bbb; - padding-left: 10px; + border: 1px solid #bbb; + padding: 1px 1px 1px 10px; width: 450px; } -- 1.7.1

2 1

[PATCH] Bug 487 Fix: Dropdown & Filter not aligned(mobile)
by huoyuxin＠linux.vnet.ibm.com 10 Dec '14

10 Dec '14

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/guest-edit.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index cd8ac89..6815ecf 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -360,6 +360,7 @@ border-radius: 7px 0px 0px 7px; padding: 2px 2px 2px 7px; width: 100px; + height: 24px; } .guest-edit-pci .filter select option { @@ -370,6 +371,7 @@ border-radius: 0px 7px 7px 0px; padding: 3px 3px 3px 10px; width: 200px; + height: 16px; font-style: italic; } -- 1.7.1

2 1

[PATCH] Bug fix #529: Kill all Kimchi process when stopping kimchid service
by Aline Manera 10 Dec '14

10 Dec '14

When using "tree.mount(); engine.start(); engine.block()" to start cherrypy server, we need to manually subscribe to the signal handlers plugin. For reference: https://cherrypy.readthedocs.org/en/3.2.6/refman/process/plugins/signalhand… Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/server.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index ec78b6c..eb58465 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -172,6 +172,10 @@ class Server(object): cherrypy.tree.mount(plugin_app, script_name, plugin_config) def start(self): + # Subscribe to SignalHandler plugin + if hasattr(cherrypy.engine, 'signal_handler'): + cherrypy.engine.signal_handler.subscribe() + cherrypy.engine.start() cherrypy.engine.block() -- 1.9.3

2 2

[PATCHv2] issue#474: Add default value for ldap_admin_id
by lvroyce＠linux.vnet.ibm.com 10 Dec '14

10 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Add default value for ldap_admin_id so that kimchi will not raise error for ldap log in. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/config.py.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index 88de1aa..83a5dd0 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -290,6 +290,7 @@ def _get_config(): config.set("authentication", "ldap_server", "") config.set("authentication", "ldap_search_base", "") config.set("authentication", "ldap_search_filter", "") + config.set("authentication", "ldap_admin_id", "") config.add_section("logging") config.set("logging", "log_dir", paths.log_dir) config.set("logging", "log_level", DEFAULT_LOG_LEVEL) -- 1.8.3.2

2 1

[PATCH] issue#474: Add check for ldap configuration
by lvroyce＠linux.vnet.ibm.com 10 Dec '14

10 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Check ldap server and filter when start up. Ignore admin id if it does not specified in config. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 14 +++++++++----- src/kimchid.in | 9 +++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index 22c5c81..23bc5ec 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -19,6 +19,7 @@ import base64 import cherrypy +from ConfigParser import NoOptionError import fcntl import ldap import multiprocessing @@ -222,11 +223,14 @@ class LDAPUser(User): return self.user[USER_GROUPS] def get_roles(self): - admin_ids = config.get( - "authentication", "ldap_admin_id").strip('"').split(',') - for admin_id in admin_ids: - if self.user[USER_NAME] == admin_id.strip(): - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') + try: + admin_ids = config.get( + "authentication", "ldap_admin_id").strip('"').split(',') + for admin_id in admin_ids: + if self.user[USER_NAME] == admin_id.strip(): + self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') + except NoOptionError: + pass return self.user[USER_ROLES] def get_user(self): diff --git a/src/kimchid.in b/src/kimchid.in index 0746ba6..0121f97 100644 --- a/src/kimchid.in +++ b/src/kimchid.in @@ -49,6 +49,15 @@ def main(options): federation = config.config.get("server", "federation") logDir = config.config.get("logging", "log_dir") logLevel = config.config.get("logging", "log_level") + auth = config.config.get("authentication", "method") + ldap_server = config.config.get("authentication", "ldap_server") + search_base = config.config.get("authentication", "ldap_search_base") + search_filter = config.config.get("authentication", "ldap_search_filter", + vars={"username": "fake"}) + + if auth == "ldap" and \ + (not all([auth, ldap_server, search_base, search_filter])): + sys.exit("LDAP server is not setup properly.Exiting ...") parser = OptionParser() parser.add_option('--host', type="string", default=host, -- 1.8.3.2

4 4

[PATCH] Remove empty directories after rpm -e kimchi on fedora
by Ramon Medeiros 10 Dec '14

10 Dec '14

Some directories were not removed on rpm -e due no declaration on %files section. Also, the directory was being created in runtime. Now, it is being created on rpm build. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- contrib/kimchi.spec.fedora.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index c1929f8..99dc153 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -83,6 +83,11 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install %if 0%{?with_systemd} + +# create directory +mkdir -p %{buildroot}/var/lib/kimchi/{isos,vnc-tokens} + + # Install the systemd scripts install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml @@ -148,7 +153,6 @@ exit 0 # Rollback SELinux rules semanage permissive -d httpd_t - %clean rm -rf $RPM_BUILD_ROOT @@ -162,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/xmlutils/*.py* %{python_sitelib}/kimchi/API.json %{python_sitelib}/kimchi/plugins/*.py* +%{python_sitelib}/kimchi/ %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md %{_datadir}/kimchi/doc/README-federation.md @@ -170,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo %{_datadir}/kimchi/config/ui/*.xml %{_datadir}/kimchi/ui/ +%{_datadir}/kimchi %{_sysconfdir}/kimchi/kimchi.conf %{_sysconfdir}/kimchi/nginx.conf.in %{_sysconfdir}/kimchi/distros.d/debian.json @@ -177,6 +183,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/kimchi/distros.d/opensuse.json %{_sysconfdir}/kimchi/distros.d/ubuntu.json %{_sysconfdir}/kimchi/distros.d/gentoo.json +%{_sysconfdir}/kimchi/ +%{_sharedstatedir}/kimchi/* %if 0%{?with_systemd} %{_unitdir}/kimchid.service -- 1.8.3.1

3 6

[PATCH v2] List as many pools' info as possible
by Christy Perez 09 Dec '14

09 Dec '14

If a pool happens to be busy at the time the pool.refresh() is called, then libvirt will throw an error: "internal error: pool 'default' has asynchronous jobs running." Currently, kimchi rasise an exception and no pools' storage volumes are listed. This patch returns a 0 for that particular pool, and allows the user to continue to request information for other pools. Without this patch, nothing is shown at all on the Storage tab if one pool is busy. In the future, we can check for VIR_ERR_RESOURCE_BUSY and come up with a plan that works with the UI to display "Busy" for a pool. But for now, this works around the issue. v1 -> v2: - Log exception message and error code Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/storagepools.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 20c9e5a..e03c6bb 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -202,6 +202,15 @@ def _get_storagepool_vols_num(self, pool): else: return 0 except libvirt.libvirtError as e: + # If something (say a busy pool) prevents the refresh, + # throwing an Exception here would prevent all pools from + # displaying information -- so return None for busy + kimchi_log.error("ERROR: Storage Pool get vol count: %s " + % e.get_error_message()) + kimchi_log.error("ERROR: Storage Pool get vol count error no: %s " + % e.get_error_code()) + return 0 + except Exception as e: raise OperationFailed("KCHPOOL0008E", {'name': pool.name(), 'err': e.get_error_message()}) -- 1.9.3

3 5

[PATCH] Bugfix#549 VM button icons unaligned
by wenwang＠linux.vnet.ibm.com 09 Dec '14

09 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Fix the issue that chrome and IE won't align the VM action buttons Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 52cccc4..7b32ea6 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -234,9 +234,11 @@ height: 42px; } -.guest-actions .top button span { - margin-left: -3px; - margin-top: -1px; +@-moz-document url-prefix() { + .guest-actions .top button span { + margin-left: -3px; + margin-top: -1px; + } } .guest-actions .bottom { -- 1.9.3

2 1

[PATCH v3] Add details on how to install test dependencies
by Crístian Viana 09 Dec '14

09 Dec '14

The difference between this and the previous patchset (v2) is: - Remove "python-requests" from the RPM/DEB configuration files. Crístian Viana (1): issue #504: Add details on how to install test dependencies contrib/DEBIAN/control.in | 3 +-- contrib/kimchi.spec.fedora.in | 1 - contrib/kimchi.spec.suse.in | 1 - docs/README.md | 29 +++++++++++++++++++++++------ 4 files changed, 24 insertions(+), 10 deletions(-) -- 1.9.3

3 3

[PATCH] Bug 499 Fix: Disable download button of debug report when mobile
by huoyuxin＠linux.vnet.ibm.com 09 Dec '14

09 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 2 +- ui/js/src/kimchi.main.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index b75b9e4..295e4cc 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -290,7 +290,7 @@ kimchi.host_main = function() { $(kimchi.substitute(buttonID, { grid: reportGridID, btn: n - })).prop('disabled', !toEnable); + })).prop('disabled', (n=="download"&&kimchi.isMobile)||!toEnable); }); }; var initReportGrid = function(reports) { diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 1424827..3f08d82 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -27,6 +27,8 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.isMobile = /android|iphone|ipad/i.test(navigator.userAgent); + kimchi.main = function() { kimchi.isLoggingOut = false; kimchi.popable(); -- 1.7.1

3 3

[PATCH] issue #438: Display nicer error message when starting network
by Crístian Viana 09 Dec '14

09 Dec '14

If an error occurs when a network is being started (e.g. the host firewall is disabled), a generic message is displayed. Add a more specific error message for when a network fails to start. The root reason is also displayed along the message. Fix issue #438 ("Unexpected error when starting network interface with firewall disabled"). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 45aa15e..e3a051c 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -234,6 +234,7 @@ messages = { "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), + "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 6d21e9e..f3ea099 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -305,7 +305,11 @@ class NetworkModel(object): def activate(self, name): network = self.get_network(self.conn.get(), name) - network.create() + try: + network.create() + except libvirt.libvirtError, e: + raise OperationFailed('KCHNET0022E', {'name': name, + 'err': e.message}) def deactivate(self, name): if self._is_network_in_use(name): -- 1.9.3

4 3

[PATCH] Bug fix #530: Update distros.d/ files
by Aline Manera 09 Dec '14

09 Dec '14

Add openSUSE 13.2 and Ubuntu 14.10 and update gentoo and debian links to reflect the latest distribution version available. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/distros.d/debian.json | 4 ++-- src/distros.d/gentoo.json | 6 +++--- src/distros.d/opensuse.json | 7 +++++++ src/distros.d/ubuntu.json | 7 +++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/distros.d/debian.json b/src/distros.d/debian.json index 60bdf41..5d6a313 100644 --- a/src/distros.d/debian.json +++ b/src/distros.d/debian.json @@ -3,7 +3,7 @@ "name": "debian-Wheezy", "os_distro": "debian", "os_arch": "x86_64", - "os_version": "7.6.0", - "path": "http://ftp.acc.umu.se/debian-cd/7.6.0-live/amd64/iso-hybrid/debian-live-7.6…" + "os_version": "7.7.0", + "path": "http://caesar.acc.umu.se/debian-cd/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-ne…" } ] diff --git a/src/distros.d/gentoo.json b/src/distros.d/gentoo.json index 1c398e8..2c0f012 100644 --- a/src/distros.d/gentoo.json +++ b/src/distros.d/gentoo.json @@ -1,9 +1,9 @@ [ { - "name": "gentoo-20140904", + "name": "gentoo-20141204", "os_distro": "gentoo", "os_arch": "x86_64", - "os_version": "20140904", - "path": "http://distfiles.gentoo.org/releases/amd64/autobuilds/current-iso/install-a…" + "os_version": "20141204", + "path": "http://distfiles.gentoo.org/releases/amd64/autobuilds/current-iso/install-a…" } ] diff --git a/src/distros.d/opensuse.json b/src/distros.d/opensuse.json index ad80c50..f51de97 100644 --- a/src/distros.d/opensuse.json +++ b/src/distros.d/opensuse.json @@ -12,5 +12,12 @@ "os_arch": "x86_64", "os_version": "13.1", "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/13.1/iso/openSUSE-13.…" + }, + { + "name": "opensuse-13.2", + "os_distro": "opensuse", + "os_arch": "x86_64", + "os_version": "13.2", + "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/13.2/iso/openSUSE-13.…" } ] diff --git a/src/distros.d/ubuntu.json b/src/distros.d/ubuntu.json index b0b5f45..161fbc8 100644 --- a/src/distros.d/ubuntu.json +++ b/src/distros.d/ubuntu.json @@ -26,5 +26,12 @@ "os_arch": "x86_64", "os_version": "14.04", "path": "http://releases.ubuntu.com/14.04/ubuntu-14.04-desktop-amd64.iso" + }, + { + "name": "Ubuntu Server 14.10 (Utopic Unicorn)", + "os_distro": "ubuntu", + "os_arch": "x86_64", + "os_version": "14.10", + "path": "http://releases.ubuntu.com/14.10/ubuntu-14.10-desktop-amd64.iso" } ] -- 1.9.3

3 3

[PATCH v2] Add details on how to install test dependencies
by Crístian Viana 09 Dec '14

09 Dec '14

The difference between this and the previous patchset (v1) is: - Remove "python-requests" from the build/install dependencies list and put it in the test list. Crístian Viana (1): issue #504: Add details on how to install test dependencies docs/README.md | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) -- 1.9.3

3 3

[PATCH] Bug #443: Do not crash Kimchi when federation is enabled and openslp is not installed
by Aline Manera 09 Dec '14

09 Dec '14

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi.conf.in | 2 +- src/kimchi/model/peers.py | 7 +++++-- src/kimchi/utils.py | 2 +- src/kimchid.in | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/kimchi.conf.in b/src/kimchi.conf.in index 003ce4a..9f62ac0 100644 --- a/src/kimchi.conf.in +++ b/src/kimchi.conf.in @@ -27,7 +27,7 @@ #environment = production # Federation feature: register Kimchi server on openSLP and discover peers -# at the same network +# in the same network. Check README-federation for more details. #federation = off # Max request body size in KB, default value is 4GB diff --git a/src/kimchi/model/peers.py b/src/kimchi/model/peers.py index 1bf74cb..a9f5fcd 100644 --- a/src/kimchi/model/peers.py +++ b/src/kimchi/model/peers.py @@ -38,7 +38,7 @@ class PeersModel(object): cmd = ["slptool", "register", "service:kimchid://%s" % self.url] out, error, ret = run_command(cmd) - if len(out) != 0: + if out and len(out) != 0: kimchi_log.error("Unable to register server on openSLP." " Details: %s" % out) @@ -47,9 +47,12 @@ class PeersModel(object): if config.get("server", "federation") == "off": return [] - peers = [] cmd = ["slptool", "findsrvs", "service:kimchid"] out, error, ret = run_command(cmd) + if ret != 0: + return [] + + peers = [] for server in out.strip().split("\n"): match = re.match("service:kimchid://(.*?),.*", server) peer = match.group(1) diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index 68415dc..989e370 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -224,7 +224,7 @@ def run_command(cmd, timeout=None): except Exception as e: msg = "Failed to run command: %s." % " ".join(cmd) msg = msg if proc is None else msg + "\n error code: %s." - kimchi_log.error("%s\n %s", msg, e) + kimchi_log.error("%s %s", msg, e) if proc: return out, error, proc.returncode diff --git a/src/kimchid.in b/src/kimchid.in index 0746ba6..0a8dc1f 100644 --- a/src/kimchid.in +++ b/src/kimchid.in @@ -70,8 +70,9 @@ def main(options): parser.add_option('--environment', default=runningEnv, help="Running environment of kimchi server") parser.add_option('--federation', default=federation, - help="Register and discover Kimchi peers at the same " - "network using openSLP") + help="Register and discover Kimchi peers in the same " + "network using openSLP. Check README-federation for" + " more details.") parser.add_option('--test', action='store_true', help="Run server in mock model") (options, args) = parser.parse_args() -- 1.9.3

2 2

[PATCH] Bugfix #479: Allow non-admin users get devices passthrough information
by Aline Manera 09 Dec '14

09 Dec '14

The API /host/devices is used in many places (such as to create a SCSI FC pool or to list the PCI passthrough devices). As the PCI passthrough devices might be accessible for non-admin users the authorization configuration to that API was reset. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/control/host.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index 3592388..c690945 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -96,8 +96,6 @@ class Partition(Resource): class Devices(Collection): def __init__(self, model): super(Devices, self).__init__(model) - self.role_key = 'storage' - self.admin_methods = ['GET'] self.resource = Device @@ -109,8 +107,6 @@ class VMHolders(SimpleCollection): class Device(Resource): def __init__(self, model, id): - self.role_key = 'storage' - self.admin_methods = ['GET'] super(Device, self).__init__(model, id) self.vm_holders = VMHolders(self.model, id) -- 1.9.3

3 3

[PATCH] issue #504: Add details on how to install test dependencies
by Crístian Viana 08 Dec '14

08 Dec '14

The package dependencies listed in docs/README.md are only required for building, installing and running Kimchi. If the user wants to run the tests, they need to install some extra packages which are not listed in that file. Update the file docs/README.md by adding the dependencies required for testing. Fix issue #504 ("check pyflakes installation"). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- docs/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/README.md b/docs/README.md index ed3d489..681acab 100644 --- a/docs/README.md +++ b/docs/README.md @@ -69,6 +69,9 @@ Install Dependencies Packages version requirement: python-psutil >= 0.6.0 + # These dependencies are only required if you want to run the tests: + $ sudo yum install pyflakes python-pep8 + *Note for RHEL users*: Some of the above packages are located in the Red Hat EPEL repositories. See [this FAQ](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.… @@ -94,6 +97,9 @@ channel at RHN Classic or Red Hat Satellite. python-jsonschema >= 1.3.0 python-psutil >= 0.6.0 + # These dependencies are only required if you want to run the tests: + $ sudo apt-get install pyflakes pep8 + **For openSUSE:** $ sudo zypper install gcc make autoconf automake gettext-tools git \ @@ -110,6 +116,9 @@ channel at RHN Classic or Red Hat Satellite. Packages version requirement: python-psutil >= 0.6.0 + # These dependencies are only required if you want to run the tests: + $ sudo zypper install python-pyflakes python-pep8 + *Note for openSUSE users*: Some of the above packages are located in different openSUSE repositories. See [this FAQ](http://download.opensuse.org/repositories/home:GRNET:synnefo/) for @@ -135,6 +144,16 @@ Run $ sudo kimchid --host=0.0.0.0 + +Test +---- + + $ make check-local # check for i18n and formatting errors + $ sudo make check + +After all tests are executed, a summary will be displayed containing any +errors/failures which might have occurred. + Usage ----- -- 1.9.3

2 1

[PATCH] Bug 495 Fix: Remove error popup when non-admin login
by huoyuxin＠linux.vnet.ibm.com 08 Dec '14

08 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.main.js | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 3f08d82..be959db 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -150,7 +150,6 @@ kimchi.main = function() { */ var tab = $('#nav-menu a[href="' + url + '"]'); if (tab.length === 0) { - kimchi.message.error.code('KCHAPI6001E'); location.hash = ''; return; } -- 1.7.1

2 1

[PATCH] Bugfix#477 Fix snapshot time didn't align issue
by wenwang＠linux.vnet.ibm.com 08 Dec '14

08 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch align the create time in snapshot for IE specially since IE is using time format different from firefox. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index aaccfe7..cd8ac89 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -141,7 +141,7 @@ } .guest-edit-snapshot .created { - width: 250px; + width: 270px; } #form-guest-edit-storage .cell.dev { -- 1.9.3

2 1

[PATCH] Bug 546 Fix: Network button state issue
by huoyuxin＠linux.vnet.ibm.com 08 Dec '14

08 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7194f93..34448f8 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -184,6 +184,11 @@ kimchi.addNetworkActions = function(network) { kimchi.initNetworkCreation = function() { $("#networkAdd").on("click", function() { kimchi.openNetworkDialog(function() { + var errorCallback = function(){ + $("#networkFormOk").button("enable"); + $("#networkName").removeAttr("readonly"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); + }; var network = kimchi.getNetworkDialogValues(); var data = { name : network.name, @@ -196,6 +201,7 @@ kimchi.initNetworkCreation = function() { data.vlan_id = network.vlan_id; if (!(data.vlan_id >=1 && data.vlan_id <= 4094)) { kimchi.message.error.code('KCHNET6001E'); + errorCallback(); return; } } @@ -209,9 +215,7 @@ kimchi.initNetworkCreation = function() { $("#networkConfig").dialog("close"); }, function(data) { kimchi.message.error(data.responseJSON.reason); - $("#networkFormOk").button("enable"); - $("#networkName").removeAttr("readonly"); - $("#networkFormOk span").text(i18n.KCHAPI6005M); + errorCallback(); }); }); }); -- 1.7.1

2 1

[RFC] Add an sos plugin for the kimchi platform
by Christy Perez 06 Dec '14

06 Dec '14

This plugin gathers kimchi logs as well as information about libvirt storage pools defined on the system. Kimchi is an HTML5-based virtualization-management platform For more information, please visit: https://github.com/kimchi-project/kimchi/wiki Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- sos/plugins/kimchi.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sos/plugins/kimchi.py diff --git a/sos/plugins/kimchi.py b/sos/plugins/kimchi.py new file mode 100644 index 0000000..69f138e --- /dev/null +++ b/sos/plugins/kimchi.py @@ -0,0 +1,39 @@ +### This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin + +class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + """kimchi-related information + """ + + plugin_name = 'kimchi' + packages = ('kimchi',) + + def setup(self): + self.add_copy_spec([ + "/etc/kimchi/", + "/var/log/kimchi*" + ]) + + file_name = self.get_cmd_output_now("virsh -r pool-list --details") + if file_name is not None: + with open(file_name, 'r') as pools: + for pool in list(pools)[2:]: + try: + pool_name = pool.lstrip().split()[0] + self.get_cmd_output_now("virsh -r vol-list --pool \ + %s --details" % pool_name) + except: + pass -- 1.9.3

1 1

[PATCH V2] issue #498: Fix typos on Kimchi messages
by Aline Manera 05 Dec '14

05 Dec '14

Also update the po files to reflect those changes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- po/de_DE.po | 18 ++++++++++++------ po/en_US.po | 18 ++++++++++++------ po/es_ES.po | 18 ++++++++++++------ po/fr_FR.po | 20 +++++++++++++------- po/it_IT.po | 18 ++++++++++++------ po/ja_JP.po | 18 ++++++++++++------ po/kimchi.pot | 18 ++++++++++++------ po/ko_KR.po | 18 ++++++++++++------ po/pt_BR.po | 20 +++++++++++++------- po/ru_RU.po | 18 ++++++++++++------ po/zh_CN.po | 20 +++++++++++++------- po/zh_TW.po | 18 ++++++++++++------ src/kimchi/i18n.py | 6 +++--- ui/pages/i18n.json.tmpl | 2 +- ui/pages/storagepool-add-volume.html.tmpl | 4 ++-- 15 files changed, 153 insertions(+), 81 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 52831eb..a66a052 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1129,7 +1129,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1160,7 +1160,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1170,6 +1170,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1407,7 +1413,7 @@ msgstr "Gäste" msgid "Templates" msgstr "Vorlagen" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Ungültiger URL. Rückleitung zur Homepage." msgid "Failed to get application configuration" @@ -2000,10 +2006,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/en_US.po b/po/en_US.po index 37efd19..bad843c 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1007,7 +1007,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1038,7 +1038,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/es_ES.po b/po/es_ES.po index 1999dd2..e4051ec 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1147,7 +1147,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1178,7 +1178,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1188,6 +1188,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1425,7 +1431,7 @@ msgstr "Invitados" msgid "Templates" msgstr "Plantillas" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL no válido. Redirigido a la página inicial." msgid "Failed to get application configuration" @@ -2017,10 +2023,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/fr_FR.po b/po/fr_FR.po index 3e19c91..1042d55 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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/" @@ -1162,7 +1162,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1193,7 +1193,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1203,6 +1203,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1441,7 +1447,7 @@ msgstr "Invités" msgid "Templates" msgstr "Modèles" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL invalide. Redirigé vers la page d'accueil." msgid "Failed to get application configuration" @@ -2044,11 +2050,11 @@ msgstr "" msgid "Enter the remote URL here." msgstr "Saisir une URL distante ici" -msgid "Upload an file" +msgid "Upload a file" msgstr "Charger un fichier" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Sélectionner le fichier ISO (avec suffixe .iso) à charger" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Ajouter un Modèle" diff --git a/po/it_IT.po b/po/it_IT.po index 2b7d69b..a31414b 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1116,7 +1116,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1147,7 +1147,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1157,6 +1157,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1394,7 +1400,7 @@ msgstr "Guest" msgid "Templates" msgstr "Modelli" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL non valido. Reindirizzato alla home page." msgid "Failed to get application configuration" @@ -1987,10 +1993,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ja_JP.po b/po/ja_JP.po index 782992b..3188aa3 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1128,7 +1128,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1159,7 +1159,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1169,6 +1169,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1404,7 +1410,7 @@ msgstr "ゲスト" msgid "Templates" msgstr "テンプレート" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL が無効です。ホーム・ページにリダイレクトします。" msgid "Failed to get application configuration" @@ -1986,10 +1992,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/kimchi.pot b/po/kimchi.pot index 08fb697..932afb1 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: 2014-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1007,7 +1007,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1038,7 +1038,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ko_KR.po b/po/ko_KR.po index f2e0ad1..f61445b 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1059,7 +1059,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1090,7 +1090,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1100,6 +1100,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1336,7 +1342,7 @@ msgstr "게스트" msgid "Templates" msgstr "템플리트" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "올바르지 않은 URL입니다. 홈 페이지로 경로 지정됩니다." msgid "Failed to get application configuration" @@ -1909,10 +1915,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8c6f821..dc1649d 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\n" "PO-Revision-Date: 2014-09-16 18:45+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -1138,7 +1138,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1169,7 +1169,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1179,6 +1179,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1416,7 +1422,7 @@ msgstr "Guests" msgid "Templates" msgstr "Modelos" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL inválida. Redirecionado para a Página Inicial." msgid "Failed to get application configuration" @@ -2012,11 +2018,11 @@ msgstr "Fazer download de uma URL remota" msgid "Enter the remote URL here." msgstr "Digite a URL remota aqui." -msgid "Upload an file" +msgid "Upload a file" msgstr "Fazer upload de um arquivo" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Escolha o arquivo ISO (com extensão .iso) que você quer fazer upload." +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Adicionar Modelo" diff --git a/po/ru_RU.po b/po/ru_RU.po index acf326d..d8f8af0 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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/" @@ -1061,7 +1061,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1092,7 +1092,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1102,6 +1102,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1337,7 +1343,7 @@ msgstr "Гостевые системы" msgid "Templates" msgstr "Шаблоны" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Недопустимый URL. Перенаправление на домашнюю страницу." msgid "Failed to get application configuration" @@ -1913,10 +1919,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9ad4e8d..0eeb631 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: 2014-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1030,7 +1030,7 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1061,7 +1061,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1071,6 +1071,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1304,7 +1310,7 @@ msgstr "客户机" msgid "Templates" msgstr "模板" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "无效的URL，已重定向到首页" msgid "Failed to get application configuration" @@ -1861,11 +1867,11 @@ msgstr "从远程URL获取" msgid "Enter the remote URL here." msgstr "在这里输入远程URL。" -msgid "Upload an file" +msgid "Upload a file" msgstr "上传一个文件" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "创建模板" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6709233..cd389d7 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1010,7 +1010,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1041,7 +1041,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1051,6 +1051,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1284,7 +1290,7 @@ msgstr "客體" msgid "Templates" msgstr "範本" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL 無效。已重新導向至首頁。" msgid "Failed to get application configuration" @@ -1847,10 +1853,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e43fe9c..45aa15e 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -311,15 +311,15 @@ messages = { "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"), "KCHREPOS0028E": _("Configuration items: '%(items)s' are not supported by repository manager"), - "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot on it."), + "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."), "KCHSNAP0002E": _("Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0003E": _("Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."), "KCHSNAP0004E": _("Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0005E": _("Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0006E": _("Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), - "KCHSNAP0008E": _("Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: %(err)s"), + "KCHSNAP0008E": _("Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0009E": _("Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %(err)s"), - "KCHSNAP0010E": _("Unable to create snapshot on virtual machine '%(vm)s' because it contains a disk with format '%(format)s'; only 'qcow2' is supported."), + "KCHSNAP0010E": _("Unable to create snapshot of virtual machine '%(vm)s' because it contains a disk with format '%(format)s'; only 'qcow2' is supported."), "KCHCPUINF0001E": _("The number of vCPUs is too large for this system."), "KCHCPUINF0002E": _("Invalid vCPU/topology combination."), diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 1edbc19..10fa4f9 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -34,7 +34,7 @@ "Storage": "$_("Storage")", "Network": "$_("Network")", - "KCHAPI6001E": "$_("Invalid URL. Redireced to home page.")", + "KCHAPI6001E": "$_("Invalid URL. Redirected to home page.")", "KCHAPI6002E": "$_("Failed to get application configuration")", "KCHAPI6003E": "$_("This is not a valid Linux path")", "KCHAPI6004E": "$_("This is not a valid URL.")", diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/ui/pages/storagepool-add-volume.html.tmpl index c0d68f6..b5f365f 100644 --- a/ui/pages/storagepool-add-volume.html.tmpl +++ b/ui/pages/storagepool-add-volume.html.tmpl @@ -49,12 +49,12 @@ <h2> <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload" disabled/> <label for="volume-type-upload"> - $_("Upload an file") + $_("Upload a file") </label> </h2> <div class="field"> <p class="text-help"> - $_("Choose the ISO file (with .iso suffix) you want to upload.") + $_("Choose the file you want to upload.") </p> <div class="textbox-wrapper"> <input type="file" class="volume-input upload" id="volume-input-file" name="volumeLocalFile" disabled="disabled" /> -- 1.9.3

2 2

[PATCH] issue #498: Fix typos on Kimchi messages
by Aline Manera 05 Dec '14

05 Dec '14

Also update the po files to reflect those changes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- po/de_DE.po | 14 ++++++++++---- po/en_US.po | 14 ++++++++++---- po/es_ES.po | 14 ++++++++++---- po/fr_FR.po | 16 +++++++++++----- po/it_IT.po | 14 ++++++++++---- po/ja_JP.po | 14 ++++++++++---- po/kimchi.pot | 14 ++++++++++---- po/ko_KR.po | 14 ++++++++++---- po/pt_BR.po | 16 +++++++++++----- po/ru_RU.po | 14 ++++++++++---- po/zh_CN.po | 16 +++++++++++----- po/zh_TW.po | 14 ++++++++++---- ui/pages/i18n.json.tmpl | 2 +- ui/pages/storagepool-add-volume.html.tmpl | 4 ++-- 14 files changed, 126 insertions(+), 54 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 52831eb..8fdc2cd 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1170,6 +1170,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1407,7 +1413,7 @@ msgstr "Gäste" msgid "Templates" msgstr "Vorlagen" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Ungültiger URL. Rückleitung zur Homepage." msgid "Failed to get application configuration" @@ -2000,10 +2006,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/en_US.po b/po/en_US.po index 37efd19..9c1f99b 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/es_ES.po b/po/es_ES.po index 1999dd2..59130cc 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1188,6 +1188,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1425,7 +1431,7 @@ msgstr "Invitados" msgid "Templates" msgstr "Plantillas" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL no válido. Redirigido a la página inicial." msgid "Failed to get application configuration" @@ -2017,10 +2023,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/fr_FR.po b/po/fr_FR.po index 3e19c91..f9465d6 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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/" @@ -1203,6 +1203,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1441,7 +1447,7 @@ msgstr "Invités" msgid "Templates" msgstr "Modèles" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL invalide. Redirigé vers la page d'accueil." msgid "Failed to get application configuration" @@ -2044,11 +2050,11 @@ msgstr "" msgid "Enter the remote URL here." msgstr "Saisir une URL distante ici" -msgid "Upload an file" +msgid "Upload a file" msgstr "Charger un fichier" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Sélectionner le fichier ISO (avec suffixe .iso) à charger" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Ajouter un Modèle" diff --git a/po/it_IT.po b/po/it_IT.po index 2b7d69b..2cc5fef 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1157,6 +1157,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1394,7 +1400,7 @@ msgstr "Guest" msgid "Templates" msgstr "Modelli" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL non valido. Reindirizzato alla home page." msgid "Failed to get application configuration" @@ -1987,10 +1993,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ja_JP.po b/po/ja_JP.po index 782992b..62d5ef7 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1169,6 +1169,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1404,7 +1410,7 @@ msgstr "ゲスト" msgid "Templates" msgstr "テンプレート" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL が無効です。ホーム・ページにリダイレクトします。" msgid "Failed to get application configuration" @@ -1986,10 +1992,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/kimchi.pot b/po/kimchi.pot index 08fb697..420f097 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: 2014-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ko_KR.po b/po/ko_KR.po index f2e0ad1..dc4ae3a 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1100,6 +1100,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1336,7 +1342,7 @@ msgstr "게스트" msgid "Templates" msgstr "템플리트" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "올바르지 않은 URL입니다. 홈 페이지로 경로 지정됩니다." msgid "Failed to get application configuration" @@ -1909,10 +1915,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8c6f821..fd815a3 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\n" "PO-Revision-Date: 2014-09-16 18:45+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -1179,6 +1179,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1416,7 +1422,7 @@ msgstr "Guests" msgid "Templates" msgstr "Modelos" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL inválida. Redirecionado para a Página Inicial." msgid "Failed to get application configuration" @@ -2012,11 +2018,11 @@ msgstr "Fazer download de uma URL remota" msgid "Enter the remote URL here." msgstr "Digite a URL remota aqui." -msgid "Upload an file" +msgid "Upload a file" msgstr "Fazer upload de um arquivo" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Escolha o arquivo ISO (com extensão .iso) que você quer fazer upload." +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Adicionar Modelo" diff --git a/po/ru_RU.po b/po/ru_RU.po index acf326d..ebd32e2 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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/" @@ -1102,6 +1102,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1337,7 +1343,7 @@ msgstr "Гостевые системы" msgid "Templates" msgstr "Шаблоны" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Недопустимый URL. Перенаправление на домашнюю страницу." msgid "Failed to get application configuration" @@ -1913,10 +1919,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9ad4e8d..b6ca095 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: 2014-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1071,6 +1071,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1304,7 +1310,7 @@ msgstr "客户机" msgid "Templates" msgstr "模板" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "无效的URL，已重定向到首页" msgid "Failed to get application configuration" @@ -1861,11 +1867,11 @@ msgstr "从远程URL获取" msgid "Enter the remote URL here." msgstr "在这里输入远程URL。" -msgid "Upload an file" +msgid "Upload a file" msgstr "上传一个文件" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "创建模板" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6709233..da3aa16 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-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1051,6 +1051,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1284,7 +1290,7 @@ msgstr "客體" msgid "Templates" msgstr "範本" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL 無效。已重新導向至首頁。" msgid "Failed to get application configuration" @@ -1847,10 +1853,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 1edbc19..10fa4f9 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -34,7 +34,7 @@ "Storage": "$_("Storage")", "Network": "$_("Network")", - "KCHAPI6001E": "$_("Invalid URL. Redireced to home page.")", + "KCHAPI6001E": "$_("Invalid URL. Redirected to home page.")", "KCHAPI6002E": "$_("Failed to get application configuration")", "KCHAPI6003E": "$_("This is not a valid Linux path")", "KCHAPI6004E": "$_("This is not a valid URL.")", diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/ui/pages/storagepool-add-volume.html.tmpl index c0d68f6..b5f365f 100644 --- a/ui/pages/storagepool-add-volume.html.tmpl +++ b/ui/pages/storagepool-add-volume.html.tmpl @@ -49,12 +49,12 @@ <h2> <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload" disabled/> <label for="volume-type-upload"> - $_("Upload an file") + $_("Upload a file") </label> </h2> <div class="field"> <p class="text-help"> - $_("Choose the ISO file (with .iso suffix) you want to upload.") + $_("Choose the file you want to upload.") </p> <div class="textbox-wrapper"> <input type="file" class="volume-input upload" id="volume-input-file" name="volumeLocalFile" disabled="disabled" /> -- 1.9.3

2 2

[PATCH V2] issue #491: Check model parameter exists when generating the interface XML
by Aline Manera 05 Dec '14

05 Dec '14

V1 -> V2: - Add test case Aline Manera (1): issue #491: Check model parameter exists when generating the interface XML src/kimchi/xmlutils/interface.py | 4 +++- tests/test_model.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) -- 1.9.3

2 3

[PATCH] issue #515: Add check_i18n.py to EXTRA_DIST
by lvroyce＠linux.vnet.ibm.com 05 Dec '14

05 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> make check-local errors for tarball because of lacking "check_i18n.py", adding it to EXTRA_DIST so that make check-local can work right. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- contrib/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index e36d4cd..393306f 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -17,6 +17,7 @@ SUBDIRS = DEBIAN EXTRA_DIST = \ + check_i18n.py \ kimchid.sysvinit \ kimchid.service.fedora \ kimchi.spec.fedora.in \ -- 1.8.3.2

2 2

[PATCH] issue#532: Fix ldap admin filtering
by lvroyce＠linux.vnet.ibm.com 05 Dec '14

05 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> LDAP admin ID is filtered because leading/trailing spaces. Fix this by truncating spaces. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index 330d98c..22c5c81 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -222,9 +222,11 @@ class LDAPUser(User): return self.user[USER_GROUPS] def get_roles(self): - admin_id = config.get("authentication", "ldap_admin_id").strip('"') - if self.user[USER_NAME] in admin_id.split(','): - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') + admin_ids = config.get( + "authentication", "ldap_admin_id").strip('"').split(',') + for admin_id in admin_ids: + if self.user[USER_NAME] == admin_id.strip(): + self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') return self.user[USER_ROLES] def get_user(self): -- 1.8.3.2

2 3

[PATCH] issue #475: Properly set cert and key variables when starting nginx proxy
by Aline Manera 05 Dec '14

05 Dec '14

When specifying a custom SSL certificate and key, Kimchi did not start up due the error: Traceback (most recent call last): File "/usr/bin/kimchid", line 95, in sys.exit(main(sys.argv[1:])) File "/usr/bin/kimchid", line 92, in main kimchi.server.main(options) File "/usr/lib/python2.6/site-packages/kimchi/server.py", line 183, in main srv = Server(options) File "/usr/lib/python2.6/site-packages/kimchi/server.py", line 62, in init start_proxy(options) File "/usr/lib/python2.6/site-packages/kimchi/proxy.py", line 89, in start_proxy _create_proxy_config(options) File "/usr/lib/python2.6/site-packages/kimchi/proxy.py", line 78, in _create_proxy_config cert_pem=cert, cert_key=key, UnboundLocalError: local variable 'cert' referenced before assignment Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/proxy.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kimchi/proxy.py b/src/kimchi/proxy.py index 9238147..fafa5bc 100644 --- a/src/kimchi/proxy.py +++ b/src/kimchi/proxy.py @@ -43,7 +43,6 @@ def _create_proxy_config(options): Arguments: options - OptionParser object with Kimchi config options """ - # User that will run the worker process of the proxy. Fedora, # RHEL and Suse creates an user called 'nginx' when installing # the proxy. Ubuntu creates an user 'www-data' for it. @@ -54,8 +53,11 @@ def _create_proxy_config(options): user_proxy = 'www-data' config_dir = paths.conf_dir + cert = options.ssl_cert + key = options.ssl_key + # No certificates specified by the user - if not options.ssl_cert or not options.ssl_key: + if not cert or not key: cert = '%s/kimchi-cert.pem' % config_dir key = '%s/kimchi-key.pem' % config_dir # create cert files if they don't exist -- 1.9.3

3 4

[PATCH] UI: Use capabilities cached values on 'Host PCI Device' tab
by Aline Manera 05 Dec '14

05 Dec '14

Kimchi capabilities are cached on UI to avoid multiples request to it as those values does not change with high frequency. So use the cached values to check host has kernel_vfio capability. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 132 ++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9d87a73..359add8 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -360,77 +360,75 @@ kimchi.guest_edit_main = function() { var setupPCIDevice = function(){ kimchi.getHostPCIDevices(function(hostPCIs){ kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){ - kimchi.getCapabilities(function(result) { - var pciEnabled = result.kernel_vfio; - for(var i=0; i<hostPCIs.length; i++){ - var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ - name: hostPCIs[i].name, - product: hostPCIs[i].product.description, - vendor: hostPCIs[i].vendor.description - })); - $(".body", "#form-guest-edit-pci").append(itemNode); - var iconClass = "ui-icon-plus"; - for(var j=0; j<vmPCIs.length; j++){ - if(hostPCIs[i].name==vmPCIs[j].name){ - iconClass = "ui-icon-minus"; - break; - } + var pciEnabled = kimchi.capabilities.kernel_vfio; + for(var i=0; i<hostPCIs.length; i++){ + var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ + name: hostPCIs[i].name, + product: hostPCIs[i].product.description, + vendor: hostPCIs[i].vendor.description + })); + $(".body", "#form-guest-edit-pci").append(itemNode); + var iconClass = "ui-icon-plus"; + for(var j=0; j<vmPCIs.length; j++){ + if(hostPCIs[i].name==vmPCIs[j].name){ + iconClass = "ui-icon-minus"; + break; } - pciEnabled || $("button", itemNode).remove(); - $("button", itemNode).button({ - icons: { primary: iconClass }, - text: false - }).click(function(){ - var obj = $(this); - if(obj.button("option", "icons").primary == "ui-icon-minus"){ - kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ - for(var k=0; k<hostPCIs.length; k++) { - $("button", "#" + hostPCIs[k].name).button("option", "icons", {primary: "ui-icon-plus"}); - } - for(var k=0; k<vmPCIs1.length; k++) { - $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); - } - }); - filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + } + pciEnabled || $("button", itemNode).remove(); + $("button", itemNode).button({ + icons: { primary: iconClass }, + text: false + }).click(function(){ + var obj = $(this); + if(obj.button("option", "icons").primary == "ui-icon-minus"){ + kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<hostPCIs.length; k++) { + $("button", "#" + hostPCIs[k].name).button("option", "icons", {primary: "ui-icon-plus"}); + } + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } }); - }else{ - kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ - for(var k=0; k<vmPCIs1.length; k++) { - $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); - } - }); - filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } else { + kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } + }); + kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { + var pciTitle = i18n["KCHVMED6007M"] + "\n"; + var haveCompanions = false; + for(var p=0; p<infoData.length; p++) { + if(infoData[p].device_type === "net") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6001M"] + " " + infoData[p].interface; + pciTitle += ", " + i18n["KCHVMED6002M"] + " " + infoData[p].address; + pciTitle += ", " + i18n["KCHVMED6003M"] + " " + infoData[p].link_type + "\n"; + } else if(infoData[p].device_type === "storage") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6004M"] + " " + infoData[p].block; + pciTitle += ", " + i18n["KCHVMED6005M"] + " " + infoData[p].drive_type; + pciTitle += ", " + i18n["KCHVMED6006M"] + " " + infoData[p].model + "\n"; } - }); - kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { - var pciTitle = i18n["KCHVMED6007M"] + "\n"; - var haveCompanions = false; - for(var p=0; p<infoData.length; p++) { - if(infoData[p].device_type === "net") { - haveCompanions = true; - pciTitle += " " + infoData[p].name + "\n"; - pciTitle += " " + i18n["KCHVMED6001M"] + " " + infoData[p].interface; - pciTitle += ", " + i18n["KCHVMED6002M"] + " " + infoData[p].address; - pciTitle += ", " + i18n["KCHVMED6003M"] + " " + infoData[p].link_type + "\n"; - } else if(infoData[p].device_type === "storage") { - haveCompanions = true; - pciTitle += " " + infoData[p].name + "\n"; - pciTitle += " " + i18n["KCHVMED6004M"] + " " + infoData[p].block; - pciTitle += ", " + i18n["KCHVMED6005M"] + " " + infoData[p].drive_type; - pciTitle += ", " + i18n["KCHVMED6006M"] + " " + infoData[p].model + "\n"; - } - } - for(var q=0; q<infoData.length; q++) { - haveCompanions && $(".name", "#" + infoData[q].parent).attr("title", pciTitle); - haveCompanions && $(".product", "#" + infoData[q].parent).attr("title", pciTitle); - haveCompanions && $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); - } - }); - } - }); + } + for(var q=0; q<infoData.length; q++) { + haveCompanions && $(".name", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".product", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); + } + }); + } }); }); var filterNodes = function(group, text){ -- 1.9.3

3 3

[PATCH] issue #491: Check model parameter exists when generating the interface XML
by Aline Manera 05 Dec '14

05 Dec '14

When interface model is not explicitly set on interface XML, libvirt automaticaly sets the default value. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/xmlutils/interface.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kimchi/xmlutils/interface.py b/src/kimchi/xmlutils/interface.py index c76131a..7b79584 100644 --- a/src/kimchi/xmlutils/interface.py +++ b/src/kimchi/xmlutils/interface.py @@ -32,7 +32,9 @@ def get_iface_xml(params, arch=None, os_distro=None, os_version=None): """ interface = E.interface(type=params['type']) interface.append(E.source(network=params['network'])) - interface.append(E.model(type=params['model'])) + + if 'model' in params.keys(): + interface.append(E.model(type=params['model'])) mac = params.get('mac', None) if mac is not None: -- 1.9.3

3 3

[PATCH] List as many pools' info as possible
by Christy Perez 04 Dec '14

04 Dec '14

If a pool happens to be busy at the time the pool.refresh() is called, then libvirt will throw an error: "internal error: pool 'default' has asynchronous jobs running." Currently, kimchi rasise an exception and no pools' storage volumes are listed. This patch returns a 0 for that particular pool, and allows the user to continue to request information for other pools. Without this patch, nothing is shown at all on the Storage tab if one pool is busy. In the future, we can check for VIR_ERR_RESOURCE_BUSY and come up with a plan that works with the UI to display "Busy" for a pool. But for now, this works around the issue. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/storagepools.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 20c9e5a..ba2cf3e 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -202,6 +202,11 @@ def _get_storagepool_vols_num(self, pool): else: return 0 except libvirt.libvirtError as e: + # If something (say a busy pool) prevents the refresh, + # throwing an Exception here would prevent all pools from + # displaying information -- so return None for busy + return 0 + except Exception as e: raise OperationFailed("KCHPOOL0008E", {'name': pool.name(), 'err': e.get_error_message()}) -- 1.9.3

2 2

[PATCH] issue #492: Expressly set autoport to yes in vm graphics.
by Aline Manera 04 Dec '14

04 Dec '14

From: Alan Jenkins <alan.james.jenkins(a)gmail.com> Signed-off-by: Alan Jenkins <alan.james.jenkins(a)gmail.com> Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/xmlutils/graphics.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/xmlutils/graphics.py b/src/kimchi/xmlutils/graphics.py index 4c69cd9..53cba09 100644 --- a/src/kimchi/xmlutils/graphics.py +++ b/src/kimchi/xmlutils/graphics.py @@ -32,7 +32,8 @@ def get_graphics_xml(params): <target type='virtio' name='com.redhat.spice.0'/> </channel> """ - graphics = E.graphics(type=params['type'], listen=params['listen']) + graphics = E.graphics(type=params['type'], autoport='yes', + listen=params['listen']) graphics_xml = ET.tostring(graphics, encoding='utf-8', pretty_print=True) if params['type'] == 'vnc': -- 1.9.3

2 2

[PATCH] Bugfix: fix testcase for repository update
by lvroyce＠linux.vnet.ibm.com 04 Dec '14

04 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Context manager delete the created repository as cleanup, But repository is update afterwards, the newly created one does not exist any more. So update repository again to the original one so that context manager can delete it successfully. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- tests/test_model.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 1355295..c42c8de 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1655,16 +1655,17 @@ class ModelTests(unittest.TestCase): self.assertEquals(system_host_repos + 1, len(host_repos)) # update repositories with invalid data - for repo in invalid_repos: + for tmp_repo in invalid_repos: self.assertRaises(InvalidParameter, inst.repository_update, - repo_id, repo) + repo_id, tmp_repo) new_repo_id = inst.repository_update(repo_id, new_repo) repo_info = inst.repository_lookup(new_repo_id) - self.assertEquals(new_repo_id, repo_info['repo_id']) - self.assertEquals(new_repo['baseurl'], repo_info['baseurl']) - self.assertEquals(True, repo_info['enabled']) + self.assertEquals(new_repo_id, repo_info['repo_id']) + self.assertEquals(new_repo['baseurl'], repo_info['baseurl']) + self.assertEquals(True, repo_info['enabled']) + inst.repository_update(new_repo_id, repo) def test_repository_disable_enable(self): inst = model.Model('test:///default', -- 1.8.3.2

2 1

[PATCH] Bugfix: Disable actions not supported by non-persistent VMs
by Wen Wang 04 Dec '14

04 Dec '14

1) Disable "Reset" and "Delete" buttons when using non-persistent VMs 2) Disable "Reset" button when VM is shutdown Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 11 +++++++++++ ui/js/src/kimchi.guest_main.js | 7 +++++-- ui/pages/guest.html.tmpl | 10 +++++----- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index ded18eb..52cccc4 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -228,6 +228,17 @@ padding: 7px 10px; } +.guest-actions .top button { + display: inline-block; + width: 42px; + height: 42px; +} + +.guest-actions .top button span { + margin-left: -3px; + margin-top: -1px; +} + .guest-actions .bottom { padding: 0 10px; } diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2fd5c55..21caf1b 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -252,6 +252,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM list entry var vmRunningBool=(vmObject.state=="running"); + var vmPersistent = (vmObject.persistent == true); result.attr('id',vmObject.name); result.data(vmObject); @@ -302,8 +303,10 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); - guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); - guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); + guestActions.find(".shutoff-disabled").prop("disabled", !vmRunningBool); + guestActions.find(".running-disabled").prop("disabled", vmRunningBool); + guestActions.find(".non-persistent-disabled").prop("disabled", !vmPersistent); + guestActions.find(".reset-disabled").prop("disabled", !vmRunningBool || !vmPersistent); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index ebb5e86..3cc2fad 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -50,9 +50,9 @@ </div> <div class="sortable guest-actions" name="guest-actions"> <div class="top"> - <a class="btn shutoff-disabled" name="vm-reset" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></a> - <a class="btn running-hidden" name="vm-start" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></a> - <a class="btn shutoff-hidden" name="vm-poweroff" href="javascript:void(0);" title="$_("Power Off")"><span class="icon power-up"></span></a> + <button class="btn reset-disabled" name="vm-reset" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></button> + <button class="btn running-hidden" name="vm-start" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></button> + <button class="btn shutoff-hidden" name="vm-poweroff" href="javascript:void(0);" title="$_("Power Off")"><span class="icon power-up"></span></button> </div> <div class="bottom"> <div name="actionmenu" class="btn dropdown popable vm-action" style="width: 70px"> @@ -61,11 +61,11 @@ <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> - <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> + <button class="button-big shutoff-hidden non-persistent-disabled" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> <button class="button-big shutoff-hidden" name="vm-poweroff"><span class="text">$_("Power Off")</span></button> - <a class="button-big red " name="vm-delete">$_("Delete")</a> + <button class="button-big red non-persistent-disabled" name="vm-delete">$_("Delete")</button> </div> </div> </div> -- 1.9.3

2 1

[PATCH] Change pattern match in pep8 filtering
by lvroyce＠linux.vnet.ibm.com 04 Dec '14

04 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Files like "./src/kimchi/i18n.py" will be warned with error by pep8 because pep8 uses wildcard searching instead of interpreting path of file. So change pattern to fix this problem. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ec88787..62b10fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST = \ $(NULL) -PEP8_BLACKLIST = src/kimchi/config.py,src/kimchi/i18n.py,tests/test_config.py +PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" -- 1.8.3.2

4 3

[PATCH 0/2] More snapshot bugfixes
by Crístian Viana 04 Dec '14

04 Dec '14

Crístian Viana (2): Only allow VM snapshots to be taken on 'qcow2' disks Revert "snapshot: Clone snapshots when cloning a VM" src/kimchi/i18n.py | 1 + src/kimchi/model/vms.py | 29 +---------------------------- src/kimchi/model/vmsnapshots.py | 17 +++++++++++++++-- tests/test_model.py | 11 ----------- tests/test_rest.py | 19 ++----------------- 5 files changed, 19 insertions(+), 58 deletions(-) -- 1.9.3

2 3

[PATCH V2] Add sos (sosreport) plugin for kimchi
by Rodrigo Trujillo 03 Dec '14

03 Dec '14

This patches adds a sos plugin to collect kimchi's configuration, log files and other information for diagnosis. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- Makefile.am | 3 +++ contrib/kimchi.spec.fedora.in | 3 +++ src/Makefile.am | 1 + src/sos.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 src/sos.py diff --git a/Makefile.am b/Makefile.am index ec88787..53b6b40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,10 +70,13 @@ install-deb: install cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/ $(MKDIR_P) $(DESTDIR)/etc/init $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services + $(MKDIR_P) $(DESTDIR)/usr/share/sosreport/sos/plugins cp -R $(top_srcdir)/contrib/kimchid-upstart.conf.debian \ $(DESTDIR)/etc/init/kimchid.conf cp -R $(top_srcdir)/src/firewalld.xml \ $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml + cp -R $(top_srcdir)/src/sos.py \ + $(DESTDIR)/usr/share/sosreport/sos/plugins/kimchi.py deb: contrib/make-deb.sh diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 236c862..4d23ad0 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -80,6 +80,8 @@ make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +install -Dm 0644 src/sos.py \ + %{buildroot}/%{python_sitelib}/sos/plugins/kimchi.py %if 0%{?with_systemd} # Install the systemd scripts @@ -161,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/xmlutils/*.py* %{python_sitelib}/kimchi/API.json %{python_sitelib}/kimchi/plugins/*.py* +%{python_sitelib}/sos/plugins/kimchi.py* %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md %{_datadir}/kimchi/doc/README-federation.md diff --git a/src/Makefile.am b/src/Makefile.am index dfeb24e..46ca1ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = kimchid.in \ kimchi.conf.in \ nginx.conf.in \ firewalld.xml \ + sos.py \ $(NULL) bin_SCRIPTS = kimchid diff --git a/src/sos.py b/src/sos.py new file mode 100644 index 0000000..5d1fa3f --- /dev/null +++ b/src/sos.py @@ -0,0 +1,43 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.utilities import sos_get_command_output + + +class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + """ + kimchi-related information + """ + + plugin_name = 'kimchi' + + def setup(self): + self.add_copy_specs([ + "/etc/kimchi/", + "/var/log/kimchi*" + ]) + self.add_cmd_output("virsh pool-list --details") + rc, out, _ = sos_get_command_output('virsh pool-list') + if rc == 0: + for pool in out.splitlines()[2:]: + if pool: + pool_name = pool.split()[0] + self.add_cmd_output("virsh vol-list --pool %s --details" + % pool_name) -- 1.9.3

2 2

Bug list for 1.4 release
by Aline Manera 03 Dec '14

03 Dec '14

Hi all, I've just tagged the bugs for 1.4 release: https://github.com/kimchi-project/kimchi/milestones/1.4%20GA Feel free to get any unassigned bug to start working on. Regards, Aline Manera

1 0

[PATCH] Update ChangeLog, VERSION and po files
by Aline Manera 02 Dec '14

02 Dec '14

Those changes were made by running "make dist" Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ChangeLog | 1 + VERSION | 2 +- plugins/sample/po/en_US.po | 2 +- plugins/sample/po/pt_BR.po | 2 +- plugins/sample/po/sample.pot | 2 +- plugins/sample/po/zh_CN.po | 2 +- po/de_DE.po | 187 ++++++++++++++++++++++++++++----- po/en_US.po | 179 +++++++++++++++++++++++++++---- po/es_ES.po | 187 ++++++++++++++++++++++++++++----- po/fr_FR.po | 245 ++++++++++++++++++++++++++++++++++--------- po/it_IT.po | 187 ++++++++++++++++++++++++++++----- po/ja_JP.po | 187 ++++++++++++++++++++++++++++----- po/kimchi.pot | 179 +++++++++++++++++++++++++++---- po/ko_KR.po | 187 ++++++++++++++++++++++++++++----- po/pt_BR.po | 188 ++++++++++++++++++++++++++++----- po/ru_RU.po | 185 +++++++++++++++++++++++++++----- po/zh_CN.po | 186 +++++++++++++++++++++++++++----- po/zh_TW.po | 185 +++++++++++++++++++++++++++----- 18 files changed, 1944 insertions(+), 349 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f33456..f39314a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ CHANGELOG ========= #### [1.4.0-rc1] #### + * [61f6ba3] Update ChangeLog for 1.4.0-rc1 (Aline Manera) * [b76db0e] Change guest edit permission logic (Royce Lv) * [f9e2d28] UI: support ldap vm permission tag (Royce Lv) * [fa07b67] vmtemplate: allow allocation = 0 for type 'raw' (Daniel Henrique Barboza) diff --git a/VERSION b/VERSION index e563f37..3280933 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.1.1 +1.4.0-rc1 diff --git a/plugins/sample/po/en_US.po b/plugins/sample/po/en_US.po index d88b525..979925d 100644 --- a/plugins/sample/po/en_US.po +++ b/plugins/sample/po/en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\n" "PO-Revision-Date: 2014-05-17 02:08+0800\n" "Last-Translator: shhfeng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" diff --git a/plugins/sample/po/pt_BR.po b/plugins/sample/po/pt_BR.po index db6976e..c9b0ab0 100644 --- a/plugins/sample/po/pt_BR.po +++ b/plugins/sample/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\n" "PO-Revision-Date: 2014-05-17 02:09+0800\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n" diff --git a/plugins/sample/po/sample.pot b/plugins/sample/po/sample.pot index ea8cc60..ad67fbb 100644 --- a/plugins/sample/po/sample.pot +++ b/plugins/sample/po/sample.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" diff --git a/plugins/sample/po/zh_CN.po b/plugins/sample/po/zh_CN.po index df9c3ae..0f8f9b1 100644 --- a/plugins/sample/po/zh_CN.po +++ b/plugins/sample/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\n" "PO-Revision-Date: 2014-05-17 02:10+0800\n" "Last-Translator: shhfeng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: Chinese (simplified)\n" diff --git a/po/de_DE.po b/po/de_DE.po index 201e6b9..52831eb 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -58,6 +58,10 @@ msgstr "" "Task kann aufgrund des folgenden Fehlers nicht gestartet werden: %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "Authentifizierung für Benutzer '%(username)s' fehlgeschlagen. [Fehlercode: " @@ -70,6 +74,14 @@ msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen" msgid "Specify %(item)s to login into Kimchi" msgstr "Geben Sie %(item)s an, um sich bei Kimchi anzumelden" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -293,6 +305,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -355,10 +379,6 @@ msgid "Template %(name)s already exists" msgstr "Vorlage %(name)s ist bereits vorhanden" #, python-format -msgid "Template %(name)s does not exist" -msgstr "Vorlage %(name)s ist nicht vorhanden" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "" @@ -455,6 +475,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Speicherpool %(name)s ist bereits vorhanden" @@ -645,14 +670,6 @@ msgstr "Geben Sie %(item)s an, um Speicherdatenträger %(volume)s zu erstellen" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" -"Speicherdatenträger %(volume)s konnte nicht abgerufen werden, weil " -"Speicherpool %(pool)s nicht aktiv ist" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" "Speicherdatenträger konnten nicht aufgelistet werden, weil Speicherpool " @@ -701,8 +718,10 @@ msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" msgid "Storage volume allocation must be an integer number" msgstr "Zuordnung des Speicherdatenträgers muss eine Ganzzahl sein" -msgid "Storage volume format not supported" -msgstr "Format des Speicherdatenträgers wird nicht unterstützt" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "Speicherdatenträger erfordert einen Datenträgernamen" @@ -733,6 +752,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "Schnittstelle %(name)s ist nicht vorhanden" @@ -1102,6 +1127,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "FEHLERCODE" @@ -1154,6 +1231,9 @@ msgstr "Speicher" msgid "Create" msgstr "Erstellen" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "Gast bearbeiten" @@ -1172,6 +1252,9 @@ msgstr "Version" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "Name" @@ -1202,6 +1285,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "Alle" @@ -1220,6 +1306,9 @@ msgstr "" msgid "Vendor" msgstr "Anbieter" +msgid "Created" +msgstr "" + msgid "Save" msgstr "Speichern" @@ -1232,6 +1321,12 @@ msgstr "Abhängen" msgid "Cancel" msgstr "Abbrechen" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "Starten" @@ -1247,6 +1342,9 @@ msgstr "Aktionen" msgid "Connect" msgstr "Verbinden" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "Bearbeiten" @@ -1343,9 +1441,6 @@ msgstr "Bestätigen" msgid "Warning" msgstr "Warnung" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "Wird geladen..." @@ -1549,6 +1644,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1575,6 +1676,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "Die VLAN-ID muss zwischen 1 und 4094 liegen." @@ -1935,11 +2057,8 @@ msgstr "Ich möchte einen benutzerdefinierten URL verwenden" msgid "Edit Template" msgstr "Vorlage bearbeiten" -msgid "CPU Number" -msgstr "CPU-Anzahl" - -msgid "Disk (GB)" -msgstr "Festplatte (GB)" +msgid "Processor" +msgstr "Prozessor" msgid "CDROM" msgstr "CD-ROM" @@ -1950,6 +2069,21 @@ msgstr "" msgid "Graphics" msgstr "Grafik" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "CPU-Anzahl" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -1980,8 +2114,8 @@ msgstr "BS-Distro" msgid "OS Code Name" msgstr "BS-Codename" -msgid "Processor" -msgstr "Prozessor" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "Systemstatistik" @@ -2067,6 +2201,3 @@ msgstr "Zuordnung:" msgid "No templates found." msgstr "Keine Vorlagen gefunden." - -msgid "Clone" -msgstr "" diff --git a/po/en_US.po b/po/en_US.po index e2ed60d..37efd19 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -58,6 +58,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" @@ -68,6 +72,14 @@ msgstr "" msgid "Specify %(item)s to login into Kimchi" msgstr "" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -268,6 +280,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -319,10 +343,6 @@ msgid "Template %(name)s already exists" msgstr "" #, python-format -msgid "Template %(name)s does not exist" -msgstr "" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "" @@ -410,6 +430,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" @@ -574,12 +599,6 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" @@ -616,7 +635,9 @@ msgstr "" msgid "Storage volume allocation must be an integer number" msgstr "" -msgid "Storage volume format not supported" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" msgid "Storage volume requires a volume name" @@ -646,6 +667,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" @@ -978,6 +1005,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -1028,6 +1107,9 @@ msgstr "" msgid "Create" msgstr "" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "" @@ -1046,6 +1128,9 @@ msgstr "" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "" @@ -1076,6 +1161,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "" @@ -1094,6 +1182,9 @@ msgstr "" msgid "Vendor" msgstr "" +msgid "Created" +msgstr "" + msgid "Save" msgstr "" @@ -1106,6 +1197,12 @@ msgstr "" msgid "Cancel" msgstr "" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "" @@ -1121,6 +1218,9 @@ msgstr "" msgid "Connect" msgstr "" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "" @@ -1213,9 +1313,6 @@ msgstr "" msgid "Warning" msgstr "" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "" @@ -1406,6 +1503,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1430,6 +1533,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "" @@ -1766,10 +1890,7 @@ msgstr "" msgid "Edit Template" msgstr "" -msgid "CPU Number" -msgstr "" - -msgid "Disk (GB)" +msgid "Processor" msgstr "" msgid "CDROM" @@ -1781,6 +1902,21 @@ msgstr "" msgid "Graphics" msgstr "" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "" @@ -1811,7 +1947,7 @@ msgstr "" msgid "OS Code Name" msgstr "" -msgid "Processor" +msgid "CPU(s)" msgstr "" msgid "System Statistics" @@ -1897,6 +2033,3 @@ msgstr "" msgid "No templates found." msgstr "" - -msgid "Clone" -msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 50de616..1999dd2 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -57,6 +57,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "No se puede iniciar la tarea debido a un error: %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "La autenticación ha fallado para el usuario '%(username)s'. [Código de " @@ -69,6 +73,14 @@ msgstr "No tiene autorización para acceder a Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Especifique %(item)s para iniciar la sesión en Kimchi" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -293,6 +305,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -353,10 +377,6 @@ msgid "Template %(name)s already exists" msgstr "La plantilla %(name)s ya existe" #, python-format -msgid "Template %(name)s does not exist" -msgstr "La plantilla %(name)s no existe" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "" @@ -452,6 +472,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "La agrupación de almacenamiento %(name)s ya existe" @@ -657,14 +682,6 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" -"No se puede recuperar el volumen de almacenamiento %(volume)s porque la " -"agrupación de almacenamiento %(pool)s no está activa" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" "No se pueden listar los volúmenes de almacenamiento porque la agrupación de " @@ -713,8 +730,10 @@ msgstr "El nombre de volumen de almacenamiento debe ser una serie" msgid "Storage volume allocation must be an integer number" msgstr "La asignación de volumen de almacenamiento debe ser un número entero" -msgid "Storage volume format not supported" -msgstr "Formato de volumen de almacenamiento no soportado" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "El volumen de almacenamiento requiere un nombre de volumen" @@ -745,6 +764,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "La interfaz %(name)s no existe" @@ -1120,6 +1145,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERROR" @@ -1172,6 +1249,9 @@ msgstr "Memoria" msgid "Create" msgstr "Crear" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "Editar invitado" @@ -1190,6 +1270,9 @@ msgstr "Versión" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "Nombre" @@ -1220,6 +1303,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "Todo" @@ -1238,6 +1324,9 @@ msgstr "" msgid "Vendor" msgstr "Proveedor" +msgid "Created" +msgstr "" + msgid "Save" msgstr "Guardar" @@ -1250,6 +1339,12 @@ msgstr "Desconectar" msgid "Cancel" msgstr "Cancelar" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "Iniciar" @@ -1265,6 +1360,9 @@ msgstr "Acciones" msgid "Connect" msgstr "Conectar" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "Editar" @@ -1362,9 +1460,6 @@ msgstr "Confirmar" msgid "Warning" msgstr "Aviso" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "Cargando..." @@ -1566,6 +1661,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1592,6 +1693,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "El ID de VLAN debe estar entre 1 y 4094." @@ -1952,11 +2074,8 @@ msgstr "Deseo utilizar un URL personalizado" msgid "Edit Template" msgstr "Editar plantilla" -msgid "CPU Number" -msgstr "Número de CPU" - -msgid "Disk (GB)" -msgstr "Disco (GB)" +msgid "Processor" +msgstr "Procesador" msgid "CDROM" msgstr "CDROM" @@ -1967,6 +2086,21 @@ msgstr "" msgid "Graphics" msgstr "Gráficos" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "Número de CPU" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -1997,8 +2131,8 @@ msgstr "Distro de SO" msgid "OS Code Name" msgstr "Nombre de código de SO" -msgid "Processor" -msgstr "Procesador" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "Estadísticas del sistema" @@ -2086,6 +2220,3 @@ msgstr "Asignado:" msgid "No templates found." msgstr "No se han encontrado plantillas." - -msgid "Clone" -msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index 6ee4f45..3e19c91 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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/" @@ -62,6 +62,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "Impossible de démarrer la tâche à cause de l'erreur: %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "L'authentification a échoué pour l'utilisateur '%(username)s'. [Code " @@ -74,6 +78,14 @@ msgstr "Vous n'êtes pas autorisé à accéder à Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Spécifiez %(item)s pour vous logguer dans Kimchi" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "\"_cap\" spécifiée inconnue" @@ -161,7 +173,9 @@ msgstr "" "%(err)s" msgid "An error occurred when probing image OS information." -msgstr "Une erreur est survenue lors de la détection de l'information d'OS de l'image." +msgstr "" +"Une erreur est survenue lors de la détection de l'information d'OS de " +"l'image." msgid "No OS information found in given image." msgstr "Aucune information d'OS trouvée sur l'image donnée." @@ -175,8 +189,8 @@ msgid "" "Image file must be an existing file on system. %(filename)s is not a valid " "input." msgstr "" -"Le fichier image doit être un fichier existant sur le système. %(filename)s n'est " -"pas une donnée valide." +"Le fichier image doit être un fichier existant sur le système. %(filename)s " +"n'est pas une donnée valide." #, python-format msgid "Virtual machine %(name)s already exists" @@ -191,8 +205,8 @@ msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s is already " "in use or the virtual machine is not powered off." msgstr "" -"Impossible de renommer la machine virtuelle %(name)s. Le nom %(new_name)s est " -"déja utilisé ou la machine virtuelle n'est pas éteinte." +"Impossible de renommer la machine virtuelle %(name)s. Le nom %(new_name)s " +"est déja utilisé ou la machine virtuelle n'est pas éteinte." #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" @@ -303,6 +317,18 @@ msgid "The life time for the guest console password must be a number." msgstr "La durée de vie du mot de passe de console invitée doit être un nombre" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -312,8 +338,8 @@ msgstr "" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." msgstr "" -"The périphérique hôte %(dev_name)s ne peut être directement assigné à " -"la machine virtuelle" +"The périphérique hôte %(dev_name)s ne peut être directement assigné à la " +"machine virtuelle" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -369,10 +395,6 @@ msgid "Template %(name)s already exists" msgstr "Le modèle %(name)s existe déjà" #, python-format -msgid "Template %(name)s does not exist" -msgstr "Le modèle %(name)s n'existe pas" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "" @@ -466,8 +488,14 @@ msgstr "" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "Dans la topologie de CPU, chaque élément doit être un entier " -"strictement positif." +msgstr "" +"Dans la topologie de CPU, chaque élément doit être un entier strictement " +"positif." + +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" #, python-format msgid "Storage pool %(name)s already exists" @@ -543,8 +571,8 @@ msgid "" "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-" "iso" msgstr "" -"Les types de pool de stockage supportés sont: dir, netfs, logical, " -"iscsi, isci et kimchi-iso" +"Les types de pool de stockage supportés sont: dir, netfs, logical, iscsi, " +"isci et kimchi-iso" msgid "Storage pool path must be a string" msgstr "Le chemin du pool de stockage doit être une chaîne de caractères" @@ -567,7 +595,8 @@ msgstr "" "et 65535" msgid "iSCSI target username must be a string" -msgstr "Le nom d'utilisateur de la cible iSCSI doit être une chaîne de caractères" +msgstr "" +"Le nom d'utilisateur de la cible iSCSI doit être une chaîne de caractères" msgid "iSCSI target password must be a string" msgstr "Le mot de passe de la cible iSCSI doit être une chaîne de caractères" @@ -655,8 +684,8 @@ msgid "" "Unable to create storage volume %(volume)s because storage pool %(pool)s is " "not active" msgstr "" -"Impossible de créer le volume de stockage %(volume)s car le pool de " -"stockage %(pool)s n'est pas actif" +"Impossible de créer le volume de stockage %(volume)s car le pool de stockage " +"%(pool)s n'est pas actif" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" @@ -664,14 +693,6 @@ msgstr "Spécifier %(item)s afin de créer le volume de stockage %(volume)s" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" -"Impossible de récupérer le volume de stockage %(volume)s car le pool de " -"stockage %(pool)s n'est pas actif" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" "Impossible de lister les volumes de stockage car le pool de stockage " @@ -718,8 +739,10 @@ msgstr "Le nom de volume de stockage doit être une chaîne de caractères" msgid "Storage volume allocation must be an integer number" msgstr "L'allocation de volume de stockage doit être une nombre entier" -msgid "Storage volume format not supported" -msgstr "Le format du volume de stockage n'est pas supporté" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "Le volume de stockage requiert un nom de volume" @@ -743,13 +766,20 @@ msgid "Storage volume capacity must be an integer number." msgstr "La capacité du volume de stockage doit être un nombre entier." msgid "Storage volume URL must be http://, https://, ftp:// or ftps://." -msgstr "L'URL du volume de stockage doit être http://, https://, ftp:// ou ftps://." +msgstr "" +"L'URL du volume de stockage doit être http://, https://, ftp:// ou ftps://." #, python-format msgid "Unable to access file %(url)s. Please, check it." msgstr "Impossible d'accéder au fichier %(url)s. Veuillez le vérifier." #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "L'interface %(name)s n'existe pas" @@ -961,8 +991,8 @@ msgid "" "The storage device %(dev_name)s does not exist in the virtual machine " "%(vm_name)s" msgstr "" -"Le périphérique de stockage %(dev_name)s n'existe pas dans la machine virtuelle " -"%(vm_name)s" +"Le périphérique de stockage %(dev_name)s n'existe pas dans la machine " +"virtuelle %(vm_name)s" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -1015,8 +1045,8 @@ msgid "" "Volume chosen with format %(format)s does not fit in the storage type " "%(type)s" msgstr "" -"Le volume de format %(format)s sélectionné ne correspond pas " -"au type de stockage %(type)s" +"Le volume de format %(format)s sélectionné ne correspond pas au type de " +"stockage %(type)s" msgid "YUM Repository ID must be one word only string." msgstr "" @@ -1126,7 +1156,61 @@ msgstr "Impossible de supprimer un dépôt. Détails: '%(err)s'" #, python-format msgid "" "Configuration items: '%(items)s' are not supported by repository manager" -msgstr "Éléments de configurations: %(items)s ne sont pas supportés par le gestionnaire de dépôt" +msgstr "" +"Éléments de configurations: %(items)s ne sont pas supportés par le " +"gestionnaire de dépôt" + +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" msgid "ERROR CODE" msgstr "ERROR CODE" @@ -1180,6 +1264,9 @@ msgstr "Mémoire" msgid "Create" msgstr "Créer" +msgid "Creating..." +msgstr "Création en cours..." + msgid "Edit Guest" msgstr "Éditer l'Invité" @@ -1198,6 +1285,9 @@ msgstr "Permission" msgid "Host PCI Device" msgstr "Périphérique PCI Hôte" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "Nom" @@ -1228,6 +1318,9 @@ msgstr "Utilisateurs et groupes systèmes disponibles" msgid "Selected system users and groups" msgstr "Utilisateurs et groupes systèmes sélectionnés" +msgid "User" +msgstr "" + msgid "All" msgstr "Tous" @@ -1246,6 +1339,9 @@ msgstr "Produit" msgid "Vendor" msgstr "Vendeur" +msgid "Created" +msgstr "" + msgid "Save" msgstr "Enregistrer" @@ -1258,6 +1354,12 @@ msgstr "Détacher" msgid "Cancel" msgstr "Annuler" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "Démarrer" @@ -1273,6 +1375,9 @@ msgstr "Actions" msgid "Connect" msgstr "Connecter" +msgid "Clone" +msgstr "Cloner" + msgid "Edit" msgstr "Éditer" @@ -1371,14 +1476,12 @@ msgstr "Confirmer" msgid "Warning" msgstr "Avertissement" -msgid "Creating..." -msgstr "Création en cours..." - msgid "Loading..." msgstr "Chargement en cours..." msgid "An error occurred while checking for packages update." -msgstr "Une erreur est survenue lors de la vérification des mises-à-jour de paquets." +msgstr "" +"Une erreur est survenue lors de la vérification des mises-à-jour de paquets." msgid "Retry" msgstr "Essayer à nouveau" @@ -1582,6 +1685,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1607,8 +1716,29 @@ msgid "" "This disk will be detached permanently and you can re-attach it. Continue to " "detach it?" msgstr "" -"Ce disque sera définitivement détaché et peut être ré-attaché. Continuer " -"à le détacher ?" +"Ce disque sera définitivement détaché et peut être ré-attaché. Continuer à " +"le détacher ?" + +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" msgid "The VLAN id must be between 1 and 4094." msgstr "L'id du VLAN doit être entre 1 et 4094." @@ -1714,7 +1844,9 @@ msgid "Failed!" msgstr "Échec!" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." -msgstr "Le chemin de CDROM doit être un chemin local/distant valide et ne peut être virge." +msgstr "" +"Le chemin de CDROM doit être un chemin local/distant valide et ne peut être " +"virge." msgid "Disk pool or volume cannot be blank." msgstr "Le pool de disque ou le volume ne peut être vierge." @@ -1969,11 +2101,8 @@ msgstr "Je veux utiliser une URL personnalisée" msgid "Edit Template" msgstr "Éditer un Modèle" -msgid "CPU Number" -msgstr "Nombre de CPU" - -msgid "Disk (GB)" -msgstr "Disque (Go)" +msgid "Processor" +msgstr "Processeur" msgid "CDROM" msgstr "CDROM" @@ -1984,6 +2113,21 @@ msgstr "Fichier Image" msgid "Graphics" msgstr "Graphiques" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "Nombre de CPU" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -2014,8 +2158,8 @@ msgstr "Distro de l'OS" msgid "OS Code Name" msgstr "Nom de code de l'OS" -msgid "Processor" -msgstr "Processeur" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "Statistiques Système" @@ -2101,6 +2245,3 @@ msgstr "Allocation" msgid "No templates found." msgstr "Aucun modèle trouvé." - -msgid "Clone" -msgstr "Cloner" diff --git a/po/it_IT.po b/po/it_IT.po index 471ea2d..2b7d69b 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -57,6 +57,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "Impossibile avviare l'attività a causa dell'errore: %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "Autenticazione non riuscita per l'utente '%(username)s'. [Codice di errore: " @@ -69,6 +73,14 @@ msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Specificare %(item)s per accedere a Kimchi" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -287,6 +299,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -347,10 +371,6 @@ msgid "Template %(name)s already exists" msgstr "Modello %(name)s già esistente" #, python-format -msgid "Template %(name)s does not exist" -msgstr "Il modello %(name)s non esiste" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "" @@ -445,6 +465,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Pool di memoria %(name)s già esistente" @@ -630,14 +655,6 @@ msgstr "Specificare %(item)s per poter creare il volume di memoria %(volume)s" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" -"Impossibile richiamare il volume di memoria %(volume)s poiché il pool di " -"memoria %(pool)s non è attivo" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" "Impossibile elencare i volumi di memoria poiché il pool di memoria %(pool)s " @@ -683,8 +700,10 @@ msgstr "Il nome del volume di memoria deve essere una stringa" msgid "Storage volume allocation must be an integer number" msgstr "L'assegnazione del volume di memoria deve essere un numero intero" -msgid "Storage volume format not supported" -msgstr "Formato del volume di memoria non supportato" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "Il volume di memoria richiede un nome volume" @@ -715,6 +734,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "L'interfaccia %(name)s non esiste" @@ -1089,6 +1114,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "CODICE DI ERRORE" @@ -1141,6 +1218,9 @@ msgstr "Memoria" msgid "Create" msgstr "Crea" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "Modifica guest" @@ -1159,6 +1239,9 @@ msgstr "Versione" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "Nome" @@ -1189,6 +1272,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "Tutti" @@ -1207,6 +1293,9 @@ msgstr "" msgid "Vendor" msgstr "Fornitore" +msgid "Created" +msgstr "" + msgid "Save" msgstr "Salva" @@ -1219,6 +1308,12 @@ msgstr "Scollega" msgid "Cancel" msgstr "Annulla" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "Avvia" @@ -1234,6 +1329,9 @@ msgstr "Azioni" msgid "Connect" msgstr "Connetti" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "Modifica" @@ -1331,9 +1429,6 @@ msgstr "Conferma" msgid "Warning" msgstr "Avvertenza" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "Caricamento in corso..." @@ -1535,6 +1630,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1561,6 +1662,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "L'ID VLAN deve essere compreso tra 1 e 4094." @@ -1922,11 +2044,8 @@ msgstr "Utilizzare un URL personalizzato" msgid "Edit Template" msgstr "Modifica modello" -msgid "CPU Number" -msgstr "Numero CPU" - -msgid "Disk (GB)" -msgstr "Disco (GB)" +msgid "Processor" +msgstr "Processore" msgid "CDROM" msgstr "CDROM" @@ -1937,6 +2056,21 @@ msgstr "" msgid "Graphics" msgstr "Grafici" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "Numero CPU" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -1967,8 +2101,8 @@ msgstr "Distro SO" msgid "OS Code Name" msgstr "Nome codice SO" -msgid "Processor" -msgstr "Processore" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "Statistiche di sistema" @@ -2054,6 +2188,3 @@ msgstr "Allocazione:" msgid "No templates found." msgstr "Nessun modello trovato." - -msgid "Clone" -msgstr "" diff --git a/po/ja_JP.po b/po/ja_JP.po index 26ceb34..782992b 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -57,6 +57,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "次のエラーのため、タスクを開始できません: %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "ユーザー「%(username)s」の認証に失敗しました。[エラー・コード: %(code)s]" @@ -68,6 +72,14 @@ msgstr "Kimchi へのアクセスを許可されていません" msgid "Specify %(item)s to login into Kimchi" msgstr "Kimchi にログインするには、%(item)s を指定します" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -284,6 +296,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -345,10 +369,6 @@ msgid "Template %(name)s already exists" msgstr "テンプレート %(name)s は既に存在します" #, python-format -msgid "Template %(name)s does not exist" -msgstr "テンプレート %(name)s は存在しません" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "" @@ -452,6 +472,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "ストレージ・プール %(name)s は既に存在します" @@ -645,14 +670,6 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" -"ストレージ・プール %(pool)s が非アクティブであるため、ストレージ・ボリューム " -"%(volume)s を取得できません。" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" "ストレージ・プール %(pool)s がアクティブではないため、ストレージ・ボリューム" @@ -697,8 +714,10 @@ msgstr "ストレージ・ボリューム名はストリングでなければな msgid "Storage volume allocation must be an integer number" msgstr "ストレージ・ボリューム割り振りは整数でなければなりません" -msgid "Storage volume format not supported" -msgstr "ストレージ・ボリューム・フォーマットはサポートされていません" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "ストレージ・ボリュームにはボリューム名が必要です" @@ -729,6 +748,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "インターフェース %(name)s は存在しません" @@ -1101,6 +1126,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "エラー・コード" @@ -1153,6 +1230,9 @@ msgstr "メモリー" msgid "Create" msgstr "作成" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "ゲストの編集" @@ -1171,6 +1251,9 @@ msgstr "バージョン" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "名前" @@ -1201,6 +1284,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "すべて" @@ -1219,6 +1305,9 @@ msgstr "" msgid "Vendor" msgstr "ベンダー" +msgid "Created" +msgstr "" + msgid "Save" msgstr "保存" @@ -1231,6 +1320,12 @@ msgstr "切り離し" msgid "Cancel" msgstr "取消" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "開始" @@ -1246,6 +1341,9 @@ msgstr "アクション" msgid "Connect" msgstr "接続" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "編集" @@ -1340,9 +1438,6 @@ msgstr "確認" msgid "Warning" msgstr "警告" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "ロードしています..." @@ -1540,6 +1635,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1565,6 +1666,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN ID は、1 から 4094 まででなければなりません。" @@ -1921,11 +2043,8 @@ msgstr "カスタム URL を使用する" msgid "Edit Template" msgstr "テンプレートの編集" -msgid "CPU Number" -msgstr "CPU 数" - -msgid "Disk (GB)" -msgstr "ディスク (GB)" +msgid "Processor" +msgstr "プロセッサー" msgid "CDROM" msgstr "CDROM" @@ -1936,6 +2055,21 @@ msgstr "" msgid "Graphics" msgstr "グラフィックス" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "CPU 数" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -1966,8 +2100,8 @@ msgstr "OS ディストリビューション" msgid "OS Code Name" msgstr "OS コード名" -msgid "Processor" -msgstr "プロセッサー" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "システム統計情報" @@ -2052,6 +2186,3 @@ msgstr "割り振り:" msgid "No templates found." msgstr "テンプレートが見つかりません。" - -msgid "Clone" -msgstr "" diff --git a/po/kimchi.pot b/po/kimchi.pot index 86fa2b6..08fb697 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: 2014-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -58,6 +58,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" @@ -68,6 +72,14 @@ msgstr "" msgid "Specify %(item)s to login into Kimchi" msgstr "" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -268,6 +280,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -319,10 +343,6 @@ msgid "Template %(name)s already exists" msgstr "" #, python-format -msgid "Template %(name)s does not exist" -msgstr "" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "" @@ -410,6 +430,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" @@ -574,12 +599,6 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" @@ -616,7 +635,9 @@ msgstr "" msgid "Storage volume allocation must be an integer number" msgstr "" -msgid "Storage volume format not supported" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" msgid "Storage volume requires a volume name" @@ -646,6 +667,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" @@ -978,6 +1005,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -1028,6 +1107,9 @@ msgstr "" msgid "Create" msgstr "" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "" @@ -1046,6 +1128,9 @@ msgstr "" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "" @@ -1076,6 +1161,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "" @@ -1094,6 +1182,9 @@ msgstr "" msgid "Vendor" msgstr "" +msgid "Created" +msgstr "" + msgid "Save" msgstr "" @@ -1106,6 +1197,12 @@ msgstr "" msgid "Cancel" msgstr "" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "" @@ -1121,6 +1218,9 @@ msgstr "" msgid "Connect" msgstr "" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "" @@ -1213,9 +1313,6 @@ msgstr "" msgid "Warning" msgstr "" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "" @@ -1406,6 +1503,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1430,6 +1533,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "" @@ -1766,10 +1890,7 @@ msgstr "" msgid "Edit Template" msgstr "" -msgid "CPU Number" -msgstr "" - -msgid "Disk (GB)" +msgid "Processor" msgstr "" msgid "CDROM" @@ -1781,6 +1902,21 @@ msgstr "" msgid "Graphics" msgstr "" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "" @@ -1811,7 +1947,7 @@ msgstr "" msgid "OS Code Name" msgstr "" -msgid "Processor" +msgid "CPU(s)" msgstr "" msgid "System Statistics" @@ -1897,6 +2033,3 @@ msgstr "" msgid "No templates found." msgstr "" - -msgid "Clone" -msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 8e77458..f2e0ad1 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -57,6 +57,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "오류 때문에 작업을 시작할 수 없음: %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "사용자 '%(username)s'의 인증이 실패했습니다. [오류 코드: %(code)s]" @@ -67,6 +71,14 @@ msgstr "Kimchi에 액세스할 권한이 없습니다." msgid "Specify %(item)s to login into Kimchi" msgstr "Kimchi에 로그인하려면 %(item)s을(를) 지정하십시오." +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -277,6 +289,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -330,10 +354,6 @@ msgid "Template %(name)s already exists" msgstr "템플리트 %(name)s이(가) 이미 존재합니다." #, python-format -msgid "Template %(name)s does not exist" -msgstr "템플리트 %(name)s이(가) 없습니다." - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "템플리트 %(template)s에 대해 지정된 '%(network)s' 네트워크가 없습니다." @@ -426,6 +446,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "스토리지 풀 %(name)s이(가) 이미 존재합니다." @@ -605,14 +630,6 @@ msgstr "스토리지 볼륨 %(volume)s을(를) 작성하려면 %(item)s을(를) #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" -"스토리지 풀 %(pool)s이(가) 활성이 아니므로 스토리지 볼륨 %(volume)s을(를) 검" -"색할 수 없습니다." - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" "스토리지 풀 %(pool)s이(가) 활성이 아니므로 스토리지 볼륨을 나열할 수 없습니" @@ -654,8 +671,10 @@ msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." msgid "Storage volume allocation must be an integer number" msgstr "스토리지 볼륨 할당은 정수여야 합니다." -msgid "Storage volume format not supported" -msgstr "스토리지 볼륨 형식이 지원되지 않습니다." +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "스토리지 볼륨은 볼륨 이름이 필요합니다." @@ -685,6 +704,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "인터페이스 %(name)s이(가) 없습니다." @@ -1032,6 +1057,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "오류 코드" @@ -1084,6 +1161,9 @@ msgstr "메모리" msgid "Create" msgstr "작성" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "게스트 편집" @@ -1102,6 +1182,9 @@ msgstr "버전" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "이름" @@ -1132,6 +1215,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "모두" @@ -1150,6 +1236,9 @@ msgstr "" msgid "Vendor" msgstr "공급업체" +msgid "Created" +msgstr "" + msgid "Save" msgstr "저장" @@ -1162,6 +1251,12 @@ msgstr "분리" msgid "Cancel" msgstr "취소" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "시작" @@ -1177,6 +1272,9 @@ msgstr "조치" msgid "Connect" msgstr "연결" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "편집" @@ -1272,9 +1370,6 @@ msgstr "확인" msgid "Warning" msgstr "경고" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "로드 중..." @@ -1470,6 +1565,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1496,6 +1597,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN ID는 1과 4094 사이여야 합니다." @@ -1844,11 +1966,8 @@ msgstr "사용자 정의 URL을 사용하려고 합니다." msgid "Edit Template" msgstr "템플리트 편집" -msgid "CPU Number" -msgstr "CPU 번호" - -msgid "Disk (GB)" -msgstr "디스크(GB)" +msgid "Processor" +msgstr "프로세서" msgid "CDROM" msgstr "CDROM" @@ -1859,6 +1978,21 @@ msgstr "" msgid "Graphics" msgstr "그래픽" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "CPU 번호" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -1889,8 +2023,8 @@ msgstr "OS Distro" msgid "OS Code Name" msgstr "OS 코드 이름" -msgid "Processor" -msgstr "프로세서" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "시스템 통계" @@ -1975,6 +2109,3 @@ msgstr "할당:" msgid "No templates found." msgstr "템플리트가 없습니다." - -msgid "Clone" -msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 76db4b5..8c6f821 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\n" "PO-Revision-Date: 2014-09-16 18:45+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -76,6 +76,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "Não foi possível iniciar a tarefa devido a um erro: %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "Autenticação falhou para o usuário '%(username)s'. [Código de erro: %(code)s]" @@ -87,6 +91,14 @@ msgstr "Você não está autorizado para acessar o Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Especifique %(item)s para autenticar no Kimchi" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -312,10 +324,23 @@ msgid "The life time for the guest console password must be a number." msgstr "O tempo de vida da senha do console do guest deve ser um número." #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" +#, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." msgstr "" @@ -366,10 +391,6 @@ msgid "Template %(name)s already exists" msgstr "Modelo %(name)s já existe" #, python-format -msgid "Template %(name)s does not exist" -msgstr "Modelo %(name)s não existe" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "Rede '%(network)s' especificada para o modelo %(template)s não existe" @@ -462,6 +483,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s já existe" @@ -653,14 +679,6 @@ msgstr "Especifique %(item)s para poder criar o volume %(volume)s" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "" -"Não foi possível achar o volume %(volume)s porque o storage pool %(pool)s " -"não está ativo" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "" "Não foi possível listar volumes pois o storage pool %(pool)s não está ativo" @@ -702,8 +720,10 @@ msgstr "Nome do volume deve ser um texto" msgid "Storage volume allocation must be an integer number" msgstr "Alocação do volume de storage deve ser um número inteiro" -msgid "Storage volume format not supported" -msgstr "Formato do volume de storage não suportado" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "Volume de storage requer um nome" @@ -735,6 +755,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "Erro ao acessar arquivo %(url)s. Por favor, verifique isso." #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "Interface %(name)s não existe" @@ -1110,6 +1136,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERRO" @@ -1162,6 +1240,9 @@ msgstr "Memória" msgid "Create" msgstr "Criar" +msgid "Creating..." +msgstr "Criando..." + msgid "Edit Guest" msgstr "Editar Guest" @@ -1180,6 +1261,9 @@ msgstr "Permissão" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "Nome" @@ -1210,6 +1294,9 @@ msgstr "Usuários e grupos de sistema disponíveis" msgid "Selected system users and groups" msgstr "Usuários e grupos de sistema selecionados" +msgid "User" +msgstr "" + msgid "All" msgstr "Todos" @@ -1228,6 +1315,9 @@ msgstr "" msgid "Vendor" msgstr "Vendor" +msgid "Created" +msgstr "" + msgid "Save" msgstr "Salvar" @@ -1240,6 +1330,12 @@ msgstr "Remover" msgid "Cancel" msgstr "Cancelar" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "Iniciar" @@ -1255,6 +1351,9 @@ msgstr "Ações" msgid "Connect" msgstr "Conectar" +msgid "Clone" +msgstr "Clonar" + msgid "Edit" msgstr "Editar" @@ -1352,9 +1451,6 @@ msgstr "Confirmar" msgid "Warning" msgstr "Aviso" -msgid "Creating..." -msgstr "Criando..." - msgid "Loading..." msgstr "Carregando..." @@ -1565,6 +1661,12 @@ msgstr "" "continuar?" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1593,6 +1695,27 @@ msgstr "" "Esse disco será desconectado permanentemente e você pode reconectá-lo. " "Deseja continuar a remoção? " +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "ID da VLAN deve ser um número entre 1 e 4094." @@ -1946,11 +2069,8 @@ msgstr "Eu quero usar uma URL personalizada" msgid "Edit Template" msgstr "Editar Modelo" -msgid "CPU Number" -msgstr "Quantidade de CPUs" - -msgid "Disk (GB)" -msgstr "Disco (GB)" +msgid "Processor" +msgstr "Processador" msgid "CDROM" msgstr "CD-ROM" @@ -1961,6 +2081,21 @@ msgstr "Arquivo de imagem" msgid "Graphics" msgstr "Gráficos" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "Quantidade de CPUs" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -1991,8 +2126,8 @@ msgstr "Distribuição" msgid "OS Code Name" msgstr "Nome-código do sistema operacional" -msgid "Processor" -msgstr "Processador" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "Estatísticas do sistema" @@ -2078,6 +2213,3 @@ msgstr "Alocação" msgid "No templates found." msgstr "Nenhum modelo encontrado." - -msgid "Clone" -msgstr "Clonar" diff --git a/po/ru_RU.po b/po/ru_RU.po index dcc23b5..acf326d 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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/" @@ -58,6 +58,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "Не удалось запустить задачу из-за ошибки %(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "Сбой идентификации пользователя %(username)s. [Код ошибки: %(code)s]" @@ -68,6 +72,14 @@ msgstr "Нет прав доступа к Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Укажите %(item)s для входа в Kimchi" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -280,6 +292,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -333,10 +357,6 @@ msgid "Template %(name)s already exists" msgstr "Шаблон %(name)s уже существует" #, python-format -msgid "Template %(name)s does not exist" -msgstr "Шаблон %(name)s не существует" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "Сеть %(network)s, указанная для шаблона %(template)s, не существует" @@ -424,6 +444,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Пул памяти %(name)s уже существует" @@ -604,12 +629,6 @@ msgstr "Укажите %(item)s для создания тома %(volume)s" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "Не удалось получить том %(volume)s: пул памяти %(pool)s не активен" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "Не удалось вывести список томов: пул памяти %(pool)s не активен" @@ -648,8 +667,10 @@ msgstr "Имя тома должно быть строкой" msgid "Storage volume allocation must be an integer number" msgstr "Выделение тома должно быть целым числом" -msgid "Storage volume format not supported" -msgstr "Формат тома не поддерживается" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "Тому требуется имя" @@ -679,6 +700,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "Интерфейс %(name)s не существует" @@ -1032,6 +1059,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "Код ошибки" @@ -1084,6 +1163,9 @@ msgstr "Память" msgid "Create" msgstr "Создать" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "Изменить гостевую систему" @@ -1102,6 +1184,9 @@ msgstr "Версия" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "Имя" @@ -1132,6 +1217,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "Все" @@ -1150,6 +1238,9 @@ msgstr "" msgid "Vendor" msgstr "Вендор" +msgid "Created" +msgstr "" + msgid "Save" msgstr "Сохранить" @@ -1162,6 +1253,12 @@ msgstr "Отключить" msgid "Cancel" msgstr "Отмена" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "Запустить" @@ -1177,6 +1274,9 @@ msgstr "Действия" msgid "Connect" msgstr "Подключить" +msgid "Clone" +msgstr "Клонировать" + msgid "Edit" msgstr "Редактировать" @@ -1271,9 +1371,6 @@ msgstr "Подтвердить" msgid "Warning" msgstr "Предупреждение" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "Загружается..." @@ -1471,6 +1568,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1496,6 +1599,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "ИД VLAN должен быть от 1 до 4094." @@ -1846,11 +1970,8 @@ msgstr "Использовать другой URL" msgid "Edit Template" msgstr "Изменить шаблон" -msgid "CPU Number" -msgstr "Количество процессоров" - -msgid "Disk (GB)" -msgstr "Диск (ГБ)" +msgid "Processor" +msgstr "Процессор" msgid "CDROM" msgstr "CDROM" @@ -1861,6 +1982,21 @@ msgstr "" msgid "Graphics" msgstr "Графика" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "Количество процессоров" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "Процессор" @@ -1891,8 +2027,8 @@ msgstr "Вариант ОС" msgid "OS Code Name" msgstr "Кодовое имя ОС" -msgid "Processor" -msgstr "Процессор" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "Системная статистика" @@ -1977,6 +2113,3 @@ msgstr "Выделение ресурсов:" msgid "No templates found." msgstr "Не найдены шаблоны." - -msgid "Clone" -msgstr "Клонировать" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9e1f1ed..9ad4e8d 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: 2014-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -74,6 +74,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "由于错误%(err)s任务启动失败" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "用户'%(username)s'身份验证失败.[错误代码：%(code)s]" @@ -84,6 +88,14 @@ msgstr "您没有被授权访问Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "指定登录Kimchi的%(item)s" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -289,10 +301,23 @@ msgid "The life time for the guest console password must be a number." msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" +#, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." msgstr "" @@ -339,10 +364,6 @@ msgid "Template %(name)s already exists" msgstr "模板 %(name)s 已经存在" #, python-format -msgid "Template %(name)s does not exist" -msgstr "模板 %(name)s 不存在" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "为模板 %(template)s 指定的网络 '%(network)s' 不存在" @@ -430,6 +451,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "存储池%(name)s已经存在" @@ -594,12 +620,6 @@ msgstr "为新存储卷%(volume)s指定指定%(item)s" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "不能获取存储卷%(volume)s，因为存储池%(pool)s没有激活" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "不能列出存储卷，因为存储池%(pool)s没有激活" @@ -636,8 +656,10 @@ msgstr "存储卷的名字必须是字符串" msgid "Storage volume allocation must be an integer number" msgstr "存储卷分配额必须是整数" -msgid "Storage volume format not supported" -msgstr "存储卷格式不支持" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -666,6 +688,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "接口%(name)s不存在" @@ -1000,6 +1028,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "软件仓库不支持配置类型: %(items)s" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "错误码" @@ -1050,6 +1130,9 @@ msgstr "内存" msgid "Create" msgstr "创建" +msgid "Creating..." +msgstr "正在创建..." + msgid "Edit Guest" msgstr "修改客户机" @@ -1068,6 +1151,9 @@ msgstr "权限" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "名称" @@ -1098,6 +1184,9 @@ msgstr "可选的系统用户及用户组" msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" +msgid "User" +msgstr "" + msgid "All" msgstr "所有" @@ -1116,6 +1205,9 @@ msgstr "" msgid "Vendor" msgstr "厂商" +msgid "Created" +msgstr "" + msgid "Save" msgstr "保存" @@ -1128,6 +1220,12 @@ msgstr "卸载" msgid "Cancel" msgstr "取消" +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "启用" @@ -1143,6 +1241,9 @@ msgstr "操作" msgid "Connect" msgstr "连接到" +msgid "Clone" +msgstr "制作副本" + msgid "Edit" msgstr "编辑" @@ -1236,9 +1337,6 @@ msgstr "确认" msgid "Warning" msgstr "警告" -msgid "Creating..." -msgstr "正在创建..." - msgid "Loading..." msgstr "正在加载..." @@ -1429,6 +1527,12 @@ msgid "" msgstr "该虚拟机不是一个稳定的虚拟机，关机将会删除它，是否继续？" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "CDROM将被永久卸载，你可以重新装载它。继续卸载？" @@ -1453,6 +1557,27 @@ msgid "" "detach it?" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1793,11 +1918,8 @@ msgstr "我想用一个自定义的URL" msgid "Edit Template" msgstr "编辑模板" -msgid "CPU Number" -msgstr "CPU个数" - -msgid "Disk (GB)" -msgstr "磁盘（GB）" +msgid "Processor" +msgstr "处理器" msgid "CDROM" msgstr "光驱" @@ -1808,6 +1930,21 @@ msgstr "镜像文件" msgid "Graphics" msgstr "图形" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "CPU个数" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "处理器" @@ -1838,8 +1975,8 @@ msgstr "操作系统发行版" msgid "OS Code Name" msgstr "操作系统代号" -msgid "Processor" -msgstr "处理器" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "系统统计信息" @@ -1924,6 +2061,3 @@ msgstr "分配" msgid "No templates found." msgstr "没有发现模板" - -msgid "Clone" -msgstr "制作副本" diff --git a/po/zh_TW.po b/po/zh_TW.po index 4195f13..6709233 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-10-22 13:00-0500\n" +"POT-Creation-Date: 2014-12-01 12:26-0200\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" @@ -57,6 +57,10 @@ msgid "Unable to start task due error: %(err)s" msgstr "由於下列錯誤，無法開始工作：%(err)s" #, python-format +msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." +msgstr "" + +#, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "使用者 '%(username)s' 的鑑別失敗。[錯誤碼：%(code)s]" @@ -67,6 +71,14 @@ msgstr "您未獲授權來存取 Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "指定 %(item)s 以登入 Kimchi" +#, python-format +msgid "User %(user_id)s not found with given LDAP settings." +msgstr "" + +#, python-format +msgid "Invalid LDAP configuration: %(item)s : %(value)s" +msgstr "" + msgid "Unknown \"_cap\" specified" msgstr "" @@ -271,6 +283,18 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "Virtual machine '%(name)s' must be stopped before cloning it." +msgstr "" + +#, python-format +msgid "Insufficient disk space to clone virtual machine '%(name)s'" +msgstr "" + +#, python-format +msgid "Unable to clone VM '%(name)s'. Details: %(err)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -322,10 +346,6 @@ msgid "Template %(name)s already exists" msgstr "範本 %(name)s 已存在" #, python-format -msgid "Template %(name)s does not exist" -msgstr "範本 %(name)s 不存在" - -#, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" msgstr "為範本 %(template)s 指定的網路 '%(network)s' 不存在" @@ -413,6 +433,11 @@ msgid "" "zero." msgstr "" +msgid "" +"Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " +"qcow2, qed, raw, vmdk, vpc." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "儲存區 %(name)s 已存在" @@ -577,12 +602,6 @@ msgstr "指定 %(item)s 以建立儲存磁區 %(volume)s" #, python-format msgid "" -"Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " -"is not active" -msgstr "無法擷取儲存磁區 %(volume)s，因為儲存區 %(pool)s未處於作用中狀態" - -#, python-format -msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" msgstr "無法列出儲存磁區，因為儲存區 %(pool)s 未處於作用中狀態" @@ -619,8 +638,10 @@ msgstr "儲存磁區名稱必須是字串" msgid "Storage volume allocation must be an integer number" msgstr "儲存磁區配置必須是整數" -msgid "Storage volume format not supported" -msgstr "儲存磁區格式不受支援" +msgid "" +"Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " +"qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "" msgid "Storage volume requires a volume name" msgstr "儲存磁區需要磁區名稱" @@ -649,6 +670,12 @@ msgid "Unable to access file %(url)s. Please, check it." msgstr "" #, python-format +msgid "" +"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "介面 %(name)s 不存在" @@ -981,6 +1008,58 @@ msgid "" "Configuration items: '%(items)s' are not supported by repository manager" msgstr "" +#, python-format +msgid "" +"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +msgstr "" + +#, python-format +msgid "" +"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"%(err)s" +msgstr "" + +#, python-format +msgid "" +"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " +"%(err)s" +msgstr "" + +msgid "The number of vCPUs is too large for this system." +msgstr "" + +msgid "Invalid vCPU/topology combination." +msgstr "" + +msgid "This host (or current configuration) does not allow CPU topology." +msgstr "" + msgid "ERROR CODE" msgstr "錯誤碼" @@ -1031,6 +1110,9 @@ msgstr "記憶體" msgid "Create" msgstr "建立" +msgid "Creating..." +msgstr "" + msgid "Edit Guest" msgstr "編輯客體" @@ -1049,6 +1131,9 @@ msgstr "版本" msgid "Host PCI Device" msgstr "" +msgid "Snapshot" +msgstr "" + msgid "Name" msgstr "名稱" @@ -1079,6 +1164,9 @@ msgstr "" msgid "Selected system users and groups" msgstr "" +msgid "User" +msgstr "" + msgid "All" msgstr "全部" @@ -1097,6 +1185,9 @@ msgstr "" msgid "Vendor" msgstr "供應商" +msgid "Created" +msgstr "" + msgid "Save" msgstr "儲存" @@ -1109,6 +1200,12 @@ msgstr "分離" msgid "Cancel" msgstr "取消 " +msgid "revert" +msgstr "" + +msgid "Cloning" +msgstr "" + msgid "Start" msgstr "開始" @@ -1124,6 +1221,9 @@ msgstr "動作" msgid "Connect" msgstr "連接" +msgid "Clone" +msgstr "" + msgid "Edit" msgstr "編輯" @@ -1218,9 +1318,6 @@ msgstr "確認" msgid "Warning" msgstr "警告" -msgid "Creating..." -msgstr "" - msgid "Loading..." msgstr "正在載入..." @@ -1411,6 +1508,12 @@ msgid "" msgstr "" msgid "" +"When the target guest has SCSI or iSCSI volumes, they will be cloned on " +"default storage pool. The same will happen when the target pool does not " +"have enough space to clone the volumes. Do you want to continue?" +msgstr "" + +msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" msgstr "" @@ -1436,6 +1539,27 @@ msgid "" "detach it?" msgstr "" +msgid "interface:" +msgstr "" + +msgid "address:" +msgstr "" + +msgid "link_type:" +msgstr "" + +msgid "block:" +msgstr "" + +msgid "drive_type:" +msgstr "" + +msgid "model:" +msgstr "" + +msgid "Affected devices:" +msgstr "" + msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN ID 必須介於 1 和 4094 之間。" @@ -1780,11 +1904,8 @@ msgstr "我想使用自訂 URL" msgid "Edit Template" msgstr "編輯範本" -msgid "CPU Number" -msgstr "CPU 數目" - -msgid "Disk (GB)" -msgstr "磁碟 (GB)" +msgid "Processor" +msgstr "處理器" msgid "CDROM" msgstr "CDROM" @@ -1795,6 +1916,21 @@ msgstr "" msgid "Graphics" msgstr "圖形卡" +msgid "Disk(GB)" +msgstr "" + +msgid "CPU Number" +msgstr "CPU 數目" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "CPU" msgstr "CPU" @@ -1825,8 +1961,8 @@ msgstr "OS Distro" msgid "OS Code Name" msgstr "OS 程式碼名稱" -msgid "Processor" -msgstr "處理器" +msgid "CPU(s)" +msgstr "" msgid "System Statistics" msgstr "系統統計資料" @@ -1911,6 +2047,3 @@ msgstr "配置：" msgid "No templates found." msgstr "找不到範本。" - -msgid "Clone" -msgstr "" -- 1.9.3

2 2

[PATCH] RHEL7: Guide user to subscribe to "RHEL Server Optional" channel
by Aline Manera 01 Dec '14

01 Dec '14

python-cheetah requires python-pygments package that is only available for RHEL7 system in the "RHEL Server Optional" channel at RHN Classic or Red Hat Satellite. So guide user to subscribe to this channel in order to install and run Kimchi. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/README.md b/docs/README.md index 555ce89..ed3d489 100644 --- a/docs/README.md +++ b/docs/README.md @@ -74,6 +74,9 @@ EPEL repositories. See [this FAQ](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.… for more information on how to configure your system to access this repository. +And for RHEL7 systems, you also need to subscribe to the "RHEL Server Optional" +channel at RHN Classic or Red Hat Satellite. + **For debian:** $ sudo apt-get install gcc make autoconf automake gettext git \ -- 1.9.3

3 3