December 2014 - Kimchi-devel - oVirt List Archives

[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 05 Dec '14

05 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