From michael.sole at soledevelopment.com  Thu Jul  2 15:03:29 2015
From: michael.sole at soledevelopment.com (Michael Sole)
Date: Thu, 2 Jul 2015 11:03:29 -0400
Subject: [Kimchi-devel] CentOS Init Script
Message-ID: <30b85ec14768e6c7d0c3da30dc9435e3.squirrel@mail.soledevelopment.com>

I created a very simple CentOS 6 compatible init script. Its a little
hacky but it does work. I know I am supposed to make a patch but perhaps
someone can evaluate and decide if you want to include it:

#!/bin/sh
#
# Name: Kimchi init script for CentOS 6
# Author: Michael Sole
# Email: michael.sole(at)soledevelopment.com
#
# Description: Very simple init script to start, stop and restart the
Kimchi control panel
#
# Usage: /etc/init.d/kimchid start|stop|restart

### BEGIN INIT INFO
# Provides: kimchid
# Required-Start: $local_fs $syslog
# Required-Stop: $local_fs $syslog
# Default-Start:  2345
# Default-Stop: 90
# Short-Description: run kimchi daemon
# Description: Very simple init script to start, stop and restart the
Kimchi control panel
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/bin/kimchid"
prog="kimchid"

lockfile=/var/lock/subsys/$prog

start() {
    if [ -f "$lockfile" ]
    then
        echo "Lock file found, is the daemon already running?"
        exit 5
    fi
    echo -n $"Starting $prog: "
    nohup $exec  > /dev/null 2>&1 &
    echo "OK"
    touch $lockfile
    return 0
}

stop() {
    echo -n $"Stopping $prog: "
    rm -f $lockfile
    ps aux | grep -ie $prog | awk '{print $2}' | xargs kill -9 > /dev/null
2>&1
    return 0
}

restart() {
    stop
    start
}

case "$1" in
    start)
        $1
        ;;
    stop)
        $1
        ;;
    restart)
        $1
        ;;
    *)
        echo $"Usage: $0 {start|stop|restart}"
        exit 2
esac
exit $?



From alinefm at linux.vnet.ibm.com  Fri Jul  3 12:39:56 2015
From: alinefm at linux.vnet.ibm.com (Aline Manera)
Date: Fri, 03 Jul 2015 09:39:56 -0300
Subject: [Kimchi-devel] [PATCH 2/2] Review changes for Kimchi
In-Reply-To: <1435704502-8836-1-git-send-email-kersten@us.ibm.com>
References: <1435704502-8836-1-git-send-email-kersten@us.ibm.com>
Message-ID: <5596829C.5080904@linux.vnet.ibm.com>



On 30/06/2015 19:48, Kersten wrote:
> Made changes to 3 files per comments from Aline.
>
> Signed-off-by: Kersten <kersten at us.ibm.com>
> ---
>   ui/pages/help/en_US/guests.dita    | 30 +++++++++++++++---------------
>   ui/pages/help/en_US/storage.dita   |  8 ++++----
>   ui/pages/help/en_US/templates.dita | 15 +++++++++------
>   3 files changed, 28 insertions(+), 25 deletions(-)
>
> diff --git a/ui/pages/help/en_US/guests.dita b/ui/pages/help/en_US/guests.dita
> index 7d0d453..45cf7da 100644
> --- a/ui/pages/help/en_US/guests.dita
> +++ b/ui/pages/help/en_US/guests.dita
> @@ -10,14 +10,14 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="en-us">
>   <title>Guests</title>
>   <shortdesc>The <wintitle>Guests</wintitle> page lists the defined
> -guests or virtual machines.</shortdesc>
> +guests for your server.</shortdesc>
>   <csbody>
>   <p>For each guest, the following information is displayed:<dl><dlentry>
>   <dt>Name</dt>
> -<dd>Name of the virtual machine.</dd>
> +<dd>Name of the guest.</dd>
>   </dlentry><dlentry>
>   <dt>CPU</dt>
> -<dd>Percentage of processor utilization in the virtual machine.</dd>
> +<dd>Percentage of processor utilization in the guest.</dd>
>   </dlentry><dlentry>
>   <dt>Disk I/O</dt>
>   <dd>Disk input/output transmission rate in KB per seconds.</dd>
> @@ -53,16 +53,16 @@ existing guest. Guests can be edited only while stopped.</li>
>   <li>Select <uicontrol>Power Off</uicontrol> to force an immediate
>   shut down of the guest.</li>
>   <li>Select <uicontrol>Delete</uicontrol> to delete the guest.</li>
> -</ul>To create a guest, or virtual machine, click the <uicontrol>plus
> -(+)</uicontrol> icon on the page.</p>
> +</ul>To create a guest, click the <uicontrol>plus (+)</uicontrol> icon
> +on the page.</p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="en-us">
> -<title>Create a guest (virtual machine)</title>
> +<title>Create a guest</title>
>   <shortdesc>Create a guest by using an existing template.</shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>Type the name to be used to identify the virtual machine.</li>
> -<li rev="rev1">Select a template. <ul>
> +<li>Type the name to be used to identify the guest.</li>
> +<li>Select a template. <ul>
>   <li>If templates exist, select from displayed templates.</li>
>   <li>If no templates exist, click <uicontrol>Create a template</uicontrol> to
>   create a template.</li>
> @@ -73,9 +73,9 @@ create a template.</li>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="en-us">
>   <title>Edit guest</title>
> -<shortdesc>Edit the properties of an existing virtual machine. Some
> -properties can be edited only while guest is stopped. Others will
> -take effect in next boot.</shortdesc>
> +<shortdesc>Edit the properties of an existing guest. Some properties
> +can be edited only while guest is stopped. Others will take effect
> +in next boot.</shortdesc>
>   <csbody>
>   <dl><dlentry>
>   <dt>General</dt>
> @@ -124,11 +124,11 @@ guest.</li>
>   iSCSI volumes or if the target pool does not have enough space, the
>   clone will be created on a default storage pool. </note></li>
>   </ol>
> -<p>A guest appears in your list with the label "cloning..." When the
> -process is complete, the cloned guest is available to use.</p><?Pub
> -Caret 54?>
> +<p>A guest appears in your list with the label <uicontrol>Cloning...</uicontrol> When
> +the process is complete, the cloned guest is available to use.</p><?Pub
> +Caret 45?>
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
> -<?Pub *0000005359?>
> +<?Pub *0000005287?>
> diff --git a/ui/pages/help/en_US/storage.dita b/ui/pages/help/en_US/storage.dita
> index e6f995d..53d1404 100644
> --- a/ui/pages/help/en_US/storage.dita
> +++ b/ui/pages/help/en_US/storage.dita
> @@ -94,16 +94,16 @@ pool is created, it will be created for you.</li>
>   </cshelp>
>   <cshelp id="kimhdefstor" xml:lang="en-us">
>   <title>Add volume</title>
> -<shortdesc>Adds volume to a storage pool.</shortdesc><?Pub Caret 0?>
> +<shortdesc>Adds volume to a storage pool.</shortdesc>
>   <csbody>
>   <dl><dlentry>
>   <dt>Fetch from remote URL</dt>
> -<dd>Specifies a location to upload the volume from. For example: <filepath>https://my-server/fedora22.img</filepath>.</dd>
> +<dd>Specifies a location to download the volume from. For example: <filepath>https://my-server/fedora22.img</filepath>.</dd>
>   </dlentry><dlentry>
>   <dt>Upload a file</dt>
>   <dd>Specifies a location on your local system.</dd>
> -</dlentry></dl>
> +</dlentry></dl><?Pub Caret 57?>
>   </csbody>
>   </cshelp>
>   </cshelp>
> -<?Pub *0000004413?>
> +<?Pub *0000004416?>
> diff --git a/ui/pages/help/en_US/templates.dita b/ui/pages/help/en_US/templates.dita
> index 1c03016..ad3747c 100644
> --- a/ui/pages/help/en_US/templates.dita
> +++ b/ui/pages/help/en_US/templates.dita
> @@ -55,7 +55,7 @@ You can select multiple networks.</dd>
>   <dd>In the <uicontrol>CPU Number</uicontrol> field, specify the number
>   of processors that are defined for the template.</dd>
>   <dd>Select to Manually set CPU topology for each guest.</dd>
> -</dlentry></dl><?Pub Caret 322?>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
> @@ -69,16 +69,19 @@ ISO image to 'ISO' storage pool for following discovery.</shortdesc>
>   <dd>Select to scan storage pools for installation ISO images available
>   on the system.</dd>
>   </dlentry><dlentry>
> +<dt>Local Image File</dt>
> +<dd>Select to specify a path to the local image file.</dd>
> +</dlentry><dlentry>
>   <dt>Remote ISO image</dt>
>   <dd>Select to specify a remote location for an installation ISO image.</dd>
>   </dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>Add template - local ISO image</title>
> -<shortdesc>Add a template from a local ISO image.</shortdesc>
> +<title>Add template - ISO image</title>
> +<shortdesc>Add a template from a ISO image.</shortdesc>
>   <csbody>
> -<p>The ISO images available on the system are displayed.</p>
> +<p>The ISO images available on the system ore remotely are displayed.</p>

Just a typo here 'ore' but I can fix is before applying.

>   <dl><dlentry>
>   <dt>OS</dt>
>   <dd>Name of the operating system or distribution.</dd>
> @@ -105,7 +108,7 @@ specify a path to the ISO image.</li>
>   ISO images.</li>
>   </ul></li>
>   </ul>
> -</csbody>
> +</csbody><?Pub Caret -2?>
>   </cshelp>
>   </cshelp>
> -<?Pub *0000004089?>
> +<?Pub *0000004194?>



From alinefm at linux.vnet.ibm.com  Fri Jul  3 12:55:25 2015
From: alinefm at linux.vnet.ibm.com (Aline Manera)
Date: Fri, 03 Jul 2015 12:55:25 -0000
Subject: [Kimchi-devel] [PATCH] Help updates for Kimchi
In-Reply-To: <1435176912-32380-1-git-send-email-kersten@us.ibm.com>
Message-ID: <201507031255.t63CtPbr015967@d01av01.pok.ibm.com>

Applied. Thanks.

Regards,

Aline Manera



From alinefm at linux.vnet.ibm.com  Fri Jul  3 12:56:11 2015
From: alinefm at linux.vnet.ibm.com (Aline Manera)
Date: Fri, 03 Jul 2015 09:56:11 -0300
Subject: [Kimchi-devel] [PATCH 2/2] Review changes for Kimchi
In-Reply-To: <1435704502-8836-1-git-send-email-kersten@us.ibm.com>
References: <1435704502-8836-1-git-send-email-kersten@us.ibm.com>
Message-ID: <5596866B.40108@linux.vnet.ibm.com>

Applied. Thanks.

Regards,

Aline Manera



From alinefm at linux.vnet.ibm.com  Fri Jul  3 17:55:45 2015
From: alinefm at linux.vnet.ibm.com (Aline Manera)
Date: Fri, 03 Jul 2015 14:55:45 -0300
Subject: [Kimchi-devel] New branches upstream
In-Reply-To: <5591C2F7.1070305@linux.vnet.ibm.com>
References: <5591C2F7.1070305@linux.vnet.ibm.com>
Message-ID: <5596CCA1.1090102@linux.vnet.ibm.com>


I've just updated the wok branch upstream. It contains the latest wok 
changes from Lucio + the new UI widgets patches.

Please, while sending patches for review add the tag *[wok] *to have 
your patch applied into wok branch or *[next] *to get the patch applied 
on next branch.

Thanks,
Aline Manera

On 29/06/2015 19:13, Aline Manera wrote:
> Hi all,
>
> As we decided for a stabilization release after 1.5, I will create a 
> new branch named 'next' to apply the patches not related to bug fixes.
> Once we get 1.5.1 released, the 'next' branch will be merged into 'master'
>
> I will also create the 'wok' branch to handle the wok framework and 
> the new UI development.
> I want to use the 1.5.1 time frame to test as much as we can the wok 
> framework and the new UI we can release all that right after 1.5.1
>
> Summary:
> - master: current release development
> - next <https://github.com/kimchi-project/kimchi/tree/next>: new features
> - wok <https://github.com/kimchi-project/kimchi/tree/wok>: disruptive 
> features (wok framework + new UI)
>
> The current 'wok' branch is a copy of the master branch.
> I am working with Lucio to get the new UI patches merged with the 
> 'wok' patches so we can update the upstream branch accordingly.
>
> Regards,
> Aline Manera
>
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150703/ac325d48/attachment.html>

From frediz at linux.vnet.ibm.com  Mon Jul  6 15:10:56 2015
From: frediz at linux.vnet.ibm.com (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bonnard?=)
Date: Mon,  6 Jul 2015 17:10:56 +0200
Subject: [Kimchi-devel] [PATCH] Fix minus in manpage
Message-ID: <1436195456-18218-1-git-send-email-frediz@linux.vnet.ibm.com>

From: Frederic Bonnard <frediz at linux.vnet.ibm.com>

Escape minus for options so they don't get interpreted as hyphens.
---
 docs/kimchid.8.in | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/docs/kimchid.8.in b/docs/kimchid.8.in
index 08e96e5..d715e87 100644
--- a/docs/kimchid.8.in
+++ b/docs/kimchid.8.in
@@ -17,35 +17,35 @@ supports HTML5.
 .SH OPTIONS
 The following options are supported:
 .TP
-\fB-h\fP , \fB--help\fP
+\fB\-h\fP , \fB\-\-help\fP
 Show this help message and exit.
 .TP
-\fB--host\fP \fIhost\fP
+\fB\-\-host\fP \fIhost\fP
 Specify the hostname or IP to listen on.
 .TP
-\fB--port\fP \fIport\fP
+\fB\-\-port\fP \fIport\fP
 Specify the HTTP port (default \fI8000\fP).
 .TP
-\fB--ssl-port\fP \fIssl_port\fP
+\fB\-\-ssl-port\fP \fIssl_port\fP
 Specify the HTTPS port (default \fI8001\fP).
 .TP
-\fB--cherrypy_port\fP \fIcherrypy_port\fP
+\fB\-\-cherrypy_port\fP \fIcherrypy_port\fP
 Specify the Cherrypy server port (default \fI8010\fP).
 .TP
-\fB--log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP]
+\fB\-\-log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP]
 Specify the log level (default \fIdebug\fP).
 .TP
-\fB--access-log\fP \fIaccess_log\fP
+\fB\-\-access-log\fP \fIaccess_log\fP
 Specify the access log location where kimchi should create the access log file.
 .TP
-\fB--environment\fP [\fIdevelopment\fP | \fIproduction\fP]
+\fB\-\-environment\fP [\fIdevelopment\fP | \fIproduction\fP]
 Specify the running environment of kimchi server. Check cherrypy documentation for more details (default \fIproduction\fP).
 .TP
-\fB--federation\fP [\fIon\fP | \fIoff\fP]
+\fB\-\-federation\fP [\fIon\fP | \fIoff\fP]
 Register and discover Kimchi peers in the same network using OpenSLP. Check
 below the \fBFEDERATION\fP section for more details (default \fIoff\fP).
 .TP
-\fB--test\fP
+\fB\-\-test\fP
 Run kimchi on a mock version that does not affect the system. For testing proposals.
 .SH FEDERATION
 Federation feature is a mechanism to discover Kimchi peers in the same network.
@@ -63,23 +63,23 @@ To enable it, do the following:
    ports in your firewall configuration
 
    For system using firewalld, do:
-   sudo firewall-cmd --permanent --add-port=427/udp
-   sudo firewall-cmd --permanent --add-port=427/tcp
-   sudo firewall-cmd --reload
+   sudo firewall-cmd \-\-permanent \-\-add-port=427/udp
+   sudo firewall-cmd \-\-permanent \-\-add-port=427/tcp
+   sudo firewall-cmd \-\-reload
 
    For openSUSE systems, do:
    sudo /sbin/SuSEfirewall2 open EXT TCP 427
    sudo /sbin/SuSEfirewall2 open EXT UDP 427
 
    For system using iptables, do:
-   sudo iptables -A INPUT -p tcp --dport 427 -j ACCEPT
-   sudo iptables -A INPUT -p udp --dport 427 -j ACCEPT
+   sudo iptables \-A INPUT \-p tcp \-\-dport 427 \-j ACCEPT
+   sudo iptables \-A INPUT \-p udp \-\-dport 427 \-j ACCEPT
 
 3. In addition to the OpenSLP ports, you also need to allow multicast in the
    firewall configuration
 
    For system using firewalld, do:
-   sudo firewall-cmd --direct --add-rule ipv4 filter INPUT 0 -s <subnet> -j ACCEPT
+   sudo firewall-cmd \-\-direct \-\-add-rule ipv4 filter INPUT 0 \-s <subnet> \-j ACCEPT
 
    For openSUSE systems, do:
    Add the subnet to the trusted networks listed on FW_TRUSTED_NETS in
@@ -87,7 +87,7 @@ To enable it, do the following:
    Make sure to restart /sbin/SuSEfirewall2 after modifying /etc/sysconfig/SuSEfirewall2
 
    For system using iptables, do:
-   sudo iptables -A INPUT -s <subnet> -j ACCEPT
+   sudo iptables \-A INPUT \-s <subnet> \-j ACCEPT
 
 4. Start slpd service and make sure it is up while running Kimchi
    sudo service slpd start
-- 
2.1.4



From joserz at linux.vnet.ibm.com  Wed Jul  8 17:42:44 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Wed,  8 Jul 2015 14:42:44 -0300
Subject: [Kimchi-devel] [PATCH 0/3] Add usb xhci controller for hotplug on
	Power
Message-ID: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>

Power system requires an USB XHCI controller in order to allow PCI
hotplug. This patch adds such controller by default when creating a new
VM and inform the users if a VM currently doesn't have the controller.

Jose Ricardo Ziviani (3):
  Add a new error code for pci hotplug
  Check for usb xhci controller in Power platform
  Define the USB xhci controller in the template for Power Systems

 src/kimchi/i18n.py             |  1 +
 src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
 src/kimchi/vmtemplate.py       | 17 +++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

-- 
1.9.1



From joserz at linux.vnet.ibm.com  Wed Jul  8 17:42:46 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Wed,  8 Jul 2015 14:42:46 -0300
Subject: [Kimchi-devel] [PATCH 2/3] Check for usb xhci controller in Power
	platform
In-Reply-To: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436377367-18815-3-git-send-email-joserz@linux.vnet.ibm.com>

 - Today it is not possible to hotplug a PCI in Power Systems without an
   USB xhci controller existing in the VM. This commit checks if there
   is such controller in the VM, displaying an error message if not.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index ea75fce..186e542 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -171,6 +171,26 @@ class VMHostDevsModel(object):
             if rc != 0:
                 kimchi_log.warning("Unable to turn on sebool virt_use_sysfs")
 
+    def _have_xhci_usb_controller(self, xmlstr):
+        root = objectify.fromstring(xmlstr)
+
+        try:
+            controllers = root.devices.controller
+
+        except AttributeError:
+            return False
+
+        for controller in controllers:
+
+            if 'model' not in controller.attrib:
+                continue
+
+            if controller.attrib['type'] == 'usb' and \
+               controller.attrib['model'] == 'nec-xhci':
+                return True
+
+        return False
+
     def _attach_pci_device(self, vmid, dev_info):
         self._validate_pci_passthrough_env()
 
@@ -180,11 +200,17 @@ class VMHostDevsModel(object):
         driver = ('vfio' if DOM_STATE_MAP[dom.info()[0]] == "shutoff" and
                   self.caps.kernel_vfio else 'kvm')
 
-        # on powerkvm systems it must be vfio driver.
         distro, _, _ = platform.linux_distribution()
         if distro == 'IBM_PowerKVM':
+            # on powerkvm systems, the driver must be vfio.
             driver = 'vfio'
 
+            # powerkvm requires a xhci usb controller in order to support
+            # pci hotplug.
+            if DOM_STATE_MAP[dom.info()[0]] != "shutoff" and \
+               not self._have_xhci_usb_controller(dom.XMLDesc(0)):
+                raise InvalidOperation("KCHVMHDEV0006E", {'vmid': vmid})
+
         # Attach all PCI devices in the same IOMMU group
         dev_model = DeviceModel(conn=self.conn)
         devs_model = DevicesModel(conn=self.conn)
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Wed Jul  8 17:42:45 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Wed,  8 Jul 2015 14:42:45 -0300
Subject: [Kimchi-devel] [PATCH 1/3] Add a new error code for pci hotplug
In-Reply-To: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436377367-18815-2-git-send-email-joserz@linux.vnet.ibm.com>

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/i18n.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index d2ffa34..54750d9 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -127,6 +127,7 @@ messages = {
                         "For AMD CPU, add iommu=pt iommu=1."),
     "KCHVMHDEV0004E": _('"name" should be a device name string'),
     "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'),
+    "KCHVMHDEV0006E": _('VM %(vmid)s does not have an USB XHCI controller to accept PCI hotplug.'),
 
     "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"),
     "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"),
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Wed Jul  8 17:42:47 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Wed,  8 Jul 2015 14:42:47 -0300
Subject: [Kimchi-devel] [PATCH 3/3] Define the USB xhci controller in the
	template for Power Systems
In-Reply-To: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436377367-18815-4-git-send-email-joserz@linux.vnet.ibm.com>

 - When creating VMs using Kimchi in a Power System, the USB xhci
   controller is defined by default to have PCI hotplug support.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/vmtemplate.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 79e04ed..3e42971 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -22,6 +22,7 @@ import stat
 import time
 import urlparse
 import uuid
+import platform
 
 from lxml import etree
 from lxml.builder import E
@@ -287,6 +288,19 @@ class VMTemplate(object):
                            self.info.get('memory') << 10,
                            cpu_topo)
 
+    def _get_usb_controller(self):
+        # powerkvm systems must include xhci controller model
+        distro, _, _ = platform.linux_distribution()
+        if distro != "IBM_PowerKVM":
+            return ''
+
+        return """
+        <controller type='usb' index='0' model='nec-xhci'>
+            <address type='pci' domain='0x0000'
+            bus='0x00' slot='0x0f' function='0x0'/>
+        </controller>
+        """
+
     def to_vm_xml(self, vm_name, vm_uuid, **kwargs):
         params = dict(self.info)
         params['name'] = vm_name
@@ -323,6 +337,8 @@ class VMTemplate(object):
         elif params['slots'] == 0:
             params['slots'] = 1
 
+        params['usb_controller'] = self._get_usb_controller()
+
         xml = """
         <domain type='%(domain)s'>
           %(qemu-stream-cmdline)s
@@ -352,6 +368,7 @@ class VMTemplate(object):
             %(networks)s
             %(graphics)s
             %(input_output)s
+            %(usb_controller)s
             <memballoon model='virtio' />
           </devices>
         </domain>
-- 
1.9.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:39 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:39 -0300
Subject: [Kimchi-devel] [PATCH V3 07/34] Update kimchi plugin docs
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-8-git-send-email-luciojhc@linux.vnet.ibm.com>

Update kimchi plugin documentation to reflect new plugin
structure.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/docs/API.md               |  112 ++++++++++++++----------------
 plugins/kimchi/docs/README-federation.md |   18 +++---
 plugins/kimchi/docs/README.md            |   37 +++++++---
 3 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/plugins/kimchi/docs/API.md b/plugins/kimchi/docs/API.md
index e022c9e..bfefeab 100644
--- a/plugins/kimchi/docs/API.md
+++ b/plugins/kimchi/docs/API.md
@@ -31,13 +31,13 @@ the following general conventions:
       URI. Available *actions* are described within the *actions* property of a
       Resource representation.  The request body *must* contain a JSON object
       which specifies parameters.
-* URIs begin with a '/' to indicate the root of the API.
+* URIs begin with '/plugins/kimchi' to indicate the root of Kimchi plugin.
     * Variable segments in the URI begin with a ':' and should replaced with the
       appropriate resource identifier.
 
 ### Collection: Virtual Machines
 
-**URI:** /vms
+**URI:** /plugins/kimchi/vms
 
 **Methods:**
 
@@ -61,7 +61,7 @@ the following general conventions:
 
 ### Resource: Virtual Machine
 
-**URI:** /vms/*:name*
+**URI:** /plugins/kimchi/vms/*:name*
 
 **Methods:**
 
@@ -149,7 +149,7 @@ the following general conventions:
 
 ### Sub-resource: Virtual Machine Screenshot
 
-**URI:** /vms/*:name*/screenshot
+**URI:** /plugins/kimchi/vms/*:name*/screenshot
 
 Represents a snapshot of the Virtual Machine's primary monitor.
 
@@ -159,7 +159,7 @@ Represents a snapshot of the Virtual Machine's primary monitor.
 
 
 ### Sub-collection: Virtual Machine storages
-**URI:** /vms/*:name*/storages
+**URI:** /plugins/kimchi/vms/*:name*/storages
 * **GET**: Retrieve a summarized list of all storages of specified guest
 * **POST**: Attach a new storage or virtual drive to specified virtual machine.
     * type: The type of the storage (currently support 'cdrom' and 'disk').
@@ -168,7 +168,7 @@ Represents a snapshot of the Virtual Machine's primary monitor.
     * vol: Storage volume name of disk image.
 
 ### Sub-resource: storage
-**URI:** /vms/*:name*/storages/*:dev*
+**URI:** /plugins/kimchi/vms/*:name*/storages/*:dev*
 * **GET**: Retrieve storage information
     * dev: The name of the storage in the vm.
     * type: The type of the storage (currently support 'cdrom' and 'disk').
@@ -182,28 +182,28 @@ Represents a snapshot of the Virtual Machine's primary monitor.
 
 
 ### Sub-collection: Virtual Machine Passthrough Devices
-**URI:** /vms/*:name*/hostdevs
+**URI:** /plugins/kimchi/vms/*:name*/hostdevs
 * **GET**: Retrieve a summarized list of all directly assigned host device of
            specified guest.
 * **POST**: Directly assign a host device to guest.
     * name: The name of the host device to be assigned to vm.
 
 ### Sub-resource: Device
-**URI:** /vms/*:name*/hostdevs/*:dev*
+**URI:** /plugins/kimchi/vms/*:name*/hostdevs/*:dev*
 * **GET**: Retrieve assigned device information
     * name: The name of the assigned device.
     * type: The type of the assigned device.
 * **DELETE**: Detach the host device from VM.
 
 ### Sub-collection: Virtual Machine Snapshots
-**URI:** /vms/*:name*/snapshots
+**URI:** /plugins/kimchi/vms/*:name*/snapshots
 * **POST**: Create a new snapshot on a VM.
     * name: The snapshot name (optional, defaults to a value based on the
             current time).
 * **GET**: Retrieve a list of snapshots on a VM.
 
 ### Sub-resource: Snapshot
-**URI:** /vms/*:name*/snapshots/*:snapshot*
+**URI:** /plugins/kimchi/vms/*:name*/snapshots/*:snapshot*
 * **GET**: Retrieve snapshot information.
     * created: The time when the snapshot was created
                (in seconds, since the epoch).
@@ -220,12 +220,12 @@ Represents a snapshot of the Virtual Machine's primary monitor.
 * revert: Revert the domain to the given snapshot.
 
 ### Sub-resource: Current snapshot
-**URI:** /vms/*:name*/snapshots/current
+**URI:** /plugins/kimchi/vms/*:name*/snapshots/current
 * **GET**: Retrieve current snapshot information for the virtual machine.
 
 ### Collection: Templates
 
-**URI:** /templates
+**URI:** /plugins/kimchi/templates
 
 **Methods:**
 
@@ -270,7 +270,7 @@ Represents a snapshot of the Virtual Machine's primary monitor.
 
 ### Sub-Collection: Virtual Machine Network Interfaces
 
-**URI:** /vms/*:name*/ifaces
+**URI:** /plugins/kimchi/vms/*:name*/ifaces
 
 Represents all network interfaces attached to a Virtual Machine.
 
@@ -289,7 +289,7 @@ Represents all network interfaces attached to a Virtual Machine.
 
 ### Sub-Resource: Virtual Machine Network Interface
 
-**URI:** /vms/*:name*/ifaces/*:mac*
+**URI:** /plugins/kimchi/vms/*:name*/ifaces/*:mac*
 
 A interface represents available network interface on VM.
 
@@ -324,7 +324,7 @@ A interface represents available network interface on VM.
 
 ### Resource: Template
 
-**URI:** /templates/*:name*
+**URI:** /plugins/kimchi/templates/*:name*
 
 **Methods:**
 
@@ -397,7 +397,7 @@ A interface represents available network interface on VM.
 
 ### Collection: Storage Pools
 
-**URI:** /storagepools
+**URI:** /plugins/kimchi/storagepools
 
 **Methods:**
 
@@ -428,7 +428,7 @@ A interface represents available network interface on VM.
 
 ### Resource: Storage Pool
 
-**URI:** /storagepools/*:name*
+**URI:** /plugins/kimchi/storagepools/*:name*
 
 **Methods:**
 
@@ -473,7 +473,7 @@ A interface represents available network interface on VM.
 
 ### Collection: Storage Volumes
 
-**URI:** /storagepools/*:poolname*/storagevolumes
+**URI:** /plugins/kimchi/storagepools/*:poolname*/storagevolumes
 
 **Methods:**
 
@@ -493,7 +493,7 @@ A interface represents available network interface on VM.
 
 ### Resource: Storage Volume
 
-**URI:** /storagepools/*:poolname*/storagevolumes/*:name*
+**URI:** /plugins/kimchi/storagepools/*:poolname*/storagevolumes/*:name*
 
 **Methods:**
 
@@ -531,7 +531,7 @@ A interface represents available network interface on VM.
 
 ### Collection: Interfaces
 
-**URI:** /interfaces
+**URI:** /plugins/kimchi/interfaces
 
 **Methods:**
 
@@ -539,7 +539,7 @@ A interface represents available network interface on VM.
 
 ### Resource: Interface
 
-**URI:** /interfaces/*:name*
+**URI:** /plugins/kimchi/interfaces/*:name*
 
 A interface represents available interface on host.
 
@@ -570,7 +570,7 @@ A interface represents available interface on host.
 
 ### Collection: Networks
 
-**URI:** /networks
+**URI:** /plugins/kimchi/networks
 
 **Methods:**
 
@@ -592,7 +592,7 @@ A interface represents available interface on host.
 
 ### Resource: Network
 
-**URI:** /networks/*:name*
+**URI:** /plugins/kimchi/networks/*:name*
 
 **Methods:**
 
@@ -637,7 +637,7 @@ A interface represents available interface on host.
 
 ### Collection: Tasks
 
-**URI:** /tasks
+**URI:** /plugins/kimchi/tasks
 
 **Methods:**
 
@@ -645,7 +645,7 @@ A interface represents available interface on host.
 
 ### Resource: Task
 
-**URI:** /tasks/*:id*
+**URI:** /plugins/kimchi/tasks/*:id*
 
 A task represents an asynchronous operation that is being performed by the
 server.
@@ -668,7 +668,7 @@ server.
 
 ### Resource: Configuration
 
-**URI:** /config
+**URI:** /plugins/kimchi/config
 
 Contains information about the application environment and configuration.
 
@@ -685,7 +685,7 @@ Contains information about the application environment and configuration.
 
 ### Resource: Capabilities
 
-**URI:** /config/capabilities
+**URI:** /plugins/kimchi/config/capabilities
 
 Contains information about the host capabilities: iso streaming, screenshot
 creation.
@@ -716,7 +716,7 @@ creation.
 
 ### Collection: Storage Servers
 
-**URI:** /storageservers
+**URI:** /plugins/kimchi/storageservers
 
 **Methods:**
 
@@ -727,7 +727,7 @@ creation.
 
 ### Resource: Storage Server
 
-**URI:** /storageservers/*:host*
+**URI:** /plugins/kimchi/storageservers/*:host*
 
 **Methods:**
 
@@ -737,7 +737,7 @@ creation.
 
 ### Collection: Storage Targets
 
-**URI:** /storageservers/*:name*/storagetargets
+**URI:** /plugins/kimchi/storageservers/*:name*/storagetargets
 
 **Methods:**
 
@@ -754,7 +754,7 @@ creation.
 
 ### Collection: Distros
 
-**URI:** /config/distros
+**URI:** /plugins/kimchi/config/distros
 
 **Methods:**
 
@@ -762,7 +762,7 @@ creation.
 
 ### Resource: Distro
 
-**URI:** /config/distros/*:name*
+**URI:** /plugins/kimchi/config/distros/*:name*
 
 Contains information about the OS distribution.
 
@@ -780,7 +780,7 @@ Contains information about the OS distribution.
 
 #### Collection: Debug Reports
 
-**URI:** /debugreports
+**URI:** /plugins/kimchi/debugreports
 
 **Methods:**
 
@@ -792,7 +792,7 @@ Contains information about the OS distribution.
 
 ### Resource: Debug Report
 
-**URI:** /debugreports/*:name*
+**URI:** /plugins/kimchi/debugreports/*:name*
 
 A Debug Report is an archive of logs and other information about the host that
 is used to diagnose and debug problems. The exact format and contents are
@@ -819,7 +819,7 @@ specific to the low level collection tool being used.
 
 ### Sub-resource: Debug Report content
 
-**URI:** /debugreports/*:name*/content
+**URI:** /plugins/kimchi/debugreports/*:name*/content
 
 It is the sub-resource of Debug Report and the client use it to get the real content
 of the Debug Report file from the server
@@ -832,7 +832,7 @@ of the Debug Report file from the server
 
 ### Resource: Host
 
-**URI:** /host
+**URI:** /plugins/kimchi/host
 Contains information of host.
 
 **Methods:**
@@ -859,7 +859,7 @@ Contains information of host.
 
 ### Resource: Users
 
-**URI:** /users
+**URI:** /plugins/kimchi/users
 List of available users.
 
 **Methods:**
@@ -871,7 +871,7 @@ List of available users.
 
 ### Resource: Groups
 
-**URI:** /groups
+**URI:** /plugins/kimchi/groups
 List of available groups.
 
 **Methods:**
@@ -880,7 +880,7 @@ List of available groups.
 
 ### Resource: HostStats
 
-**URI:** /host/stats
+**URI:** /plugins/kimchi/host/stats
 
 Contains the host sample data.
 
@@ -912,7 +912,7 @@ Contains the host sample data.
 
 ### Resource: HostStats
 
-**URI:** /host/cpuinfo
+**URI:** /plugins/kimchi/host/cpuinfo
 
 The cores and sockets of a hosts's CPU. Useful when sizing VMs to take
 advantages of the perforamance benefits of SMT (Power) or Hyper-Threading (Intel).
@@ -936,7 +936,7 @@ advantages of the perforamance benefits of SMT (Power) or Hyper-Threading (Intel
 
 ### Resource: HostStatsHistory
 
-**URI:** /host/stats/history
+**URI:** /plugins/kimchi/host/stats/history
 
 It is the sub-resource of Host Stats and the client uses it to get the host
 stats history
@@ -962,17 +962,9 @@ stats history
 
 *No actions defined*
 
-### Collection: Plugins
-
-**URI:** /plugins
-
-**Methods:**
-
-* **GET**: Retrieve a summarized list names of all UI Plugins
-
 ### Collection: Partitions
 
-**URI:** /host/partitions
+**URI:** /plugins/kimchi/host/partitions
 
 **Methods:**
 
@@ -980,7 +972,7 @@ stats history
 
 ### Resource: Partition
 
-**URI:** /host/partitions/*:name*
+**URI:** /plugins/kimchi/host/partitions/*:name*
 
 **Methods:**
 
@@ -998,7 +990,7 @@ stats history
 
 ### Collection: Devices
 
-**URI:** /host/devices
+**URI:** /plugins/kimchi/host/devices
 
 **Methods:**
 
@@ -1016,7 +1008,7 @@ stats history
 
 ### Resource: Device
 
-**URI:** /host/devices/*:name*
+**URI:** /plugins/kimchi/host/devices/*:name*
 
 **Methods:**
 
@@ -1045,11 +1037,11 @@ stats history
 
 
 ### Sub-collection: VMs with the device assigned.
-**URI:** /host/devices/*:name*/vmholders
+**URI:** /plugins/kimchi/host/devices/*:name*/vmholders
 * **GET**: Retrieve a summarized list of all VMs holding the device.
 
 ### Sub-resource: VM holder
-**URI:** /host/devices/*:name*/vmholders/*:vm*
+**URI:** /plugins/kimchi/host/devices/*:name*/vmholders/*:vm*
 * **GET**: Retrieve information of the VM which is holding the device
     * name: The name of the VM.
     * state: The power state of the VM. Could be "running" and "shutdown".
@@ -1057,7 +1049,7 @@ stats history
 
 ### Collection: Host Packages Update
 
-**URI:** /host/packagesupdate
+**URI:** /plugins/kimchi/host/packagesupdate
 
 Contains the information and action of packages update in the host.
 
@@ -1067,7 +1059,7 @@ Contains the information and action of packages update in the host.
 
 ### Resource: Host Package Update
 
-**URI:** /host/packagesupdate/*:name*
+**URI:** /plugins/kimchi/host/packagesupdate/*:name*
 
 Contains the information for a specific package to be updated.
 
@@ -1081,7 +1073,7 @@ Contains the information for a specific package to be updated.
 
 ### Collection: Host Repositories
 
-**URI:** /host/repositories
+**URI:** /plugins/kimchi/host/repositories
 
 **Methods:**
 
@@ -1101,7 +1093,7 @@ http://, ftp:// or file://  URL.
 
 ### Resource: Repository
 
-**URI:** /host/repositories/*:repo-id*
+**URI:** /plugins/kimchi/host/repositories/*:repo-id*
 
 **Methods:**
 
@@ -1147,7 +1139,7 @@ http://, ftp:// or file://  URL.
 
 ### Collection: Peers
 
-**URI:** /peers
+**URI:** /plugins/kimchi/peers
 
 **Methods:**
 
diff --git a/plugins/kimchi/docs/README-federation.md b/plugins/kimchi/docs/README-federation.md
index b71a172..c184f4f 100644
--- a/plugins/kimchi/docs/README-federation.md
+++ b/plugins/kimchi/docs/README-federation.md
@@ -1,11 +1,11 @@
 Kimchi Project - Federation Feature
 ===================================
 
-Federation feature is a mechanism to discover Kimchi peers in the same network.
-It uses openSLP tool (http://www.openslp.org/) to register and find the Kimchi
+Federation feature is a Kimchi mechanism to discover Wok peers in the same
+network. It uses openSLP tool (http://www.openslp.org/) to register and find Wok
 servers.
 
-By default this feature is disabled on Kimchi as it is not critical for KVM
+By default this feature is disabled on Wok as it is not critical for KVM
 virtualization and requires additional software installation.
 
 To enable it, do the following:
@@ -43,18 +43,18 @@ To enable it, do the following:
    For system using iptables, do:
    sudo iptables -A INPUT -s <subnet> -j ACCEPT
 
-4. Start slpd service and make sure it is up while running Kimchi
+4. Start slpd service and make sure it is up while running Wok
    sudo service slpd start
 
-5. Enable federation on Kimchi by editing the /etc/kimchi/kimchi.conf file:
+5. Enable federation on Wok by editing the /etc/wok/wok.conf file:
 
    federation = on
 
-6. Then start Kimchi service
-   sudo service kimchid start
+6. Then start Wok service
+   sudo service wokd start
 
-The Kimchi server will be registered on openSLP on server starting up and will
-be found by other Kimchi peers (with federation feature enabled) in the same
+The Wok server will be registered on openSLP on server starting up and will
+be found by other Wok peers (with federation feature enabled) in the same
 network.
 
 Enjoy!
diff --git a/plugins/kimchi/docs/README.md b/plugins/kimchi/docs/README.md
index 034a591..f400333 100644
--- a/plugins/kimchi/docs/README.md
+++ b/plugins/kimchi/docs/README.md
@@ -4,9 +4,10 @@ Kimchi Project
 Kimchi is an HTML5 based management tool for KVM. It is designed to make it as
 easy as possible to get started with KVM and create your first guest.
 
-Kimchi runs as a daemon on the hypervisor host. It manages KVM guests through
-libvirt. The management interface is accessed over the web using a browser that
-supports HTML5.
+Kimchi runs as a Wok plugin. Wok runs as a daemon on the hypervisor host.
+
+Kimchi manages KVM guests through libvirt. The management interface is accessed
+over the web using a browser that supports HTML5.
 
 Browser Support
 ===============
@@ -33,11 +34,11 @@ find.
 Hypervisor Distro Support
 =========================
 
-Kimchi daemon might run on any GNU/Linux distribution that meets the conditions
+Kimchi and Wok might run on any GNU/Linux distribution that meets the conditions
 described on the 'Getting Started' section below.
 
-The Kimchi community makes an effort to test with the latest versions of Fedora,
-RHEL, OpenSuSe, and Ubuntu.
+The Kimchi community makes an effort to test it with the latest versions of
+Fedora, RHEL, OpenSuSe, and Ubuntu.
 
 Getting Started
 ===============
@@ -125,6 +126,17 @@ information on how configure your system to access this repository.
 
 Build and Install
 -----------------
+
+    Wok:
+    $ ./autogen.sh --system
+
+    $ make
+    $ sudo make install   # Optional if running from the source tree
+
+
+    Kimchi:
+    $ cd plugins/kimchi
+
     For openSUSE 13.1:
     $ ./autogen.sh --with-spice-html5
 
@@ -137,12 +149,12 @@ Build and Install
 Run
 ---
 
-    $ sudo kimchid --host=0.0.0.0
+    $ sudo wokd --host=0.0.0.0
 
-If you cannot access Kimchi, take a look at these 2 points:
+If you cannot access Wok, take a look at these 2 points:
 
 1. Firewall
-Kimchi uses by default the ports 8000, 8001 and 64667. To allow incoming connections:
+Wok uses by default the ports 8000, 8001 and 64667. To allow incoming connections:
 
     For system using firewalld, do:
     sudo firewall-cmd --add-port=8000/tcp --permanent
@@ -164,7 +176,7 @@ Kimchi uses by default the ports 8000, 8001 and 64667. To allow incoming connect
 
 
 2. SELinux
-Allow httpd_t context for Kimchi web server:
+Allow httpd_t context for Wok web server:
 
     semanage permissive -a httpd_t
 
@@ -172,6 +184,7 @@ Allow httpd_t context for Kimchi web server:
 Test
 ----
 
+    $ cd plugins/kimchi
     $ make check-local # check for i18n and formatting errors
     $ sudo make check
 
@@ -183,9 +196,9 @@ Usage
 
 Connect your browser to https://localhost:8001.  You should see a screen like:
 
-![Kimchi Login Screen](/docs/kimchi-login.png)
+![Wok Login Screen](/docs/kimchi-login.png)
 
-Kimchi uses PAM to authenticate users so you can log in with the same username
+Wok uses PAM to authenticate users so you can log in with the same username
 and password that you would use to log in to the machine itself.  Once logged in
 you will see a screen like:
 
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:40 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:40 -0300
Subject: [Kimchi-devel] [PATCH V3 08/34] Update wok build files
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-9-git-send-email-luciojhc@linux.vnet.ibm.com>

Update autoconf and all build files to the new directory
structure

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 .gitignore                             |   18 +++---
 Makefile.am                            |   91 +++++++++++++++----------------
 configure.ac                           |   38 +++----------
 contrib/Makefile.am                    |   12 ++--
 docs/Makefile.am                       |    9 +--
 plugins/Makefile.am                    |    2 +-
 po/Makevars                            |    2 +-
 po/POTFILES.in                         |    3 +-
 po/gen-pot.in                          |    2 +-
 src/Makefile.am                        |   24 ++++----
 src/nginx/Makefile.am                  |    6 +-
 src/wok/Makefile.am                    |   18 +++---
 src/wok/config.py.in                   |    2 +-
 src/wok/control/Makefile.am            |    4 +-
 src/wok/model/Makefile.am              |    2 +-
 src/wok/xmlutils/Makefile.am           |    2 +-
 ui/Makefile.am                         |    4 +-
 ui/css/Makefile.am                     |    2 +-
 ui/images/Makefile.am                  |    4 +-
 ui/images/theme-default/Makefile.am    |    2 +-
 ui/js/Makefile.am                      |    8 ++--
 ui/libs/Makefile.am                    |    2 +-
 ui/libs/themes/base/Makefile.am        |    2 +-
 ui/libs/themes/base/images/Makefile.am |    2 +-
 ui/pages/Makefile.am                   |    4 +-
 ui/pages/websockify/Makefile.am        |    2 +-
 26 files changed, 118 insertions(+), 149 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3988b6..a9bbc16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,19 +18,20 @@ configure
 config.log
 config.status
 contrib/DEBIAN/control
-contrib/kimchi.spec.fedora
-contrib/kimchi.spec.suse
+contrib/wok.spec.fedora
+contrib/wok.spec.suse
 contrib/make-deb.sh
-docs/kimchid.8
+docs/wokd.8
 *.min.css
 *.min.js
 *.gmo
 stamp-po
-kimchi-*.tar.gz
-src/kimchid
-src/kimchi.conf
-src/nginx/kimchi.conf
-src/kimchi/config.py
+wok-*.tar.gz
+wok.spec
+src/wokd
+src/wok.conf
+src/nginx/wok.conf
+src/wok/config.py
 tests/run_tests.sh
 tests/test_config.py
 plugins/sample/po/POTFILES
@@ -40,4 +41,3 @@ po/gen-pot
 *.orig
 *.rej
 *.pem
-ui/pages/help/*/*.html
diff --git a/Makefile.am b/Makefile.am
index 0e6e59e..dfc7576 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,9 +16,9 @@
 # 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
-SUBDIRS = src ui docs contrib tests po config plugins
+SUBDIRS = src ui docs contrib po plugins
 
-man_MANS = docs/kimchid.8
+man_MANS = docs/wokd.8
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -35,12 +35,12 @@ EXTRA_DIST = \
 	$(NULL)
 
 
-PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py
+PEP8_BLACKLIST = *src/wok/config.py,*src/wok/i18n.py
 
-SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py"
+SKIP_PYFLAKES_ERR = "\./src/wok/websocket\.py"
 
 I18N_FILES = plugins/*/i18n.py \
-	src/kimchi/i18n.py \
+	src/wok/i18n.py \
 	$(NULL)
 
 check-local:
@@ -60,7 +60,7 @@ all-local:
 	while read L && test -n "$$L"; do                  \
 		dir=mo/$$L/LC_MESSAGES ;                       \
 		$(MKDIR_P) $$dir ;                             \
-		ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ;   \
+		ln -sf ../../../po/$$L.gmo $$dir/wok.mo ;   \
 	done < po/LINGUAS
 
 #
@@ -69,44 +69,41 @@ all-local:
 
 install-deb: install
 	cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/
-	mkdir -p $(DESTDIR)/var/lib/kimchi/debugreports
-	mkdir -p $(DESTDIR)/var/lib/kimchi/screenshots
-	mkdir -p $(DESTDIR)/var/lib/kimchi/vnc-tokens
-	mkdir -p $(DESTDIR)/var/lib/kimchi/isos
-	touch $(DESTDIR)/var/lib/kimchi/objectstore
+	mkdir -p $(DESTDIR)/var/lib/wok/vnc-tokens
+	touch $(DESTDIR)/var/lib/wok/objectstore
 	$(MKDIR_P) $(DESTDIR)/etc/init
 	$(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services
-	cp -R $(top_srcdir)/contrib/kimchid-upstart.conf.debian \
-		$(DESTDIR)/etc/init/kimchid.conf
+	cp -R $(top_srcdir)/contrib/wokd-upstart.conf.debian \
+		$(DESTDIR)/etc/init/wokd.conf
 	cp -R $(top_srcdir)/src/firewalld.xml \
-		$(DESTDIR)/usr/lib/firewalld/services/kimchid.xml
+		$(DESTDIR)/usr/lib/firewalld/services/wokd.xml
 
 
 deb: contrib/make-deb.sh
 	$(top_srcdir)/contrib/make-deb.sh
 
-kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse
+wok.spec: contrib/wok.spec.fedora contrib/wok.spec.suse
 	@if test -e /etc/redhat-release; then                   \
-		ln -sf contrib/kimchi.spec.fedora $@ ;              \
+		ln -sf contrib/wok.spec.fedora $@ ;              \
 	elif test -e /etc/SuSE-release; then                    \
-		ln -sf contrib/kimchi.spec.suse $@ ;                \
+		ln -sf contrib/wok.spec.suse $@ ;                \
 	else                                                    \
 		echo "Unable to select a spec file for RPM build" ; \
 		/bin/false ;                                        \
 	fi
 
-rpm: dist kimchi.spec
+rpm: dist wok.spec
 	$(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS
-	cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec
+	cp $(top_srcdir)/wok.spec rpm/SPECS/wok.spec
 	cp $(DIST_ARCHIVES) rpm/SOURCES
-	rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec
+	rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/wok.spec
 
-fedora-rpm: contrib/kimchi.spec.fedora
-	ln -sf contrib/kimchi.spec.fedora kimchi.spec
+fedora-rpm: contrib/wok.spec.fedora
+	ln -sf contrib/wok.spec.fedora wok.spec
 	$(MAKE) rpm
 
-suse-rpm: contrib/kimchi.spec.suse
-	ln -sf contrib/kimchi.spec.suse kimchi.spec
+suse-rpm: contrib/wok.spec.suse
+	ln -sf contrib/wok.spec.suse wok.spec
 	$(MAKE) rpm
 
 ChangeLog:
@@ -117,39 +114,39 @@ ChangeLog:
 install-data-local:
 	@if test -d "$(systemdsystemunitdir)" ; then \
 		mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \
-		$(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \
+		$(INSTALL_DATA) contrib/wokd.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/wokd.service; \
 	else \
 		mkdir -p $(DESTDIR)/etc/init.d/; \
-		$(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \
-		chmod +x $(DESTDIR)/etc/init.d/kimchid; \
+		$(INSTALL_DATA) contrib/wokd.sysvinit $(DESTDIR)/etc/init.d/wokd; \
+		chmod +x $(DESTDIR)/etc/init.d/wokd; \
     fi; \
 	if test -d /usr/lib/firewalld/services/; then \
 		mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \
-		$(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \
+		$(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \
 	fi; \
-	mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos}
-	touch $(DESTDIR)/var/lib/kimchi/objectstore
-	mkdir -p $(DESTDIR)/var/log/kimchi/
-	touch $(DESTDIR)/var/log/kimchi/kimchi-access.log
-	touch $(DESTDIR)/var/log/kimchi/kimchi-error.log
-	mkdir -p $(DESTDIR)/etc/kimchi/
-	$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/kimchi/dhparams.pem
-	touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf
+	mkdir -p $(DESTDIR)/var/lib/wok/vnc-tokens
+	touch $(DESTDIR)/var/lib/wok/objectstore
+	mkdir -p $(DESTDIR)/var/log/wok/
+	touch $(DESTDIR)/var/log/wok/wok-access.log
+	touch $(DESTDIR)/var/log/wok/wok-error.log
+	mkdir -p $(DESTDIR)/etc/wok/
+	$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem
+	touch $(DESTDIR)/etc/nginx/conf.d/wok.conf
 
 uninstall-local:
-	@if test -f $(systemdsystemunitdir)/kimchid.service; then \
-		$(RM) $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \
-	elif test -f /etc/init.d/kimchid; then \
-		$(RM) $(DESTDIR)/etc/init.d/kimchid; \
-		$(RM) $(DESTDIR)/etc/init/kimchi.conf; \
+	@if test -f $(systemdsystemunitdir)/wokd.service; then \
+		$(RM) $(DESTDIR)/$(systemdsystemunitdir)/wokd.service; \
+	elif test -f /etc/init.d/wokd; then \
+		$(RM) $(DESTDIR)/etc/init.d/wokd; \
+		$(RM) $(DESTDIR)/etc/init/wok.conf; \
 	fi; \
 	if test -d /usr/lib/firewalld/services/; then \
-		$(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \
+		$(RM) $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \
 	fi; \
-	$(RM) -rf $(DESTDIR)/var/lib/kimchi
-	$(RM) -rf $(DESTDIR)/var/log/kimchi
-	$(RM) -rf $(DESTDIR)/etc/kimchi
-	$(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf
+	$(RM) -rf $(DESTDIR)/var/lib/wok
+	$(RM) -rf $(DESTDIR)/var/log/wok
+	$(RM) -rf $(DESTDIR)/etc/wok
+	$(RM) $(DESTDIR)/etc/nginx/conf.d/wok.conf
 
 VERSION:
 	@if test -d .git; then                                \
@@ -162,4 +159,4 @@ VERSION:
 clean-local:
 	rm -rf mo rpm
 
-CLEANFILES = kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`
+CLEANFILES = wok.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`
diff --git a/configure.ac b/configure.ac
index 9e3edb8..47c2e6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-AC_INIT([kimchi], [m4_esyscmd([./build-aux/pkg-version --version])])
+AC_INIT([wok], [m4_esyscmd([./build-aux/pkg-version --version])])
 
 AC_SUBST([PACKAGE_VERSION],
          [m4_esyscmd([./build-aux/pkg-version --version])])
@@ -87,15 +87,13 @@ AC_CONFIG_FILES([
     po/gen-pot
     Makefile
     docs/Makefile
-    docs/kimchid.8
+    docs/wokd.8
     src/Makefile
-    src/distros.d/Makefile
     src/nginx/Makefile
-    src/kimchi/Makefile
-    src/kimchi/control/Makefile
-    src/kimchi/control/vm/Makefile
-    src/kimchi/model/Makefile
-    src/kimchi/xmlutils/Makefile
+    src/wok/Makefile
+    src/wok/control/Makefile
+    src/wok/model/Makefile
+    src/wok/xmlutils/Makefile
     plugins/Makefile
     plugins/sample/Makefile
     plugins/sample/po/Makefile.in
@@ -112,37 +110,17 @@ AC_CONFIG_FILES([
     ui/images/Makefile
     ui/images/theme-default/Makefile
     ui/js/Makefile
-    ui/spice-html5/Makefile
-    ui/spice-html5/css/Makefile
-    ui/spice-html5/pages/Makefile
-    ui/spice-html5/thirdparty/Makefile
     ui/libs/Makefile
     ui/libs/themes/Makefile
     ui/libs/themes/base/Makefile
     ui/libs/themes/base/images/Makefile
     ui/pages/Makefile
-    ui/pages/help/Makefile
-    ui/pages/help/en_US/Makefile
-    ui/pages/help/de_DE/Makefile
-    ui/pages/help/es_ES/Makefile
-    ui/pages/help/fr_FR/Makefile
-    ui/pages/help/it_IT/Makefile
-    ui/pages/help/ja_JP/Makefile
-    ui/pages/help/ko_KR/Makefile
-    ui/pages/help/pt_BR/Makefile
-    ui/pages/help/ru_RU/Makefile
-    ui/pages/help/zh_CN/Makefile
-    ui/pages/help/zh_TW/Makefile
-    ui/pages/tabs/Makefile
     ui/pages/websockify/Makefile
     contrib/Makefile
     contrib/DEBIAN/Makefile
     contrib/DEBIAN/control
-    contrib/kimchi.spec.fedora
-    contrib/kimchi.spec.suse
-    tests/Makefile
-    config/Makefile
-    config/ui/Makefile
+    contrib/wok.spec.fedora
+    contrib/wok.spec.suse
 ],[
     chmod +x po/gen-pot
 ])
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 393306f..b537df5 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -18,11 +18,11 @@ SUBDIRS = DEBIAN
 
 EXTRA_DIST = \
 	check_i18n.py \
-	kimchid.sysvinit \
-	kimchid.service.fedora \
-	kimchi.spec.fedora.in \
-	kimchid-upstart.conf.debian \
-	kimchid-upstart.conf.fedora \
+	wokd.sysvinit \
+	wokd.service.fedora \
+	wok.spec.fedora.in \
+	wokd-upstart.conf.debian \
+	wokd-upstart.conf.fedora \
 	make-deb.sh.in \
 	$(NULL)
 
@@ -35,4 +35,4 @@ make-deb.sh: make-deb.sh.in $(top_builddir)/config.status
 	    mv $@-t $@
 BUILT_SOURCES = make-deb.sh
 
-CLEANFILES = kimchi.spec.fedora kimchi.spec.suse kimchi.spec make-deb.sh
+CLEANFILES = wok.spec.fedora wok.spec.suse wok.spec make-deb.sh
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2f686f1..db23721 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -17,15 +17,12 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-docdir = $(datadir)/kimchi/doc
+docdir = $(datadir)/wok/doc
 
 dist_doc_DATA = \
 	API.md \
 	README.md \
-	README-federation.md \
-	kimchi-guest.png \
-	kimchi-templates.png \
-	kimchid.8 \
+	wokd.8 \
 	$(NULL)
 
-CLEANFILES = kimchid.8
+CLEANFILES = wokd.8
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 894d28e..21a6ece 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -22,4 +22,4 @@ SUBDIRS = sample
 plugins_PYTHON = \
 	__init__.py
 
-pluginsdir = $(pythondir)/kimchi/plugins
+pluginsdir = $(pythondir)/wok/plugins
diff --git a/po/Makevars b/po/Makevars
index c29a807..e135764 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = kimchi
+DOMAIN = wok
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 57bc711..aae0ca9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
 # List of source files which contain translatable strings.
-src/kimchi/i18n.py
+src/wok/i18n.py
 ui/pages/*.tmpl
-ui/pages/tabs/*.tmpl
diff --git a/po/gen-pot.in b/po/gen-pot.in
index 0e3cd10..7ccf28b 100644
--- a/po/gen-pot.in
+++ b/po/gen-pot.in
@@ -6,4 +6,4 @@ for src in $@; do
     else
         cat $src | @CHEETAH@ compile -
     fi
-done | xgettext --no-location -o kimchi.pot -L Python -
+done | xgettext --no-location -o wok.pot -L Python -
diff --git a/src/Makefile.am b/src/Makefile.am
index e0e0821..2fed7d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,19 +17,19 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-SUBDIRS = kimchi distros.d nginx
+SUBDIRS = wok nginx
 
-EXTRA_DIST = kimchid.in \
-	kimchi.conf.in \
+EXTRA_DIST = wokd.in \
+	wok.conf.in \
 	firewalld.xml \
 	$(NULL)
 
-bin_SCRIPTS = kimchid
+bin_SCRIPTS = wokd
 
-confdir = $(sysconfdir)/kimchi
-dist_conf_DATA = kimchi.conf template.conf
+confdir = $(sysconfdir)/wok
+dist_conf_DATA = wok.conf
 
-BUILT_SOURCES = kimchi.conf
+BUILT_SOURCES = wok.conf
 
 do_substitution = \
 	sed -e 's,[@]pythondir[@],$(pythondir),g'     \
@@ -38,12 +38,12 @@ do_substitution = \
 	-e 's,[@]VERSION[@],$(VERSION),g'
 
 
-kimchid: kimchid.in Makefile
-	$(do_substitution) < $(srcdir)/kimchid.in > kimchid
-	chmod +x kimchid
+wokd: wokd.in Makefile
+	$(do_substitution) < $(srcdir)/wokd.in > wokd
+	chmod +x wokd
 
-kimchi.conf: kimchi.conf.in Makefile
-	$(do_substitution) < kimchi.conf.in > kimchi.conf
+wok.conf: wok.conf.in Makefile
+	$(do_substitution) < wok.conf.in > wok.conf
 
 # Generate unique Diffie-Hellman group with 2048-bit
 all-local: dhparams.pem
diff --git a/src/nginx/Makefile.am b/src/nginx/Makefile.am
index c754947..0f36b44 100644
--- a/src/nginx/Makefile.am
+++ b/src/nginx/Makefile.am
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-EXTRA_DIST = kimchi.conf.in
+EXTRA_DIST = wok.conf.in
 
 confdir = $(sysconfdir)/nginx/conf.d
-dist_conf_DATA = kimchi.conf.in
+dist_conf_DATA = wok.conf.in
 
-CLEANFILES = kimchi.conf
+CLEANFILES = wok.conf
diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am
index 5c204e0..6e00907 100644
--- a/src/wok/Makefile.am
+++ b/src/wok/Makefile.am
@@ -19,9 +19,9 @@
 
 SUBDIRS = control model xmlutils
 
-kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py))
+wok_PYTHON = $(filter-out config.py, $(wildcard *.py))
 
-nodist_kimchi_PYTHON = config.py
+nodist_wok_PYTHON = config.py
 
 EXTRA_DIST = \
 	API.json \
@@ -33,14 +33,14 @@ else
 WITH_SPICE=no
 endif
 
-kimchidir = $(pythondir)/kimchi
+wokdir = $(pythondir)/wok
 
 install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(kimchidir)
-	$(INSTALL_DATA) API.json $(DESTDIR)$(kimchidir)/API.json
+	$(MKDIR_P) $(DESTDIR)$(wokdir)
+	$(INSTALL_DATA) API.json $(DESTDIR)$(wokdir)/API.json
 
 uninstall-local:
-	$(RM) $(DESTDIR)$(kimchidir)/API.json
+	$(RM) $(DESTDIR)$(wokdir)/API.json
 
 do_substitution = \
 	sed -e 's,[@]prefix[@],$(prefix),g'             \
@@ -48,9 +48,9 @@ do_substitution = \
 	-e 's,[@]sysconfdir[@],$(sysconfdir),g'         \
 	-e 's,[@]localstatedir[@],$(localstatedir),g'   \
 	-e 's,[@]pkgdatadir[@],$(pkgdatadir),g'         \
-	-e 's,[@]kimchidir[@],$(kimchidir),g'           \
-	-e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \
-	-e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \
+	-e 's,[@]wokdir[@],$(wokdir),g'           \
+	-e 's,[@]wokversion[@],$(PACKAGE_VERSION),g' \
+	-e 's,[@]wokrelease[@],$(PACKAGE_RELEASE),g' \
 	-e 's,[@]withspice[@],$(WITH_SPICE),g'
 
 
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index d2c5169..1408024 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -136,7 +136,7 @@ class Paths(object):
         else:
             base = os.path.dirname('./%s' % __file__)
 
-        if os.access('%s/../../src/kimchi/config.py' % base, os.F_OK):
+        if os.access('%s/../../src/wok/config.py' % base, os.F_OK):
             return os.path.abspath('%s/../..' % base)
         else:
             return '@pkgdatadir@'
diff --git a/src/wok/control/Makefile.am b/src/wok/control/Makefile.am
index fee98dc..d6cb3f0 100644
--- a/src/wok/control/Makefile.am
+++ b/src/wok/control/Makefile.am
@@ -17,11 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-SUBDIRS = vm
-
 control_PYTHON = *.py
 
-controldir = $(pythondir)/kimchi/control
+controldir = $(pythondir)/wok/control
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(controldir)
diff --git a/src/wok/model/Makefile.am b/src/wok/model/Makefile.am
index a6ccbf0..8f0f102 100644
--- a/src/wok/model/Makefile.am
+++ b/src/wok/model/Makefile.am
@@ -19,7 +19,7 @@
 
 model_PYTHON = *.py
 
-modeldir = $(pythondir)/kimchi/model
+modeldir = $(pythondir)/wok/model
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(modeldir)
diff --git a/src/wok/xmlutils/Makefile.am b/src/wok/xmlutils/Makefile.am
index 73f86f4..69aa524 100644
--- a/src/wok/xmlutils/Makefile.am
+++ b/src/wok/xmlutils/Makefile.am
@@ -19,7 +19,7 @@
 
 xmlutils_PYTHON = *.py
 
-xmlutilsdir = $(pythondir)/kimchi/xmlutils
+xmlutilsdir = $(pythondir)/wok/xmlutils
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(xmlutilsdir)
diff --git a/ui/Makefile.am b/ui/Makefile.am
index adb6ada..6be27ed 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = css fontello images js libs pages spice-html5
+SUBDIRS = css fontello images js libs pages
 
-uidir = $(datadir)/kimchi/ui
+uidir = $(datadir)/wok/ui
 
 dist_ui_DATA = robots.txt
diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
index f4f3dac..29ddb26 100644
--- a/ui/css/Makefile.am
+++ b/ui/css/Makefile.am
@@ -17,7 +17,7 @@
 
 EXTRA_DIST = theme-default
 
-cssdir = $(datadir)/kimchi/ui/css
+cssdir = $(datadir)/wok/ui/css
 dist_css_DATA = theme-default.min.css
 
 theme-default.min.css: theme-default/*.css
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
index 7b63d23..297c0bd 100644
--- a/ui/images/Makefile.am
+++ b/ui/images/Makefile.am
@@ -17,6 +17,6 @@
 
 SUBDIRS = theme-default
 
-imagedir = $(datadir)/kimchi/ui/images
+imagedir = $(datadir)/wok/ui/images
 
-dist_image_DATA = *.png *.ico
+dist_image_DATA = *.ico
diff --git a/ui/images/theme-default/Makefile.am b/ui/images/theme-default/Makefile.am
index 7c69b2a..336729c 100644
--- a/ui/images/theme-default/Makefile.am
+++ b/ui/images/theme-default/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-imagedir = $(datadir)/kimchi/ui/images/theme-default
+imagedir = $(datadir)/wok/ui/images/theme-default
 
 dist_image_DATA = *.png *.gif
diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am
index d0653b9..2549846 100644
--- a/ui/js/Makefile.am
+++ b/ui/js/Makefile.am
@@ -17,11 +17,11 @@
 
 EXTRA_DIST = src widgets
 
-jsdir = $(datadir)/kimchi/ui/js
+jsdir = $(datadir)/wok/ui/js
 
-dist_js_DATA = kimchi.min.js $(filter-out kimchi.min.js, $(wildcard *.js))
+dist_js_DATA = wok.min.js $(filter-out wok.min.js, $(wildcard *.js))
 
-kimchi.min.js: widgets/*.js src/*.js
+wok.min.js: widgets/*.js src/*.js
 	cat $(sort $^) > $@
 
-CLEANFILES = kimchi.min.js
+CLEANFILES = wok.min.js
diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am
index a2acce2..49ad3bb 100644
--- a/ui/libs/Makefile.am
+++ b/ui/libs/Makefile.am
@@ -17,6 +17,6 @@
 
 SUBDIRS = themes
 
-jsdir = $(datadir)/kimchi/ui/libs
+jsdir = $(datadir)/wok/ui/libs
 
 dist_js_DATA = $(wildcard *.js) $(NULL)
diff --git a/ui/libs/themes/base/Makefile.am b/ui/libs/themes/base/Makefile.am
index d7454f0..1bbaa50 100644
--- a/ui/libs/themes/base/Makefile.am
+++ b/ui/libs/themes/base/Makefile.am
@@ -17,6 +17,6 @@
 
 SUBDIRS = images
 
-basedir = $(datadir)/kimchi/ui/libs/themes/base
+basedir = $(datadir)/wok/ui/libs/themes/base
 
 dist_base_DATA = $(wildcard *.css) $(NULL)
diff --git a/ui/libs/themes/base/images/Makefile.am b/ui/libs/themes/base/images/Makefile.am
index 6afec8b..dd619c8 100644
--- a/ui/libs/themes/base/images/Makefile.am
+++ b/ui/libs/themes/base/images/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-imagesdir = $(datadir)/kimchi/ui/libs/themes/base/images
+imagesdir = $(datadir)/wok/ui/libs/themes/base/images
 
 dist_images_DATA = *.png
diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am
index a22afc1..68f4c92 100644
--- a/ui/pages/Makefile.am
+++ b/ui/pages/Makefile.am
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = help tabs websockify
+SUBDIRS = websockify
 
-htmldir = $(datadir)/kimchi/ui/pages
+htmldir = $(datadir)/wok/ui/pages
 
 dist_html_DATA = $(wildcard *.tmpl) $(NULL)
diff --git a/ui/pages/websockify/Makefile.am b/ui/pages/websockify/Makefile.am
index d498242..5321562 100644
--- a/ui/pages/websockify/Makefile.am
+++ b/ui/pages/websockify/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-websockifyhtmldir = $(datadir)/kimchi/ui/pages/websockify
+websockifyhtmldir = $(datadir)/wok/ui/pages/websockify
 
 dist_websockifyhtml_DATA = $(wildcard *.html) $(NULL)
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:41 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:41 -0300
Subject: [Kimchi-devel] [PATCH V3 09/34] Update kimchi plugin makefiles
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-10-git-send-email-luciojhc@linux.vnet.ibm.com>

- Reflect new plugin structure in all base files.
- Add kimchi plugin specifics (spice, config.py)
- Remove wok specifics

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/.gitignore                          |    8 +--
 plugins/kimchi/Makefile.am                         |   94 +++++++++-----------
 plugins/kimchi/configure.ac                        |   43 ++--------
 plugins/kimchi/contrib/Makefile.am                 |    4 -
 plugins/kimchi/control/Makefile.am                 |    2 +-
 plugins/kimchi/control/vm/Makefile.am              |    2 +-
 plugins/kimchi/docs/Makefile.am                    |    3 -
 plugins/kimchi/model/Makefile.am                   |    2 +-
 plugins/kimchi/po/POTFILES.in                      |    3 +-
 plugins/kimchi/tests/Makefile.am                   |    2 +-
 plugins/kimchi/ui/Makefile.am                      |    4 +-
 plugins/kimchi/ui/config/Makefile.am               |    4 +-
 plugins/kimchi/ui/css/Makefile.am                  |    2 +-
 plugins/kimchi/ui/images/Makefile.am               |    2 +-
 plugins/kimchi/ui/images/theme-default/Makefile.am |    2 +-
 plugins/kimchi/ui/js/Makefile.am                   |    6 +-
 plugins/kimchi/ui/pages/Makefile.am                |    4 +-
 plugins/kimchi/ui/pages/help/Makefile.am           |    2 +-
 plugins/kimchi/ui/pages/help/de_DE/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/en_US/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/es_ES/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/fr_FR/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/it_IT/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/ja_JP/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/ko_KR/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/pt_BR/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/ru_RU/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/zh_CN/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/zh_TW/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/tabs/Makefile.am           |    2 +-
 plugins/kimchi/ui/spice-html5/Makefile.am          |    2 +-
 plugins/kimchi/ui/spice-html5/css/Makefile.am      |    2 +-
 plugins/kimchi/ui/spice-html5/pages/Makefile.am    |    2 +-
 .../kimchi/ui/spice-html5/thirdparty/Makefile.am   |    2 +-
 plugins/kimchi/xmlutils/Makefile.am                |    2 +-
 35 files changed, 87 insertions(+), 136 deletions(-)

diff --git a/plugins/kimchi/.gitignore b/plugins/kimchi/.gitignore
index b3988b6..1dae610 100644
--- a/plugins/kimchi/.gitignore
+++ b/plugins/kimchi/.gitignore
@@ -16,25 +16,19 @@ build-aux/missing
 build-aux/py-compile
 configure
 config.log
+config.py
 config.status
 contrib/DEBIAN/control
 contrib/kimchi.spec.fedora
 contrib/kimchi.spec.suse
 contrib/make-deb.sh
-docs/kimchid.8
 *.min.css
 *.min.js
 *.gmo
 stamp-po
 kimchi-*.tar.gz
-src/kimchid
-src/kimchi.conf
-src/nginx/kimchi.conf
-src/kimchi/config.py
 tests/run_tests.sh
 tests/test_config.py
-plugins/sample/po/POTFILES
-plugins/sample/sample.conf
 po/POTFILES
 po/gen-pot
 *.orig
diff --git a/plugins/kimchi/Makefile.am b/plugins/kimchi/Makefile.am
index 0e6e59e..faef341 100644
--- a/plugins/kimchi/Makefile.am
+++ b/plugins/kimchi/Makefile.am
@@ -16,9 +16,24 @@
 # 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
-SUBDIRS = src ui docs contrib tests po config plugins
 
-man_MANS = docs/kimchid.8
+SUBDIRS = contrib control distros.d docs model po tests ui xmlutils
+
+kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py))
+
+nodist_kimchi_PYTHON = config.py
+
+if WITH_SPICE
+WITH_SPICE=yes
+else
+WITH_SPICE=no
+endif
+
+wokdir = $(pythondir)/wok
+kimchidir = $(pythondir)/wok/plugins/kimchi
+
+confdir = $(sysconfdir)/wok/plugins.d
+dist_conf_DATA = kimchi.conf template.conf
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -26,28 +41,26 @@ ACLOCAL_AMFLAGS = --install -I m4
 
 EXTRA_DIST = \
 	config.rpath \
+	API.json \
 	autogen.sh \
 	COPYING.ASL2 \
 	COPYING.LGPL \
 	CONTRIBUTE.md \
 	VERSION \
 	build-aux/pkg-version \
+	config.py.in \
 	$(NULL)
 
 
-PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py
+PEP8_BLACKLIST = *config.py,*i18n.py,*tests/test_config.py
 
-SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py"
-
-I18N_FILES = plugins/*/i18n.py \
-	src/kimchi/i18n.py \
+I18N_FILES = ./i18n.py \
 	$(NULL)
 
 check-local:
-	PYTHONPATH=src contrib/check_i18n.py $(I18N_FILES)
+	contrib/check_i18n.py $(I18N_FILES)
 	find . -path './.git' -prune -type f -o \
 		-name '*.py' -o -name '*.py.in'  | xargs $(PYFLAKES) | \
-		grep -w -v $(SKIP_PYFLAKES_ERR) | \
 		while read LINE; do echo "$$LINE"; false; done
 
 	$(PEP8) --version
@@ -63,6 +76,22 @@ all-local:
 		ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ;   \
 	done < po/LINGUAS
 
+do_substitution = \
+	sed -e 's,[@]prefix[@],$(prefix),g'             \
+	-e 's,[@]datadir[@],$(datadir),g'               \
+	-e 's,[@]sysconfdir[@],$(sysconfdir),g'         \
+	-e 's,[@]localstatedir[@],$(localstatedir),g'   \
+	-e 's,[@]pkgdatadir[@],$(pkgdatadir),g'         \
+	-e 's,[@]wokdir[@],$(wokdir),g'           \
+	-e 's,[@]kimchidir[@],$(kimchidir),g'           \
+	-e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \
+	-e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \
+	-e 's,[@]withspice[@],$(WITH_SPICE),g'
+
+config.py: config.py.in Makefile
+	$(do_substitution) < $(srcdir)/config.py.in > config.py
+
+
 #
 # Packaging helpers
 #
@@ -71,15 +100,7 @@ install-deb: install
 	cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/
 	mkdir -p $(DESTDIR)/var/lib/kimchi/debugreports
 	mkdir -p $(DESTDIR)/var/lib/kimchi/screenshots
-	mkdir -p $(DESTDIR)/var/lib/kimchi/vnc-tokens
 	mkdir -p $(DESTDIR)/var/lib/kimchi/isos
-	touch $(DESTDIR)/var/lib/kimchi/objectstore
-	$(MKDIR_P) $(DESTDIR)/etc/init
-	$(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services
-	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
 
 
 deb: contrib/make-deb.sh
@@ -115,41 +136,13 @@ ChangeLog:
 	fi
 
 install-data-local:
-	@if test -d "$(systemdsystemunitdir)" ; then \
-		mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \
-		$(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \
-	else \
-		mkdir -p $(DESTDIR)/etc/init.d/; \
-		$(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \
-		chmod +x $(DESTDIR)/etc/init.d/kimchid; \
-    fi; \
-	if test -d /usr/lib/firewalld/services/; then \
-		mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \
-		$(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \
-	fi; \
-	mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos}
-	touch $(DESTDIR)/var/lib/kimchi/objectstore
-	mkdir -p $(DESTDIR)/var/log/kimchi/
-	touch $(DESTDIR)/var/log/kimchi/kimchi-access.log
-	touch $(DESTDIR)/var/log/kimchi/kimchi-error.log
-	mkdir -p $(DESTDIR)/etc/kimchi/
-	$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/kimchi/dhparams.pem
-	touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf
+	$(MKDIR_P) $(DESTDIR)$(kimchidir)
+	$(INSTALL_DATA) API.json $(DESTDIR)$(kimchidir)/API.json
+	mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,isos}
 
 uninstall-local:
-	@if test -f $(systemdsystemunitdir)/kimchid.service; then \
-		$(RM) $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \
-	elif test -f /etc/init.d/kimchid; then \
-		$(RM) $(DESTDIR)/etc/init.d/kimchid; \
-		$(RM) $(DESTDIR)/etc/init/kimchi.conf; \
-	fi; \
-	if test -d /usr/lib/firewalld/services/; then \
-		$(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \
-	fi; \
+	$(RM) $(DESTDIR)$(kimchidir)/API.json
 	$(RM) -rf $(DESTDIR)/var/lib/kimchi
-	$(RM) -rf $(DESTDIR)/var/log/kimchi
-	$(RM) -rf $(DESTDIR)/etc/kimchi
-	$(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf
 
 VERSION:
 	@if test -d .git; then                                \
@@ -162,4 +155,5 @@ VERSION:
 clean-local:
 	rm -rf mo rpm
 
-CLEANFILES = kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`
+BUILT_SOURCES = config.py
+CLEANFILES = config.py kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`
diff --git a/plugins/kimchi/configure.ac b/plugins/kimchi/configure.ac
index 9e3edb8..adab45b 100644
--- a/plugins/kimchi/configure.ac
+++ b/plugins/kimchi/configure.ac
@@ -64,15 +64,6 @@ else
 AC_SUBST([ENABLE_SAMPLE], [False])
 fi
 
-# check for systemd
-PKG_PROG_PKG_CONFIG
-AC_ARG_WITH([systemdsystemunitdir],
-    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-    [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-if test "x$with_systemdsystemunitdir" != xno; then
-    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-fi
-
 AC_ARG_WITH(
     [spice-html5],
     [AS_HELP_STRING([--with-spice-html5],
@@ -87,28 +78,13 @@ AC_CONFIG_FILES([
     po/gen-pot
     Makefile
     docs/Makefile
-    docs/kimchid.8
-    src/Makefile
-    src/distros.d/Makefile
-    src/nginx/Makefile
-    src/kimchi/Makefile
-    src/kimchi/control/Makefile
-    src/kimchi/control/vm/Makefile
-    src/kimchi/model/Makefile
-    src/kimchi/xmlutils/Makefile
-    plugins/Makefile
-    plugins/sample/Makefile
-    plugins/sample/po/Makefile.in
-    plugins/sample/sample.conf
-    plugins/sample/ui/Makefile
-    plugins/sample/ui/config/Makefile
-    plugins/sample/ui/js/Makefile
-    plugins/sample/ui/pages/Makefile
+    distros.d/Makefile
+    control/Makefile
+    control/vm/Makefile
+    model/Makefile
     ui/Makefile
+    ui/config/Makefile
     ui/css/Makefile
-    ui/fontello/Makefile
-    ui/fontello/css/Makefile
-    ui/fontello/font/Makefile
     ui/images/Makefile
     ui/images/theme-default/Makefile
     ui/js/Makefile
@@ -116,10 +92,6 @@ AC_CONFIG_FILES([
     ui/spice-html5/css/Makefile
     ui/spice-html5/pages/Makefile
     ui/spice-html5/thirdparty/Makefile
-    ui/libs/Makefile
-    ui/libs/themes/Makefile
-    ui/libs/themes/base/Makefile
-    ui/libs/themes/base/images/Makefile
     ui/pages/Makefile
     ui/pages/help/Makefile
     ui/pages/help/en_US/Makefile
@@ -133,16 +105,13 @@ AC_CONFIG_FILES([
     ui/pages/help/ru_RU/Makefile
     ui/pages/help/zh_CN/Makefile
     ui/pages/help/zh_TW/Makefile
-    ui/pages/tabs/Makefile
-    ui/pages/websockify/Makefile
     contrib/Makefile
     contrib/DEBIAN/Makefile
     contrib/DEBIAN/control
     contrib/kimchi.spec.fedora
     contrib/kimchi.spec.suse
     tests/Makefile
-    config/Makefile
-    config/ui/Makefile
+    xmlutils/Makefile
 ],[
     chmod +x po/gen-pot
 ])
diff --git a/plugins/kimchi/contrib/Makefile.am b/plugins/kimchi/contrib/Makefile.am
index 393306f..5001191 100644
--- a/plugins/kimchi/contrib/Makefile.am
+++ b/plugins/kimchi/contrib/Makefile.am
@@ -18,11 +18,7 @@ SUBDIRS = DEBIAN
 
 EXTRA_DIST = \
 	check_i18n.py \
-	kimchid.sysvinit \
-	kimchid.service.fedora \
 	kimchi.spec.fedora.in \
-	kimchid-upstart.conf.debian \
-	kimchid-upstart.conf.fedora \
 	make-deb.sh.in \
 	$(NULL)
 
diff --git a/plugins/kimchi/control/Makefile.am b/plugins/kimchi/control/Makefile.am
index fee98dc..33118ca 100644
--- a/plugins/kimchi/control/Makefile.am
+++ b/plugins/kimchi/control/Makefile.am
@@ -21,7 +21,7 @@ SUBDIRS = vm
 
 control_PYTHON = *.py
 
-controldir = $(pythondir)/kimchi/control
+controldir = $(pythondir)/wok/plugins/kimchi/control
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(controldir)
diff --git a/plugins/kimchi/control/vm/Makefile.am b/plugins/kimchi/control/vm/Makefile.am
index e57b907..b17c68a 100644
--- a/plugins/kimchi/control/vm/Makefile.am
+++ b/plugins/kimchi/control/vm/Makefile.am
@@ -20,7 +20,7 @@
 
 vm_PYTHON = *.py
 
-vmdir = $(pythondir)/kimchi/control/vm
+vmdir = $(pythondir)/wok/plugins/kimchi/control/vm
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(vmdir)
diff --git a/plugins/kimchi/docs/Makefile.am b/plugins/kimchi/docs/Makefile.am
index 2f686f1..679aa18 100644
--- a/plugins/kimchi/docs/Makefile.am
+++ b/plugins/kimchi/docs/Makefile.am
@@ -25,7 +25,4 @@ dist_doc_DATA = \
 	README-federation.md \
 	kimchi-guest.png \
 	kimchi-templates.png \
-	kimchid.8 \
 	$(NULL)
-
-CLEANFILES = kimchid.8
diff --git a/plugins/kimchi/model/Makefile.am b/plugins/kimchi/model/Makefile.am
index a6ccbf0..f4f4750 100644
--- a/plugins/kimchi/model/Makefile.am
+++ b/plugins/kimchi/model/Makefile.am
@@ -19,7 +19,7 @@
 
 model_PYTHON = *.py
 
-modeldir = $(pythondir)/kimchi/model
+modeldir = $(pythondir)/wok/plugins/kimchi/model
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(modeldir)
diff --git a/plugins/kimchi/po/POTFILES.in b/plugins/kimchi/po/POTFILES.in
index 57bc711..92eef1e 100644
--- a/plugins/kimchi/po/POTFILES.in
+++ b/plugins/kimchi/po/POTFILES.in
@@ -1,4 +1,3 @@
 # List of source files which contain translatable strings.
-src/kimchi/i18n.py
+i18n.py
 ui/pages/*.tmpl
-ui/pages/tabs/*.tmpl
diff --git a/plugins/kimchi/tests/Makefile.am b/plugins/kimchi/tests/Makefile.am
index 09dce6c..c1f6784 100644
--- a/plugins/kimchi/tests/Makefile.am
+++ b/plugins/kimchi/tests/Makefile.am
@@ -31,7 +31,7 @@ do_substitution = \
 	-e 's,[@]prefix[@],$(prefix),g' \
 	-e 's,[@]datadir[@],$(datadir),g' \
 	-e 's,[@]PYTHON_VERSION[@],$(PYTHON_VERSION),g' \
-	-e 's,[@]kimchidir[@],$(pythondir)/kimchi,g' \
+	-e 's,[@]wokdir[@],$(pythondir)/wok,g' \
 	-e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
 
 
diff --git a/plugins/kimchi/ui/Makefile.am b/plugins/kimchi/ui/Makefile.am
index 208d3e3..21fe703 100644
--- a/plugins/kimchi/ui/Makefile.am
+++ b/plugins/kimchi/ui/Makefile.am
@@ -15,4 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = ui
+SUBDIRS = config css images js pages spice-html5
+
+uidir = $(datadir)/wok/plugins/kimchi/ui
diff --git a/plugins/kimchi/ui/config/Makefile.am b/plugins/kimchi/ui/config/Makefile.am
index 32b74e3..e3b3d19 100644
--- a/plugins/kimchi/ui/config/Makefile.am
+++ b/plugins/kimchi/ui/config/Makefile.am
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-xmldir = $(datadir)/kimchi/config/ui
+xmldir = $(datadir)/wok/plugins/kimchi/ui/config
 
 dist_xml_DATA = \
-	tabs.xml \
+	tab-ext.xml \
 	$(NULL)
diff --git a/plugins/kimchi/ui/css/Makefile.am b/plugins/kimchi/ui/css/Makefile.am
index f4f3dac..5071d29 100644
--- a/plugins/kimchi/ui/css/Makefile.am
+++ b/plugins/kimchi/ui/css/Makefile.am
@@ -17,7 +17,7 @@
 
 EXTRA_DIST = theme-default
 
-cssdir = $(datadir)/kimchi/ui/css
+cssdir = $(datadir)/wok/plugins/kimchi/ui/css
 dist_css_DATA = theme-default.min.css
 
 theme-default.min.css: theme-default/*.css
diff --git a/plugins/kimchi/ui/images/Makefile.am b/plugins/kimchi/ui/images/Makefile.am
index 7b63d23..0562e6a 100644
--- a/plugins/kimchi/ui/images/Makefile.am
+++ b/plugins/kimchi/ui/images/Makefile.am
@@ -17,6 +17,6 @@
 
 SUBDIRS = theme-default
 
-imagedir = $(datadir)/kimchi/ui/images
+imagedir = $(datadir)/wok/plugins/kimchi/ui/images
 
 dist_image_DATA = *.png *.ico
diff --git a/plugins/kimchi/ui/images/theme-default/Makefile.am b/plugins/kimchi/ui/images/theme-default/Makefile.am
index 7c69b2a..7e11d75 100644
--- a/plugins/kimchi/ui/images/theme-default/Makefile.am
+++ b/plugins/kimchi/ui/images/theme-default/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-imagedir = $(datadir)/kimchi/ui/images/theme-default
+imagedir = $(datadir)/wok/plugins/kimchi/ui/images/theme-default
 
 dist_image_DATA = *.png *.gif
diff --git a/plugins/kimchi/ui/js/Makefile.am b/plugins/kimchi/ui/js/Makefile.am
index d0653b9..c9d1218 100644
--- a/plugins/kimchi/ui/js/Makefile.am
+++ b/plugins/kimchi/ui/js/Makefile.am
@@ -15,13 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-EXTRA_DIST = src widgets
+EXTRA_DIST = src
 
-jsdir = $(datadir)/kimchi/ui/js
+jsdir = $(datadir)/wok/plugins/kimchi/ui/js
 
 dist_js_DATA = kimchi.min.js $(filter-out kimchi.min.js, $(wildcard *.js))
 
-kimchi.min.js: widgets/*.js src/*.js
+kimchi.min.js: src/*.js
 	cat $(sort $^) > $@
 
 CLEANFILES = kimchi.min.js
diff --git a/plugins/kimchi/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am
index a22afc1..076b814 100644
--- a/plugins/kimchi/ui/pages/Makefile.am
+++ b/plugins/kimchi/ui/pages/Makefile.am
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = help tabs websockify
+SUBDIRS = help tabs
 
-htmldir = $(datadir)/kimchi/ui/pages
+htmldir = $(datadir)/wok/plugins/kimchi/ui/pages
 
 dist_html_DATA = $(wildcard *.tmpl) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/Makefile.am b/plugins/kimchi/ui/pages/help/Makefile.am
index 5c04319..0fbe47b 100644
--- a/plugins/kimchi/ui/pages/help/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/Makefile.am
@@ -22,7 +22,7 @@ DITA_XSL_FILE = dita-help.xsl
 
 EXTRA_DIST = gen-index.py\
 			 $(DITA_XSL_FILE)
-helpdir = $(datadir)/kimchi/ui/pages/help
+helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help
 
 dist_help_DATA = kimchi.css
 
diff --git a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
index ab1c769..3d99aae 100644
--- a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-de_DE_helpdir = $(datadir)/kimchi/ui/pages/help/de_DE
+de_DE_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/de_DE
 
 dist_de_DE_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/en_US/Makefile.am b/plugins/kimchi/ui/pages/help/en_US/Makefile.am
index d5ab24f..d37f03a 100644
--- a/plugins/kimchi/ui/pages/help/en_US/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/en_US/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-en_US_helpdir = $(datadir)/kimchi/ui/pages/help/en_US
+en_US_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/en_US
 
 dist_en_US_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
index a3317a6..29c596f 100644
--- a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-es_ES_helpdir = $(datadir)/kimchi/ui/pages/help/es_ES
+es_ES_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/es_ES
 
 dist_es_ES_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
index a5eba5a..11ce394 100644
--- a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-fr_FR_helpdir = $(datadir)/kimchi/ui/pages/help/fr_FR
+fr_FR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/fr_FR
 
 dist_fr_FR_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
index c828f26..62e2f29 100644
--- a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-it_IT_helpdir = $(datadir)/kimchi/ui/pages/help/it_IT
+it_IT_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/it_IT
 
 dist_it_IT_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
index a7d6464..f9c2f33 100644
--- a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-ja_JP_helpdir = $(datadir)/kimchi/ui/pages/help/ja_JP
+ja_JP_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ja_JP
 
 dist_ja_JP_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
index 3242ad7..e441955 100644
--- a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-ko_KR_helpdir = $(datadir)/kimchi/ui/pages/help/ko_KR
+ko_KR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ko_KR
 
 dist_ko_KR_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
index 0f1df92..7fc2cb0 100644
--- a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-pt_BR_helpdir = $(datadir)/kimchi/ui/pages/help/pt_BR
+pt_BR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/pt_BR
 
 dist_pt_BR_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
index b128c6d..85ca27a 100644
--- a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-ru_RU_helpdir = $(datadir)/kimchi/ui/pages/help/ru_RU
+ru_RU_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ru_RU
 
 dist_ru_RU_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
index 8b812ff..e785048 100644
--- a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-zh_CN_helpdir = $(datadir)/kimchi/ui/pages/help/zh_CN
+zh_CN_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/zh_CN
 
 dist_zh_CN_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
index 911d737..9c8ac26 100644
--- a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-zh_TW_helpdir = $(datadir)/kimchi/ui/pages/help/zh_TW
+zh_TW_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/zh_TW
 
 dist_zh_TW_help_DATA = $(wildcard *.html) $(NULL)
 
diff --git a/plugins/kimchi/ui/pages/tabs/Makefile.am b/plugins/kimchi/ui/pages/tabs/Makefile.am
index a29df7e..4d5d33e 100644
--- a/plugins/kimchi/ui/pages/tabs/Makefile.am
+++ b/plugins/kimchi/ui/pages/tabs/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-tabshtmldir = $(datadir)/kimchi/ui/pages/tabs
+tabshtmldir = $(datadir)/wok/plugins/kimchi/ui/pages/tabs
 
 dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL)
diff --git a/plugins/kimchi/ui/spice-html5/Makefile.am b/plugins/kimchi/ui/spice-html5/Makefile.am
index 3a6558a..c43f1ef 100644
--- a/plugins/kimchi/ui/spice-html5/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/Makefile.am
@@ -20,6 +20,6 @@ SUBDIRS = pages
 if WITH_SPICE
 SUBDIRS += css thirdparty
 
-spicehtml5dir = $(datadir)/kimchi/ui/spice-html5
+spicehtml5dir = $(datadir)/wok/plugins/kimchi/ui/spice-html5
 dist_spicehtml5_DATA = $(wildcard *.js) $(NULL)
 endif
diff --git a/plugins/kimchi/ui/spice-html5/css/Makefile.am b/plugins/kimchi/ui/spice-html5/css/Makefile.am
index 6106e0d..ed51972 100644
--- a/plugins/kimchi/ui/spice-html5/css/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/css/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-spicecssdir = $(datadir)/kimchi/ui/spice-html5
+spicecssdir = $(datadir)/wok/plugins/kimchi/ui/spice-html5
 
 dist_spicecss_DATA = $(wildcard *.css) $(NULL)
diff --git a/plugins/kimchi/ui/spice-html5/pages/Makefile.am b/plugins/kimchi/ui/spice-html5/pages/Makefile.am
index 45e67a5..431ec6c 100644
--- a/plugins/kimchi/ui/spice-html5/pages/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/pages/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-spicepagesdir = $(datadir)/kimchi/ui/spice-html5/pages
+spicepagesdir = $(datadir)/wok/plugins/kimchi/ui/spice-html5/pages
 
 dist_spicepages_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
index b83a585..474478d 100644
--- a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-thirdpartydir = $(datadir)/kimchi/ui/spice-html5/thirdparty
+thirdpartydir = $(datadir)/wok/plugins/kimchi/ui/spice-html5/thirdparty
 
 dist_thirdparty_DATA = $(wildcard *.js) $(NULL)
diff --git a/plugins/kimchi/xmlutils/Makefile.am b/plugins/kimchi/xmlutils/Makefile.am
index 73f86f4..207ad7f 100644
--- a/plugins/kimchi/xmlutils/Makefile.am
+++ b/plugins/kimchi/xmlutils/Makefile.am
@@ -19,7 +19,7 @@
 
 xmlutils_PYTHON = *.py
 
-xmlutilsdir = $(pythondir)/kimchi/xmlutils
+xmlutilsdir = $(pythondir)/wok/plugins/kimchi/xmlutils
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(xmlutilsdir)
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:42 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:42 -0300
Subject: [Kimchi-devel] [PATCH V3 10/34] Update wok daemon and specs
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-11-git-send-email-luciojhc@linux.vnet.ibm.com>

- Rename from kimchi(d) to wok(d)
- Remove all kimchi specifics (including deps)
- Do not check for libvirt status
- Reflect new file names/structure
- Replace gettext-devel dependency by gettext

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 contrib/DEBIAN/control.in        |   15 +-----
 contrib/DEBIAN/postrm            |    4 +-
 contrib/make-deb.sh.in           |    2 +-
 contrib/wok.spec.fedora.in       |  106 ++++++++++++++------------------------
 contrib/wok.spec.suse.in         |  101 +++++++++++++++---------------------
 contrib/wokd-upstart.conf.debian |   14 ++----
 contrib/wokd-upstart.conf.fedora |   11 +---
 contrib/wokd.service.fedora      |    6 +-
 contrib/wokd.sysvinit            |   18 +++---
 src/firewalld.xml                |    4 +-
 10 files changed, 105 insertions(+), 176 deletions(-)

diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index a288e9b..ef4e0c2 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -6,31 +6,18 @@ Architecture: all
 Depends: python-cherrypy3 (>= 3.2.0),
          python-cheetah,
          python-imaging,
-         python-configobj,
          websockify,
          novnc,
          python-jsonschema (>= 1.3.0),
-         python-libvirt,
          gettext,
-         libvirt-bin,
-         nfs-common,
          python-m2crypto,
-         qemu-kvm,
          python-pam,
-         python-parted,
-         python-psutil (>= 0.6.0),
-         python-ethtool,
-         sosreport,
-         python-ipaddr,
          python-lxml,
-         open-iscsi,
          nginx,
-         python-guestfs,
          python-ldap,
-         libguestfs-tools,
          spice-html5
 Build-Depends: libxslt,
                openssl,
                python-lxml
 Maintainer: Aline Manera <alinefm at br.ibm.com>
-Description: Kimchi web server
+Description: Wok - Webserver Originated from Kimchi
diff --git a/contrib/DEBIAN/postrm b/contrib/DEBIAN/postrm
index ef90b49..256a234 100755
--- a/contrib/DEBIAN/postrm
+++ b/contrib/DEBIAN/postrm
@@ -20,9 +20,9 @@
 
 case "$1" in
     remove)
-        rm -rf /var/log/kimchi /var/run/kimchi.pid
+        rm -rf /var/log/wok /var/run/wok.pid
     ;;
     purge)
-        rm -rf /var/log/kimchi /var/run/kimchi.pid /usr/share/kimchi/
+        rm -rf /var/log/wok /var/run/wok.pid /usr/share/wok/
     ;;
 esac
diff --git a/contrib/make-deb.sh.in b/contrib/make-deb.sh.in
index 5a6e56a..6c42072 100644
--- a/contrib/make-deb.sh.in
+++ b/contrib/make-deb.sh.in
@@ -11,5 +11,5 @@ fi
 TMPDIR=`mktemp -d`
 
 make DESTDIR=$TMPDIR install-deb
-dpkg-deb -b $TMPDIR kimchi-${VERSION}-${RELEASE}.noarch.deb
+dpkg-deb -b $TMPDIR wok-${VERSION}-${RELEASE}.noarch.deb
 rm -rf $TMPDIR
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index 183fd43..edbe385 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -1,38 +1,24 @@
-Name:		kimchi
+Name:		wok
 Version:	@PACKAGE_VERSION@
 Release:	@PACKAGE_RELEASE@%{?dist}
-Summary:	Kimchi server application
+Summary:	Wok - Webserver Originated from Kimchi
 BuildRoot:	%{_topdir}/BUILD/%{name}-%{version}-%{release}
 BuildArch:	noarch
 Group:		System Environment/Base
 License:	LGPL/ASL2
 Source0:	%{name}-%{version}.tar.gz
-Requires:	qemu-kvm
-Requires:	gettext-devel
-Requires:	libvirt
-Requires:	libvirt-python
-Requires:	libvirt-daemon-config-network
+Requires:	gettext
 Requires:	python-cherrypy >= 3.2.0
 Requires:	python-cheetah
 Requires:	python-websockify
-Requires:	python-configobj
 Requires:	novnc
 Requires:	m2crypto
 Requires:	python-imaging
 Requires:	PyPAM
-Requires:	pyparted
-Requires:	python-psutil >= 0.6.0
 Requires:	python-jsonschema >= 1.3.0
-Requires:	python-ethtool
-Requires:	sos
-Requires:	python-ipaddr
 Requires:	python-lxml
-Requires:	nfs-utils
 Requires:	nginx
-Requires:	iscsi-initiator-utils
 Requires:	python-ldap
-Requires:	python-libguestfs
-Requires:	libguestfs-tools
 BuildRequires:	libxslt
 BuildRequires:	openssl
 BuildRequires:	python-lxml
@@ -64,7 +50,7 @@ BuildRequires: systemd-units
 %endif
 
 %description
-Web server application to manage KVM/Qemu virtual machines
+Wok is Webserver Originated from Kimchi.
 
 
 %prep
@@ -84,22 +70,18 @@ make
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-%if 0%{?with_systemd}
-
-%endif
-
 %if 0%{?rhel} == 6
 # Install the upstart script
-install -Dm 0755 contrib/kimchid-upstart.conf.fedora %{buildroot}/etc/init/kimchid.conf
+install -Dm 0755 contrib/wokd-upstart.conf.fedora %{buildroot}/etc/init/wokd.conf
 %endif
 %if 0%{?rhel} == 5
 # Install the SysV init scripts
-install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid
+install -Dm 0755 contrib/wokd.sysvinit %{buildroot}%{_initrddir}/wokd
 %endif
 
 %post
 if [ $1 -eq 1 ] ; then
-    /bin/systemctl enable kimchid.service >/dev/null 2>&1 || :
+    /bin/systemctl enable wokd.service >/dev/null 2>&1 || :
     # Initial installation
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
@@ -109,8 +91,8 @@ fi
 
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
-    /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || :
-    /bin/systemctl stop kimchid.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable wokd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop wokd.service > /dev/null 2>&1 || :
 fi
 
 exit 0
@@ -118,7 +100,7 @@ exit 0
 
 %postun
 if [ "$1" -ge 1 ] ; then
-    /bin/systemctl try-restart kimchid.service >/dev/null 2>&1 || :
+    /bin/systemctl try-restart wokd.service >/dev/null 2>&1 || :
 fi
 exit 0
 
@@ -127,55 +109,43 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root)
-%{_bindir}/kimchid
-%{python_sitelib}/kimchi/*.py*
-%{python_sitelib}/kimchi/control/*.py*
-%{python_sitelib}/kimchi/control/vm/*.py*
-%{python_sitelib}/kimchi/model/*.py*
-%{python_sitelib}/kimchi/xmlutils/*.py*
-%{python_sitelib}/kimchi/API.json
-%{python_sitelib}/kimchi/plugins/*.py*
-%{python_sitelib}/kimchi/
-%{_datadir}/kimchi/doc/API.md
-%{_datadir}/kimchi/doc/README.md
-%{_datadir}/kimchi/doc/README-federation.md
-%{_datadir}/kimchi/doc/kimchi-guest.png
-%{_datadir}/kimchi/doc/kimchi-templates.png
-%{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
-%{_datadir}/kimchi/config/ui/*.xml
-%{_datadir}/kimchi/ui/
-%{_datadir}/kimchi
-%{_sysconfdir}/nginx/conf.d/kimchi.conf.in
-%{_sysconfdir}/nginx/conf.d/kimchi.conf
-%{_sysconfdir}/kimchi/kimchi.conf
-%{_sysconfdir}/kimchi/template.conf
-%{_sysconfdir}/kimchi/distros.d/debian.json
-%{_sysconfdir}/kimchi/distros.d/fedora.json
-%{_sysconfdir}/kimchi/distros.d/opensuse.json
-%{_sysconfdir}/kimchi/distros.d/ubuntu.json
-%{_sysconfdir}/kimchi/distros.d/gentoo.json
-%{_sysconfdir}/kimchi/
-%{_sharedstatedir}/kimchi/debugreports/
-%{_sharedstatedir}/kimchi/screenshots/
-%{_sharedstatedir}/kimchi/vnc-tokens/
-%{_sharedstatedir}/kimchi/isos/
-%{_sharedstatedir}/kimchi/
-%{_localstatedir}/log/kimchi/*
-%{_localstatedir}/log/kimchi/
-%{_mandir}/man8/kimchid.8.gz
+%{_bindir}/wokd
+%{python_sitelib}/wok/*.py*
+%{python_sitelib}/wok/control/*.py*
+%{python_sitelib}/wok/model/*.py*
+%{python_sitelib}/wok/xmlutils/*.py*
+%{python_sitelib}/wok/API.json
+%{python_sitelib}/wok/plugins/*.py*
+%{python_sitelib}/wok/
+%{_prefix}/share/locale/*/LC_MESSAGES/wok.mo
+%{_datadir}/wok/ui/
+%{_datadir}/wok
+%{_sysconfdir}/nginx/conf.d/wok.conf.in
+%{_sysconfdir}/nginx/conf.d/wok.conf
+%{_sysconfdir}/wok/wok.conf
+%{_sysconfdir}/wok/
+%{_sharedstatedir}/wok/vnc-tokens/
+%{_sharedstatedir}/wok/
+%{_localstatedir}/log/wok/*
+%{_localstatedir}/log/wok/
+%{_mandir}/man8/wokd.8.gz
 
 %if 0%{?with_systemd}
-%{_unitdir}/kimchid.service
-%{_prefix}/lib/firewalld/services/kimchid.xml
+%{_unitdir}/wokd.service
+%{_prefix}/lib/firewalld/services/wokd.xml
 %endif
 %if 0%{?rhel} == 6
-/etc/init/kimchid.conf
+/etc/init/wokd.conf
 %endif
 %if 0%{?rhel} == 5
-%{_initrddir}/kimchid
+%{_initrddir}/wokd
 %endif
 
 %changelog
+* Fri Jun 19 2015 Lucio Correia <luciojhc at linux.vnet.ibm.com> 1.6
+- Rename to wokd
+- Remove kimchi specifics
+
 * Thu Feb 26 2015 Fr??d??ric Bonnard <frediz at linux.vnet.ibm.com> 1.4.0
 - Add man page for kimchid
 
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index 54228ae..63bdce3 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -1,38 +1,25 @@
-Name:		kimchi
+Name:		wok
 Version:	@PACKAGE_VERSION@
 Release:	@PACKAGE_RELEASE@%{?dist}
-Summary:	Kimchi server application
+Summary:	Wok - Webserver Originated from Kimchi
 BuildRoot:	%{_topdir}/BUILD/%{name}-%{version}-%{release}
 BuildArch:	noarch
 Group:		System Environment/Base
 License:	LGPL/ASL2
 Source0:	%{name}-%{version}.tar.gz
-Requires:	kvm
 Requires:	gettext-tools
-Requires:	libvirt
-Requires:	libvirt-python
-Requires:	libvirt-daemon-config-network
 Requires:	python-CherryPy >= 3.2.0
 Requires:	python-Cheetah
 Requires:	python-websockify
-Requires:	python-configobj
 Requires:	novnc
 Requires:	python-imaging
 Requires:	python-M2Crypto
 Requires:	python-pam
-Requires:	python-parted
-Requires:	python-psutil >= 0.6.0
 Requires:	python-jsonschema >= 1.3.0
-Requires:	python-ethtool
-Requires:	python-ipaddr
 Requires:	python-ldap
 Requires:	python-lxml
 Requires:	python-xml
-Requires:	nfs-client
 Requires:	nginx
-Requires:	open-iscsi
-Requires:	python-libguestfs
-Requires:	guestfs-tools
 BuildRequires:	libxslt-tools
 BuildRequires:	openssl
 BuildRequires:	python-lxml
@@ -46,7 +33,7 @@ Requires:       python-ordereddict
 %endif
 
 %description
-Web server application to manage KVM/Qemu virtual machines
+Wok is Webserver Originated from Kimchi.
 
 %prep
 %setup
@@ -59,29 +46,30 @@ make
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
+
 %post
 %if 0%{?with_systemd}
-    /bin/systemctl enable kimchid.service >/dev/null 2>&1 || :
+    /bin/systemctl enable wokd.service >/dev/null 2>&1 || :
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 %else
-    chkconfig kimchid on
+    chkconfig wokd on
 %endif
 exit 0
 
 
 %preun
 %if 0%{?with_systemd}
-    /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || :
-    /bin/systemctl stop kimchid.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable wokd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop wokd.service > /dev/null 2>&1 || :
 %else
-    service kimchid stop
+    service wokd stop
 %endif
 exit 0
 
 
 %postun
 %if 0%{?with_systemd}
-    /bin/systemctl try-restart kimchid.service >/dev/null 2>&1 || :
+    /bin/systemctl try-restart wokd.service >/dev/null 2>&1 || :
 %endif
 exit 0
 
@@ -90,43 +78,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root)
-%{_bindir}/kimchid
-%{python_sitelib}/kimchi/*.py*
-%{python_sitelib}/kimchi/control/*.py*
-%{python_sitelib}/kimchi/control/vm/*.py*
-%{python_sitelib}/kimchi/model/*.py*
-%{python_sitelib}/kimchi/xmlutils/*.py*
-%{python_sitelib}/kimchi/API.json
-%{python_sitelib}/kimchi/plugins/*.py*
-%{python_sitelib}/kimchi/
-%{_datadir}/kimchi/doc/API.md
-%{_datadir}/kimchi/doc/README.md
-%{_datadir}/kimchi/doc/README-federation.md
-%{_datadir}/kimchi/doc/kimchi-guest.png
-%{_datadir}/kimchi/doc/kimchi-templates.png
-%{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
-%{_datadir}/kimchi/config/ui/*.xml
-%{_datadir}/kimchi/ui/
-%{_datadir}/kimchi
-%{_sysconfdir}/nginx/conf.d/kimchi.conf.in
-%{_sysconfdir}/nginx/conf.d/kimchi.conf
-%{_sysconfdir}/kimchi/kimchi.conf
-%{_sysconfdir}/kimchi/template.conf
-%{_sysconfdir}/kimchi/distros.d/debian.json
-%{_sysconfdir}/kimchi/distros.d/fedora.json
-%{_sysconfdir}/kimchi/distros.d/opensuse.json
-%{_sysconfdir}/kimchi/distros.d/ubuntu.json
-%{_sysconfdir}/kimchi/distros.d/gentoo.json
-%{_sysconfdir}/kimchi
-%{_sysconfdir}/kimchi/
-%{_var}/lib/kimchi/debugreports/
-%{_var}/lib/kimchi/screenshots/
-%{_var}/lib/kimchi/vnc-tokens/
-%{_var}/lib/kimchi/isos/
-%{_var}/lib/kimchi/
-%{_localstatedir}/log/kimchi/*
-%{_localstatedir}/log/kimchi/
-%{_mandir}/man8/kimchid.8.gz
+%{_bindir}/wokd
+%{python_sitelib}/wok/*.py*
+%{python_sitelib}/wok/control/*.py*
+%{python_sitelib}/wok/model/*.py*
+%{python_sitelib}/wok/xmlutils/*.py*
+%{python_sitelib}/wok/API.json
+%{python_sitelib}/wok/plugins/*.py*
+%{python_sitelib}/wok/
+%{_prefix}/share/locale/*/LC_MESSAGES/wok.mo
+%{_datadir}/wok/ui/
+%{_datadir}/wok
+%{_sysconfdir}/wok/wok.conf
+%{_sysconfdir}/wok/
+%{_sysconfdir}/nginx/conf.d/wok.conf.in
+%{_sysconfdir}/nginx/conf.d/wok.conf
+%{_var}/lib/wok/vnc-tokens/
+%{_var}/lib/wok/
+%{_localstatedir}/log/wok/*
+%{_localstatedir}/log/wok/
+%{_mandir}/man8/wokd.8.gz
+
+%if 0%{?with_systemd}
+%{_unitdir}/wokd.service
+%else
+%{_initrddir}/wokd
+%endif
+
+
 
 %if 0%{?with_systemd}
 %{_unitdir}/kimchid.service
@@ -136,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 19 2015 Lucio Correia <luciojhc at linux.vnet.ibm.com> 1.6
+- Rename to wokd
+- Remove kimchi specifics
+
 * Thu Feb 26 2015 Fr??d??ric Bonnard <frediz at linux.vnet.ibm.com> 1.4.0
 - Add man page for kimchid
 
diff --git a/contrib/wokd-upstart.conf.debian b/contrib/wokd-upstart.conf.debian
index a58d3c3..82e9156 100644
--- a/contrib/wokd-upstart.conf.debian
+++ b/contrib/wokd-upstart.conf.debian
@@ -1,5 +1,5 @@
 #
-# kimchid - Kimchi Web Server
+# wokd - Wok Web Server
 #
 # Copyright IBM, Corp. 2013
 #
@@ -18,17 +18,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-description	"Kimchi Web Server"
+description	"Wok - Webserver Originated from Kimchi"
 
-start on started libvirt-bin
-stop on stopped libvirt-bin
+start on stopped rc RUNLEVEL=[2345]
 
 respawn
 respawn limit 5 30
 
-pre-start script
-    status libvirt-bin | grep -q "start/running" && exit 0
-    start libvirt-bin || exit 1
-end script
-
-exec /usr/bin/kimchid
+exec /usr/bin/wokd
diff --git a/contrib/wokd-upstart.conf.fedora b/contrib/wokd-upstart.conf.fedora
index 53e8a39..f02ce34 100644
--- a/contrib/wokd-upstart.conf.fedora
+++ b/contrib/wokd-upstart.conf.fedora
@@ -1,5 +1,5 @@
 #
-# kimchid - Kimchi Web Server
+# wokd - Wok Web Server
 #
 # Copyright IBM, Corp. 2013
 #
@@ -18,16 +18,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-description "Kimchi Web Server"
+description "Wok - Webserver Originated from Kimchi"
 
 start on stopped rc RUNLEVEL=[2345]
 
 respawn
 respawn limit 5 30
 
-pre-start script
-    service libvirtd status | grep -q "start/running" && exit 0
-    service libvirtd start || exit 1
-end script
-
-exec /usr/bin/kimchid
+exec /usr/bin/wokd
diff --git a/contrib/wokd.service.fedora b/contrib/wokd.service.fedora
index 7abe49b..17414d3 100644
--- a/contrib/wokd.service.fedora
+++ b/contrib/wokd.service.fedora
@@ -1,13 +1,13 @@
 [Unit]
-Description=Kimchi server
+Description=Wok - Webserver Originated from Kimchi
 Requires=libvirtd.service
 After=libvirtd.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/kimchid
+ExecStart=/usr/bin/wokd
 ExecStop=/bin/kill -TERM $MAINPID
-EnvironmentFile=/etc/kimchi/kimchi.conf
+EnvironmentFile=/etc/wok/wok.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/contrib/wokd.sysvinit b/contrib/wokd.sysvinit
index 023b34c..10680ee 100644
--- a/contrib/wokd.sysvinit
+++ b/contrib/wokd.sysvinit
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# kimchid		Kimchi Web Server
+# wokd		Wok Web Server
 #
 # Copyright IBM, Corp. 2013
 #
@@ -21,12 +21,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ### BEGIN INIT INFO
-# Provides: kimchid
+# Provides: wokd
 # Required-Start: libvirtd
 # Required-Stop:
 # Default-Start: 3 5
 # Default-Stop: 0 1 2 6
-# Description: Start the kimchid daemon
+# Description: Start the wokd daemon
 ### END INIT INFO
 
 . /etc/rc.status
@@ -45,21 +45,21 @@ rc_reset
 
 case "$1" in
     start)
-	echo -n "Starting kimchid daemon"
+	echo -n "Starting wokd daemon"
 	## Start daemon with startproc(8). If this fails
 	## the echo return value is set appropriate.
 
-	startproc -f /usr/bin/kimchid > /dev/null 2>&1
+	startproc -f /usr/bin/wokd > /dev/null 2>&1
 
 	# Remember status and be verbose
 	rc_status -v
 	;;
     stop)
-	echo -n "Shutting down kimchid daemon"
+	echo -n "Shutting down wokd daemon"
 	## Stop daemon with killproc(8) and if this fails
 	## set echo the echo return value.
 
-	killproc -TERM /usr/bin/kimchid
+	killproc -TERM /usr/bin/wokd
 
 	# Remember status and be verbose
 	rc_status -v
@@ -82,7 +82,7 @@ case "$1" in
         rc_status
         ;;
     status)
-	echo -n "Checking for service kimchid "
+	echo -n "Checking for service wokd "
         ## Check status with checkproc(8), if process is running
         ## checkproc will return with exit status 0.
 
@@ -92,7 +92,7 @@ case "$1" in
         # 2 - service dead, but /var/lock/ lock file exists
         # 3 - service not running
 
-	checkproc /usr/bin/kimchid
+	checkproc /usr/bin/wokd
 
 	rc_status -v
 	;;
diff --git a/src/firewalld.xml b/src/firewalld.xml
index 03e1510..ff9fafe 100644
--- a/src/firewalld.xml
+++ b/src/firewalld.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
-  <short>kimchid</short>
-  <description>Kimchid is a daemon service for kimchi which is a HTML5 based management tool for KVM. It is designed to make it as easy as possible to get started with KVM and create your first guest.</description>
+  <short>wokd</short>
+  <description>wokd is a daemon service for wok which is a web framework.</description>
   <port protocol="tcp" port="8000"/>
   <port protocol="tcp" port="8001"/>
   <port protocol="tcp" port="64667"/>
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:43 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:43 -0300
Subject: [Kimchi-devel] [PATCH V3 11/34] Update kimchi plugin rpm specs
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-12-git-send-email-luciojhc@linux.vnet.ibm.com>

- Add dependency on wok
- Drop wok specifics from specs
- Reflect new plugin structure in the specs
- Replace gettext-devel dependency by gettext

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/contrib/DEBIAN/control.in     |    6 +-
 plugins/kimchi/contrib/kimchi.spec.fedora.in |   99 +++++---------------------
 plugins/kimchi/contrib/kimchi.spec.suse.in   |   71 +++++--------------
 3 files changed, 37 insertions(+), 139 deletions(-)

diff --git a/plugins/kimchi/contrib/DEBIAN/control.in b/plugins/kimchi/contrib/DEBIAN/control.in
index a288e9b..ecfcd89 100644
--- a/plugins/kimchi/contrib/DEBIAN/control.in
+++ b/plugins/kimchi/contrib/DEBIAN/control.in
@@ -3,7 +3,8 @@ Version: @PACKAGE_VERSION@
 Section: base
 Priority: optional
 Architecture: all
-Depends: python-cherrypy3 (>= 3.2.0),
+Depends: wok,
+         python-cherrypy3 (>= 3.2.0),
          python-cheetah,
          python-imaging,
          python-configobj,
@@ -30,7 +31,6 @@ Depends: python-cherrypy3 (>= 3.2.0),
          libguestfs-tools,
          spice-html5
 Build-Depends: libxslt,
-               openssl,
                python-lxml
 Maintainer: Aline Manera <alinefm at br.ibm.com>
-Description: Kimchi web server
+Description: Kimchi web application
diff --git a/plugins/kimchi/contrib/kimchi.spec.fedora.in b/plugins/kimchi/contrib/kimchi.spec.fedora.in
index 183fd43..7a7a447 100644
--- a/plugins/kimchi/contrib/kimchi.spec.fedora.in
+++ b/plugins/kimchi/contrib/kimchi.spec.fedora.in
@@ -7,8 +7,9 @@ BuildArch:	noarch
 Group:		System Environment/Base
 License:	LGPL/ASL2
 Source0:	%{name}-%{version}.tar.gz
+Requires:	wok
 Requires:	qemu-kvm
-Requires:	gettext-devel
+Requires:	gettext
 Requires:	libvirt
 Requires:	libvirt-python
 Requires:	libvirt-daemon-config-network
@@ -34,7 +35,6 @@ Requires:	python-ldap
 Requires:	python-libguestfs
 Requires:	libguestfs-tools
 BuildRequires:	libxslt
-BuildRequires:	openssl
 BuildRequires:	python-lxml
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 19
@@ -51,20 +51,8 @@ Requires:	python-imaging
 BuildRequires:    python-unittest2
 %endif
 
-%if 0%{?with_systemd}
-Requires:	systemd
-Requires:	firewalld
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-%endif
-
-%if 0%{?with_systemd}
-BuildRequires: systemd-units
-%endif
-
 %description
-Web server application to manage KVM/Qemu virtual machines
+Web application to manage KVM/Qemu virtual machines
 
 
 %prep
@@ -84,71 +72,29 @@ make
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-%if 0%{?with_systemd}
-
-%endif
-
-%if 0%{?rhel} == 6
-# Install the upstart script
-install -Dm 0755 contrib/kimchid-upstart.conf.fedora %{buildroot}/etc/init/kimchid.conf
-%endif
-%if 0%{?rhel} == 5
-# Install the SysV init scripts
-install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid
-%endif
-
-%post
-if [ $1 -eq 1 ] ; then
-    /bin/systemctl enable kimchid.service >/dev/null 2>&1 || :
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
-
-%preun
-
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || :
-    /bin/systemctl stop kimchid.service > /dev/null 2>&1 || :
-fi
-
-exit 0
-
-
-%postun
-if [ "$1" -ge 1 ] ; then
-    /bin/systemctl try-restart kimchid.service >/dev/null 2>&1 || :
-fi
-exit 0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root)
-%{_bindir}/kimchid
-%{python_sitelib}/kimchi/*.py*
-%{python_sitelib}/kimchi/control/*.py*
-%{python_sitelib}/kimchi/control/vm/*.py*
-%{python_sitelib}/kimchi/model/*.py*
-%{python_sitelib}/kimchi/xmlutils/*.py*
-%{python_sitelib}/kimchi/API.json
-%{python_sitelib}/kimchi/plugins/*.py*
-%{python_sitelib}/kimchi/
+%{python_sitelib}/wok/plugins/kimchi/*.py*
+%{python_sitelib}/wok/plugins/kimchi/control/*.py*
+%{python_sitelib}/wok/plugins/kimchi/control/vm/*.py*
+%{python_sitelib}/wok/plugins/kimchi/model/*.py*
+%{python_sitelib}/wok/plugins/kimchi/API.json
+%{python_sitelib}/wok/plugins/kimchi/
 %{_datadir}/kimchi/doc/API.md
 %{_datadir}/kimchi/doc/README.md
 %{_datadir}/kimchi/doc/README-federation.md
 %{_datadir}/kimchi/doc/kimchi-guest.png
 %{_datadir}/kimchi/doc/kimchi-templates.png
 %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
-%{_datadir}/kimchi/config/ui/*.xml
-%{_datadir}/kimchi/ui/
-%{_datadir}/kimchi
-%{_sysconfdir}/nginx/conf.d/kimchi.conf.in
-%{_sysconfdir}/nginx/conf.d/kimchi.conf
-%{_sysconfdir}/kimchi/kimchi.conf
-%{_sysconfdir}/kimchi/template.conf
+%{_datadir}/wok/plugins/kimchi/ui/config/*.xml
+%{_datadir}/wok/plugins/kimchi/ui/
+%{_datadir}/wok/plugins/kimchi
+%{_sysconfdir}/wok/plugins.d/kimchi.conf
+%{_sysconfdir}/wok/plugins.d/template.conf
 %{_sysconfdir}/kimchi/distros.d/debian.json
 %{_sysconfdir}/kimchi/distros.d/fedora.json
 %{_sysconfdir}/kimchi/distros.d/opensuse.json
@@ -157,25 +103,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/kimchi/
 %{_sharedstatedir}/kimchi/debugreports/
 %{_sharedstatedir}/kimchi/screenshots/
-%{_sharedstatedir}/kimchi/vnc-tokens/
 %{_sharedstatedir}/kimchi/isos/
 %{_sharedstatedir}/kimchi/
-%{_localstatedir}/log/kimchi/*
-%{_localstatedir}/log/kimchi/
-%{_mandir}/man8/kimchid.8.gz
 
-%if 0%{?with_systemd}
-%{_unitdir}/kimchid.service
-%{_prefix}/lib/firewalld/services/kimchid.xml
-%endif
-%if 0%{?rhel} == 6
-/etc/init/kimchid.conf
-%endif
-%if 0%{?rhel} == 5
-%{_initrddir}/kimchid
-%endif
 
 %changelog
+* Thu Jun 18 2015 Lucio Correia <luciojhc at linux.vnet.ibm.com> 1.6
+- Run kimchi as a plugin
+
 * Thu Feb 26 2015 Fr??d??ric Bonnard <frediz at linux.vnet.ibm.com> 1.4.0
 - Add man page for kimchid
 
diff --git a/plugins/kimchi/contrib/kimchi.spec.suse.in b/plugins/kimchi/contrib/kimchi.spec.suse.in
index 54228ae..1ab2e5f 100644
--- a/plugins/kimchi/contrib/kimchi.spec.suse.in
+++ b/plugins/kimchi/contrib/kimchi.spec.suse.in
@@ -7,6 +7,7 @@ BuildArch:	noarch
 Group:		System Environment/Base
 License:	LGPL/ASL2
 Source0:	%{name}-%{version}.tar.gz
+Requires:	wok
 Requires:	kvm
 Requires:	gettext-tools
 Requires:	libvirt
@@ -34,7 +35,6 @@ Requires:	open-iscsi
 Requires:	python-libguestfs
 Requires:	guestfs-tools
 BuildRequires:	libxslt-tools
-BuildRequires:	openssl
 BuildRequires:	python-lxml
 
 %if 0%{?suse_version} == 1100
@@ -46,7 +46,7 @@ Requires:       python-ordereddict
 %endif
 
 %description
-Web server application to manage KVM/Qemu virtual machines
+Web application to manage KVM/Qemu virtual machines
 
 %prep
 %setup
@@ -59,83 +59,46 @@ make
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-%post
-%if 0%{?with_systemd}
-    /bin/systemctl enable kimchid.service >/dev/null 2>&1 || :
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%else
-    chkconfig kimchid on
-%endif
-exit 0
-
-
-%preun
-%if 0%{?with_systemd}
-    /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || :
-    /bin/systemctl stop kimchid.service > /dev/null 2>&1 || :
-%else
-    service kimchid stop
-%endif
-exit 0
-
-
-%postun
-%if 0%{?with_systemd}
-    /bin/systemctl try-restart kimchid.service >/dev/null 2>&1 || :
-%endif
-exit 0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root)
-%{_bindir}/kimchid
-%{python_sitelib}/kimchi/*.py*
-%{python_sitelib}/kimchi/control/*.py*
-%{python_sitelib}/kimchi/control/vm/*.py*
-%{python_sitelib}/kimchi/model/*.py*
-%{python_sitelib}/kimchi/xmlutils/*.py*
-%{python_sitelib}/kimchi/API.json
-%{python_sitelib}/kimchi/plugins/*.py*
-%{python_sitelib}/kimchi/
+%{python_sitelib}/wok/plugins/kimchi/*.py*
+%{python_sitelib}/wok/plugins/kimchi/control/*.py*
+%{python_sitelib}/wok/plugins/kimchi/control/vm/*.py*
+%{python_sitelib}/wok/plugins/kimchi/model/*.py*
+%{python_sitelib}/wok/plugins/kimchi/API.json
+%{python_sitelib}/wok/plugins/kimchi/
 %{_datadir}/kimchi/doc/API.md
 %{_datadir}/kimchi/doc/README.md
 %{_datadir}/kimchi/doc/README-federation.md
 %{_datadir}/kimchi/doc/kimchi-guest.png
 %{_datadir}/kimchi/doc/kimchi-templates.png
 %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
-%{_datadir}/kimchi/config/ui/*.xml
-%{_datadir}/kimchi/ui/
-%{_datadir}/kimchi
-%{_sysconfdir}/nginx/conf.d/kimchi.conf.in
-%{_sysconfdir}/nginx/conf.d/kimchi.conf
-%{_sysconfdir}/kimchi/kimchi.conf
-%{_sysconfdir}/kimchi/template.conf
+%{_datadir}/wok/plugins/kimchi/ui/config/*.xml
+%{_datadir}/wok/plugins/kimchi/ui/
+%{_datadir}/wok/plugins/kimchi
+%{_sysconfdir}/wok/plugins.d/kimchi.conf
+%{_sysconfdir}/wok/plugins.d/template.conf
 %{_sysconfdir}/kimchi/distros.d/debian.json
 %{_sysconfdir}/kimchi/distros.d/fedora.json
 %{_sysconfdir}/kimchi/distros.d/opensuse.json
 %{_sysconfdir}/kimchi/distros.d/ubuntu.json
 %{_sysconfdir}/kimchi/distros.d/gentoo.json
-%{_sysconfdir}/kimchi
 %{_sysconfdir}/kimchi/
 %{_var}/lib/kimchi/debugreports/
 %{_var}/lib/kimchi/screenshots/
-%{_var}/lib/kimchi/vnc-tokens/
 %{_var}/lib/kimchi/isos/
 %{_var}/lib/kimchi/
-%{_localstatedir}/log/kimchi/*
-%{_localstatedir}/log/kimchi/
-%{_mandir}/man8/kimchid.8.gz
-
-%if 0%{?with_systemd}
-%{_unitdir}/kimchid.service
-%else
-%{_initrddir}/kimchid
-%endif
+
 
 
 %changelog
+* Thu Jun 18 2015 Lucio Correia <luciojhc at linux.vnet.ibm.com> 1.6
+- Run kimchi as a plugin
+
 * Thu Feb 26 2015 Fr??d??ric Bonnard <frediz at linux.vnet.ibm.com> 1.4.0
 - Add man page for kimchid
 
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:35 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:35 -0300
Subject: [Kimchi-devel] [PATCH V3 03/34] Rename src/kimchi to src/wok
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-4-git-send-email-luciojhc@linux.vnet.ibm.com>

This patch only renames the directory src/kimchi to
src/wok. These files will compose Wok, the web server.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 src/{kimchi => wok}/Makefile.am        |    0
 src/{kimchi => wok}/__init__.py        |    0
 src/{kimchi => wok}/asynctask.py       |    0
 src/{kimchi => wok}/auth.py            |    0
 src/{kimchi => wok}/basemodel.py       |    0
 src/{kimchi => wok}/cachebust.py       |    0
 src/{kimchi => wok}/config.py.in       |    0
 src/{kimchi => wok}/control/base.py    |    0
 src/{kimchi => wok}/control/plugins.py |    0
 src/{kimchi => wok}/control/utils.py   |    0
 src/{kimchi => wok}/exception.py       |    0
 src/{kimchi => wok}/model/plugins.py   |    0
 src/{kimchi => wok}/netinfo.py         |    0
 src/{kimchi => wok}/network.py         |    0
 src/{kimchi => wok}/objectstore.py     |    0
 src/{kimchi => wok}/proxy.py           |    0
 src/{kimchi => wok}/rollbackcontext.py |    0
 src/{kimchi => wok}/root.py            |    0
 src/{kimchi => wok}/server.py          |    0
 src/{kimchi => wok}/sslcert.py         |    0
 src/{kimchi => wok}/template.py        |    0
 src/{kimchi => wok}/utils.py           |    0
 src/{kimchi => wok}/vnc.py             |    0
 src/{kimchi => wok}/xmlutils/utils.py  |    0
 24 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{kimchi => wok}/Makefile.am (100%)
 rename src/{kimchi => wok}/__init__.py (100%)
 rename src/{kimchi => wok}/asynctask.py (100%)
 rename src/{kimchi => wok}/auth.py (100%)
 rename src/{kimchi => wok}/basemodel.py (100%)
 rename src/{kimchi => wok}/cachebust.py (100%)
 rename src/{kimchi => wok}/config.py.in (100%)
 rename src/{kimchi => wok}/control/base.py (100%)
 rename src/{kimchi => wok}/control/plugins.py (100%)
 rename src/{kimchi => wok}/control/utils.py (100%)
 rename src/{kimchi => wok}/exception.py (100%)
 rename src/{kimchi => wok}/model/plugins.py (100%)
 rename src/{kimchi => wok}/netinfo.py (100%)
 rename src/{kimchi => wok}/network.py (100%)
 rename src/{kimchi => wok}/objectstore.py (100%)
 rename src/{kimchi => wok}/proxy.py (100%)
 rename src/{kimchi => wok}/rollbackcontext.py (100%)
 rename src/{kimchi => wok}/root.py (100%)
 rename src/{kimchi => wok}/server.py (100%)
 rename src/{kimchi => wok}/sslcert.py (100%)
 rename src/{kimchi => wok}/template.py (100%)
 rename src/{kimchi => wok}/utils.py (100%)
 rename src/{kimchi => wok}/vnc.py (100%)
 rename src/{kimchi => wok}/xmlutils/utils.py (100%)

diff --git a/src/kimchi/Makefile.am b/src/wok/Makefile.am
similarity index 100%
rename from src/kimchi/Makefile.am
rename to src/wok/Makefile.am
diff --git a/src/kimchi/__init__.py b/src/wok/__init__.py
similarity index 100%
rename from src/kimchi/__init__.py
rename to src/wok/__init__.py
diff --git a/src/kimchi/asynctask.py b/src/wok/asynctask.py
similarity index 100%
rename from src/kimchi/asynctask.py
rename to src/wok/asynctask.py
diff --git a/src/kimchi/auth.py b/src/wok/auth.py
similarity index 100%
rename from src/kimchi/auth.py
rename to src/wok/auth.py
diff --git a/src/kimchi/basemodel.py b/src/wok/basemodel.py
similarity index 100%
rename from src/kimchi/basemodel.py
rename to src/wok/basemodel.py
diff --git a/src/kimchi/cachebust.py b/src/wok/cachebust.py
similarity index 100%
rename from src/kimchi/cachebust.py
rename to src/wok/cachebust.py
diff --git a/src/kimchi/config.py.in b/src/wok/config.py.in
similarity index 100%
rename from src/kimchi/config.py.in
rename to src/wok/config.py.in
diff --git a/src/kimchi/control/base.py b/src/wok/control/base.py
similarity index 100%
rename from src/kimchi/control/base.py
rename to src/wok/control/base.py
diff --git a/src/kimchi/control/plugins.py b/src/wok/control/plugins.py
similarity index 100%
rename from src/kimchi/control/plugins.py
rename to src/wok/control/plugins.py
diff --git a/src/kimchi/control/utils.py b/src/wok/control/utils.py
similarity index 100%
rename from src/kimchi/control/utils.py
rename to src/wok/control/utils.py
diff --git a/src/kimchi/exception.py b/src/wok/exception.py
similarity index 100%
rename from src/kimchi/exception.py
rename to src/wok/exception.py
diff --git a/src/kimchi/model/plugins.py b/src/wok/model/plugins.py
similarity index 100%
rename from src/kimchi/model/plugins.py
rename to src/wok/model/plugins.py
diff --git a/src/kimchi/netinfo.py b/src/wok/netinfo.py
similarity index 100%
rename from src/kimchi/netinfo.py
rename to src/wok/netinfo.py
diff --git a/src/kimchi/network.py b/src/wok/network.py
similarity index 100%
rename from src/kimchi/network.py
rename to src/wok/network.py
diff --git a/src/kimchi/objectstore.py b/src/wok/objectstore.py
similarity index 100%
rename from src/kimchi/objectstore.py
rename to src/wok/objectstore.py
diff --git a/src/kimchi/proxy.py b/src/wok/proxy.py
similarity index 100%
rename from src/kimchi/proxy.py
rename to src/wok/proxy.py
diff --git a/src/kimchi/rollbackcontext.py b/src/wok/rollbackcontext.py
similarity index 100%
rename from src/kimchi/rollbackcontext.py
rename to src/wok/rollbackcontext.py
diff --git a/src/kimchi/root.py b/src/wok/root.py
similarity index 100%
rename from src/kimchi/root.py
rename to src/wok/root.py
diff --git a/src/kimchi/server.py b/src/wok/server.py
similarity index 100%
rename from src/kimchi/server.py
rename to src/wok/server.py
diff --git a/src/kimchi/sslcert.py b/src/wok/sslcert.py
similarity index 100%
rename from src/kimchi/sslcert.py
rename to src/wok/sslcert.py
diff --git a/src/kimchi/template.py b/src/wok/template.py
similarity index 100%
rename from src/kimchi/template.py
rename to src/wok/template.py
diff --git a/src/kimchi/utils.py b/src/wok/utils.py
similarity index 100%
rename from src/kimchi/utils.py
rename to src/wok/utils.py
diff --git a/src/kimchi/vnc.py b/src/wok/vnc.py
similarity index 100%
rename from src/kimchi/vnc.py
rename to src/wok/vnc.py
diff --git a/src/kimchi/xmlutils/utils.py b/src/wok/xmlutils/utils.py
similarity index 100%
rename from src/kimchi/xmlutils/utils.py
rename to src/wok/xmlutils/utils.py
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:33 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:33 -0300
Subject: [Kimchi-devel] [PATCH V3 01/34] Add makefiles for fontello
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-2-git-send-email-luciojhc@linux.vnet.ibm.com>

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 configure.ac                       |    3 +++
 src/kimchi/config.py.in            |    2 +-
 ui/Makefile.am                     |    2 +-
 ui/{ => fontello}/Makefile.am      |    8 ++++----
 ui/{ => fontello/css}/Makefile.am  |    8 +++-----
 ui/{ => fontello/font}/Makefile.am |    8 +++-----
 6 files changed, 15 insertions(+), 16 deletions(-)
 copy ui/{ => fontello}/Makefile.am (81%)
 copy ui/{ => fontello/css}/Makefile.am (81%)
 copy ui/{ => fontello/font}/Makefile.am (81%)

diff --git a/configure.ac b/configure.ac
index 0261b5f..9e3edb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,9 @@ AC_CONFIG_FILES([
     plugins/sample/ui/pages/Makefile
     ui/Makefile
     ui/css/Makefile
+    ui/fontello/Makefile
+    ui/fontello/css/Makefile
+    ui/fontello/font/Makefile
     ui/images/Makefile
     ui/images/theme-default/Makefile
     ui/js/Makefile
diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in
index 8cc63e7..d2c5169 100644
--- a/src/kimchi/config.py.in
+++ b/src/kimchi/config.py.in
@@ -176,7 +176,7 @@ class UIConfig(dict):
 
     def __init__(self, paths):
         ui_configs = {}
-        for sub_dir in ('css', 'js', 'libs', 'images'):
+        for sub_dir in ('css', 'fontello', 'js', 'libs', 'images'):
             ui_configs['/' + sub_dir] = {
                 'tools.staticdir.on': True,
                 'tools.staticdir.dir': os.path.join(paths.ui_dir, sub_dir),
diff --git a/ui/Makefile.am b/ui/Makefile.am
index d541355..adb6ada 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = css images js libs pages spice-html5
+SUBDIRS = css fontello images js libs pages spice-html5
 
 uidir = $(datadir)/kimchi/ui
 
diff --git a/ui/Makefile.am b/ui/fontello/Makefile.am
similarity index 81%
copy from ui/Makefile.am
copy to ui/fontello/Makefile.am
index d541355..0576ed2 100644
--- a/ui/Makefile.am
+++ b/ui/fontello/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = css images js libs pages spice-html5
+SUBDIRS = css font
 
-uidir = $(datadir)/kimchi/ui
+fontellodir = $(datadir)/wok/ui/fontello
 
-dist_ui_DATA = robots.txt
+dist_fontello_DATA = LICENSE.txt
diff --git a/ui/Makefile.am b/ui/fontello/css/Makefile.am
similarity index 81%
copy from ui/Makefile.am
copy to ui/fontello/css/Makefile.am
index d541355..50b5489 100644
--- a/ui/Makefile.am
+++ b/ui/fontello/css/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = css images js libs pages spice-html5
+cssdir = $(datadir)/wok/ui/fontello/css
 
-uidir = $(datadir)/kimchi/ui
-
-dist_ui_DATA = robots.txt
+dist_css_DATA = $(wildcard *.css) $(NULL)
diff --git a/ui/Makefile.am b/ui/fontello/font/Makefile.am
similarity index 81%
copy from ui/Makefile.am
copy to ui/fontello/font/Makefile.am
index d541355..da9cb66 100644
--- a/ui/Makefile.am
+++ b/ui/fontello/font/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = css images js libs pages spice-html5
+fontdir = $(datadir)/wok/ui/fontello/font
 
-uidir = $(datadir)/kimchi/ui
-
-dist_ui_DATA = robots.txt
+dist_font_DATA = $(wildcard fontello.*) $(NULL)
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:36 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:36 -0300
Subject: [Kimchi-devel] [PATCH V3 04/34] Rename kimchi-named files to wok
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-5-git-send-email-luciojhc@linux.vnet.ibm.com>

Renames the remaining kimchi-named files in wok to avoid
confusion. No code changes.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 ...pstart.conf.debian => wokd-upstart.conf.debian} |    0
 ...pstart.conf.fedora => wokd-upstart.conf.fedora} |    0
 ...{kimchid.service.fedora => wokd.service.fedora} |    0
 contrib/{kimchid.sysvinit => wokd.sysvinit}        |    0
 docs/{kimchid.8.in => wokd.8.in}                   |    0
 src/nginx/{kimchi.conf.in => wok.conf.in}          |    0
 src/{kimchi.conf.in => wok.conf.in}                |    0
 src/{kimchid.in => wokd.in}                        |    0
 .../{kimchi-loading.gif => wok-loading.gif}        |  Bin 6181 -> 6181 bytes
 ui/js/src/{kimchi.cookie.js => wok.cookie.js}      |    0
 ui/js/src/{kimchi.form.js => wok.form.js}          |    0
 ui/js/src/{kimchi.grid.js => wok.grid.js}          |    0
 ui/js/src/{kimchi.lang.js => wok.lang.js}          |    0
 .../{kimchi.line-chart.js => wok.line-chart.js}    |    0
 ui/js/src/{kimchi.login.js => wok.login.js}        |    0
 ui/js/src/{kimchi.main.js => wok.main.js}          |    0
 ui/js/src/{kimchi.message.js => wok.message.js}    |    0
 ui/js/src/{kimchi.object.js => wok.object.js}      |    0
 ui/js/src/{kimchi.popable.js => wok.popable.js}    |    0
 ui/js/src/{kimchi.select.js => wok.select.js}      |    0
 ui/js/src/{kimchi.string.js => wok.string.js}      |    0
 .../{kimchi.substitute.js => wok.substitute.js}    |    0
 ui/js/src/{kimchi.topic.js => wok.topic.js}        |    0
 ui/js/src/{kimchi.user.js => wok.user.js}          |    0
 ui/js/src/{kimchi.utils.js => wok.utils.js}        |    0
 ui/js/src/{kimchi.window.js => wok.window.js}      |    0
 ui/pages/{kimchi-ui.html.tmpl => wok-ui.html.tmpl} |    0
 27 files changed, 0 insertions(+), 0 deletions(-)
 rename contrib/{kimchid-upstart.conf.debian => wokd-upstart.conf.debian} (100%)
 rename contrib/{kimchid-upstart.conf.fedora => wokd-upstart.conf.fedora} (100%)
 rename contrib/{kimchid.service.fedora => wokd.service.fedora} (100%)
 rename contrib/{kimchid.sysvinit => wokd.sysvinit} (100%)
 rename docs/{kimchid.8.in => wokd.8.in} (100%)
 rename src/nginx/{kimchi.conf.in => wok.conf.in} (100%)
 rename src/{kimchi.conf.in => wok.conf.in} (100%)
 rename src/{kimchid.in => wokd.in} (100%)
 rename ui/images/theme-default/{kimchi-loading.gif => wok-loading.gif} (100%)
 rename ui/js/src/{kimchi.cookie.js => wok.cookie.js} (100%)
 rename ui/js/src/{kimchi.form.js => wok.form.js} (100%)
 rename ui/js/src/{kimchi.grid.js => wok.grid.js} (100%)
 rename ui/js/src/{kimchi.lang.js => wok.lang.js} (100%)
 rename ui/js/src/{kimchi.line-chart.js => wok.line-chart.js} (100%)
 rename ui/js/src/{kimchi.login.js => wok.login.js} (100%)
 rename ui/js/src/{kimchi.main.js => wok.main.js} (100%)
 rename ui/js/src/{kimchi.message.js => wok.message.js} (100%)
 rename ui/js/src/{kimchi.object.js => wok.object.js} (100%)
 rename ui/js/src/{kimchi.popable.js => wok.popable.js} (100%)
 rename ui/js/src/{kimchi.select.js => wok.select.js} (100%)
 rename ui/js/src/{kimchi.string.js => wok.string.js} (100%)
 rename ui/js/src/{kimchi.substitute.js => wok.substitute.js} (100%)
 rename ui/js/src/{kimchi.topic.js => wok.topic.js} (100%)
 rename ui/js/src/{kimchi.user.js => wok.user.js} (100%)
 rename ui/js/src/{kimchi.utils.js => wok.utils.js} (100%)
 rename ui/js/src/{kimchi.window.js => wok.window.js} (100%)
 rename ui/pages/{kimchi-ui.html.tmpl => wok-ui.html.tmpl} (100%)

diff --git a/contrib/kimchid-upstart.conf.debian b/contrib/wokd-upstart.conf.debian
similarity index 100%
rename from contrib/kimchid-upstart.conf.debian
rename to contrib/wokd-upstart.conf.debian
diff --git a/contrib/kimchid-upstart.conf.fedora b/contrib/wokd-upstart.conf.fedora
similarity index 100%
rename from contrib/kimchid-upstart.conf.fedora
rename to contrib/wokd-upstart.conf.fedora
diff --git a/contrib/kimchid.service.fedora b/contrib/wokd.service.fedora
similarity index 100%
rename from contrib/kimchid.service.fedora
rename to contrib/wokd.service.fedora
diff --git a/contrib/kimchid.sysvinit b/contrib/wokd.sysvinit
similarity index 100%
rename from contrib/kimchid.sysvinit
rename to contrib/wokd.sysvinit
diff --git a/docs/kimchid.8.in b/docs/wokd.8.in
similarity index 100%
rename from docs/kimchid.8.in
rename to docs/wokd.8.in
diff --git a/src/nginx/kimchi.conf.in b/src/nginx/wok.conf.in
similarity index 100%
rename from src/nginx/kimchi.conf.in
rename to src/nginx/wok.conf.in
diff --git a/src/kimchi.conf.in b/src/wok.conf.in
similarity index 100%
rename from src/kimchi.conf.in
rename to src/wok.conf.in
diff --git a/src/kimchid.in b/src/wokd.in
similarity index 100%
rename from src/kimchid.in
rename to src/wokd.in
diff --git a/ui/js/src/kimchi.cookie.js b/ui/js/src/wok.cookie.js
similarity index 100%
rename from ui/js/src/kimchi.cookie.js
rename to ui/js/src/wok.cookie.js
diff --git a/ui/js/src/kimchi.form.js b/ui/js/src/wok.form.js
similarity index 100%
rename from ui/js/src/kimchi.form.js
rename to ui/js/src/wok.form.js
diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/wok.grid.js
similarity index 100%
rename from ui/js/src/kimchi.grid.js
rename to ui/js/src/wok.grid.js
diff --git a/ui/js/src/kimchi.lang.js b/ui/js/src/wok.lang.js
similarity index 100%
rename from ui/js/src/kimchi.lang.js
rename to ui/js/src/wok.lang.js
diff --git a/ui/js/src/kimchi.line-chart.js b/ui/js/src/wok.line-chart.js
similarity index 100%
rename from ui/js/src/kimchi.line-chart.js
rename to ui/js/src/wok.line-chart.js
diff --git a/ui/js/src/kimchi.login.js b/ui/js/src/wok.login.js
similarity index 100%
rename from ui/js/src/kimchi.login.js
rename to ui/js/src/wok.login.js
diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/wok.main.js
similarity index 100%
rename from ui/js/src/kimchi.main.js
rename to ui/js/src/wok.main.js
diff --git a/ui/js/src/kimchi.message.js b/ui/js/src/wok.message.js
similarity index 100%
rename from ui/js/src/kimchi.message.js
rename to ui/js/src/wok.message.js
diff --git a/ui/js/src/kimchi.object.js b/ui/js/src/wok.object.js
similarity index 100%
rename from ui/js/src/kimchi.object.js
rename to ui/js/src/wok.object.js
diff --git a/ui/js/src/kimchi.popable.js b/ui/js/src/wok.popable.js
similarity index 100%
rename from ui/js/src/kimchi.popable.js
rename to ui/js/src/wok.popable.js
diff --git a/ui/js/src/kimchi.select.js b/ui/js/src/wok.select.js
similarity index 100%
rename from ui/js/src/kimchi.select.js
rename to ui/js/src/wok.select.js
diff --git a/ui/js/src/kimchi.string.js b/ui/js/src/wok.string.js
similarity index 100%
rename from ui/js/src/kimchi.string.js
rename to ui/js/src/wok.string.js
diff --git a/ui/js/src/kimchi.substitute.js b/ui/js/src/wok.substitute.js
similarity index 100%
rename from ui/js/src/kimchi.substitute.js
rename to ui/js/src/wok.substitute.js
diff --git a/ui/js/src/kimchi.topic.js b/ui/js/src/wok.topic.js
similarity index 100%
rename from ui/js/src/kimchi.topic.js
rename to ui/js/src/wok.topic.js
diff --git a/ui/js/src/kimchi.user.js b/ui/js/src/wok.user.js
similarity index 100%
rename from ui/js/src/kimchi.user.js
rename to ui/js/src/wok.user.js
diff --git a/ui/js/src/kimchi.utils.js b/ui/js/src/wok.utils.js
similarity index 100%
rename from ui/js/src/kimchi.utils.js
rename to ui/js/src/wok.utils.js
diff --git a/ui/js/src/kimchi.window.js b/ui/js/src/wok.window.js
similarity index 100%
rename from ui/js/src/kimchi.window.js
rename to ui/js/src/wok.window.js
diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
similarity index 100%
rename from ui/pages/kimchi-ui.html.tmpl
rename to ui/pages/wok-ui.html.tmpl
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:38 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:38 -0300
Subject: [Kimchi-devel] [PATCH V3 06/34] Update wok docs
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-7-git-send-email-luciojhc@linux.vnet.ibm.com>

- Fix and update COPYING file
- Add API and README docs to reflect new changes introduced
by wok.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 COPYING        |    8 +++---
 README.md      |    1 +
 docs/API.md    |   46 ++++++++++++++++++++++++++++++++++++++++
 docs/README.md |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+), 4 deletions(-)
 create mode 120000 README.md
 create mode 100644 docs/API.md
 create mode 100644 docs/README.md

diff --git a/COPYING b/COPYING
index aca8f01..4cc4028 100644
--- a/COPYING
+++ b/COPYING
@@ -1,9 +1,9 @@
-Kimchi is distributed pursuant to the terms of two different licenses.
-The user interface (located in ui/ in this distribution) is governed by
-the Apache License version 2.0.
+Wok/Kimchi are distributed pursuant to the terms of two different licenses.
+The user interface (located in ui/ and plugins/kimchi/ui in this distribution)
+is governed by the Apache License version 2.0.
 
 Except the imported code under the following directories:
-- ui/spice-html5 which is imported from spice-html5 project
+- plugins/kimchi/ui/spice-html5 which is imported from spice-html5 project
 (http://cgit.freedesktop.org/spice/spice-html5);
 - ui/libs which is imported from JQuery UI (http://jqueryui.com);
 - ui/fontello which is generated by http://fontello.com open source project.
diff --git a/README.md b/README.md
new file mode 120000
index 0000000..0e01b43
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+docs/README.md
\ No newline at end of file
diff --git a/docs/API.md b/docs/API.md
new file mode 100644
index 0000000..67d966e
--- /dev/null
+++ b/docs/API.md
@@ -0,0 +1,46 @@
+## Wok REST API Specification
+
+The API provides functionality to the application and may be used directly by
+external tools.  In the following sections you will find the specification of
+all Collections and Resource types that are supported and the URIs where they
+can be accessed.  In order to use the API effectively, please the following
+general conventions:
+
+* The **Content Type** of the API is JSON.  When making HTTP requests to this
+  API you should specify the following headers:
+    * Accept: application/json
+    * Content-type: application/json
+* A **Collection** is a group of Resources of a given type.
+    * A **GET** request retrieves a list of summarized Resource representations
+      This summary *may* include all or some of the Resource properties but
+      *must* include a link to the full Resource representation.
+    * A **POST** request will create a new Resource in the Collection. The set
+      of Resource properties *must* be specified as a JSON object in the request
+      body.
+    * No other HTTP methods are supported for Collections
+* A **Resource** is a representation of a singular object in the API (eg.
+  Virtual Machine).
+    * A **GET** request retrieves the full Resource representation.
+    * A **DELETE** request will delete the Resource. This request *may* contain
+      a JSON object which specifies optional parameters.
+    * A **PUT** request is used to modify the properties of a Resource (eg.
+      Change the name of a Virtual Machine). This kind of request *must not*
+      alter the live state of the Resource. Only *actions* may alter live state.
+    * A **POST** request commits an *action* upon a Resource (eg. Start a
+      Virtual Machine). This request is made to a URI relative to the Resource
+      URI. Available *actions* are described within the *actions* property of a
+      Resource representation.  The request body *must* contain a JSON object
+      which specifies parameters.
+* URIs begin with '/' to indicate Wok server root.
+    * Variable segments in the URI begin with a ':' and should replaced with the
+      appropriate resource identifier.
+
+
+### Collection: Plugins
+
+**URI:** /plugins
+
+**Methods:**
+
+* **GET**: Retrieve a summarized list names of all UI Plugins
+
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..1b31ccf
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,64 @@
+Wok (Webserver Originated from Kimchi)
+======================================
+
+Wok is a cherrypy-based web framework with HTML5 support that is extended by
+plugins which expose functionality through REST APIs.
+
+Examples of such plugins are Kimchi (Virtualization Management) and Ginger
+(System Administration). Wok comes with a sample plugin for education purposes.
+
+Wok runs through wokd daemon.
+
+
+Build and Install
+-----------------
+
+    $ ./autogen.sh --system
+    $ make
+    $ sudo make install   # Optional if running from the source tree
+
+
+Run
+---
+
+    $ sudo wokd --host=0.0.0.0
+
+If you cannot access Wok, take a look at these 2 points:
+
+1. Firewall
+Wok uses by default the ports 8000, 8001 and 64667. To allow incoming connections:
+
+    For system using firewalld, do:
+    sudo firewall-cmd --add-port=8000/tcp --permanent
+    sudo firewall-cmd --add-port=8001/tcp --permanent
+    sudo firewall-cmd --add-port=64667/tcp --permanent
+    sudo firewall-cmd --reload
+
+    For openSUSE systems, do:
+    sudo /sbin/SuSEfirewall2 open EXT TCP 8000
+    sudo /sbin/SuSEfirewall2 open EXT TCP 8001
+    sudo /sbin/SuSEfirewall2 open EXT TCP 64667
+
+    For system using iptables, do:
+    sudo iptables -A INPUT -p tcp --dport 8000 -j ACCEPT
+    sudo iptables -A INPUT -p tcp --dport 8001 -j ACCEPT
+    sudo iptables -A INPUT -p tcp --dport 64667 -j ACCEPT
+
+    Don't forget to correctly save the rules.
+
+
+2. SELinux
+Allow httpd_t context for Wok web server:
+
+    semanage permissive -a httpd_t
+
+
+Participating
+-------------
+
+All patches are sent through our mailing list hosted by oVirt.  More
+information can be found at:
+
+https://github.com/kimchi-project/kimchi/wiki/Communications
+
+Patches should be sent using git-send-email to kimchi-devel at ovirt.org.
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:47 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:47 -0300
Subject: [Kimchi-devel] [PATCH V3 15/34] Setup wok
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-16-git-send-email-luciojhc@linux.vnet.ibm.com>

- Add model.py for wok
- Add an empty json API to wok
- Move some basic Javascript APIs from kimchi
- Do not load tabs.xml anymore
- Disable wok authentication by default
- Rename KimchiRoot to WokRoot
- Update default_page to wok-ui.html
- Adapt 'sample' plugin
- Move hide-content css to wok

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/ui/css/theme-default/storage.css |    4 -
 plugins/sample/__init__.py                      |    4 +-
 src/wok/API.json                                |    6 ++
 src/wok/config.py.in                            |    1 +
 src/wok/model/model.py                          |   49 ++++++++++++
 src/wok/root.py                                 |   10 +-
 src/wok/server.py                               |    8 +-
 src/wok/utils.py                                |    2 +-
 ui/css/theme-default/topbar.css                 |    4 +
 ui/js/src/wok.api.js                            |   91 +++++++++++++++++++++++
 ui/js/src/wok.main.js                           |    3 +-
 11 files changed, 164 insertions(+), 18 deletions(-)
 create mode 100644 src/wok/API.json
 create mode 100644 src/wok/model/model.py
 create mode 100644 ui/js/src/wok.api.js

diff --git a/plugins/kimchi/ui/css/theme-default/storage.css b/plugins/kimchi/ui/css/theme-default/storage.css
index 31e8f5b..88447b5 100644
--- a/plugins/kimchi/ui/css/theme-default/storage.css
+++ b/plugins/kimchi/ui/css/theme-default/storage.css
@@ -215,10 +215,6 @@
     border: 1px solid rgb(204, 204, 204);
 }
 
-.hide-content {
-    display: none!important;
-}
-
 .volumeslist {
     padding: 7px;
     max-height: 272px;
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 786832f..3a309a5 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -26,7 +26,7 @@ from cherrypy import expose
 
 from wok.config import PluginPaths
 from wok.control.base import Collection, Resource
-from wok.root import Root
+from wok.root import WokRoot
 from plugins.sample.i18n import messages
 from plugins.sample.model import Model
 
@@ -34,7 +34,7 @@ from plugins.sample.model import Model
 model = Model()
 
 
-class Drawings(Root):
+class Drawings(WokRoot):
     def __init__(self):
         Resource.__init__(self, model)
         self.description = Description(model)
diff --git a/src/wok/API.json b/src/wok/API.json
new file mode 100644
index 0000000..8965db9
--- /dev/null
+++ b/src/wok/API.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "title": "Wok API",
+    "description": "Json schema for Wok API",
+    "type": "object"
+}
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 3fc46a4..47c9edf 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -180,6 +180,7 @@ class UIConfig(dict):
             ui_configs['/' + sub_dir] = {
                 'tools.staticdir.on': True,
                 'tools.staticdir.dir': os.path.join(paths.ui_dir, sub_dir),
+                'tools.wokauth.on': False,
                 'tools.nocache.on': False}
             if sub_dir != 'images':
                 ui_configs['/' + sub_dir].update({
diff --git a/src/wok/model/model.py b/src/wok/model/model.py
new file mode 100644
index 0000000..09c4c1e
--- /dev/null
+++ b/src/wok/model/model.py
@@ -0,0 +1,49 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2014-2015
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# 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
+
+import inspect
+import os
+
+from wok.basemodel import BaseModel
+from wok.objectstore import ObjectStore
+from wok.utils import import_module, listPathModules
+
+
+class Model(BaseModel):
+    def __init__(self, objstore_loc=None):
+
+        self.objstore = ObjectStore(objstore_loc)
+        kargs = {'objstore': self.objstore}
+
+        this = os.path.basename(__file__)
+        this_mod = os.path.splitext(this)[0]
+
+        models = []
+        for mod_name in listPathModules(os.path.dirname(__file__)):
+            if mod_name.startswith("_") or mod_name == this_mod:
+                continue
+
+            module = import_module('wok.model.' + mod_name)
+            members = inspect.getmembers(module, inspect.isclass)
+            for cls_name, instance in members:
+                if inspect.getmodule(instance) == module:
+                    if cls_name.endswith('Model'):
+                        models.append(instance(**kargs))
+
+        return super(Model, self).__init__(models)
diff --git a/src/wok/root.py b/src/wok/root.py
index a3b8be1..35620c7 100644
--- a/src/wok/root.py
+++ b/src/wok/root.py
@@ -114,16 +114,16 @@ class Root(Resource):
         raise cherrypy.HTTPError(404)
 
 
-class KimchiRoot(Root):
-    def __init__(self, model, dev_env):
-        super(KimchiRoot, self).__init__(model, dev_env)
-        self.default_page = 'kimchi-ui.html'
+class WokRoot(Root):
+    def __init__(self, model, dev_env=False):
+        super(WokRoot, self).__init__(model, dev_env)
+        self.default_page = 'wok-ui.html'
         for ident, node in sub_nodes.items():
             setattr(self, ident, node(model))
         with open(os.path.join(paths.src_dir, 'API.json')) as f:
             self.api_schema = json.load(f)
         self.paths = paths
-        self.domain = 'kimchi'
+        self.domain = 'wok'
         self.messages = messages
 
     @cherrypy.expose
diff --git a/src/wok/server.py b/src/wok/server.py
index 0f99663..ab941e7 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -28,10 +28,10 @@ from wok import config
 from wok.model import model
 from wok import mockmodel
 from wok import vnc
-from wok.config import KimchiConfig, PluginConfig
+from wok.config import WokConfig, PluginConfig
 from wok.control import sub_nodes
 from wok.proxy import start_proxy, terminate_proxy
-from wok.root import KimchiRoot
+from wok.root import WokRoot
 from wok.utils import get_enabled_plugins, import_class
 
 
@@ -73,7 +73,7 @@ class Server(object):
             if not os.path.isdir(directory):
                 os.makedirs(directory)
 
-        self.configObj = KimchiConfig()
+        self.configObj = WokConfig()
         # We'll use the session timeout (= 10 minutes) and the
         # nginx timeout (= 10 minutes). This monitor isn't involved
         # in anything other than monitor the timeout of the connection,
@@ -141,7 +141,7 @@ class Server(object):
                 ident = "/%s" % ident
                 cfg[ident] = {'tools.wokauth.on': True}
 
-        self.app = cherrypy.tree.mount(KimchiRoot(model_instance, dev_env),
+        self.app = cherrypy.tree.mount(WokRoot(model_instance, dev_env),
                                        config=self.configObj)
         self._load_plugins()
 
diff --git a/src/wok/utils.py b/src/wok/utils.py
index f5058d5..fc76620 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -113,7 +113,7 @@ def get_enabled_plugins():
 
 
 def get_all_tabs():
-    files = [os.path.join(paths.prefix, 'config/ui/tabs.xml')]
+    files = []
 
     for plugin, _ in get_enabled_plugins():
         files.append(os.path.join(PluginPaths(plugin).ui_dir,
diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css
index 9dd5ec1..4fce02c 100644
--- a/ui/css/theme-default/topbar.css
+++ b/ui/css/theme-default/topbar.css
@@ -208,3 +208,7 @@ a#btn-logout:hover {
     display: block;
     padding: 10px;
 }
+
+.hide-content {
+    display: none!important;
+}
diff --git a/ui/js/src/wok.api.js b/ui/js/src/wok.api.js
new file mode 100644
index 0000000..93a07ad
--- /dev/null
+++ b/ui/js/src/wok.api.js
@@ -0,0 +1,91 @@
+/*
+ * Project Kimchi
+ *
+ * Copyright IBM, Corp. 2013-2015
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var wok = {
+
+    widget: {},
+
+    /**
+     * A wrapper of jQuery.ajax function to allow custom bindings.
+     *
+     * @param settings an extended object to jQuery Ajax settings object
+     *   with some extra properties (see below)
+     *
+     *   resend: if the XHR has failed due to 401, the XHR can be resent
+     *     after user being authenticated successfully by setting resend
+     *     to true: settings = {resend: true}. It's useful for switching
+     *     pages (Guests, Templates, etc.).
+     *       e.g., the user wants to list guests by clicking Guests tab,
+     *     but he is told not authorized and a login window will pop up.
+     *     After login, the Ajax request for /vms will be resent without
+     *     user clicking the tab again.
+     *       Default to false.
+     */
+    requestJSON : function(settings) {
+        settings['originalError'] = settings['error'];
+        settings['error'] = null;
+        settings['wok'] = true;
+        return $.ajax(settings);
+    },
+
+    /**
+     * Get the i18 strings.
+     */
+    getI18n: function(suc, err, url, sync) {
+        wok.requestJSON({
+            url : url ? url : 'i18n.json',
+            type : 'GET',
+            resend: true,
+            dataType : 'json',
+            async : !sync,
+            success : suc,
+            error: err
+        });
+    },
+
+    login : function(settings, suc, err) {
+        $.ajax({
+            url : "login",
+            type : "POST",
+            contentType : "application/json",
+            data : JSON.stringify(settings),
+            dataType : "json"
+        }).done(suc).fail(err);
+    },
+
+    logout : function(suc, err) {
+        wok.requestJSON({
+            url : 'logout',
+            type : 'POST',
+            contentType : "application/json",
+            dataType : "json"
+        }).done(suc).fail(err);
+    },
+
+    listPlugins : function(suc, err, sync) {
+        wok.requestJSON({
+            url : 'plugins',
+            type : 'GET',
+            contentType : 'application/json',
+            dataType : 'json',
+            resend: true,
+            async : !sync,
+            success : suc,
+            error : err
+        });
+     },
+};
diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js
index 089b523..5b1f1bc 100644
--- a/ui/js/src/wok.main.js
+++ b/ui/js/src/wok.main.js
@@ -90,12 +90,11 @@ wok.main = function() {
         return tabs;
     };
 
-    var tabConfigUrl = 'config/ui/tabs.xml';
     var pluginConfigUrl = 'plugins/{plugin}/ui/config/tab-ext.xml';
     var pluginI18nUrl = 'plugins/{plugin}/i18n.json';
     var DEFAULT_HASH;
     var buildTabs = function(callback) {
-        var tabs = retrieveTabs(tabConfigUrl);
+        var tabs = [];
         wok.listPlugins(function(plugins) {
             $(plugins).each(function(i, p) {
                 var url = wok.substitute(pluginConfigUrl, {
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:48 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:48 -0300
Subject: [Kimchi-devel] [PATCH V3 16/34] Setup kimchi plugin
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-17-git-send-email-luciojhc@linux.vnet.ibm.com>

- Create root.py, kimchi.conf and config.py.in in plugin
- Adjust tabs-ext.xml
- Move kimchi specific config/API from wok to plugin
- Move mockmodel stuff to plugin
- Create mechanism to load plugin-specific config through
  get_custom_conf() method in plugin root and use it for
  novnc/spice config moved to new classes KimchiPaths and
  KimchiConfig
- Pass all server options in plugins initalization
- Adapt sample plugin to receive server options
- Drop server-specific functions from kimchi plugin
- Move kimchi-specific URI functions to plugin
- Move capabilities to kimchi plugin

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/__init__.py                         |   21 +++
 plugins/kimchi/config.py.in                        |  139 ++++++++++++++++++++
 plugins/kimchi/kimchi.conf                         |   45 +++++++
 plugins/kimchi/root.py                             |   70 ++++++++++
 plugins/kimchi/ui/config/tab-ext.xml               |   14 +-
 plugins/kimchi/ui/js/src/kimchi.api.js             |   55 --------
 plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js |    6 +-
 plugins/kimchi/ui/js/src/kimchi.host.js            |   12 +-
 plugins/kimchi/ui/js/src/kimchi.main.js            |   26 ++++
 .../ui/js/src/kimchi.repository_edit_main.js       |    4 +-
 .../kimchi/ui/js/src/kimchi.template_add_main.js   |    4 +-
 .../kimchi/ui/js/src/kimchi.template_edit_main.js  |    4 +-
 plugins/kimchi/utils.py                            |   40 ++++++
 plugins/sample/__init__.py                         |    2 +-
 src/wok/config.py.in                               |  122 -----------------
 src/wok/server.py                                  |   25 ++--
 src/wok/utils.py                                   |   16 ---
 ui/js/src/wok.main.js                              |   10 --
 18 files changed, 374 insertions(+), 241 deletions(-)
 create mode 100644 plugins/kimchi/__init__.py
 create mode 100644 plugins/kimchi/config.py.in
 create mode 100644 plugins/kimchi/kimchi.conf
 create mode 100644 plugins/kimchi/root.py
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.main.js
 create mode 100644 plugins/kimchi/utils.py

diff --git a/plugins/kimchi/__init__.py b/plugins/kimchi/__init__.py
new file mode 100644
index 0000000..9330044
--- /dev/null
+++ b/plugins/kimchi/__init__.py
@@ -0,0 +1,21 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2013-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 root import KimchiRoot
+__all__ = [KimchiRoot]
diff --git a/plugins/kimchi/config.py.in b/plugins/kimchi/config.py.in
new file mode 100644
index 0000000..80b72bd
--- /dev/null
+++ b/plugins/kimchi/config.py.in
@@ -0,0 +1,139 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2013-2015
+#
+# 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
+#
+
+import libvirt
+import os
+import platform
+import threading
+
+from wok.config import PluginPaths
+from wok.xmlutils.utils import xpath_get_text
+
+kimchiLock = threading.Lock()
+
+__with_spice__ = "@withspice@"
+
+# Storage pool constant for read-only pool types
+READONLY_POOL_TYPE = ['iscsi', 'scsi', 'mpath']
+
+
+def get_distros_store():
+    return os.path.join(PluginPaths('kimchi').conf_dir, 'distros.d')
+
+
+def get_debugreports_path():
+    return os.path.join(PluginPaths('kimchi').state_dir, 'debugreports')
+
+
+def get_screenshot_path():
+    return os.path.join(PluginPaths('kimchi').state_dir, 'screenshots')
+
+
+def find_qemu_binary(find_emulator=False):
+    try:
+        connect = libvirt.open(None)
+    except Exception, e:
+        raise Exception("Unable to get qemu binary location: %s" % e)
+    try:
+        xml = connect.getCapabilities()
+
+        # On Little Endian system, the qemu binary is
+        # qemu-system-ppc64, not qemu-system-ppc64le as expected
+        arch = platform.machine()
+        if arch == "ppc64le":
+            arch = "ppc64"
+
+        if find_emulator:
+            expr = "/capabilities/guest/arch[@name='%s']\
+                    /emulator" % arch
+        else:
+            expr = "/capabilities/guest/arch[@name='%s']\
+                    /domain[@type='kvm']/emulator" % arch
+        res = xpath_get_text(xml, expr)
+        location = res[0]
+    except Exception, e:
+        raise Exception("Unable to get qemu binary location: %s" % e)
+    finally:
+        connect.close()
+    return location
+
+
+class KimchiPaths(PluginPaths):
+
+    def __init__(self):
+        super(KimchiPaths, self).__init__('kimchi')
+        self.spice_file = os.path.join(self.ui_dir,
+                                       'spice-html5/pages/spice_auto.html')
+
+        if __with_spice__ == 'yes':
+            self.spice_dir = self.add_prefix('ui/spice-html5')
+        elif os.path.exists('@datadir@/spice-html5'):
+            self.spice_dir = '@datadir@/spice-html5'
+        else:
+            self.spice_dir = '/usr/share/spice-html5'
+
+        if os.path.exists('@datadir@/novnc'):
+            self.novnc_dir = '@datadir@/novnc'
+        else:
+            self.novnc_dir = '/usr/share/novnc'
+
+        if self.installed:
+            self.spice_css_file = os.path.join(self.spice_dir, 'spice.css')
+        else:
+            self.spice_css_file = os.path.join(self.spice_dir, 'css/spice.css')
+
+
+kimchiPaths = KimchiPaths()
+
+
+class KimchiConfig(dict):
+    def __init__(self):
+        super(KimchiConfig, self).__init__(self)
+
+        custom_config = {
+            '/novnc': {
+                'tools.staticdir.on': True,
+                'tools.staticdir.dir': kimchiPaths.novnc_dir,
+                'tools.nocache.on': True,
+                'tools.wokauth.on': True,
+            },
+
+            '/spice_auto.html': {
+                'tools.staticfile.on': True,
+                'tools.staticfile.filename': kimchiPaths.spice_file,
+                'tools.nocache.on': True,
+                'tools.wokauth.on': True,
+            },
+
+            '/spice-html5': {
+                'tools.staticdir.on': True,
+                'tools.staticdir.dir': kimchiPaths.spice_dir,
+                'tools.nocache.on': True,
+            },
+
+            '/spice-html5/spice.css': {
+                'tools.staticfile.on': True,
+                'tools.staticfile.filename': kimchiPaths.spice_css_file,
+                'tools.nocache.on': True,
+            },
+        }
+
+        self.update(custom_config)
+
diff --git a/plugins/kimchi/kimchi.conf b/plugins/kimchi/kimchi.conf
new file mode 100644
index 0000000..1e0ee6b
--- /dev/null
+++ b/plugins/kimchi/kimchi.conf
@@ -0,0 +1,45 @@
+[wok]
+enable = True
+plugin_class = "KimchiRoot"
+uri = "/plugins/kimchi"
+
+[/]
+tools.trailing_slash.on = False
+request.methods_with_bodies = ('POST', 'PUT')
+tools.nocache.on = True
+tools.proxy.on = True
+tools.sessions.on = True
+tools.sessions.name = 'wok'
+tools.sessions.secure = True
+tools.sessions.httponly = True
+tools.sessions.locking = 'explicit'
+tools.sessions.storage_type = 'ram'
+tools.sessions.timeout = 10
+tools.wokauth.on = True
+
+[/data/screenshots]
+tools.staticdir.on = True
+tools.staticdir.dir = wok.config.PluginPaths('kimchi').state_dir + '/screenshots'
+tools.nocache.on = False
+
+[/data/debugreports]
+tools.staticdir.on = True
+tools.staticdir.dir = wok.config.PluginPaths('kimchi').state_dir + '/debugreports'
+tools.nocache.on = False
+tools.wokauth.on = True
+tools.staticdir.content_types = {'xz': 'application/x-xz'}
+
+[/favicon.ico]
+tools.staticfile.on = True
+tools.staticfile.filename = wok.config.PluginPaths('kimchi').ui_dir + '/images/logo.ico'
+
+[/robots.txt]
+tools.staticfile.on = True
+tools.staticfile.filename = wok.config.PluginPaths('kimchi').ui_dir + '/robots.txt'
+
+[/help]
+tools.staticdir.on = True
+tools.staticdir.dir = wok.config.PluginPaths('kimchi').ui_dir + '/pages/help'
+tools.nocache.on = True
+tools.staticdir.index = 'en_US/index.html'
+
diff --git a/plugins/kimchi/root.py b/plugins/kimchi/root.py
new file mode 100644
index 0000000..9889926
--- /dev/null
+++ b/plugins/kimchi/root.py
@@ -0,0 +1,70 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2013-2015
+#
+# 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
+
+import json
+import os
+import cherrypy
+
+
+import config
+import mockmodel
+from control import sub_nodes
+from wok.i18n import messages
+from model import model as kimchiModel
+from wok.root import WokRoot
+from wok import vnc
+
+
+class KimchiRoot(WokRoot):
+    def __init__(self, wok_options):
+        if hasattr(wok_options, "model"):
+            self.model = wok_options.model
+        elif wok_options.test:
+            self.model = mockmodel.MockModel()
+        else:
+            self.model = kimchiModel.Model()
+
+        dev_env = wok_options.environment != 'production'
+        super(KimchiRoot, self).__init__(self.model, dev_env)
+
+        for ident, node in sub_nodes.items():
+            setattr(self, ident, node(self.model))
+
+        if isinstance(self.model, kimchiModel.Model):
+            vnc_ws_proxy = vnc.new_ws_proxy()
+            cherrypy.engine.subscribe('exit', vnc_ws_proxy.terminate)
+
+        self.api_schema = json.load(open(os.path.join(os.path.dirname(
+                                    os.path.abspath(__file__)), 'API.json')))
+        self.paths = config.kimchiPaths
+        self.domain = 'kimchi'
+        self.messages = messages
+
+        make_dirs = [
+            os.path.abspath(config.get_distros_store()),
+            os.path.abspath(config.get_debugreports_path()),
+            os.path.abspath(config.get_screenshot_path())
+        ]
+        for directory in make_dirs:
+            if not os.path.isdir(directory):
+                os.makedirs(directory)
+
+    def get_custom_conf(self):
+        return config.KimchiConfig()
+
diff --git a/plugins/kimchi/ui/config/tab-ext.xml b/plugins/kimchi/ui/config/tab-ext.xml
index f79684c..ee88c88 100644
--- a/plugins/kimchi/ui/config/tab-ext.xml
+++ b/plugins/kimchi/ui/config/tab-ext.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tabs>
+<tabs-ext>
     <tab>
         <access role="admin" mode="admin"/>
         <access role="user" mode="none"/>
 
         <title>Host</title>
-        <path>tabs/host.html</path>
+        <path>plugins/kimchi/host.html</path>
     </tab>
     <tab>
         <access role="admin" mode="admin"/>
         <access role="user" mode="byInstance"/>
 
         <title>Guests</title>
-        <path>tabs/guests.html</path>
+        <path>plugins/kimchi/guests.html</path>
     </tab>
     <tab>
         <access role="admin" mode="admin"/>
         <access role="user" mode="none"/>
 
         <title>Templates</title>
-        <path>tabs/templates.html</path>
+        <path>plugins/kimchi/templates.html</path>
     </tab>
     <tab>
         <access role="admin" mode="admin"/>
         <access role="user" mode="read-only"/>
 
         <title>Storage</title>
-        <path>tabs/storage.html</path>
+        <path>plugins/kimchi/storage.html</path>
     </tab>
     <tab>
         <access role="admin" mode="admin"/>
         <access role="user" mode="read-only"/>
 
         <title>Network</title>
-        <path>tabs/network.html</path>
+        <path>plugins/kimchi/network.html</path>
     </tab>
-</tabs>
+</tabs-ext>
diff --git a/plugins/kimchi/ui/js/src/kimchi.api.js b/plugins/kimchi/ui/js/src/kimchi.api.js
index d4d0c83..0ec3747 100644
--- a/plugins/kimchi/ui/js/src/kimchi.api.js
+++ b/plugins/kimchi/ui/js/src/kimchi.api.js
@@ -22,29 +22,6 @@ var kimchi = {
     trackingTasks: [],
 
     /**
-     * A wrapper of jQuery.ajax function to allow custom bindings.
-     *
-     * @param settings an extended object to jQuery Ajax settings object
-     *   with some extra properties (see below)
-     *
-     *   resend: if the XHR has failed due to 401, the XHR can be resent
-     *     after user being authenticated successfully by setting resend
-     *     to true: settings = {resend: true}. It's useful for switching
-     *     pages (Guests, Templates, etc.).
-     *       e.g., the user wants to list guests by clicking Guests tab,
-     *     but he is told not authorized and a login window will pop up.
-     *     After login, the Ajax request for /vms will be resent without
-     *     user clicking the tab again.
-     *       Default to false.
-     */
-    requestJSON : function(settings) {
-        settings['originalError'] = settings['error'];
-        settings['error'] = null;
-        settings['kimchi'] = true;
-        return $.ajax(settings);
-    },
-
-    /**
      *
      * Get host capabilities
      * suc: callback if succeed err: callback if failed
@@ -569,25 +546,6 @@ var kimchi = {
         });
     },
 
-    login : function(settings, suc, err) {
-        $.ajax({
-            url : "login",
-            type : "POST",
-            contentType : "application/json",
-            data : JSON.stringify(settings),
-            dataType : "json"
-        }).done(suc).fail(err);
-    },
-
-    logout : function(suc, err) {
-        kimchi.requestJSON({
-            url : 'logout',
-            type : 'POST',
-            contentType : "application/json",
-            dataType : "json"
-        }).done(suc).fail(err);
-    },
-
     deleteStoragePool : function(poolName, suc, err) {
         $.ajax({
             url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName),
@@ -611,19 +569,6 @@ var kimchi = {
             });
     },
 
-    listPlugins : function(suc, err, sync) {
-        kimchi.requestJSON({
-            url : 'plugins',
-            type : 'GET',
-            contentType : 'application/json',
-            dataType : 'json',
-            resend: true,
-            async : !sync,
-            success : suc,
-            error : err
-        });
-     },
-
     listNetworks : function(suc, err) {
         wok.requestJSON({
             url : 'plugins/kimchi/networks',
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
index 25e3703..7105c88 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
@@ -314,7 +314,7 @@ kimchi.guest_edit_main = function() {
         };
         //set up for PAM
         var userNodes = {}, groupNodes = {};
-        authType = wok.capabilities['auth']
+        authType = kimchi.capabilities['auth']
         if (authType == 'pam') {
             $("#form-guest-edit-permission .ldap").hide();
             kimchi.retrieveVM(kimchi.selectedGuest, function(vm){
@@ -432,7 +432,7 @@ kimchi.guest_edit_main = function() {
     var setupPCIDevice = function(){
         kimchi.getHostPCIDevices(function(hostPCIs){
             kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){
-                var pciEnabled = wok.capabilities.kernel_vfio;
+                var pciEnabled = kimchi.capabilities.kernel_vfio;
                 for(var i=0; i<hostPCIs.length; i++){
                     var itemNode = $.parseHTML(wok.substitute($('#pci-tmpl').html(),{
                         name: hostPCIs[i].name,
@@ -708,7 +708,7 @@ kimchi.guest_edit_main = function() {
 
     var permissionSubmit = function(event) {
         var content = { users: [], groups: [] };
-        authType = wok.capabilities['auth']
+        authType = kimchi.capabilities['auth']
         if (authType == 'pam') {
             $("#permission-sel-users").children().each(function(){
                 content.users.push($("label", this).text());
diff --git a/plugins/kimchi/ui/js/src/kimchi.host.js b/plugins/kimchi/ui/js/src/kimchi.host.js
index afca992..e2d2511 100644
--- a/plugins/kimchi/ui/js/src/kimchi.host.js
+++ b/plugins/kimchi/ui/js/src/kimchi.host.js
@@ -507,14 +507,14 @@ kimchi.host_main = function() {
         });
 
         var setupUI = function() {
-            if (wok.capabilities == undefined) {
+            if (kimchi.capabilities == undefined) {
                 setTimeout(setupUI, 2000);
                 return;
             }
 
-            if((wok.capabilities['repo_mngt_tool']) && (wok.capabilities['repo_mngt_tool']!="None")) {
-                initRepositoriesGrid(wok.capabilities['repo_mngt_tool']);
-                $('#repositories-section').switchClass('hidden', wok.capabilities['repo_mngt_tool']);
+            if((kimchi.capabilities['repo_mngt_tool']) && (kimchi.capabilities['repo_mngt_tool']!="None")) {
+                initRepositoriesGrid(kimchi.capabilities['repo_mngt_tool']);
+                $('#repositories-section').switchClass('hidden', kimchi.capabilities['repo_mngt_tool']);
                 wok.topic('kimchi/repositoryAdded')
                     .subscribe(listRepositories);
                 wok.topic('kimchi/repositoryUpdated')
@@ -523,7 +523,7 @@ kimchi.host_main = function() {
                     .subscribe(listRepositories);
             }
 
-            if(wok.capabilities['update_tool']) {
+            if(kimchi.capabilities['update_tool']) {
                 $('#software-update-section').removeClass('hidden');
                 initSoftwareUpdatesGrid();
                 wok.topic('kimchi/softwareUpdated')
@@ -533,7 +533,7 @@ kimchi.host_main = function() {
                 });
             }
 
-            if(wok.capabilities['system_report_tool']) {
+            if(kimchi.capabilities['system_report_tool']) {
                 listDebugReports();
                 wok.topic('kimchi/debugReportAdded')
                     .subscribe(listDebugReports);
diff --git a/plugins/kimchi/ui/js/src/kimchi.main.js b/plugins/kimchi/ui/js/src/kimchi.main.js
new file mode 100644
index 0000000..2fdeb85
--- /dev/null
+++ b/plugins/kimchi/ui/js/src/kimchi.main.js
@@ -0,0 +1,26 @@
+/*
+ * Project Kimchi
+ *
+ * Copyright IBM, Corp. 2013-2014
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+kimchi.capabilities = undefined;
+kimchi.getCapabilities(function(result) {
+    kimchi.capabilities = result;
+
+    if(kimchi.capabilities.federation=="on")
+        $('#peers').removeClass('hide-content');
+}, function() {
+    kimchi.capabilities = {};
+});
diff --git a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
index 85e24d4..5bfc51e 100644
--- a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
@@ -21,10 +21,10 @@ kimchi.repository_edit_main = function() {
 
     var saveButton = $('#repository-edit-button-save');
 
-    if(wok.capabilities['repo_mngt_tool']=="yum") {
+    if(kimchi.capabilities['repo_mngt_tool']=="yum") {
         editForm.find('input.deb').prop('disabled', true);
     }
-    else if(wok.capabilities['repo_mngt_tool']=="deb") {
+    else if(kimchi.capabilities['repo_mngt_tool']=="deb") {
         editForm.find('input.yum').prop('disabled', true);
     }
 
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_add_main.js b/plugins/kimchi/ui/js/src/kimchi.template_add_main.js
index 5528eb2..01a47c2 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_add_main.js
@@ -224,12 +224,12 @@ kimchi.template_add_main = function() {
     $('#iso-remote').css('opacity', 0.3).css('cursor', 'not-allowed');
 
     var enabledRemoteIso = function() {
-        if (wok.capabilities == undefined) {
+        if (kimchi.capabilities == undefined) {
             setTimeout(enabledRemoteIso, 2000);
             return;
         }
 
-        if (wok.capabilities.qemu_stream != true) {
+        if (kimchi.capabilities.qemu_stream != true) {
             return;
         }
 
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
index 87bba3d..d40b6c7 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
@@ -49,11 +49,11 @@ kimchi.template_edit_main = function() {
         $('#template-edit-graphics').append('<option>Spice</option>');
         wok.select('template-edit-graphics-list', vncOpt);
         var enableSpice = function() {
-            if (wok.capabilities == undefined) {
+            if (kimchi.capabilities == undefined) {
                 setTimeout(enableSpice, 2000);
                 return;
             }
-            if (wok.capabilities.qemu_spice == true) {
+            if (kimchi.capabilities.qemu_spice == true) {
                 spiceOpt = [{label: 'Spice', value: 'spice'}]
                 wok.select('template-edit-graphics-list', spiceOpt);
             }
diff --git a/plugins/kimchi/utils.py b/plugins/kimchi/utils.py
new file mode 100644
index 0000000..dc00481
--- /dev/null
+++ b/plugins/kimchi/utils.py
@@ -0,0 +1,40 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2013-2015
+#
+# 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
+#
+
+import re
+
+from wok.exception import InvalidParameter
+
+
+def _uri_to_name(collection, uri):
+    expr = '/plugins/kimchi/%s/(.*?)$' % collection
+    m = re.match(expr, uri)
+    if not m:
+        raise InvalidParameter("KCHUTILS0001E", {'uri': uri})
+    return m.group(1)
+
+
+def template_name_from_uri(uri):
+    return _uri_to_name('templates', uri)
+
+
+def pool_name_from_uri(uri):
+    return _uri_to_name('storagepools', uri)
+
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 3a309a5..a2cfbf2 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -35,7 +35,7 @@ model = Model()
 
 
 class Drawings(WokRoot):
-    def __init__(self):
+    def __init__(self, wok_options):
         Resource.__init__(self, model)
         self.description = Description(model)
         self.rectangles = Rectangles(model)
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 47c9edf..558eceb 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -18,98 +18,32 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-import libvirt
 import os
-import platform
-import threading
 
 
 from ConfigParser import SafeConfigParser
 
 
-from kimchi.xmlutils.utils import xpath_get_text
-
 __version__ = "@wokversion@"
 __release__ = "@wokrelease@"
-__with_spice__ = "@withspice@"
 
 DEFAULT_LOG_LEVEL = "debug"
 
-kimchiLock = threading.Lock()
-
-# Storage pool constant for read-only pool types
-READONLY_POOL_TYPE = ['iscsi', 'scsi', 'mpath']
-
 
 def get_object_store():
     return os.path.join(paths.state_dir, 'objectstore')
 
 
-def get_distros_store():
-    return os.path.join(paths.conf_dir, 'distros.d')
-
-
-def get_screenshot_path():
-    return os.path.join(paths.state_dir, 'screenshots')
-
-
-def get_debugreports_path():
-    return os.path.join(paths.state_dir, 'debugreports')
-
-
 def get_version():
     return "-".join([__version__, __release__])
 
 
-def find_qemu_binary(find_emulator=False):
-    try:
-        connect = libvirt.open(None)
-    except Exception, e:
-        raise Exception("Unable to get qemu binary location: %s" % e)
-    try:
-        xml = connect.getCapabilities()
-
-        # On Little Endian system, the qemu binary is
-        # qemu-system-ppc64, not qemu-system-ppc64le as expected
-        arch = platform.machine()
-        if arch == "ppc64le":
-            arch = "ppc64"
-
-        if find_emulator:
-            expr = "/capabilities/guest/arch[@name='%s']\
-                    /emulator" % arch
-        else:
-            expr = "/capabilities/guest/arch[@name='%s']\
-                    /domain[@type='kvm']/emulator" % arch
-        res = xpath_get_text(xml, expr)
-        location = res[0]
-    except Exception, e:
-        raise Exception("Unable to get qemu binary location: %s" % e)
-    finally:
-        connect.close()
-    return location
-
-
 class Paths(object):
 
     def __init__(self):
         self.prefix = self.get_prefix()
         self.installed = (self.prefix == '@pkgdatadir@')
         self.ui_dir = self.add_prefix('ui')
-        self.spice_file = os.path.join(self.ui_dir,
-                                       'spice-html5/pages/spice_auto.html')
-
-        if __with_spice__ == 'yes':
-            self.spice_dir = self.add_prefix('ui/spice-html5')
-        elif os.path.exists('@datadir@/spice-html5'):
-            self.spice_dir = '@datadir@/spice-html5'
-        else:
-            self.spice_dir = '/usr/share/spice-html5'
-
-        if os.path.exists('@datadir@/novnc'):
-            self.novnc_dir = '@datadir@/novnc'
-        else:
-            self.novnc_dir = '/usr/share/novnc'
 
         if self.installed:
             self.nginx_conf_dir = '@sysconfdir@/nginx/conf.d'
@@ -119,7 +53,6 @@ class Paths(object):
             self.src_dir = '@wokdir@'
             self.plugins_dir = '@wokdir@/plugins'
             self.mo_dir = '@prefix@/share/locale'
-            self.spice_css_file = os.path.join(self.spice_dir, 'spice.css')
         else:
             self.nginx_conf_dir = self.add_prefix('src/nginx')
             self.state_dir = self.add_prefix('data')
@@ -128,7 +61,6 @@ class Paths(object):
             self.src_dir = self.add_prefix('src/wok')
             self.plugins_dir = self.add_prefix('plugins')
             self.mo_dir = self.add_prefix('mo')
-            self.spice_css_file = os.path.join(self.spice_dir, 'css/spice.css')
 
     def get_prefix(self):
         if __file__.startswith("/"):
@@ -208,63 +140,9 @@ class WokConfig(dict):
             'tools.sessions.timeout': SESSIONSTIMEOUT,
             'tools.wokauth.on': False
         },
-        '/novnc': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': paths.novnc_dir,
-            'tools.nocache.on': True,
-            'tools.wokauth.on': True
-        },
-        '/spice_auto.html': {
-            'tools.staticfile.on': True,
-            'tools.staticfile.filename': paths.spice_file,
-            'tools.nocache.on': True,
-            'tools.kimchiauth.on': True
-        },
-        '/spice-html5': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': paths.spice_dir,
-            'tools.nocache.on': True
-        },
-        '/spice-html5/spice.css': {
-            'tools.staticfile.on': True,
-            'tools.staticfile.filename': paths.spice_css_file,
-            'tools.nocache.on': True,
-        },
         '/wok-ui.html': {
             'tools.wokauth.on': True
         },
-        '/data/screenshots': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': get_screenshot_path(),
-            'tools.nocache.on': False
-        },
-        '/data/debugreports': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': get_debugreports_path(),
-            'tools.nocache.on': False,
-            'tools.kimchiauth.on': True,
-            'tools.staticdir.content_types': {'xz': 'application/x-xz'}
-        },
-        '/config/ui/tabs.xml': {
-            'tools.staticfile.on': True,
-            'tools.staticfile.filename': '%s/config/ui/tabs.xml' %
-                                         paths.prefix,
-            'tools.nocache.on': True
-        },
-        '/favicon.ico': {
-            'tools.staticfile.on': True,
-            'tools.staticfile.filename': '%s/images/logo.ico' % paths.ui_dir
-        },
-        '/robots.txt': {
-            'tools.staticfile.on': True,
-            'tools.staticfile.filename': '%s/robots.txt' % paths.ui_dir
-        },
-        '/help': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': '%s/ui/pages/help' % paths.prefix,
-            'tools.staticdir.index': 'en_US/index.html',
-            'tools.nocache.on': True
-        }
     }
 
     def __init__(self):
diff --git a/src/wok/server.py b/src/wok/server.py
index ab941e7..ba81308 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -26,8 +26,6 @@ import os
 from wok import auth
 from wok import config
 from wok.model import model
-from wok import mockmodel
-from wok import vnc
 from wok.config import WokConfig, PluginConfig
 from wok.control import sub_nodes
 from wok.proxy import start_proxy, terminate_proxy
@@ -64,10 +62,7 @@ class Server(object):
         make_dirs = [
             os.path.dirname(os.path.abspath(options.access_log)),
             os.path.dirname(os.path.abspath(options.error_log)),
-            os.path.dirname(os.path.abspath(config.get_object_store())),
-            os.path.abspath(config.get_screenshot_path()),
-            os.path.abspath(config.get_debugreports_path()),
-            os.path.abspath(config.get_distros_store())
+            os.path.dirname(os.path.abspath(config.get_object_store()))
         ]
         for directory in make_dirs:
             if not os.path.isdir(directory):
@@ -126,15 +121,9 @@ class Server(object):
 
         if hasattr(options, 'model'):
             model_instance = options.model
-        elif options.test:
-            model_instance = mockmodel.MockModel()
         else:
             model_instance = model.Model()
 
-        if isinstance(model_instance, model.Model):
-            vnc_ws_proxy = vnc.new_ws_proxy()
-            cherrypy.engine.subscribe('exit', vnc_ws_proxy.terminate)
-
         for ident, node in sub_nodes.items():
             if node.url_auth:
                 cfg = self.configObj
@@ -143,14 +132,14 @@ class Server(object):
 
         self.app = cherrypy.tree.mount(WokRoot(model_instance, dev_env),
                                        config=self.configObj)
-        self._load_plugins()
+        self._load_plugins(options)
 
         # Terminate proxy when cherrypy server is terminated
         cherrypy.engine.subscribe('exit', terminate_proxy)
 
         cherrypy.lib.sessions.init()
 
-    def _load_plugins(self):
+    def _load_plugins(self, options):
         for plugin_name, plugin_config in get_enabled_plugins():
             try:
                 plugin_class = ('plugins.%s.%s' %
@@ -164,11 +153,17 @@ class Server(object):
                 continue
 
             try:
-                plugin_app = import_class(plugin_class)()
+                plugin_app = import_class(plugin_class)(options)
             except ImportError:
                 cherrypy.log.error_log.error("Failed to import plugin %s" %
                                              plugin_class)
                 continue
+
+            # dynamically extend plugin config with custom data, if provided
+            get_custom_conf = getattr(plugin_app, "get_custom_conf", None)
+            if get_custom_conf is not None:
+                plugin_config.update(get_custom_conf())
+
             cherrypy.tree.mount(plugin_app, script_name, plugin_config)
 
     def start(self):
diff --git a/src/wok/utils.py b/src/wok/utils.py
index fc76620..af0d200 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -44,22 +44,6 @@ wok_log = cherrypy.log.error_log
 task_id = 0
 
 
-def _uri_to_name(collection, uri):
-    expr = '/%s/(.*?)$' % collection
-    m = re.match(expr, uri)
-    if not m:
-        raise InvalidParameter("KCHUTILS0001E", {'uri': uri})
-    return m.group(1)
-
-
-def template_name_from_uri(uri):
-    return _uri_to_name('templates', uri)
-
-
-def pool_name_from_uri(uri):
-    return _uri_to_name('storagepools', uri)
-
-
 def get_next_task_id():
     global task_id
     task_id += 1
diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js
index 5b1f1bc..b7797dd 100644
--- a/ui/js/src/wok.main.js
+++ b/ui/js/src/wok.main.js
@@ -17,16 +17,6 @@
  */
 wok.tabMode = {};
 
-wok.capabilities = undefined;
-wok.getCapabilities(function(result) {
-    wok.capabilities = result;
-
-    if(wok.capabilities.federation=="on")
-        $('#peers').removeClass('hide-content');
-}, function() {
-    wok.capabilities = {};
-});
-
 wok.main = function() {
     wok.isLoggingOut = false;
     wok.popable();
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:49 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:49 -0300
Subject: [Kimchi-devel] [PATCH V3 17/34] Use InternalRedirect for all plugin
	redirects
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-18-git-send-email-luciojhc@linux.vnet.ibm.com>

The attribute self.uri_fmt is used both with HTTPRedirect and
InternalRedirect calls. In the new plugin structure, it is
necessary to make all redirects uniform, since InternalRedirect
is relative to current path (i.e. /plugins/kimchi) and
HTTPRedirect is not. This patch converts all plugin redirects
to use InternalRedirect, since it is less costly.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 src/wok/control/base.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wok/control/base.py b/src/wok/control/base.py
index 8cfa51c..65a6fee 100644
--- a/src/wok/control/base.py
+++ b/src/wok/control/base.py
@@ -64,12 +64,12 @@ class Resource(object):
                 if arg is None:
                     arg = ''
                 uri_params.append(urllib2.quote(arg.encode('utf-8'), safe=""))
-            raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code)
+            raise internal_redirect(self.uri_fmt % tuple(uri_params))
         elif action_result is not None and action_result != self.ident:
             uri_params = list(self.model_args[:-1])
             uri_params += [urllib2.quote(action_result.encode('utf-8'),
                            safe="")]
-            raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code)
+            raise internal_redirect(self.uri_fmt % tuple(uri_params))
 
     def generate_action_handler(self, action_name, action_args=None,
                                 destructive=False):
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:50 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:50 -0300
Subject: [Kimchi-devel] [PATCH V3 18/34] Dynamically add authed URLs to
	plugin conf
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-19-git-send-email-luciojhc@linux.vnet.ibm.com>

This patch implements the loading of URL subnodes in Kimchi
plugin and makes it available to any plugin that wants to use
it, through the extra_auth_api_class conf attribute.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/kimchi.conf |    1 +
 src/wok/server.py          |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/plugins/kimchi/kimchi.conf b/plugins/kimchi/kimchi.conf
index 1e0ee6b..bf5efc5 100644
--- a/plugins/kimchi/kimchi.conf
+++ b/plugins/kimchi/kimchi.conf
@@ -2,6 +2,7 @@
 enable = True
 plugin_class = "KimchiRoot"
 uri = "/plugins/kimchi"
+extra_auth_api_class = "control.sub_nodes"
 
 [/]
 tools.trailing_slash.on = False
diff --git a/src/wok/server.py b/src/wok/server.py
index ba81308..0a836a2 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -145,6 +145,8 @@ class Server(object):
                 plugin_class = ('plugins.%s.%s' %
                                 (plugin_name,
                                  plugin_config['wok']['plugin_class']))
+                extra_auth = plugin_config['wok'].get('extra_auth_api_class',
+                                                      None)
                 script_name = plugin_config['wok']['uri']
                 del plugin_config['wok']
 
@@ -164,6 +166,24 @@ class Server(object):
             if get_custom_conf is not None:
                 plugin_config.update(get_custom_conf())
 
+            # dynamically add tools.wokauth.on = True to extra plugin APIs
+            if extra_auth:
+                try:
+                    authed_apis = import_class(('plugins.%s.%s' % (plugin_name,
+                                              extra_auth)))
+                except ImportError:
+                    cherrypy.log.error_log.error("Failed to import subnodes "
+                                                 "for plugin %s" % plugin_class)
+                    continue
+
+                urlSubNodes = {}
+                for ident, node in authed_apis.items():
+                    if node.url_auth:
+                        ident = "/%s" % ident
+                        urlSubNodes[ident] = {'tools.wokauth.on': True}
+
+                plugin_config.update(urlSubNodes)
+
             cherrypy.tree.mount(plugin_app, script_name, plugin_config)
 
     def start(self):
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:51 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:51 -0300
Subject: [Kimchi-devel] [PATCH V3 19/34] Do not use tabs dir for kimchi
	plugin html templates
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-20-git-send-email-luciojhc@linux.vnet.ibm.com>

This patch standardizes kimchi plugin tmpl files location to
be similar of other plugins. It only moves tmpl files from
plugins/kimchi/ui/pages/tabs to plugins/kimchi/ui/pages and
updates respective Makefiles.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/ui/pages/Makefile.am                |    2 +-
 .../kimchi/ui/pages/{tabs => }/guests.html.tmpl    |    0
 plugins/kimchi/ui/pages/{tabs => }/host.html.tmpl  |    0
 .../kimchi/ui/pages/{tabs => }/network.html.tmpl   |    0
 .../kimchi/ui/pages/{tabs => }/storage.html.tmpl   |    0
 plugins/kimchi/ui/pages/tabs/Makefile.am           |   20 --------------------
 .../kimchi/ui/pages/{tabs => }/templates.html.tmpl |    0
 7 files changed, 1 insertions(+), 21 deletions(-)
 rename plugins/kimchi/ui/pages/{tabs => }/guests.html.tmpl (100%)
 rename plugins/kimchi/ui/pages/{tabs => }/host.html.tmpl (100%)
 rename plugins/kimchi/ui/pages/{tabs => }/network.html.tmpl (100%)
 rename plugins/kimchi/ui/pages/{tabs => }/storage.html.tmpl (100%)
 delete mode 100644 plugins/kimchi/ui/pages/tabs/Makefile.am
 rename plugins/kimchi/ui/pages/{tabs => }/templates.html.tmpl (100%)

diff --git a/plugins/kimchi/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am
index 076b814..56288e3 100644
--- a/plugins/kimchi/ui/pages/Makefile.am
+++ b/plugins/kimchi/ui/pages/Makefile.am
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = help tabs
+SUBDIRS = help
 
 htmldir = $(datadir)/wok/plugins/kimchi/ui/pages
 
diff --git a/plugins/kimchi/ui/pages/tabs/guests.html.tmpl b/plugins/kimchi/ui/pages/guests.html.tmpl
similarity index 100%
rename from plugins/kimchi/ui/pages/tabs/guests.html.tmpl
rename to plugins/kimchi/ui/pages/guests.html.tmpl
diff --git a/plugins/kimchi/ui/pages/tabs/host.html.tmpl b/plugins/kimchi/ui/pages/host.html.tmpl
similarity index 100%
rename from plugins/kimchi/ui/pages/tabs/host.html.tmpl
rename to plugins/kimchi/ui/pages/host.html.tmpl
diff --git a/plugins/kimchi/ui/pages/tabs/network.html.tmpl b/plugins/kimchi/ui/pages/network.html.tmpl
similarity index 100%
rename from plugins/kimchi/ui/pages/tabs/network.html.tmpl
rename to plugins/kimchi/ui/pages/network.html.tmpl
diff --git a/plugins/kimchi/ui/pages/tabs/storage.html.tmpl b/plugins/kimchi/ui/pages/storage.html.tmpl
similarity index 100%
rename from plugins/kimchi/ui/pages/tabs/storage.html.tmpl
rename to plugins/kimchi/ui/pages/storage.html.tmpl
diff --git a/plugins/kimchi/ui/pages/tabs/Makefile.am b/plugins/kimchi/ui/pages/tabs/Makefile.am
deleted file mode 100644
index 4d5d33e..0000000
--- a/plugins/kimchi/ui/pages/tabs/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Kimchi
-#
-# Copyright IBM, Corp. 2013
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tabshtmldir = $(datadir)/wok/plugins/kimchi/ui/pages/tabs
-
-dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL)
diff --git a/plugins/kimchi/ui/pages/tabs/templates.html.tmpl b/plugins/kimchi/ui/pages/templates.html.tmpl
similarity index 100%
rename from plugins/kimchi/ui/pages/tabs/templates.html.tmpl
rename to plugins/kimchi/ui/pages/templates.html.tmpl
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:52 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:52 -0300
Subject: [Kimchi-devel] [PATCH V3 20/34] Refer to kimchi plugin specific
	js/css in htmls
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-21-git-send-email-luciojhc@linux.vnet.ibm.com>

Since wok-ui.html now uses only wok-specific JavaScript and
CSS, it is necessary to include kimchi-specific code into
kimchi htmls.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/ui/pages/guests.html.tmpl    |    9 +++++++++
 plugins/kimchi/ui/pages/host.html.tmpl      |    9 +++++++++
 plugins/kimchi/ui/pages/network.html.tmpl   |    4 ++++
 plugins/kimchi/ui/pages/storage.html.tmpl   |    4 ++++
 plugins/kimchi/ui/pages/templates.html.tmpl |    4 ++++
 5 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/plugins/kimchi/ui/pages/guests.html.tmpl b/plugins/kimchi/ui/pages/guests.html.tmpl
index b96dd21..b8a1259 100644
--- a/plugins/kimchi/ui/pages/guests.html.tmpl
+++ b/plugins/kimchi/ui/pages/guests.html.tmpl
@@ -26,6 +26,13 @@
 
 #silent ht = Template
 
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" href="plugins/kimchi/css/theme-default.min.css">
+<script src="plugins/kimchi/js/kimchi.min.js"></script>
+</head>
+<body>
 <div id="guests-root-container">
     <div class="toolbar">
         <div class="tools" style="display:none">
@@ -54,3 +61,5 @@
         kimchi.guest_main();
     </script>
 </div>
+</body>
+</html>
diff --git a/plugins/kimchi/ui/pages/host.html.tmpl b/plugins/kimchi/ui/pages/host.html.tmpl
index 192a7eb..d87debc 100644
--- a/plugins/kimchi/ui/pages/host.html.tmpl
+++ b/plugins/kimchi/ui/pages/host.html.tmpl
@@ -22,6 +22,13 @@
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" href="plugins/kimchi/css/theme-default.min.css">
+<script src="plugins/kimchi/js/kimchi.min.js"></script>
+</head>
+<body>
 <div id="host-root-container">
     <div class="toolbar">
         <div class="tools">
@@ -166,3 +173,5 @@
 <script type="text/javascript">
     kimchi.host_main();
 </script>
+</body>
+</html>
diff --git a/plugins/kimchi/ui/pages/network.html.tmpl b/plugins/kimchi/ui/pages/network.html.tmpl
index 8d72f77..915feac 100644
--- a/plugins/kimchi/ui/pages/network.html.tmpl
+++ b/plugins/kimchi/ui/pages/network.html.tmpl
@@ -24,6 +24,10 @@
 #silent _t = t.gettext
 <!DOCTYPE html>
 <html>
+<head>
+<link rel="stylesheet" href="plugins/kimchi/css/theme-default.min.css">
+<script src="plugins/kimchi/js/kimchi.min.js"></script>
+</head>
 <body>
 <div class="toolbar">
     <div class="tools" style="display:none">
diff --git a/plugins/kimchi/ui/pages/storage.html.tmpl b/plugins/kimchi/ui/pages/storage.html.tmpl
index 2f89d22..7b51a8b 100644
--- a/plugins/kimchi/ui/pages/storage.html.tmpl
+++ b/plugins/kimchi/ui/pages/storage.html.tmpl
@@ -23,6 +23,10 @@
 #silent _t = t.gettext
 <!DOCTYPE html>
 <html>
+<head>
+<link rel="stylesheet" href="plugins/kimchi/css/theme-default.min.css">
+<script src="plugins/kimchi/js/kimchi.min.js"></script>
+</head>
 <body>
 <div class="toolbar">
     <div class="tools" style="display:none">
diff --git a/plugins/kimchi/ui/pages/templates.html.tmpl b/plugins/kimchi/ui/pages/templates.html.tmpl
index cd9b8e5..af1cf3f 100644
--- a/plugins/kimchi/ui/pages/templates.html.tmpl
+++ b/plugins/kimchi/ui/pages/templates.html.tmpl
@@ -23,6 +23,10 @@
 #silent _t = t.gettext
 <!DOCTYPE html>
 <html>
+<head>
+<link rel="stylesheet" href="plugins/kimchi/css/theme-default.min.css">
+<script src="plugins/kimchi/js/kimchi.min.js"></script>
+</head>
 <body>
 <div class="toolbar">
     <div class="tools" style="display:none">
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:53 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:53 -0300
Subject: [Kimchi-devel] [PATCH V3 21/34] Do not generate help index
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-22-git-send-email-luciojhc@linux.vnet.ibm.com>

Now that kimchi is not the main functionality, an index for
its help files is not necessary anymore.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/kimchi.conf                |    1 -
 plugins/kimchi/ui/pages/help/Makefile.am  |    5 +-
 plugins/kimchi/ui/pages/help/gen-index.py |   63 -----------------------------
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100755 plugins/kimchi/ui/pages/help/gen-index.py

diff --git a/plugins/kimchi/kimchi.conf b/plugins/kimchi/kimchi.conf
index bf5efc5..78f4f3f 100644
--- a/plugins/kimchi/kimchi.conf
+++ b/plugins/kimchi/kimchi.conf
@@ -42,5 +42,4 @@ tools.staticfile.filename = wok.config.PluginPaths('kimchi').ui_dir + '/robots.t
 tools.staticdir.on = True
 tools.staticdir.dir = wok.config.PluginPaths('kimchi').ui_dir + '/pages/help'
 tools.nocache.on = True
-tools.staticdir.index = 'en_US/index.html'
 
diff --git a/plugins/kimchi/ui/pages/help/Makefile.am b/plugins/kimchi/ui/pages/help/Makefile.am
index 0fbe47b..a4ee361 100644
--- a/plugins/kimchi/ui/pages/help/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/Makefile.am
@@ -20,14 +20,13 @@ DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard */*.dita))
 HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), $(wildcard */*.html))
 DITA_XSL_FILE = dita-help.xsl
 
-EXTRA_DIST = gen-index.py\
-			 $(DITA_XSL_FILE)
+EXTRA_DIST = $(DITA_XSL_FILE)
+
 helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help
 
 dist_help_DATA = kimchi.css
 
 all: $(HTML_FILES) $(wildcard */*.dita)
-	@$(foreach dir, $(dir $(wildcard */)), $(shell pwd)/gen-index.py $(wildcard $(dir)*.dita) > $(dir)/index.html;)
 
 %.html: %.dita $(DITA_XSL_FILE)
 	xsltproc -o $@ $(DITA_XSL_FILE) $<
diff --git a/plugins/kimchi/ui/pages/help/gen-index.py b/plugins/kimchi/ui/pages/help/gen-index.py
deleted file mode 100755
index d81e722..0000000
--- a/plugins/kimchi/ui/pages/help/gen-index.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python2
-#
-# Project Kimchi
-#
-# Copyright IBM, Corp. 2014-2015
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# 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
-
-import lxml.etree as ET
-import sys
-
-
-HTML_HEAD = """
-<html>
-<head>
-  <title>Kimchi Help</title>
-</head>
-<body>
-<h1>Kimchi Help</h1>
-"""
-
-HTML_TAIL = """
-</body>
-</html>
-"""
-
-
-def main():
-    if len(sys.argv) < 2:
-        sys.exit("Missing input files")
-
-    input_files = sys.argv[1:]
-
-    pages = {}
-
-    for f in sorted(input_files):
-        with open(f) as fd:
-            xml = fd.read()
-            doc = ET.fromstring(xml)
-            name = doc.xpath('./title')[0].text
-            pages[f.replace('.dita', '.html')] = name.encode('utf-8')
-
-    print HTML_HEAD
-    for page, name in pages.iteritems():
-        html = '  <a href="/help/%s">%s</a><br />\n'
-        print html % (page, name)
-    print HTML_TAIL
-
-
-if __name__ == '__main__':
-    main()
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:54 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:54 -0300
Subject: [Kimchi-devel] [PATCH V3 22/34] Fix import_module
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-23-git-send-email-luciojhc@linux.vnet.ibm.com>

This was necessary to make load_url_sub_nodes work with
new kimchi plugin structure.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 src/wok/utils.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wok/utils.py b/src/wok/utils.py
index af0d200..fa379d4 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -114,14 +114,14 @@ def get_all_tabs():
 def import_class(class_path):
     module_name, class_name = class_path.rsplit('.', 1)
     try:
-        mod = import_module(module_name)
+        mod = import_module(module_name, class_name)
         return getattr(mod, class_name)
     except (ImportError, AttributeError):
         raise ImportError('Class %s can not be imported' % class_path)
 
 
-def import_module(module_name):
-    return __import__(module_name, globals(), locals(), [''])
+def import_module(module_name, class_name=''):
+    return __import__(module_name, globals(), locals(), [class_name])
 
 
 def check_url_path(path):
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:55 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:55 -0300
Subject: [Kimchi-devel] [PATCH V3 23/34] Make render_cheetah_file()
	plugin-aware
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-24-git-send-email-luciojhc@linux.vnet.ibm.com>

The key ui_dir must come from either Paths or PluginPaths,
depending on who is calling render_cheetah_file(), otherwise
wrong paths would be used. This patch fixes that.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 src/wok/template.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/wok/template.py b/src/wok/template.py
index e192ca4..323bf55 100644
--- a/src/wok/template.py
+++ b/src/wok/template.py
@@ -86,12 +86,13 @@ def render_cheetah_file(resource, data):
     paths = cherrypy.request.app.root.paths
     filename = paths.get_template_path(resource)
     try:
-        params = {'data': data}
+        params = {}
         lang = validate_language(get_lang())
         gettext_conf = {'domain': cherrypy.request.app.root.domain,
                         'localedir': paths.mo_dir,
                         'lang': [lang]}
         params['lang'] = gettext_conf
+        params['data'] = {'ui_dir': paths.ui_dir}
         return Template(file=filename, searchList=params).respond()
     except OSError, e:
         if e.errno == errno.ENOENT:
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:56 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:56 -0300
Subject: [Kimchi-devel] [PATCH V3 24/34] Make cachebust's href() plugin-aware
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-25-git-send-email-luciojhc@linux.vnet.ibm.com>

Fixes cachebust's href() method to take the correct path
depending on if it is called by a plugin or wok main page.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 src/wok/cachebust.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/wok/cachebust.py b/src/wok/cachebust.py
index d7cf111..d04b2c6 100644
--- a/src/wok/cachebust.py
+++ b/src/wok/cachebust.py
@@ -20,11 +20,16 @@
 import os
 
 
-from wok.config import paths
+from wok.config import paths, PluginPaths
 
 
-def href(url):
+def href(url, plugin = None):
+    if plugin is None:
+        basePath = paths.ui_dir
+    else:
+        basePath = PluginPaths(plugin).ui_dir
+
     # for error.html, url is absolute path
-    f = os.path.join(paths.ui_dir, url.lstrip("/"))
+    f = os.path.join(basePath, url.lstrip("/"))
     mtime = os.path.getmtime(f)
     return "%s?cacheBust=%s" % (url, mtime)
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:57 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:57 -0300
Subject: [Kimchi-devel] [PATCH V3 25/34] Default to first tab of first plugin
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-26-git-send-email-luciojhc@linux.vnet.ibm.com>

It is now possible that wok is part of a product with
only one plugin containing a single tab. Thus it is
necessary to show the first tab of first plugin loaded
as a default upon login.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 ui/js/src/wok.main.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js
index b7797dd..f046466 100644
--- a/ui/js/src/wok.main.js
+++ b/ui/js/src/wok.main.js
@@ -99,7 +99,7 @@ wok.main = function() {
                 tabs.push.apply(tabs, retrieveTabs(url));
             });
 
-            var defaultTab = tabs[1]
+            var defaultTab = tabs[0]
 
             var defaultTabPath = defaultTab && defaultTab['path']
             // Remove file extension from 'defaultTabPath'
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:58 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:58 -0300
Subject: [Kimchi-devel] [PATCH V3 26/34] Fix storage pool URI split
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-27-git-send-email-luciojhc@linux.vnet.ibm.com>

We want here the last piece of URI (storage pool name),
not the second one. This was breaking kimchi initialization
in the new plugin structure.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/model/storagepools.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/kimchi/model/storagepools.py b/plugins/kimchi/model/storagepools.py
index 920d29a..67377c5 100644
--- a/plugins/kimchi/model/storagepools.py
+++ b/plugins/kimchi/model/storagepools.py
@@ -72,7 +72,7 @@ class StoragePoolsModel(object):
         pools = {}
 
         default_pool = tmpl_defaults['storagepool']
-        default_pool = default_pool.split('/')[2]
+        default_pool = default_pool.split('/')[-1]
 
         pools[default_pool] = {}
         if default_pool == 'default':
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:59 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:59 -0300
Subject: [Kimchi-devel] [PATCH V3 27/34] Correctly join help pathes for
	plugins case
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-28-git-send-email-luciojhc@linux.vnet.ibm.com>

When generating the help path for a plugin, a slash was
missing in the string.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 ui/js/src/wok.main.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js
index f046466..f4c9940 100644
--- a/ui/js/src/wok.main.js
+++ b/ui/js/src/wok.main.js
@@ -335,7 +335,7 @@ wok.checkHelpFile = function(path) {
     if (/^tabs/.test(path))
         url = path.replace("tabs", "help/" + lang);
     else if (/^plugins/.test(path))
-        url = path.slice(0, path.lastIndexOf('/')) + "help/" + lang + path.slice(path.lastIndexOf('/'));
+        url = path.slice(0, path.lastIndexOf('/')) + "/help/" + lang + path.slice(path.lastIndexOf('/'));
     // Checking if help page exist.
     $.ajax({
         url: url,
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:18:00 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:18:00 -0300
Subject: [Kimchi-devel] [PATCH V3 28/34] Install plugin .mo files to default
	locale dir
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-29-git-send-email-luciojhc@linux.vnet.ibm.com>

This implements for plugins the changes done by commit
2e90908b8e79ff293298dfcd83b166dd06d361c3.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 src/wok/config.py.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 558eceb..64ae633 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -92,12 +92,13 @@ class PluginPaths(Paths):
         if self.installed:
             self.conf_dir = '@sysconfdir@/wok/plugins.d'
             self.src_dir = os.path.join('@wokdir@', self.plugin_dir)
+            self.mo_dir = '@prefix@/share/locale'
         else:
             self.conf_dir = self.add_prefix(self.plugin_dir)
             self.src_dir = self.add_prefix(self.plugin_dir)
+            self.mo_dir = self.add_prefix(os.path.join(self.plugin_dir, 'mo'))
 
         self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui'))
-        self.mo_dir = self.add_prefix(os.path.join(self.plugin_dir, 'mo'))
         self.conf_file = os.path.join(self.conf_dir, '%s.conf' % name)
 
 
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:18:01 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:18:01 -0300
Subject: [Kimchi-devel] [PATCH V3 29/34] Adapt automated tests to the new
	plugin structure
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-30-git-send-email-luciojhc@linux.vnet.ibm.com>

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/tests/test_config.py.in |  119 +++++++++++++++----------------
 plugins/kimchi/tests/test_exception.py |    4 +-
 plugins/kimchi/tests/test_rest.py      |    1 -
 plugins/kimchi/tests/utils.py          |    4 +-
 4 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/plugins/kimchi/tests/test_config.py.in b/plugins/kimchi/tests/test_config.py.in
index 337218e..19ae0ba 100644
--- a/plugins/kimchi/tests/test_config.py.in
+++ b/plugins/kimchi/tests/test_config.py.in
@@ -18,9 +18,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import unittest
+from cherrypy.lib.reprconf import Parser
+
+from wok.config import Paths
+
+from wok.plugins.kimchi.config import get_debugreports_path
+from wok.plugins.kimchi.config import get_screenshot_path
+from wok.plugins.kimchi.config import KimchiPaths
 
-from wok import config
-from wok.config import Paths, PluginPaths, KimchiConfig
 
 get_prefix = None
 
@@ -31,7 +36,7 @@ def setUpModule():
 
 
 def tearDownModule():
-    Paths.get_prefix = PluginPaths.get_prefix = get_prefix
+    Paths.get_prefix = KimchiPaths.get_prefix = get_prefix
 
 
 class ConfigTests(unittest.TestCase):
@@ -43,52 +48,50 @@ class ConfigTests(unittest.TestCase):
         self.assertEquals(actual, expected)
 
     def test_installed_paths(self):
-        Paths.get_prefix = lambda self: '@pkgdatadir@'
+        Paths.get_prefix = lambda self: '@datadir@/wok'
         paths = Paths()
-        self.assertInstalledPath(paths.state_dir, '/var/lib/kimchi')
-        self.assertInstalledPath(paths.log_dir, '/var/log/kimchi')
-        self.assertInstalledPath(paths.conf_dir, '/etc/kimchi')
-        self.assertInstalledPath(paths.src_dir, '@kimchidir@')
-        self.assertInstalledPath(paths.plugins_dir, '@kimchidir@/plugins')
-        self.assertInstalledPath(paths.ui_dir, '@pkgdatadir@/ui')
+        self.assertInstalledPath(paths.state_dir, '/var/lib/wok')
+        self.assertInstalledPath(paths.log_dir, '/var/log/wok')
+        self.assertInstalledPath(paths.conf_dir, '/etc/wok')
+        self.assertInstalledPath(paths.src_dir, '@wokdir@')
+        self.assertInstalledPath(paths.plugins_dir, '@wokdir@/plugins')
+        self.assertInstalledPath(paths.ui_dir, '@datadir@/wok/ui')
         self.assertInstalledPath(paths.mo_dir, '@prefix@/share/locale')
 
     def test_uninstalled_paths(self):
-        Paths.get_prefix = lambda self: '/home/user/kimchi'
+        Paths.get_prefix = lambda self: '/home/user/wok'
         paths = Paths()
-        self.assertEquals(paths.state_dir, '/home/user/kimchi/data')
-        self.assertEquals(paths.log_dir, '/home/user/kimchi/log')
-        self.assertEquals(paths.conf_dir, '/home/user/kimchi/src')
-        self.assertEquals(paths.src_dir, '/home/user/kimchi/src/kimchi')
-        self.assertEquals(paths.plugins_dir, '/home/user/kimchi/plugins')
-        self.assertEquals(paths.ui_dir, '/home/user/kimchi/ui')
-        self.assertEquals(paths.mo_dir, '/home/user/kimchi/mo')
+        self.assertEquals(paths.state_dir, '/home/user/wok/data')
+        self.assertEquals(paths.log_dir, '/home/user/wok/log')
+        self.assertEquals(paths.conf_dir, '/home/user/wok/src')
+        self.assertEquals(paths.src_dir, '/home/user/wok/src/wok')
+        self.assertEquals(paths.plugins_dir, '/home/user/wok/plugins')
+        self.assertEquals(paths.ui_dir, '/home/user/wok/ui')
+        self.assertEquals(paths.mo_dir, '/home/user/wok/mo')
 
     def test_installed_plugin_paths(self):
-        PluginPaths.get_prefix = lambda self: '@pkgdatadir@'
-        paths = PluginPaths('sample')
-        self.assertInstalledPath(paths.conf_dir, '/etc/kimchi/plugins.d')
+        KimchiPaths.get_prefix = lambda self: '@datadir@/wok'
+        paths = KimchiPaths()
+        self.assertInstalledPath(paths.conf_dir, '/etc/wok/plugins.d')
         self.assertInstalledPath(paths.conf_file,
-                                 '/etc/kimchi/plugins.d/sample.conf')
-        self.assertInstalledPath(paths.src_dir, '@kimchidir@/plugins/sample')
+                                 '/etc/wok/plugins.d/kimchi.conf')
+        self.assertInstalledPath(paths.src_dir, '@wokdir@/plugins/kimchi')
         self.assertInstalledPath(paths.ui_dir,
-                                 '@pkgdatadir@/plugins/sample/ui')
-        self.assertInstalledPath(paths.mo_dir,
-                                 '@pkgdatadir@/plugins/sample/mo')
+                                 '@datadir@/wok/plugins/kimchi/ui')
+        self.assertInstalledPath(paths.mo_dir, '@prefix@/share/locale')
 
     def test_uninstalled_plugin_paths(self):
-        PluginPaths.get_prefix = lambda self: '/home/user/kimchi'
-        paths = PluginPaths('sample')
-        self.assertEquals(paths.conf_dir, '/home/user/kimchi/plugins/sample')
+        KimchiPaths.get_prefix = lambda self: '/home/user/wok'
+        paths = KimchiPaths()
+        self.assertEquals(paths.conf_dir, '/home/user/wok/plugins/kimchi')
         self.assertEquals(
-            paths.conf_file, '/home/user/kimchi/plugins/sample/sample.conf')
-        self.assertEquals(paths.src_dir, '/home/user/kimchi/plugins/sample')
-        self.assertEquals(paths.ui_dir, '/home/user/kimchi/plugins/sample/ui')
-        self.assertEquals(paths.mo_dir, '/home/user/kimchi/plugins/sample/mo')
+            paths.conf_file, '/home/user/wok/plugins/kimchi/kimchi.conf')
+        self.assertEquals(paths.src_dir, '/home/user/wok/plugins/kimchi')
+        self.assertEquals(paths.ui_dir, '/home/user/wok/plugins/kimchi/ui')
+        self.assertEquals(paths.mo_dir, '/home/user/wok/plugins/kimchi/mo')
 
     def test_kimchi_config(self):
-        Paths.get_prefix = PluginPaths.get_prefix = get_prefix
-        paths = Paths()
+        Paths.get_prefix = KimchiPaths.get_prefix = get_prefix
         CACHEEXPIRES = 31536000
         SESSIONSTIMEOUT = 10
         configObj = {
@@ -98,99 +101,93 @@ class ConfigTests(unittest.TestCase):
                 'tools.nocache.on': True,
                 'tools.proxy.on': True,
                 'tools.sessions.on': True,
-                'tools.sessions.name': 'kimchi',
+                'tools.sessions.name': 'wok',
                 'tools.sessions.secure': True,
                 'tools.sessions.httponly': True,
                 'tools.sessions.locking': 'explicit',
                 'tools.sessions.storage_type': 'ram',
                 'tools.sessions.timeout': SESSIONSTIMEOUT,
-                'tools.kimchiauth.on': False
+                'tools.wokauth.on': False
             },
             '/novnc': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': paths.novnc_dir,
+                'tools.staticdir.dir': KimchiPaths().novnc_dir,
                 'tools.nocache.on': True,
-                'tools.kimchiauth.on': True
+                'tools.wokauth.on': True
             },
             '/spice_auto.html': {
                 'tools.staticfile.on': True,
-                'tools.staticfile.filename': paths.spice_file,
+                'tools.staticfile.filename': KimchiPaths().spice_file,
                 'tools.nocache.on': True,
-                'tools.kimchiauth.on': True
+                'tools.wokauth.on': True
             },
             '/spice-html5': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': paths.spice_dir,
+                'tools.staticdir.dir': KimchiPaths().spice_dir,
                 'tools.nocache.on': True
             },
             '/spice-html5/spice.css': {
                 'tools.staticfile.on': True,
-                'tools.staticfile.filename': paths.spice_css_file,
+                'tools.staticfile.filename': KimchiPaths().spice_css_file,
                 'tools.nocache.on': True,
             },
             '/kimchi-ui.html': {
-                'tools.kimchiauth.on': True
+                'tools.wokauth.on': True
             },
             '/css': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': '%s/ui/css' % paths.prefix,
+                'tools.staticdir.dir': '%s/ui/css' % KimchiPaths().prefix,
                 'tools.expires.on': True,
                 'tools.expires.secs': CACHEEXPIRES,
                 'tools.nocache.on': False
             },
             '/js': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': '%s/ui/js' % paths.prefix,
+                'tools.staticdir.dir': '%s/ui/js' % KimchiPaths().prefix,
                 'tools.expires.on': True,
                 'tools.expires.secs': CACHEEXPIRES,
                 'tools.nocache.on': False
             },
             '/libs': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': '%s/ui/libs' % paths.prefix,
+                'tools.staticdir.dir': '%s/ui/libs' % KimchiPaths().prefix,
                 'tools.expires.on': True,
                 'tools.expires.secs': CACHEEXPIRES,
                 'tools.nocache.on': False,
             },
             '/images': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': '%s/ui/images' % paths.prefix,
+                'tools.staticdir.dir': '%s/ui/images' % KimchiPaths().prefix,
                 'tools.nocache.on': False
             },
             '/data/screenshots': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': config.get_screenshot_path(),
+                'tools.staticdir.dir': get_screenshot_path(),
                 'tools.nocache.on': False
             },
             '/data/debugreports': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': config.get_debugreports_path(),
+                'tools.staticdir.dir': get_debugreports_path(),
                 'tools.nocache.on': False,
-                'tools.kimchiauth.on': True,
+                'tools.wokauth.on': True,
                 'tools.staticdir.content_types': {'xz': 'application/x-xz'}
             },
-            '/config/ui/tabs.xml': {
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename': '%s/config/ui/tabs.xml' %
-                                             paths.prefix,
-                'tools.nocache.on': True
-            },
             '/favicon.ico': {
                 'tools.staticfile.on': True,
                 'tools.staticfile.filename':
-                '%s/images/logo.ico' % paths.ui_dir
+                '%s/images/logo.ico' % KimchiPaths().ui_dir
             },
             '/robots.txt': {
                 'tools.staticfile.on': True,
-                'tools.staticfile.filename': '%s/robots.txt' % paths.ui_dir
+                'tools.staticfile.filename': '%s/robots.txt' % KimchiPaths().ui_dir
             },
             '/help': {
                 'tools.staticdir.on': True,
-                'tools.staticdir.dir': '%s/ui/pages/help' % paths.prefix,
+                'tools.staticdir.dir': '%s/ui/pages/help' % KimchiPaths().prefix,
                 'tools.staticdir.index': 'en_US/index.html',
                 'tools.nocache.on': True
             }
         }
 
-        kimchi_config = KimchiConfig()
+        kimchi_config = Parser().dict_from_file(KimchiPaths().conf_file)
         self.assertEquals(kimchi_config, configObj)
diff --git a/plugins/kimchi/tests/test_exception.py b/plugins/kimchi/tests/test_exception.py
index 32b6baf..c0dadab 100644
--- a/plugins/kimchi/tests/test_exception.py
+++ b/plugins/kimchi/tests/test_exception.py
@@ -62,7 +62,7 @@ class ExceptionTests(unittest.TestCase):
 
         # test 405 wrong method
         resp = json.loads(request(host, ssl_port, '/', None, 'DELETE').read())
-        msg = u'KCHAPI0002E: Delete is not allowed for kimchiroot'
+        msg = u'KCHAPI0002E: Delete is not allowed for wokroot'
         self.assertEquals('405 Method Not Allowed', resp.get('code'))
         self.assertEquals(msg, resp.get('reason'))
 
@@ -92,7 +92,7 @@ class ExceptionTests(unittest.TestCase):
 
         # test 405 wrong method
         resp = json.loads(request(host, ssl_port, '/', None, 'DELETE').read())
-        msg = u'KCHAPI0002E: Delete is not allowed for kimchiroot'
+        msg = u'KCHAPI0002E: Delete is not allowed for wokroot'
         self.assertEquals('405 Method Not Allowed', resp.get('code'))
         self.assertEquals(msg, resp.get('reason'))
 
diff --git a/plugins/kimchi/tests/test_rest.py b/plugins/kimchi/tests/test_rest.py
index 69db7a7..52e3404 100644
--- a/plugins/kimchi/tests/test_rest.py
+++ b/plugins/kimchi/tests/test_rest.py
@@ -30,7 +30,6 @@ from functools import partial
 
 import iso_gen
 from wok.plugins.kimchi import mockmodel
-import wok.server
 from wok.plugins.kimchi.osinfo import get_template_default
 from wok.rollbackcontext import RollbackContext
 from wok.utils import add_task
diff --git a/plugins/kimchi/tests/utils.py b/plugins/kimchi/tests/utils.py
index e22bffa..dceed9c 100644
--- a/plugins/kimchi/tests/utils.py
+++ b/plugins/kimchi/tests/utils.py
@@ -38,7 +38,7 @@ from lxml import etree
 
 from wok.plugins.kimchi import mockmodel
 import wok.server
-from wok.config import config, paths
+from wok.config import config, PluginPaths
 from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs
 from wok.exception import NotFoundError, OperationFailed
 from wok.utils import wok_log
@@ -167,7 +167,7 @@ def get_remote_iso_path():
     """
     host_arch = os.uname()[4]
     remote_path = ''
-    with open(os.path.join(paths.conf_dir, 'distros.d', 'fedora.json')) \
+    with open(os.path.join(PluginPaths('kimchi').conf_dir, 'distros.d', 'fedora.json')) \
             as fedora_isos:
         # Get a list of dicts
         json_isos_list = json.load(fedora_isos)
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:18:02 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:18:02 -0300
Subject: [Kimchi-devel] [PATCH V3 30/34] Use pool_uri to avoid case
	pool_name is not defined
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-31-git-send-email-luciojhc@linux.vnet.ibm.com>

If exception is raised when setting pool_uri, a new
exception will be raised trying to print pool_uri
value, which will be undefined.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/model/templates.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/kimchi/model/templates.py b/plugins/kimchi/model/templates.py
index 0f1f6be..a7a74fc 100644
--- a/plugins/kimchi/model/templates.py
+++ b/plugins/kimchi/model/templates.py
@@ -76,7 +76,7 @@ class TemplatesModel(object):
                 pool_name = pool_name_from_uri(pool_uri)
                 pool = conn.storagePoolLookupByName(pool_name.encode("utf-8"))
             except Exception:
-                raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name,
+                raise InvalidParameter("KCHTMPL0004E", {'pool': pool_uri,
                                                         'template': name})
 
             tmp_volumes = [disk['volume'] for disk in params.get('disks', [])
@@ -194,7 +194,7 @@ class TemplateModel(object):
                 pool_name = pool_name_from_uri(pool_uri)
                 pool = conn.storagePoolLookupByName(pool_name.encode("utf-8"))
             except Exception:
-                raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name,
+                raise InvalidParameter("KCHTMPL0004E", {'pool': pool_uri,
                                                         'template': name})
             tmp_volumes = [disk['volume'] for disk in new_t.get('disks', [])
                            if 'volume' in disk]
@@ -239,7 +239,7 @@ class LibvirtVMTemplate(VMTemplate):
             conn = self.conn.get()
             pool = conn.storagePoolLookupByName(pool_name.encode("utf-8"))
         except libvirt.libvirtError:
-            raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name,
+            raise InvalidParameter("KCHTMPL0004E", {'pool': pool_uri,
                                                     'template': self.name})
 
         if not pool.isActive():
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:18:03 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:18:03 -0300
Subject: [Kimchi-devel] [PATCH V3 31/34] Fix Fedora RPM build issue
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-32-git-send-email-luciojhc@linux.vnet.ibm.com>

Some dirs/files are always listed in %files section, but
they are only created if with_systemd is true, which breaks
RPM build. This patch fixes it by only listing those
directories when with_systemd is true.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 contrib/wok.spec.fedora.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index edbe385..30319a9 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -121,16 +121,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/wok/ui/
 %{_datadir}/wok
 %{_sysconfdir}/nginx/conf.d/wok.conf.in
-%{_sysconfdir}/nginx/conf.d/wok.conf
 %{_sysconfdir}/wok/wok.conf
 %{_sysconfdir}/wok/
+%{_mandir}/man8/wokd.8.gz
+
+%if 0%{?with_systemd}
+%{_sysconfdir}/nginx/conf.d/wok.conf
 %{_sharedstatedir}/wok/vnc-tokens/
 %{_sharedstatedir}/wok/
 %{_localstatedir}/log/wok/*
 %{_localstatedir}/log/wok/
-%{_mandir}/man8/wokd.8.gz
-
-%if 0%{?with_systemd}
 %{_unitdir}/wokd.service
 %{_prefix}/lib/firewalld/services/wokd.xml
 %endif
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:18:04 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:18:04 -0300
Subject: [Kimchi-devel] [PATCH V3 32/34] Organize imports in all .py files
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-33-git-send-email-luciojhc@linux.vnet.ibm.com>

Separate imports into following sections:
1) Import common modules
import ...
import ...
from ... import ...
from ... import ...

2) Import wok modules
import wok.<mod>
import wok.<mod>
from wok import ...
from wok import ...

3) Import plugin modules
import ..<mod>
import <mod>
from ..<mod> import ...
from <mod> import ...

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/control/host.py                   |    3 +-
 plugins/kimchi/control/storagepools.py           |    5 ++-
 plugins/kimchi/control/vms.py                    |    1 +
 plugins/kimchi/disks.py                          |    1 -
 plugins/kimchi/distroloader.py                   |    3 +-
 plugins/kimchi/imageinfo.py                      |    2 +-
 plugins/kimchi/isoinfo.py                        |    2 +-
 plugins/kimchi/kvmusertests.py                   |    2 +-
 plugins/kimchi/mockmodel.py                      |   13 ++++-----
 plugins/kimchi/model/config.py                   |   14 +++++-----
 plugins/kimchi/model/cpuinfo.py                  |    4 +-
 plugins/kimchi/model/debugreports.py             |    9 ++++---
 plugins/kimchi/model/diskutils.py                |    4 +-
 plugins/kimchi/model/featuretests.py             |    4 +-
 plugins/kimchi/model/host.py                     |   18 +++++++-------
 plugins/kimchi/model/hostdev.py                  |    3 +-
 plugins/kimchi/model/interfaces.py               |    1 +
 plugins/kimchi/model/libvirtconnection.py        |    5 +--
 plugins/kimchi/model/libvirtstoragepool.py       |   10 ++++----
 plugins/kimchi/model/model.py                    |    3 +-
 plugins/kimchi/model/networks.py                 |   13 ++++-----
 plugins/kimchi/model/peers.py                    |    2 +-
 plugins/kimchi/model/storagepools.py             |   12 ++++----
 plugins/kimchi/model/storageservers.py           |    1 +
 plugins/kimchi/model/storagetargets.py           |    3 +-
 plugins/kimchi/model/storagevolumes.py           |   12 ++++----
 plugins/kimchi/model/templates.py                |   10 ++++----
 plugins/kimchi/model/utils.py                    |    1 +
 plugins/kimchi/model/vmhostdevs.py               |   10 ++++----
 plugins/kimchi/model/vmifaces.py                 |    6 ++--
 plugins/kimchi/model/vms.py                      |   28 +++++++++++-----------
 plugins/kimchi/model/vmsnapshots.py              |    8 +++---
 plugins/kimchi/model/vmstorages.py               |   15 ++++++-----
 plugins/kimchi/osinfo.py                         |    1 -
 plugins/kimchi/repositories.py                   |    4 +-
 plugins/kimchi/root.py                           |    6 ++--
 plugins/kimchi/scan.py                           |    2 +-
 plugins/kimchi/screenshot.py                     |    4 +-
 plugins/kimchi/swupdate.py                       |    5 ++-
 plugins/kimchi/tests/iso_gen.py                  |    1 +
 plugins/kimchi/tests/test_authorization.py       |    2 +-
 plugins/kimchi/tests/test_config.py.in           |    2 +
 plugins/kimchi/tests/test_exception.py           |    3 +-
 plugins/kimchi/tests/test_host.py                |    3 +-
 plugins/kimchi/tests/test_mock_network.py        |    2 +-
 plugins/kimchi/tests/test_mock_storagepool.py    |    2 +-
 plugins/kimchi/tests/test_mock_storagevolume.py  |    2 +-
 plugins/kimchi/tests/test_mockmodel.py           |    4 +-
 plugins/kimchi/tests/test_model.py               |   11 ++++----
 plugins/kimchi/tests/test_model_network.py       |    5 ++-
 plugins/kimchi/tests/test_model_storagepool.py   |    5 ++-
 plugins/kimchi/tests/test_model_storagevolume.py |    7 +++--
 plugins/kimchi/tests/test_networkxml.py          |    7 +++--
 plugins/kimchi/tests/test_objectstore.py         |    3 +-
 plugins/kimchi/tests/test_osinfo.py              |    1 -
 plugins/kimchi/tests/test_plugin.py              |    7 ++---
 plugins/kimchi/tests/test_rest.py                |    6 ++++-
 plugins/kimchi/tests/test_server.py              |    8 ++++--
 plugins/kimchi/tests/test_template.py            |    2 +-
 plugins/kimchi/tests/test_vmtemplate.py          |    2 +-
 plugins/kimchi/tests/test_yumparser.py           |    7 +++--
 plugins/kimchi/tests/utils.py                    |    8 +++---
 plugins/kimchi/vmtemplate.py                     |    8 +++---
 plugins/kimchi/xmlutils/disk.py                  |    2 +-
 plugins/kimchi/xmlutils/graphics.py              |    1 -
 plugins/kimchi/xmlutils/interface.py             |    1 -
 plugins/kimchi/xmlutils/network.py               |    1 -
 plugins/kimchi/yumparser.py                      |    2 +-
 plugins/sample/__init__.py                       |    4 +-
 plugins/sample/model.py                          |    2 +-
 src/wok/config.py.in                             |    2 -
 src/wok/control/base.py                          |    4 +-
 src/wok/control/utils.py                         |    2 -
 src/wok/objectstore.py                           |    1 -
 src/wok/root.py                                  |    3 +-
 src/wok/server.py                                |    2 +-
 src/wok/sslcert.py                               |    2 -
 src/wok/template.py                              |    4 +-
 src/wok/utils.py                                 |    2 +-
 src/wok/vnc.py                                   |    1 -
 80 files changed, 203 insertions(+), 191 deletions(-)

diff --git a/plugins/kimchi/control/host.py b/plugins/kimchi/control/host.py
index 6634d8f..0a40f1b 100644
--- a/plugins/kimchi/control/host.py
+++ b/plugins/kimchi/control/host.py
@@ -17,11 +17,12 @@
 # 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 cpuinfo import CPUInfo
 from wok.control.base import Collection, Resource, SimpleCollection
 from wok.control.utils import UrlSubNode
 from wok.exception import NotFoundError
 
+from cpuinfo import CPUInfo
+
 
 @UrlSubNode('host', True)
 class Host(Resource):
diff --git a/plugins/kimchi/control/storagepools.py b/plugins/kimchi/control/storagepools.py
index 4a83c20..e5f264e 100644
--- a/plugins/kimchi/control/storagepools.py
+++ b/plugins/kimchi/control/storagepools.py
@@ -20,12 +20,13 @@
 import cherrypy
 
 from wok.control.base import Collection, Resource
-from storagevolumes import IsoVolumes, StorageVolumes
 from wok.control.utils import get_class_name, model_fn
 from wok.control.utils import validate_params
-from ..model.storagepools import ISO_POOL_NAME
 from wok.control.utils import UrlSubNode
 
+from ..model.storagepools import ISO_POOL_NAME
+from storagevolumes import IsoVolumes, StorageVolumes
+
 
 @UrlSubNode('storagepools', True)
 class StoragePools(Collection):
diff --git a/plugins/kimchi/control/vms.py b/plugins/kimchi/control/vms.py
index c8105bc..858b23c 100644
--- a/plugins/kimchi/control/vms.py
+++ b/plugins/kimchi/control/vms.py
@@ -19,6 +19,7 @@
 
 from wok.control.base import AsyncCollection, Resource
 from wok.control.utils import internal_redirect, UrlSubNode
+
 from vm import sub_nodes
 
 
diff --git a/plugins/kimchi/disks.py b/plugins/kimchi/disks.py
index 88a69f4..eb40e3a 100644
--- a/plugins/kimchi/disks.py
+++ b/plugins/kimchi/disks.py
@@ -20,7 +20,6 @@
 import os.path
 import re
 import subprocess
-
 from parted import Device as PDevice
 from parted import Disk as PDisk
 
diff --git a/plugins/kimchi/distroloader.py b/plugins/kimchi/distroloader.py
index a593246..0032737 100644
--- a/plugins/kimchi/distroloader.py
+++ b/plugins/kimchi/distroloader.py
@@ -23,10 +23,11 @@ import json
 import os
 
 
-import config
 from wok.exception import NotFoundError, OperationFailed
 from wok.utils import wok_log
 
+import config
+
 
 ARCHS = {'x86_64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'],
          'amd64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'],
diff --git a/plugins/kimchi/imageinfo.py b/plugins/kimchi/imageinfo.py
index 7d92f54..8a22495 100644
--- a/plugins/kimchi/imageinfo.py
+++ b/plugins/kimchi/imageinfo.py
@@ -17,10 +17,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
+import guestfs
 import json
 import os
 import sys
-import guestfs
 
 from wok.exception import ImageFormatError, InvalidParameter, TimeoutExpired
 from wok.utils import run_command, wok_log
diff --git a/plugins/kimchi/isoinfo.py b/plugins/kimchi/isoinfo.py
index cec20b1..8de6885 100644
--- a/plugins/kimchi/isoinfo.py
+++ b/plugins/kimchi/isoinfo.py
@@ -19,8 +19,8 @@
 
 import contextlib
 import glob
-import platform
 import os
+import platform
 import re
 import stat
 import struct
diff --git a/plugins/kimchi/kvmusertests.py b/plugins/kimchi/kvmusertests.py
index ace157e..35350d8 100644
--- a/plugins/kimchi/kvmusertests.py
+++ b/plugins/kimchi/kvmusertests.py
@@ -16,11 +16,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import libvirt
 import platform
 import psutil
 import threading
 
-import libvirt
 
 from wok.rollbackcontext import RollbackContext
 
diff --git a/plugins/kimchi/mockmodel.py b/plugins/kimchi/mockmodel.py
index d51ab9e..e316c21 100644
--- a/plugins/kimchi/mockmodel.py
+++ b/plugins/kimchi/mockmodel.py
@@ -22,16 +22,18 @@ import lxml.etree as ET
 import os
 import random
 import time
-
-from model import cpuinfo
-
 from lxml import objectify
 from lxml.builder import E
 
+from wok.exception import NotFoundError, OperationFailed
+from wok.objectstore import ObjectStore
+from wok.utils import add_task, get_next_clone_name, wok_log
+from wok.xmlutils.utils import xml_item_update
+
 import config
 import imageinfo
 import osinfo
-from wok.exception import NotFoundError, OperationFailed
+from model import cpuinfo
 from model.debugreports import DebugReportsModel
 from model.host import DeviceModel
 from model.libvirtstoragepool import IscsiPoolDef, NetfsPoolDef
@@ -42,10 +44,7 @@ from model.storagevolumes import StorageVolumeModel, StorageVolumesModel
 from model.templates import LibvirtVMTemplate
 from model.users import PAMUsersModel
 from model.groups import PAMGroupsModel
-from wok.objectstore import ObjectStore
-from wok.utils import add_task, get_next_clone_name, wok_log
 from vmtemplate import VMTemplate
-from wok.xmlutils.utils import xml_item_update
 
 
 fake_user = {'root': 'letmein!'}
diff --git a/plugins/kimchi/model/config.py b/plugins/kimchi/model/config.py
index d0799fe..371e382 100644
--- a/plugins/kimchi/model/config.py
+++ b/plugins/kimchi/model/config.py
@@ -17,23 +17,23 @@
 # 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 multiprocessing.pool import ThreadPool
-
 import cherrypy
+from multiprocessing.pool import ThreadPool
 
 from wok.basemodel import Singleton
 from wok.config import config as kconfig
 from wok.config import get_version
+from wok.exception import NotFoundError
+from wok.utils import check_url_path, run_command, wok_log
+
 from ..config import find_qemu_binary
 from ..distroloader import DistroLoader
-from wok.exception import NotFoundError
-from debugreports import DebugReportsModel
-from featuretests import FeatureTests, FEATURETEST_POOL_NAME
-from featuretests import FEATURETEST_VM_NAME
 from ..repositories import Repositories
 from ..screenshot import VMScreenshot
 from ..swupdate import SoftwareUpdate
-from wok.utils import check_url_path, wok_log, run_command
+from debugreports import DebugReportsModel
+from featuretests import FeatureTests, FEATURETEST_POOL_NAME
+from featuretests import FEATURETEST_VM_NAME
 
 
 class ConfigModel(object):
diff --git a/plugins/kimchi/model/cpuinfo.py b/plugins/kimchi/model/cpuinfo.py
index 61d1ec6..5f4bbca 100644
--- a/plugins/kimchi/model/cpuinfo.py
+++ b/plugins/kimchi/model/cpuinfo.py
@@ -18,11 +18,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import platform
-
 from xml.etree import ElementTree as ET
 
 from wok.exception import InvalidParameter, InvalidOperation
-from wok.utils import wok_log, run_command
+from wok.utils import run_command, wok_log
+
 
 ARCH = 'power' if platform.machine().startswith('ppc') else 'x86'
 
diff --git a/plugins/kimchi/model/debugreports.py b/plugins/kimchi/model/debugreports.py
index aff2152..d20eb12 100644
--- a/plugins/kimchi/model/debugreports.py
+++ b/plugins/kimchi/model/debugreports.py
@@ -25,13 +25,14 @@ import shutil
 import subprocess
 import time
 
-from .. import config
-from wok.exception import InvalidParameter, WokException, NotFoundError
-from wok.exception import OperationFailed
-from tasks import TaskModel
+from wok.exception import InvalidParameter, NotFoundError, OperationFailed
+from wok.exception import WokException
 from wok.utils import add_task, wok_log
 from wok.utils import run_command
 
+from .. import config
+from tasks import TaskModel
+
 
 class DebugReportsModel(object):
     def __init__(self, **kargs):
diff --git a/plugins/kimchi/model/diskutils.py b/plugins/kimchi/model/diskutils.py
index 49bf17d..2f0c903 100644
--- a/plugins/kimchi/model/diskutils.py
+++ b/plugins/kimchi/model/diskutils.py
@@ -17,11 +17,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-
 from wok.exception import OperationFailed, NotFoundError
-from vms import VMModel, VMsModel
 from wok.utils import wok_log
+
 from ..xmlutils.disk import get_vm_disk_info, get_vm_disks
+from vms import VMModel, VMsModel
 
 """
     Functions that multiple storage-related models (e.g. VMStoragesModel,
diff --git a/plugins/kimchi/model/featuretests.py b/plugins/kimchi/model/featuretests.py
index eb41edb..c53d1aa 100644
--- a/plugins/kimchi/model/featuretests.py
+++ b/plugins/kimchi/model/featuretests.py
@@ -22,11 +22,11 @@ import libvirt
 import lxml.etree as ET
 import platform
 import subprocess
-
 from lxml.builder import E
 
 from wok.rollbackcontext import RollbackContext
-from wok.utils import wok_log, run_command, servermethod
+from wok.utils import run_command, servermethod, wok_log
+
 
 FEATURETEST_VM_NAME = "FEATURETEST_VM"
 FEATURETEST_POOL_NAME = "FEATURETEST_POOL"
diff --git a/plugins/kimchi/model/host.py b/plugins/kimchi/model/host.py
index 09b0a09..3ff034c 100644
--- a/plugins/kimchi/model/host.py
+++ b/plugins/kimchi/model/host.py
@@ -19,26 +19,26 @@
 
 import libvirt
 import os
-import time
 import platform
-from collections import defaultdict
-
 import psutil
+import time
 from cherrypy.process.plugins import BackgroundTask
+from collections import defaultdict
 
-from .. import disks
 from wok import netinfo
 from wok.basemodel import Singleton
-import hostdev
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import NotFoundError, OperationFailed
+from wok.utils import add_task, wok_log
+from wok.xmlutils.utils import xpath_get_text
+
+import hostdev
+from .. import disks
+from ..repositories import Repositories
+from ..swupdate import SoftwareUpdate
 from config import CapabilitiesModel
 from tasks import TaskModel
 from vms import DOM_STATE_MAP
-from ..repositories import Repositories
-from ..swupdate import SoftwareUpdate
-from wok.utils import add_task, wok_log
-from wok.xmlutils.utils import xpath_get_text
 
 
 HOST_STATS_INTERVAL = 1
diff --git a/plugins/kimchi/model/hostdev.py b/plugins/kimchi/model/hostdev.py
index 9ebc3c3..c411d0b 100644
--- a/plugins/kimchi/model/hostdev.py
+++ b/plugins/kimchi/model/hostdev.py
@@ -21,10 +21,11 @@ import os
 from pprint import pformat
 from pprint import pprint
 
-from libvirtconnection import LibvirtConnection
 from wok.utils import wok_log
 from wok.xmlutils.utils import dictize
 
+from libvirtconnection import LibvirtConnection
+
 
 def _get_all_host_dev_infos(libvirt_conn):
     node_devs = libvirt_conn.listAllDevices(0)
diff --git a/plugins/kimchi/model/interfaces.py b/plugins/kimchi/model/interfaces.py
index 5ccadc7..81b379a 100644
--- a/plugins/kimchi/model/interfaces.py
+++ b/plugins/kimchi/model/interfaces.py
@@ -19,6 +19,7 @@
 
 from wok import netinfo
 from wok.exception import NotFoundError
+
 from networks import NetworksModel
 
 
diff --git a/plugins/kimchi/model/libvirtconnection.py b/plugins/kimchi/model/libvirtconnection.py
index d2ce031..ef4a4ce 100644
--- a/plugins/kimchi/model/libvirtconnection.py
+++ b/plugins/kimchi/model/libvirtconnection.py
@@ -17,11 +17,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-import threading
-import time
-
 import cherrypy
 import libvirt
+import threading
+import time
 
 from wok.utils import wok_log
 
diff --git a/plugins/kimchi/model/libvirtstoragepool.py b/plugins/kimchi/model/libvirtstoragepool.py
index 6c1f031..b22856b 100644
--- a/plugins/kimchi/model/libvirtstoragepool.py
+++ b/plugins/kimchi/model/libvirtstoragepool.py
@@ -17,17 +17,17 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
+import libvirt
+import lxml.etree as ET
 import os
 import tempfile
-import lxml.etree as ET
 from lxml.builder import E
 
-import libvirt
-
 from wok.exception import InvalidParameter, OperationFailed, TimeoutExpired
-from ..iscsi import TargetClient
 from wok.rollbackcontext import RollbackContext
-from wok.utils import wok_log, parse_cmd_output, run_command
+from wok.utils import parse_cmd_output, run_command, wok_log
+
+from ..iscsi import TargetClient
 
 
 class StoragePoolDef(object):
diff --git a/plugins/kimchi/model/model.py b/plugins/kimchi/model/model.py
index 33dea12..0c94f63 100644
--- a/plugins/kimchi/model/model.py
+++ b/plugins/kimchi/model/model.py
@@ -21,10 +21,11 @@ import inspect
 import os
 
 from wok.basemodel import BaseModel
-from libvirtconnection import LibvirtConnection
 from wok.objectstore import ObjectStore
 from wok.utils import import_module, listPathModules
 
+from libvirtconnection import LibvirtConnection
+
 
 class Model(BaseModel):
     def __init__(self, libvirt_uri=None, objstore_loc=None):
diff --git a/plugins/kimchi/model/networks.py b/plugins/kimchi/model/networks.py
index 3723e4c..57af9e7 100644
--- a/plugins/kimchi/model/networks.py
+++ b/plugins/kimchi/model/networks.py
@@ -17,12 +17,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-import sys
-import time
-
 import ipaddr
 import libvirt
-
+import sys
+import time
 from xml.sax.saxutils import escape
 
 from wok import netinfo
@@ -30,12 +28,13 @@ from wok import network as knetwork
 from wok.config import PluginPaths
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import MissingParameter, NotFoundError, OperationFailed
-from ..osinfo import defaults as tmpl_defaults
 from wok.rollbackcontext import RollbackContext
-from wok.utils import wok_log, run_command
+from wok.utils import run_command, wok_log
+from wok.xmlutils.utils import xpath_get_text
+
+from ..osinfo import defaults as tmpl_defaults
 from ..xmlutils.network import create_vlan_tagged_bridge_xml
 from ..xmlutils.network import to_network_xml
-from wok.xmlutils.utils import xpath_get_text
 
 
 KIMCHI_BRIDGE_PREFIX = 'kb'
diff --git a/plugins/kimchi/model/peers.py b/plugins/kimchi/model/peers.py
index a9cf3b7..91e4a32 100644
--- a/plugins/kimchi/model/peers.py
+++ b/plugins/kimchi/model/peers.py
@@ -22,7 +22,7 @@ import re
 import socket
 
 from wok.config import config
-from wok.utils import wok_log, run_command
+from wok.utils import run_command, wok_log
 
 
 class PeersModel(object):
diff --git a/plugins/kimchi/model/storagepools.py b/plugins/kimchi/model/storagepools.py
index 67377c5..9e45ccf 100644
--- a/plugins/kimchi/model/storagepools.py
+++ b/plugins/kimchi/model/storagepools.py
@@ -20,20 +20,20 @@
 import libvirt
 import lxml.etree as ET
 import sys
-
 from lxml.builder import E
 
 from wok.config import config, PluginPaths
-from ..scan import Scanner
 from wok.exception import InvalidOperation, MissingParameter
 from wok.exception import NotFoundError, OperationFailed
+from wok.utils import add_task, run_command, wok_log
+from wok.xmlutils.utils import xpath_get_text
+
+from ..osinfo import defaults as tmpl_defaults
+from ..scan import Scanner
+from ..utils import pool_name_from_uri
 from config import CapabilitiesModel
 from host import DeviceModel
 from libvirtstoragepool import StoragePoolDef
-from ..osinfo import defaults as tmpl_defaults
-from wok.utils import add_task, wok_log, run_command
-from ..utils import pool_name_from_uri
-from wok.xmlutils.utils import xpath_get_text
 
 
 ISO_POOL_NAME = u'kimchi_isos'
diff --git a/plugins/kimchi/model/storageservers.py b/plugins/kimchi/model/storageservers.py
index 17e1289..accc5f5 100644
--- a/plugins/kimchi/model/storageservers.py
+++ b/plugins/kimchi/model/storageservers.py
@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 from wok.exception import NotFoundError
+
 from storagepools import StoragePoolModel, StoragePoolsModel
 
 # Types of remote storage servers supported
diff --git a/plugins/kimchi/model/storagetargets.py b/plugins/kimchi/model/storagetargets.py
index bbcfb0d..4090b45 100644
--- a/plugins/kimchi/model/storagetargets.py
+++ b/plugins/kimchi/model/storagetargets.py
@@ -22,9 +22,10 @@ import lxml.etree as ET
 from lxml import objectify
 from lxml.builder import E
 
+from wok.utils import patch_find_nfs_target, wok_log
+
 from config import CapabilitiesModel
 from storageservers import STORAGE_SERVERS
-from wok.utils import wok_log, patch_find_nfs_target
 
 
 class StorageTargetsModel(object):
diff --git a/plugins/kimchi/model/storagevolumes.py b/plugins/kimchi/model/storagevolumes.py
index 6bc203a..7fc0837 100644
--- a/plugins/kimchi/model/storagevolumes.py
+++ b/plugins/kimchi/model/storagevolumes.py
@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import contextlib
+import libvirt
 import lxml.etree as ET
 import os
 import tempfile
@@ -26,18 +27,17 @@ import time
 import urllib2
 from lxml.builder import E
 
-import libvirt
-
-from ..config import READONLY_POOL_TYPE
 from wok.exception import InvalidOperation, InvalidParameter, IsoFormatError
 from wok.exception import MissingParameter, NotFoundError, OperationFailed
+from wok.utils import add_task, get_next_clone_name, get_unique_file_name
+from wok.utils import wok_log
+from wok.xmlutils.utils import xpath_get_text
+
+from ..config import READONLY_POOL_TYPE
 from ..isoinfo import IsoImage
 from diskutils import get_disk_used_by, set_disk_used_by
 from storagepools import StoragePoolModel
 from tasks import TaskModel
-from wok.utils import add_task, get_next_clone_name, get_unique_file_name
-from wok.utils import wok_log
-from wok.xmlutils.utils import xpath_get_text
 
 
 VOLUME_TYPE_MAP = {0: 'file',
diff --git a/plugins/kimchi/model/templates.py b/plugins/kimchi/model/templates.py
index a7a74fc..4f0b204 100644
--- a/plugins/kimchi/model/templates.py
+++ b/plugins/kimchi/model/templates.py
@@ -18,19 +18,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import copy
+import libvirt
 import os
 import stat
 
-import libvirt
-
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import NotFoundError, OperationFailed
+from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr
+from wok.xmlutils.utils import xpath_get_text
+
 from ..kvmusertests import UserTests
-from cpuinfo import CPUInfoModel
 from ..utils import pool_name_from_uri
-from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr
 from ..vmtemplate import VMTemplate
-from wok.xmlutils.utils import xpath_get_text
+from cpuinfo import CPUInfoModel
 
 
 class TemplatesModel(object):
diff --git a/plugins/kimchi/model/utils.py b/plugins/kimchi/model/utils.py
index 878390f..53d719d 100644
--- a/plugins/kimchi/model/utils.py
+++ b/plugins/kimchi/model/utils.py
@@ -23,6 +23,7 @@ from lxml.builder import E, ElementMaker
 
 from wok.exception import OperationFailed
 
+
 KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi"
 KIMCHI_NAMESPACE = "kimchi"
 
diff --git a/plugins/kimchi/model/vmhostdevs.py b/plugins/kimchi/model/vmhostdevs.py
index 18f4e1f..0cc6bd3 100644
--- a/plugins/kimchi/model/vmhostdevs.py
+++ b/plugins/kimchi/model/vmhostdevs.py
@@ -18,21 +18,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import glob
-import os
-
 import libvirt
+import os
+import platform
 from lxml import etree, objectify
 from lxml.builder import E
 
 from wok.exception import InvalidOperation, InvalidParameter, NotFoundError
 from wok.exception import OperationFailed
+from wok.rollbackcontext import RollbackContext
+from wok.utils import run_command, wok_log
+
 from config import CapabilitiesModel
 from host import DeviceModel, DevicesModel
 from utils import get_vm_config_flag
 from vms import DOM_STATE_MAP, VMModel
-from wok.rollbackcontext import RollbackContext
-from wok.utils import wok_log, run_command
-import platform
 
 
 class VMHostDevsModel(object):
diff --git a/plugins/kimchi/model/vmifaces.py b/plugins/kimchi/model/vmifaces.py
index 6e14cc3..87565c8 100644
--- a/plugins/kimchi/model/vmifaces.py
+++ b/plugins/kimchi/model/vmifaces.py
@@ -17,16 +17,16 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-import random
-
 import libvirt
+import random
 from lxml import etree, objectify
 
 from wok.exception import InvalidParameter, MissingParameter
 from wok.exception import NotFoundError, InvalidOperation
+
+from ..xmlutils.interface import get_iface_xml
 from config import CapabilitiesModel
 from vms import DOM_STATE_MAP, VMModel
-from ..xmlutils.interface import get_iface_xml
 
 
 class VMIfacesModel(object):
diff --git a/plugins/kimchi/model/vms.py b/plugins/kimchi/model/vms.py
index 96e5084..561e7d8 100644
--- a/plugins/kimchi/model/vms.py
+++ b/plugins/kimchi/model/vms.py
@@ -17,39 +17,39 @@
 # 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 lxml.builder import E
+import libvirt
 import lxml.etree as ET
-from lxml import etree, objectify
 import os
 import random
 import string
 import time
 import uuid
+from lxml import etree, objectify
+from lxml.builder import E
 from xml.etree import ElementTree
 
-import libvirt
-
 from wok import vnc
-from .. import model
 from wok.config import config
-from ..config import READONLY_POOL_TYPE
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import NotFoundError, OperationFailed
+from wok.rollbackcontext import RollbackContext
+from wok.utils import add_task, convert_data_size, get_next_clone_name
+from wok.utils import import_class, run_setfacl_set_attr, wok_log
+from wok.xmlutils.utils import xpath_get_text, xml_item_update
+from wok.xmlutils.utils import dictize
+
+from .. import model
+from ..config import READONLY_POOL_TYPE
 from ..kvmusertests import UserTests
+from ..screenshot import VMScreenshot
+from ..utils import template_name_from_uri
+from ..xmlutils.cpu import get_cpu_xml, get_numa_xml
 from config import CapabilitiesModel
 from tasks import TaskModel
 from templates import TemplateModel
 from utils import get_vm_name
 from utils import get_metadata_node
 from utils import set_metadata_node
-from wok.rollbackcontext import RollbackContext
-from ..screenshot import VMScreenshot
-from wok.utils import add_task, convert_data_size, get_next_clone_name
-from wok.utils import import_class, wok_log, run_setfacl_set_attr
-from ..utils import template_name_from_uri
-from ..xmlutils.cpu import get_cpu_xml, get_numa_xml
-from wok.xmlutils.utils import xpath_get_text, xml_item_update
-from wok.xmlutils.utils import dictize
 
 
 DOM_STATE_MAP = {0: 'nostate',
diff --git a/plugins/kimchi/model/vmsnapshots.py b/plugins/kimchi/model/vmsnapshots.py
index 0724adc..6abf726 100644
--- a/plugins/kimchi/model/vmsnapshots.py
+++ b/plugins/kimchi/model/vmsnapshots.py
@@ -17,19 +17,19 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-import time
-
 import libvirt
 import lxml.etree as ET
+import time
 from lxml import objectify
 from lxml.builder import E
 
 from wok.exception import InvalidOperation, NotFoundError, OperationFailed
+from wok.utils import add_task
+from wok.xmlutils.utils import xpath_get_text
+
 from tasks import TaskModel
 from vms import DOM_STATE_MAP, VMModel
 from vmstorages import VMStorageModel, VMStoragesModel
-from wok.utils import add_task
-from wok.xmlutils.utils import xpath_get_text
 
 
 class VMSnapshotsModel(object):
diff --git a/plugins/kimchi/model/vmstorages.py b/plugins/kimchi/model/vmstorages.py
index f7cef52..d6987e3 100644
--- a/plugins/kimchi/model/vmstorages.py
+++ b/plugins/kimchi/model/vmstorages.py
@@ -18,20 +18,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import string
-
 from lxml import etree
 
 from wok.exception import InvalidOperation, InvalidParameter, NotFoundError
 from wok.exception import OperationFailed
-from config import CapabilitiesModel
-from vms import DOM_STATE_MAP, VMModel
-from storagevolumes import StorageVolumeModel
-from utils import get_vm_config_flag
-from ..osinfo import lookup
-from diskutils import get_disk_used_by, set_disk_used_by
 from wok.utils import wok_log
+
+from ..osinfo import lookup
 from ..xmlutils.disk import get_device_node, get_disk_xml
 from ..xmlutils.disk import get_vm_disk_info, get_vm_disks
+from config import CapabilitiesModel
+from diskutils import get_disk_used_by, set_disk_used_by
+from storagevolumes import StorageVolumeModel
+from utils import get_vm_config_flag
+from vms import DOM_STATE_MAP, VMModel
+
 
 HOTPLUG_TYPE = ['scsi', 'virtio']
 
diff --git a/plugins/kimchi/osinfo.py b/plugins/kimchi/osinfo.py
index 5fe1e07..1164946 100644
--- a/plugins/kimchi/osinfo.py
+++ b/plugins/kimchi/osinfo.py
@@ -21,7 +21,6 @@ import copy
 import glob
 import os
 import psutil
-
 from collections import defaultdict
 from configobj import ConfigObj
 from distutils.version import LooseVersion
diff --git a/plugins/kimchi/repositories.py b/plugins/kimchi/repositories.py
index 926bd45..9caabc4 100644
--- a/plugins/kimchi/repositories.py
+++ b/plugins/kimchi/repositories.py
@@ -21,14 +21,14 @@ import copy
 import os
 import time
 import urlparse
-
 from ConfigParser import ConfigParser
 
 from wok.basemodel import Singleton
-from config import kimchiLock
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import OperationFailed, NotFoundError, MissingParameter
 from wok.utils import validate_repo_url
+
+from config import kimchiLock
 from yumparser import get_yum_repositories, write_repo_to_file
 
 
diff --git a/plugins/kimchi/root.py b/plugins/kimchi/root.py
index 9889926..20c41ca 100644
--- a/plugins/kimchi/root.py
+++ b/plugins/kimchi/root.py
@@ -21,14 +21,14 @@ import json
 import os
 import cherrypy
 
+from wok import vnc
+from wok.i18n import messages
+from wok.root import WokRoot
 
 import config
 import mockmodel
 from control import sub_nodes
-from wok.i18n import messages
 from model import model as kimchiModel
-from wok.root import WokRoot
-from wok import vnc
 
 
 class KimchiRoot(WokRoot):
diff --git a/plugins/kimchi/scan.py b/plugins/kimchi/scan.py
index 663b838..b475c46 100644
--- a/plugins/kimchi/scan.py
+++ b/plugins/kimchi/scan.py
@@ -25,9 +25,9 @@ import shutil
 import tempfile
 import time
 
+from wok.utils import wok_log
 
 from isoinfo import IsoImage, probe_iso
-from wok.utils import wok_log
 
 
 SCAN_IGNORE = ['/tmp/kimchi-scan-*']
diff --git a/plugins/kimchi/screenshot.py b/plugins/kimchi/screenshot.py
index 1cac964..7c2347c 100644
--- a/plugins/kimchi/screenshot.py
+++ b/plugins/kimchi/screenshot.py
@@ -25,16 +25,16 @@ import tempfile
 import time
 import uuid
 
-
 try:
     from PIL import Image
 except ImportError:
     import Image
 
 
-import config
 from wok.utils import wok_log
 
+import config
+
 
 (fd, pipe) = tempfile.mkstemp()
 stream_test_result = None
diff --git a/plugins/kimchi/swupdate.py b/plugins/kimchi/swupdate.py
index cd56707..84b927f 100644
--- a/plugins/kimchi/swupdate.py
+++ b/plugins/kimchi/swupdate.py
@@ -21,9 +21,10 @@ import subprocess
 import time
 
 from wok.basemodel import Singleton
-from config import kimchiLock
 from wok.exception import NotFoundError, OperationFailed
-from wok.utils import wok_log, run_command
+from wok.utils import run_command, wok_log
+
+from config import kimchiLock
 from yumparser import get_yum_packages_list_update
 
 
diff --git a/plugins/kimchi/tests/iso_gen.py b/plugins/kimchi/tests/iso_gen.py
index 7e92622..736c660 100644
--- a/plugins/kimchi/tests/iso_gen.py
+++ b/plugins/kimchi/tests/iso_gen.py
@@ -22,6 +22,7 @@ import struct
 
 from wok.plugins.kimchi.isoinfo import IsoImage
 
+
 iso_des = [
     ('openbsd', lambda v: True,
         lambda v: 'OpenBSD/i386    %s Install CD' % v),
diff --git a/plugins/kimchi/tests/test_authorization.py b/plugins/kimchi/tests/test_authorization.py
index 695b512..53aa847 100644
--- a/plugins/kimchi/tests/test_authorization.py
+++ b/plugins/kimchi/tests/test_authorization.py
@@ -20,10 +20,10 @@
 import json
 import os
 import unittest
-
 from functools import partial
 
 from wok.plugins.kimchi import mockmodel
+
 from iso_gen import construct_fake_iso
 from utils import get_free_port, patch_auth, request
 from utils import run_server, wait_task
diff --git a/plugins/kimchi/tests/test_config.py.in b/plugins/kimchi/tests/test_config.py.in
index 19ae0ba..6bca3df 100644
--- a/plugins/kimchi/tests/test_config.py.in
+++ b/plugins/kimchi/tests/test_config.py.in
@@ -26,6 +26,8 @@ from wok.plugins.kimchi.config import get_debugreports_path
 from wok.plugins.kimchi.config import get_screenshot_path
 from wok.plugins.kimchi.config import KimchiPaths
 
+from wok.plugins.kimchi import config as kconfig
+
 
 get_prefix = None
 
diff --git a/plugins/kimchi/tests/test_exception.py b/plugins/kimchi/tests/test_exception.py
index c0dadab..f1b81ba 100644
--- a/plugins/kimchi/tests/test_exception.py
+++ b/plugins/kimchi/tests/test_exception.py
@@ -21,9 +21,10 @@ import json
 import os
 import unittest
 
+import wok.server
 
 from wok.plugins.kimchi import mockmodel
-import wok.server
+
 from utils import get_free_port, patch_auth, request, run_server
 
 
diff --git a/plugins/kimchi/tests/test_host.py b/plugins/kimchi/tests/test_host.py
index 5a18490..e2aa196 100644
--- a/plugins/kimchi/tests/test_host.py
+++ b/plugins/kimchi/tests/test_host.py
@@ -25,12 +25,13 @@ import psutil
 import tempfile
 import time
 import unittest
-
 from functools import partial
 
 from wok.plugins.kimchi.mockmodel import MockModel
+
 from utils import get_free_port, patch_auth, request, run_server, wait_task
 
+
 test_server = None
 model = None
 host = None
diff --git a/plugins/kimchi/tests/test_mock_network.py b/plugins/kimchi/tests/test_mock_network.py
index 749b9c3..9f38869 100644
--- a/plugins/kimchi/tests/test_mock_network.py
+++ b/plugins/kimchi/tests/test_mock_network.py
@@ -21,10 +21,10 @@
 import json
 import os
 import unittest
-
 from functools import partial
 
 from wok.plugins.kimchi.mockmodel import MockModel
+
 from test_model_network import _do_network_test
 from utils import get_free_port, patch_auth, request, run_server
 
diff --git a/plugins/kimchi/tests/test_mock_storagepool.py b/plugins/kimchi/tests/test_mock_storagepool.py
index b96d72d..6fe0981 100644
--- a/plugins/kimchi/tests/test_mock_storagepool.py
+++ b/plugins/kimchi/tests/test_mock_storagepool.py
@@ -21,10 +21,10 @@
 import json
 import os
 import unittest
-
 from functools import partial
 
 from wok.plugins.kimchi.mockmodel import MockModel
+
 from utils import get_free_port, patch_auth, request, run_server
 
 
diff --git a/plugins/kimchi/tests/test_mock_storagevolume.py b/plugins/kimchi/tests/test_mock_storagevolume.py
index 0065305..22fcce1 100644
--- a/plugins/kimchi/tests/test_mock_storagevolume.py
+++ b/plugins/kimchi/tests/test_mock_storagevolume.py
@@ -21,10 +21,10 @@
 import json
 import os
 import unittest
-
 from functools import partial
 
 from wok.plugins.kimchi.mockmodel import MockModel
+
 from test_model_storagevolume import _do_volume_test
 from utils import get_free_port, patch_auth, request, run_server
 
diff --git a/plugins/kimchi/tests/test_mockmodel.py b/plugins/kimchi/tests/test_mockmodel.py
index 133a61e..2fae0e2 100644
--- a/plugins/kimchi/tests/test_mockmodel.py
+++ b/plugins/kimchi/tests/test_mockmodel.py
@@ -23,11 +23,11 @@ import os
 import time
 import unittest
 
-
 from wok.plugins.kimchi import mockmodel
-from utils import get_free_port, patch_auth, request, run_server, wait_task
 from wok.plugins.kimchi.osinfo import get_template_default
 
+from utils import get_free_port, patch_auth, request, run_server, wait_task
+
 
 test_server = None
 model = None
diff --git a/plugins/kimchi/tests/test_model.py b/plugins/kimchi/tests/test_model.py
index 157ba62..c70e4fb 100644
--- a/plugins/kimchi/tests/test_model.py
+++ b/plugins/kimchi/tests/test_model.py
@@ -27,20 +27,21 @@ import time
 import unittest
 import uuid
 
-
-import iso_gen
 import wok.objectstore
-import utils
 from wok import netinfo
 from wok.basemodel import Singleton
 from wok.config import config
 from wok.exception import InvalidOperation
 from wok.exception import InvalidParameter, NotFoundError, OperationFailed
+from wok.rollbackcontext import RollbackContext
+from wok.utils import add_task
+
 from wok.plugins.kimchi.osinfo import get_template_default
 from wok.plugins.kimchi.model import model
 from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection
-from wok.rollbackcontext import RollbackContext
-from wok.utils import add_task
+
+import iso_gen
+import utils
 
 
 invalid_repository_urls = ['www.fedora.org',       # missing protocol
diff --git a/plugins/kimchi/tests/test_model_network.py b/plugins/kimchi/tests/test_model_network.py
index 37f5652..8874ed9 100644
--- a/plugins/kimchi/tests/test_model_network.py
+++ b/plugins/kimchi/tests/test_model_network.py
@@ -21,11 +21,12 @@
 import json
 import os
 import unittest
-
 from functools import partial
 
-from wok.plugins.kimchi.model.model import Model
 from wok.rollbackcontext import RollbackContext
+
+from wok.plugins.kimchi.model.model import Model
+
 from utils import get_free_port, patch_auth, request, rollback_wrapper
 from utils import run_server
 
diff --git a/plugins/kimchi/tests/test_model_storagepool.py b/plugins/kimchi/tests/test_model_storagepool.py
index ec11dc1..0bdf91a 100644
--- a/plugins/kimchi/tests/test_model_storagepool.py
+++ b/plugins/kimchi/tests/test_model_storagepool.py
@@ -22,11 +22,12 @@ import json
 import os
 import tempfile
 import unittest
-
 from functools import partial
 
-from wok.plugins.kimchi.model.model import Model
 from wok.rollbackcontext import RollbackContext
+
+from wok.plugins.kimchi.model.model import Model
+
 from utils import get_free_port, patch_auth, request
 from utils import run_server
 
diff --git a/plugins/kimchi/tests/test_model_storagevolume.py b/plugins/kimchi/tests/test_model_storagevolume.py
index 103948e..a05e479 100644
--- a/plugins/kimchi/tests/test_model_storagevolume.py
+++ b/plugins/kimchi/tests/test_model_storagevolume.py
@@ -22,14 +22,15 @@ import json
 import os
 import requests
 import unittest
-
 from functools import partial
 
 from wok.config import paths
+from wok.rollbackcontext import RollbackContext
+
 from wok.plugins.kimchi.config import READONLY_POOL_TYPE
-from wok.plugins.kimchi.model.model import Model
 from wok.plugins.kimchi.mockmodel import MockModel
-from wok.rollbackcontext import RollbackContext
+from wok.plugins.kimchi.model.model import Model
+
 from utils import fake_auth_header, get_free_port, patch_auth, request
 from utils import rollback_wrapper, run_server, wait_task
 
diff --git a/plugins/kimchi/tests/test_networkxml.py b/plugins/kimchi/tests/test_networkxml.py
index 139f051..a64b6c2 100644
--- a/plugins/kimchi/tests/test_networkxml.py
+++ b/plugins/kimchi/tests/test_networkxml.py
@@ -18,13 +18,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import ipaddr
-import unittest
 import lxml.etree as ET
+import unittest
 
-import utils
+from wok.xmlutils.utils import xpath_get_text
 
 from wok.plugins.kimchi.xmlutils import network as nxml
-from wok.xmlutils.utils import xpath_get_text
+
+import utils
 
 
 class NetworkXmlTests(unittest.TestCase):
diff --git a/plugins/kimchi/tests/test_objectstore.py b/plugins/kimchi/tests/test_objectstore.py
index 412a7f2..632786f 100644
--- a/plugins/kimchi/tests/test_objectstore.py
+++ b/plugins/kimchi/tests/test_objectstore.py
@@ -23,8 +23,9 @@ import tempfile
 import threading
 import unittest
 
-from wok.exception import NotFoundError
 from wok import objectstore
+from wok.exception import NotFoundError
+
 
 tmpfile = None
 
diff --git a/plugins/kimchi/tests/test_osinfo.py b/plugins/kimchi/tests/test_osinfo.py
index 1712ded..bd2af58 100644
--- a/plugins/kimchi/tests/test_osinfo.py
+++ b/plugins/kimchi/tests/test_osinfo.py
@@ -19,7 +19,6 @@
 
 import unittest
 
-
 from wok.plugins.kimchi.osinfo import _get_arch, get_template_default, lookup
 from wok.plugins.kimchi.osinfo import modern_version_bases
 
diff --git a/plugins/kimchi/tests/test_plugin.py b/plugins/kimchi/tests/test_plugin.py
index 2f2475a..ebc4a39 100644
--- a/plugins/kimchi/tests/test_plugin.py
+++ b/plugins/kimchi/tests/test_plugin.py
@@ -20,14 +20,13 @@
 import json
 import os
 import unittest
-
-
 from functools import partial
 
-
-from wok.plugins.kimchi import mockmodel
 import wok.server
 from wok.utils import get_enabled_plugins
+
+from wok.plugins.kimchi import mockmodel
+
 import utils
 
 
diff --git a/plugins/kimchi/tests/test_rest.py b/plugins/kimchi/tests/test_rest.py
index 52e3404..1a1ae6c 100644
--- a/plugins/kimchi/tests/test_rest.py
+++ b/plugins/kimchi/tests/test_rest.py
@@ -25,7 +25,6 @@ import time
 import unittest
 import urllib2
 import urlparse
-
 from functools import partial
 
 import iso_gen
@@ -33,6 +32,11 @@ from wok.plugins.kimchi import mockmodel
 from wok.plugins.kimchi.osinfo import get_template_default
 from wok.rollbackcontext import RollbackContext
 from wok.utils import add_task
+
+from wok.plugins.kimchi import mockmodel
+from wok.plugins.kimchi.osinfo import get_template_default
+
+import iso_gen
 from utils import get_free_port, patch_auth, request
 from utils import run_server, wait_task
 
diff --git a/plugins/kimchi/tests/test_server.py b/plugins/kimchi/tests/test_server.py
index 48a8589..d7f1af0 100644
--- a/plugins/kimchi/tests/test_server.py
+++ b/plugins/kimchi/tests/test_server.py
@@ -24,13 +24,15 @@ import os
 import tempfile
 import threading
 import unittest
-
 from functools import partial
 
-import utils
-from wok.plugins.kimchi import mockmodel
 from wok.control.base import Collection, Resource
 
+from wok.plugins.kimchi import mockmodel
+
+import utils
+
+
 test_server = None
 model = None
 host = None
diff --git a/plugins/kimchi/tests/test_template.py b/plugins/kimchi/tests/test_template.py
index a1a828b..39adeb1 100644
--- a/plugins/kimchi/tests/test_template.py
+++ b/plugins/kimchi/tests/test_template.py
@@ -21,11 +21,11 @@
 import json
 import os
 import unittest
-
 from functools import partial
 
 from wok.plugins.kimchi.config import READONLY_POOL_TYPE
 from wok.plugins.kimchi.mockmodel import MockModel
+
 from utils import get_free_port, patch_auth, request, run_server
 
 
diff --git a/plugins/kimchi/tests/test_vmtemplate.py b/plugins/kimchi/tests/test_vmtemplate.py
index 6213900..0bca215 100644
--- a/plugins/kimchi/tests/test_vmtemplate.py
+++ b/plugins/kimchi/tests/test_vmtemplate.py
@@ -21,10 +21,10 @@ import os
 import unittest
 import uuid
 
+from wok.xmlutils.utils import xpath_get_text
 
 from wok.plugins.kimchi.osinfo import get_template_default
 from wok.plugins.kimchi.vmtemplate import VMTemplate
-from wok.xmlutils.utils import xpath_get_text
 
 
 class VMTemplateTests(unittest.TestCase):
diff --git a/plugins/kimchi/tests/test_yumparser.py b/plugins/kimchi/tests/test_yumparser.py
index 99a757d..be5e95c 100644
--- a/plugins/kimchi/tests/test_yumparser.py
+++ b/plugins/kimchi/tests/test_yumparser.py
@@ -21,12 +21,13 @@ import os
 import tempfile
 import unittest
 
-from wok.plugins.kimchi.model import model
 from wok.rollbackcontext import RollbackContext
+
+from wok.plugins.kimchi.model import model
 from wok.plugins.kimchi.yumparser import delete_repo_from_file, get_repo_files
 from wok.plugins.kimchi.yumparser import get_yum_packages_list_update
-from wok.plugins.kimchi.yumparser import get_yum_repositories, write_repo_to_file
-from wok.plugins.kimchi.yumparser import YumRepoObject
+from wok.plugins.kimchi.yumparser import get_yum_repositories
+from wok.plugins.kimchi.yumparser import write_repo_to_file, YumRepoObject
 
 
 TEMP_REPO_FILE = ''
diff --git a/plugins/kimchi/tests/utils.py b/plugins/kimchi/tests/utils.py
index dceed9c..f674164 100644
--- a/plugins/kimchi/tests/utils.py
+++ b/plugins/kimchi/tests/utils.py
@@ -28,21 +28,21 @@ import os
 import socket
 import ssl
 import sys
-import time
 import threading
+import time
 import unittest
-
 from contextlib import closing
 from lxml import etree
 
-
-from wok.plugins.kimchi import mockmodel
 import wok.server
 from wok.config import config, PluginPaths
 from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs
 from wok.exception import NotFoundError, OperationFailed
 from wok.utils import wok_log
 
+from wok.plugins.kimchi import mockmodel
+
+
 _ports = {}
 
 # provide missing unittest decorators and API for python 2.6; these decorators
diff --git a/plugins/kimchi/vmtemplate.py b/plugins/kimchi/vmtemplate.py
index f45f80d..07e70ba 100644
--- a/plugins/kimchi/vmtemplate.py
+++ b/plugins/kimchi/vmtemplate.py
@@ -22,16 +22,16 @@ import stat
 import time
 import urlparse
 import uuid
-
 from lxml import etree
 from lxml.builder import E
 
+from wok.exception import InvalidParameter, ImageFormatError, IsoFormatError
+from wok.exception import MissingParameter, OperationFailed
+from wok.utils import check_url_path
+
 import imageinfo
 import osinfo
-from wok.exception import InvalidParameter, IsoFormatError, MissingParameter
-from wok.exception import ImageFormatError, OperationFailed
 from isoinfo import IsoImage
-from wok.utils import check_url_path
 from utils import pool_name_from_uri
 from xmlutils.cpu import get_cpu_xml
 from xmlutils.disk import get_disk_xml
diff --git a/plugins/kimchi/xmlutils/disk.py b/plugins/kimchi/xmlutils/disk.py
index a451c43..126ce77 100644
--- a/plugins/kimchi/xmlutils/disk.py
+++ b/plugins/kimchi/xmlutils/disk.py
@@ -23,13 +23,13 @@ import socket
 import stat
 import string
 import urlparse
-
 from lxml import objectify
 from lxml.builder import E
 
 from wok.exception import InvalidParameter, NotFoundError
 from wok.utils import check_url_path
 
+
 BUS_TO_DEV_MAP = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'}
 DEV_TYPE_SRC_ATTR_MAP = {'file': 'file', 'block': 'dev'}
 
diff --git a/plugins/kimchi/xmlutils/graphics.py b/plugins/kimchi/xmlutils/graphics.py
index 53cba09..2b4346a 100644
--- a/plugins/kimchi/xmlutils/graphics.py
+++ b/plugins/kimchi/xmlutils/graphics.py
@@ -18,7 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import lxml.etree as ET
-
 from lxml.builder import E
 
 
diff --git a/plugins/kimchi/xmlutils/interface.py b/plugins/kimchi/xmlutils/interface.py
index 70b63bd..0f3e848 100644
--- a/plugins/kimchi/xmlutils/interface.py
+++ b/plugins/kimchi/xmlutils/interface.py
@@ -18,7 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import lxml.etree as ET
-
 from distutils.version import LooseVersion
 from lxml.builder import E
 
diff --git a/plugins/kimchi/xmlutils/network.py b/plugins/kimchi/xmlutils/network.py
index e78779c..c73aad9 100644
--- a/plugins/kimchi/xmlutils/network.py
+++ b/plugins/kimchi/xmlutils/network.py
@@ -19,7 +19,6 @@
 
 import ipaddr
 import lxml.etree as ET
-
 from lxml.builder import E
 
 
diff --git a/plugins/kimchi/yumparser.py b/plugins/kimchi/yumparser.py
index 792c3ae..74f9fa0 100644
--- a/plugins/kimchi/yumparser.py
+++ b/plugins/kimchi/yumparser.py
@@ -16,8 +16,8 @@
 # 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
-import subprocess
 
+import subprocess
 from os import listdir
 from os.path import isfile, splitext
 
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index a2cfbf2..a3a8f05 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -19,14 +19,14 @@
 
 import json
 import os
-
-
 from cherrypy import expose
 
 
 from wok.config import PluginPaths
 from wok.control.base import Collection, Resource
 from wok.root import WokRoot
+
+
 from plugins.sample.i18n import messages
 from plugins.sample.model import Model
 
diff --git a/plugins/sample/model.py b/plugins/sample/model.py
index 8edcc85..4ada648 100644
--- a/plugins/sample/model.py
+++ b/plugins/sample/model.py
@@ -17,8 +17,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-from wok.exception import InvalidOperation, NotFoundError
 from wok.basemodel import BaseModel
+from wok.exception import InvalidOperation, NotFoundError
 
 
 class CirclesModel(object):
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 64ae633..5ffa936 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -19,8 +19,6 @@
 #
 
 import os
-
-
 from ConfigParser import SafeConfigParser
 
 
diff --git a/src/wok/control/base.py b/src/wok/control/base.py
index 65a6fee..5242f51 100644
--- a/src/wok/control/base.py
+++ b/src/wok/control/base.py
@@ -28,8 +28,8 @@ from wok.control.utils import get_class_name, internal_redirect, model_fn
 from wok.control.utils import parse_request, validate_method
 from wok.control.utils import validate_params
 from wok.exception import InvalidOperation, InvalidParameter
-from wok.exception import WokException, MissingParameter, NotFoundError
-from wok.exception import OperationFailed, UnauthorizedError
+from wok.exception import MissingParameter, NotFoundError
+from wok.exception import OperationFailed, UnauthorizedError, WokException
 
 
 class Resource(object):
diff --git a/src/wok/control/utils.py b/src/wok/control/utils.py
index d617dcd..496320c 100644
--- a/src/wok/control/utils.py
+++ b/src/wok/control/utils.py
@@ -20,8 +20,6 @@
 
 import cherrypy
 import json
-
-
 from jsonschema import Draft3Validator, ValidationError, FormatChecker
 
 
diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py
index 87a30d1..107b568 100644
--- a/src/wok/objectstore.py
+++ b/src/wok/objectstore.py
@@ -21,7 +21,6 @@ import sqlite3
 import threading
 import traceback
 
-
 try:
     from collections import OrderedDict
 except ImportError:
diff --git a/src/wok/root.py b/src/wok/root.py
index 35620c7..3a86a74 100644
--- a/src/wok/root.py
+++ b/src/wok/root.py
@@ -20,9 +20,8 @@
 import cherrypy
 import json
 import os
-
-
 from distutils.version import LooseVersion
+
 from wok import auth
 from wok import template
 from wok.i18n import messages
diff --git a/src/wok/server.py b/src/wok/server.py
index 0a836a2..5b48049 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -25,9 +25,9 @@ import os
 
 from wok import auth
 from wok import config
-from wok.model import model
 from wok.config import WokConfig, PluginConfig
 from wok.control import sub_nodes
+from wok.model import model
 from wok.proxy import start_proxy, terminate_proxy
 from wok.root import WokRoot
 from wok.utils import get_enabled_plugins, import_class
diff --git a/src/wok/sslcert.py b/src/wok/sslcert.py
index e772dc8..6b64796 100644
--- a/src/wok/sslcert.py
+++ b/src/wok/sslcert.py
@@ -22,8 +22,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 import time
-
-
 from M2Crypto import ASN1, EVP, RSA, X509
 
 
diff --git a/src/wok/template.py b/src/wok/template.py
index 323bf55..c743f73 100644
--- a/src/wok/template.py
+++ b/src/wok/template.py
@@ -20,11 +20,11 @@
 import cherrypy
 import errno
 import json
+from Cheetah.Template import Template
+from glob import iglob
 
 
 from wok.config import paths
-from Cheetah.Template import Template
-from glob import iglob
 
 
 def get_lang():
diff --git a/src/wok/utils.py b/src/wok/utils.py
index fa379d4..a5083af 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -29,11 +29,11 @@ import subprocess
 import traceback
 import urllib2
 import xml.etree.ElementTree as ET
+from cherrypy.lib.reprconf import Parser
 from httplib import HTTPConnection, HTTPException
 from multiprocessing import Process, Queue
 from threading import Timer
 from urlparse import urlparse
-from cherrypy.lib.reprconf import Parser
 
 from wok.asynctask import AsyncTask
 from wok.config import paths, PluginPaths
diff --git a/src/wok/vnc.py b/src/wok/vnc.py
index 3b6a80b..2532449 100644
--- a/src/wok/vnc.py
+++ b/src/wok/vnc.py
@@ -21,7 +21,6 @@
 import base64
 import errno
 import os
-
 from multiprocessing import Process
 from websockify import WebSocketProxy
 
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:18:06 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:18:06 -0300
Subject: [Kimchi-devel] [PATCH V3 34/34] Move kimchi-specific CSS to plugin
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-35-git-send-email-luciojhc@linux.vnet.ibm.com>

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/ui/css/theme-default/icon.css |  106 ++++++++++++++++++++++++++
 ui/css/theme-default/button.css              |   85 ---------------------
 2 files changed, 106 insertions(+), 85 deletions(-)
 create mode 100644 plugins/kimchi/ui/css/theme-default/icon.css

diff --git a/plugins/kimchi/ui/css/theme-default/icon.css b/plugins/kimchi/ui/css/theme-default/icon.css
new file mode 100644
index 0000000..f82d45d
--- /dev/null
+++ b/plugins/kimchi/ui/css/theme-default/icon.css
@@ -0,0 +1,106 @@
+/*
+ * Project Kimchi
+ *
+ * Copyright IBM, Corp. 2013-2015
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /* Generated at http://colorzilla.com/gradient-editor/ */
+
+.btn.loading {
+    box-shadow: none;
+    cursor: default;
+}
+
+.btn.loading .icon {
+    background: url(../images/theme-default/icon-load.png) center
+                center no-repeat;
+}
+
+.btn.pause-gray .icon {
+    background: url(../images/theme-default/ac22_pause_grey.png) center
+                center no-repeat;
+}
+
+.btn.resume-gray .icon {
+    background: url(../images/theme-default/ac24_resume_grey.png) center
+                center no-repeat;
+}
+
+.icon.reset {
+    background: url(../images/theme-default/icon-reset.png) center
+                center no-repeat;
+}
+
+.icon.power-up {
+    background: url(../images/theme-default/icon-power-up.png) center
+                center no-repeat;
+}
+
+.icon.power-down {
+    background: url(../images/theme-default/icon-power-down.png) center
+                center no-repeat;
+}
+
+.icon.pause {
+    background: url(../images/theme-default/ac22_pause.png) center
+                center no-repeat;
+}
+
+.icon.resume {
+    background: url(../images/theme-default/ac24_resume.png) center
+                center no-repeat;
+}
+
+.icon.search {
+    background: url(../images/theme-default/icon-search.png) no-repeat
+                center center;
+}
+
+.icon.sort {
+    background: url(../images/theme-default/icon-sort.png) no-repeat
+                center center;
+}
+
+.icon.design {
+    background: url(../images/theme-default/icon-design.png) no-repeat
+                center center;
+}
+
+.icon.list {
+    background: url(../images/theme-default/icon-list.png) no-repeat
+                center center;
+}
+
+.icon.detail {
+    background: url(../images/theme-default/icon-detail.png) no-repeat
+                center center;
+}
+
+.icon.add {
+    line-height: 32px;
+    text-align: center;
+    text-shadow: -1px -1px 1px #aaa, 1px 1px 1px #eee;
+    font-size: 38px;
+    font-weight: bold;
+    color: #7cae0a;
+}
+
+.icon.tree {
+    width: 42px;
+    background: url(../images/theme-default/icon-tree.png) no-repeat
+                center center;
+}
+
+
diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css
index e774128..071e331 100644
--- a/ui/css/theme-default/button.css
+++ b/ui/css/theme-default/button.css
@@ -84,26 +84,6 @@
             endColorstr='#ffffff', GradientType=0);
 }
 
-.btn.loading {
-    box-shadow: none;
-    cursor: default;
-}
-
-.btn.loading .icon {
-    background: url(../images/theme-default/icon-load.png) center
-                center no-repeat;
-}
-
-.btn.pause-gray .icon {
-    background: url(../images/theme-default/ac22_pause_grey.png) center
-                center no-repeat;
-}
-
-.btn.resume-gray .icon {
-    background: url(../images/theme-default/ac24_resume_grey.png) center
-                center no-repeat;
-}
-
 .btn .text {
     padding: 0 10px;
 }
@@ -221,71 +201,6 @@
     height: 38px;
 }
 
-.icon.reset {
-    background: url(../images/theme-default/icon-reset.png) center
-                center no-repeat;
-}
-
-.icon.power-up {
-    background: url(../images/theme-default/icon-power-up.png) center
-                center no-repeat;
-}
-
-.icon.power-down {
-    background: url(../images/theme-default/icon-power-down.png) center
-                center no-repeat;
-}
-
-.icon.pause {
-    background: url(../images/theme-default/ac22_pause.png) center
-                center no-repeat;
-}
-
-.icon.resume {
-    background: url(../images/theme-default/ac24_resume.png) center
-                center no-repeat;
-}
-
-.icon.search {
-    background: url(../images/theme-default/icon-search.png) no-repeat
-                center center;
-}
-
-.icon.sort {
-    background: url(../images/theme-default/icon-sort.png) no-repeat
-                center center;
-}
-
-.icon.design {
-    background: url(../images/theme-default/icon-design.png) no-repeat
-                center center;
-}
-
-.icon.list {
-    background: url(../images/theme-default/icon-list.png) no-repeat
-                center center;
-}
-
-.icon.detail {
-    background: url(../images/theme-default/icon-detail.png) no-repeat
-                center center;
-}
-
-.icon.add {
-    line-height: 32px;
-    text-align: center;
-    text-shadow: -1px -1px 1px #aaa, 1px 1px 1px #eee;
-    font-size: 38px;
-    font-weight: bold;
-    color: #7cae0a;
-}
-
-.icon.tree {
-    width: 42px;
-    background: url(../images/theme-default/icon-tree.png) no-repeat
-                center center;
-}
-
 /* Generated at http://colorzilla.com/gradient-editor/ */
 .btn-tool.tree {
     width: 42px;
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:32 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:32 -0300
Subject: [Kimchi-devel] [PATCH V3 00/34] Split code into Wok server and
	Kimchi plugin
Message-ID: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>

v3 changes:
* Rebased with new-ui
* Reorganized UI files and removed unnecessary duplicated ones
* Added patch 01 to fix new-ui branch
* Added patch 33 to split error messages
* Added patch 34 to move small specific css code to plugin

Github branch URL:
https://github.com/lcorreia/kimchi/tree/lcorreia/wok-v3

This patchset splits code into web server framework (Wok) and virtualization
layer functionality (Kimchi, made a plugin). Wok stands for Webserver Originated
from Kimchi.

It's now stable and working.

Despite the size of patchset, the review will be straightforward. The biggest
patches have only repetitive changes, like file/variable renames or URI changes.

Patches organization:
* 02 to 04: just renames, no code changes.
* 05: just duplications of files
* 06 to 14: initial changes - mostly repetitive stuff like renames
* 15 and 16: core changes - a good summary of reorganization done to the code
* 17 to 29: small fixes necessary for the reorganization to work
* 30 to 34: additional fixes

Patches 02 to 29 should be applied as a single commit in order to not break
functionality. They are separated here to easy the reviewers work.

Thanks,
Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>

Lucio Correia (34):
  Add makefiles for fontello
  Create kimchi plugin
  Rename src/kimchi to src/wok
  Rename kimchi-named files to wok
  Duplicate some files
  Update wok docs
  Update kimchi plugin docs
  Update wok build files
  Update kimchi plugin makefiles
  Update wok daemon and specs
  Update kimchi plugin rpm specs
  Adapt imports to the new plugin structure
  Update server references to wok
  Use plugin relative URLs
  Setup wok
  Setup kimchi plugin
  Use InternalRedirect for all plugin redirects
  Dynamically add authed URLs to plugin conf
  Do not use tabs dir for kimchi plugin html templates
  Refer to kimchi plugin specific js/css in htmls
  Do not generate help index
  Fix import_module
  Make render_cheetah_file() plugin-aware
  Make cachebust's href() plugin-aware
  Default to first tab of first plugin
  Fix storage pool URI split
  Correctly join help pathes for plugins case
  Install plugin .mo files to default locale dir
  Adapt automated tests to the new plugin structure
  Use pool_uri to avoid case pool_name is not defined
  Fix Fedora RPM build issue
  Organize imports in all .py files
  Split error messages between wok and kimchi plugin
  Move kimchi-specific CSS to plugin

 .gitignore                                         |   18 +-
 COPYING                                            |    8 +-
 Makefile.am                                        |   91 +-
 config/Makefile.am                                 |   18 -
 config/ui/Makefile.am                              |   22 -
 config/ui/tabs.xml                                 |   38 -
 configure.ac                                       |   41 +-
 contrib/DEBIAN/control.in                          |   15 +-
 contrib/DEBIAN/postrm                              |    4 +-
 contrib/Makefile.am                                |   12 +-
 contrib/kimchi.spec.fedora.in                      |  189 --
 contrib/kimchi.spec.suse.in                        |  150 -
 contrib/kimchid-upstart.conf.debian                |   34 -
 contrib/kimchid-upstart.conf.fedora                |   33 -
 contrib/kimchid.service.fedora                     |   13 -
 contrib/kimchid.sysvinit                           |  104 -
 contrib/make-deb.sh.in                             |    2 +-
 contrib/wok.spec.fedora.in                         |  159 +
 contrib/wok.spec.suse.in                           |  133 +
 contrib/wokd-upstart.conf.debian                   |   28 +
 contrib/wokd-upstart.conf.fedora                   |   28 +
 contrib/wokd.service.fedora                        |   13 +
 contrib/wokd.sysvinit                              |  104 +
 docs/API.md                                        | 1123 +-------
 docs/Makefile.am                                   |    9 +-
 docs/README-federation.md                          |   60 -
 docs/README.md                                     |  202 +--
 docs/{kimchid.8.in => wokd.8.in}                   |    0
 plugins/Makefile.am                                |    2 +-
 plugins/kimchi/.gitignore                          |   37 +
 plugins/kimchi/API.json                            |  836 ++++++
 plugins/kimchi/INSTALL                             |  369 +++
 plugins/kimchi/Makefile.am                         |  159 +
 plugins/kimchi/README.md                           |    1 +
 plugins/kimchi/VERSION                             |    1 +
 plugins/kimchi/__init__.py                         |   21 +
 plugins/kimchi/autogen.sh                          |   21 +
 plugins/kimchi/build-aux/config.rpath              |  672 +++++
 plugins/kimchi/build-aux/genChangelog              |   25 +
 plugins/kimchi/build-aux/pkg-version               |   59 +
 plugins/kimchi/config.py.in                        |  139 +
 plugins/kimchi/config.rpath                        |  672 +++++
 plugins/kimchi/configure.ac                        |  119 +
 plugins/kimchi/contrib/DEBIAN/Makefile.am          |   17 +
 plugins/kimchi/contrib/DEBIAN/control.in           |   36 +
 plugins/kimchi/contrib/Makefile.am                 |   34 +
 plugins/kimchi/contrib/check_i18n.py               |   82 +
 plugins/kimchi/contrib/kimchi.spec.fedora.in       |  124 +
 plugins/kimchi/contrib/kimchi.spec.suse.in         |  113 +
 {contrib => plugins/kimchi/contrib}/make-deb.sh.in |    0
 plugins/kimchi/control/Makefile.am                 |   27 +
 plugins/kimchi/control/__init__.py                 |   26 +
 plugins/kimchi/control/config.py                   |   57 +
 plugins/kimchi/control/cpuinfo.py                  |   37 +
 plugins/kimchi/control/debugreports.py             |   61 +
 plugins/kimchi/control/groups.py                   |   28 +
 plugins/kimchi/control/host.py                     |  157 +
 plugins/kimchi/control/interfaces.py               |   46 +
 plugins/kimchi/control/networks.py                 |   54 +
 plugins/kimchi/control/peers.py                    |   29 +
 plugins/kimchi/control/storagepools.py             |  116 +
 plugins/kimchi/control/storageservers.py           |   60 +
 plugins/kimchi/control/storagevolumes.py           |   83 +
 plugins/kimchi/control/tasks.py                    |   37 +
 plugins/kimchi/control/templates.py                |   58 +
 plugins/kimchi/control/users.py                    |   35 +
 plugins/kimchi/control/vm/Makefile.am              |   26 +
 plugins/kimchi/control/vm/__init__.py              |   26 +
 plugins/kimchi/control/vm/hostdevs.py              |   43 +
 plugins/kimchi/control/vm/ifaces.py                |   45 +
 plugins/kimchi/control/vm/snapshots.py             |   58 +
 plugins/kimchi/control/vm/storages.py              |   45 +
 plugins/kimchi/control/vms.py                      |   67 +
 plugins/kimchi/disks.py                            |  196 ++
 plugins/kimchi/distroloader.py                     |   67 +
 {src => plugins/kimchi}/distros.d/Makefile.am      |    0
 {src => plugins/kimchi}/distros.d/debian.json      |    0
 {src => plugins/kimchi}/distros.d/fedora.json      |    0
 {src => plugins/kimchi}/distros.d/gentoo.json      |    0
 {src => plugins/kimchi}/distros.d/opensuse.json    |    0
 {src => plugins/kimchi}/distros.d/ubuntu.json      |    0
 plugins/kimchi/docs/API.md                         | 1147 +++++++
 plugins/kimchi/docs/Makefile.am                    |   28 +
 plugins/kimchi/docs/README-federation.md           |   60 +
 plugins/kimchi/docs/README.md                      |  247 ++
 {docs => plugins/kimchi/docs}/kimchi-guest.png     |  Bin 192281 -> 192281 bytes
 {docs => plugins/kimchi/docs}/kimchi-login.png     |  Bin 318041 -> 318041 bytes
 {docs => plugins/kimchi/docs}/kimchi-templates.png |  Bin 329678 -> 329678 bytes
 plugins/kimchi/i18n.py                             |  336 +++
 plugins/kimchi/imageinfo.py                        |   72 +
 plugins/kimchi/iscsi.py                            |   88 +
 plugins/kimchi/isoinfo.py                          |  506 ++++
 plugins/kimchi/kimchi.conf                         |   45 +
 plugins/kimchi/kvmusertests.py                     |   79 +
 plugins/kimchi/m4/ac_python_module.m4              |   30 +
 plugins/kimchi/m4/gettext.m4                       |  383 +++
 plugins/kimchi/m4/iconv.m4                         |  214 ++
 plugins/kimchi/m4/intlmacosx.m4                    |   51 +
 plugins/kimchi/m4/lib-ld.m4                        |  110 +
 plugins/kimchi/m4/lib-link.m4                      |  774 +++++
 plugins/kimchi/m4/lib-prefix.m4                    |  224 ++
 plugins/kimchi/m4/nls.m4                           |   32 +
 plugins/kimchi/m4/po.m4                            |  449 +++
 plugins/kimchi/m4/progtest.m4                      |   92 +
 plugins/kimchi/mockmodel.py                        |  624 ++++
 plugins/kimchi/model/Makefile.am                   |   25 +
 {src => plugins}/kimchi/model/__init__.py          |    0
 plugins/kimchi/model/config.py                     |  176 ++
 plugins/kimchi/model/cpuinfo.py                    |  126 +
 plugins/kimchi/model/debugreports.py               |  213 ++
 plugins/kimchi/model/diskutils.py                  |   75 +
 plugins/kimchi/model/featuretests.py               |  259 ++
 plugins/kimchi/model/groups.py                     |   67 +
 plugins/kimchi/model/host.py                       |  476 +++
 plugins/kimchi/model/hostdev.py                    |  324 ++
 plugins/kimchi/model/interfaces.py                 |   44 +
 plugins/kimchi/model/libvirtconnection.py          |  136 +
 plugins/kimchi/model/libvirtstoragepool.py         |  264 ++
 plugins/kimchi/model/model.py                      |   52 +
 plugins/kimchi/model/networks.py                   |  381 +++
 plugins/kimchi/model/peers.py                      |   72 +
 plugins/kimchi/model/storagepools.py               |  491 +++
 plugins/kimchi/model/storageservers.py             |   81 +
 plugins/kimchi/model/storagetargets.py             |  122 +
 plugins/kimchi/model/storagevolumes.py             |  541 ++++
 plugins/kimchi/model/tasks.py                      |   64 +
 plugins/kimchi/model/templates.py                  |  303 ++
 plugins/kimchi/model/users.py                      |   90 +
 plugins/kimchi/model/utils.py                      |  161 +
 plugins/kimchi/model/vmhostdevs.py                 |  336 +++
 plugins/kimchi/model/vmifaces.py                   |  186 ++
 plugins/kimchi/model/vms.py                        | 1303 ++++++++
 plugins/kimchi/model/vmsnapshots.py                |  204 ++
 plugins/kimchi/model/vmstorages.py                 |  252 ++
 plugins/kimchi/osinfo.py                           |  214 ++
 plugins/kimchi/po/LINGUAS                          |   11 +
 plugins/kimchi/po/Makefile.in.in                   |  398 +++
 {po => plugins/kimchi/po}/Makevars                 |    0
 plugins/kimchi/po/POTFILES.in                      |    3 +
 plugins/kimchi/po/de_DE.po                         | 2288 ++++++++++++++
 plugins/kimchi/po/en_US.po                         | 2075 +++++++++++++
 plugins/kimchi/po/es_ES.po                         | 2305 ++++++++++++++
 plugins/kimchi/po/fr_FR.po                         | 2338 +++++++++++++++
 {po => plugins/kimchi/po}/gen-pot.in               |    0
 plugins/kimchi/po/it_IT.po                         | 2274 ++++++++++++++
 plugins/kimchi/po/ja_JP.po                         | 2269 ++++++++++++++
 plugins/kimchi/po/kimchi.pot                       | 2074 +++++++++++++
 plugins/kimchi/po/ko_KR.po                         | 2197 ++++++++++++++
 plugins/kimchi/po/pt_BR.po                         | 2369 +++++++++++++++
 plugins/kimchi/po/ru_RU.po                         | 2198 ++++++++++++++
 plugins/kimchi/po/zh_CN.po                         | 2186 ++++++++++++++
 plugins/kimchi/po/zh_TW.po                         | 2138 +++++++++++++
 plugins/kimchi/repositories.py                     |  529 ++++
 plugins/kimchi/root.py                             |   70 +
 plugins/kimchi/scan.py                             |   89 +
 plugins/kimchi/screenshot.py                       |  184 ++
 plugins/kimchi/swupdate.py                         |  263 ++
 {src => plugins/kimchi}/template.conf              |    0
 plugins/kimchi/tests/Makefile.am                   |   50 +
 plugins/kimchi/tests/iso_gen.py                    |  212 ++
 plugins/kimchi/tests/run_tests.sh.in               |   55 +
 plugins/kimchi/tests/test_authorization.py         |  166 +
 plugins/kimchi/tests/test_config.py.in             |  195 ++
 plugins/kimchi/tests/test_exception.py             |  113 +
 plugins/kimchi/tests/test_host.py                  |  200 ++
 plugins/kimchi/tests/test_mock_network.py          |   71 +
 plugins/kimchi/tests/test_mock_storagepool.py      |  141 +
 plugins/kimchi/tests/test_mock_storagevolume.py    |   94 +
 plugins/kimchi/tests/test_mockmodel.py             |  139 +
 plugins/kimchi/tests/test_model.py                 | 1240 ++++++++
 plugins/kimchi/tests/test_model_network.py         |  145 +
 plugins/kimchi/tests/test_model_storagepool.py     |  115 +
 plugins/kimchi/tests/test_model_storagevolume.py   |  272 ++
 plugins/kimchi/tests/test_networkxml.py            |  172 ++
 plugins/kimchi/tests/test_objectstore.py           |   97 +
 plugins/kimchi/tests/test_osinfo.py                |   69 +
 plugins/kimchi/tests/test_plugin.py                |  127 +
 plugins/kimchi/tests/test_rest.py                  | 1221 ++++++++
 plugins/kimchi/tests/test_rollbackcontext.py       |   99 +
 plugins/kimchi/tests/test_server.py                |  289 ++
 plugins/kimchi/tests/test_storagepoolxml.py        |  171 ++
 plugins/kimchi/tests/test_template.py              |  362 +++
 plugins/kimchi/tests/test_utils.py                 |   69 +
 plugins/kimchi/tests/test_vmtemplate.py            |  116 +
 plugins/kimchi/tests/test_yumparser.py             |  162 +
 plugins/kimchi/tests/utils.py                      |  260 ++
 plugins/kimchi/ui/Makefile.am                      |   20 +
 plugins/kimchi/ui/config/Makefile.am               |   22 +
 plugins/kimchi/ui/config/tab-ext.xml               |   38 +
 plugins/kimchi/ui/css/Makefile.am                  |   26 +
 plugins/kimchi/ui/css/theme-default/guest-edit.css |  424 +++
 .../ui}/css/theme-default/guest-storage-add.css    |    0
 plugins/kimchi/ui/css/theme-default/host.css       |  287 ++
 plugins/kimchi/ui/css/theme-default/icon.css       |  106 +
 plugins/kimchi/ui/css/theme-default/list.css       |  326 ++
 plugins/kimchi/ui/css/theme-default/network.css    |  267 ++
 .../kimchi/ui}/css/theme-default/report-add.css    |    0
 .../kimchi/ui/css/theme-default/report-rename.css  |   39 +
 .../ui}/css/theme-default/repository-add.css       |    0
 .../ui}/css/theme-default/repository-edit.css      |    0
 plugins/kimchi/ui/css/theme-default/storage.css    |  550 ++++
 .../css/theme-default/storagepool-add-volume.css   |    0
 .../kimchi/ui}/css/theme-default/template-edit.css |    0
 .../kimchi/ui}/css/theme-default/template.css      |    0
 .../kimchi/ui/css/theme-default/template_add.css   |  317 ++
 .../kimchi/ui}/css/theme-default/template_list.css |    0
 plugins/kimchi/ui/images/Makefile.am               |   22 +
 {ui => plugins/kimchi/ui}/images/icon-centos.png   |  Bin 4734 -> 4734 bytes
 {ui => plugins/kimchi/ui}/images/icon-debian.png   |  Bin 4239 -> 4239 bytes
 {ui => plugins/kimchi/ui}/images/icon-fedora.png   |  Bin 4449 -> 4449 bytes
 {ui => plugins/kimchi/ui}/images/icon-gentoo.png   |  Bin 15307 -> 15307 bytes
 {ui => plugins/kimchi/ui}/images/icon-opensuse.png |  Bin 3046 -> 3046 bytes
 {ui => plugins/kimchi/ui}/images/icon-ubuntu.png   |  Bin 4818 -> 4818 bytes
 {ui => plugins/kimchi/ui}/images/icon-vm.png       |  Bin 2976 -> 2976 bytes
 plugins/kimchi/ui/images/logo.ico                  |  Bin 0 -> 1214 bytes
 plugins/kimchi/ui/images/theme-default/Makefile.am |   20 +
 .../kimchi/ui}/images/theme-default/ac22_pause.png |  Bin 1219 -> 1219 bytes
 .../ui}/images/theme-default/ac22_pause_grey.png   |  Bin 1175 -> 1175 bytes
 .../ui}/images/theme-default/ac24_resume.png       |  Bin 1341 -> 1341 bytes
 .../ui}/images/theme-default/ac24_resume_grey.png  |  Bin 1282 -> 1282 bytes
 .../ui/images/theme-default/arrow-down-black.png   |  Bin 0 -> 2942 bytes
 .../images/theme-default/arrow-down-disable.png    |  Bin 472 -> 472 bytes
 .../kimchi/ui/images/theme-default/arrow-down.png  |  Bin 0 -> 537 bytes
 .../kimchi/ui}/images/theme-default/arrow-up.png   |  Bin 510 -> 510 bytes
 .../kimchi/ui}/images/theme-default/arrow_out.png  |  Bin 3048 -> 3048 bytes
 .../kimchi/ui}/images/theme-default/group.png      |  Bin 1703 -> 1703 bytes
 .../ui}/images/theme-default/host-icon-sprite.png  |  Bin 1034 -> 1034 bytes
 .../kimchi/ui}/images/theme-default/icon-back.png  |  Bin 244 -> 244 bytes
 .../ui}/images/theme-default/icon-camera.png       |  Bin 4860 -> 4860 bytes
 .../ui}/images/theme-default/icon-design.png       |  Bin 4562 -> 4562 bytes
 .../ui}/images/theme-default/icon-detail.png       |  Bin 3079 -> 3079 bytes
 .../kimchi/ui}/images/theme-default/icon-iso.png   |  Bin 4188 -> 4188 bytes
 .../kimchi/ui}/images/theme-default/icon-list.png  |  Bin 2983 -> 2983 bytes
 .../kimchi/ui}/images/theme-default/icon-load.png  |  Bin 3678 -> 3678 bytes
 .../kimchi/ui}/images/theme-default/icon-local.png |  Bin 425 -> 425 bytes
 .../ui}/images/theme-default/icon-power-down.png   |  Bin 4372 -> 4372 bytes
 .../ui}/images/theme-default/icon-power-up.png     |  Bin 4367 -> 4367 bytes
 .../kimchi/ui}/images/theme-default/icon-qcow2.png |  Bin 4684 -> 4684 bytes
 .../kimchi/ui}/images/theme-default/icon-raw.png   |  Bin 4679 -> 4679 bytes
 .../ui}/images/theme-default/icon-remote.png       |  Bin 1005 -> 1005 bytes
 .../kimchi/ui}/images/theme-default/icon-reset.png |  Bin 4576 -> 4576 bytes
 .../ui}/images/theme-default/icon-search.png       |  Bin 4197 -> 4197 bytes
 .../kimchi/ui}/images/theme-default/icon-sort.png  |  Bin 3421 -> 3421 bytes
 .../kimchi/ui}/images/theme-default/icon-tree.png  |  Bin 3526 -> 3526 bytes
 .../kimchi/ui}/images/theme-default/icon-user.png  |  Bin 5366 -> 5366 bytes
 .../images/theme-default/icon-volume-default.png   |  Bin 4265 -> 4265 bytes
 .../images/theme-default/kimchi-loading15x15.gif   |  Bin 1653 -> 1653 bytes
 .../kimchi/ui}/images/theme-default/loading.gif    |  Bin 2190 -> 2190 bytes
 .../kimchi/ui}/images/theme-default/user.png       |  Bin 1322 -> 1322 bytes
 plugins/kimchi/ui/js/Makefile.am                   |   27 +
 plugins/kimchi/ui/js/src/kimchi.api.js             | 1355 +++++++++
 plugins/kimchi/ui/js/src/kimchi.guest_add_main.js  |   86 +
 plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js |  759 +++++
 plugins/kimchi/ui/js/src/kimchi.guest_main.js      |  511 ++++
 .../kimchi/ui/js/src/kimchi.guest_media_main.js    |   56 +
 .../ui/js/src/kimchi.guest_storage_add.main.js     |  199 ++
 plugins/kimchi/ui/js/src/kimchi.host.js            |  858 ++++++
 plugins/kimchi/ui/js/src/kimchi.main.js            |   26 +
 plugins/kimchi/ui/js/src/kimchi.network.js         |  442 +++
 plugins/kimchi/ui/js/src/kimchi.report_add_main.js |   72 +
 .../kimchi/ui/js/src/kimchi.report_rename_main.js  |   66 +
 .../kimchi/ui/js/src/kimchi.repository_add_main.js |   96 +
 .../ui/js/src/kimchi.repository_edit_main.js       |   74 +
 plugins/kimchi/ui/js/src/kimchi.storage_main.js    |  428 +++
 .../ui/js/src/kimchi.storagepool_add_main.js       |  414 +++
 .../js/src/kimchi.storagepool_add_volume_main.js   |  179 ++
 .../kimchi/ui/js/src/kimchi.template_add_main.js   |  441 +++
 .../kimchi/ui/js/src/kimchi.template_edit_main.js  |  343 +++
 plugins/kimchi/ui/js/src/kimchi.template_main.js   |  111 +
 plugins/kimchi/ui/pages/Makefile.am                |   22 +
 plugins/kimchi/ui/pages/guest-add.html.tmpl        |   98 +
 .../kimchi/ui}/pages/guest-edit.html.tmpl          |    0
 .../kimchi/ui/pages/guest-storage-add.html.tmpl    |  103 +
 plugins/kimchi/ui/pages/guest.html.tmpl            |   77 +
 plugins/kimchi/ui/pages/guests.html.tmpl           |   65 +
 plugins/kimchi/ui/pages/help/Makefile.am           |   34 +
 plugins/kimchi/ui/pages/help/de_DE/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/de_DE/guests.dita        |    0
 .../kimchi/ui}/pages/help/de_DE/host.dita          |    0
 .../kimchi/ui}/pages/help/de_DE/network.dita       |    0
 .../kimchi/ui}/pages/help/de_DE/storage.dita       |    0
 .../kimchi/ui}/pages/help/de_DE/templates.dita     |    0
 {ui => plugins/kimchi/ui}/pages/help/dita-help.xsl |    0
 plugins/kimchi/ui/pages/help/en_US/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/en_US/guests.dita        |    0
 .../kimchi/ui}/pages/help/en_US/host.dita          |    0
 .../kimchi/ui}/pages/help/en_US/network.dita       |    0
 .../kimchi/ui}/pages/help/en_US/storage.dita       |    0
 .../kimchi/ui}/pages/help/en_US/templates.dita     |    0
 plugins/kimchi/ui/pages/help/es_ES/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/es_ES/guests.dita        |    0
 .../kimchi/ui}/pages/help/es_ES/host.dita          |    0
 .../kimchi/ui}/pages/help/es_ES/network.dita       |    0
 .../kimchi/ui}/pages/help/es_ES/storage.dita       |    0
 .../kimchi/ui}/pages/help/es_ES/templates.dita     |    0
 plugins/kimchi/ui/pages/help/fr_FR/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/fr_FR/guests.dita        |    0
 .../kimchi/ui}/pages/help/fr_FR/host.dita          |    0
 .../kimchi/ui}/pages/help/fr_FR/network.dita       |    0
 .../kimchi/ui}/pages/help/fr_FR/storage.dita       |    0
 .../kimchi/ui}/pages/help/fr_FR/templates.dita     |    0
 plugins/kimchi/ui/pages/help/it_IT/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/it_IT/guests.dita        |    0
 .../kimchi/ui}/pages/help/it_IT/host.dita          |    0
 .../kimchi/ui}/pages/help/it_IT/network.dita       |    0
 .../kimchi/ui}/pages/help/it_IT/storage.dita       |    0
 .../kimchi/ui}/pages/help/it_IT/templates.dita     |    0
 plugins/kimchi/ui/pages/help/ja_JP/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/ja_JP/guests.dita        |    0
 .../kimchi/ui}/pages/help/ja_JP/host.dita          |    0
 .../kimchi/ui}/pages/help/ja_JP/network.dita       |    0
 .../kimchi/ui}/pages/help/ja_JP/storage.dita       |    0
 .../kimchi/ui}/pages/help/ja_JP/templates.dita     |    0
 {ui => plugins/kimchi/ui}/pages/help/kimchi.css    |    0
 plugins/kimchi/ui/pages/help/ko_KR/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/ko_KR/guests.dita        |    0
 .../kimchi/ui}/pages/help/ko_KR/host.dita          |    0
 .../kimchi/ui}/pages/help/ko_KR/network.dita       |    0
 .../kimchi/ui}/pages/help/ko_KR/storage.dita       |    0
 .../kimchi/ui}/pages/help/ko_KR/templates.dita     |    0
 plugins/kimchi/ui/pages/help/pt_BR/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/pt_BR/guests.dita        |    0
 .../kimchi/ui}/pages/help/pt_BR/host.dita          |    0
 .../kimchi/ui}/pages/help/pt_BR/network.dita       |    0
 .../kimchi/ui}/pages/help/pt_BR/storage.dita       |    0
 .../kimchi/ui}/pages/help/pt_BR/templates.dita     |    0
 plugins/kimchi/ui/pages/help/ru_RU/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/ru_RU/guests.dita        |    0
 .../kimchi/ui}/pages/help/ru_RU/host.dita          |    0
 .../kimchi/ui}/pages/help/ru_RU/network.dita       |    0
 .../kimchi/ui}/pages/help/ru_RU/storage.dita       |    0
 .../kimchi/ui}/pages/help/ru_RU/templates.dita     |    0
 plugins/kimchi/ui/pages/help/zh_CN/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/zh_CN/guests.dita        |    0
 .../kimchi/ui}/pages/help/zh_CN/host.dita          |    0
 .../kimchi/ui}/pages/help/zh_CN/network.dita       |    0
 .../kimchi/ui}/pages/help/zh_CN/storage.dita       |    0
 .../kimchi/ui}/pages/help/zh_CN/templates.dita     |    0
 plugins/kimchi/ui/pages/help/zh_TW/Makefile.am     |   23 +
 .../kimchi/ui}/pages/help/zh_TW/guests.dita        |    0
 .../kimchi/ui}/pages/help/zh_TW/host.dita          |    0
 .../kimchi/ui}/pages/help/zh_TW/network.dita       |    0
 .../kimchi/ui}/pages/help/zh_TW/storage.dita       |    0
 .../kimchi/ui}/pages/help/zh_TW/templates.dita     |    0
 plugins/kimchi/ui/pages/host.html.tmpl             |  177 ++
 plugins/kimchi/ui/pages/i18n.json.tmpl             |  187 ++
 plugins/kimchi/ui/pages/network.html.tmpl          |  133 +
 plugins/kimchi/ui/pages/report-add.html.tmpl       |   56 +
 plugins/kimchi/ui/pages/report-rename.html.tmpl    |   56 +
 plugins/kimchi/ui/pages/repository-add.html.tmpl   |  113 +
 plugins/kimchi/ui/pages/repository-edit.html.tmpl  |  117 +
 plugins/kimchi/ui/pages/storage.html.tmpl          |  143 +
 .../ui/pages/storagepool-add-volume.html.tmpl      |   79 +
 plugins/kimchi/ui/pages/storagepool-add.html.tmpl  |  186 ++
 plugins/kimchi/ui/pages/template-add.html.tmpl     |  233 ++
 plugins/kimchi/ui/pages/template-edit.html.tmpl    |  193 ++
 plugins/kimchi/ui/pages/templates.html.tmpl        |   77 +
 plugins/kimchi/ui/robots.txt                       |    2 +
 plugins/kimchi/ui/spice-html5/Makefile.am          |   25 +
 .../kimchi/ui}/spice-html5/atKeynames.js           |    0
 {ui => plugins/kimchi/ui}/spice-html5/bitmap.js    |    0
 plugins/kimchi/ui/spice-html5/css/Makefile.am      |   20 +
 .../kimchi/ui}/spice-html5/css/spice.css           |    0
 {ui => plugins/kimchi/ui}/spice-html5/cursor.js    |    0
 {ui => plugins/kimchi/ui}/spice-html5/display.js   |    0
 {ui => plugins/kimchi/ui}/spice-html5/enums.js     |    0
 {ui => plugins/kimchi/ui}/spice-html5/inputs.js    |    0
 {ui => plugins/kimchi/ui}/spice-html5/lz.js        |    0
 {ui => plugins/kimchi/ui}/spice-html5/main.js      |    0
 plugins/kimchi/ui/spice-html5/pages/Makefile.am    |   20 +
 .../kimchi/ui/spice-html5/pages/spice_auto.html    |  200 ++
 {ui => plugins/kimchi/ui}/spice-html5/playback.js  |    0
 {ui => plugins/kimchi/ui}/spice-html5/png.js       |    0
 {ui => plugins/kimchi/ui}/spice-html5/quic.js      |    0
 {ui => plugins/kimchi/ui}/spice-html5/resize.js    |    0
 .../kimchi/ui}/spice-html5/simulatecursor.js       |    0
 .../kimchi/ui}/spice-html5/spicearraybuffer.js     |    0
 {ui => plugins/kimchi/ui}/spice-html5/spiceconn.js |    0
 .../kimchi/ui}/spice-html5/spicedataview.js        |    0
 {ui => plugins/kimchi/ui}/spice-html5/spicemsg.js  |    0
 {ui => plugins/kimchi/ui}/spice-html5/spicetype.js |    0
 .../kimchi/ui/spice-html5/thirdparty/Makefile.am   |   20 +
 .../kimchi/ui}/spice-html5/thirdparty/jsbn.js      |    0
 .../kimchi/ui}/spice-html5/thirdparty/prng4.js     |    0
 .../kimchi/ui}/spice-html5/thirdparty/rng.js       |    0
 .../kimchi/ui}/spice-html5/thirdparty/rsa.js       |    0
 .../kimchi/ui}/spice-html5/thirdparty/sha1.js      |    0
 {ui => plugins/kimchi/ui}/spice-html5/ticket.js    |    0
 {ui => plugins/kimchi/ui}/spice-html5/utils.js     |    0
 {ui => plugins/kimchi/ui}/spice-html5/webm.js      |    0
 {ui => plugins/kimchi/ui}/spice-html5/wire.js      |    0
 plugins/kimchi/utils.py                            |   40 +
 plugins/kimchi/vmtemplate.py                       |  431 +++
 plugins/kimchi/xmlutils/Makefile.am                |   25 +
 {src => plugins}/kimchi/xmlutils/__init__.py       |    0
 {src => plugins}/kimchi/xmlutils/cpu.py            |    0
 plugins/kimchi/xmlutils/disk.py                    |  164 +
 plugins/kimchi/xmlutils/graphics.py                |   45 +
 plugins/kimchi/xmlutils/interface.py               |   61 +
 plugins/kimchi/xmlutils/network.py                 |  122 +
 {src => plugins}/kimchi/xmlutils/qemucmdline.py    |    0
 plugins/kimchi/yumparser.py                        |  283 ++
 plugins/sample/API.json                            |    2 +-
 plugins/sample/__init__.py                         |   14 +-
 plugins/sample/model.py                            |    4 +-
 plugins/sample/sample.conf.in                      |   12 +-
 plugins/sample/ui/js/util.js                       |    6 +-
 .../sample/ui/pages/help/en_US/sample-tab1.html    |    2 +-
 .../sample/ui/pages/help/en_US/sample-tab2.html    |    2 +-
 plugins/sample/ui/pages/i18n.json.tmpl             |    2 +-
 po/Makevars                                        |    2 +-
 po/POTFILES.in                                     |    3 +-
 po/de_DE.po                                        | 2737 +++++++-----------
 po/en_US.po                                        | 1686 +----------
 po/es_ES.po                                        | 2763 +++++++-----------
 po/fr_FR.po                                        | 2997 ++++++++-----------
 po/gen-pot.in                                      |    2 +-
 po/it_IT.po                                        | 2706 +++++++-----------
 po/ja_JP.po                                        | 2694 +++++++-----------
 po/kimchi.pot                                      | 2162 --------------
 po/ko_KR.po                                        | 2558 ++++++----------
 po/pt_BR.po                                        | 3140 +++++++++-----------
 po/ru_RU.po                                        | 2558 ++++++----------
 po/wok.pot                                         |  553 ++++
 po/zh_CN.po                                        | 2816 ++++++++----------
 po/zh_TW.po                                        | 2442 ++++++----------
 src/Makefile.am                                    |   24 +-
 src/firewalld.xml                                  |    4 +-
 src/kimchi.conf.in                                 |   65 -
 src/kimchi/API.json                                |  836 ------
 src/kimchi/Makefile.am                             |   61 -
 src/kimchi/asynctask.py                            |   74 -
 src/kimchi/auth.py                                 |  352 ---
 src/kimchi/cachebust.py                            |   30 -
 src/kimchi/config.py.in                            |  324 --
 src/kimchi/control/Makefile.am                     |   27 -
 src/kimchi/control/__init__.py                     |   26 -
 src/kimchi/control/base.py                         |  381 ---
 src/kimchi/control/config.py                       |   57 -
 src/kimchi/control/cpuinfo.py                      |   37 -
 src/kimchi/control/debugreports.py                 |   61 -
 src/kimchi/control/groups.py                       |   28 -
 src/kimchi/control/host.py                         |  156 -
 src/kimchi/control/interfaces.py                   |   46 -
 src/kimchi/control/networks.py                     |   54 -
 src/kimchi/control/peers.py                        |   29 -
 src/kimchi/control/plugins.py                      |   27 -
 src/kimchi/control/storagepools.py                 |  115 -
 src/kimchi/control/storageservers.py               |   60 -
 src/kimchi/control/storagevolumes.py               |   83 -
 src/kimchi/control/tasks.py                        |   37 -
 src/kimchi/control/templates.py                    |   58 -
 src/kimchi/control/users.py                        |   35 -
 src/kimchi/control/utils.py                        |  149 -
 src/kimchi/control/vm/Makefile.am                  |   26 -
 src/kimchi/control/vm/__init__.py                  |   26 -
 src/kimchi/control/vm/hostdevs.py                  |   43 -
 src/kimchi/control/vm/ifaces.py                    |   45 -
 src/kimchi/control/vm/snapshots.py                 |   58 -
 src/kimchi/control/vm/storages.py                  |   45 -
 src/kimchi/control/vms.py                          |   66 -
 src/kimchi/disks.py                                |  197 --
 src/kimchi/distroloader.py                         |   66 -
 src/kimchi/exception.py                            |  102 -
 src/kimchi/i18n.py                                 |  354 ---
 src/kimchi/imageinfo.py                            |   72 -
 src/kimchi/iscsi.py                                |   88 -
 src/kimchi/isoinfo.py                              |  506 ----
 src/kimchi/kvmusertests.py                         |   79 -
 src/kimchi/mockmodel.py                            |  625 ----
 src/kimchi/model/Makefile.am                       |   25 -
 src/kimchi/model/config.py                         |  175 --
 src/kimchi/model/cpuinfo.py                        |  126 -
 src/kimchi/model/debugreports.py                   |  211 --
 src/kimchi/model/diskutils.py                      |   75 -
 src/kimchi/model/featuretests.py                   |  259 --
 src/kimchi/model/groups.py                         |   67 -
 src/kimchi/model/host.py                           |  476 ---
 src/kimchi/model/hostdev.py                        |  323 --
 src/kimchi/model/interfaces.py                     |   43 -
 src/kimchi/model/libvirtconnection.py              |  137 -
 src/kimchi/model/libvirtstoragepool.py             |  264 --
 src/kimchi/model/model.py                          |   51 -
 src/kimchi/model/networks.py                       |  382 ---
 src/kimchi/model/peers.py                          |   72 -
 src/kimchi/model/plugins.py                        |   28 -
 src/kimchi/model/storagepools.py                   |  489 ---
 src/kimchi/model/storageservers.py                 |   80 -
 src/kimchi/model/storagetargets.py                 |  121 -
 src/kimchi/model/storagevolumes.py                 |  541 ----
 src/kimchi/model/tasks.py                          |   64 -
 src/kimchi/model/templates.py                      |  303 --
 src/kimchi/model/users.py                          |   90 -
 src/kimchi/model/utils.py                          |  160 -
 src/kimchi/model/vmhostdevs.py                     |  336 ---
 src/kimchi/model/vmifaces.py                       |  186 --
 src/kimchi/model/vms.py                            | 1300 --------
 src/kimchi/model/vmsnapshots.py                    |  204 --
 src/kimchi/model/vmstorages.py                     |  251 --
 src/kimchi/objectstore.py                          |  133 -
 src/kimchi/osinfo.py                               |  213 --
 src/kimchi/proxy.py                                |  105 -
 src/kimchi/repositories.py                         |  529 ----
 src/kimchi/root.py                                 |  149 -
 src/kimchi/scan.py                                 |   89 -
 src/kimchi/screenshot.py                           |  184 --
 src/kimchi/server.py                               |  188 --
 src/kimchi/sslcert.py                              |   91 -
 src/kimchi/swupdate.py                             |  262 --
 src/kimchi/template.py                             |  111 -
 src/kimchi/utils.py                                |  549 ----
 src/kimchi/vmtemplate.py                           |  430 ---
 src/kimchi/vnc.py                                  |   78 -
 src/kimchi/xmlutils/Makefile.am                    |   25 -
 src/kimchi/xmlutils/disk.py                        |  164 -
 src/kimchi/xmlutils/graphics.py                    |   46 -
 src/kimchi/xmlutils/interface.py                   |   62 -
 src/kimchi/xmlutils/network.py                     |  123 -
 src/kimchi/yumparser.py                            |  283 --
 src/kimchid.in                                     |   99 -
 src/nginx/Makefile.am                              |    6 +-
 src/nginx/kimchi.conf.in                           |   78 -
 src/nginx/wok.conf.in                              |   78 +
 src/wok.conf.in                                    |   65 +
 src/wok/API.json                                   |    6 +
 src/wok/Makefile.am                                |   61 +
 src/{kimchi => wok}/__init__.py                    |    0
 src/wok/asynctask.py                               |   74 +
 src/wok/auth.py                                    |  352 +++
 src/{kimchi => wok}/basemodel.py                   |    0
 src/wok/cachebust.py                               |   35 +
 src/wok/config.py.in                               |  202 ++
 src/wok/control/Makefile.am                        |   25 +
 src/wok/control/__init__.py                        |   26 +
 src/wok/control/base.py                            |  381 +++
 src/wok/control/plugins.py                         |   27 +
 src/wok/control/utils.py                           |  147 +
 src/wok/exception.py                               |  102 +
 src/wok/i18n.py                                    |   47 +
 src/wok/model/Makefile.am                          |   25 +
 src/{kimchi => wok}/model/__init__.py              |    0
 src/wok/model/model.py                             |   49 +
 src/wok/model/plugins.py                           |   28 +
 src/{kimchi => wok}/netinfo.py                     |    0
 src/{kimchi => wok}/network.py                     |    0
 src/wok/objectstore.py                             |  132 +
 src/wok/proxy.py                                   |  105 +
 src/{kimchi => wok}/rollbackcontext.py             |    0
 src/wok/root.py                                    |  148 +
 src/wok/server.py                                  |  203 ++
 src/wok/sslcert.py                                 |   89 +
 src/wok/template.py                                |  112 +
 src/wok/utils.py                                   |  533 ++++
 src/wok/vnc.py                                     |   77 +
 src/wok/xmlutils/Makefile.am                       |   25 +
 src/{kimchi/model => wok/xmlutils}/__init__.py     |    0
 src/{kimchi => wok}/xmlutils/utils.py              |    0
 src/wokd.in                                        |   99 +
 tests/Makefile.am                                  |   50 -
 tests/iso_gen.py                                   |  211 --
 tests/run_tests.sh.in                              |   55 -
 tests/test_authorization.py                        |  166 -
 tests/test_config.py.in                            |  196 --
 tests/test_exception.py                            |  112 -
 tests/test_host.py                                 |  192 --
 tests/test_mock_network.py                         |   71 -
 tests/test_mock_storagepool.py                     |  141 -
 tests/test_mock_storagevolume.py                   |   94 -
 tests/test_mockmodel.py                            |  138 -
 tests/test_model.py                                | 1228 --------
 tests/test_model_network.py                        |  144 -
 tests/test_model_storagepool.py                    |  114 -
 tests/test_model_storagevolume.py                  |  269 --
 tests/test_networkxml.py                           |  171 --
 tests/test_objectstore.py                          |   96 -
 tests/test_osinfo.py                               |   70 -
 tests/test_plugin.py                               |  128 -
 tests/test_rest.py                                 | 1208 --------
 tests/test_rollbackcontext.py                      |   99 -
 tests/test_server.py                               |  287 --
 tests/test_storagepoolxml.py                       |  171 --
 tests/test_template.py                             |  362 ---
 tests/test_utils.py                                |   69 -
 tests/test_vmtemplate.py                           |  116 -
 tests/test_yumparser.py                            |  161 -
 tests/utils.py                                     |  260 --
 ui/Makefile.am                                     |    4 +-
 ui/css/Makefile.am                                 |    2 +-
 ui/css/theme-default/button.css                    |   85 -
 ui/css/theme-default/grid.css                      |    2 +-
 ui/css/theme-default/guest-edit.css                |  424 ---
 ui/css/theme-default/host.css                      |  287 --
 ui/css/theme-default/list.css                      |  326 --
 ui/css/theme-default/network.css                   |  267 --
 ui/css/theme-default/report-rename.css             |   39 -
 ui/css/theme-default/storage.css                   |  554 ----
 ui/css/theme-default/template_add.css              |  317 --
 ui/css/theme-default/topbar.css                    |    4 +
 ui/fontello/Makefile.am                            |   22 +
 ui/fontello/css/Makefile.am                        |   20 +
 ui/fontello/font/Makefile.am                       |   20 +
 ui/images/Makefile.am                              |    4 +-
 ui/images/theme-default/Makefile.am                |    2 +-
 .../{kimchi-loading.gif => wok-loading.gif}        |  Bin 6181 -> 6181 bytes
 ui/js/Makefile.am                                  |    8 +-
 ui/js/src/kimchi.api.js                            | 1411 ---------
 ui/js/src/kimchi.cookie.js                         |   40 -
 ui/js/src/kimchi.grid.js                           |  528 ----
 ui/js/src/kimchi.guest_add_main.js                 |   86 -
 ui/js/src/kimchi.guest_edit_main.js                |  759 -----
 ui/js/src/kimchi.guest_main.js                     |  511 ----
 ui/js/src/kimchi.guest_media_main.js               |   56 -
 ui/js/src/kimchi.guest_storage_add.main.js         |  199 --
 ui/js/src/kimchi.host.js                           |  856 ------
 ui/js/src/kimchi.lang.js                           |   50 -
 ui/js/src/kimchi.line-chart.js                     |  202 --
 ui/js/src/kimchi.login.js                          |   72 -
 ui/js/src/kimchi.main.js                           |  366 ---
 ui/js/src/kimchi.message.js                        |  116 -
 ui/js/src/kimchi.network.js                        |  442 ---
 ui/js/src/kimchi.popable.js                        |   34 -
 ui/js/src/kimchi.report_add_main.js                |   72 -
 ui/js/src/kimchi.report_rename_main.js             |   66 -
 ui/js/src/kimchi.repository_add_main.js            |   96 -
 ui/js/src/kimchi.repository_edit_main.js           |   74 -
 ui/js/src/kimchi.select.js                         |   50 -
 ui/js/src/kimchi.storage_main.js                   |  428 ---
 ui/js/src/kimchi.storagepool_add_main.js           |  414 ---
 ui/js/src/kimchi.storagepool_add_volume_main.js    |  179 --
 ui/js/src/kimchi.substitute.js                     |   45 -
 ui/js/src/kimchi.template_add_main.js              |  441 ---
 ui/js/src/kimchi.template_edit_main.js             |  343 ---
 ui/js/src/kimchi.template_main.js                  |  111 -
 ui/js/src/kimchi.topic.js                          |   48 -
 ui/js/src/kimchi.user.js                           |   43 -
 ui/js/src/kimchi.utils.js                          |  193 --
 ui/js/src/kimchi.window.js                         |   70 -
 ui/js/src/wok.api.js                               |   91 +
 ui/js/src/wok.cookie.js                            |   40 +
 ui/js/src/{kimchi.form.js => wok.form.js}          |    0
 ui/js/src/wok.grid.js                              |  528 ++++
 ui/js/src/wok.lang.js                              |   50 +
 ui/js/src/wok.line-chart.js                        |  202 ++
 ui/js/src/wok.login.js                             |   72 +
 ui/js/src/wok.main.js                              |  355 +++
 ui/js/src/wok.message.js                           |  116 +
 ui/js/src/{kimchi.object.js => wok.object.js}      |    0
 ui/js/src/wok.popable.js                           |   34 +
 ui/js/src/wok.select.js                            |   50 +
 ui/js/src/{kimchi.string.js => wok.string.js}      |    0
 ui/js/src/wok.substitute.js                        |   45 +
 ui/js/src/wok.topic.js                             |   48 +
 ui/js/src/wok.user.js                              |   43 +
 ui/js/src/wok.utils.js                             |  193 ++
 ui/js/src/wok.window.js                            |   70 +
 ui/js/widgets/button-dropDown.js                   |    2 +-
 ui/js/widgets/button-flat.js                       |    2 +-
 ui/js/widgets/checkbox-flat.js                     |    4 +-
 ui/js/widgets/circleGauge.js                       |    4 +-
 ui/js/widgets/combobox.js                          |    2 +-
 ui/js/widgets/dialog-flat.js                       |    4 +-
 ui/js/widgets/filter-select.js                     |    2 +-
 ui/js/widgets/gauge-flat.js                        |    2 +-
 ui/js/widgets/grid.js                              |    2 +-
 ui/js/widgets/line.js                              |    2 +-
 ui/js/widgets/list-flat.js                         |    4 +-
 ui/js/widgets/menu-flat.js                         |    4 +-
 ui/js/widgets/message-flat.js                      |    4 +-
 ui/js/widgets/messagebar-flat.js                   |    4 +-
 ui/js/widgets/radio-flat.js                        |    4 +-
 ui/js/widgets/samples/grid.html                    |    4 +-
 ui/js/widgets/samples/line.html                    |    4 +-
 ui/js/widgets/samples/tabs.html                    |    4 +-
 ui/js/widgets/select-menu.js                       |    2 +-
 ui/js/widgets/selectmenu-flat.js                   |    4 +-
 ui/js/widgets/textbox-flat.js                      |    4 +-
 ui/libs/Makefile.am                                |    2 +-
 ui/libs/themes/base/Makefile.am                    |    2 +-
 ui/libs/themes/base/images/Makefile.am             |    2 +-
 ui/pages/Makefile.am                               |    4 +-
 ui/pages/error.html.tmpl                           |    8 +-
 ui/pages/guest-add.html.tmpl                       |   98 -
 ui/pages/guest-storage-add.html.tmpl               |  103 -
 ui/pages/guest.html.tmpl                           |   77 -
 ui/pages/help/Makefile.am                          |   35 -
 ui/pages/help/de_DE/Makefile.am                    |   23 -
 ui/pages/help/en_US/Makefile.am                    |   23 -
 ui/pages/help/es_ES/Makefile.am                    |   23 -
 ui/pages/help/fr_FR/Makefile.am                    |   23 -
 ui/pages/help/gen-index.py                         |   63 -
 ui/pages/help/it_IT/Makefile.am                    |   23 -
 ui/pages/help/ja_JP/Makefile.am                    |   23 -
 ui/pages/help/ko_KR/Makefile.am                    |   23 -
 ui/pages/help/pt_BR/Makefile.am                    |   23 -
 ui/pages/help/ru_RU/Makefile.am                    |   23 -
 ui/pages/help/zh_CN/Makefile.am                    |   23 -
 ui/pages/help/zh_TW/Makefile.am                    |   23 -
 ui/pages/i18n.json.tmpl                            |    2 +-
 ui/pages/kimchi-ui.html.tmpl                       |  143 -
 ui/pages/login.html.tmpl                           |    8 +-
 ui/pages/report-add.html.tmpl                      |   56 -
 ui/pages/report-rename.html.tmpl                   |   56 -
 ui/pages/repository-add.html.tmpl                  |  113 -
 ui/pages/repository-edit.html.tmpl                 |  117 -
 ui/pages/storagepool-add-volume.html.tmpl          |   79 -
 ui/pages/storagepool-add.html.tmpl                 |  186 --
 ui/pages/tabs/Makefile.am                          |   20 -
 ui/pages/tabs/guests.html.tmpl                     |   56 -
 ui/pages/tabs/host.html.tmpl                       |  168 --
 ui/pages/tabs/network.html.tmpl                    |  129 -
 ui/pages/tabs/storage.html.tmpl                    |  139 -
 ui/pages/tabs/templates.html.tmpl                  |   73 -
 ui/pages/template-add.html.tmpl                    |  233 --
 ui/pages/template-edit.html.tmpl                   |  193 --
 ui/pages/websockify/Makefile.am                    |    2 +-
 ui/pages/websockify/console.html                   |   12 +-
 ui/pages/wok-ui.html.tmpl                          |  143 +
 ui/spice-html5/Makefile.am                         |   25 -
 ui/spice-html5/css/Makefile.am                     |   20 -
 ui/spice-html5/pages/Makefile.am                   |   20 -
 ui/spice-html5/pages/spice_auto.html               |  200 --
 ui/spice-html5/thirdparty/Makefile.am              |   20 -
 722 files changed, 82954 insertions(+), 58514 deletions(-)
 delete mode 100644 config/Makefile.am
 delete mode 100644 config/ui/Makefile.am
 delete mode 100644 config/ui/tabs.xml
 delete mode 100644 contrib/kimchi.spec.fedora.in
 delete mode 100644 contrib/kimchi.spec.suse.in
 delete mode 100644 contrib/kimchid-upstart.conf.debian
 delete mode 100644 contrib/kimchid-upstart.conf.fedora
 delete mode 100644 contrib/kimchid.service.fedora
 delete mode 100644 contrib/kimchid.sysvinit
 create mode 100644 contrib/wok.spec.fedora.in
 create mode 100644 contrib/wok.spec.suse.in
 create mode 100644 contrib/wokd-upstart.conf.debian
 create mode 100644 contrib/wokd-upstart.conf.fedora
 create mode 100644 contrib/wokd.service.fedora
 create mode 100644 contrib/wokd.sysvinit
 delete mode 100644 docs/README-federation.md
 rename docs/{kimchid.8.in => wokd.8.in} (100%)
 create mode 100644 plugins/kimchi/.gitignore
 create mode 100644 plugins/kimchi/API.json
 create mode 100644 plugins/kimchi/INSTALL
 create mode 100644 plugins/kimchi/Makefile.am
 create mode 120000 plugins/kimchi/README.md
 create mode 100644 plugins/kimchi/VERSION
 create mode 100644 plugins/kimchi/__init__.py
 create mode 100755 plugins/kimchi/autogen.sh
 create mode 100644 plugins/kimchi/build-aux/config.rpath
 create mode 100755 plugins/kimchi/build-aux/genChangelog
 create mode 100755 plugins/kimchi/build-aux/pkg-version
 create mode 100644 plugins/kimchi/config.py.in
 create mode 100644 plugins/kimchi/config.rpath
 create mode 100644 plugins/kimchi/configure.ac
 create mode 100644 plugins/kimchi/contrib/DEBIAN/Makefile.am
 create mode 100644 plugins/kimchi/contrib/DEBIAN/control.in
 create mode 100644 plugins/kimchi/contrib/Makefile.am
 create mode 100755 plugins/kimchi/contrib/check_i18n.py
 create mode 100644 plugins/kimchi/contrib/kimchi.spec.fedora.in
 create mode 100644 plugins/kimchi/contrib/kimchi.spec.suse.in
 copy {contrib => plugins/kimchi/contrib}/make-deb.sh.in (100%)
 create mode 100644 plugins/kimchi/control/Makefile.am
 create mode 100644 plugins/kimchi/control/__init__.py
 create mode 100644 plugins/kimchi/control/config.py
 create mode 100644 plugins/kimchi/control/cpuinfo.py
 create mode 100644 plugins/kimchi/control/debugreports.py
 create mode 100644 plugins/kimchi/control/groups.py
 create mode 100644 plugins/kimchi/control/host.py
 create mode 100644 plugins/kimchi/control/interfaces.py
 create mode 100644 plugins/kimchi/control/networks.py
 create mode 100644 plugins/kimchi/control/peers.py
 create mode 100644 plugins/kimchi/control/storagepools.py
 create mode 100644 plugins/kimchi/control/storageservers.py
 create mode 100644 plugins/kimchi/control/storagevolumes.py
 create mode 100644 plugins/kimchi/control/tasks.py
 create mode 100644 plugins/kimchi/control/templates.py
 create mode 100644 plugins/kimchi/control/users.py
 create mode 100644 plugins/kimchi/control/vm/Makefile.am
 create mode 100644 plugins/kimchi/control/vm/__init__.py
 create mode 100644 plugins/kimchi/control/vm/hostdevs.py
 create mode 100644 plugins/kimchi/control/vm/ifaces.py
 create mode 100644 plugins/kimchi/control/vm/snapshots.py
 create mode 100644 plugins/kimchi/control/vm/storages.py
 create mode 100644 plugins/kimchi/control/vms.py
 create mode 100644 plugins/kimchi/disks.py
 create mode 100644 plugins/kimchi/distroloader.py
 rename {src => plugins/kimchi}/distros.d/Makefile.am (100%)
 rename {src => plugins/kimchi}/distros.d/debian.json (100%)
 rename {src => plugins/kimchi}/distros.d/fedora.json (100%)
 rename {src => plugins/kimchi}/distros.d/gentoo.json (100%)
 rename {src => plugins/kimchi}/distros.d/opensuse.json (100%)
 rename {src => plugins/kimchi}/distros.d/ubuntu.json (100%)
 create mode 100644 plugins/kimchi/docs/API.md
 create mode 100644 plugins/kimchi/docs/Makefile.am
 create mode 100644 plugins/kimchi/docs/README-federation.md
 create mode 100644 plugins/kimchi/docs/README.md
 rename {docs => plugins/kimchi/docs}/kimchi-guest.png (100%)
 rename {docs => plugins/kimchi/docs}/kimchi-login.png (100%)
 rename {docs => plugins/kimchi/docs}/kimchi-templates.png (100%)
 create mode 100644 plugins/kimchi/i18n.py
 create mode 100644 plugins/kimchi/imageinfo.py
 create mode 100644 plugins/kimchi/iscsi.py
 create mode 100644 plugins/kimchi/isoinfo.py
 create mode 100644 plugins/kimchi/kimchi.conf
 create mode 100644 plugins/kimchi/kvmusertests.py
 create mode 100644 plugins/kimchi/m4/ac_python_module.m4
 create mode 100644 plugins/kimchi/m4/gettext.m4
 create mode 100644 plugins/kimchi/m4/iconv.m4
 create mode 100644 plugins/kimchi/m4/intlmacosx.m4
 create mode 100644 plugins/kimchi/m4/lib-ld.m4
 create mode 100644 plugins/kimchi/m4/lib-link.m4
 create mode 100644 plugins/kimchi/m4/lib-prefix.m4
 create mode 100644 plugins/kimchi/m4/nls.m4
 create mode 100644 plugins/kimchi/m4/po.m4
 create mode 100644 plugins/kimchi/m4/progtest.m4
 create mode 100644 plugins/kimchi/mockmodel.py
 create mode 100644 plugins/kimchi/model/Makefile.am
 copy {src => plugins}/kimchi/model/__init__.py (100%)
 create mode 100644 plugins/kimchi/model/config.py
 create mode 100644 plugins/kimchi/model/cpuinfo.py
 create mode 100644 plugins/kimchi/model/debugreports.py
 create mode 100644 plugins/kimchi/model/diskutils.py
 create mode 100644 plugins/kimchi/model/featuretests.py
 create mode 100644 plugins/kimchi/model/groups.py
 create mode 100644 plugins/kimchi/model/host.py
 create mode 100644 plugins/kimchi/model/hostdev.py
 create mode 100644 plugins/kimchi/model/interfaces.py
 create mode 100644 plugins/kimchi/model/libvirtconnection.py
 create mode 100644 plugins/kimchi/model/libvirtstoragepool.py
 create mode 100644 plugins/kimchi/model/model.py
 create mode 100644 plugins/kimchi/model/networks.py
 create mode 100644 plugins/kimchi/model/peers.py
 create mode 100644 plugins/kimchi/model/storagepools.py
 create mode 100644 plugins/kimchi/model/storageservers.py
 create mode 100644 plugins/kimchi/model/storagetargets.py
 create mode 100644 plugins/kimchi/model/storagevolumes.py
 create mode 100644 plugins/kimchi/model/tasks.py
 create mode 100644 plugins/kimchi/model/templates.py
 create mode 100644 plugins/kimchi/model/users.py
 create mode 100644 plugins/kimchi/model/utils.py
 create mode 100644 plugins/kimchi/model/vmhostdevs.py
 create mode 100644 plugins/kimchi/model/vmifaces.py
 create mode 100644 plugins/kimchi/model/vms.py
 create mode 100644 plugins/kimchi/model/vmsnapshots.py
 create mode 100644 plugins/kimchi/model/vmstorages.py
 create mode 100644 plugins/kimchi/osinfo.py
 create mode 100644 plugins/kimchi/po/LINGUAS
 create mode 100644 plugins/kimchi/po/Makefile.in.in
 copy {po => plugins/kimchi/po}/Makevars (100%)
 create mode 100644 plugins/kimchi/po/POTFILES.in
 create mode 100644 plugins/kimchi/po/de_DE.po
 create mode 100644 plugins/kimchi/po/en_US.po
 create mode 100644 plugins/kimchi/po/es_ES.po
 create mode 100644 plugins/kimchi/po/fr_FR.po
 copy {po => plugins/kimchi/po}/gen-pot.in (100%)
 create mode 100644 plugins/kimchi/po/it_IT.po
 create mode 100644 plugins/kimchi/po/ja_JP.po
 create mode 100755 plugins/kimchi/po/kimchi.pot
 create mode 100644 plugins/kimchi/po/ko_KR.po
 create mode 100644 plugins/kimchi/po/pt_BR.po
 create mode 100644 plugins/kimchi/po/ru_RU.po
 create mode 100644 plugins/kimchi/po/zh_CN.po
 create mode 100644 plugins/kimchi/po/zh_TW.po
 create mode 100644 plugins/kimchi/repositories.py
 create mode 100644 plugins/kimchi/root.py
 create mode 100644 plugins/kimchi/scan.py
 create mode 100644 plugins/kimchi/screenshot.py
 create mode 100644 plugins/kimchi/swupdate.py
 rename {src => plugins/kimchi}/template.conf (100%)
 create mode 100644 plugins/kimchi/tests/Makefile.am
 create mode 100644 plugins/kimchi/tests/iso_gen.py
 create mode 100644 plugins/kimchi/tests/run_tests.sh.in
 create mode 100644 plugins/kimchi/tests/test_authorization.py
 create mode 100644 plugins/kimchi/tests/test_config.py.in
 create mode 100644 plugins/kimchi/tests/test_exception.py
 create mode 100644 plugins/kimchi/tests/test_host.py
 create mode 100644 plugins/kimchi/tests/test_mock_network.py
 create mode 100644 plugins/kimchi/tests/test_mock_storagepool.py
 create mode 100644 plugins/kimchi/tests/test_mock_storagevolume.py
 create mode 100644 plugins/kimchi/tests/test_mockmodel.py
 create mode 100644 plugins/kimchi/tests/test_model.py
 create mode 100644 plugins/kimchi/tests/test_model_network.py
 create mode 100644 plugins/kimchi/tests/test_model_storagepool.py
 create mode 100644 plugins/kimchi/tests/test_model_storagevolume.py
 create mode 100644 plugins/kimchi/tests/test_networkxml.py
 create mode 100644 plugins/kimchi/tests/test_objectstore.py
 create mode 100644 plugins/kimchi/tests/test_osinfo.py
 create mode 100644 plugins/kimchi/tests/test_plugin.py
 create mode 100644 plugins/kimchi/tests/test_rest.py
 create mode 100644 plugins/kimchi/tests/test_rollbackcontext.py
 create mode 100644 plugins/kimchi/tests/test_server.py
 create mode 100644 plugins/kimchi/tests/test_storagepoolxml.py
 create mode 100644 plugins/kimchi/tests/test_template.py
 create mode 100644 plugins/kimchi/tests/test_utils.py
 create mode 100644 plugins/kimchi/tests/test_vmtemplate.py
 create mode 100644 plugins/kimchi/tests/test_yumparser.py
 create mode 100644 plugins/kimchi/tests/utils.py
 create mode 100644 plugins/kimchi/ui/Makefile.am
 create mode 100644 plugins/kimchi/ui/config/Makefile.am
 create mode 100644 plugins/kimchi/ui/config/tab-ext.xml
 create mode 100644 plugins/kimchi/ui/css/Makefile.am
 create mode 100644 plugins/kimchi/ui/css/theme-default/guest-edit.css
 rename {ui => plugins/kimchi/ui}/css/theme-default/guest-storage-add.css (100%)
 create mode 100644 plugins/kimchi/ui/css/theme-default/host.css
 create mode 100644 plugins/kimchi/ui/css/theme-default/icon.css
 create mode 100644 plugins/kimchi/ui/css/theme-default/list.css
 create mode 100644 plugins/kimchi/ui/css/theme-default/network.css
 rename {ui => plugins/kimchi/ui}/css/theme-default/report-add.css (100%)
 create mode 100644 plugins/kimchi/ui/css/theme-default/report-rename.css
 rename {ui => plugins/kimchi/ui}/css/theme-default/repository-add.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/repository-edit.css (100%)
 create mode 100644 plugins/kimchi/ui/css/theme-default/storage.css
 rename {ui => plugins/kimchi/ui}/css/theme-default/storagepool-add-volume.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/template-edit.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/template.css (100%)
 create mode 100644 plugins/kimchi/ui/css/theme-default/template_add.css
 rename {ui => plugins/kimchi/ui}/css/theme-default/template_list.css (100%)
 create mode 100644 plugins/kimchi/ui/images/Makefile.am
 rename {ui => plugins/kimchi/ui}/images/icon-centos.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-debian.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-fedora.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-gentoo.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-opensuse.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-ubuntu.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-vm.png (100%)
 create mode 100644 plugins/kimchi/ui/images/logo.ico
 create mode 100644 plugins/kimchi/ui/images/theme-default/Makefile.am
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac22_pause.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac22_pause_grey.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac24_resume.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac24_resume_grey.png (100%)
 create mode 100644 plugins/kimchi/ui/images/theme-default/arrow-down-black.png
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-down-disable.png (100%)
 create mode 100644 plugins/kimchi/ui/images/theme-default/arrow-down.png
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-up.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow_out.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/group.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/host-icon-sprite.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-back.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-camera.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-design.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-detail.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-iso.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-list.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-load.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-local.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-power-down.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-power-up.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-qcow2.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-raw.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-remote.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-reset.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-search.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-sort.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-tree.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-user.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-volume-default.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/kimchi-loading15x15.gif (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/loading.gif (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/user.png (100%)
 create mode 100644 plugins/kimchi/ui/js/Makefile.am
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.api.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.host.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.network.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.report_add_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.storage_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.template_add_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
 create mode 100644 plugins/kimchi/ui/js/src/kimchi.template_main.js
 create mode 100644 plugins/kimchi/ui/pages/Makefile.am
 create mode 100644 plugins/kimchi/ui/pages/guest-add.html.tmpl
 rename {ui => plugins/kimchi/ui}/pages/guest-edit.html.tmpl (100%)
 create mode 100644 plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/guest.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/guests.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/help/Makefile.am
 create mode 100644 plugins/kimchi/ui/pages/help/de_DE/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/dita-help.xsl (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/en_US/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/es_ES/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/it_IT/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/kimchi.css (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/templates.dita (100%)
 create mode 100644 plugins/kimchi/ui/pages/host.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/i18n.json.tmpl
 create mode 100644 plugins/kimchi/ui/pages/network.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/report-add.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/report-rename.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/repository-add.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/repository-edit.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/storage.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/storagepool-add.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/template-add.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/template-edit.html.tmpl
 create mode 100644 plugins/kimchi/ui/pages/templates.html.tmpl
 create mode 100644 plugins/kimchi/ui/robots.txt
 create mode 100644 plugins/kimchi/ui/spice-html5/Makefile.am
 rename {ui => plugins/kimchi/ui}/spice-html5/atKeynames.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/bitmap.js (100%)
 create mode 100644 plugins/kimchi/ui/spice-html5/css/Makefile.am
 rename {ui => plugins/kimchi/ui}/spice-html5/css/spice.css (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/cursor.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/display.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/enums.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/inputs.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/lz.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/main.js (100%)
 create mode 100644 plugins/kimchi/ui/spice-html5/pages/Makefile.am
 create mode 100644 plugins/kimchi/ui/spice-html5/pages/spice_auto.html
 rename {ui => plugins/kimchi/ui}/spice-html5/playback.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/png.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/quic.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/resize.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/simulatecursor.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicearraybuffer.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spiceconn.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicedataview.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicemsg.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicetype.js (100%)
 create mode 100644 plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/jsbn.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/prng4.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/rng.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/rsa.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/sha1.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/ticket.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/utils.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/webm.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/wire.js (100%)
 create mode 100644 plugins/kimchi/utils.py
 create mode 100644 plugins/kimchi/vmtemplate.py
 create mode 100644 plugins/kimchi/xmlutils/Makefile.am
 rename {src => plugins}/kimchi/xmlutils/__init__.py (100%)
 rename {src => plugins}/kimchi/xmlutils/cpu.py (100%)
 create mode 100644 plugins/kimchi/xmlutils/disk.py
 create mode 100644 plugins/kimchi/xmlutils/graphics.py
 create mode 100644 plugins/kimchi/xmlutils/interface.py
 create mode 100644 plugins/kimchi/xmlutils/network.py
 rename {src => plugins}/kimchi/xmlutils/qemucmdline.py (100%)
 create mode 100644 plugins/kimchi/yumparser.py
 delete mode 100755 po/kimchi.pot
 create mode 100755 po/wok.pot
 delete mode 100644 src/kimchi.conf.in
 delete mode 100644 src/kimchi/API.json
 delete mode 100644 src/kimchi/Makefile.am
 delete mode 100644 src/kimchi/asynctask.py
 delete mode 100644 src/kimchi/auth.py
 delete mode 100644 src/kimchi/cachebust.py
 delete mode 100644 src/kimchi/config.py.in
 delete mode 100644 src/kimchi/control/Makefile.am
 delete mode 100644 src/kimchi/control/__init__.py
 delete mode 100644 src/kimchi/control/base.py
 delete mode 100644 src/kimchi/control/config.py
 delete mode 100644 src/kimchi/control/cpuinfo.py
 delete mode 100644 src/kimchi/control/debugreports.py
 delete mode 100644 src/kimchi/control/groups.py
 delete mode 100644 src/kimchi/control/host.py
 delete mode 100644 src/kimchi/control/interfaces.py
 delete mode 100644 src/kimchi/control/networks.py
 delete mode 100644 src/kimchi/control/peers.py
 delete mode 100644 src/kimchi/control/plugins.py
 delete mode 100644 src/kimchi/control/storagepools.py
 delete mode 100644 src/kimchi/control/storageservers.py
 delete mode 100644 src/kimchi/control/storagevolumes.py
 delete mode 100644 src/kimchi/control/tasks.py
 delete mode 100644 src/kimchi/control/templates.py
 delete mode 100644 src/kimchi/control/users.py
 delete mode 100644 src/kimchi/control/utils.py
 delete mode 100644 src/kimchi/control/vm/Makefile.am
 delete mode 100644 src/kimchi/control/vm/__init__.py
 delete mode 100644 src/kimchi/control/vm/hostdevs.py
 delete mode 100644 src/kimchi/control/vm/ifaces.py
 delete mode 100644 src/kimchi/control/vm/snapshots.py
 delete mode 100644 src/kimchi/control/vm/storages.py
 delete mode 100644 src/kimchi/control/vms.py
 delete mode 100644 src/kimchi/disks.py
 delete mode 100644 src/kimchi/distroloader.py
 delete mode 100644 src/kimchi/exception.py
 delete mode 100644 src/kimchi/i18n.py
 delete mode 100644 src/kimchi/imageinfo.py
 delete mode 100644 src/kimchi/iscsi.py
 delete mode 100644 src/kimchi/isoinfo.py
 delete mode 100644 src/kimchi/kvmusertests.py
 delete mode 100644 src/kimchi/mockmodel.py
 delete mode 100644 src/kimchi/model/Makefile.am
 delete mode 100644 src/kimchi/model/config.py
 delete mode 100644 src/kimchi/model/cpuinfo.py
 delete mode 100644 src/kimchi/model/debugreports.py
 delete mode 100644 src/kimchi/model/diskutils.py
 delete mode 100644 src/kimchi/model/featuretests.py
 delete mode 100644 src/kimchi/model/groups.py
 delete mode 100644 src/kimchi/model/host.py
 delete mode 100644 src/kimchi/model/hostdev.py
 delete mode 100644 src/kimchi/model/interfaces.py
 delete mode 100644 src/kimchi/model/libvirtconnection.py
 delete mode 100644 src/kimchi/model/libvirtstoragepool.py
 delete mode 100644 src/kimchi/model/model.py
 delete mode 100644 src/kimchi/model/networks.py
 delete mode 100644 src/kimchi/model/peers.py
 delete mode 100644 src/kimchi/model/plugins.py
 delete mode 100644 src/kimchi/model/storagepools.py
 delete mode 100644 src/kimchi/model/storageservers.py
 delete mode 100644 src/kimchi/model/storagetargets.py
 delete mode 100644 src/kimchi/model/storagevolumes.py
 delete mode 100644 src/kimchi/model/tasks.py
 delete mode 100644 src/kimchi/model/templates.py
 delete mode 100644 src/kimchi/model/users.py
 delete mode 100644 src/kimchi/model/utils.py
 delete mode 100644 src/kimchi/model/vmhostdevs.py
 delete mode 100644 src/kimchi/model/vmifaces.py
 delete mode 100644 src/kimchi/model/vms.py
 delete mode 100644 src/kimchi/model/vmsnapshots.py
 delete mode 100644 src/kimchi/model/vmstorages.py
 delete mode 100644 src/kimchi/objectstore.py
 delete mode 100644 src/kimchi/osinfo.py
 delete mode 100644 src/kimchi/proxy.py
 delete mode 100644 src/kimchi/repositories.py
 delete mode 100644 src/kimchi/root.py
 delete mode 100644 src/kimchi/scan.py
 delete mode 100644 src/kimchi/screenshot.py
 delete mode 100644 src/kimchi/server.py
 delete mode 100644 src/kimchi/sslcert.py
 delete mode 100644 src/kimchi/swupdate.py
 delete mode 100644 src/kimchi/template.py
 delete mode 100644 src/kimchi/utils.py
 delete mode 100644 src/kimchi/vmtemplate.py
 delete mode 100644 src/kimchi/vnc.py
 delete mode 100644 src/kimchi/xmlutils/Makefile.am
 delete mode 100644 src/kimchi/xmlutils/disk.py
 delete mode 100644 src/kimchi/xmlutils/graphics.py
 delete mode 100644 src/kimchi/xmlutils/interface.py
 delete mode 100644 src/kimchi/xmlutils/network.py
 delete mode 100644 src/kimchi/yumparser.py
 delete mode 100644 src/kimchid.in
 delete mode 100644 src/nginx/kimchi.conf.in
 create mode 100644 src/nginx/wok.conf.in
 create mode 100644 src/wok.conf.in
 create mode 100644 src/wok/API.json
 create mode 100644 src/wok/Makefile.am
 rename src/{kimchi => wok}/__init__.py (100%)
 create mode 100644 src/wok/asynctask.py
 create mode 100644 src/wok/auth.py
 rename src/{kimchi => wok}/basemodel.py (100%)
 create mode 100644 src/wok/cachebust.py
 create mode 100644 src/wok/config.py.in
 create mode 100644 src/wok/control/Makefile.am
 create mode 100644 src/wok/control/__init__.py
 create mode 100644 src/wok/control/base.py
 create mode 100644 src/wok/control/plugins.py
 create mode 100644 src/wok/control/utils.py
 create mode 100644 src/wok/exception.py
 create mode 100644 src/wok/i18n.py
 create mode 100644 src/wok/model/Makefile.am
 copy src/{kimchi => wok}/model/__init__.py (100%)
 create mode 100644 src/wok/model/model.py
 create mode 100644 src/wok/model/plugins.py
 rename src/{kimchi => wok}/netinfo.py (100%)
 rename src/{kimchi => wok}/network.py (100%)
 create mode 100644 src/wok/objectstore.py
 create mode 100644 src/wok/proxy.py
 rename src/{kimchi => wok}/rollbackcontext.py (100%)
 create mode 100644 src/wok/root.py
 create mode 100644 src/wok/server.py
 create mode 100644 src/wok/sslcert.py
 create mode 100644 src/wok/template.py
 create mode 100644 src/wok/utils.py
 create mode 100644 src/wok/vnc.py
 create mode 100644 src/wok/xmlutils/Makefile.am
 rename src/{kimchi/model => wok/xmlutils}/__init__.py (100%)
 rename src/{kimchi => wok}/xmlutils/utils.py (100%)
 create mode 100644 src/wokd.in
 delete mode 100644 tests/Makefile.am
 delete mode 100644 tests/iso_gen.py
 delete mode 100644 tests/run_tests.sh.in
 delete mode 100644 tests/test_authorization.py
 delete mode 100644 tests/test_config.py.in
 delete mode 100644 tests/test_exception.py
 delete mode 100644 tests/test_host.py
 delete mode 100644 tests/test_mock_network.py
 delete mode 100644 tests/test_mock_storagepool.py
 delete mode 100644 tests/test_mock_storagevolume.py
 delete mode 100644 tests/test_mockmodel.py
 delete mode 100644 tests/test_model.py
 delete mode 100644 tests/test_model_network.py
 delete mode 100644 tests/test_model_storagepool.py
 delete mode 100644 tests/test_model_storagevolume.py
 delete mode 100644 tests/test_networkxml.py
 delete mode 100644 tests/test_objectstore.py
 delete mode 100644 tests/test_osinfo.py
 delete mode 100644 tests/test_plugin.py
 delete mode 100644 tests/test_rest.py
 delete mode 100644 tests/test_rollbackcontext.py
 delete mode 100644 tests/test_server.py
 delete mode 100644 tests/test_storagepoolxml.py
 delete mode 100644 tests/test_template.py
 delete mode 100644 tests/test_utils.py
 delete mode 100644 tests/test_vmtemplate.py
 delete mode 100644 tests/test_yumparser.py
 delete mode 100644 tests/utils.py
 delete mode 100644 ui/css/theme-default/guest-edit.css
 delete mode 100644 ui/css/theme-default/host.css
 delete mode 100644 ui/css/theme-default/list.css
 delete mode 100644 ui/css/theme-default/network.css
 delete mode 100644 ui/css/theme-default/report-rename.css
 delete mode 100644 ui/css/theme-default/storage.css
 delete mode 100644 ui/css/theme-default/template_add.css
 create mode 100644 ui/fontello/Makefile.am
 create mode 100644 ui/fontello/css/Makefile.am
 create mode 100644 ui/fontello/font/Makefile.am
 rename ui/images/theme-default/{kimchi-loading.gif => wok-loading.gif} (100%)
 delete mode 100644 ui/js/src/kimchi.api.js
 delete mode 100644 ui/js/src/kimchi.cookie.js
 delete mode 100644 ui/js/src/kimchi.grid.js
 delete mode 100644 ui/js/src/kimchi.guest_add_main.js
 delete mode 100644 ui/js/src/kimchi.guest_edit_main.js
 delete mode 100644 ui/js/src/kimchi.guest_main.js
 delete mode 100644 ui/js/src/kimchi.guest_media_main.js
 delete mode 100644 ui/js/src/kimchi.guest_storage_add.main.js
 delete mode 100644 ui/js/src/kimchi.host.js
 delete mode 100644 ui/js/src/kimchi.lang.js
 delete mode 100644 ui/js/src/kimchi.line-chart.js
 delete mode 100644 ui/js/src/kimchi.login.js
 delete mode 100644 ui/js/src/kimchi.main.js
 delete mode 100644 ui/js/src/kimchi.message.js
 delete mode 100644 ui/js/src/kimchi.network.js
 delete mode 100644 ui/js/src/kimchi.popable.js
 delete mode 100644 ui/js/src/kimchi.report_add_main.js
 delete mode 100644 ui/js/src/kimchi.report_rename_main.js
 delete mode 100644 ui/js/src/kimchi.repository_add_main.js
 delete mode 100644 ui/js/src/kimchi.repository_edit_main.js
 delete mode 100644 ui/js/src/kimchi.select.js
 delete mode 100644 ui/js/src/kimchi.storage_main.js
 delete mode 100644 ui/js/src/kimchi.storagepool_add_main.js
 delete mode 100644 ui/js/src/kimchi.storagepool_add_volume_main.js
 delete mode 100644 ui/js/src/kimchi.substitute.js
 delete mode 100644 ui/js/src/kimchi.template_add_main.js
 delete mode 100644 ui/js/src/kimchi.template_edit_main.js
 delete mode 100644 ui/js/src/kimchi.template_main.js
 delete mode 100644 ui/js/src/kimchi.topic.js
 delete mode 100644 ui/js/src/kimchi.user.js
 delete mode 100644 ui/js/src/kimchi.utils.js
 delete mode 100644 ui/js/src/kimchi.window.js
 create mode 100644 ui/js/src/wok.api.js
 create mode 100644 ui/js/src/wok.cookie.js
 rename ui/js/src/{kimchi.form.js => wok.form.js} (100%)
 create mode 100644 ui/js/src/wok.grid.js
 create mode 100644 ui/js/src/wok.lang.js
 create mode 100644 ui/js/src/wok.line-chart.js
 create mode 100644 ui/js/src/wok.login.js
 create mode 100644 ui/js/src/wok.main.js
 create mode 100644 ui/js/src/wok.message.js
 rename ui/js/src/{kimchi.object.js => wok.object.js} (100%)
 create mode 100644 ui/js/src/wok.popable.js
 create mode 100644 ui/js/src/wok.select.js
 rename ui/js/src/{kimchi.string.js => wok.string.js} (100%)
 create mode 100644 ui/js/src/wok.substitute.js
 create mode 100644 ui/js/src/wok.topic.js
 create mode 100644 ui/js/src/wok.user.js
 create mode 100644 ui/js/src/wok.utils.js
 create mode 100644 ui/js/src/wok.window.js
 delete mode 100644 ui/pages/guest-add.html.tmpl
 delete mode 100644 ui/pages/guest-storage-add.html.tmpl
 delete mode 100644 ui/pages/guest.html.tmpl
 delete mode 100644 ui/pages/help/Makefile.am
 delete mode 100644 ui/pages/help/de_DE/Makefile.am
 delete mode 100644 ui/pages/help/en_US/Makefile.am
 delete mode 100644 ui/pages/help/es_ES/Makefile.am
 delete mode 100644 ui/pages/help/fr_FR/Makefile.am
 delete mode 100755 ui/pages/help/gen-index.py
 delete mode 100644 ui/pages/help/it_IT/Makefile.am
 delete mode 100644 ui/pages/help/ja_JP/Makefile.am
 delete mode 100644 ui/pages/help/ko_KR/Makefile.am
 delete mode 100644 ui/pages/help/pt_BR/Makefile.am
 delete mode 100644 ui/pages/help/ru_RU/Makefile.am
 delete mode 100644 ui/pages/help/zh_CN/Makefile.am
 delete mode 100644 ui/pages/help/zh_TW/Makefile.am
 delete mode 100644 ui/pages/kimchi-ui.html.tmpl
 delete mode 100644 ui/pages/report-add.html.tmpl
 delete mode 100644 ui/pages/report-rename.html.tmpl
 delete mode 100644 ui/pages/repository-add.html.tmpl
 delete mode 100644 ui/pages/repository-edit.html.tmpl
 delete mode 100644 ui/pages/storagepool-add-volume.html.tmpl
 delete mode 100644 ui/pages/storagepool-add.html.tmpl
 delete mode 100644 ui/pages/tabs/Makefile.am
 delete mode 100644 ui/pages/tabs/guests.html.tmpl
 delete mode 100644 ui/pages/tabs/host.html.tmpl
 delete mode 100644 ui/pages/tabs/network.html.tmpl
 delete mode 100644 ui/pages/tabs/storage.html.tmpl
 delete mode 100644 ui/pages/tabs/templates.html.tmpl
 delete mode 100644 ui/pages/template-add.html.tmpl
 delete mode 100644 ui/pages/template-edit.html.tmpl
 create mode 100644 ui/pages/wok-ui.html.tmpl
 delete mode 100644 ui/spice-html5/Makefile.am
 delete mode 100644 ui/spice-html5/css/Makefile.am
 delete mode 100644 ui/spice-html5/pages/Makefile.am
 delete mode 100644 ui/spice-html5/pages/spice_auto.html
 delete mode 100644 ui/spice-html5/thirdparty/Makefile.am



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:34 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:34 -0300
Subject: [Kimchi-devel] [PATCH V3 02/34] Create kimchi plugin
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-3-git-send-email-luciojhc@linux.vnet.ibm.com>

This patch only moves or duplicates files. No code changes.

- Move virtualization layer to plugins/kimchi
- Move kimchi-specific Web UI to plugins/kimchi

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 {src => plugins}/kimchi/API.json                   |    0
 README.md => plugins/kimchi/README.md              |    0
 VERSION => plugins/kimchi/VERSION                  |    0
 .../kimchi/contrib}/DEBIAN/Makefile.am             |    0
 .../kimchi/contrib}/DEBIAN/control.in              |    0
 {contrib => plugins/kimchi/contrib}/Makefile.am    |    0
 .../kimchi/contrib}/kimchi.spec.fedora.in          |    0
 .../kimchi/contrib}/kimchi.spec.suse.in            |    0
 {contrib => plugins/kimchi/contrib}/make-deb.sh.in |    0
 {src => plugins}/kimchi/control/Makefile.am        |    0
 {src => plugins}/kimchi/control/__init__.py        |    0
 {src => plugins}/kimchi/control/config.py          |    0
 {src => plugins}/kimchi/control/cpuinfo.py         |    0
 {src => plugins}/kimchi/control/debugreports.py    |    0
 {src => plugins}/kimchi/control/groups.py          |    0
 {src => plugins}/kimchi/control/host.py            |    0
 {src => plugins}/kimchi/control/interfaces.py      |    0
 {src => plugins}/kimchi/control/networks.py        |    0
 {src => plugins}/kimchi/control/peers.py           |    0
 {src => plugins}/kimchi/control/storagepools.py    |    0
 {src => plugins}/kimchi/control/storageservers.py  |    0
 {src => plugins}/kimchi/control/storagevolumes.py  |    0
 {src => plugins}/kimchi/control/tasks.py           |    0
 {src => plugins}/kimchi/control/templates.py       |    0
 {src => plugins}/kimchi/control/users.py           |    0
 {src => plugins}/kimchi/control/vm/Makefile.am     |    0
 {src => plugins}/kimchi/control/vm/__init__.py     |    0
 {src => plugins}/kimchi/control/vm/hostdevs.py     |    0
 {src => plugins}/kimchi/control/vm/ifaces.py       |    0
 {src => plugins}/kimchi/control/vm/snapshots.py    |    0
 {src => plugins}/kimchi/control/vm/storages.py     |    0
 {src => plugins}/kimchi/control/vms.py             |    0
 {src => plugins}/kimchi/disks.py                   |    0
 {src => plugins}/kimchi/distroloader.py            |    0
 {src => plugins/kimchi}/distros.d/Makefile.am      |    0
 {src => plugins/kimchi}/distros.d/debian.json      |    0
 {src => plugins/kimchi}/distros.d/fedora.json      |    0
 {src => plugins/kimchi}/distros.d/gentoo.json      |    0
 {src => plugins/kimchi}/distros.d/opensuse.json    |    0
 {src => plugins/kimchi}/distros.d/ubuntu.json      |    0
 {docs => plugins/kimchi/docs}/API.md               |    0
 {docs => plugins/kimchi/docs}/Makefile.am          |    0
 {docs => plugins/kimchi/docs}/README-federation.md |    0
 {docs => plugins/kimchi/docs}/README.md            |    0
 {docs => plugins/kimchi/docs}/kimchi-guest.png     |  Bin 192281 -> 192281 bytes
 {docs => plugins/kimchi/docs}/kimchi-login.png     |  Bin 318041 -> 318041 bytes
 {docs => plugins/kimchi/docs}/kimchi-templates.png |  Bin 329678 -> 329678 bytes
 {src => plugins}/kimchi/i18n.py                    |    0
 {src => plugins}/kimchi/imageinfo.py               |    0
 {src => plugins}/kimchi/iscsi.py                   |    0
 {src => plugins}/kimchi/isoinfo.py                 |    0
 {src => plugins}/kimchi/kvmusertests.py            |    0
 {src => plugins}/kimchi/mockmodel.py               |    0
 {src => plugins}/kimchi/model/Makefile.am          |    0
 {src => plugins}/kimchi/model/__init__.py          |    0
 {src => plugins}/kimchi/model/config.py            |    0
 {src => plugins}/kimchi/model/cpuinfo.py           |    0
 {src => plugins}/kimchi/model/debugreports.py      |    0
 {src => plugins}/kimchi/model/diskutils.py         |    0
 {src => plugins}/kimchi/model/featuretests.py      |    0
 {src => plugins}/kimchi/model/groups.py            |    0
 {src => plugins}/kimchi/model/host.py              |    0
 {src => plugins}/kimchi/model/hostdev.py           |    0
 {src => plugins}/kimchi/model/interfaces.py        |    0
 {src => plugins}/kimchi/model/libvirtconnection.py |    0
 .../kimchi/model/libvirtstoragepool.py             |    0
 {src => plugins}/kimchi/model/model.py             |    0
 {src => plugins}/kimchi/model/networks.py          |    0
 {src => plugins}/kimchi/model/peers.py             |    0
 {src => plugins}/kimchi/model/storagepools.py      |    0
 {src => plugins}/kimchi/model/storageservers.py    |    0
 {src => plugins}/kimchi/model/storagetargets.py    |    0
 {src => plugins}/kimchi/model/storagevolumes.py    |    0
 {src => plugins}/kimchi/model/tasks.py             |    0
 {src => plugins}/kimchi/model/templates.py         |    0
 {src => plugins}/kimchi/model/users.py             |    0
 {src => plugins}/kimchi/model/utils.py             |    0
 {src => plugins}/kimchi/model/vmhostdevs.py        |    0
 {src => plugins}/kimchi/model/vmifaces.py          |    0
 {src => plugins}/kimchi/model/vms.py               |    0
 {src => plugins}/kimchi/model/vmsnapshots.py       |    0
 {src => plugins}/kimchi/model/vmstorages.py        |    0
 {src => plugins}/kimchi/osinfo.py                  |    0
 {po => plugins/kimchi/po}/LINGUAS                  |    0
 {po => plugins/kimchi/po}/Makefile.in.in           |    0
 {po => plugins/kimchi/po}/Makevars                 |    0
 {po => plugins/kimchi/po}/POTFILES.in              |    0
 {po => plugins/kimchi/po}/de_DE.po                 |    0
 {po => plugins/kimchi/po}/en_US.po                 |    0
 {po => plugins/kimchi/po}/es_ES.po                 |    0
 {po => plugins/kimchi/po}/fr_FR.po                 |    0
 {po => plugins/kimchi/po}/gen-pot.in               |    0
 {po => plugins/kimchi/po}/it_IT.po                 |    0
 {po => plugins/kimchi/po}/ja_JP.po                 |    0
 {po => plugins/kimchi/po}/kimchi.pot               |    0
 {po => plugins/kimchi/po}/ko_KR.po                 |    0
 {po => plugins/kimchi/po}/pt_BR.po                 |    0
 {po => plugins/kimchi/po}/ru_RU.po                 |    0
 {po => plugins/kimchi/po}/zh_CN.po                 |    0
 {po => plugins/kimchi/po}/zh_TW.po                 |    0
 {src => plugins}/kimchi/repositories.py            |    0
 {src => plugins}/kimchi/scan.py                    |    0
 {src => plugins}/kimchi/screenshot.py              |    0
 {src => plugins}/kimchi/swupdate.py                |    0
 {src => plugins/kimchi}/template.conf              |    0
 {tests => plugins/kimchi/tests}/Makefile.am        |    0
 {tests => plugins/kimchi/tests}/iso_gen.py         |    0
 {tests => plugins/kimchi/tests}/run_tests.sh.in    |    0
 .../kimchi/tests}/test_authorization.py            |    0
 {tests => plugins/kimchi/tests}/test_config.py.in  |    0
 {tests => plugins/kimchi/tests}/test_exception.py  |    0
 {tests => plugins/kimchi/tests}/test_host.py       |    0
 .../kimchi/tests}/test_mock_network.py             |    0
 .../kimchi/tests}/test_mock_storagepool.py         |    0
 .../kimchi/tests}/test_mock_storagevolume.py       |    0
 {tests => plugins/kimchi/tests}/test_mockmodel.py  |    0
 {tests => plugins/kimchi/tests}/test_model.py      |    0
 .../kimchi/tests}/test_model_network.py            |    0
 .../kimchi/tests}/test_model_storagepool.py        |    0
 .../kimchi/tests}/test_model_storagevolume.py      |    0
 {tests => plugins/kimchi/tests}/test_networkxml.py |    0
 .../kimchi/tests}/test_objectstore.py              |    0
 {tests => plugins/kimchi/tests}/test_osinfo.py     |    0
 {tests => plugins/kimchi/tests}/test_plugin.py     |    0
 {tests => plugins/kimchi/tests}/test_rest.py       |    0
 .../kimchi/tests}/test_rollbackcontext.py          |    0
 {tests => plugins/kimchi/tests}/test_server.py     |    0
 .../kimchi/tests}/test_storagepoolxml.py           |    0
 {tests => plugins/kimchi/tests}/test_template.py   |    0
 {tests => plugins/kimchi/tests}/test_utils.py      |    0
 {tests => plugins/kimchi/tests}/test_vmtemplate.py |    0
 {tests => plugins/kimchi/tests}/test_yumparser.py  |    0
 {tests => plugins/kimchi/tests}/utils.py           |    0
 {config => plugins/kimchi/ui}/Makefile.am          |    0
 .../ui => plugins/kimchi/ui/config}/Makefile.am    |    0
 .../kimchi/ui/config/tab-ext.xml                   |    0
 {ui => plugins/kimchi/ui}/css/Makefile.am          |    0
 .../kimchi/ui}/css/theme-default/guest-edit.css    |    0
 .../ui}/css/theme-default/guest-storage-add.css    |    0
 .../kimchi/ui}/css/theme-default/host.css          |    0
 .../kimchi/ui}/css/theme-default/list.css          |    0
 .../kimchi/ui}/css/theme-default/network.css       |    0
 .../kimchi/ui}/css/theme-default/report-add.css    |    0
 .../kimchi/ui}/css/theme-default/report-rename.css |    0
 .../ui}/css/theme-default/repository-add.css       |    0
 .../ui}/css/theme-default/repository-edit.css      |    0
 .../kimchi/ui}/css/theme-default/storage.css       |    0
 .../css/theme-default/storagepool-add-volume.css   |    0
 .../kimchi/ui}/css/theme-default/template-edit.css |    0
 .../kimchi/ui}/css/theme-default/template.css      |    0
 .../kimchi/ui}/css/theme-default/template_add.css  |    0
 .../kimchi/ui}/css/theme-default/template_list.css |    0
 {ui => plugins/kimchi/ui}/images/Makefile.am       |    0
 {ui => plugins/kimchi/ui}/images/icon-centos.png   |  Bin 4734 -> 4734 bytes
 {ui => plugins/kimchi/ui}/images/icon-debian.png   |  Bin 4239 -> 4239 bytes
 {ui => plugins/kimchi/ui}/images/icon-fedora.png   |  Bin 4449 -> 4449 bytes
 {ui => plugins/kimchi/ui}/images/icon-gentoo.png   |  Bin 15307 -> 15307 bytes
 {ui => plugins/kimchi/ui}/images/icon-opensuse.png |  Bin 3046 -> 3046 bytes
 {ui => plugins/kimchi/ui}/images/icon-ubuntu.png   |  Bin 4818 -> 4818 bytes
 {ui => plugins/kimchi/ui}/images/icon-vm.png       |  Bin 2976 -> 2976 bytes
 {ui => plugins/kimchi/ui}/images/logo.ico          |  Bin 1214 -> 1214 bytes
 .../kimchi/ui}/images/theme-default/Makefile.am    |    0
 .../kimchi/ui}/images/theme-default/ac22_pause.png |  Bin 1219 -> 1219 bytes
 .../ui}/images/theme-default/ac22_pause_grey.png   |  Bin 1175 -> 1175 bytes
 .../ui}/images/theme-default/ac24_resume.png       |  Bin 1341 -> 1341 bytes
 .../ui}/images/theme-default/ac24_resume_grey.png  |  Bin 1282 -> 1282 bytes
 .../ui}/images/theme-default/arrow-down-black.png  |  Bin 2942 -> 2942 bytes
 .../images/theme-default/arrow-down-disable.png    |  Bin 472 -> 472 bytes
 .../kimchi/ui}/images/theme-default/arrow-down.png |  Bin 537 -> 537 bytes
 .../kimchi/ui}/images/theme-default/arrow-up.png   |  Bin 510 -> 510 bytes
 .../kimchi/ui}/images/theme-default/arrow_out.png  |  Bin 3048 -> 3048 bytes
 .../kimchi/ui}/images/theme-default/group.png      |  Bin 1703 -> 1703 bytes
 .../ui}/images/theme-default/host-icon-sprite.png  |  Bin 1034 -> 1034 bytes
 .../kimchi/ui}/images/theme-default/icon-back.png  |  Bin 244 -> 244 bytes
 .../ui}/images/theme-default/icon-camera.png       |  Bin 4860 -> 4860 bytes
 .../ui}/images/theme-default/icon-design.png       |  Bin 4562 -> 4562 bytes
 .../ui}/images/theme-default/icon-detail.png       |  Bin 3079 -> 3079 bytes
 .../kimchi/ui}/images/theme-default/icon-iso.png   |  Bin 4188 -> 4188 bytes
 .../kimchi/ui}/images/theme-default/icon-list.png  |  Bin 2983 -> 2983 bytes
 .../kimchi/ui}/images/theme-default/icon-load.png  |  Bin 3678 -> 3678 bytes
 .../kimchi/ui}/images/theme-default/icon-local.png |  Bin 425 -> 425 bytes
 .../ui}/images/theme-default/icon-power-down.png   |  Bin 4372 -> 4372 bytes
 .../ui}/images/theme-default/icon-power-up.png     |  Bin 4367 -> 4367 bytes
 .../kimchi/ui}/images/theme-default/icon-qcow2.png |  Bin 4684 -> 4684 bytes
 .../kimchi/ui}/images/theme-default/icon-raw.png   |  Bin 4679 -> 4679 bytes
 .../ui}/images/theme-default/icon-remote.png       |  Bin 1005 -> 1005 bytes
 .../kimchi/ui}/images/theme-default/icon-reset.png |  Bin 4576 -> 4576 bytes
 .../ui}/images/theme-default/icon-search.png       |  Bin 4197 -> 4197 bytes
 .../kimchi/ui}/images/theme-default/icon-sort.png  |  Bin 3421 -> 3421 bytes
 .../kimchi/ui}/images/theme-default/icon-tree.png  |  Bin 3526 -> 3526 bytes
 .../kimchi/ui}/images/theme-default/icon-user.png  |  Bin 5366 -> 5366 bytes
 .../images/theme-default/icon-volume-default.png   |  Bin 4265 -> 4265 bytes
 .../images/theme-default/kimchi-loading15x15.gif   |  Bin 1653 -> 1653 bytes
 .../kimchi/ui}/images/theme-default/loading.gif    |  Bin 2190 -> 2190 bytes
 .../kimchi/ui}/images/theme-default/user.png       |  Bin 1322 -> 1322 bytes
 {ui => plugins/kimchi/ui}/js/Makefile.am           |    0
 {ui => plugins/kimchi/ui}/js/src/kimchi.api.js     |    0
 .../kimchi/ui}/js/src/kimchi.guest_add_main.js     |    0
 .../kimchi/ui}/js/src/kimchi.guest_edit_main.js    |    0
 .../kimchi/ui}/js/src/kimchi.guest_main.js         |    0
 .../kimchi/ui}/js/src/kimchi.guest_media_main.js   |    0
 .../ui}/js/src/kimchi.guest_storage_add.main.js    |    0
 {ui => plugins/kimchi/ui}/js/src/kimchi.host.js    |    0
 {ui => plugins/kimchi/ui}/js/src/kimchi.network.js |    0
 .../kimchi/ui}/js/src/kimchi.report_add_main.js    |    0
 .../kimchi/ui}/js/src/kimchi.report_rename_main.js |    0
 .../ui}/js/src/kimchi.repository_add_main.js       |    0
 .../ui}/js/src/kimchi.repository_edit_main.js      |    0
 .../kimchi/ui}/js/src/kimchi.storage_main.js       |    0
 .../ui}/js/src/kimchi.storagepool_add_main.js      |    0
 .../js/src/kimchi.storagepool_add_volume_main.js   |    0
 .../kimchi/ui}/js/src/kimchi.template_add_main.js  |    0
 .../kimchi/ui}/js/src/kimchi.template_edit_main.js |    0
 .../kimchi/ui}/js/src/kimchi.template_main.js      |    0
 {ui => plugins/kimchi/ui}/pages/Makefile.am        |    0
 .../kimchi/ui}/pages/guest-add.html.tmpl           |    0
 .../kimchi/ui}/pages/guest-edit.html.tmpl          |    0
 .../kimchi/ui}/pages/guest-storage-add.html.tmpl   |    0
 {ui => plugins/kimchi/ui}/pages/guest.html.tmpl    |    0
 {ui => plugins/kimchi/ui}/pages/help/Makefile.am   |    0
 .../kimchi/ui}/pages/help/de_DE/Makefile.am        |    0
 .../kimchi/ui}/pages/help/de_DE/guests.dita        |    0
 .../kimchi/ui}/pages/help/de_DE/host.dita          |    0
 .../kimchi/ui}/pages/help/de_DE/network.dita       |    0
 .../kimchi/ui}/pages/help/de_DE/storage.dita       |    0
 .../kimchi/ui}/pages/help/de_DE/templates.dita     |    0
 {ui => plugins/kimchi/ui}/pages/help/dita-help.xsl |    0
 .../kimchi/ui}/pages/help/en_US/Makefile.am        |    0
 .../kimchi/ui}/pages/help/en_US/guests.dita        |    0
 .../kimchi/ui}/pages/help/en_US/host.dita          |    0
 .../kimchi/ui}/pages/help/en_US/network.dita       |    0
 .../kimchi/ui}/pages/help/en_US/storage.dita       |    0
 .../kimchi/ui}/pages/help/en_US/templates.dita     |    0
 .../kimchi/ui}/pages/help/es_ES/Makefile.am        |    0
 .../kimchi/ui}/pages/help/es_ES/guests.dita        |    0
 .../kimchi/ui}/pages/help/es_ES/host.dita          |    0
 .../kimchi/ui}/pages/help/es_ES/network.dita       |    0
 .../kimchi/ui}/pages/help/es_ES/storage.dita       |    0
 .../kimchi/ui}/pages/help/es_ES/templates.dita     |    0
 .../kimchi/ui}/pages/help/fr_FR/Makefile.am        |    0
 .../kimchi/ui}/pages/help/fr_FR/guests.dita        |    0
 .../kimchi/ui}/pages/help/fr_FR/host.dita          |    0
 .../kimchi/ui}/pages/help/fr_FR/network.dita       |    0
 .../kimchi/ui}/pages/help/fr_FR/storage.dita       |    0
 .../kimchi/ui}/pages/help/fr_FR/templates.dita     |    0
 {ui => plugins/kimchi/ui}/pages/help/gen-index.py  |    0
 .../kimchi/ui}/pages/help/it_IT/Makefile.am        |    0
 .../kimchi/ui}/pages/help/it_IT/guests.dita        |    0
 .../kimchi/ui}/pages/help/it_IT/host.dita          |    0
 .../kimchi/ui}/pages/help/it_IT/network.dita       |    0
 .../kimchi/ui}/pages/help/it_IT/storage.dita       |    0
 .../kimchi/ui}/pages/help/it_IT/templates.dita     |    0
 .../kimchi/ui}/pages/help/ja_JP/Makefile.am        |    0
 .../kimchi/ui}/pages/help/ja_JP/guests.dita        |    0
 .../kimchi/ui}/pages/help/ja_JP/host.dita          |    0
 .../kimchi/ui}/pages/help/ja_JP/network.dita       |    0
 .../kimchi/ui}/pages/help/ja_JP/storage.dita       |    0
 .../kimchi/ui}/pages/help/ja_JP/templates.dita     |    0
 {ui => plugins/kimchi/ui}/pages/help/kimchi.css    |    0
 .../kimchi/ui}/pages/help/ko_KR/Makefile.am        |    0
 .../kimchi/ui}/pages/help/ko_KR/guests.dita        |    0
 .../kimchi/ui}/pages/help/ko_KR/host.dita          |    0
 .../kimchi/ui}/pages/help/ko_KR/network.dita       |    0
 .../kimchi/ui}/pages/help/ko_KR/storage.dita       |    0
 .../kimchi/ui}/pages/help/ko_KR/templates.dita     |    0
 .../kimchi/ui}/pages/help/pt_BR/Makefile.am        |    0
 .../kimchi/ui}/pages/help/pt_BR/guests.dita        |    0
 .../kimchi/ui}/pages/help/pt_BR/host.dita          |    0
 .../kimchi/ui}/pages/help/pt_BR/network.dita       |    0
 .../kimchi/ui}/pages/help/pt_BR/storage.dita       |    0
 .../kimchi/ui}/pages/help/pt_BR/templates.dita     |    0
 .../kimchi/ui}/pages/help/ru_RU/Makefile.am        |    0
 .../kimchi/ui}/pages/help/ru_RU/guests.dita        |    0
 .../kimchi/ui}/pages/help/ru_RU/host.dita          |    0
 .../kimchi/ui}/pages/help/ru_RU/network.dita       |    0
 .../kimchi/ui}/pages/help/ru_RU/storage.dita       |    0
 .../kimchi/ui}/pages/help/ru_RU/templates.dita     |    0
 .../kimchi/ui}/pages/help/zh_CN/Makefile.am        |    0
 .../kimchi/ui}/pages/help/zh_CN/guests.dita        |    0
 .../kimchi/ui}/pages/help/zh_CN/host.dita          |    0
 .../kimchi/ui}/pages/help/zh_CN/network.dita       |    0
 .../kimchi/ui}/pages/help/zh_CN/storage.dita       |    0
 .../kimchi/ui}/pages/help/zh_CN/templates.dita     |    0
 .../kimchi/ui}/pages/help/zh_TW/Makefile.am        |    0
 .../kimchi/ui}/pages/help/zh_TW/guests.dita        |    0
 .../kimchi/ui}/pages/help/zh_TW/host.dita          |    0
 .../kimchi/ui}/pages/help/zh_TW/network.dita       |    0
 .../kimchi/ui}/pages/help/zh_TW/storage.dita       |    0
 .../kimchi/ui}/pages/help/zh_TW/templates.dita     |    0
 {ui => plugins/kimchi/ui}/pages/i18n.json.tmpl     |    0
 .../kimchi/ui}/pages/report-add.html.tmpl          |    0
 .../kimchi/ui}/pages/report-rename.html.tmpl       |    0
 .../kimchi/ui}/pages/repository-add.html.tmpl      |    0
 .../kimchi/ui}/pages/repository-edit.html.tmpl     |    0
 .../ui}/pages/storagepool-add-volume.html.tmpl     |    0
 .../kimchi/ui}/pages/storagepool-add.html.tmpl     |    0
 {ui => plugins/kimchi/ui}/pages/tabs/Makefile.am   |    0
 .../kimchi/ui}/pages/tabs/guests.html.tmpl         |    0
 .../kimchi/ui}/pages/tabs/host.html.tmpl           |    0
 .../kimchi/ui}/pages/tabs/network.html.tmpl        |    0
 .../kimchi/ui}/pages/tabs/storage.html.tmpl        |    0
 .../kimchi/ui}/pages/tabs/templates.html.tmpl      |    0
 .../kimchi/ui}/pages/template-add.html.tmpl        |    0
 .../kimchi/ui}/pages/template-edit.html.tmpl       |    0
 {ui => plugins/kimchi/ui}/robots.txt               |    0
 {ui => plugins/kimchi/ui}/spice-html5/Makefile.am  |    0
 .../kimchi/ui}/spice-html5/atKeynames.js           |    0
 {ui => plugins/kimchi/ui}/spice-html5/bitmap.js    |    0
 .../kimchi/ui}/spice-html5/css/Makefile.am         |    0
 .../kimchi/ui}/spice-html5/css/spice.css           |    0
 {ui => plugins/kimchi/ui}/spice-html5/cursor.js    |    0
 {ui => plugins/kimchi/ui}/spice-html5/display.js   |    0
 {ui => plugins/kimchi/ui}/spice-html5/enums.js     |    0
 {ui => plugins/kimchi/ui}/spice-html5/inputs.js    |    0
 {ui => plugins/kimchi/ui}/spice-html5/lz.js        |    0
 {ui => plugins/kimchi/ui}/spice-html5/main.js      |    0
 .../kimchi/ui}/spice-html5/pages/Makefile.am       |    0
 .../kimchi/ui}/spice-html5/pages/spice_auto.html   |    0
 {ui => plugins/kimchi/ui}/spice-html5/playback.js  |    0
 {ui => plugins/kimchi/ui}/spice-html5/png.js       |    0
 {ui => plugins/kimchi/ui}/spice-html5/quic.js      |    0
 {ui => plugins/kimchi/ui}/spice-html5/resize.js    |    0
 .../kimchi/ui}/spice-html5/simulatecursor.js       |    0
 .../kimchi/ui}/spice-html5/spicearraybuffer.js     |    0
 {ui => plugins/kimchi/ui}/spice-html5/spiceconn.js |    0
 .../kimchi/ui}/spice-html5/spicedataview.js        |    0
 {ui => plugins/kimchi/ui}/spice-html5/spicemsg.js  |    0
 {ui => plugins/kimchi/ui}/spice-html5/spicetype.js |    0
 .../kimchi/ui}/spice-html5/thirdparty/Makefile.am  |    0
 .../kimchi/ui}/spice-html5/thirdparty/jsbn.js      |    0
 .../kimchi/ui}/spice-html5/thirdparty/prng4.js     |    0
 .../kimchi/ui}/spice-html5/thirdparty/rng.js       |    0
 .../kimchi/ui}/spice-html5/thirdparty/rsa.js       |    0
 .../kimchi/ui}/spice-html5/thirdparty/sha1.js      |    0
 {ui => plugins/kimchi/ui}/spice-html5/ticket.js    |    0
 {ui => plugins/kimchi/ui}/spice-html5/utils.js     |    0
 {ui => plugins/kimchi/ui}/spice-html5/webm.js      |    0
 {ui => plugins/kimchi/ui}/spice-html5/wire.js      |    0
 {src => plugins}/kimchi/vmtemplate.py              |    0
 {src => plugins}/kimchi/xmlutils/Makefile.am       |    0
 {src => plugins}/kimchi/xmlutils/__init__.py       |    0
 {src => plugins}/kimchi/xmlutils/cpu.py            |    0
 {src => plugins}/kimchi/xmlutils/disk.py           |    0
 {src => plugins}/kimchi/xmlutils/graphics.py       |    0
 {src => plugins}/kimchi/xmlutils/interface.py      |    0
 {src => plugins}/kimchi/xmlutils/network.py        |    0
 {src => plugins}/kimchi/xmlutils/qemucmdline.py    |    0
 {src => plugins}/kimchi/yumparser.py               |    0
 348 files changed, 0 insertions(+), 0 deletions(-)
 rename {src => plugins}/kimchi/API.json (100%)
 rename README.md => plugins/kimchi/README.md (100%)
 rename VERSION => plugins/kimchi/VERSION (100%)
 rename {contrib => plugins/kimchi/contrib}/DEBIAN/Makefile.am (100%)
 rename {contrib => plugins/kimchi/contrib}/DEBIAN/control.in (100%)
 rename {contrib => plugins/kimchi/contrib}/Makefile.am (100%)
 rename {contrib => plugins/kimchi/contrib}/kimchi.spec.fedora.in (100%)
 rename {contrib => plugins/kimchi/contrib}/kimchi.spec.suse.in (100%)
 rename {contrib => plugins/kimchi/contrib}/make-deb.sh.in (100%)
 rename {src => plugins}/kimchi/control/Makefile.am (100%)
 rename {src => plugins}/kimchi/control/__init__.py (100%)
 rename {src => plugins}/kimchi/control/config.py (100%)
 rename {src => plugins}/kimchi/control/cpuinfo.py (100%)
 rename {src => plugins}/kimchi/control/debugreports.py (100%)
 rename {src => plugins}/kimchi/control/groups.py (100%)
 rename {src => plugins}/kimchi/control/host.py (100%)
 rename {src => plugins}/kimchi/control/interfaces.py (100%)
 rename {src => plugins}/kimchi/control/networks.py (100%)
 rename {src => plugins}/kimchi/control/peers.py (100%)
 rename {src => plugins}/kimchi/control/storagepools.py (100%)
 rename {src => plugins}/kimchi/control/storageservers.py (100%)
 rename {src => plugins}/kimchi/control/storagevolumes.py (100%)
 rename {src => plugins}/kimchi/control/tasks.py (100%)
 rename {src => plugins}/kimchi/control/templates.py (100%)
 rename {src => plugins}/kimchi/control/users.py (100%)
 rename {src => plugins}/kimchi/control/vm/Makefile.am (100%)
 rename {src => plugins}/kimchi/control/vm/__init__.py (100%)
 rename {src => plugins}/kimchi/control/vm/hostdevs.py (100%)
 rename {src => plugins}/kimchi/control/vm/ifaces.py (100%)
 rename {src => plugins}/kimchi/control/vm/snapshots.py (100%)
 rename {src => plugins}/kimchi/control/vm/storages.py (100%)
 rename {src => plugins}/kimchi/control/vms.py (100%)
 rename {src => plugins}/kimchi/disks.py (100%)
 rename {src => plugins}/kimchi/distroloader.py (100%)
 rename {src => plugins/kimchi}/distros.d/Makefile.am (100%)
 rename {src => plugins/kimchi}/distros.d/debian.json (100%)
 rename {src => plugins/kimchi}/distros.d/fedora.json (100%)
 rename {src => plugins/kimchi}/distros.d/gentoo.json (100%)
 rename {src => plugins/kimchi}/distros.d/opensuse.json (100%)
 rename {src => plugins/kimchi}/distros.d/ubuntu.json (100%)
 rename {docs => plugins/kimchi/docs}/API.md (100%)
 rename {docs => plugins/kimchi/docs}/Makefile.am (100%)
 rename {docs => plugins/kimchi/docs}/README-federation.md (100%)
 rename {docs => plugins/kimchi/docs}/README.md (100%)
 rename {docs => plugins/kimchi/docs}/kimchi-guest.png (100%)
 rename {docs => plugins/kimchi/docs}/kimchi-login.png (100%)
 rename {docs => plugins/kimchi/docs}/kimchi-templates.png (100%)
 rename {src => plugins}/kimchi/i18n.py (100%)
 rename {src => plugins}/kimchi/imageinfo.py (100%)
 rename {src => plugins}/kimchi/iscsi.py (100%)
 rename {src => plugins}/kimchi/isoinfo.py (100%)
 rename {src => plugins}/kimchi/kvmusertests.py (100%)
 rename {src => plugins}/kimchi/mockmodel.py (100%)
 rename {src => plugins}/kimchi/model/Makefile.am (100%)
 rename {src => plugins}/kimchi/model/__init__.py (100%)
 rename {src => plugins}/kimchi/model/config.py (100%)
 rename {src => plugins}/kimchi/model/cpuinfo.py (100%)
 rename {src => plugins}/kimchi/model/debugreports.py (100%)
 rename {src => plugins}/kimchi/model/diskutils.py (100%)
 rename {src => plugins}/kimchi/model/featuretests.py (100%)
 rename {src => plugins}/kimchi/model/groups.py (100%)
 rename {src => plugins}/kimchi/model/host.py (100%)
 rename {src => plugins}/kimchi/model/hostdev.py (100%)
 rename {src => plugins}/kimchi/model/interfaces.py (100%)
 rename {src => plugins}/kimchi/model/libvirtconnection.py (100%)
 rename {src => plugins}/kimchi/model/libvirtstoragepool.py (100%)
 rename {src => plugins}/kimchi/model/model.py (100%)
 rename {src => plugins}/kimchi/model/networks.py (100%)
 rename {src => plugins}/kimchi/model/peers.py (100%)
 rename {src => plugins}/kimchi/model/storagepools.py (100%)
 rename {src => plugins}/kimchi/model/storageservers.py (100%)
 rename {src => plugins}/kimchi/model/storagetargets.py (100%)
 rename {src => plugins}/kimchi/model/storagevolumes.py (100%)
 rename {src => plugins}/kimchi/model/tasks.py (100%)
 rename {src => plugins}/kimchi/model/templates.py (100%)
 rename {src => plugins}/kimchi/model/users.py (100%)
 rename {src => plugins}/kimchi/model/utils.py (100%)
 rename {src => plugins}/kimchi/model/vmhostdevs.py (100%)
 rename {src => plugins}/kimchi/model/vmifaces.py (100%)
 rename {src => plugins}/kimchi/model/vms.py (100%)
 rename {src => plugins}/kimchi/model/vmsnapshots.py (100%)
 rename {src => plugins}/kimchi/model/vmstorages.py (100%)
 rename {src => plugins}/kimchi/osinfo.py (100%)
 rename {po => plugins/kimchi/po}/LINGUAS (100%)
 rename {po => plugins/kimchi/po}/Makefile.in.in (100%)
 rename {po => plugins/kimchi/po}/Makevars (100%)
 rename {po => plugins/kimchi/po}/POTFILES.in (100%)
 rename {po => plugins/kimchi/po}/de_DE.po (100%)
 rename {po => plugins/kimchi/po}/en_US.po (100%)
 rename {po => plugins/kimchi/po}/es_ES.po (100%)
 rename {po => plugins/kimchi/po}/fr_FR.po (100%)
 rename {po => plugins/kimchi/po}/gen-pot.in (100%)
 rename {po => plugins/kimchi/po}/it_IT.po (100%)
 rename {po => plugins/kimchi/po}/ja_JP.po (100%)
 rename {po => plugins/kimchi/po}/kimchi.pot (100%)
 rename {po => plugins/kimchi/po}/ko_KR.po (100%)
 rename {po => plugins/kimchi/po}/pt_BR.po (100%)
 rename {po => plugins/kimchi/po}/ru_RU.po (100%)
 rename {po => plugins/kimchi/po}/zh_CN.po (100%)
 rename {po => plugins/kimchi/po}/zh_TW.po (100%)
 rename {src => plugins}/kimchi/repositories.py (100%)
 rename {src => plugins}/kimchi/scan.py (100%)
 rename {src => plugins}/kimchi/screenshot.py (100%)
 rename {src => plugins}/kimchi/swupdate.py (100%)
 rename {src => plugins/kimchi}/template.conf (100%)
 rename {tests => plugins/kimchi/tests}/Makefile.am (100%)
 rename {tests => plugins/kimchi/tests}/iso_gen.py (100%)
 rename {tests => plugins/kimchi/tests}/run_tests.sh.in (100%)
 rename {tests => plugins/kimchi/tests}/test_authorization.py (100%)
 rename {tests => plugins/kimchi/tests}/test_config.py.in (100%)
 rename {tests => plugins/kimchi/tests}/test_exception.py (100%)
 rename {tests => plugins/kimchi/tests}/test_host.py (100%)
 rename {tests => plugins/kimchi/tests}/test_mock_network.py (100%)
 rename {tests => plugins/kimchi/tests}/test_mock_storagepool.py (100%)
 rename {tests => plugins/kimchi/tests}/test_mock_storagevolume.py (100%)
 rename {tests => plugins/kimchi/tests}/test_mockmodel.py (100%)
 rename {tests => plugins/kimchi/tests}/test_model.py (100%)
 rename {tests => plugins/kimchi/tests}/test_model_network.py (100%)
 rename {tests => plugins/kimchi/tests}/test_model_storagepool.py (100%)
 rename {tests => plugins/kimchi/tests}/test_model_storagevolume.py (100%)
 rename {tests => plugins/kimchi/tests}/test_networkxml.py (100%)
 rename {tests => plugins/kimchi/tests}/test_objectstore.py (100%)
 rename {tests => plugins/kimchi/tests}/test_osinfo.py (100%)
 rename {tests => plugins/kimchi/tests}/test_plugin.py (100%)
 rename {tests => plugins/kimchi/tests}/test_rest.py (100%)
 rename {tests => plugins/kimchi/tests}/test_rollbackcontext.py (100%)
 rename {tests => plugins/kimchi/tests}/test_server.py (100%)
 rename {tests => plugins/kimchi/tests}/test_storagepoolxml.py (100%)
 rename {tests => plugins/kimchi/tests}/test_template.py (100%)
 rename {tests => plugins/kimchi/tests}/test_utils.py (100%)
 rename {tests => plugins/kimchi/tests}/test_vmtemplate.py (100%)
 rename {tests => plugins/kimchi/tests}/test_yumparser.py (100%)
 rename {tests => plugins/kimchi/tests}/utils.py (100%)
 rename {config => plugins/kimchi/ui}/Makefile.am (100%)
 rename {config/ui => plugins/kimchi/ui/config}/Makefile.am (100%)
 rename config/ui/tabs.xml => plugins/kimchi/ui/config/tab-ext.xml (100%)
 rename {ui => plugins/kimchi/ui}/css/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/guest-edit.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/guest-storage-add.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/host.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/list.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/network.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/report-add.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/report-rename.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/repository-add.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/repository-edit.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/storage.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/storagepool-add-volume.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/template-edit.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/template.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/template_add.css (100%)
 rename {ui => plugins/kimchi/ui}/css/theme-default/template_list.css (100%)
 rename {ui => plugins/kimchi/ui}/images/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-centos.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-debian.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-fedora.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-gentoo.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-opensuse.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-ubuntu.png (100%)
 rename {ui => plugins/kimchi/ui}/images/icon-vm.png (100%)
 rename {ui => plugins/kimchi/ui}/images/logo.ico (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac22_pause.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac22_pause_grey.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac24_resume.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/ac24_resume_grey.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-down-black.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-down-disable.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-down.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-up.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/arrow_out.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/group.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/host-icon-sprite.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-back.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-camera.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-design.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-detail.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-iso.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-list.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-load.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-local.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-power-down.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-power-up.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-qcow2.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-raw.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-remote.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-reset.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-search.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-sort.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-tree.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-user.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/icon-volume-default.png (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/kimchi-loading15x15.gif (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/loading.gif (100%)
 rename {ui => plugins/kimchi/ui}/images/theme-default/user.png (100%)
 rename {ui => plugins/kimchi/ui}/js/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.api.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.guest_add_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.guest_edit_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.guest_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.guest_media_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.guest_storage_add.main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.host.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.network.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.report_add_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.report_rename_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.repository_add_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.repository_edit_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.storage_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.storagepool_add_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.storagepool_add_volume_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.template_add_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.template_edit_main.js (100%)
 rename {ui => plugins/kimchi/ui}/js/src/kimchi.template_main.js (100%)
 rename {ui => plugins/kimchi/ui}/pages/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/guest-add.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/guest-edit.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/guest-storage-add.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/guest.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/de_DE/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/dita-help.xsl (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/en_US/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/es_ES/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/gen-index.py (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/it_IT/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/kimchi.css (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/guests.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/host.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/network.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/storage.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/templates.dita (100%)
 rename {ui => plugins/kimchi/ui}/pages/i18n.json.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/report-add.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/report-rename.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/repository-add.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/repository-edit.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/storagepool-add-volume.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/storagepool-add.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/tabs/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/pages/tabs/guests.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/tabs/host.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/tabs/network.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/tabs/storage.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/tabs/templates.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/template-add.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/pages/template-edit.html.tmpl (100%)
 rename {ui => plugins/kimchi/ui}/robots.txt (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/atKeynames.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/bitmap.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/css/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/css/spice.css (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/cursor.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/display.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/enums.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/inputs.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/lz.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/main.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/pages/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/pages/spice_auto.html (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/playback.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/png.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/quic.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/resize.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/simulatecursor.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicearraybuffer.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spiceconn.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicedataview.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicemsg.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/spicetype.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/Makefile.am (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/jsbn.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/prng4.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/rng.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/rsa.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/sha1.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/ticket.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/utils.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/webm.js (100%)
 rename {ui => plugins/kimchi/ui}/spice-html5/wire.js (100%)
 rename {src => plugins}/kimchi/vmtemplate.py (100%)
 rename {src => plugins}/kimchi/xmlutils/Makefile.am (100%)
 rename {src => plugins}/kimchi/xmlutils/__init__.py (100%)
 rename {src => plugins}/kimchi/xmlutils/cpu.py (100%)
 rename {src => plugins}/kimchi/xmlutils/disk.py (100%)
 rename {src => plugins}/kimchi/xmlutils/graphics.py (100%)
 rename {src => plugins}/kimchi/xmlutils/interface.py (100%)
 rename {src => plugins}/kimchi/xmlutils/network.py (100%)
 rename {src => plugins}/kimchi/xmlutils/qemucmdline.py (100%)
 rename {src => plugins}/kimchi/yumparser.py (100%)

diff --git a/src/kimchi/API.json b/plugins/kimchi/API.json
similarity index 100%
rename from src/kimchi/API.json
rename to plugins/kimchi/API.json
diff --git a/README.md b/plugins/kimchi/README.md
similarity index 100%
rename from README.md
rename to plugins/kimchi/README.md
diff --git a/VERSION b/plugins/kimchi/VERSION
similarity index 100%
rename from VERSION
rename to plugins/kimchi/VERSION
diff --git a/contrib/DEBIAN/Makefile.am b/plugins/kimchi/contrib/DEBIAN/Makefile.am
similarity index 100%
rename from contrib/DEBIAN/Makefile.am
rename to plugins/kimchi/contrib/DEBIAN/Makefile.am
diff --git a/contrib/DEBIAN/control.in b/plugins/kimchi/contrib/DEBIAN/control.in
similarity index 100%
rename from contrib/DEBIAN/control.in
rename to plugins/kimchi/contrib/DEBIAN/control.in
diff --git a/contrib/Makefile.am b/plugins/kimchi/contrib/Makefile.am
similarity index 100%
rename from contrib/Makefile.am
rename to plugins/kimchi/contrib/Makefile.am
diff --git a/contrib/kimchi.spec.fedora.in b/plugins/kimchi/contrib/kimchi.spec.fedora.in
similarity index 100%
rename from contrib/kimchi.spec.fedora.in
rename to plugins/kimchi/contrib/kimchi.spec.fedora.in
diff --git a/contrib/kimchi.spec.suse.in b/plugins/kimchi/contrib/kimchi.spec.suse.in
similarity index 100%
rename from contrib/kimchi.spec.suse.in
rename to plugins/kimchi/contrib/kimchi.spec.suse.in
diff --git a/contrib/make-deb.sh.in b/plugins/kimchi/contrib/make-deb.sh.in
similarity index 100%
rename from contrib/make-deb.sh.in
rename to plugins/kimchi/contrib/make-deb.sh.in
diff --git a/src/kimchi/control/Makefile.am b/plugins/kimchi/control/Makefile.am
similarity index 100%
rename from src/kimchi/control/Makefile.am
rename to plugins/kimchi/control/Makefile.am
diff --git a/src/kimchi/control/__init__.py b/plugins/kimchi/control/__init__.py
similarity index 100%
rename from src/kimchi/control/__init__.py
rename to plugins/kimchi/control/__init__.py
diff --git a/src/kimchi/control/config.py b/plugins/kimchi/control/config.py
similarity index 100%
rename from src/kimchi/control/config.py
rename to plugins/kimchi/control/config.py
diff --git a/src/kimchi/control/cpuinfo.py b/plugins/kimchi/control/cpuinfo.py
similarity index 100%
rename from src/kimchi/control/cpuinfo.py
rename to plugins/kimchi/control/cpuinfo.py
diff --git a/src/kimchi/control/debugreports.py b/plugins/kimchi/control/debugreports.py
similarity index 100%
rename from src/kimchi/control/debugreports.py
rename to plugins/kimchi/control/debugreports.py
diff --git a/src/kimchi/control/groups.py b/plugins/kimchi/control/groups.py
similarity index 100%
rename from src/kimchi/control/groups.py
rename to plugins/kimchi/control/groups.py
diff --git a/src/kimchi/control/host.py b/plugins/kimchi/control/host.py
similarity index 100%
rename from src/kimchi/control/host.py
rename to plugins/kimchi/control/host.py
diff --git a/src/kimchi/control/interfaces.py b/plugins/kimchi/control/interfaces.py
similarity index 100%
rename from src/kimchi/control/interfaces.py
rename to plugins/kimchi/control/interfaces.py
diff --git a/src/kimchi/control/networks.py b/plugins/kimchi/control/networks.py
similarity index 100%
rename from src/kimchi/control/networks.py
rename to plugins/kimchi/control/networks.py
diff --git a/src/kimchi/control/peers.py b/plugins/kimchi/control/peers.py
similarity index 100%
rename from src/kimchi/control/peers.py
rename to plugins/kimchi/control/peers.py
diff --git a/src/kimchi/control/storagepools.py b/plugins/kimchi/control/storagepools.py
similarity index 100%
rename from src/kimchi/control/storagepools.py
rename to plugins/kimchi/control/storagepools.py
diff --git a/src/kimchi/control/storageservers.py b/plugins/kimchi/control/storageservers.py
similarity index 100%
rename from src/kimchi/control/storageservers.py
rename to plugins/kimchi/control/storageservers.py
diff --git a/src/kimchi/control/storagevolumes.py b/plugins/kimchi/control/storagevolumes.py
similarity index 100%
rename from src/kimchi/control/storagevolumes.py
rename to plugins/kimchi/control/storagevolumes.py
diff --git a/src/kimchi/control/tasks.py b/plugins/kimchi/control/tasks.py
similarity index 100%
rename from src/kimchi/control/tasks.py
rename to plugins/kimchi/control/tasks.py
diff --git a/src/kimchi/control/templates.py b/plugins/kimchi/control/templates.py
similarity index 100%
rename from src/kimchi/control/templates.py
rename to plugins/kimchi/control/templates.py
diff --git a/src/kimchi/control/users.py b/plugins/kimchi/control/users.py
similarity index 100%
rename from src/kimchi/control/users.py
rename to plugins/kimchi/control/users.py
diff --git a/src/kimchi/control/vm/Makefile.am b/plugins/kimchi/control/vm/Makefile.am
similarity index 100%
rename from src/kimchi/control/vm/Makefile.am
rename to plugins/kimchi/control/vm/Makefile.am
diff --git a/src/kimchi/control/vm/__init__.py b/plugins/kimchi/control/vm/__init__.py
similarity index 100%
rename from src/kimchi/control/vm/__init__.py
rename to plugins/kimchi/control/vm/__init__.py
diff --git a/src/kimchi/control/vm/hostdevs.py b/plugins/kimchi/control/vm/hostdevs.py
similarity index 100%
rename from src/kimchi/control/vm/hostdevs.py
rename to plugins/kimchi/control/vm/hostdevs.py
diff --git a/src/kimchi/control/vm/ifaces.py b/plugins/kimchi/control/vm/ifaces.py
similarity index 100%
rename from src/kimchi/control/vm/ifaces.py
rename to plugins/kimchi/control/vm/ifaces.py
diff --git a/src/kimchi/control/vm/snapshots.py b/plugins/kimchi/control/vm/snapshots.py
similarity index 100%
rename from src/kimchi/control/vm/snapshots.py
rename to plugins/kimchi/control/vm/snapshots.py
diff --git a/src/kimchi/control/vm/storages.py b/plugins/kimchi/control/vm/storages.py
similarity index 100%
rename from src/kimchi/control/vm/storages.py
rename to plugins/kimchi/control/vm/storages.py
diff --git a/src/kimchi/control/vms.py b/plugins/kimchi/control/vms.py
similarity index 100%
rename from src/kimchi/control/vms.py
rename to plugins/kimchi/control/vms.py
diff --git a/src/kimchi/disks.py b/plugins/kimchi/disks.py
similarity index 100%
rename from src/kimchi/disks.py
rename to plugins/kimchi/disks.py
diff --git a/src/kimchi/distroloader.py b/plugins/kimchi/distroloader.py
similarity index 100%
rename from src/kimchi/distroloader.py
rename to plugins/kimchi/distroloader.py
diff --git a/src/distros.d/Makefile.am b/plugins/kimchi/distros.d/Makefile.am
similarity index 100%
rename from src/distros.d/Makefile.am
rename to plugins/kimchi/distros.d/Makefile.am
diff --git a/src/distros.d/debian.json b/plugins/kimchi/distros.d/debian.json
similarity index 100%
rename from src/distros.d/debian.json
rename to plugins/kimchi/distros.d/debian.json
diff --git a/src/distros.d/fedora.json b/plugins/kimchi/distros.d/fedora.json
similarity index 100%
rename from src/distros.d/fedora.json
rename to plugins/kimchi/distros.d/fedora.json
diff --git a/src/distros.d/gentoo.json b/plugins/kimchi/distros.d/gentoo.json
similarity index 100%
rename from src/distros.d/gentoo.json
rename to plugins/kimchi/distros.d/gentoo.json
diff --git a/src/distros.d/opensuse.json b/plugins/kimchi/distros.d/opensuse.json
similarity index 100%
rename from src/distros.d/opensuse.json
rename to plugins/kimchi/distros.d/opensuse.json
diff --git a/src/distros.d/ubuntu.json b/plugins/kimchi/distros.d/ubuntu.json
similarity index 100%
rename from src/distros.d/ubuntu.json
rename to plugins/kimchi/distros.d/ubuntu.json
diff --git a/docs/API.md b/plugins/kimchi/docs/API.md
similarity index 100%
rename from docs/API.md
rename to plugins/kimchi/docs/API.md
diff --git a/docs/Makefile.am b/plugins/kimchi/docs/Makefile.am
similarity index 100%
rename from docs/Makefile.am
rename to plugins/kimchi/docs/Makefile.am
diff --git a/docs/README-federation.md b/plugins/kimchi/docs/README-federation.md
similarity index 100%
rename from docs/README-federation.md
rename to plugins/kimchi/docs/README-federation.md
diff --git a/docs/README.md b/plugins/kimchi/docs/README.md
similarity index 100%
rename from docs/README.md
rename to plugins/kimchi/docs/README.md
diff --git a/src/kimchi/i18n.py b/plugins/kimchi/i18n.py
similarity index 100%
rename from src/kimchi/i18n.py
rename to plugins/kimchi/i18n.py
diff --git a/src/kimchi/imageinfo.py b/plugins/kimchi/imageinfo.py
similarity index 100%
rename from src/kimchi/imageinfo.py
rename to plugins/kimchi/imageinfo.py
diff --git a/src/kimchi/iscsi.py b/plugins/kimchi/iscsi.py
similarity index 100%
rename from src/kimchi/iscsi.py
rename to plugins/kimchi/iscsi.py
diff --git a/src/kimchi/isoinfo.py b/plugins/kimchi/isoinfo.py
similarity index 100%
rename from src/kimchi/isoinfo.py
rename to plugins/kimchi/isoinfo.py
diff --git a/src/kimchi/kvmusertests.py b/plugins/kimchi/kvmusertests.py
similarity index 100%
rename from src/kimchi/kvmusertests.py
rename to plugins/kimchi/kvmusertests.py
diff --git a/src/kimchi/mockmodel.py b/plugins/kimchi/mockmodel.py
similarity index 100%
rename from src/kimchi/mockmodel.py
rename to plugins/kimchi/mockmodel.py
diff --git a/src/kimchi/model/Makefile.am b/plugins/kimchi/model/Makefile.am
similarity index 100%
rename from src/kimchi/model/Makefile.am
rename to plugins/kimchi/model/Makefile.am
diff --git a/src/kimchi/model/__init__.py b/plugins/kimchi/model/__init__.py
similarity index 100%
rename from src/kimchi/model/__init__.py
rename to plugins/kimchi/model/__init__.py
diff --git a/src/kimchi/model/config.py b/plugins/kimchi/model/config.py
similarity index 100%
rename from src/kimchi/model/config.py
rename to plugins/kimchi/model/config.py
diff --git a/src/kimchi/model/cpuinfo.py b/plugins/kimchi/model/cpuinfo.py
similarity index 100%
rename from src/kimchi/model/cpuinfo.py
rename to plugins/kimchi/model/cpuinfo.py
diff --git a/src/kimchi/model/debugreports.py b/plugins/kimchi/model/debugreports.py
similarity index 100%
rename from src/kimchi/model/debugreports.py
rename to plugins/kimchi/model/debugreports.py
diff --git a/src/kimchi/model/diskutils.py b/plugins/kimchi/model/diskutils.py
similarity index 100%
rename from src/kimchi/model/diskutils.py
rename to plugins/kimchi/model/diskutils.py
diff --git a/src/kimchi/model/featuretests.py b/plugins/kimchi/model/featuretests.py
similarity index 100%
rename from src/kimchi/model/featuretests.py
rename to plugins/kimchi/model/featuretests.py
diff --git a/src/kimchi/model/groups.py b/plugins/kimchi/model/groups.py
similarity index 100%
rename from src/kimchi/model/groups.py
rename to plugins/kimchi/model/groups.py
diff --git a/src/kimchi/model/host.py b/plugins/kimchi/model/host.py
similarity index 100%
rename from src/kimchi/model/host.py
rename to plugins/kimchi/model/host.py
diff --git a/src/kimchi/model/hostdev.py b/plugins/kimchi/model/hostdev.py
similarity index 100%
rename from src/kimchi/model/hostdev.py
rename to plugins/kimchi/model/hostdev.py
diff --git a/src/kimchi/model/interfaces.py b/plugins/kimchi/model/interfaces.py
similarity index 100%
rename from src/kimchi/model/interfaces.py
rename to plugins/kimchi/model/interfaces.py
diff --git a/src/kimchi/model/libvirtconnection.py b/plugins/kimchi/model/libvirtconnection.py
similarity index 100%
rename from src/kimchi/model/libvirtconnection.py
rename to plugins/kimchi/model/libvirtconnection.py
diff --git a/src/kimchi/model/libvirtstoragepool.py b/plugins/kimchi/model/libvirtstoragepool.py
similarity index 100%
rename from src/kimchi/model/libvirtstoragepool.py
rename to plugins/kimchi/model/libvirtstoragepool.py
diff --git a/src/kimchi/model/model.py b/plugins/kimchi/model/model.py
similarity index 100%
rename from src/kimchi/model/model.py
rename to plugins/kimchi/model/model.py
diff --git a/src/kimchi/model/networks.py b/plugins/kimchi/model/networks.py
similarity index 100%
rename from src/kimchi/model/networks.py
rename to plugins/kimchi/model/networks.py
diff --git a/src/kimchi/model/peers.py b/plugins/kimchi/model/peers.py
similarity index 100%
rename from src/kimchi/model/peers.py
rename to plugins/kimchi/model/peers.py
diff --git a/src/kimchi/model/storagepools.py b/plugins/kimchi/model/storagepools.py
similarity index 100%
rename from src/kimchi/model/storagepools.py
rename to plugins/kimchi/model/storagepools.py
diff --git a/src/kimchi/model/storageservers.py b/plugins/kimchi/model/storageservers.py
similarity index 100%
rename from src/kimchi/model/storageservers.py
rename to plugins/kimchi/model/storageservers.py
diff --git a/src/kimchi/model/storagetargets.py b/plugins/kimchi/model/storagetargets.py
similarity index 100%
rename from src/kimchi/model/storagetargets.py
rename to plugins/kimchi/model/storagetargets.py
diff --git a/src/kimchi/model/storagevolumes.py b/plugins/kimchi/model/storagevolumes.py
similarity index 100%
rename from src/kimchi/model/storagevolumes.py
rename to plugins/kimchi/model/storagevolumes.py
diff --git a/src/kimchi/model/tasks.py b/plugins/kimchi/model/tasks.py
similarity index 100%
rename from src/kimchi/model/tasks.py
rename to plugins/kimchi/model/tasks.py
diff --git a/src/kimchi/model/templates.py b/plugins/kimchi/model/templates.py
similarity index 100%
rename from src/kimchi/model/templates.py
rename to plugins/kimchi/model/templates.py
diff --git a/src/kimchi/model/users.py b/plugins/kimchi/model/users.py
similarity index 100%
rename from src/kimchi/model/users.py
rename to plugins/kimchi/model/users.py
diff --git a/src/kimchi/model/utils.py b/plugins/kimchi/model/utils.py
similarity index 100%
rename from src/kimchi/model/utils.py
rename to plugins/kimchi/model/utils.py
diff --git a/src/kimchi/model/vmhostdevs.py b/plugins/kimchi/model/vmhostdevs.py
similarity index 100%
rename from src/kimchi/model/vmhostdevs.py
rename to plugins/kimchi/model/vmhostdevs.py
diff --git a/src/kimchi/model/vmifaces.py b/plugins/kimchi/model/vmifaces.py
similarity index 100%
rename from src/kimchi/model/vmifaces.py
rename to plugins/kimchi/model/vmifaces.py
diff --git a/src/kimchi/model/vms.py b/plugins/kimchi/model/vms.py
similarity index 100%
rename from src/kimchi/model/vms.py
rename to plugins/kimchi/model/vms.py
diff --git a/src/kimchi/model/vmsnapshots.py b/plugins/kimchi/model/vmsnapshots.py
similarity index 100%
rename from src/kimchi/model/vmsnapshots.py
rename to plugins/kimchi/model/vmsnapshots.py
diff --git a/src/kimchi/model/vmstorages.py b/plugins/kimchi/model/vmstorages.py
similarity index 100%
rename from src/kimchi/model/vmstorages.py
rename to plugins/kimchi/model/vmstorages.py
diff --git a/src/kimchi/osinfo.py b/plugins/kimchi/osinfo.py
similarity index 100%
rename from src/kimchi/osinfo.py
rename to plugins/kimchi/osinfo.py
diff --git a/po/LINGUAS b/plugins/kimchi/po/LINGUAS
similarity index 100%
rename from po/LINGUAS
rename to plugins/kimchi/po/LINGUAS
diff --git a/po/Makefile.in.in b/plugins/kimchi/po/Makefile.in.in
similarity index 100%
rename from po/Makefile.in.in
rename to plugins/kimchi/po/Makefile.in.in
diff --git a/po/Makevars b/plugins/kimchi/po/Makevars
similarity index 100%
rename from po/Makevars
rename to plugins/kimchi/po/Makevars
diff --git a/po/POTFILES.in b/plugins/kimchi/po/POTFILES.in
similarity index 100%
rename from po/POTFILES.in
rename to plugins/kimchi/po/POTFILES.in
diff --git a/po/de_DE.po b/plugins/kimchi/po/de_DE.po
similarity index 100%
rename from po/de_DE.po
rename to plugins/kimchi/po/de_DE.po
diff --git a/po/en_US.po b/plugins/kimchi/po/en_US.po
similarity index 100%
rename from po/en_US.po
rename to plugins/kimchi/po/en_US.po
diff --git a/po/es_ES.po b/plugins/kimchi/po/es_ES.po
similarity index 100%
rename from po/es_ES.po
rename to plugins/kimchi/po/es_ES.po
diff --git a/po/fr_FR.po b/plugins/kimchi/po/fr_FR.po
similarity index 100%
rename from po/fr_FR.po
rename to plugins/kimchi/po/fr_FR.po
diff --git a/po/gen-pot.in b/plugins/kimchi/po/gen-pot.in
similarity index 100%
rename from po/gen-pot.in
rename to plugins/kimchi/po/gen-pot.in
diff --git a/po/it_IT.po b/plugins/kimchi/po/it_IT.po
similarity index 100%
rename from po/it_IT.po
rename to plugins/kimchi/po/it_IT.po
diff --git a/po/ja_JP.po b/plugins/kimchi/po/ja_JP.po
similarity index 100%
rename from po/ja_JP.po
rename to plugins/kimchi/po/ja_JP.po
diff --git a/po/kimchi.pot b/plugins/kimchi/po/kimchi.pot
similarity index 100%
rename from po/kimchi.pot
rename to plugins/kimchi/po/kimchi.pot
diff --git a/po/ko_KR.po b/plugins/kimchi/po/ko_KR.po
similarity index 100%
rename from po/ko_KR.po
rename to plugins/kimchi/po/ko_KR.po
diff --git a/po/pt_BR.po b/plugins/kimchi/po/pt_BR.po
similarity index 100%
rename from po/pt_BR.po
rename to plugins/kimchi/po/pt_BR.po
diff --git a/po/ru_RU.po b/plugins/kimchi/po/ru_RU.po
similarity index 100%
rename from po/ru_RU.po
rename to plugins/kimchi/po/ru_RU.po
diff --git a/po/zh_CN.po b/plugins/kimchi/po/zh_CN.po
similarity index 100%
rename from po/zh_CN.po
rename to plugins/kimchi/po/zh_CN.po
diff --git a/po/zh_TW.po b/plugins/kimchi/po/zh_TW.po
similarity index 100%
rename from po/zh_TW.po
rename to plugins/kimchi/po/zh_TW.po
diff --git a/src/kimchi/repositories.py b/plugins/kimchi/repositories.py
similarity index 100%
rename from src/kimchi/repositories.py
rename to plugins/kimchi/repositories.py
diff --git a/src/kimchi/scan.py b/plugins/kimchi/scan.py
similarity index 100%
rename from src/kimchi/scan.py
rename to plugins/kimchi/scan.py
diff --git a/src/kimchi/screenshot.py b/plugins/kimchi/screenshot.py
similarity index 100%
rename from src/kimchi/screenshot.py
rename to plugins/kimchi/screenshot.py
diff --git a/src/kimchi/swupdate.py b/plugins/kimchi/swupdate.py
similarity index 100%
rename from src/kimchi/swupdate.py
rename to plugins/kimchi/swupdate.py
diff --git a/src/template.conf b/plugins/kimchi/template.conf
similarity index 100%
rename from src/template.conf
rename to plugins/kimchi/template.conf
diff --git a/tests/Makefile.am b/plugins/kimchi/tests/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to plugins/kimchi/tests/Makefile.am
diff --git a/tests/iso_gen.py b/plugins/kimchi/tests/iso_gen.py
similarity index 100%
rename from tests/iso_gen.py
rename to plugins/kimchi/tests/iso_gen.py
diff --git a/tests/run_tests.sh.in b/plugins/kimchi/tests/run_tests.sh.in
similarity index 100%
rename from tests/run_tests.sh.in
rename to plugins/kimchi/tests/run_tests.sh.in
diff --git a/tests/test_authorization.py b/plugins/kimchi/tests/test_authorization.py
similarity index 100%
rename from tests/test_authorization.py
rename to plugins/kimchi/tests/test_authorization.py
diff --git a/tests/test_config.py.in b/plugins/kimchi/tests/test_config.py.in
similarity index 100%
rename from tests/test_config.py.in
rename to plugins/kimchi/tests/test_config.py.in
diff --git a/tests/test_exception.py b/plugins/kimchi/tests/test_exception.py
similarity index 100%
rename from tests/test_exception.py
rename to plugins/kimchi/tests/test_exception.py
diff --git a/tests/test_host.py b/plugins/kimchi/tests/test_host.py
similarity index 100%
rename from tests/test_host.py
rename to plugins/kimchi/tests/test_host.py
diff --git a/tests/test_mock_network.py b/plugins/kimchi/tests/test_mock_network.py
similarity index 100%
rename from tests/test_mock_network.py
rename to plugins/kimchi/tests/test_mock_network.py
diff --git a/tests/test_mock_storagepool.py b/plugins/kimchi/tests/test_mock_storagepool.py
similarity index 100%
rename from tests/test_mock_storagepool.py
rename to plugins/kimchi/tests/test_mock_storagepool.py
diff --git a/tests/test_mock_storagevolume.py b/plugins/kimchi/tests/test_mock_storagevolume.py
similarity index 100%
rename from tests/test_mock_storagevolume.py
rename to plugins/kimchi/tests/test_mock_storagevolume.py
diff --git a/tests/test_mockmodel.py b/plugins/kimchi/tests/test_mockmodel.py
similarity index 100%
rename from tests/test_mockmodel.py
rename to plugins/kimchi/tests/test_mockmodel.py
diff --git a/tests/test_model.py b/plugins/kimchi/tests/test_model.py
similarity index 100%
rename from tests/test_model.py
rename to plugins/kimchi/tests/test_model.py
diff --git a/tests/test_model_network.py b/plugins/kimchi/tests/test_model_network.py
similarity index 100%
rename from tests/test_model_network.py
rename to plugins/kimchi/tests/test_model_network.py
diff --git a/tests/test_model_storagepool.py b/plugins/kimchi/tests/test_model_storagepool.py
similarity index 100%
rename from tests/test_model_storagepool.py
rename to plugins/kimchi/tests/test_model_storagepool.py
diff --git a/tests/test_model_storagevolume.py b/plugins/kimchi/tests/test_model_storagevolume.py
similarity index 100%
rename from tests/test_model_storagevolume.py
rename to plugins/kimchi/tests/test_model_storagevolume.py
diff --git a/tests/test_networkxml.py b/plugins/kimchi/tests/test_networkxml.py
similarity index 100%
rename from tests/test_networkxml.py
rename to plugins/kimchi/tests/test_networkxml.py
diff --git a/tests/test_objectstore.py b/plugins/kimchi/tests/test_objectstore.py
similarity index 100%
rename from tests/test_objectstore.py
rename to plugins/kimchi/tests/test_objectstore.py
diff --git a/tests/test_osinfo.py b/plugins/kimchi/tests/test_osinfo.py
similarity index 100%
rename from tests/test_osinfo.py
rename to plugins/kimchi/tests/test_osinfo.py
diff --git a/tests/test_plugin.py b/plugins/kimchi/tests/test_plugin.py
similarity index 100%
rename from tests/test_plugin.py
rename to plugins/kimchi/tests/test_plugin.py
diff --git a/tests/test_rest.py b/plugins/kimchi/tests/test_rest.py
similarity index 100%
rename from tests/test_rest.py
rename to plugins/kimchi/tests/test_rest.py
diff --git a/tests/test_rollbackcontext.py b/plugins/kimchi/tests/test_rollbackcontext.py
similarity index 100%
rename from tests/test_rollbackcontext.py
rename to plugins/kimchi/tests/test_rollbackcontext.py
diff --git a/tests/test_server.py b/plugins/kimchi/tests/test_server.py
similarity index 100%
rename from tests/test_server.py
rename to plugins/kimchi/tests/test_server.py
diff --git a/tests/test_storagepoolxml.py b/plugins/kimchi/tests/test_storagepoolxml.py
similarity index 100%
rename from tests/test_storagepoolxml.py
rename to plugins/kimchi/tests/test_storagepoolxml.py
diff --git a/tests/test_template.py b/plugins/kimchi/tests/test_template.py
similarity index 100%
rename from tests/test_template.py
rename to plugins/kimchi/tests/test_template.py
diff --git a/tests/test_utils.py b/plugins/kimchi/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to plugins/kimchi/tests/test_utils.py
diff --git a/tests/test_vmtemplate.py b/plugins/kimchi/tests/test_vmtemplate.py
similarity index 100%
rename from tests/test_vmtemplate.py
rename to plugins/kimchi/tests/test_vmtemplate.py
diff --git a/tests/test_yumparser.py b/plugins/kimchi/tests/test_yumparser.py
similarity index 100%
rename from tests/test_yumparser.py
rename to plugins/kimchi/tests/test_yumparser.py
diff --git a/tests/utils.py b/plugins/kimchi/tests/utils.py
similarity index 100%
rename from tests/utils.py
rename to plugins/kimchi/tests/utils.py
diff --git a/config/Makefile.am b/plugins/kimchi/ui/Makefile.am
similarity index 100%
rename from config/Makefile.am
rename to plugins/kimchi/ui/Makefile.am
diff --git a/config/ui/Makefile.am b/plugins/kimchi/ui/config/Makefile.am
similarity index 100%
rename from config/ui/Makefile.am
rename to plugins/kimchi/ui/config/Makefile.am
diff --git a/config/ui/tabs.xml b/plugins/kimchi/ui/config/tab-ext.xml
similarity index 100%
rename from config/ui/tabs.xml
rename to plugins/kimchi/ui/config/tab-ext.xml
diff --git a/ui/css/Makefile.am b/plugins/kimchi/ui/css/Makefile.am
similarity index 100%
rename from ui/css/Makefile.am
rename to plugins/kimchi/ui/css/Makefile.am
diff --git a/ui/css/theme-default/guest-edit.css b/plugins/kimchi/ui/css/theme-default/guest-edit.css
similarity index 100%
rename from ui/css/theme-default/guest-edit.css
rename to plugins/kimchi/ui/css/theme-default/guest-edit.css
diff --git a/ui/css/theme-default/guest-storage-add.css b/plugins/kimchi/ui/css/theme-default/guest-storage-add.css
similarity index 100%
rename from ui/css/theme-default/guest-storage-add.css
rename to plugins/kimchi/ui/css/theme-default/guest-storage-add.css
diff --git a/ui/css/theme-default/host.css b/plugins/kimchi/ui/css/theme-default/host.css
similarity index 100%
rename from ui/css/theme-default/host.css
rename to plugins/kimchi/ui/css/theme-default/host.css
diff --git a/ui/css/theme-default/list.css b/plugins/kimchi/ui/css/theme-default/list.css
similarity index 100%
rename from ui/css/theme-default/list.css
rename to plugins/kimchi/ui/css/theme-default/list.css
diff --git a/ui/css/theme-default/network.css b/plugins/kimchi/ui/css/theme-default/network.css
similarity index 100%
rename from ui/css/theme-default/network.css
rename to plugins/kimchi/ui/css/theme-default/network.css
diff --git a/ui/css/theme-default/report-add.css b/plugins/kimchi/ui/css/theme-default/report-add.css
similarity index 100%
rename from ui/css/theme-default/report-add.css
rename to plugins/kimchi/ui/css/theme-default/report-add.css
diff --git a/ui/css/theme-default/report-rename.css b/plugins/kimchi/ui/css/theme-default/report-rename.css
similarity index 100%
rename from ui/css/theme-default/report-rename.css
rename to plugins/kimchi/ui/css/theme-default/report-rename.css
diff --git a/ui/css/theme-default/repository-add.css b/plugins/kimchi/ui/css/theme-default/repository-add.css
similarity index 100%
rename from ui/css/theme-default/repository-add.css
rename to plugins/kimchi/ui/css/theme-default/repository-add.css
diff --git a/ui/css/theme-default/repository-edit.css b/plugins/kimchi/ui/css/theme-default/repository-edit.css
similarity index 100%
rename from ui/css/theme-default/repository-edit.css
rename to plugins/kimchi/ui/css/theme-default/repository-edit.css
diff --git a/ui/css/theme-default/storage.css b/plugins/kimchi/ui/css/theme-default/storage.css
similarity index 100%
rename from ui/css/theme-default/storage.css
rename to plugins/kimchi/ui/css/theme-default/storage.css
diff --git a/ui/css/theme-default/storagepool-add-volume.css b/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css
similarity index 100%
rename from ui/css/theme-default/storagepool-add-volume.css
rename to plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css
diff --git a/ui/css/theme-default/template-edit.css b/plugins/kimchi/ui/css/theme-default/template-edit.css
similarity index 100%
rename from ui/css/theme-default/template-edit.css
rename to plugins/kimchi/ui/css/theme-default/template-edit.css
diff --git a/ui/css/theme-default/template.css b/plugins/kimchi/ui/css/theme-default/template.css
similarity index 100%
rename from ui/css/theme-default/template.css
rename to plugins/kimchi/ui/css/theme-default/template.css
diff --git a/ui/css/theme-default/template_add.css b/plugins/kimchi/ui/css/theme-default/template_add.css
similarity index 100%
rename from ui/css/theme-default/template_add.css
rename to plugins/kimchi/ui/css/theme-default/template_add.css
diff --git a/ui/css/theme-default/template_list.css b/plugins/kimchi/ui/css/theme-default/template_list.css
similarity index 100%
rename from ui/css/theme-default/template_list.css
rename to plugins/kimchi/ui/css/theme-default/template_list.css
diff --git a/ui/images/Makefile.am b/plugins/kimchi/ui/images/Makefile.am
similarity index 100%
rename from ui/images/Makefile.am
rename to plugins/kimchi/ui/images/Makefile.am
diff --git a/ui/images/theme-default/Makefile.am b/plugins/kimchi/ui/images/theme-default/Makefile.am
similarity index 100%
rename from ui/images/theme-default/Makefile.am
rename to plugins/kimchi/ui/images/theme-default/Makefile.am
diff --git a/ui/js/Makefile.am b/plugins/kimchi/ui/js/Makefile.am
similarity index 100%
rename from ui/js/Makefile.am
rename to plugins/kimchi/ui/js/Makefile.am
diff --git a/ui/js/src/kimchi.api.js b/plugins/kimchi/ui/js/src/kimchi.api.js
similarity index 100%
rename from ui/js/src/kimchi.api.js
rename to plugins/kimchi/ui/js/src/kimchi.api.js
diff --git a/ui/js/src/kimchi.guest_add_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
similarity index 100%
rename from ui/js/src/kimchi.guest_add_main.js
rename to plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
diff --git a/ui/js/src/kimchi.guest_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
similarity index 100%
rename from ui/js/src/kimchi.guest_edit_main.js
rename to plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
diff --git a/ui/js/src/kimchi.guest_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_main.js
similarity index 100%
rename from ui/js/src/kimchi.guest_main.js
rename to plugins/kimchi/ui/js/src/kimchi.guest_main.js
diff --git a/ui/js/src/kimchi.guest_media_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
similarity index 100%
rename from ui/js/src/kimchi.guest_media_main.js
rename to plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
similarity index 100%
rename from ui/js/src/kimchi.guest_storage_add.main.js
rename to plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
diff --git a/ui/js/src/kimchi.host.js b/plugins/kimchi/ui/js/src/kimchi.host.js
similarity index 100%
rename from ui/js/src/kimchi.host.js
rename to plugins/kimchi/ui/js/src/kimchi.host.js
diff --git a/ui/js/src/kimchi.network.js b/plugins/kimchi/ui/js/src/kimchi.network.js
similarity index 100%
rename from ui/js/src/kimchi.network.js
rename to plugins/kimchi/ui/js/src/kimchi.network.js
diff --git a/ui/js/src/kimchi.report_add_main.js b/plugins/kimchi/ui/js/src/kimchi.report_add_main.js
similarity index 100%
rename from ui/js/src/kimchi.report_add_main.js
rename to plugins/kimchi/ui/js/src/kimchi.report_add_main.js
diff --git a/ui/js/src/kimchi.report_rename_main.js b/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
similarity index 100%
rename from ui/js/src/kimchi.report_rename_main.js
rename to plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
diff --git a/ui/js/src/kimchi.repository_add_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
similarity index 100%
rename from ui/js/src/kimchi.repository_add_main.js
rename to plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
diff --git a/ui/js/src/kimchi.repository_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
similarity index 100%
rename from ui/js/src/kimchi.repository_edit_main.js
rename to plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
diff --git a/ui/js/src/kimchi.storage_main.js b/plugins/kimchi/ui/js/src/kimchi.storage_main.js
similarity index 100%
rename from ui/js/src/kimchi.storage_main.js
rename to plugins/kimchi/ui/js/src/kimchi.storage_main.js
diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js
similarity index 100%
rename from ui/js/src/kimchi.storagepool_add_main.js
rename to plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js
diff --git a/ui/js/src/kimchi.storagepool_add_volume_main.js b/plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js
similarity index 100%
rename from ui/js/src/kimchi.storagepool_add_volume_main.js
rename to plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js
diff --git a/ui/js/src/kimchi.template_add_main.js b/plugins/kimchi/ui/js/src/kimchi.template_add_main.js
similarity index 100%
rename from ui/js/src/kimchi.template_add_main.js
rename to plugins/kimchi/ui/js/src/kimchi.template_add_main.js
diff --git a/ui/js/src/kimchi.template_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
similarity index 100%
rename from ui/js/src/kimchi.template_edit_main.js
rename to plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
diff --git a/ui/js/src/kimchi.template_main.js b/plugins/kimchi/ui/js/src/kimchi.template_main.js
similarity index 100%
rename from ui/js/src/kimchi.template_main.js
rename to plugins/kimchi/ui/js/src/kimchi.template_main.js
diff --git a/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am
similarity index 100%
rename from ui/pages/Makefile.am
rename to plugins/kimchi/ui/pages/Makefile.am
diff --git a/ui/pages/guest-add.html.tmpl b/plugins/kimchi/ui/pages/guest-add.html.tmpl
similarity index 100%
rename from ui/pages/guest-add.html.tmpl
rename to plugins/kimchi/ui/pages/guest-add.html.tmpl
diff --git a/ui/pages/guest-edit.html.tmpl b/plugins/kimchi/ui/pages/guest-edit.html.tmpl
similarity index 100%
rename from ui/pages/guest-edit.html.tmpl
rename to plugins/kimchi/ui/pages/guest-edit.html.tmpl
diff --git a/ui/pages/guest-storage-add.html.tmpl b/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
similarity index 100%
rename from ui/pages/guest-storage-add.html.tmpl
rename to plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
diff --git a/ui/pages/guest.html.tmpl b/plugins/kimchi/ui/pages/guest.html.tmpl
similarity index 100%
rename from ui/pages/guest.html.tmpl
rename to plugins/kimchi/ui/pages/guest.html.tmpl
diff --git a/ui/pages/help/Makefile.am b/plugins/kimchi/ui/pages/help/Makefile.am
similarity index 100%
rename from ui/pages/help/Makefile.am
rename to plugins/kimchi/ui/pages/help/Makefile.am
diff --git a/ui/pages/help/de_DE/Makefile.am b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
similarity index 100%
rename from ui/pages/help/de_DE/Makefile.am
rename to plugins/kimchi/ui/pages/help/de_DE/Makefile.am
diff --git a/ui/pages/help/de_DE/guests.dita b/plugins/kimchi/ui/pages/help/de_DE/guests.dita
similarity index 100%
rename from ui/pages/help/de_DE/guests.dita
rename to plugins/kimchi/ui/pages/help/de_DE/guests.dita
diff --git a/ui/pages/help/de_DE/host.dita b/plugins/kimchi/ui/pages/help/de_DE/host.dita
similarity index 100%
rename from ui/pages/help/de_DE/host.dita
rename to plugins/kimchi/ui/pages/help/de_DE/host.dita
diff --git a/ui/pages/help/de_DE/network.dita b/plugins/kimchi/ui/pages/help/de_DE/network.dita
similarity index 100%
rename from ui/pages/help/de_DE/network.dita
rename to plugins/kimchi/ui/pages/help/de_DE/network.dita
diff --git a/ui/pages/help/de_DE/storage.dita b/plugins/kimchi/ui/pages/help/de_DE/storage.dita
similarity index 100%
rename from ui/pages/help/de_DE/storage.dita
rename to plugins/kimchi/ui/pages/help/de_DE/storage.dita
diff --git a/ui/pages/help/de_DE/templates.dita b/plugins/kimchi/ui/pages/help/de_DE/templates.dita
similarity index 100%
rename from ui/pages/help/de_DE/templates.dita
rename to plugins/kimchi/ui/pages/help/de_DE/templates.dita
diff --git a/ui/pages/help/dita-help.xsl b/plugins/kimchi/ui/pages/help/dita-help.xsl
similarity index 100%
rename from ui/pages/help/dita-help.xsl
rename to plugins/kimchi/ui/pages/help/dita-help.xsl
diff --git a/ui/pages/help/en_US/Makefile.am b/plugins/kimchi/ui/pages/help/en_US/Makefile.am
similarity index 100%
rename from ui/pages/help/en_US/Makefile.am
rename to plugins/kimchi/ui/pages/help/en_US/Makefile.am
diff --git a/ui/pages/help/en_US/guests.dita b/plugins/kimchi/ui/pages/help/en_US/guests.dita
similarity index 100%
rename from ui/pages/help/en_US/guests.dita
rename to plugins/kimchi/ui/pages/help/en_US/guests.dita
diff --git a/ui/pages/help/en_US/host.dita b/plugins/kimchi/ui/pages/help/en_US/host.dita
similarity index 100%
rename from ui/pages/help/en_US/host.dita
rename to plugins/kimchi/ui/pages/help/en_US/host.dita
diff --git a/ui/pages/help/en_US/network.dita b/plugins/kimchi/ui/pages/help/en_US/network.dita
similarity index 100%
rename from ui/pages/help/en_US/network.dita
rename to plugins/kimchi/ui/pages/help/en_US/network.dita
diff --git a/ui/pages/help/en_US/storage.dita b/plugins/kimchi/ui/pages/help/en_US/storage.dita
similarity index 100%
rename from ui/pages/help/en_US/storage.dita
rename to plugins/kimchi/ui/pages/help/en_US/storage.dita
diff --git a/ui/pages/help/en_US/templates.dita b/plugins/kimchi/ui/pages/help/en_US/templates.dita
similarity index 100%
rename from ui/pages/help/en_US/templates.dita
rename to plugins/kimchi/ui/pages/help/en_US/templates.dita
diff --git a/ui/pages/help/es_ES/Makefile.am b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
similarity index 100%
rename from ui/pages/help/es_ES/Makefile.am
rename to plugins/kimchi/ui/pages/help/es_ES/Makefile.am
diff --git a/ui/pages/help/es_ES/guests.dita b/plugins/kimchi/ui/pages/help/es_ES/guests.dita
similarity index 100%
rename from ui/pages/help/es_ES/guests.dita
rename to plugins/kimchi/ui/pages/help/es_ES/guests.dita
diff --git a/ui/pages/help/es_ES/host.dita b/plugins/kimchi/ui/pages/help/es_ES/host.dita
similarity index 100%
rename from ui/pages/help/es_ES/host.dita
rename to plugins/kimchi/ui/pages/help/es_ES/host.dita
diff --git a/ui/pages/help/es_ES/network.dita b/plugins/kimchi/ui/pages/help/es_ES/network.dita
similarity index 100%
rename from ui/pages/help/es_ES/network.dita
rename to plugins/kimchi/ui/pages/help/es_ES/network.dita
diff --git a/ui/pages/help/es_ES/storage.dita b/plugins/kimchi/ui/pages/help/es_ES/storage.dita
similarity index 100%
rename from ui/pages/help/es_ES/storage.dita
rename to plugins/kimchi/ui/pages/help/es_ES/storage.dita
diff --git a/ui/pages/help/es_ES/templates.dita b/plugins/kimchi/ui/pages/help/es_ES/templates.dita
similarity index 100%
rename from ui/pages/help/es_ES/templates.dita
rename to plugins/kimchi/ui/pages/help/es_ES/templates.dita
diff --git a/ui/pages/help/fr_FR/Makefile.am b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
similarity index 100%
rename from ui/pages/help/fr_FR/Makefile.am
rename to plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
diff --git a/ui/pages/help/fr_FR/guests.dita b/plugins/kimchi/ui/pages/help/fr_FR/guests.dita
similarity index 100%
rename from ui/pages/help/fr_FR/guests.dita
rename to plugins/kimchi/ui/pages/help/fr_FR/guests.dita
diff --git a/ui/pages/help/fr_FR/host.dita b/plugins/kimchi/ui/pages/help/fr_FR/host.dita
similarity index 100%
rename from ui/pages/help/fr_FR/host.dita
rename to plugins/kimchi/ui/pages/help/fr_FR/host.dita
diff --git a/ui/pages/help/fr_FR/network.dita b/plugins/kimchi/ui/pages/help/fr_FR/network.dita
similarity index 100%
rename from ui/pages/help/fr_FR/network.dita
rename to plugins/kimchi/ui/pages/help/fr_FR/network.dita
diff --git a/ui/pages/help/fr_FR/storage.dita b/plugins/kimchi/ui/pages/help/fr_FR/storage.dita
similarity index 100%
rename from ui/pages/help/fr_FR/storage.dita
rename to plugins/kimchi/ui/pages/help/fr_FR/storage.dita
diff --git a/ui/pages/help/fr_FR/templates.dita b/plugins/kimchi/ui/pages/help/fr_FR/templates.dita
similarity index 100%
rename from ui/pages/help/fr_FR/templates.dita
rename to plugins/kimchi/ui/pages/help/fr_FR/templates.dita
diff --git a/ui/pages/help/gen-index.py b/plugins/kimchi/ui/pages/help/gen-index.py
similarity index 100%
rename from ui/pages/help/gen-index.py
rename to plugins/kimchi/ui/pages/help/gen-index.py
diff --git a/ui/pages/help/it_IT/Makefile.am b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
similarity index 100%
rename from ui/pages/help/it_IT/Makefile.am
rename to plugins/kimchi/ui/pages/help/it_IT/Makefile.am
diff --git a/ui/pages/help/it_IT/guests.dita b/plugins/kimchi/ui/pages/help/it_IT/guests.dita
similarity index 100%
rename from ui/pages/help/it_IT/guests.dita
rename to plugins/kimchi/ui/pages/help/it_IT/guests.dita
diff --git a/ui/pages/help/it_IT/host.dita b/plugins/kimchi/ui/pages/help/it_IT/host.dita
similarity index 100%
rename from ui/pages/help/it_IT/host.dita
rename to plugins/kimchi/ui/pages/help/it_IT/host.dita
diff --git a/ui/pages/help/it_IT/network.dita b/plugins/kimchi/ui/pages/help/it_IT/network.dita
similarity index 100%
rename from ui/pages/help/it_IT/network.dita
rename to plugins/kimchi/ui/pages/help/it_IT/network.dita
diff --git a/ui/pages/help/it_IT/storage.dita b/plugins/kimchi/ui/pages/help/it_IT/storage.dita
similarity index 100%
rename from ui/pages/help/it_IT/storage.dita
rename to plugins/kimchi/ui/pages/help/it_IT/storage.dita
diff --git a/ui/pages/help/it_IT/templates.dita b/plugins/kimchi/ui/pages/help/it_IT/templates.dita
similarity index 100%
rename from ui/pages/help/it_IT/templates.dita
rename to plugins/kimchi/ui/pages/help/it_IT/templates.dita
diff --git a/ui/pages/help/ja_JP/Makefile.am b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
similarity index 100%
rename from ui/pages/help/ja_JP/Makefile.am
rename to plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
diff --git a/ui/pages/help/ja_JP/guests.dita b/plugins/kimchi/ui/pages/help/ja_JP/guests.dita
similarity index 100%
rename from ui/pages/help/ja_JP/guests.dita
rename to plugins/kimchi/ui/pages/help/ja_JP/guests.dita
diff --git a/ui/pages/help/ja_JP/host.dita b/plugins/kimchi/ui/pages/help/ja_JP/host.dita
similarity index 100%
rename from ui/pages/help/ja_JP/host.dita
rename to plugins/kimchi/ui/pages/help/ja_JP/host.dita
diff --git a/ui/pages/help/ja_JP/network.dita b/plugins/kimchi/ui/pages/help/ja_JP/network.dita
similarity index 100%
rename from ui/pages/help/ja_JP/network.dita
rename to plugins/kimchi/ui/pages/help/ja_JP/network.dita
diff --git a/ui/pages/help/ja_JP/storage.dita b/plugins/kimchi/ui/pages/help/ja_JP/storage.dita
similarity index 100%
rename from ui/pages/help/ja_JP/storage.dita
rename to plugins/kimchi/ui/pages/help/ja_JP/storage.dita
diff --git a/ui/pages/help/ja_JP/templates.dita b/plugins/kimchi/ui/pages/help/ja_JP/templates.dita
similarity index 100%
rename from ui/pages/help/ja_JP/templates.dita
rename to plugins/kimchi/ui/pages/help/ja_JP/templates.dita
diff --git a/ui/pages/help/kimchi.css b/plugins/kimchi/ui/pages/help/kimchi.css
similarity index 100%
rename from ui/pages/help/kimchi.css
rename to plugins/kimchi/ui/pages/help/kimchi.css
diff --git a/ui/pages/help/ko_KR/Makefile.am b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
similarity index 100%
rename from ui/pages/help/ko_KR/Makefile.am
rename to plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
diff --git a/ui/pages/help/ko_KR/guests.dita b/plugins/kimchi/ui/pages/help/ko_KR/guests.dita
similarity index 100%
rename from ui/pages/help/ko_KR/guests.dita
rename to plugins/kimchi/ui/pages/help/ko_KR/guests.dita
diff --git a/ui/pages/help/ko_KR/host.dita b/plugins/kimchi/ui/pages/help/ko_KR/host.dita
similarity index 100%
rename from ui/pages/help/ko_KR/host.dita
rename to plugins/kimchi/ui/pages/help/ko_KR/host.dita
diff --git a/ui/pages/help/ko_KR/network.dita b/plugins/kimchi/ui/pages/help/ko_KR/network.dita
similarity index 100%
rename from ui/pages/help/ko_KR/network.dita
rename to plugins/kimchi/ui/pages/help/ko_KR/network.dita
diff --git a/ui/pages/help/ko_KR/storage.dita b/plugins/kimchi/ui/pages/help/ko_KR/storage.dita
similarity index 100%
rename from ui/pages/help/ko_KR/storage.dita
rename to plugins/kimchi/ui/pages/help/ko_KR/storage.dita
diff --git a/ui/pages/help/ko_KR/templates.dita b/plugins/kimchi/ui/pages/help/ko_KR/templates.dita
similarity index 100%
rename from ui/pages/help/ko_KR/templates.dita
rename to plugins/kimchi/ui/pages/help/ko_KR/templates.dita
diff --git a/ui/pages/help/pt_BR/Makefile.am b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
similarity index 100%
rename from ui/pages/help/pt_BR/Makefile.am
rename to plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
diff --git a/ui/pages/help/pt_BR/guests.dita b/plugins/kimchi/ui/pages/help/pt_BR/guests.dita
similarity index 100%
rename from ui/pages/help/pt_BR/guests.dita
rename to plugins/kimchi/ui/pages/help/pt_BR/guests.dita
diff --git a/ui/pages/help/pt_BR/host.dita b/plugins/kimchi/ui/pages/help/pt_BR/host.dita
similarity index 100%
rename from ui/pages/help/pt_BR/host.dita
rename to plugins/kimchi/ui/pages/help/pt_BR/host.dita
diff --git a/ui/pages/help/pt_BR/network.dita b/plugins/kimchi/ui/pages/help/pt_BR/network.dita
similarity index 100%
rename from ui/pages/help/pt_BR/network.dita
rename to plugins/kimchi/ui/pages/help/pt_BR/network.dita
diff --git a/ui/pages/help/pt_BR/storage.dita b/plugins/kimchi/ui/pages/help/pt_BR/storage.dita
similarity index 100%
rename from ui/pages/help/pt_BR/storage.dita
rename to plugins/kimchi/ui/pages/help/pt_BR/storage.dita
diff --git a/ui/pages/help/pt_BR/templates.dita b/plugins/kimchi/ui/pages/help/pt_BR/templates.dita
similarity index 100%
rename from ui/pages/help/pt_BR/templates.dita
rename to plugins/kimchi/ui/pages/help/pt_BR/templates.dita
diff --git a/ui/pages/help/ru_RU/Makefile.am b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
similarity index 100%
rename from ui/pages/help/ru_RU/Makefile.am
rename to plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
diff --git a/ui/pages/help/ru_RU/guests.dita b/plugins/kimchi/ui/pages/help/ru_RU/guests.dita
similarity index 100%
rename from ui/pages/help/ru_RU/guests.dita
rename to plugins/kimchi/ui/pages/help/ru_RU/guests.dita
diff --git a/ui/pages/help/ru_RU/host.dita b/plugins/kimchi/ui/pages/help/ru_RU/host.dita
similarity index 100%
rename from ui/pages/help/ru_RU/host.dita
rename to plugins/kimchi/ui/pages/help/ru_RU/host.dita
diff --git a/ui/pages/help/ru_RU/network.dita b/plugins/kimchi/ui/pages/help/ru_RU/network.dita
similarity index 100%
rename from ui/pages/help/ru_RU/network.dita
rename to plugins/kimchi/ui/pages/help/ru_RU/network.dita
diff --git a/ui/pages/help/ru_RU/storage.dita b/plugins/kimchi/ui/pages/help/ru_RU/storage.dita
similarity index 100%
rename from ui/pages/help/ru_RU/storage.dita
rename to plugins/kimchi/ui/pages/help/ru_RU/storage.dita
diff --git a/ui/pages/help/ru_RU/templates.dita b/plugins/kimchi/ui/pages/help/ru_RU/templates.dita
similarity index 100%
rename from ui/pages/help/ru_RU/templates.dita
rename to plugins/kimchi/ui/pages/help/ru_RU/templates.dita
diff --git a/ui/pages/help/zh_CN/Makefile.am b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
similarity index 100%
rename from ui/pages/help/zh_CN/Makefile.am
rename to plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
diff --git a/ui/pages/help/zh_CN/guests.dita b/plugins/kimchi/ui/pages/help/zh_CN/guests.dita
similarity index 100%
rename from ui/pages/help/zh_CN/guests.dita
rename to plugins/kimchi/ui/pages/help/zh_CN/guests.dita
diff --git a/ui/pages/help/zh_CN/host.dita b/plugins/kimchi/ui/pages/help/zh_CN/host.dita
similarity index 100%
rename from ui/pages/help/zh_CN/host.dita
rename to plugins/kimchi/ui/pages/help/zh_CN/host.dita
diff --git a/ui/pages/help/zh_CN/network.dita b/plugins/kimchi/ui/pages/help/zh_CN/network.dita
similarity index 100%
rename from ui/pages/help/zh_CN/network.dita
rename to plugins/kimchi/ui/pages/help/zh_CN/network.dita
diff --git a/ui/pages/help/zh_CN/storage.dita b/plugins/kimchi/ui/pages/help/zh_CN/storage.dita
similarity index 100%
rename from ui/pages/help/zh_CN/storage.dita
rename to plugins/kimchi/ui/pages/help/zh_CN/storage.dita
diff --git a/ui/pages/help/zh_CN/templates.dita b/plugins/kimchi/ui/pages/help/zh_CN/templates.dita
similarity index 100%
rename from ui/pages/help/zh_CN/templates.dita
rename to plugins/kimchi/ui/pages/help/zh_CN/templates.dita
diff --git a/ui/pages/help/zh_TW/Makefile.am b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
similarity index 100%
rename from ui/pages/help/zh_TW/Makefile.am
rename to plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
diff --git a/ui/pages/help/zh_TW/guests.dita b/plugins/kimchi/ui/pages/help/zh_TW/guests.dita
similarity index 100%
rename from ui/pages/help/zh_TW/guests.dita
rename to plugins/kimchi/ui/pages/help/zh_TW/guests.dita
diff --git a/ui/pages/help/zh_TW/host.dita b/plugins/kimchi/ui/pages/help/zh_TW/host.dita
similarity index 100%
rename from ui/pages/help/zh_TW/host.dita
rename to plugins/kimchi/ui/pages/help/zh_TW/host.dita
diff --git a/ui/pages/help/zh_TW/network.dita b/plugins/kimchi/ui/pages/help/zh_TW/network.dita
similarity index 100%
rename from ui/pages/help/zh_TW/network.dita
rename to plugins/kimchi/ui/pages/help/zh_TW/network.dita
diff --git a/ui/pages/help/zh_TW/storage.dita b/plugins/kimchi/ui/pages/help/zh_TW/storage.dita
similarity index 100%
rename from ui/pages/help/zh_TW/storage.dita
rename to plugins/kimchi/ui/pages/help/zh_TW/storage.dita
diff --git a/ui/pages/help/zh_TW/templates.dita b/plugins/kimchi/ui/pages/help/zh_TW/templates.dita
similarity index 100%
rename from ui/pages/help/zh_TW/templates.dita
rename to plugins/kimchi/ui/pages/help/zh_TW/templates.dita
diff --git a/ui/pages/i18n.json.tmpl b/plugins/kimchi/ui/pages/i18n.json.tmpl
similarity index 100%
rename from ui/pages/i18n.json.tmpl
rename to plugins/kimchi/ui/pages/i18n.json.tmpl
diff --git a/ui/pages/report-add.html.tmpl b/plugins/kimchi/ui/pages/report-add.html.tmpl
similarity index 100%
rename from ui/pages/report-add.html.tmpl
rename to plugins/kimchi/ui/pages/report-add.html.tmpl
diff --git a/ui/pages/report-rename.html.tmpl b/plugins/kimchi/ui/pages/report-rename.html.tmpl
similarity index 100%
rename from ui/pages/report-rename.html.tmpl
rename to plugins/kimchi/ui/pages/report-rename.html.tmpl
diff --git a/ui/pages/repository-add.html.tmpl b/plugins/kimchi/ui/pages/repository-add.html.tmpl
similarity index 100%
rename from ui/pages/repository-add.html.tmpl
rename to plugins/kimchi/ui/pages/repository-add.html.tmpl
diff --git a/ui/pages/repository-edit.html.tmpl b/plugins/kimchi/ui/pages/repository-edit.html.tmpl
similarity index 100%
rename from ui/pages/repository-edit.html.tmpl
rename to plugins/kimchi/ui/pages/repository-edit.html.tmpl
diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl
similarity index 100%
rename from ui/pages/storagepool-add-volume.html.tmpl
rename to plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl
diff --git a/ui/pages/storagepool-add.html.tmpl b/plugins/kimchi/ui/pages/storagepool-add.html.tmpl
similarity index 100%
rename from ui/pages/storagepool-add.html.tmpl
rename to plugins/kimchi/ui/pages/storagepool-add.html.tmpl
diff --git a/ui/pages/tabs/Makefile.am b/plugins/kimchi/ui/pages/tabs/Makefile.am
similarity index 100%
rename from ui/pages/tabs/Makefile.am
rename to plugins/kimchi/ui/pages/tabs/Makefile.am
diff --git a/ui/pages/tabs/guests.html.tmpl b/plugins/kimchi/ui/pages/tabs/guests.html.tmpl
similarity index 100%
rename from ui/pages/tabs/guests.html.tmpl
rename to plugins/kimchi/ui/pages/tabs/guests.html.tmpl
diff --git a/ui/pages/tabs/host.html.tmpl b/plugins/kimchi/ui/pages/tabs/host.html.tmpl
similarity index 100%
rename from ui/pages/tabs/host.html.tmpl
rename to plugins/kimchi/ui/pages/tabs/host.html.tmpl
diff --git a/ui/pages/tabs/network.html.tmpl b/plugins/kimchi/ui/pages/tabs/network.html.tmpl
similarity index 100%
rename from ui/pages/tabs/network.html.tmpl
rename to plugins/kimchi/ui/pages/tabs/network.html.tmpl
diff --git a/ui/pages/tabs/storage.html.tmpl b/plugins/kimchi/ui/pages/tabs/storage.html.tmpl
similarity index 100%
rename from ui/pages/tabs/storage.html.tmpl
rename to plugins/kimchi/ui/pages/tabs/storage.html.tmpl
diff --git a/ui/pages/tabs/templates.html.tmpl b/plugins/kimchi/ui/pages/tabs/templates.html.tmpl
similarity index 100%
rename from ui/pages/tabs/templates.html.tmpl
rename to plugins/kimchi/ui/pages/tabs/templates.html.tmpl
diff --git a/ui/pages/template-add.html.tmpl b/plugins/kimchi/ui/pages/template-add.html.tmpl
similarity index 100%
rename from ui/pages/template-add.html.tmpl
rename to plugins/kimchi/ui/pages/template-add.html.tmpl
diff --git a/ui/pages/template-edit.html.tmpl b/plugins/kimchi/ui/pages/template-edit.html.tmpl
similarity index 100%
rename from ui/pages/template-edit.html.tmpl
rename to plugins/kimchi/ui/pages/template-edit.html.tmpl
diff --git a/ui/robots.txt b/plugins/kimchi/ui/robots.txt
similarity index 100%
rename from ui/robots.txt
rename to plugins/kimchi/ui/robots.txt
diff --git a/ui/spice-html5/Makefile.am b/plugins/kimchi/ui/spice-html5/Makefile.am
similarity index 100%
rename from ui/spice-html5/Makefile.am
rename to plugins/kimchi/ui/spice-html5/Makefile.am
diff --git a/ui/spice-html5/atKeynames.js b/plugins/kimchi/ui/spice-html5/atKeynames.js
similarity index 100%
rename from ui/spice-html5/atKeynames.js
rename to plugins/kimchi/ui/spice-html5/atKeynames.js
diff --git a/ui/spice-html5/bitmap.js b/plugins/kimchi/ui/spice-html5/bitmap.js
similarity index 100%
rename from ui/spice-html5/bitmap.js
rename to plugins/kimchi/ui/spice-html5/bitmap.js
diff --git a/ui/spice-html5/css/Makefile.am b/plugins/kimchi/ui/spice-html5/css/Makefile.am
similarity index 100%
rename from ui/spice-html5/css/Makefile.am
rename to plugins/kimchi/ui/spice-html5/css/Makefile.am
diff --git a/ui/spice-html5/css/spice.css b/plugins/kimchi/ui/spice-html5/css/spice.css
similarity index 100%
rename from ui/spice-html5/css/spice.css
rename to plugins/kimchi/ui/spice-html5/css/spice.css
diff --git a/ui/spice-html5/cursor.js b/plugins/kimchi/ui/spice-html5/cursor.js
similarity index 100%
rename from ui/spice-html5/cursor.js
rename to plugins/kimchi/ui/spice-html5/cursor.js
diff --git a/ui/spice-html5/display.js b/plugins/kimchi/ui/spice-html5/display.js
similarity index 100%
rename from ui/spice-html5/display.js
rename to plugins/kimchi/ui/spice-html5/display.js
diff --git a/ui/spice-html5/enums.js b/plugins/kimchi/ui/spice-html5/enums.js
similarity index 100%
rename from ui/spice-html5/enums.js
rename to plugins/kimchi/ui/spice-html5/enums.js
diff --git a/ui/spice-html5/inputs.js b/plugins/kimchi/ui/spice-html5/inputs.js
similarity index 100%
rename from ui/spice-html5/inputs.js
rename to plugins/kimchi/ui/spice-html5/inputs.js
diff --git a/ui/spice-html5/lz.js b/plugins/kimchi/ui/spice-html5/lz.js
similarity index 100%
rename from ui/spice-html5/lz.js
rename to plugins/kimchi/ui/spice-html5/lz.js
diff --git a/ui/spice-html5/main.js b/plugins/kimchi/ui/spice-html5/main.js
similarity index 100%
rename from ui/spice-html5/main.js
rename to plugins/kimchi/ui/spice-html5/main.js
diff --git a/ui/spice-html5/pages/Makefile.am b/plugins/kimchi/ui/spice-html5/pages/Makefile.am
similarity index 100%
rename from ui/spice-html5/pages/Makefile.am
rename to plugins/kimchi/ui/spice-html5/pages/Makefile.am
diff --git a/ui/spice-html5/pages/spice_auto.html b/plugins/kimchi/ui/spice-html5/pages/spice_auto.html
similarity index 100%
rename from ui/spice-html5/pages/spice_auto.html
rename to plugins/kimchi/ui/spice-html5/pages/spice_auto.html
diff --git a/ui/spice-html5/playback.js b/plugins/kimchi/ui/spice-html5/playback.js
similarity index 100%
rename from ui/spice-html5/playback.js
rename to plugins/kimchi/ui/spice-html5/playback.js
diff --git a/ui/spice-html5/png.js b/plugins/kimchi/ui/spice-html5/png.js
similarity index 100%
rename from ui/spice-html5/png.js
rename to plugins/kimchi/ui/spice-html5/png.js
diff --git a/ui/spice-html5/quic.js b/plugins/kimchi/ui/spice-html5/quic.js
similarity index 100%
rename from ui/spice-html5/quic.js
rename to plugins/kimchi/ui/spice-html5/quic.js
diff --git a/ui/spice-html5/resize.js b/plugins/kimchi/ui/spice-html5/resize.js
similarity index 100%
rename from ui/spice-html5/resize.js
rename to plugins/kimchi/ui/spice-html5/resize.js
diff --git a/ui/spice-html5/simulatecursor.js b/plugins/kimchi/ui/spice-html5/simulatecursor.js
similarity index 100%
rename from ui/spice-html5/simulatecursor.js
rename to plugins/kimchi/ui/spice-html5/simulatecursor.js
diff --git a/ui/spice-html5/spicearraybuffer.js b/plugins/kimchi/ui/spice-html5/spicearraybuffer.js
similarity index 100%
rename from ui/spice-html5/spicearraybuffer.js
rename to plugins/kimchi/ui/spice-html5/spicearraybuffer.js
diff --git a/ui/spice-html5/spiceconn.js b/plugins/kimchi/ui/spice-html5/spiceconn.js
similarity index 100%
rename from ui/spice-html5/spiceconn.js
rename to plugins/kimchi/ui/spice-html5/spiceconn.js
diff --git a/ui/spice-html5/spicedataview.js b/plugins/kimchi/ui/spice-html5/spicedataview.js
similarity index 100%
rename from ui/spice-html5/spicedataview.js
rename to plugins/kimchi/ui/spice-html5/spicedataview.js
diff --git a/ui/spice-html5/spicemsg.js b/plugins/kimchi/ui/spice-html5/spicemsg.js
similarity index 100%
rename from ui/spice-html5/spicemsg.js
rename to plugins/kimchi/ui/spice-html5/spicemsg.js
diff --git a/ui/spice-html5/spicetype.js b/plugins/kimchi/ui/spice-html5/spicetype.js
similarity index 100%
rename from ui/spice-html5/spicetype.js
rename to plugins/kimchi/ui/spice-html5/spicetype.js
diff --git a/ui/spice-html5/thirdparty/Makefile.am b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
similarity index 100%
rename from ui/spice-html5/thirdparty/Makefile.am
rename to plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
diff --git a/ui/spice-html5/thirdparty/jsbn.js b/plugins/kimchi/ui/spice-html5/thirdparty/jsbn.js
similarity index 100%
rename from ui/spice-html5/thirdparty/jsbn.js
rename to plugins/kimchi/ui/spice-html5/thirdparty/jsbn.js
diff --git a/ui/spice-html5/thirdparty/prng4.js b/plugins/kimchi/ui/spice-html5/thirdparty/prng4.js
similarity index 100%
rename from ui/spice-html5/thirdparty/prng4.js
rename to plugins/kimchi/ui/spice-html5/thirdparty/prng4.js
diff --git a/ui/spice-html5/thirdparty/rng.js b/plugins/kimchi/ui/spice-html5/thirdparty/rng.js
similarity index 100%
rename from ui/spice-html5/thirdparty/rng.js
rename to plugins/kimchi/ui/spice-html5/thirdparty/rng.js
diff --git a/ui/spice-html5/thirdparty/rsa.js b/plugins/kimchi/ui/spice-html5/thirdparty/rsa.js
similarity index 100%
rename from ui/spice-html5/thirdparty/rsa.js
rename to plugins/kimchi/ui/spice-html5/thirdparty/rsa.js
diff --git a/ui/spice-html5/thirdparty/sha1.js b/plugins/kimchi/ui/spice-html5/thirdparty/sha1.js
similarity index 100%
rename from ui/spice-html5/thirdparty/sha1.js
rename to plugins/kimchi/ui/spice-html5/thirdparty/sha1.js
diff --git a/ui/spice-html5/ticket.js b/plugins/kimchi/ui/spice-html5/ticket.js
similarity index 100%
rename from ui/spice-html5/ticket.js
rename to plugins/kimchi/ui/spice-html5/ticket.js
diff --git a/ui/spice-html5/utils.js b/plugins/kimchi/ui/spice-html5/utils.js
similarity index 100%
rename from ui/spice-html5/utils.js
rename to plugins/kimchi/ui/spice-html5/utils.js
diff --git a/ui/spice-html5/webm.js b/plugins/kimchi/ui/spice-html5/webm.js
similarity index 100%
rename from ui/spice-html5/webm.js
rename to plugins/kimchi/ui/spice-html5/webm.js
diff --git a/ui/spice-html5/wire.js b/plugins/kimchi/ui/spice-html5/wire.js
similarity index 100%
rename from ui/spice-html5/wire.js
rename to plugins/kimchi/ui/spice-html5/wire.js
diff --git a/src/kimchi/vmtemplate.py b/plugins/kimchi/vmtemplate.py
similarity index 100%
rename from src/kimchi/vmtemplate.py
rename to plugins/kimchi/vmtemplate.py
diff --git a/src/kimchi/xmlutils/Makefile.am b/plugins/kimchi/xmlutils/Makefile.am
similarity index 100%
rename from src/kimchi/xmlutils/Makefile.am
rename to plugins/kimchi/xmlutils/Makefile.am
diff --git a/src/kimchi/xmlutils/__init__.py b/plugins/kimchi/xmlutils/__init__.py
similarity index 100%
rename from src/kimchi/xmlutils/__init__.py
rename to plugins/kimchi/xmlutils/__init__.py
diff --git a/src/kimchi/xmlutils/cpu.py b/plugins/kimchi/xmlutils/cpu.py
similarity index 100%
rename from src/kimchi/xmlutils/cpu.py
rename to plugins/kimchi/xmlutils/cpu.py
diff --git a/src/kimchi/xmlutils/disk.py b/plugins/kimchi/xmlutils/disk.py
similarity index 100%
rename from src/kimchi/xmlutils/disk.py
rename to plugins/kimchi/xmlutils/disk.py
diff --git a/src/kimchi/xmlutils/graphics.py b/plugins/kimchi/xmlutils/graphics.py
similarity index 100%
rename from src/kimchi/xmlutils/graphics.py
rename to plugins/kimchi/xmlutils/graphics.py
diff --git a/src/kimchi/xmlutils/interface.py b/plugins/kimchi/xmlutils/interface.py
similarity index 100%
rename from src/kimchi/xmlutils/interface.py
rename to plugins/kimchi/xmlutils/interface.py
diff --git a/src/kimchi/xmlutils/network.py b/plugins/kimchi/xmlutils/network.py
similarity index 100%
rename from src/kimchi/xmlutils/network.py
rename to plugins/kimchi/xmlutils/network.py
diff --git a/src/kimchi/xmlutils/qemucmdline.py b/plugins/kimchi/xmlutils/qemucmdline.py
similarity index 100%
rename from src/kimchi/xmlutils/qemucmdline.py
rename to plugins/kimchi/xmlutils/qemucmdline.py
diff --git a/src/kimchi/yumparser.py b/plugins/kimchi/yumparser.py
similarity index 100%
rename from src/kimchi/yumparser.py
rename to plugins/kimchi/yumparser.py
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:37 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:37 -0300
Subject: [Kimchi-devel] [PATCH V3 05/34] Duplicate some files
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-6-git-send-email-luciojhc@linux.vnet.ibm.com>

- Duplicate UI files from kimchi to wok
In the future, wok may have its own UI files. Since it is
not the focus of this patchset, just duplicate them for now.

- Add i18n files to wok
Copy files from kimchi for now. The error messages will be
split up in a future patch.

- Add packaging specs to wok
Copies respective plugins/kimchi/contrib counterparts.

- Add back necessary __init__.py and Makefile.am files to wok

- Copy autogen, configure, build-aux, m4 files to plugins/kimchi
- Copy documentation files to plugins/kimchi
- Add .gitignore to plugins/kimchi for further separation from
wok.

No code changes in this patch, only copies.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 VERSION                                      |    1 +
 contrib/DEBIAN/Makefile.am                   |   17 +
 contrib/DEBIAN/control.in                    |   36 +
 contrib/Makefile.am                          |   38 +
 contrib/make-deb.sh.in                       |   15 +
 contrib/wok.spec.fedora.in                   |  189 +++
 contrib/wok.spec.suse.in                     |  150 ++
 docs/Makefile.am                             |   31 +
 plugins/kimchi/.gitignore                    |   43 +
 plugins/kimchi/INSTALL                       |  369 +++++
 plugins/kimchi/Makefile.am                   |  165 ++
 plugins/kimchi/autogen.sh                    |   21 +
 plugins/kimchi/build-aux/config.rpath        |  672 ++++++++
 plugins/kimchi/build-aux/genChangelog        |   25 +
 plugins/kimchi/build-aux/pkg-version         |   59 +
 plugins/kimchi/config.rpath                  |  672 ++++++++
 plugins/kimchi/configure.ac                  |  150 ++
 plugins/kimchi/contrib/check_i18n.py         |   82 +
 plugins/kimchi/m4/ac_python_module.m4        |   30 +
 plugins/kimchi/m4/gettext.m4                 |  383 +++++
 plugins/kimchi/m4/iconv.m4                   |  214 +++
 plugins/kimchi/m4/intlmacosx.m4              |   51 +
 plugins/kimchi/m4/lib-ld.m4                  |  110 ++
 plugins/kimchi/m4/lib-link.m4                |  774 +++++++++
 plugins/kimchi/m4/lib-prefix.m4              |  224 +++
 plugins/kimchi/m4/nls.m4                     |   32 +
 plugins/kimchi/m4/po.m4                      |  449 ++++++
 plugins/kimchi/m4/progtest.m4                |   92 ++
 po/LINGUAS                                   |   11 +
 po/Makefile.in.in                            |  398 +++++
 po/Makevars                                  |   41 +
 po/POTFILES.in                               |    4 +
 po/gen-pot.in                                |    9 +
 po/wok.pot                                   | 2162 ++++++++++++++++++++++++++
 src/wok/control/Makefile.am                  |   27 +
 src/wok/control/__init__.py                  |   26 +
 src/wok/i18n.py                              |  354 +++++
 src/wok/model/Makefile.am                    |   25 +
 src/wok/model/__init__.py                    |   18 +
 src/wok/xmlutils/Makefile.am                 |   25 +
 src/wok/xmlutils/__init__.py                 |   18 +
 ui/css/Makefile.am                           |   26 +
 ui/images/Makefile.am                        |   22 +
 ui/images/logo.ico                           |  Bin 0 -> 1214 bytes
 ui/images/theme-default/Makefile.am          |   20 +
 ui/images/theme-default/arrow-down-black.png |  Bin 0 -> 2942 bytes
 ui/images/theme-default/arrow-down.png       |  Bin 0 -> 537 bytes
 ui/js/Makefile.am                            |   27 +
 ui/pages/Makefile.am                         |   22 +
 ui/pages/i18n.json.tmpl                      |  187 +++
 ui/robots.txt                                |    2 +
 51 files changed, 8518 insertions(+), 0 deletions(-)
 create mode 100644 VERSION
 create mode 100644 contrib/DEBIAN/Makefile.am
 create mode 100644 contrib/DEBIAN/control.in
 create mode 100644 contrib/Makefile.am
 create mode 100644 contrib/make-deb.sh.in
 create mode 100644 contrib/wok.spec.fedora.in
 create mode 100644 contrib/wok.spec.suse.in
 create mode 100644 docs/Makefile.am
 create mode 100644 plugins/kimchi/.gitignore
 create mode 100644 plugins/kimchi/INSTALL
 create mode 100644 plugins/kimchi/Makefile.am
 create mode 100755 plugins/kimchi/autogen.sh
 create mode 100644 plugins/kimchi/build-aux/config.rpath
 create mode 100755 plugins/kimchi/build-aux/genChangelog
 create mode 100755 plugins/kimchi/build-aux/pkg-version
 create mode 100644 plugins/kimchi/config.rpath
 create mode 100644 plugins/kimchi/configure.ac
 create mode 100755 plugins/kimchi/contrib/check_i18n.py
 create mode 100644 plugins/kimchi/m4/ac_python_module.m4
 create mode 100644 plugins/kimchi/m4/gettext.m4
 create mode 100644 plugins/kimchi/m4/iconv.m4
 create mode 100644 plugins/kimchi/m4/intlmacosx.m4
 create mode 100644 plugins/kimchi/m4/lib-ld.m4
 create mode 100644 plugins/kimchi/m4/lib-link.m4
 create mode 100644 plugins/kimchi/m4/lib-prefix.m4
 create mode 100644 plugins/kimchi/m4/nls.m4
 create mode 100644 plugins/kimchi/m4/po.m4
 create mode 100644 plugins/kimchi/m4/progtest.m4
 create mode 100644 po/LINGUAS
 create mode 100644 po/Makefile.in.in
 create mode 100644 po/Makevars
 create mode 100644 po/POTFILES.in
 create mode 100644 po/gen-pot.in
 create mode 100755 po/wok.pot
 create mode 100644 src/wok/control/Makefile.am
 create mode 100644 src/wok/control/__init__.py
 create mode 100644 src/wok/i18n.py
 create mode 100644 src/wok/model/Makefile.am
 create mode 100644 src/wok/model/__init__.py
 create mode 100644 src/wok/xmlutils/Makefile.am
 create mode 100644 src/wok/xmlutils/__init__.py
 create mode 100644 ui/css/Makefile.am
 create mode 100644 ui/images/Makefile.am
 create mode 100644 ui/images/logo.ico
 create mode 100644 ui/images/theme-default/Makefile.am
 create mode 100644 ui/images/theme-default/arrow-down-black.png
 create mode 100644 ui/images/theme-default/arrow-down.png
 create mode 100644 ui/js/Makefile.am
 create mode 100644 ui/pages/Makefile.am
 create mode 100644 ui/pages/i18n.json.tmpl
 create mode 100644 ui/robots.txt

diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..bc80560
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.5.0
diff --git a/contrib/DEBIAN/Makefile.am b/contrib/DEBIAN/Makefile.am
new file mode 100644
index 0000000..ca89552
--- /dev/null
+++ b/contrib/DEBIAN/Makefile.am
@@ -0,0 +1,17 @@
+# Copyright IBM Corp, 2013
+#
+# 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
+
+CLEANFILES = control
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
new file mode 100644
index 0000000..a288e9b
--- /dev/null
+++ b/contrib/DEBIAN/control.in
@@ -0,0 +1,36 @@
+Package: @PACKAGE_NAME@
+Version: @PACKAGE_VERSION@
+Section: base
+Priority: optional
+Architecture: all
+Depends: python-cherrypy3 (>= 3.2.0),
+         python-cheetah,
+         python-imaging,
+         python-configobj,
+         websockify,
+         novnc,
+         python-jsonschema (>= 1.3.0),
+         python-libvirt,
+         gettext,
+         libvirt-bin,
+         nfs-common,
+         python-m2crypto,
+         qemu-kvm,
+         python-pam,
+         python-parted,
+         python-psutil (>= 0.6.0),
+         python-ethtool,
+         sosreport,
+         python-ipaddr,
+         python-lxml,
+         open-iscsi,
+         nginx,
+         python-guestfs,
+         python-ldap,
+         libguestfs-tools,
+         spice-html5
+Build-Depends: libxslt,
+               openssl,
+               python-lxml
+Maintainer: Aline Manera <alinefm at br.ibm.com>
+Description: Kimchi web server
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 0000000..393306f
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,38 @@
+# Copyright IBM Corp, 2013
+#
+# 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
+
+SUBDIRS = DEBIAN
+
+EXTRA_DIST = \
+	check_i18n.py \
+	kimchid.sysvinit \
+	kimchid.service.fedora \
+	kimchi.spec.fedora.in \
+	kimchid-upstart.conf.debian \
+	kimchid-upstart.conf.fedora \
+	make-deb.sh.in \
+	$(NULL)
+
+make-deb.sh: make-deb.sh.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g'	\
+	    -e 's|[@]PACKAGE_RELEASE[@]|$(PACKAGE_RELEASE)|g'	\
+	    < $< > $@-t &&					\
+	    chmod a+x $@-t &&					\
+	    mv $@-t $@
+BUILT_SOURCES = make-deb.sh
+
+CLEANFILES = kimchi.spec.fedora kimchi.spec.suse kimchi.spec make-deb.sh
diff --git a/contrib/make-deb.sh.in b/contrib/make-deb.sh.in
new file mode 100644
index 0000000..5a6e56a
--- /dev/null
+++ b/contrib/make-deb.sh.in
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+VERSION="@PACKAGE_VERSION@"
+RELEASE="@PACKAGE_RELEASE@"
+
+if [ ! -f configure ]; then
+    echo "Please run this script from the top of the package tree"
+    exit 1
+fi
+
+TMPDIR=`mktemp -d`
+
+make DESTDIR=$TMPDIR install-deb
+dpkg-deb -b $TMPDIR kimchi-${VERSION}-${RELEASE}.noarch.deb
+rm -rf $TMPDIR
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
new file mode 100644
index 0000000..183fd43
--- /dev/null
+++ b/contrib/wok.spec.fedora.in
@@ -0,0 +1,189 @@
+Name:		kimchi
+Version:	@PACKAGE_VERSION@
+Release:	@PACKAGE_RELEASE@%{?dist}
+Summary:	Kimchi server application
+BuildRoot:	%{_topdir}/BUILD/%{name}-%{version}-%{release}
+BuildArch:	noarch
+Group:		System Environment/Base
+License:	LGPL/ASL2
+Source0:	%{name}-%{version}.tar.gz
+Requires:	qemu-kvm
+Requires:	gettext-devel
+Requires:	libvirt
+Requires:	libvirt-python
+Requires:	libvirt-daemon-config-network
+Requires:	python-cherrypy >= 3.2.0
+Requires:	python-cheetah
+Requires:	python-websockify
+Requires:	python-configobj
+Requires:	novnc
+Requires:	m2crypto
+Requires:	python-imaging
+Requires:	PyPAM
+Requires:	pyparted
+Requires:	python-psutil >= 0.6.0
+Requires:	python-jsonschema >= 1.3.0
+Requires:	python-ethtool
+Requires:	sos
+Requires:	python-ipaddr
+Requires:	python-lxml
+Requires:	nfs-utils
+Requires:	nginx
+Requires:	iscsi-initiator-utils
+Requires:	python-ldap
+Requires:	python-libguestfs
+Requires:	libguestfs-tools
+BuildRequires:	libxslt
+BuildRequires:	openssl
+BuildRequires:	python-lxml
+
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 19
+Requires:	spice-html5
+%endif
+
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+%global with_systemd 1
+%endif
+
+%if 0%{?rhel} == 6
+Requires:	python-ordereddict
+Requires:	python-imaging
+BuildRequires:    python-unittest2
+%endif
+
+%if 0%{?with_systemd}
+Requires:	systemd
+Requires:	firewalld
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+%endif
+
+%if 0%{?with_systemd}
+BuildRequires: systemd-units
+%endif
+
+%description
+Web server application to manage KVM/Qemu virtual machines
+
+
+%prep
+%setup
+
+
+%build
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 19
+%configure
+%else
+%configure --with-spice-html5
+%endif
+make
+
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+%if 0%{?with_systemd}
+
+%endif
+
+%if 0%{?rhel} == 6
+# Install the upstart script
+install -Dm 0755 contrib/kimchid-upstart.conf.fedora %{buildroot}/etc/init/kimchid.conf
+%endif
+%if 0%{?rhel} == 5
+# Install the SysV init scripts
+install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid
+%endif
+
+%post
+if [ $1 -eq 1 ] ; then
+    /bin/systemctl enable kimchid.service >/dev/null 2>&1 || :
+    # Initial installation
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+
+%preun
+
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || :
+    /bin/systemctl stop kimchid.service > /dev/null 2>&1 || :
+fi
+
+exit 0
+
+
+%postun
+if [ "$1" -ge 1 ] ; then
+    /bin/systemctl try-restart kimchid.service >/dev/null 2>&1 || :
+fi
+exit 0
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%attr(-,root,root)
+%{_bindir}/kimchid
+%{python_sitelib}/kimchi/*.py*
+%{python_sitelib}/kimchi/control/*.py*
+%{python_sitelib}/kimchi/control/vm/*.py*
+%{python_sitelib}/kimchi/model/*.py*
+%{python_sitelib}/kimchi/xmlutils/*.py*
+%{python_sitelib}/kimchi/API.json
+%{python_sitelib}/kimchi/plugins/*.py*
+%{python_sitelib}/kimchi/
+%{_datadir}/kimchi/doc/API.md
+%{_datadir}/kimchi/doc/README.md
+%{_datadir}/kimchi/doc/README-federation.md
+%{_datadir}/kimchi/doc/kimchi-guest.png
+%{_datadir}/kimchi/doc/kimchi-templates.png
+%{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
+%{_datadir}/kimchi/config/ui/*.xml
+%{_datadir}/kimchi/ui/
+%{_datadir}/kimchi
+%{_sysconfdir}/nginx/conf.d/kimchi.conf.in
+%{_sysconfdir}/nginx/conf.d/kimchi.conf
+%{_sysconfdir}/kimchi/kimchi.conf
+%{_sysconfdir}/kimchi/template.conf
+%{_sysconfdir}/kimchi/distros.d/debian.json
+%{_sysconfdir}/kimchi/distros.d/fedora.json
+%{_sysconfdir}/kimchi/distros.d/opensuse.json
+%{_sysconfdir}/kimchi/distros.d/ubuntu.json
+%{_sysconfdir}/kimchi/distros.d/gentoo.json
+%{_sysconfdir}/kimchi/
+%{_sharedstatedir}/kimchi/debugreports/
+%{_sharedstatedir}/kimchi/screenshots/
+%{_sharedstatedir}/kimchi/vnc-tokens/
+%{_sharedstatedir}/kimchi/isos/
+%{_sharedstatedir}/kimchi/
+%{_localstatedir}/log/kimchi/*
+%{_localstatedir}/log/kimchi/
+%{_mandir}/man8/kimchid.8.gz
+
+%if 0%{?with_systemd}
+%{_unitdir}/kimchid.service
+%{_prefix}/lib/firewalld/services/kimchid.xml
+%endif
+%if 0%{?rhel} == 6
+/etc/init/kimchid.conf
+%endif
+%if 0%{?rhel} == 5
+%{_initrddir}/kimchid
+%endif
+
+%changelog
+* Thu Feb 26 2015 Fr??d??ric Bonnard <frediz at linux.vnet.ibm.com> 1.4.0
+- Add man page for kimchid
+
+* Tue Feb 11 2014 Cr??stian Viana <vianac at linux.vnet.ibm.com> 1.1.0
+- Add help pages and XSLT dependency
+
+* Tue Jul 16 2013 Adam Litke <agl at us.ibm.com> 0.1.0-1
+- Adapted for autotools build
+
+* Thu Apr 04 2013 Aline Manera <alinefm at br.ibm.com> 0.0-1
+- First build
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
new file mode 100644
index 0000000..54228ae
--- /dev/null
+++ b/contrib/wok.spec.suse.in
@@ -0,0 +1,150 @@
+Name:		kimchi
+Version:	@PACKAGE_VERSION@
+Release:	@PACKAGE_RELEASE@%{?dist}
+Summary:	Kimchi server application
+BuildRoot:	%{_topdir}/BUILD/%{name}-%{version}-%{release}
+BuildArch:	noarch
+Group:		System Environment/Base
+License:	LGPL/ASL2
+Source0:	%{name}-%{version}.tar.gz
+Requires:	kvm
+Requires:	gettext-tools
+Requires:	libvirt
+Requires:	libvirt-python
+Requires:	libvirt-daemon-config-network
+Requires:	python-CherryPy >= 3.2.0
+Requires:	python-Cheetah
+Requires:	python-websockify
+Requires:	python-configobj
+Requires:	novnc
+Requires:	python-imaging
+Requires:	python-M2Crypto
+Requires:	python-pam
+Requires:	python-parted
+Requires:	python-psutil >= 0.6.0
+Requires:	python-jsonschema >= 1.3.0
+Requires:	python-ethtool
+Requires:	python-ipaddr
+Requires:	python-ldap
+Requires:	python-lxml
+Requires:	python-xml
+Requires:	nfs-client
+Requires:	nginx
+Requires:	open-iscsi
+Requires:	python-libguestfs
+Requires:	guestfs-tools
+BuildRequires:	libxslt-tools
+BuildRequires:	openssl
+BuildRequires:	python-lxml
+
+%if 0%{?suse_version} == 1100
+Requires:       python-ordereddict
+%endif
+
+%if 0%{?suse_version} > 1140
+%global with_systemd 1
+%endif
+
+%description
+Web server application to manage KVM/Qemu virtual machines
+
+%prep
+%setup
+
+%build
+%configure --with-spice-html5
+make
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+%post
+%if 0%{?with_systemd}
+    /bin/systemctl enable kimchid.service >/dev/null 2>&1 || :
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%else
+    chkconfig kimchid on
+%endif
+exit 0
+
+
+%preun
+%if 0%{?with_systemd}
+    /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || :
+    /bin/systemctl stop kimchid.service > /dev/null 2>&1 || :
+%else
+    service kimchid stop
+%endif
+exit 0
+
+
+%postun
+%if 0%{?with_systemd}
+    /bin/systemctl try-restart kimchid.service >/dev/null 2>&1 || :
+%endif
+exit 0
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%attr(-,root,root)
+%{_bindir}/kimchid
+%{python_sitelib}/kimchi/*.py*
+%{python_sitelib}/kimchi/control/*.py*
+%{python_sitelib}/kimchi/control/vm/*.py*
+%{python_sitelib}/kimchi/model/*.py*
+%{python_sitelib}/kimchi/xmlutils/*.py*
+%{python_sitelib}/kimchi/API.json
+%{python_sitelib}/kimchi/plugins/*.py*
+%{python_sitelib}/kimchi/
+%{_datadir}/kimchi/doc/API.md
+%{_datadir}/kimchi/doc/README.md
+%{_datadir}/kimchi/doc/README-federation.md
+%{_datadir}/kimchi/doc/kimchi-guest.png
+%{_datadir}/kimchi/doc/kimchi-templates.png
+%{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
+%{_datadir}/kimchi/config/ui/*.xml
+%{_datadir}/kimchi/ui/
+%{_datadir}/kimchi
+%{_sysconfdir}/nginx/conf.d/kimchi.conf.in
+%{_sysconfdir}/nginx/conf.d/kimchi.conf
+%{_sysconfdir}/kimchi/kimchi.conf
+%{_sysconfdir}/kimchi/template.conf
+%{_sysconfdir}/kimchi/distros.d/debian.json
+%{_sysconfdir}/kimchi/distros.d/fedora.json
+%{_sysconfdir}/kimchi/distros.d/opensuse.json
+%{_sysconfdir}/kimchi/distros.d/ubuntu.json
+%{_sysconfdir}/kimchi/distros.d/gentoo.json
+%{_sysconfdir}/kimchi
+%{_sysconfdir}/kimchi/
+%{_var}/lib/kimchi/debugreports/
+%{_var}/lib/kimchi/screenshots/
+%{_var}/lib/kimchi/vnc-tokens/
+%{_var}/lib/kimchi/isos/
+%{_var}/lib/kimchi/
+%{_localstatedir}/log/kimchi/*
+%{_localstatedir}/log/kimchi/
+%{_mandir}/man8/kimchid.8.gz
+
+%if 0%{?with_systemd}
+%{_unitdir}/kimchid.service
+%else
+%{_initrddir}/kimchid
+%endif
+
+
+%changelog
+* Thu Feb 26 2015 Fr??d??ric Bonnard <frediz at linux.vnet.ibm.com> 1.4.0
+- Add man page for kimchid
+
+* Tue Feb 11 2014 Cr??stian Viana <vianac at linux.vnet.ibm.com> 1.1.0
+- Add help pages and XSLT dependency
+
+* Thu Jul 18 2013 Adam Litke <agl at us.ibm.com> 0.1.0-1
+- Adapted for autotools build
+- Split Suse and Fedora spec files
+
+* Thu Apr 04 2013 Aline Manera <alinefm at br.ibm.com> 0.0-1
+- First build
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 0000000..2f686f1
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,31 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013
+#
+# 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
+
+docdir = $(datadir)/kimchi/doc
+
+dist_doc_DATA = \
+	API.md \
+	README.md \
+	README-federation.md \
+	kimchi-guest.png \
+	kimchi-templates.png \
+	kimchid.8 \
+	$(NULL)
+
+CLEANFILES = kimchid.8
diff --git a/plugins/kimchi/.gitignore b/plugins/kimchi/.gitignore
new file mode 100644
index 0000000..b3988b6
--- /dev/null
+++ b/plugins/kimchi/.gitignore
@@ -0,0 +1,43 @@
+*.pyc
+*~
+i18n/mo/*
+log
+data
+mo
+autom4te.cache
+Makefile
+Makefile.in
+aclocal.m4
+build-aux/compile
+build-aux/config.guess
+build-aux/config.sub
+build-aux/install-sh
+build-aux/missing
+build-aux/py-compile
+configure
+config.log
+config.status
+contrib/DEBIAN/control
+contrib/kimchi.spec.fedora
+contrib/kimchi.spec.suse
+contrib/make-deb.sh
+docs/kimchid.8
+*.min.css
+*.min.js
+*.gmo
+stamp-po
+kimchi-*.tar.gz
+src/kimchid
+src/kimchi.conf
+src/nginx/kimchi.conf
+src/kimchi/config.py
+tests/run_tests.sh
+tests/test_config.py
+plugins/sample/po/POTFILES
+plugins/sample/sample.conf
+po/POTFILES
+po/gen-pot
+*.orig
+*.rej
+*.pem
+ui/pages/help/*/*.html
diff --git a/plugins/kimchi/INSTALL b/plugins/kimchi/INSTALL
new file mode 100644
index 0000000..63bf076
--- /dev/null
+++ b/plugins/kimchi/INSTALL
@@ -0,0 +1,369 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
diff --git a/plugins/kimchi/Makefile.am b/plugins/kimchi/Makefile.am
new file mode 100644
index 0000000..0e6e59e
--- /dev/null
+++ b/plugins/kimchi/Makefile.am
@@ -0,0 +1,165 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013
+#
+# 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
+SUBDIRS = src ui docs contrib tests po config plugins
+
+man_MANS = docs/kimchid.8
+
+AUTOMAKE_OPTIONS = foreign
+
+ACLOCAL_AMFLAGS = --install -I m4
+
+EXTRA_DIST = \
+	config.rpath \
+	autogen.sh \
+	COPYING.ASL2 \
+	COPYING.LGPL \
+	CONTRIBUTE.md \
+	VERSION \
+	build-aux/pkg-version \
+	$(NULL)
+
+
+PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py
+
+SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py"
+
+I18N_FILES = plugins/*/i18n.py \
+	src/kimchi/i18n.py \
+	$(NULL)
+
+check-local:
+	PYTHONPATH=src contrib/check_i18n.py $(I18N_FILES)
+	find . -path './.git' -prune -type f -o \
+		-name '*.py' -o -name '*.py.in'  | xargs $(PYFLAKES) | \
+		grep -w -v $(SKIP_PYFLAKES_ERR) | \
+		while read LINE; do echo "$$LINE"; false; done
+
+	$(PEP8) --version
+	$(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" .
+
+
+# Link built mo files in the source tree to enable use of translations from
+# within the source tree
+all-local:
+	while read L && test -n "$$L"; do                  \
+		dir=mo/$$L/LC_MESSAGES ;                       \
+		$(MKDIR_P) $$dir ;                             \
+		ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ;   \
+	done < po/LINGUAS
+
+#
+# Packaging helpers
+#
+
+install-deb: install
+	cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/
+	mkdir -p $(DESTDIR)/var/lib/kimchi/debugreports
+	mkdir -p $(DESTDIR)/var/lib/kimchi/screenshots
+	mkdir -p $(DESTDIR)/var/lib/kimchi/vnc-tokens
+	mkdir -p $(DESTDIR)/var/lib/kimchi/isos
+	touch $(DESTDIR)/var/lib/kimchi/objectstore
+	$(MKDIR_P) $(DESTDIR)/etc/init
+	$(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services
+	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
+
+
+deb: contrib/make-deb.sh
+	$(top_srcdir)/contrib/make-deb.sh
+
+kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse
+	@if test -e /etc/redhat-release; then                   \
+		ln -sf contrib/kimchi.spec.fedora $@ ;              \
+	elif test -e /etc/SuSE-release; then                    \
+		ln -sf contrib/kimchi.spec.suse $@ ;                \
+	else                                                    \
+		echo "Unable to select a spec file for RPM build" ; \
+		/bin/false ;                                        \
+	fi
+
+rpm: dist kimchi.spec
+	$(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS
+	cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec
+	cp $(DIST_ARCHIVES) rpm/SOURCES
+	rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec
+
+fedora-rpm: contrib/kimchi.spec.fedora
+	ln -sf contrib/kimchi.spec.fedora kimchi.spec
+	$(MAKE) rpm
+
+suse-rpm: contrib/kimchi.spec.suse
+	ln -sf contrib/kimchi.spec.suse kimchi.spec
+	$(MAKE) rpm
+
+ChangeLog:
+	@if test -d .git; then                                   \
+		$(top_srcdir)/build-aux/genChangelog --release > $@; \
+	fi
+
+install-data-local:
+	@if test -d "$(systemdsystemunitdir)" ; then \
+		mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \
+		$(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \
+	else \
+		mkdir -p $(DESTDIR)/etc/init.d/; \
+		$(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \
+		chmod +x $(DESTDIR)/etc/init.d/kimchid; \
+    fi; \
+	if test -d /usr/lib/firewalld/services/; then \
+		mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \
+		$(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \
+	fi; \
+	mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos}
+	touch $(DESTDIR)/var/lib/kimchi/objectstore
+	mkdir -p $(DESTDIR)/var/log/kimchi/
+	touch $(DESTDIR)/var/log/kimchi/kimchi-access.log
+	touch $(DESTDIR)/var/log/kimchi/kimchi-error.log
+	mkdir -p $(DESTDIR)/etc/kimchi/
+	$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/kimchi/dhparams.pem
+	touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf
+
+uninstall-local:
+	@if test -f $(systemdsystemunitdir)/kimchid.service; then \
+		$(RM) $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \
+	elif test -f /etc/init.d/kimchid; then \
+		$(RM) $(DESTDIR)/etc/init.d/kimchid; \
+		$(RM) $(DESTDIR)/etc/init/kimchi.conf; \
+	fi; \
+	if test -d /usr/lib/firewalld/services/; then \
+		$(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \
+	fi; \
+	$(RM) -rf $(DESTDIR)/var/lib/kimchi
+	$(RM) -rf $(DESTDIR)/var/log/kimchi
+	$(RM) -rf $(DESTDIR)/etc/kimchi
+	$(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf
+
+VERSION:
+	@if test -d .git; then                                \
+		git describe --abbrev=0 > $@;                     \
+	fi
+
+.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION
+
+
+clean-local:
+	rm -rf mo rpm
+
+CLEANFILES = kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`
diff --git a/plugins/kimchi/autogen.sh b/plugins/kimchi/autogen.sh
new file mode 100755
index 0000000..0f22dba
--- /dev/null
+++ b/plugins/kimchi/autogen.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+aclocal
+automake --add-missing
+autoreconf
+
+if [ ! -f "configure" ]; then
+    echo "Failed to generate configure script.  Check to make sure autoconf, "
+    echo "automake, and other build dependencies are properly installed."
+    exit 1
+fi
+
+if [ "x$1" == "x--system" ]; then
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+else
+   if [ $# -gt 0 ]; then
+        ./configure $@
+   else
+        ./configure --prefix=/usr/local
+   fi
+fi
diff --git a/plugins/kimchi/build-aux/config.rpath b/plugins/kimchi/build-aux/config.rpath
new file mode 100644
index 0000000..17298f2
--- /dev/null
+++ b/plugins/kimchi/build-aux/config.rpath
@@ -0,0 +1,672 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2010 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    library_names_spec='$libname.a'
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32* | cegcc*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd1*)
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  nto-qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/plugins/kimchi/build-aux/genChangelog b/plugins/kimchi/build-aux/genChangelog
new file mode 100755
index 0000000..803f24e
--- /dev/null
+++ b/plugins/kimchi/build-aux/genChangelog
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This script is based on code from the Kandan project:
+# https://github.com/kandanapp/kandan/blob/master/gen-changelog.sh
+
+echo "CHANGELOG"
+echo "========="
+echo
+git for-each-ref --sort='*authordate' --format='%(tag)' refs/tags | tac |grep -v '^$' | while read TAG ; do
+    if [ $NEXT ]; then
+        echo "#### [$NEXT] ####"
+    elif [ "$1" != "--release" ]; then
+        echo "#### [Current] ####"
+    else
+        NEXT=$TAG
+        continue
+    fi
+    GIT_PAGER=cat git log --pretty=format:" * [%h] %<(78,trunc)%s (%an)" $TAG..$NEXT
+    NEXT=$TAG
+    echo; echo
+done
+FIRST=$(git for-each-ref --sort='*authordate' --format='%(tag)' refs/tags | head -1)
+
+echo "#### [$FIRST] ####"
+GIT_PAGER=cat git log --pretty=format:" * [%h] %<(78,trunc)%s (%an)" $FIRST
diff --git a/plugins/kimchi/build-aux/pkg-version b/plugins/kimchi/build-aux/pkg-version
new file mode 100755
index 0000000..749cf6c
--- /dev/null
+++ b/plugins/kimchi/build-aux/pkg-version
@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# Copyright 2008-2012 Red Hat, Inc.
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# tags and output versions:
+#   - 4.9.0   => 4.9.0 (upstream clean)
+#   - 4.9.0-1 => 4.9.0 (downstream clean)
+#   - 4.9.0-2-g34e62f   => 4.9.0 (upstream dirty)
+#   - 4.9.0-1-2-g34e62f => 4.9.0 (downstream dirty)
+AWK_VERSION='
+    BEGIN { FS="-" }
+    /^[0-9]/ {
+      print $1
+    }'
+
+# tags and output releases:
+#   - 4.9.0   => 0 (upstream clean)
+#   - 4.9.0-1 => 1 (downstream clean)
+#   - 4.9.0-2-g34e62f1   => 2.git34e62f1 (upstream dirty)
+#   - 4.9.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty)
+AWK_RELEASE='
+    BEGIN { FS="-"; OFS="." }
+    /^[0-9]/ {
+      if (NF == 1) print 0
+      else if (NF == 2) print $2
+      else if (NF == 3) print $2, "git" substr($3, 2)
+      else if (NF == 4) print $2, $3, "git" substr($4, 2)
+    }'
+
+if [ ! -d .git ]; then
+    PKG_VERSION=`cat VERSION`
+else
+    PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION`
+fi
+
+if test "x$1" = "x--full"; then
+    echo $PKG_VERSION | tr -d '[:space:]'
+elif test "x$1" = "x--version"; then
+    echo $PKG_VERSION | awk "$AWK_VERSION" | tr -cd '[:alnum:].'
+elif test "x$1" = "x--release"; then
+    echo $PKG_VERSION | awk "$AWK_RELEASE" | tr -cd '[:alnum:].'
+else
+    echo "usage: $0 [--full|--version|--release]"
+    exit 1
+fi
diff --git a/plugins/kimchi/config.rpath b/plugins/kimchi/config.rpath
new file mode 100644
index 0000000..17298f2
--- /dev/null
+++ b/plugins/kimchi/config.rpath
@@ -0,0 +1,672 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2010 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    library_names_spec='$libname.a'
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32* | cegcc*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd1*)
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  nto-qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/plugins/kimchi/configure.ac b/plugins/kimchi/configure.ac
new file mode 100644
index 0000000..9e3edb8
--- /dev/null
+++ b/plugins/kimchi/configure.ac
@@ -0,0 +1,150 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013-2015
+#
+# 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
+
+AC_INIT([kimchi], [m4_esyscmd([./build-aux/pkg-version --version])])
+
+AC_SUBST([PACKAGE_VERSION],
+         [m4_esyscmd([./build-aux/pkg-version --version])])
+
+AC_SUBST([PACKAGE_RELEASE],
+         [m4_esyscmd([./build-aux/pkg-version --release])])
+
+# Testing for version and release
+AS_IF([test "x$PACKAGE_VERSION" = x],
+      AC_MSG_ERROR([package version not defined]))
+AS_IF([test "x$PACKAGE_RELEASE" = x],
+      AC_MSG_ERROR([package release not defined]))
+
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([-Wno-portability])
+AM_PATH_PYTHON([2.6])
+AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8])
+AC_PYTHON_MODULE([unittest])
+AC_SUBST([HAVE_PYMOD_UNITTEST])
+AC_SUBST([PYTHON_VERSION])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.10])
+AC_PATH_PROG([CHEETAH], [cheetah], [/usr/bin/cheetah])
+
+# Checking for pyflakes
+AC_PATH_PROG([PYFLAKES], [pyflakes])
+if test "x$PYFLAKES" = "x"; then
+  AC_MSG_WARN([pyflakes not found])
+fi
+
+AC_ARG_ENABLE(
+    [sample],
+    [AS_HELP_STRING(
+        [--enable-sample],
+        [enable sample plugin @<:@default=no@:>@]
+    )],
+    ,
+    [enable_sample="no"]
+)
+
+if test "${enable_sample}" = "yes"; then
+AC_SUBST([ENABLE_SAMPLE], [True])
+else
+AC_SUBST([ENABLE_SAMPLE], [False])
+fi
+
+# check for systemd
+PKG_PROG_PKG_CONFIG
+AC_ARG_WITH([systemdsystemunitdir],
+    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+    [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+
+AC_ARG_WITH(
+    [spice-html5],
+    [AS_HELP_STRING([--with-spice-html5],
+                    [Build Kimchi with spice-html5 @<:@default=no@:>@])],
+    ,
+    [with_spice_html5="no"]
+)
+AM_CONDITIONAL([WITH_SPICE], [test "x$with_spice_html5" = xyes])
+
+AC_CONFIG_FILES([
+    po/Makefile.in
+    po/gen-pot
+    Makefile
+    docs/Makefile
+    docs/kimchid.8
+    src/Makefile
+    src/distros.d/Makefile
+    src/nginx/Makefile
+    src/kimchi/Makefile
+    src/kimchi/control/Makefile
+    src/kimchi/control/vm/Makefile
+    src/kimchi/model/Makefile
+    src/kimchi/xmlutils/Makefile
+    plugins/Makefile
+    plugins/sample/Makefile
+    plugins/sample/po/Makefile.in
+    plugins/sample/sample.conf
+    plugins/sample/ui/Makefile
+    plugins/sample/ui/config/Makefile
+    plugins/sample/ui/js/Makefile
+    plugins/sample/ui/pages/Makefile
+    ui/Makefile
+    ui/css/Makefile
+    ui/fontello/Makefile
+    ui/fontello/css/Makefile
+    ui/fontello/font/Makefile
+    ui/images/Makefile
+    ui/images/theme-default/Makefile
+    ui/js/Makefile
+    ui/spice-html5/Makefile
+    ui/spice-html5/css/Makefile
+    ui/spice-html5/pages/Makefile
+    ui/spice-html5/thirdparty/Makefile
+    ui/libs/Makefile
+    ui/libs/themes/Makefile
+    ui/libs/themes/base/Makefile
+    ui/libs/themes/base/images/Makefile
+    ui/pages/Makefile
+    ui/pages/help/Makefile
+    ui/pages/help/en_US/Makefile
+    ui/pages/help/de_DE/Makefile
+    ui/pages/help/es_ES/Makefile
+    ui/pages/help/fr_FR/Makefile
+    ui/pages/help/it_IT/Makefile
+    ui/pages/help/ja_JP/Makefile
+    ui/pages/help/ko_KR/Makefile
+    ui/pages/help/pt_BR/Makefile
+    ui/pages/help/ru_RU/Makefile
+    ui/pages/help/zh_CN/Makefile
+    ui/pages/help/zh_TW/Makefile
+    ui/pages/tabs/Makefile
+    ui/pages/websockify/Makefile
+    contrib/Makefile
+    contrib/DEBIAN/Makefile
+    contrib/DEBIAN/control
+    contrib/kimchi.spec.fedora
+    contrib/kimchi.spec.suse
+    tests/Makefile
+    config/Makefile
+    config/ui/Makefile
+],[
+    chmod +x po/gen-pot
+])
+
+AC_OUTPUT
diff --git a/plugins/kimchi/contrib/check_i18n.py b/plugins/kimchi/contrib/check_i18n.py
new file mode 100755
index 0000000..6a2603c
--- /dev/null
+++ b/plugins/kimchi/contrib/check_i18n.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python2
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2014-2015
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# 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
+
+import imp
+import os
+import re
+import sys
+
+
+# Match all conversion specifier with mapping key
+PATTERN = re.compile(r'''%\([^)]+\)  # Mapping key
+                         [#0\-+]?  # Conversion flags (optional)
+                         (\d+|\*)?  # Minimum field width (optional)
+                         (\.(\d+|\*))?  # Precision (optional)
+                         [lLh]?  # Length modifier (optional)
+                         [cdeEfFgGioursxX%]  # Conversion type''',
+                     re.VERBOSE)
+BAD_PATTERN = re.compile(r"%\([^)]*?\)")
+
+
+def load_i18n_module(i18nfile):
+    path = os.path.dirname(i18nfile)
+    mname = i18nfile.replace("/", "_").rstrip(".py")
+    mobj = imp.find_module("i18n", [path])
+    return imp.load_module(mname, *mobj)
+
+
+def check_string_formatting(messages):
+    for k, v in messages.iteritems():
+        if BAD_PATTERN.findall(PATTERN.sub(" ", v)):
+            print "bad i18n string formatting:"
+            print "  %s: %s" % (k, v)
+            exit(1)
+
+
+def check_obsolete_messages(path, messages):
+    def find_message_key(path, k):
+        for root, dirs, files in os.walk(path):
+            for f in files:
+                fname = os.path.join(root, f)
+                if (not fname.endswith("i18n.py") and fname.endswith(".py") or
+                   fname.endswith(".json")):
+                    with open(fname) as f:
+                        string = "".join(f.readlines())
+                        if k in string:
+                            return True
+        return False
+
+    for k in messages.iterkeys():
+        if not find_message_key(path, k):
+            print "  %s is obsolete, it is no longer in use" % k
+            exit(1)
+
+
+def main():
+    print "Checking for invalid i18n string..."
+    for f in sys.argv[1:]:
+        messages = load_i18n_module(f).messages
+        check_string_formatting(messages)
+        check_obsolete_messages(os.path.dirname(f), messages)
+    print "Checking for invalid i18n string successfully"
+
+
+if __name__ == '__main__':
+    main()
diff --git a/plugins/kimchi/m4/ac_python_module.m4 b/plugins/kimchi/m4/ac_python_module.m4
new file mode 100644
index 0000000..32b9d72
--- /dev/null
+++ b/plugins/kimchi/m4/ac_python_module.m4
@@ -0,0 +1,30 @@
+dnl @synopsis AC_PYTHON_MODULE(modname[, fatal])
+dnl
+dnl Checks for Python module.
+dnl
+dnl If fatal is non-empty then absence of a module will trigger an
+dnl error.
+dnl
+dnl @category InstalledPackages
+dnl @author Andrew Collier <colliera at nu.ac.za>.
+dnl @version 2004-07-14
+dnl @license AllPermissive
+
+AC_DEFUN([AC_PYTHON_MODULE],[
+	AC_MSG_CHECKING(python module: $1)
+	python -c "import $1" 2>/dev/null
+	if test $? -eq 0;
+	then
+		AC_MSG_RESULT(yes)
+		eval AS_TR_CPP(HAVE_PYMOD_$1)=yes
+	else
+		AC_MSG_RESULT(no)
+		eval AS_TR_CPP(HAVE_PYMOD_$1)=no
+		#
+		if test -n "$2"
+		then
+			AC_MSG_ERROR(failed to find required module $1)
+			exit 1
+		fi
+	fi
+])
diff --git a/plugins/kimchi/m4/gettext.m4 b/plugins/kimchi/m4/gettext.m4
new file mode 100644
index 0000000..f84e6a5
--- /dev/null
+++ b/plugins/kimchi/m4/gettext.m4
@@ -0,0 +1,383 @@
+# gettext.m4 serial 63 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2006, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv.
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE([ENABLE_NLS], [1],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST([DATADIRNAME])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST([INSTOBJEXT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST([GENCAT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST([INTLOBJS])
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST([INTLLIBS])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/plugins/kimchi/m4/iconv.m4 b/plugins/kimchi/m4/iconv.m4
new file mode 100644
index 0000000..e2041b9
--- /dev/null
+++ b/plugins/kimchi/m4/iconv.m4
@@ -0,0 +1,214 @@
+# iconv.m4 serial 11 (gettext-0.18.1)
+dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      [am_cv_func_iconv=yes])
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE([HAVE_ICONV], [1],
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
+])
+
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define([gl_iconv_AC_DEFUN],
+  m4_version_prereq([2.64],
+    [[AC_DEFUN_ONCE(
+        [$1], [$2])]],
+    [[AC_DEFUN(
+        [$1], [$2])]]))
+gl_iconv_AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL([am_cv_proto_iconv], [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([
+         $am_cv_proto_iconv])
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+])
diff --git a/plugins/kimchi/m4/intlmacosx.m4 b/plugins/kimchi/m4/intlmacosx.m4
new file mode 100644
index 0000000..dd91025
--- /dev/null
+++ b/plugins/kimchi/m4/intlmacosx.m4
@@ -0,0 +1,51 @@
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
diff --git a/plugins/kimchi/m4/lib-ld.m4 b/plugins/kimchi/m4/lib-ld.m4
new file mode 100644
index 0000000..ebb3052
--- /dev/null
+++ b/plugins/kimchi/m4/lib-ld.m4
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL([acl_cv_path_LD],
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+        test "$with_gnu_ld" != no && break ;;
+      *)
+        test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff --git a/plugins/kimchi/m4/lib-link.m4 b/plugins/kimchi/m4/lib-link.m4
new file mode 100644
index 0000000..c73bd8e
--- /dev/null
+++ b/plugins/kimchi/m4/lib-link.m4
@@ -0,0 +1,774 @@
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.54])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_TRY_LINK([$3], [$4],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/plugins/kimchi/m4/lib-prefix.m4 b/plugins/kimchi/m4/lib-prefix.m4
new file mode 100644
index 0000000..1601cea
--- /dev/null
+++ b/plugins/kimchi/m4/lib-prefix.m4
@@ -0,0 +1,224 @@
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+      dnl symlink is missing, so we set acl_libdirstem2 too.
+      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+        [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+        ])
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+])
diff --git a/plugins/kimchi/m4/nls.m4 b/plugins/kimchi/m4/nls.m4
new file mode 100644
index 0000000..003704c
--- /dev/null
+++ b/plugins/kimchi/m4/nls.m4
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
diff --git a/plugins/kimchi/m4/po.m4 b/plugins/kimchi/m4/po.m4
new file mode 100644
index 0000000..8bc921d
--- /dev/null
+++ b/plugins/kimchi/m4/po.m4
@@ -0,0 +1,449 @@
+# po.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by autoconf
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+  # Seen the first line of the variable definition.
+  s/^[	 ]*VARIABLE[	 ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
diff --git a/plugins/kimchi/m4/progtest.m4 b/plugins/kimchi/m4/progtest.m4
new file mode 100644
index 0000000..2d804ac
--- /dev/null
+++ b/plugins/kimchi/m4/progtest.m4
@@ -0,0 +1,92 @@
+# progtest.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper at cygnus.com>, 1996.
+
+AC_PREREQ([2.50])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$][$1])
+else
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..3fcb18f
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,11 @@
+en_US
+pt_BR
+zh_CN
+de_DE
+es_ES
+fr_FR
+it_IT
+ja_JP
+ko_KR
+ru_RU
+zh_TW
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 0000000..d01fb31
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,398 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+ at SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @prefix@/share/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(MKDIR_P).
+# This macro uses the 'mkdir -p' command if possible. Otherwise, it falls back
+# on invoking install-sh with the -d option, so your package should contain
+# install-sh as described under AC_PROG_INSTALL.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+MKDIR_P = @MKDIR_P@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in gen-pot.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: check-macro-version update-gmo all- at USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
+	$(srcdir)/gen-pot $(POTFILES)
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data- at USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data- at USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(MKDIR_P) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data- at USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..c29a807
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = kimchi
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = project-kimchi at googlegroups.com
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..57bc711
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,4 @@
+# List of source files which contain translatable strings.
+src/kimchi/i18n.py
+ui/pages/*.tmpl
+ui/pages/tabs/*.tmpl
diff --git a/po/gen-pot.in b/po/gen-pot.in
new file mode 100644
index 0000000..0e3cd10
--- /dev/null
+++ b/po/gen-pot.in
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for src in $@; do
+    if [ ${src: -3} == ".py" ]; then
+        cat $src
+    else
+        cat $src | @CHEETAH@ compile -
+    fi
+done | xgettext --no-location -o kimchi.pot -L Python -
diff --git a/po/wok.pot b/po/wok.pot
new file mode 100755
index 0000000..81fac83
--- /dev/null
+++ b/po/wok.pot
@@ -0,0 +1,2162 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#, python-format
+msgid "Unknown parameter %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr ""
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr ""
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr ""
+
+msgid "Unable to parse JSON request"
+msgstr ""
+
+msgid "This API only supports JSON"
+msgstr ""
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr ""
+
+#, python-format
+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 ""
+
+msgid "You are not authorized to access Kimchi"
+msgstr ""
+
+#, python-format
+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 ""
+
+msgid "\"_passthrough\" should be \"true\" or \"false\""
+msgstr ""
+
+msgid "\"_passthrough_affected_by\" should be a device name string"
+msgstr ""
+
+#, python-format
+msgid "Error while getting block devices. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Error while getting block device information for %(device)s."
+msgstr ""
+
+#, python-format
+msgid "Unable to find distro file: %(filename)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+msgstr ""
+
+#, python-format
+msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find ISO file %(filename)s"
+msgstr ""
+
+#, python-format
+msgid "The ISO file %(filename)s is not bootable"
+msgstr ""
+
+#, python-format
+msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
+msgstr ""
+
+#, python-format
+msgid "Invalid El Torito validation entry in ISO %(filename)s"
+msgstr ""
+
+#, python-format
+msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+msgstr ""
+
+#, python-format
+msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+msgstr ""
+
+#, python-format
+msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"The hypervisor doesn't have permission to use this ISO %(filename)s. "
+"Consider moving it under /var/lib/libvirt,  or set the search permission to "
+"file access control lists for '%(user)s' user if possible, or add the "
+"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"'path_to_iso'.Details: %(err)s"
+msgstr ""
+
+msgid "An error occurred when probing image OS information."
+msgstr ""
+
+msgid "No OS information found in given image."
+msgstr ""
+
+#, python-format
+msgid "Unable to read image file %(filename)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Image file must be an existing file on system. %(filename)s is not a valid "
+"input."
+msgstr ""
+
+#, python-format
+msgid "Virtual machine %(name)s already exists"
+msgstr ""
+
+#, python-format
+msgid "Virtual machine %(name)s does not exist"
+msgstr ""
+
+#, python-format
+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 ""
+
+#, python-format
+msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+msgstr ""
+
+msgid "Remote ISO image is not supported by this server."
+msgstr ""
+
+#, python-format
+msgid "Screenshot is not supported on virtual machine %(name)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to connect to powered off virtual machine %(name)s."
+msgstr ""
+
+msgid "Virtual machine name must be a string without slashes (/)"
+msgstr ""
+
+#, python-format
+msgid "Invalid template URI %(value)s specified for virtual machine"
+msgstr ""
+
+#, python-format
+msgid "Invalid storage pool URI %(value)s specified for virtual machine"
+msgstr ""
+
+msgid "Supported virtual machine graphics are Spice or VNC"
+msgstr ""
+
+msgid "Graphics address to listen on must be IPv4 or IPv6"
+msgstr ""
+
+msgid "Specify a template to create a virtual machine from"
+msgstr ""
+
+#, python-format
+msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+msgid "User name list must be an array"
+msgstr ""
+
+msgid "User name must be a string"
+msgstr ""
+
+msgid "Group name list must be an array"
+msgstr ""
+
+msgid "Group name must be a string"
+msgstr ""
+
+#, python-format
+msgid "User(s) '%(users)s' do not exist"
+msgstr ""
+
+#, python-format
+msgid "Group(s) '%(groups)s' do not exist"
+msgstr ""
+
+#, python-format
+msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+msgid "The guest console password must be a string."
+msgstr ""
+
+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 "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
+msgid "Cannot suspend VM '%(name)s' because it is not running."
+msgstr ""
+
+#, python-format
+msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Cannot resume VM '%(name)s' because it is not paused."
+msgstr ""
+
+#, python-format
+msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
+msgstr ""
+
+msgid "Memory assigned is higher then the maximum allowed in the host."
+msgstr ""
+
+#, python-format
+msgid ""
+"VM '%(name)s' does not support live memory update. Update the memory with "
+"the machine offline to enable this feature."
+msgstr ""
+
+msgid "Only increase memory is allowed in active VMs"
+msgstr ""
+
+msgid ""
+"For live memory update, new memory value must be equal old memory value plus "
+"multiples of 1024 Mib"
+msgstr ""
+
+msgid "There are not enough free slots of 1024 Mib in the guest."
+msgstr ""
+
+msgid ""
+"Host's libvirt version does not support memory devices. Libvirt must be >= "
+"1.2.14"
+msgstr ""
+
+#, python-format
+msgid "Error attaching memory device. Details: %(error)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 ""
+
+msgid ""
+"No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
+"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify "
+"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on "
+"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
+"iommu=1."
+msgstr ""
+
+msgid "\"name\" should be a device name string"
+msgstr ""
+
+#, python-format
+msgid ""
+"The device %(name)s is probably in use by the host. Unable to attach it to "
+"the guest."
+msgstr ""
+
+#, python-format
+msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Network %(network)s specified for virtual machine %(name)s does not exist"
+msgstr ""
+
+msgid "Supported virtual machine interfaces type is only network"
+msgstr ""
+
+msgid "Network name for virtual machine interface must be a string"
+msgstr ""
+
+msgid "Invalid network model card specified for virtual machine interface"
+msgstr ""
+
+msgid "Specify type and network to add a new virtual machine interface"
+msgstr ""
+
+msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
+msgstr ""
+
+#, python-format
+msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
+msgstr ""
+
+msgid "Invalid MAC Address"
+msgstr ""
+
+msgid "Cannot change MAC address of a running virtual machine"
+msgstr ""
+
+#, python-format
+msgid "Template %(name)s already exists"
+msgstr ""
+
+#, python-format
+msgid ""
+"Network '%(network)s' specified for template %(template)s does not exist"
+msgstr ""
+
+#, python-format
+msgid ""
+"Storage pool %(pool)s specified for template %(template)s does not exist"
+msgstr ""
+
+#, python-format
+msgid "Storage pool %(pool)s specified for template %(template)s is not active"
+msgstr ""
+
+#, python-format
+msgid "Invalid parameter '%(param)s' specified for CDROM."
+msgstr ""
+
+#, python-format
+msgid "Network %(network)s specified for template %(template)s is not active"
+msgstr ""
+
+msgid "Template name must be a string"
+msgstr ""
+
+msgid "Template icon must be a path to the image"
+msgstr ""
+
+msgid "Template distribution must be a string"
+msgstr ""
+
+msgid "Template distribution version must be a string"
+msgstr ""
+
+msgid "The number of CPUs must be an integer greater than 0"
+msgstr ""
+
+msgid "Amount of memory (MB) must be an integer greater than 512"
+msgstr ""
+
+msgid "Template CDROM must be a local or remote ISO file"
+msgstr ""
+
+#, python-format
+msgid "Invalid storage pool URI %(value)s specified for template"
+msgstr ""
+
+msgid "Specify an ISO image as CDROM or a base image to create a template"
+msgstr ""
+
+msgid "All networks for the template must be specified in a list."
+msgstr ""
+
+msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
+msgstr ""
+
+#, python-format
+msgid "The volume %(volume)s is not in storage pool %(pool)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to create template due error: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to delete template due error: %(err)s"
+msgstr ""
+
+msgid "Disk size must be an integer greater than 1GB."
+msgstr ""
+
+msgid "Template base image must be a valid local image file"
+msgstr ""
+
+#, python-format
+msgid "Cannot identify base image %(path)s format"
+msgstr ""
+
+msgid ""
+"When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
+"threads."
+msgstr ""
+
+msgid ""
+"When specifying CPU topology, each element must be an integer greater than "
+"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 ""
+
+#, python-format
+msgid "Storage pool %(name)s does not exist"
+msgstr ""
+
+#, python-format
+msgid "Specify %(item)s in order to create the storage pool %(name)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to delete active storage pool %(name)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to list storage pools. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to get number of storage volumes in storage pool %(name)s. Details: "
+"%(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to create NFS Pool as export path %(path)s may block during mount"
+msgstr ""
+
+#, python-format
+msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+msgstr ""
+
+#, python-format
+msgid "Unsupported storage pool type: %(type)s"
+msgstr ""
+
+#, python-format
+msgid "Error while retrieving storage pool XML to %(pool)s"
+msgstr ""
+
+msgid "Storage pool name must be a string without slashes (/)"
+msgstr ""
+
+msgid ""
+"Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
+"iso"
+msgstr ""
+
+msgid "Storage pool path must be a string"
+msgstr ""
+
+msgid "Storage pool host must be a IP or hostname"
+msgstr ""
+
+msgid "Storage pool device must be the absolute path to the block device"
+msgstr ""
+
+msgid "Storage pool devices parameter must be a list"
+msgstr ""
+
+msgid "Target IQN of an iSCSI pool must be a string"
+msgstr ""
+
+msgid "Port of a remote storage server must be an integer between 1 and 65535"
+msgstr ""
+
+msgid "iSCSI target username must be a string"
+msgstr ""
+
+msgid "iSCSI target password must be a string"
+msgstr ""
+
+msgid "Specify name and type to create a storage pool"
+msgstr ""
+
+#, python-format
+msgid ""
+"%(disk)s is not a valid disk/partition. Could not add it to the pool "
+"%(pool)s."
+msgstr ""
+
+#, python-format
+msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
+msgstr ""
+
+msgid "The parameter disks only can be updated for logical storage pool."
+msgstr ""
+
+msgid "The SCSI host adapter name must be a string."
+msgstr ""
+
+msgid "The storage pool kimchi_isos is reserved for internal use"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+"unreachable."
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to deactivate pool %(name)s as it is associated with some templates"
+msgstr ""
+
+#, python-format
+msgid "Unable to delete pool %(name)s as it is associated with some templates"
+msgstr ""
+
+#, python-format
+msgid ""
+"A volume group named '%(name)s' already exists. Please, choose another name "
+"to create the logical pool."
+msgstr ""
+
+#, python-format
+msgid "Unable to update database with deep scan information due error: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Storage volume %(name)s already exists"
+msgstr ""
+
+#, python-format
+msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to create storage volume %(volume)s because storage pool %(pool)s is "
+"not active"
+msgstr ""
+
+#, python-format
+msgid "Specify %(item)s in order to create storage volume %(volume)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to list storage volumes because storage pool %(pool)s is not active"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
+"%(err)s"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Storage type %(type)s does not support volume create and delete"
+msgstr ""
+
+msgid "Storage volume name must be a string"
+msgstr ""
+
+msgid "Storage volume allocation must be an integer number"
+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 ""
+
+#, python-format
+msgid ""
+"Unable to update database with storage volume information due error: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Only one of parameter %(param)s can be specified"
+msgstr ""
+
+#, python-format
+msgid "Create volume from %(param)s is not supported"
+msgstr ""
+
+msgid "Storage volume capacity must be an integer number."
+msgstr ""
+
+msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
+msgstr ""
+
+#, python-format
+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 ""
+
+msgid "Specify chunk data and its size to upload a file."
+msgstr ""
+
+msgid "In order to upload a storage volume, specify the 'upload' parameter."
+msgstr ""
+
+msgid ""
+"Unable to upload chunk data as it does not match with requested chunk size."
+msgstr ""
+
+#, python-format
+msgid "The storage volume %(vol)s is not under an upload process."
+msgstr ""
+
+msgid "The upload chunk data will exceed the storage volume size."
+msgstr ""
+
+#, python-format
+msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
+msgstr ""
+
+#, python-format
+msgid "Interface %(name)s does not exist"
+msgstr ""
+
+#, python-format
+msgid "Network %(name)s already exists"
+msgstr ""
+
+#, python-format
+msgid "Network %(name)s does not exist"
+msgstr ""
+
+#, python-format
+msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+msgstr ""
+
+#, python-format
+msgid "Specify a network interface to create bridged network %(name)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to delete active network %(name)s"
+msgstr ""
+
+#, python-format
+msgid "Interface %(iface)s specified for network %(network)s is already in use"
+msgstr ""
+
+msgid "Interface should be bare NIC, bonding or bridge device."
+msgstr ""
+
+#, python-format
+msgid "Unable to create network %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find a free IP address for network '%(name)s'"
+msgstr ""
+
+#, python-format
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
+msgid "Network name must be a string without slashes (/) or quotes (\")"
+msgstr ""
+
+msgid "Supported network types are isolated, NAT and bridge"
+msgstr ""
+
+msgid "Network subnet must be a string with IP address and prefix or netmask"
+msgstr ""
+
+msgid "Network interface must be a string"
+msgstr ""
+
+msgid "Network VLAN ID must be an integer between 1 and 4094"
+msgstr ""
+
+msgid "Specify name and type to create a Network"
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
+msgstr ""
+
+#, python-format
+msgid ""
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
+msgstr ""
+
+#, python-format
+msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+msgstr ""
+
+#, python-format
+msgid "Failed to activate interface %(iface)s: %(err)s."
+msgstr ""
+
+#, python-format
+msgid ""
+"Failed to activate interface %(iface)s. Please check the physical link "
+"status."
+msgstr ""
+
+#, python-format
+msgid "Failed to start network %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Debug report %(name)s does not exist"
+msgstr ""
+
+msgid "Debug report tool not found in system"
+msgstr ""
+
+#, python-format
+msgid "Unable to create debug report %(name)s. Details: %(err)s."
+msgstr ""
+
+#, python-format
+msgid "Can not find any debug report with the given name %(name)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+msgstr ""
+
+msgid "You should give a name for the debug report file."
+msgstr ""
+
+msgid ""
+"Debug report name must be a string. Only letters, digits, underscore ('_') "
+"and hyphen ('-') are allowed."
+msgstr ""
+
+#, python-format
+msgid ""
+"The debug report with specified name \"%(name)s\" already exists. Please use "
+"another one."
+msgstr ""
+
+#, python-format
+msgid "Storage server %(server)s was not used by Kimchi"
+msgstr ""
+
+#, python-format
+msgid "Distro '%(name)s' does not exist"
+msgstr ""
+
+#, python-format
+msgid "Partition %(name)s does not exist in the host"
+msgstr ""
+
+msgid "Unable to shutdown host machine as there are running virtual machines"
+msgstr ""
+
+msgid "Unable to reboot host machine as there are running virtual machines"
+msgstr ""
+
+#, python-format
+msgid "Node device '%(name)s' not found"
+msgstr ""
+
+msgid "Conflicting flag filters specified."
+msgstr ""
+
+msgid "No packages marked for update"
+msgstr ""
+
+#, python-format
+msgid "Package %(name)s is not marked to be updated."
+msgstr ""
+
+#, python-format
+msgid "Error while getting packages marked to be updated. Details: %(err)s"
+msgstr ""
+
+msgid "There is no compatible package manager for this system."
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr ""
+
+#, python-format
+msgid "Invalid URI %(uri)s"
+msgstr ""
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+
+msgid "Unable to choose a virtual machine name"
+msgstr ""
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr ""
+
+msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+msgstr ""
+
+#, python-format
+msgid "The path '%(value)s' is not a valid local/remote path for the device"
+msgstr ""
+
+msgid "Only CDROM path can be update."
+msgstr ""
+
+#, python-format
+msgid ""
+"The storage device %(dev_name)s does not exist in the virtual machine "
+"%(vm_name)s"
+msgstr ""
+
+#, python-format
+msgid "Error while creating new storage device: %(error)s"
+msgstr ""
+
+#, python-format
+msgid "Error while updating storage device: %(error)s"
+msgstr ""
+
+#, python-format
+msgid "Error while removing storage device: %(error)s"
+msgstr ""
+
+msgid "Do not support IDE device hot plug"
+msgstr ""
+
+msgid ""
+"Specify type and path or type and pool/volume to add a new virtual machine "
+"disk"
+msgstr ""
+
+msgid "Specify path to update virtual machine disk"
+msgstr ""
+
+#, python-format
+msgid "Controller type %(type)s limitation of %(limit)s devices reached"
+msgstr ""
+
+#, python-format
+msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
+msgstr ""
+
+msgid "Volume already in use by other virtual machine."
+msgstr ""
+
+msgid ""
+"Only one of path or pool/volume can be specified to add a new virtual "
+"machine disk"
+msgstr ""
+
+#, python-format
+msgid ""
+"Volume chosen with format %(format)s does not fit in the storage type "
+"%(type)s"
+msgstr ""
+
+msgid "YUM Repository ID must be one word only string."
+msgstr ""
+
+msgid "Repository URL must be an http://, ftp:// or file:// URL."
+msgstr ""
+
+msgid ""
+"Repository configuration is a dictionary with specific values according to "
+"repository type."
+msgstr ""
+
+msgid "Distribution to DEB repository must be a string"
+msgstr ""
+
+msgid "Components to DEB repository must be listed in a array"
+msgstr ""
+
+msgid "Components to DEB repository must be a string"
+msgstr ""
+
+msgid "Mirror list to repository must be a string"
+msgstr ""
+
+msgid "YUM Repository name must be string."
+msgstr ""
+
+msgid "GPG check must be a boolean value."
+msgstr ""
+
+msgid "GPG key must be a URL pointing to the ASCII-armored file."
+msgstr ""
+
+#, python-format
+msgid "Could not update repository %(repo_id)s."
+msgstr ""
+
+#, python-format
+msgid "Repository %(repo_id)s does not exist."
+msgstr ""
+
+msgid ""
+"Specify repository base URL,  mirror list or metalink in order to create or "
+"update a YUM repository."
+msgstr ""
+
+msgid "Repository management tool was not recognized for your system."
+msgstr ""
+
+#, python-format
+msgid "Repository %(repo_id)s is already enabled."
+msgstr ""
+
+#, python-format
+msgid "Repository %(repo_id)s is already disabled."
+msgstr ""
+
+#, python-format
+msgid "Could not remove repository %(repo_id)s."
+msgstr ""
+
+#, python-format
+msgid "Could not write repository configuration file %(repo_file)s"
+msgstr ""
+
+msgid "Specify repository distribution in order to create a DEB repository."
+msgstr ""
+
+#, python-format
+msgid "Could not enable repository %(repo_id)s."
+msgstr ""
+
+#, python-format
+msgid "Could not disable repository %(repo_id)s."
+msgstr ""
+
+msgid "YUM Repository ID already exists"
+msgstr ""
+
+msgid "YUM Repository name must be a string"
+msgstr ""
+
+#, python-format
+msgid "Unable to list repositories. Details: '%(err)s'"
+msgstr ""
+
+#, python-format
+msgid "Unable to retrieve repository information. Details: '%(err)s'"
+msgstr ""
+
+#, python-format
+msgid "Unable to add repository. Details: '%(err)s'"
+msgstr ""
+
+#, python-format
+msgid "Unable to remove repository. Details: '%(err)s'"
+msgstr ""
+
+#, python-format
+msgid ""
+"Configuration items: '%(items)s' are not supported by repository manager"
+msgstr ""
+
+msgid "Repository metalink must be an http://, ftp:// or file:// URL."
+msgstr ""
+
+msgid "Cannot specify mirrorlist and metalink at the same time."
+msgstr ""
+
+#, python-format
+msgid ""
+"Virtual machine '%(vm)s' must be stopped before creating a snapshot of 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 of 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 ""
+
+#, 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 ""
+
+msgid "Invalid vCPU/topology combination."
+msgstr ""
+
+msgid "This host (or current configuration) does not allow CPU topology."
+msgstr ""
+
+msgid "ERROR CODE"
+msgstr ""
+
+msgid "REASON"
+msgstr ""
+
+msgid "STACK"
+msgstr ""
+
+msgid "Go to Homepage"
+msgstr ""
+
+msgid "Create a New Virtual Machine"
+msgstr ""
+
+msgid "Virtual Machine Name"
+msgstr ""
+
+msgid ""
+"The name used to identify the virtual machine. If omitted, a name will be "
+"chosen based on the template used."
+msgstr ""
+
+msgid "Template"
+msgstr ""
+
+msgid "Please create a template first."
+msgstr ""
+
+msgid "Create a Template"
+msgstr ""
+
+msgid "Please choose a template."
+msgstr ""
+
+msgid "OS"
+msgstr ""
+
+msgid "OS Version"
+msgstr ""
+
+msgid "CPUS"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Edit Guest"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Storage"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Permission"
+msgstr ""
+
+msgid "Host PCI Device"
+msgstr ""
+
+msgid "Snapshot"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "CPUs"
+msgstr ""
+
+msgid "Memory (MB)"
+msgstr ""
+
+msgid "Icon"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "Available system users and groups"
+msgstr ""
+
+msgid "Selected system users and groups"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "To Add"
+msgstr ""
+
+msgid "Added"
+msgstr ""
+
+msgid "filter"
+msgstr ""
+
+msgid "Product"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "Created"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Replace"
+msgstr ""
+
+msgid "Detach"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "revert"
+msgstr ""
+
+msgid "Add a Storage Device to VM"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+msgstr ""
+
+msgid "Storage Pool"
+msgstr ""
+
+msgid "Storage pool which volume located in"
+msgstr ""
+
+msgid "Storage Volume"
+msgstr ""
+
+msgid "Storage volume to be attached"
+msgstr ""
+
+msgid "File Path"
+msgstr ""
+
+msgid "The ISO file path in the server for CDROM."
+msgstr ""
+
+msgid "Attach"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Shut Down"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+
+msgid "This field is required."
+msgstr ""
+
+msgid "Log in"
+msgstr ""
+
+msgid "Logging in..."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Guests"
+msgstr ""
+
+msgid "Templates"
+msgstr ""
+
+msgid "Failed to get application configuration"
+msgstr ""
+
+msgid "This is not a valid Linux path"
+msgstr ""
+
+msgid "This is not a valid URL."
+msgstr ""
+
+msgid "No such data available."
+msgstr ""
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Confirm"
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr ""
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr ""
+
+msgid "Detailed message:"
+msgstr ""
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr ""
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr ""
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr ""
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+
+msgid "Max:"
+msgstr ""
+
+msgid "Utilization"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid "Read Rate"
+msgstr ""
+
+msgid "Write Rate"
+msgstr ""
+
+msgid "Received"
+msgstr ""
+
+msgid "Sent"
+msgstr ""
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+
+msgid "Repositories"
+msgstr ""
+
+msgid "ID"
+msgstr ""
+
+msgid "Base URL"
+msgstr ""
+
+msgid "Is Mirror"
+msgstr ""
+
+msgid "URL Args"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "GPG Check"
+msgstr ""
+
+msgid "GPG Key"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Software Updates"
+msgstr ""
+
+msgid "Package Name"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Architecture"
+msgstr ""
+
+msgid "Repository"
+msgstr ""
+
+msgid "Update All"
+msgstr ""
+
+msgid "Updating..."
+msgstr ""
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr ""
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+
+msgid "Debug Reports"
+msgstr ""
+
+msgid "Generated Time"
+msgstr ""
+
+msgid "Generate"
+msgstr ""
+
+msgid "Generating..."
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+
+msgid "Pending..."
+msgstr ""
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+
+msgid "Power off Confirmation"
+msgstr ""
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr ""
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr ""
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr ""
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ""
+
+msgid "Attaching..."
+msgstr ""
+
+msgid "Replacing..."
+msgstr ""
+
+msgid "Successfully attached!"
+msgstr ""
+
+msgid "Successfully replaced!"
+msgstr ""
+
+msgid "Successfully detached!"
+msgstr ""
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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 ""
+
+msgid "unavailable"
+msgstr ""
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+
+msgid "Create a network"
+msgstr ""
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr ""
+
+msgid "This storage pool is empty."
+msgstr ""
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+
+msgid "SCSI Fibre Channel"
+msgstr ""
+
+msgid "No SCSI adapters found."
+msgstr ""
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr ""
+
+msgid "The storage pool path can not be blank."
+msgstr ""
+
+msgid "NFS server mount path can not be blank."
+msgstr ""
+
+msgid "Invalid NFS mount path."
+msgstr ""
+
+msgid "No logical device selected."
+msgstr ""
+
+msgid "The iSCSI target can not be blank."
+msgstr ""
+
+msgid "Server name can not be blank."
+msgstr ""
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr ""
+
+msgid "No available partitions found."
+msgstr ""
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+
+msgid "Unable to retrieve partitions information."
+msgstr ""
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr ""
+
+msgid "Peers"
+msgstr ""
+
+msgid "Searching"
+msgstr ""
+
+msgid "No peers found."
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+msgid "About"
+msgstr ""
+
+msgid "Log out"
+msgstr ""
+
+msgid "Version:"
+msgstr ""
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Generate a New Debug Report"
+msgstr ""
+
+msgid "Report Name"
+msgstr ""
+
+msgid ""
+"The name used to identify the report. If omitted, a name will be chosen "
+"based on current time. Name can contain: letters, digits, underscore (\"_\") "
+"and hyphen (\"-\")."
+msgstr ""
+
+msgid "Rename a Debug Report"
+msgstr ""
+
+msgid ""
+"The name used to identify the report. Name can contain: letters, digits and "
+"hyphen (\"-\")."
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Add a Repository"
+msgstr ""
+
+msgid "Identifier"
+msgstr ""
+
+msgid "Single word, unique identifier for the repository."
+msgstr ""
+
+msgid "Textual name for the repository."
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Required Field"
+msgstr ""
+
+msgid "URL to the repository. Supported protocols are http, ftp, and file."
+msgstr ""
+
+msgid "Repository is a mirror"
+msgstr ""
+
+msgid "Distribution"
+msgstr ""
+
+msgid "Distribution of the DEB repository."
+msgstr ""
+
+msgid "Components"
+msgstr ""
+
+msgid "List of components in DEB repository."
+msgstr ""
+
+msgid "Edit Repository"
+msgstr ""
+
+msgid "Mirror List URL"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
+msgid "Define a New Storage Pool"
+msgstr ""
+
+msgid "Storage Pool Name"
+msgstr ""
+
+msgid ""
+"The name used to identify the storage pools, and it should not be empty."
+msgstr ""
+
+msgid "Storage Pool Type"
+msgstr ""
+
+msgid "Storage Path"
+msgstr ""
+
+msgid ""
+"The path of the Storage Pool. Each Storage Pool must have a unique path."
+msgstr ""
+
+msgid ""
+"Kimchi will try to create the directory when it does not already exist in "
+"your system."
+msgstr ""
+
+msgid "NFS Server IP"
+msgstr ""
+
+msgid "NFS server IP or hostname. It can be input or chosen from history."
+msgstr ""
+
+msgid "NFS Path"
+msgstr ""
+
+msgid "The NFS exported path on NFS server."
+msgstr ""
+
+msgid "Device path"
+msgstr ""
+
+msgid "iSCSI Server"
+msgstr ""
+
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr ""
+
+msgid "Server"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "The iSCSI target on iSCSI server"
+msgstr ""
+
+msgid "Add iSCSI Authentication"
+msgstr ""
+
+msgid "iSCSI Authentication"
+msgstr ""
+
+msgid "SCSI Adapter"
+msgstr ""
+
+msgid "Please, wait..."
+msgstr ""
+
+msgid "Add Template"
+msgstr ""
+
+msgid "Where is the source media for this template? "
+msgstr ""
+
+msgid "Local ISO Image"
+msgstr ""
+
+msgid "Local Image File"
+msgstr ""
+
+msgid "Remote ISO Image"
+msgstr ""
+
+msgid "Search ISOs"
+msgstr ""
+
+msgid "The following ISOs are available:"
+msgstr ""
+
+msgid "OS: "
+msgstr ""
+
+msgid "Version: "
+msgstr ""
+
+msgid "Size: "
+msgstr ""
+
+msgid "Search more ISOs"
+msgstr ""
+
+msgid "Create Templates from Selected ISO"
+msgstr ""
+
+msgid "I want to use a specific ISO file"
+msgstr ""
+
+msgid "Loading default remote ISOs ..."
+msgstr ""
+
+msgid "Arch: "
+msgstr ""
+
+msgid "I want to use a custom URL"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "CDROM"
+msgstr ""
+
+msgid "Image File"
+msgstr ""
+
+msgid "Graphics"
+msgstr ""
+
+msgid "Disk(GB)"
+msgstr ""
+
+msgid "Disk Format"
+msgstr ""
+
+msgid "CPU Number"
+msgstr ""
+
+msgid "Manually set CPU topology"
+msgstr ""
+
+msgid "Cores"
+msgstr ""
+
+msgid "Threads"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "Disk I/O"
+msgstr ""
+
+msgid "Network I/O"
+msgstr ""
+
+msgid "Livetile"
+msgstr ""
+
+msgid "No guests found."
+msgstr ""
+
+msgid "Shut down"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Basic Information"
+msgstr ""
+
+msgid "OS Distro"
+msgstr ""
+
+msgid "OS Code Name"
+msgstr ""
+
+msgid "CPU(s)"
+msgstr ""
+
+msgid "System Statistics"
+msgstr ""
+
+msgid "Update Progress"
+msgstr ""
+
+msgid "Network Name"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Network Type"
+msgstr ""
+
+msgid "Address Space"
+msgstr ""
+
+msgid "Name should not contain '/' and '\"'."
+msgstr ""
+
+msgid "Isolated: no external network connection"
+msgstr ""
+
+msgid "NAT: outbound physical network connection only"
+msgstr ""
+
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr ""
+
+msgid "(No interfaces found)"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Enable VLAN"
+msgstr ""
+
+msgid "VLAN ID"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "%Used"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Capacity"
+msgstr ""
+
+msgid "Allocated"
+msgstr ""
+
+msgid "active"
+msgstr ""
+
+msgid "inactive"
+msgstr ""
+
+msgid "Deactivate"
+msgstr ""
+
+msgid "Activate"
+msgstr ""
+
+msgid "Add Volume"
+msgstr ""
+
+msgid "Extend"
+msgstr ""
+
+msgid "Undefine"
+msgstr ""
+
+msgid "Format"
+msgstr ""
+
+msgid "Allocation"
+msgstr ""
+
+msgid "No templates found."
+msgstr ""
diff --git a/src/wok/control/Makefile.am b/src/wok/control/Makefile.am
new file mode 100644
index 0000000..fee98dc
--- /dev/null
+++ b/src/wok/control/Makefile.am
@@ -0,0 +1,27 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013
+#
+# 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
+
+SUBDIRS = vm
+
+control_PYTHON = *.py
+
+controldir = $(pythondir)/kimchi/control
+
+install-data-local:
+	$(MKDIR_P) $(DESTDIR)$(controldir)
diff --git a/src/wok/control/__init__.py b/src/wok/control/__init__.py
new file mode 100644
index 0000000..98d42d3
--- /dev/null
+++ b/src/wok/control/__init__.py
@@ -0,0 +1,26 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2013-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
+
+import os
+
+
+from kimchi.control.utils import load_url_sub_node
+
+
+sub_nodes = load_url_sub_node(os.path.dirname(__file__), __name__)
diff --git a/src/wok/i18n.py b/src/wok/i18n.py
new file mode 100644
index 0000000..d2ffa34
--- /dev/null
+++ b/src/wok/i18n.py
@@ -0,0 +1,354 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2014-2015
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# 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
+
+import gettext
+
+_ = gettext.gettext
+
+
+messages = {
+    "KCHAPI0001E": _("Unknown parameter %(value)s"),
+    "KCHAPI0002E": _("Delete is not allowed for %(resource)s"),
+    "KCHAPI0003E": _("%(resource)s does not implement update method"),
+    "KCHAPI0005E": _("Create is not allowed for %(resource)s"),
+    "KCHAPI0006E": _("Unable to parse JSON request"),
+    "KCHAPI0007E": _("This API only supports JSON"),
+    "KCHAPI0008E": _("Parameters does not match requirement in schema: %(err)s"),
+    "KCHAPI0009E": _("You don't have permission to perform this operation."),
+
+    "KCHASYNC0001E": _("Datastore is not initiated in the model object."),
+    "KCHASYNC0002E": _("Unable to start task due error: %(err)s"),
+    "KCHASYNC0003E": _("Timeout of %(seconds)s seconds expired while running task '%(task)s."),
+
+    "KCHAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"),
+    "KCHAUTH0002E": _("You are not authorized to access Kimchi"),
+    "KCHAUTH0003E": _("Specify %(item)s to login into Kimchi"),
+    "KCHAUTH0004E": _("User %(user_id)s not found with given LDAP settings."),
+    "KCHAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"),
+
+    "KCHDEVS0001E": _('Unknown "_cap" specified'),
+    "KCHDEVS0002E": _('"_passthrough" should be "true" or "false"'),
+    "KCHDEVS0003E": _('"_passthrough_affected_by" should be a device name string'),
+
+    "KCHDISKS0001E": _("Error while getting block devices. Details: %(err)s"),
+    "KCHDISKS0002E": _("Error while getting block device information for %(device)s."),
+
+    "KCHDL0001E": _("Unable to find distro file: %(filename)s"),
+    "KCHDL0002E": _("Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."),
+
+    "KCHISCSI0001E": _("Unable to login to iSCSI host target %(portal)s. Details: %(err)s"),
+    "KCHISCSI0002E": _("Unable to login to iSCSI host %(host)s target %(target)s"),
+
+    "KCHISO0001E": _("Unable to find ISO file %(filename)s"),
+    "KCHISO0002E": _("The ISO file %(filename)s is not bootable"),
+    "KCHISO0003E": _("The ISO file %(filename)s does not have a valid El Torito boot record"),
+    "KCHISO0004E": _("Invalid El Torito validation entry in ISO %(filename)s"),
+    "KCHISO0005E": _("Invalid El Torito boot indicator in ISO %(filename)s"),
+    "KCHISO0006E": _("Unexpected volume type for primary volume in ISO %(filename)s"),
+    "KCHISO0007E": _("Bad format while reading volume descriptor in ISO %(filename)s"),
+    "KCHISO0008E": _("The hypervisor doesn't have permission to use this ISO %(filename)s. "
+                     "Consider moving it under /var/lib/libvirt,  or set the search permission "
+                     "to file access control lists for '%(user)s' user if possible, or add the "
+                     "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'."
+                     "Details: %(err)s" ),
+
+    "KCHIMG0001E": _("An error occurred when probing image OS information."),
+    "KCHIMG0002E": _("No OS information found in given image."),
+    "KCHIMG0003E": _("Unable to read image file %(filename)s"),
+    "KCHIMG0004E": _("Image file must be an existing file on system. %(filename)s is not a valid input."),
+
+    "KCHVM0001E": _("Virtual machine %(name)s already exists"),
+    "KCHVM0002E": _("Virtual machine %(name)s does not exist"),
+    "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s is already in use or the virtual machine is not powered off."),
+    "KCHVM0004E": _("Unable to retrieve screenshot for stopped virtual machine %(name)s"),
+    "KCHVM0005E": _("Remote ISO image is not supported by this server."),
+    "KCHVM0006E": _("Screenshot is not supported on virtual machine %(name)s"),
+    "KCHVM0007E": _("Unable to create virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0008E": _("Unable to update virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0009E": _("Unable to retrieve virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0010E": _("Unable to connect to powered off virtual machine %(name)s."),
+    "KCHVM0011E": _("Virtual machine name must be a string without slashes (/)"),
+    "KCHVM0012E": _("Invalid template URI %(value)s specified for virtual machine"),
+    "KCHVM0013E": _("Invalid storage pool URI %(value)s specified for virtual machine"),
+    "KCHVM0014E": _("Supported virtual machine graphics are Spice or VNC"),
+    "KCHVM0015E": _("Graphics address to listen on must be IPv4 or IPv6"),
+    "KCHVM0016E": _("Specify a template to create a virtual machine from"),
+    "KCHVM0019E": _("Unable to start virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0020E": _("Unable to power off virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0021E": _("Unable to delete virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0022E": _("Unable to reset virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0023E": _("User name list must be an array"),
+    "KCHVM0024E": _("User name must be a string"),
+    "KCHVM0025E": _("Group name list must be an array"),
+    "KCHVM0026E": _("Group name must be a string"),
+    "KCHVM0027E": _("User(s) '%(users)s' do not exist"),
+    "KCHVM0028E": _("Group(s) '%(groups)s' do not exist"),
+    "KCHVM0029E": _("Unable to shutdown virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0030E": _("Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"),
+    "KCHVM0031E": _("The guest console password must be a string."),
+    "KCHVM0032E": _("The life time for the guest console password must be a number."),
+    "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."),
+    "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"),
+    "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"),
+    "KCHVM0036E": _("Invalid operation for non-persistent virtual machine %(name)s"),
+    "KCHVM0037E": _("Cannot suspend VM '%(name)s' because it is not running."),
+    "KCHVM0038E": _("Unable to suspend VM '%(name)s'. Details: %(err)s"),
+    "KCHVM0039E": _("Cannot resume VM '%(name)s' because it is not paused."),
+    "KCHVM0040E": _("Unable to resume VM '%(name)s'. Details: %(err)s"),
+    "KCHVM0041E": _("Memory assigned is higher then the maximum allowed in the host."),
+    "KCHVM0042E": _("VM '%(name)s' does not support live memory update. Update the memory with the machine offline to enable this feature."),
+    "KCHVM0043E": _("Only increase memory is allowed in active VMs"),
+    "KCHVM0044E": _("For live memory update, new memory value must be equal old memory value plus multiples of 1024 Mib"),
+    "KCHVM0045E": _("There are not enough free slots of 1024 Mib in the guest."),
+    "KCHVM0046E": _("Host's libvirt version does not support memory devices. Libvirt must be >= 1.2.14"),
+    "KCHVM0047E": _("Error attaching memory device. Details: %(error)s"),
+
+    "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."),
+    "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."),
+    "KCHVMHDEV0003E": _("No IOMMU groups found. Host PCI pass through needs IOMMU group to function correctly. "
+                        "Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify the Kernel is compiled with IOMMU support. "
+                        "For Intel CPU, add intel_iommu=on to your Kernel parameter in /boot/grub2/grub.conf. "
+                        "For AMD CPU, add iommu=pt iommu=1."),
+    "KCHVMHDEV0004E": _('"name" should be a device name string'),
+    "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'),
+
+    "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"),
+    "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"),
+    "KCHVMIF0004E": _("Supported virtual machine interfaces type is only network"),
+    "KCHVMIF0005E": _("Network name for virtual machine interface must be a string"),
+    "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"),
+    "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"),
+    "KCHVMIF0008E": _("MAC Address must respect this format FF:FF:FF:FF:FF:FF"),
+    "KCHVMIF0009E": _("MAC Address %(mac)s already exists in virtual machine %(name)s"),
+    "KCHVMIF0010E": _("Invalid MAC Address"),
+    "KCHVMIF0011E": _("Cannot change MAC address of a running virtual machine"),
+
+    "KCHTMPL0001E": _("Template %(name)s already exists"),
+    "KCHTMPL0003E": _("Network '%(network)s' specified for template %(template)s does not exist"),
+    "KCHTMPL0004E": _("Storage pool %(pool)s specified for template %(template)s does not exist"),
+    "KCHTMPL0005E": _("Storage pool %(pool)s specified for template %(template)s is not active"),
+    "KCHTMPL0006E": _("Invalid parameter '%(param)s' specified for CDROM."),
+    "KCHTMPL0007E": _("Network %(network)s specified for template %(template)s is not active"),
+    "KCHTMPL0008E": _("Template name must be a string"),
+    "KCHTMPL0009E": _("Template icon must be a path to the image"),
+    "KCHTMPL0010E": _("Template distribution must be a string"),
+    "KCHTMPL0011E": _("Template distribution version must be a string"),
+    "KCHTMPL0012E": _("The number of CPUs must be an integer greater than 0"),
+    "KCHTMPL0013E": _("Amount of memory (MB) must be an integer greater than 512"),
+    "KCHTMPL0014E": _("Template CDROM must be a local or remote ISO file"),
+    "KCHTMPL0015E": _("Invalid storage pool URI %(value)s specified for template"),
+    "KCHTMPL0016E": _("Specify an ISO image as CDROM or a base image to create a template"),
+    "KCHTMPL0017E": _("All networks for the template must be specified in a list."),
+    "KCHTMPL0018E": _("Specify a volume to a template when storage pool is iSCSI or SCSI"),
+    "KCHTMPL0019E": _("The volume %(volume)s is not in storage pool %(pool)s"),
+    "KCHTMPL0020E": _("Unable to create template due error: %(err)s"),
+    "KCHTMPL0021E": _("Unable to delete template due error: %(err)s"),
+    "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."),
+    "KCHTMPL0023E": _("Template base image must be a valid local image file"),
+    "KCHTMPL0024E": _("Cannot identify base image %(path)s format"),
+    "KCHTMPL0025E": _("When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads."),
+    "KCHTMPL0026E": _("When specifying CPU topology, each element must be an integer greater than zero."),
+    "KCHTMPL0027E": _("Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, qcow2, qed, raw, vmdk, vpc."),
+
+    "KCHPOOL0001E": _("Storage pool %(name)s already exists"),
+    "KCHPOOL0002E": _("Storage pool %(name)s does not exist"),
+    "KCHPOOL0004E": _("Specify %(item)s in order to create the storage pool %(name)s"),
+    "KCHPOOL0005E": _("Unable to delete active storage pool %(name)s"),
+    "KCHPOOL0006E": _("Unable to list storage pools. Details: %(err)s"),
+    "KCHPOOL0007E": _("Unable to create storage pool %(name)s. Details: %(err)s"),
+    "KCHPOOL0008E": _("Unable to get number of storage volumes in storage pool %(name)s. Details: %(err)s"),
+    "KCHPOOL0009E": _("Unable to activate storage pool %(name)s. Details: %(err)s"),
+    "KCHPOOL0010E": _("Unable to deactivate storage pool %(name)s. Details: %(err)s"),
+    "KCHPOOL0011E": _("Unable to delete storage pool %(name)s. Details: %(err)s"),
+    "KCHPOOL0012E": _("Unable to create NFS Pool as export path %(path)s may block during mount"),
+    "KCHPOOL0013E": _("Unable to create NFS Pool as export path %(path)s mount failed"),
+    "KCHPOOL0014E": _("Unsupported storage pool type: %(type)s"),
+    "KCHPOOL0015E": _("Error while retrieving storage pool XML to %(pool)s"),
+    "KCHPOOL0016E": _("Storage pool name must be a string without slashes (/)"),
+    "KCHPOOL0017E": _("Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-iso"),
+    "KCHPOOL0018E": _("Storage pool path must be a string"),
+    "KCHPOOL0019E": _("Storage pool host must be a IP or hostname"),
+    "KCHPOOL0020E": _("Storage pool device must be the absolute path to the block device"),
+    "KCHPOOL0021E": _("Storage pool devices parameter must be a list"),
+    "KCHPOOL0022E": _("Target IQN of an iSCSI pool must be a string"),
+    "KCHPOOL0023E": _("Port of a remote storage server must be an integer between 1 and 65535"),
+    "KCHPOOL0024E": _("iSCSI target username must be a string"),
+    "KCHPOOL0025E": _("iSCSI target password must be a string"),
+    "KCHPOOL0026E": _("Specify name and type to create a storage pool"),
+    "KCHPOOL0027E": _("%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)s."),
+    "KCHPOOL0028E": _("Unable to extend logical pool %(pool)s. Details: %(err)s"),
+    "KCHPOOL0029E": _("The parameter disks only can be updated for logical storage pool."),
+    "KCHPOOL0030E": _("The SCSI host adapter name must be a string."),
+    "KCHPOOL0031E": _("The storage pool kimchi_isos is reserved for internal use"),
+    "KCHPOOL0032E": _("Unable to activate NFS storage pool %(name)s. NFS server %(server)s is unreachable."),
+    "KCHPOOL0033E": _("Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is unreachable."),
+    "KCHPOOL0034E": _("Unable to deactivate pool %(name)s as it is associated with some templates"),
+    "KCHPOOL0035E": _("Unable to delete pool %(name)s as it is associated with some templates"),
+    "KCHPOOL0036E": _("A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool."),
+    "KCHPOOL0037E": _("Unable to update database with deep scan information due error: %(err)s"),
+
+    "KCHVOL0001E": _("Storage volume %(name)s already exists"),
+    "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"),
+    "KCHVOL0003E": _("Unable to create storage volume %(volume)s because storage pool %(pool)s is not active"),
+    "KCHVOL0004E": _("Specify %(item)s in order to create storage volume %(volume)s"),
+    "KCHVOL0006E": _("Unable to list storage volumes because storage pool %(pool)s is not active"),
+    "KCHVOL0007E": _("Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %(err)s"),
+    "KCHVOL0008E": _("Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"),
+    "KCHVOL0009E": _("Unable to wipe storage volumes %(name)s. Details: %(err)s"),
+    "KCHVOL0010E": _("Unable to delete storage volume %(name)s. Details: %(err)s"),
+    "KCHVOL0011E": _("Unable to resize storage volume %(name)s. Details: %(err)s"),
+    "KCHVOL0012E": _("Storage type %(type)s does not support volume create and delete"),
+    "KCHVOL0013E": _("Storage volume name must be a string"),
+    "KCHVOL0014E": _("Storage volume allocation must be an integer number"),
+    "KCHVOL0015E": _("Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, qcow, qcow2, qed, raw, vmdk, vpc."),
+    "KCHVOL0016E": _("Storage volume requires a volume name"),
+    "KCHVOL0017E": _("Unable to update database with storage volume information due error: %(err)s"),
+    "KCHVOL0018E": _("Only one of parameter %(param)s can be specified"),
+    "KCHVOL0019E": _("Create volume from %(param)s is not supported"),
+    "KCHVOL0020E": _("Storage volume capacity must be an integer number."),
+    "KCHVOL0021E": _("Storage volume URL must be http://, https://, ftp:// or ftps://."),
+    "KCHVOL0022E": _("Unable to access file %(url)s. Please, check it."),
+    "KCHVOL0023E": _("Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)s"),
+    "KCHVOL0024E": _("Specify chunk data and its size to upload a file."),
+    "KCHVOL0025E": _("In order to upload a storage volume, specify the 'upload' parameter."),
+    "KCHVOL0026E": _("Unable to upload chunk data as it does not match with requested chunk size."),
+    "KCHVOL0027E": _("The storage volume %(vol)s is not under an upload process."),
+    "KCHVOL0028E": _("The upload chunk data will exceed the storage volume size."),
+    "KCHVOL0029E": _("Unable to upload chunk data to storage volume. Details: %(err)s."),
+
+    "KCHIFACE0001E": _("Interface %(name)s does not exist"),
+
+    "KCHNET0001E": _("Network %(name)s already exists"),
+    "KCHNET0002E": _("Network %(name)s does not exist"),
+    "KCHNET0003E": _("Subnet %(subnet)s specified for network %(network)s  is not valid."),
+    "KCHNET0004E": _("Specify a network interface to create bridged network %(name)s"),
+    "KCHNET0005E": _("Unable to delete active network %(name)s"),
+    "KCHNET0006E": _("Interface %(iface)s specified for network %(network)s is already in use"),
+    "KCHNET0007E": _("Interface should be bare NIC, bonding or bridge device."),
+    "KCHNET0008E": _("Unable to create network %(name)s. Details: %(err)s"),
+    "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"),
+    "KCHNET0010E": _("The interface %(iface)s already exists."),
+    "KCHNET0011E": _("Network name must be a string without slashes (/) or quotes (\")"),
+    "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"),
+    "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"),
+    "KCHNET0014E": _("Network interface must be a string"),
+    "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"),
+    "KCHNET0016E": _("Specify name and type to create a Network"),
+    "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network."),
+    "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network."),
+    "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"),
+    "KCHDR0003E": _("Unable to create debug report %(name)s. Details: %(err)s."),
+    "KCHDR0004E": _("Can not find any debug report with the given name %(name)s"),
+    "KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"),
+    "KCHDR0006E": _("You should give a name for the debug report file."),
+    "KCHDR0007E": _("Debug report name must be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."),
+    "KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."),
+
+    "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"),
+
+    "KCHDISTRO0001E": _("Distro '%(name)s' does not exist"),
+
+    "KCHPART0001E": _("Partition %(name)s does not exist in the host"),
+
+    "KCHHOST0001E": _("Unable to shutdown host machine as there are running virtual machines"),
+    "KCHHOST0002E": _("Unable to reboot host machine as there are running virtual machines"),
+    "KCHHOST0003E": _("Node device '%(name)s' not found"),
+    "KCHHOST0004E": _("Conflicting flag filters specified."),
+
+    "KCHPKGUPD0001E": _("No packages marked for update"),
+    "KCHPKGUPD0002E": _("Package %(name)s is not marked to be updated."),
+    "KCHPKGUPD0003E": _("Error while getting packages marked to be updated. Details: %(err)s"),
+    "KCHPKGUPD0004E": _("There is no compatible package manager for this system."),
+
+    "KCHOBJST0001E": _("Unable to find %(item)s in datastore"),
+
+    "KCHUTILS0001E": _("Invalid URI %(uri)s"),
+    "KCHUTILS0002E": _("Timeout while running command '%(cmd)s' after %(seconds)s seconds"),
+    "KCHUTILS0003E": _("Unable to choose a virtual machine name"),
+    "KCHUTILS0004E": _("Invalid data value '%(value)s'"),
+    "KCHUTILS0005E": _("Invalid data unit '%(unit)s'"),
+
+    "KCHVMSTOR0002E": _("Invalid storage type. Types supported: 'cdrom', 'disk'"),
+    "KCHVMSTOR0003E": _("The path '%(value)s' is not a valid local/remote path for the device"),
+    "KCHVMSTOR0006E": _("Only CDROM path can be update."),
+    "KCHVMSTOR0007E": _("The storage device %(dev_name)s does not exist in the virtual machine %(vm_name)s"),
+    "KCHVMSTOR0008E": _("Error while creating new storage device: %(error)s"),
+    "KCHVMSTOR0009E": _("Error while updating storage device: %(error)s"),
+    "KCHVMSTOR0010E": _("Error while removing storage device: %(error)s"),
+    "KCHVMSTOR0011E": _("Do not support IDE device hot plug"),
+    "KCHVMSTOR0012E": _("Specify type and path or type and pool/volume to add a new virtual machine disk"),
+    "KCHVMSTOR0013E": _("Specify path to update virtual machine disk"),
+    "KCHVMSTOR0014E": _("Controller type %(type)s limitation of %(limit)s devices reached"),
+    "KCHVMSTOR0015E": _("Cannot retrieve disk path information for given pool/volume: %(error)s"),
+    "KCHVMSTOR0016E": _("Volume already in use by other virtual machine."),
+    "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"),
+    "KCHVMSTOR0018E": _("Volume chosen with format %(format)s does not fit in the storage type %(type)s"),
+
+    "KCHREPOS0001E": _("YUM Repository ID must be one word only string."),
+    "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."),
+    "KCHREPOS0003E": _("Repository configuration is a dictionary with specific values according to repository type."),
+    "KCHREPOS0004E": _("Distribution to DEB repository must be a string"),
+    "KCHREPOS0005E": _("Components to DEB repository must be listed in a array"),
+    "KCHREPOS0006E": _("Components to DEB repository must be a string"),
+    "KCHREPOS0007E": _("Mirror list to repository must be a string"),
+    "KCHREPOS0008E": _("YUM Repository name must be string."),
+    "KCHREPOS0009E": _("GPG check must be a boolean value."),
+    "KCHREPOS0010E": _("GPG key must be a URL pointing to the ASCII-armored file."),
+    "KCHREPOS0011E": _("Could not update repository %(repo_id)s."),
+    "KCHREPOS0012E": _("Repository %(repo_id)s does not exist."),
+    "KCHREPOS0013E": _("Specify repository base URL,  mirror list or metalink in order to create or update a YUM repository."),
+    "KCHREPOS0014E": _("Repository management tool was not recognized for your system."),
+    "KCHREPOS0015E": _("Repository %(repo_id)s is already enabled."),
+    "KCHREPOS0016E": _("Repository %(repo_id)s is already disabled."),
+    "KCHREPOS0017E": _("Could not remove repository %(repo_id)s."),
+    "KCHREPOS0018E": _("Could not write repository configuration file %(repo_file)s"),
+    "KCHREPOS0019E": _("Specify repository distribution in order to create a DEB repository."),
+    "KCHREPOS0020E": _("Could not enable repository %(repo_id)s."),
+    "KCHREPOS0021E": _("Could not disable repository %(repo_id)s."),
+    "KCHREPOS0022E": _("YUM Repository ID already exists"),
+    "KCHREPOS0023E": _("YUM Repository name must be a string"),
+    "KCHREPOS0024E": _("Unable to list repositories. Details: '%(err)s'"),
+    "KCHREPOS0025E": _("Unable to retrieve repository information. Details: '%(err)s'"),
+    "KCHREPOS0026E": _("Unable to add repository. Details: '%(err)s'"),
+    "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"),
+    "KCHREPOS0028E": _("Configuration items: '%(items)s' are not supported by repository manager"),
+    "KCHREPOS0029E": _("Repository metalink must be an http://, ftp:// or file:// URL."),
+    "KCHREPOS0030E": _("Cannot specify mirrorlist and metalink at the same time."),
+
+    "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 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 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."),
+    "KCHCPUINF0003E": _("This host (or current configuration) does not allow CPU topology."),
+
+}
diff --git a/src/wok/model/Makefile.am b/src/wok/model/Makefile.am
new file mode 100644
index 0000000..a6ccbf0
--- /dev/null
+++ b/src/wok/model/Makefile.am
@@ -0,0 +1,25 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013
+#
+# 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
+
+model_PYTHON = *.py
+
+modeldir = $(pythondir)/kimchi/model
+
+install-data-local:
+	$(MKDIR_P) $(DESTDIR)$(modeldir)
diff --git a/src/wok/model/__init__.py b/src/wok/model/__init__.py
new file mode 100644
index 0000000..ca7ede4
--- /dev/null
+++ b/src/wok/model/__init__.py
@@ -0,0 +1,18 @@
+#
+# 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
diff --git a/src/wok/xmlutils/Makefile.am b/src/wok/xmlutils/Makefile.am
new file mode 100644
index 0000000..73f86f4
--- /dev/null
+++ b/src/wok/xmlutils/Makefile.am
@@ -0,0 +1,25 @@
+#
+# 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
+
+xmlutils_PYTHON = *.py
+
+xmlutilsdir = $(pythondir)/kimchi/xmlutils
+
+install-data-local:
+	$(MKDIR_P) $(DESTDIR)$(xmlutilsdir)
diff --git a/src/wok/xmlutils/__init__.py b/src/wok/xmlutils/__init__.py
new file mode 100644
index 0000000..ca7ede4
--- /dev/null
+++ b/src/wok/xmlutils/__init__.py
@@ -0,0 +1,18 @@
+#
+# 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
diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
new file mode 100644
index 0000000..f4f3dac
--- /dev/null
+++ b/ui/css/Makefile.am
@@ -0,0 +1,26 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+EXTRA_DIST = theme-default
+
+cssdir = $(datadir)/kimchi/ui/css
+dist_css_DATA = theme-default.min.css
+
+theme-default.min.css: theme-default/*.css
+	cat $^ > $@
+
+CLEANFILES = theme-default.min.css
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
new file mode 100644
index 0000000..7b63d23
--- /dev/null
+++ b/ui/images/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SUBDIRS = theme-default
+
+imagedir = $(datadir)/kimchi/ui/images
+
+dist_image_DATA = *.png *.ico
diff --git a/ui/images/logo.ico b/ui/images/logo.ico
new file mode 100644
index 0000000000000000000000000000000000000000..446143f066a60f479b2cb8f8d04ab3c97ff60e56
GIT binary patch
literal 1214
zcma)*3rLeu6vyu=X_;nPV)$&PPF)r(wTQ|dTGOUtnOdf0mZ=cR#99xbub1{BqnD9^
z^Z>PV6h)fUny6#CN{3di2P{*h2ek at Oq0a4o*=I}2Iv?krbAR`oKi_vQA0faVCr83o
zF{!X2#Dx$Nz}$(sm^sgR<Jj30yCMGpMl1z837jm3H1$<DU4IV>Tbdw<FM-;Hi<#et
z=I}n~iB^qh8{XzCNyvT<I;$&znmT~?eFXZgAE at Om?1h(6Iq+2e1-ca!zOAO7n3*};
zXq6n?2kF<!f%cez;-Fgx4$e+xo{WR;oqhc_OW;#nF!Zm|JK}m8gi6aC+##`QA5PmJ
zfeZ(o(}%&&1P5#*1vVbnssk~XhN5bNz=T)>5^+BS=V54SJ|^z)5I7%kU;>-skiq*{
z5B^=eF<T)pK9+)bV;9UCK>t-HOi+bkR-wK1xpfXL;S<?ho1pQ5gYzxiHR~=e+XHS(
zYe7QMZb3IjWV72H-JpD~6z(tbgwn1o$D2s!YteWNJS!i9l%iW?+34Lvr*KL(6{_X|
zobEjAb{lD|4qsmYvGF;~r0Aunc#>=c)0W4s|D{#(q9~vaX{rGms=((Wn*~LeWqIu}
zkGvlzwaxjL25hey2bVweu<xK*t+ at Oa_)UKTK^x4IwmKMOjm at oL`l)}_NGPy}tdb}w
zHa>H`ji2N7m}Xsj#j7-`#=Dv}`)h&)9th^&^dR%>WH_MB8KcIXVf8p&s1xD|_k)R-
zrk$Z0-|Gf}&4Au$KhU$k?3YR5by~D9M&-q$=ocNz4!IY&p7%OxuJf&+Ei-G(23hU;
zHTLhMtjFR9ExVbPQVLzBFlROcIZ|#jmX6fm_hsVa3XP<aKAeAt8dqp&oBW=V^+d>Q
zkcNnm%Ds?ggd^Rv2~9_o82cv;p6LSBD_g_s-n1uZ8#<EeLwTm~LE9J!Zdo at M&*jFU
zoM+Z%F5)(8$8y`Wz~%Pd;Nlx at aH{<lk}}CcRMRXZMD&%Uhz3Ze$jpg#uec1IlFMPW
MDQ4iZEk#_;cNAJoqyPW_

literal 0
HcmV?d00001

diff --git a/ui/images/theme-default/Makefile.am b/ui/images/theme-default/Makefile.am
new file mode 100644
index 0000000..7c69b2a
--- /dev/null
+++ b/ui/images/theme-default/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+imagedir = $(datadir)/kimchi/ui/images/theme-default
+
+dist_image_DATA = *.png *.gif
diff --git a/ui/images/theme-default/arrow-down-black.png b/ui/images/theme-default/arrow-down-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c05f00498232213a081497051c94d16537daab8
GIT binary patch
literal 2942
zcmV-^3xV{BP)<h;3K|Lk000e1NJLTq000gE000RH1^@s60!<xh00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e at S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc at _vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z at C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z at 488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC- at r6P$!k}1U{(*I=Q-z at tBKHoI}uxdU5dyy at u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6 at fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA at W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t at q*0);U*o*SAPZv|vv at 2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w at D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w at Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E at oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim at mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz at C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f at NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC at Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl at Psh8QyPB@KTx+ at RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+ at AhPrP6BK<z=<L*0kfKU at CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E at 6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv at x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV at Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0001~Nkl<Zc-oxNJxW7S5QgD*4hlCvSlFuR0 at Ge_ZDuQRGcH1qgN=nD*+C*$<h40h
zG at uEY>MQ2qgPBk{XD$FDVh-E^lOy|E;2qe6N<`dd=IYe8TI+0p1?Vz!djeVjuLVFI
zt6i=2>Iiylaa~&20iVF-U$~(+;0bss?Ku1Y at F9wb4}QKwE$URgR{P9UU8)c2y*e6p
ohvWRhz!<mz`j(%+o7#L0056AMLI?@#xBvhE07*qoM6N<$f;a(mxBvhE

literal 0
HcmV?d00001

diff --git a/ui/images/theme-default/arrow-down.png b/ui/images/theme-default/arrow-down.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f5239bbb93ad8660f47d3def443e42b8f57c6e6
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004b3#c}2nYxW
zd<bNS0005dNkl<ZIE~$sze^Nw7>A$d6~#>G7g3=>Q#G^&cL#z*Q$%}FLnMWF=;0ky
z&|yo<#f2xjw6^sJL}L+>rbk<lQf`6m4I+8ox1kd>!=xqXGrqjf!~62S at ZUy&d_HeP
zq|VMxrlzL$3=a<v_W}piuaVE^O(~t<*x0zVwzk%>S4p8z=mPEn&wyM2ed+_?sd}|g
zDEv`2GBVPo-j0Z3L|jmxbYwD_l6og14yzZ{&P*orF`Lb<HX4l`lF`x89-yE;RF9}l
zbve`-b+%nN6cP8-Dsb{wNx57Obtoe4t4Gy!^@UpO$Y!%&)b|n5ubx)BBjTLem&@fE
z3kwV107|7&q?E1zkJS?@?IFtQCjrLB#sGR!N;UNca6sJv-T~w4LQ3g6 at CfJw)`1z|
zW~<d&nVz2hdHyY<_X2sKxVf6T1Uv_ZQc9<Q at 4!o-0xV5VP6BKfwPpJw;xbSN`rGAI
zU|+lcHBd|`E!OMxw8`x__5A$&`oO at zVnocUXCvZxM07_)Q+=!60+uHxCbn_E{h7JB
zIR*y at SJZj6S3RS?Qp*wXxmK&~V0NswHRI#sG at H$1z%}5F`k`8_wsvE7O{G$aN~QAG
b{J+T$+X03p_V~Q~00000NkvXXu0mjf`lS0g

literal 0
HcmV?d00001

diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am
new file mode 100644
index 0000000..d0653b9
--- /dev/null
+++ b/ui/js/Makefile.am
@@ -0,0 +1,27 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+EXTRA_DIST = src widgets
+
+jsdir = $(datadir)/kimchi/ui/js
+
+dist_js_DATA = kimchi.min.js $(filter-out kimchi.min.js, $(wildcard *.js))
+
+kimchi.min.js: widgets/*.js src/*.js
+	cat $(sort $^) > $@
+
+CLEANFILES = kimchi.min.js
diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am
new file mode 100644
index 0000000..a22afc1
--- /dev/null
+++ b/ui/pages/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SUBDIRS = help tabs websockify
+
+htmldir = $(datadir)/kimchi/ui/pages
+
+dist_html_DATA = $(wildcard *.tmpl) $(NULL)
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
new file mode 100644
index 0000000..f705613
--- /dev/null
+++ b/ui/pages/i18n.json.tmpl
@@ -0,0 +1,187 @@
+#*
+ * Project Kimchi
+ *
+ * Copyright IBM, Corp. 2014-2015
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *#
+#unicode UTF-8
+#import gettext
+#from kimchi.cachebust import href
+#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
+#silent _ = t.gettext
+#silent _t = t.gettext
+{
+    "KCHAUTH6001E": "$_("The username or password you entered is incorrect. Please try again.")",
+    "KCHAUTH6002E": "$_("This field is required.")",
+
+    "KCHAUTH6001M": "$_("Log in")",
+    "KCHAUTH6002M": "$_("Logging in...")",
+
+    "Host": "$_("Host")",
+    "Guests": "$_("Guests")",
+    "Templates": "$_("Templates")",
+    "Storage": "$_("Storage")",
+    "Network": "$_("Network")",
+
+    "KCHAPI6002E": "$_("Failed to get application configuration")",
+    "KCHAPI6003E": "$_("This is not a valid Linux path")",
+    "KCHAPI6004E": "$_("This is not a valid URL.")",
+    "KCHAPI6005E": "$_("No such data available.")",
+    "KCHAPI6007E": "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")",
+    "KCHAPI6008E": "$_("Unable to read file.")",
+    "KCHAPI6009E": "$_("Error while uploading file.")",
+
+    "KCHAPI6001M": "$_("Delete Confirmation")",
+    "KCHAPI6002M": "$_("OK")",
+    "KCHAPI6003M": "$_("Cancel")",
+    "KCHAPI6004M": "$_("Confirm")",
+    "KCHAPI6005M": "$_("Create")",
+    "KCHAPI6006M": "$_("Warning")",
+    "KCHAPI6007M": "$_("Save")",
+    "KCHAPI6008M": "$_("Creating...")",
+    "KCHAPI6009M": "$_("Cloning...")",
+
+    "KCHGRD6001M": "$_("Loading...")",
+    "KCHGRD6002M": "$_("An error occurred while retrieving system information.")",
+    "KCHGRD6003M": "$_("Retry")",
+    "KCHGRD6004M": "$_("Detailed message:")",
+
+    "KCHTMPL6001W": "$_("No ISO found")",
+
+    "KCHTMPL6002E": "$_("This is not a valid ISO file.")",
+
+    "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")",
+    "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")",
+
+    "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")",
+
+    "KCHHOST6001M": "$_("Max:")",
+    "KCHHOST6002M": "$_("Utilization")",
+    "KCHHOST6003M": "$_("Available")",
+    "KCHHOST6004M": "$_("Read Rate")",
+    "KCHHOST6005M": "$_("Write Rate")",
+    "KCHHOST6006M": "$_("Received")",
+    "KCHHOST6007M": "$_("Sent")",
+    "KCHHOST6008M": "$_("Shutting down or restarting host will cause unsaved work lost. Continue to shut down/restarting?")",
+
+
+    "KCHREPO6001M": "$_("Confirm")",
+    "KCHREPO6002M": "$_("Repository will be removed permanently and can't be recovered. Do you want to continue?")",
+    "KCHREPO6003M": "$_("Repositories")",
+    "KCHREPO6004M": "$_("ID")",
+    "KCHREPO6005M": "$_("Name")",
+    "KCHREPO6006M": "$_("Base URL")",
+    "KCHREPO6007M": "$_("Is Mirror")",
+    "KCHREPO6008M": "$_("URL Args")",
+    "KCHREPO6009M": "$_("Enabled")",
+    "KCHREPO6010M": "$_("GPG Check")",
+    "KCHREPO6011M": "$_("GPG Key")",
+    "KCHREPO6012M": "$_("Add")",
+    "KCHREPO6013M": "$_("Edit")",
+    "KCHREPO6014M": "$_("Remove")",
+    "KCHREPO6016M": "$_("Enable")",
+    "KCHREPO6017M": "$_("Disable")",
+
+
+    "KCHUPD6001M": "$_("Software Updates")",
+    "KCHUPD6002M": "$_("Package Name")",
+    "KCHUPD6003M": "$_("Version")",
+    "KCHUPD6004M": "$_("Architecture")",
+    "KCHUPD6005M": "$_("Repository")",
+    "KCHUPD6006M": "$_("Update All")",
+    "KCHUPD6007M": "$_("Updating...")",
+    "KCHUPD6008M": "$_("Failed to retrieve packages update information.")",
+    "KCHUPD6009M": "$_("Failed to update package(s).")",
+
+
+    "KCHDR6001M": "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")",
+    "KCHDR6002M": "$_("Debug Reports")",
+    "KCHDR6003M": "$_("Name")",
+    "KCHDR6005M": "$_("Generated Time")",
+    "KCHDR6006M": "$_("Generate")",
+    "KCHDR6007M": "$_("Generating...")",
+    "KCHDR6008M": "$_("Rename")",
+    "KCHDR6009M": "$_("Remove")",
+    "KCHDR6010M": "$_("Download")",
+    "KCHDR6011M": "$_("Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-').")",
+    "KCHDR6012M": "$_("Pending...")",
+    "KCHDR6013M": "$_("Report name is the same as the original one.")",
+
+    "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")",
+    "KCHVM6002M": "$_("Power off Confirmation")",
+    "KCHVM6003M": "$_("This action may produce undesirable results, "
+                      "for example unflushed disk cache in the guest. "
+                      "Would you like to continue?")",
+    "KCHVM6004M": "$_("Reset Confirmation")",
+    "KCHVM6005M": "$_("There is a risk of data loss caused by reset without"
+                      " the guest OS shutdown. Would you like to continue?")",
+    "KCHVM6006M": "$_("Shut Down Confirmation")",
+    "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")",
+    "KCHVM6008M": "$_("Virtual Machine delete Confirmation")",
+    "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")",
+    "KCHVM6010M": "$_("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?")",
+
+    "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")",
+    "KCHVMCD6002M": "$_("Attach")",
+    "KCHVMCD6003M": "$_("Attaching...")",
+    "KCHVMCD6004M": "$_("Replace")",
+    "KCHVMCD6005M": "$_("Replacing...")",
+    "KCHVMCD6006M": "$_("Successfully attached!")",
+    "KCHVMCD6007M": "$_("Successfully replaced!")",
+    "KCHVMCD6008M": "$_("Successfully detached!")",
+    "KCHVMCD6009M": "$_("This disk will be detached permanently and you can re-attach it. Continue to detach it?")",
+
+    "KCHVMED6001M": "$_("interface:")",
+    "KCHVMED6002M": "$_("address:")",
+    "KCHVMED6003M": "$_("link_type:")",
+    "KCHVMED6004M": "$_("block:")",
+    "KCHVMED6005M": "$_("drive_type:")",
+    "KCHVMED6006M": "$_("model:")",
+    "KCHVMED6007M": "$_("Affected devices:")",
+
+    "KCHNET6001E": "$_("The VLAN id must be between 1 and 4094.")",
+
+    "KCHNET6001M": "$_("unavailable")",
+    "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on this network.")",
+    "KCHNET6003M": "$_("Create a network")",
+    "KCHNET6004M": "$_("This network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")",
+    "KCHNET6001W": "$_("The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it.")",
+
+    "KCHPOOL6001M": "$_("This will permanently delete the storage pool. Would you like to continue?")",
+    "KCHPOOL6002M": "$_("This storage pool is empty.")",
+    "KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")",
+    "KCHPOOL6004M": "$_("SCSI Fibre Channel")",
+    "KCHPOOL6005M": "$_("No SCSI adapters found.")",
+    "KCHPOOL6006M": "$_("Loading iSCSI targets...")",
+    "KCHPOOL6007M": "$_("No iSCSI found. Please input one.")",
+    "KCHPOOL6008M": "$_("Failed to load iSCSI targets.")",
+
+    "KCHPOOL6001E": "$_("The storage pool name can not be blank.")",
+    "KCHPOOL6002E": "$_("The storage pool path can not be blank.")",
+    "KCHPOOL6003E": "$_("NFS server mount path can not be blank.")",
+    "KCHPOOL6005E": "$_("Invalid NFS mount path.")",
+    "KCHPOOL6006E": "$_("No logical device selected.")",
+    "KCHPOOL6007E": "$_("The iSCSI target can not be blank.")",
+    "KCHPOOL6008E": "$_("Server name can not be blank.")",
+    "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")",
+    "KCHPOOL6010M": "$_("Looking for available partitions ...")",
+    "KCHPOOL6011M": "$_("No available partitions found.")",
+    "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")",
+    "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")",
+    "KCHPOOL6014M": "$_("In progress...")",
+    "KCHPOOL6015M": "$_("Failed!")",
+
+    "KCHVMSTOR0001E": "$_("CDROM path needs to be a valid local/remote path and cannot be blank.")",
+    "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")"
+}
diff --git a/ui/robots.txt b/ui/robots.txt
new file mode 100644
index 0000000..1f53798
--- /dev/null
+++ b/ui/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:44 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:44 -0300
Subject: [Kimchi-devel] [PATCH V3 12/34] Adapt imports to the new plugin
	structure
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-13-git-send-email-luciojhc@linux.vnet.ibm.com>

This patch adapts imports to the new file structure and
updates imported names in code. No other code changes.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/control/__init__.py                 |    2 +-
 plugins/kimchi/control/config.py                   |    4 +-
 plugins/kimchi/control/cpuinfo.py                  |    2 +-
 plugins/kimchi/control/debugreports.py             |    6 +-
 plugins/kimchi/control/groups.py                   |    4 +-
 plugins/kimchi/control/host.py                     |    8 ++--
 plugins/kimchi/control/interfaces.py               |    4 +-
 plugins/kimchi/control/networks.py                 |    4 +-
 plugins/kimchi/control/peers.py                    |    4 +-
 plugins/kimchi/control/storagepools.py             |   12 +++---
 plugins/kimchi/control/storageservers.py           |    8 ++--
 plugins/kimchi/control/storagevolumes.py           |    8 ++--
 plugins/kimchi/control/tasks.py                    |    4 +-
 plugins/kimchi/control/templates.py                |    4 +-
 plugins/kimchi/control/users.py                    |    6 +-
 plugins/kimchi/control/vm/__init__.py              |    2 +-
 plugins/kimchi/control/vm/hostdevs.py              |    4 +-
 plugins/kimchi/control/vm/ifaces.py                |    4 +-
 plugins/kimchi/control/vm/snapshots.py             |    4 +-
 plugins/kimchi/control/vm/storages.py              |    4 +-
 plugins/kimchi/control/vms.py                      |    6 +-
 plugins/kimchi/disks.py                            |    4 +-
 plugins/kimchi/distroloader.py                     |    6 +-
 plugins/kimchi/imageinfo.py                        |    4 +-
 plugins/kimchi/iscsi.py                            |    2 +-
 plugins/kimchi/isoinfo.py                          |    4 +-
 plugins/kimchi/kvmusertests.py                     |    2 +-
 plugins/kimchi/mockmodel.py                        |   40 ++++++++--------
 plugins/kimchi/model/config.py                     |   25 +++++-----
 plugins/kimchi/model/cpuinfo.py                    |    4 +-
 plugins/kimchi/model/debugreports.py               |   12 +++---
 plugins/kimchi/model/diskutils.py                  |    8 ++--
 plugins/kimchi/model/featuretests.py               |    4 +-
 plugins/kimchi/model/groups.py                     |    2 +-
 plugins/kimchi/model/host.py                       |   26 +++++-----
 plugins/kimchi/model/hostdev.py                    |    6 +-
 plugins/kimchi/model/interfaces.py                 |    6 +-
 plugins/kimchi/model/libvirtconnection.py          |    2 +-
 plugins/kimchi/model/libvirtstoragepool.py         |    8 ++--
 plugins/kimchi/model/model.py                      |   10 ++--
 plugins/kimchi/model/networks.py                   |   22 +++++-----
 plugins/kimchi/model/peers.py                      |    4 +-
 plugins/kimchi/model/storagepools.py               |   21 +++++----
 plugins/kimchi/model/storageservers.py             |    4 +-
 plugins/kimchi/model/storagetargets.py             |    6 +-
 plugins/kimchi/model/storagevolumes.py             |   20 ++++----
 plugins/kimchi/model/tasks.py                      |    2 +-
 plugins/kimchi/model/templates.py                  |   16 +++---
 plugins/kimchi/model/users.py                      |    4 +-
 plugins/kimchi/model/utils.py                      |    2 +-
 plugins/kimchi/model/vmhostdevs.py                 |   16 +++---
 plugins/kimchi/model/vmifaces.py                   |   10 ++--
 plugins/kimchi/model/vms.py                        |   48 ++++++++++---------
 plugins/kimchi/model/vmsnapshots.py                |   12 +++---
 plugins/kimchi/model/vmstorages.py                 |   22 +++++-----
 plugins/kimchi/osinfo.py                           |    2 +-
 plugins/kimchi/repositories.py                     |   12 +++---
 plugins/kimchi/scan.py                             |    4 +-
 plugins/kimchi/screenshot.py                       |    4 +-
 plugins/kimchi/swupdate.py                         |   10 ++--
 plugins/kimchi/tests/iso_gen.py                    |    2 +-
 plugins/kimchi/tests/run_tests.sh.in               |    2 +-
 plugins/kimchi/tests/test_authorization.py         |    6 +-
 plugins/kimchi/tests/test_config.py.in             |    4 +-
 plugins/kimchi/tests/test_exception.py             |    6 +-
 plugins/kimchi/tests/test_host.py                  |    2 +-
 plugins/kimchi/tests/test_mock_network.py          |    2 +-
 plugins/kimchi/tests/test_mock_storagepool.py      |    2 +-
 plugins/kimchi/tests/test_mock_storagevolume.py    |    2 +-
 plugins/kimchi/tests/test_mockmodel.py             |    6 +-
 plugins/kimchi/tests/test_model.py                 |   24 +++++-----
 plugins/kimchi/tests/test_model_network.py         |    4 +-
 plugins/kimchi/tests/test_model_storagepool.py     |    4 +-
 plugins/kimchi/tests/test_model_storagevolume.py   |    9 ++--
 plugins/kimchi/tests/test_networkxml.py            |    4 +-
 plugins/kimchi/tests/test_objectstore.py           |    4 +-
 plugins/kimchi/tests/test_osinfo.py                |    4 +-
 plugins/kimchi/tests/test_plugin.py                |    8 ++--
 plugins/kimchi/tests/test_rest.py                  |   12 +++---
 plugins/kimchi/tests/test_rollbackcontext.py       |    2 +-
 plugins/kimchi/tests/test_server.py                |    4 +-
 plugins/kimchi/tests/test_storagepoolxml.py        |    2 +-
 plugins/kimchi/tests/test_template.py              |    4 +-
 plugins/kimchi/tests/test_utils.py                 |    4 +-
 plugins/kimchi/tests/test_vmtemplate.py            |    6 +-
 plugins/kimchi/tests/test_yumparser.py             |   12 +++---
 plugins/kimchi/tests/utils.py                      |   20 ++++----
 plugins/kimchi/ui/pages/guest-add.html.tmpl        |    2 +-
 .../kimchi/ui/pages/guest-storage-add.html.tmpl    |    2 +-
 plugins/kimchi/ui/pages/guest.html.tmpl            |    2 +-
 plugins/kimchi/ui/pages/i18n.json.tmpl             |    2 +-
 plugins/kimchi/ui/pages/report-add.html.tmpl       |    2 +-
 plugins/kimchi/ui/pages/report-rename.html.tmpl    |    2 +-
 plugins/kimchi/ui/pages/repository-add.html.tmpl   |    2 +-
 plugins/kimchi/ui/pages/repository-edit.html.tmpl  |    2 +-
 .../ui/pages/storagepool-add-volume.html.tmpl      |    2 +-
 plugins/kimchi/ui/pages/tabs/guests.html.tmpl      |    2 +-
 plugins/kimchi/ui/pages/tabs/host.html.tmpl        |    2 +-
 plugins/kimchi/ui/pages/tabs/network.html.tmpl     |    2 +-
 plugins/kimchi/ui/pages/tabs/templates.html.tmpl   |    2 +-
 plugins/kimchi/ui/pages/template-add.html.tmpl     |    2 +-
 plugins/kimchi/ui/pages/template-edit.html.tmpl    |    2 +-
 plugins/kimchi/vmtemplate.py                       |   23 +++++-----
 plugins/kimchi/xmlutils/disk.py                    |    4 +-
 plugins/kimchi/xmlutils/interface.py               |    2 +-
 plugins/sample/__init__.py                         |    6 +-
 plugins/sample/model.py                            |    4 +-
 plugins/sample/sample.conf.in                      |    2 +-
 plugins/sample/ui/pages/i18n.json.tmpl             |    2 +-
 src/wok/asynctask.py                               |    2 +-
 src/wok/auth.py                                    |    8 ++--
 src/wok/cachebust.py                               |    2 +-
 src/wok/control/__init__.py                        |    2 +-
 src/wok/control/base.py                            |   26 +++++-----
 src/wok/control/plugins.py                         |    4 +-
 src/wok/control/utils.py                           |    6 +-
 src/wok/exception.py                               |    4 +-
 src/wok/model/plugins.py                           |    2 +-
 src/wok/objectstore.py                             |    6 +-
 src/wok/proxy.py                                   |    4 +-
 src/wok/root.py                                    |   16 +++---
 src/wok/server.py                                  |   20 ++++----
 src/wok/template.py                                |    2 +-
 src/wok/utils.py                                   |    6 +-
 src/wok/vnc.py                                     |    2 +-
 src/wokd.in                                        |    6 +-
 ui/pages/error.html.tmpl                           |    2 +-
 ui/pages/i18n.json.tmpl                            |    2 +-
 ui/pages/login.html.tmpl                           |    4 +-
 ui/pages/wok-ui.html.tmpl                          |    4 +-
 130 files changed, 445 insertions(+), 439 deletions(-)

diff --git a/plugins/kimchi/control/__init__.py b/plugins/kimchi/control/__init__.py
index 98d42d3..4ad9459 100644
--- a/plugins/kimchi/control/__init__.py
+++ b/plugins/kimchi/control/__init__.py
@@ -20,7 +20,7 @@
 import os
 
 
-from kimchi.control.utils import load_url_sub_node
+from wok.control.utils import load_url_sub_node
 
 
 sub_nodes = load_url_sub_node(os.path.dirname(__file__), __name__)
diff --git a/plugins/kimchi/control/config.py b/plugins/kimchi/control/config.py
index 45bb013..15df68f 100644
--- a/plugins/kimchi/control/config.py
+++ b/plugins/kimchi/control/config.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode("config")
diff --git a/plugins/kimchi/control/cpuinfo.py b/plugins/kimchi/control/cpuinfo.py
index 415dd3d..31f316c 100644
--- a/plugins/kimchi/control/cpuinfo.py
+++ b/plugins/kimchi/control/cpuinfo.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 
-from kimchi.control.base import Resource
+from wok.control.base import Resource
 
 
 class CPUInfo(Resource):
diff --git a/plugins/kimchi/control/debugreports.py b/plugins/kimchi/control/debugreports.py
index 377d002..b5a3072 100644
--- a/plugins/kimchi/control/debugreports.py
+++ b/plugins/kimchi/control/debugreports.py
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-from kimchi.control.base import AsyncCollection, Resource
-from kimchi.control.utils import internal_redirect
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import AsyncCollection, Resource
+from wok.control.utils import internal_redirect
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode('debugreports', True)
diff --git a/plugins/kimchi/control/groups.py b/plugins/kimchi/control/groups.py
index f18b2ab..649ff09 100644
--- a/plugins/kimchi/control/groups.py
+++ b/plugins/kimchi/control/groups.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import SimpleCollection
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import SimpleCollection
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode('groups', True)
diff --git a/plugins/kimchi/control/host.py b/plugins/kimchi/control/host.py
index 5e736db..6634d8f 100644
--- a/plugins/kimchi/control/host.py
+++ b/plugins/kimchi/control/host.py
@@ -17,10 +17,10 @@
 # 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 kimchi.control.cpuinfo import CPUInfo
-from kimchi.control.base import Collection, Resource, SimpleCollection
-from kimchi.control.utils import UrlSubNode
-from kimchi.exception import NotFoundError
+from cpuinfo import CPUInfo
+from wok.control.base import Collection, Resource, SimpleCollection
+from wok.control.utils import UrlSubNode
+from wok.exception import NotFoundError
 
 
 @UrlSubNode('host', True)
diff --git a/plugins/kimchi/control/interfaces.py b/plugins/kimchi/control/interfaces.py
index 3c76f3f..d698b7a 100644
--- a/plugins/kimchi/control/interfaces.py
+++ b/plugins/kimchi/control/interfaces.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode('interfaces', True)
diff --git a/plugins/kimchi/control/networks.py b/plugins/kimchi/control/networks.py
index 42e013f..fd92111 100644
--- a/plugins/kimchi/control/networks.py
+++ b/plugins/kimchi/control/networks.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode('networks', True)
diff --git a/plugins/kimchi/control/peers.py b/plugins/kimchi/control/peers.py
index f72a38c..21e9f13 100644
--- a/plugins/kimchi/control/peers.py
+++ b/plugins/kimchi/control/peers.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import SimpleCollection
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import SimpleCollection
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode("peers", True)
diff --git a/plugins/kimchi/control/storagepools.py b/plugins/kimchi/control/storagepools.py
index ee74bee..4a83c20 100644
--- a/plugins/kimchi/control/storagepools.py
+++ b/plugins/kimchi/control/storagepools.py
@@ -19,12 +19,12 @@
 
 import cherrypy
 
-from kimchi.control.base import Collection, Resource
-from kimchi.control.storagevolumes import IsoVolumes, StorageVolumes
-from kimchi.control.utils import get_class_name, model_fn
-from kimchi.control.utils import validate_params
-from kimchi.model.storagepools import ISO_POOL_NAME
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from storagevolumes import IsoVolumes, StorageVolumes
+from wok.control.utils import get_class_name, model_fn
+from wok.control.utils import validate_params
+from ..model.storagepools import ISO_POOL_NAME
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode('storagepools', True)
diff --git a/plugins/kimchi/control/storageservers.py b/plugins/kimchi/control/storageservers.py
index 4b70c39..654ab47 100644
--- a/plugins/kimchi/control/storageservers.py
+++ b/plugins/kimchi/control/storageservers.py
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-import kimchi.template
-from kimchi.control.base import Collection, Resource
-from kimchi.control.utils import get_class_name, model_fn, UrlSubNode
+from wok import template
+from wok.control.base import Collection, Resource
+from wok.control.utils import get_class_name, model_fn, UrlSubNode
 
 
 @UrlSubNode('storageservers', True)
@@ -57,4 +57,4 @@ class StorageTargets(Collection):
         res_list = []
         get_list = getattr(self.model, model_fn(self, 'get_list'))
         res_list = get_list(*self.model_args, **filter_params)
-        return kimchi.template.render(get_class_name(self), res_list)
+        return template.render(get_class_name(self), res_list)
diff --git a/plugins/kimchi/control/storagevolumes.py b/plugins/kimchi/control/storagevolumes.py
index 8af7abc..bbe6627 100644
--- a/plugins/kimchi/control/storagevolumes.py
+++ b/plugins/kimchi/control/storagevolumes.py
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-import kimchi.template
-from kimchi.control.base import AsyncCollection, Collection, Resource
-from kimchi.control.utils import get_class_name, model_fn
+from wok import template
+from wok.control.base import AsyncCollection, Collection, Resource
+from wok.control.utils import get_class_name, model_fn
 
 
 class StorageVolumes(AsyncCollection):
@@ -80,4 +80,4 @@ class IsoVolumes(Collection):
         except AttributeError:
             pass
 
-        return kimchi.template.render(get_class_name(self), res_list)
+        return template.render(get_class_name(self), res_list)
diff --git a/plugins/kimchi/control/tasks.py b/plugins/kimchi/control/tasks.py
index 4870dbd..b25d892 100644
--- a/plugins/kimchi/control/tasks.py
+++ b/plugins/kimchi/control/tasks.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode("tasks", True)
diff --git a/plugins/kimchi/control/templates.py b/plugins/kimchi/control/templates.py
index 4c45910..fc58815 100644
--- a/plugins/kimchi/control/templates.py
+++ b/plugins/kimchi/control/templates.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode('templates', True)
diff --git a/plugins/kimchi/control/users.py b/plugins/kimchi/control/users.py
index 45603d0..756a2f7 100644
--- a/plugins/kimchi/control/users.py
+++ b/plugins/kimchi/control/users.py
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-from kimchi.control.base import SimpleCollection
-from kimchi.control.utils import get_class_name, model_fn, UrlSubNode
-from kimchi.template import render
+from wok.control.base import SimpleCollection
+from wok.control.utils import get_class_name, model_fn, UrlSubNode
+from wok.template import render
 
 
 @UrlSubNode('users', True)
diff --git a/plugins/kimchi/control/vm/__init__.py b/plugins/kimchi/control/vm/__init__.py
index 2ea1e8c..a311045 100644
--- a/plugins/kimchi/control/vm/__init__.py
+++ b/plugins/kimchi/control/vm/__init__.py
@@ -20,7 +20,7 @@
 import os
 
 
-from kimchi.control.utils import load_url_sub_node
+from wok.control.utils import load_url_sub_node
 
 
 sub_nodes = load_url_sub_node(os.path.dirname(__file__), __name__)
diff --git a/plugins/kimchi/control/vm/hostdevs.py b/plugins/kimchi/control/vm/hostdevs.py
index 1eb88cf..a43b9d8 100644
--- a/plugins/kimchi/control/vm/hostdevs.py
+++ b/plugins/kimchi/control/vm/hostdevs.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode("hostdevs")
diff --git a/plugins/kimchi/control/vm/ifaces.py b/plugins/kimchi/control/vm/ifaces.py
index 8a60217..ac957fd 100644
--- a/plugins/kimchi/control/vm/ifaces.py
+++ b/plugins/kimchi/control/vm/ifaces.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode("ifaces")
diff --git a/plugins/kimchi/control/vm/snapshots.py b/plugins/kimchi/control/vm/snapshots.py
index bbebc9a..dd17b85 100644
--- a/plugins/kimchi/control/vm/snapshots.py
+++ b/plugins/kimchi/control/vm/snapshots.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import AsyncCollection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import AsyncCollection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode('snapshots')
diff --git a/plugins/kimchi/control/vm/storages.py b/plugins/kimchi/control/vm/storages.py
index 81a5d48..f502caa 100644
--- a/plugins/kimchi/control/vm/storages.py
+++ b/plugins/kimchi/control/vm/storages.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import Collection, Resource
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import Collection, Resource
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode("storages")
diff --git a/plugins/kimchi/control/vms.py b/plugins/kimchi/control/vms.py
index a40b56e..c8105bc 100644
--- a/plugins/kimchi/control/vms.py
+++ b/plugins/kimchi/control/vms.py
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-from kimchi.control.base import AsyncCollection, Resource
-from kimchi.control.utils import internal_redirect, UrlSubNode
-from kimchi.control.vm import sub_nodes
+from wok.control.base import AsyncCollection, Resource
+from wok.control.utils import internal_redirect, UrlSubNode
+from vm import sub_nodes
 
 
 @UrlSubNode('vms', True)
diff --git a/plugins/kimchi/disks.py b/plugins/kimchi/disks.py
index 016a079..59e52f9 100644
--- a/plugins/kimchi/disks.py
+++ b/plugins/kimchi/disks.py
@@ -24,8 +24,8 @@ import subprocess
 from parted import Device as PDevice
 from parted import Disk as PDisk
 
-from kimchi.exception import OperationFailed
-from kimchi.utils import kimchi_log
+from wok.exception import OperationFailed
+from wok.utils import kimchi_log
 
 
 def _get_dev_node_path(maj_min):
diff --git a/plugins/kimchi/distroloader.py b/plugins/kimchi/distroloader.py
index daed73c..8ad34d2 100644
--- a/plugins/kimchi/distroloader.py
+++ b/plugins/kimchi/distroloader.py
@@ -23,9 +23,9 @@ import json
 import os
 
 
-from kimchi import config
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.utils import kimchi_log
+import config
+from wok.exception import NotFoundError, OperationFailed
+from wok.utils import kimchi_log
 
 
 ARCHS = {'x86_64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'],
diff --git a/plugins/kimchi/imageinfo.py b/plugins/kimchi/imageinfo.py
index 89d1e0a..fbd1396 100644
--- a/plugins/kimchi/imageinfo.py
+++ b/plugins/kimchi/imageinfo.py
@@ -22,8 +22,8 @@ import os
 import sys
 import guestfs
 
-from kimchi.exception import ImageFormatError, InvalidParameter, TimeoutExpired
-from kimchi.utils import run_command, kimchi_log
+from wok.exception import ImageFormatError, InvalidParameter, TimeoutExpired
+from wok.utils import run_command, kimchi_log
 
 
 def probe_img_info(path):
diff --git a/plugins/kimchi/iscsi.py b/plugins/kimchi/iscsi.py
index b3e1b78..02886ac 100644
--- a/plugins/kimchi/iscsi.py
+++ b/plugins/kimchi/iscsi.py
@@ -20,7 +20,7 @@
 import subprocess
 
 
-from kimchi.exception import OperationFailed
+from wok.exception import OperationFailed
 
 
 class TargetClient(object):
diff --git a/plugins/kimchi/isoinfo.py b/plugins/kimchi/isoinfo.py
index 6fb0f38..de9c359 100644
--- a/plugins/kimchi/isoinfo.py
+++ b/plugins/kimchi/isoinfo.py
@@ -28,8 +28,8 @@ import sys
 import urllib2
 
 
-from kimchi.exception import IsoFormatError
-from kimchi.utils import check_url_path, kimchi_log
+from wok.exception import IsoFormatError
+from wok.utils import check_url_path, kimchi_log
 
 
 iso_dir = [
diff --git a/plugins/kimchi/kvmusertests.py b/plugins/kimchi/kvmusertests.py
index 5724267..ace157e 100644
--- a/plugins/kimchi/kvmusertests.py
+++ b/plugins/kimchi/kvmusertests.py
@@ -22,7 +22,7 @@ import threading
 
 import libvirt
 
-from kimchi.rollbackcontext import RollbackContext
+from wok.rollbackcontext import RollbackContext
 
 KVMUSERTEST_VM_NAME = "KVMUSERTEST_VM"
 
diff --git a/plugins/kimchi/mockmodel.py b/plugins/kimchi/mockmodel.py
index aaf1af2..384ce9b 100644
--- a/plugins/kimchi/mockmodel.py
+++ b/plugins/kimchi/mockmodel.py
@@ -23,29 +23,29 @@ import os
 import random
 import time
 
-import kimchi.model.cpuinfo
+from model import cpuinfo
 
 from lxml import objectify
 from lxml.builder import E
 
-from kimchi import config
-from kimchi import imageinfo
-from kimchi import osinfo
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.model.debugreports import DebugReportsModel
-from kimchi.model.host import DeviceModel
-from kimchi.model.libvirtstoragepool import IscsiPoolDef, NetfsPoolDef
-from kimchi.model.libvirtstoragepool import StoragePoolDef
-from kimchi.model.model import Model
-from kimchi.model.storagepools import StoragePoolModel
-from kimchi.model.storagevolumes import StorageVolumeModel, StorageVolumesModel
-from kimchi.model.templates import LibvirtVMTemplate
-from kimchi.model.users import PAMUsersModel
-from kimchi.model.groups import PAMGroupsModel
-from kimchi.objectstore import ObjectStore
-from kimchi.utils import add_task, get_next_clone_name, kimchi_log
-from kimchi.vmtemplate import VMTemplate
-from kimchi.xmlutils.utils import xml_item_update
+import config
+import imageinfo
+import osinfo
+from wok.exception import NotFoundError, OperationFailed
+from model.debugreports import DebugReportsModel
+from model.host import DeviceModel
+from model.libvirtstoragepool import IscsiPoolDef, NetfsPoolDef
+from model.libvirtstoragepool import StoragePoolDef
+from model.model import Model
+from model.storagepools import StoragePoolModel
+from model.storagevolumes import StorageVolumeModel, StorageVolumesModel
+from model.templates import LibvirtVMTemplate
+from model.users import PAMUsersModel
+from model.groups import PAMGroupsModel
+from wok.objectstore import ObjectStore
+from wok.utils import add_task, get_next_clone_name, kimchi_log
+from vmtemplate import VMTemplate
+from wok.xmlutils.utils import xml_item_update
 
 
 fake_user = {'root': 'letmein!'}
@@ -74,7 +74,7 @@ class MockModel(Model):
         self._mock_swupdate = MockSoftwareUpdate()
         self._mock_repositories = MockRepositories()
 
-        kimchi.model.cpuinfo.get_topo_capabilities = \
+        cpuinfo.get_topo_capabilities = \
             MockModel.get_topo_capabilities
         libvirt.virConnect.defineXML = MockModel.domainDefineXML
         libvirt.virDomain.XMLDesc = MockModel.domainXMLDesc
diff --git a/plugins/kimchi/model/config.py b/plugins/kimchi/model/config.py
index d894b21..6f593e3 100644
--- a/plugins/kimchi/model/config.py
+++ b/plugins/kimchi/model/config.py
@@ -21,18 +21,19 @@ from multiprocessing.pool import ThreadPool
 
 import cherrypy
 
-from kimchi.basemodel import Singleton
-from kimchi.config import config as kconfig
-from kimchi.config import find_qemu_binary, get_version
-from kimchi.distroloader import DistroLoader
-from kimchi.exception import NotFoundError
-from kimchi.model.debugreports import DebugReportsModel
-from kimchi.model.featuretests import FeatureTests, FEATURETEST_POOL_NAME
-from kimchi.model.featuretests import FEATURETEST_VM_NAME
-from kimchi.repositories import Repositories
-from kimchi.screenshot import VMScreenshot
-from kimchi.swupdate import SoftwareUpdate
-from kimchi.utils import check_url_path, kimchi_log, run_command
+from wok.basemodel import Singleton
+from wok.config import config as kconfig
+from wok.config import get_version
+from ..config import find_qemu_binary
+from ..distroloader import DistroLoader
+from wok.exception import NotFoundError
+from debugreports import DebugReportsModel
+from featuretests import FeatureTests, FEATURETEST_POOL_NAME
+from featuretests import FEATURETEST_VM_NAME
+from ..repositories import Repositories
+from ..screenshot import VMScreenshot
+from ..swupdate import SoftwareUpdate
+from wok.utils import check_url_path, kimchi_log, run_command
 
 
 class ConfigModel(object):
diff --git a/plugins/kimchi/model/cpuinfo.py b/plugins/kimchi/model/cpuinfo.py
index 548aa3e..54d6eaa 100644
--- a/plugins/kimchi/model/cpuinfo.py
+++ b/plugins/kimchi/model/cpuinfo.py
@@ -21,8 +21,8 @@ import platform
 
 from xml.etree import ElementTree as ET
 
-from kimchi.exception import InvalidParameter, InvalidOperation
-from kimchi.utils import kimchi_log, run_command
+from wok.exception import InvalidParameter, InvalidOperation
+from wok.utils import kimchi_log, run_command
 
 ARCH = 'power' if platform.machine().startswith('ppc') else 'x86'
 
diff --git a/plugins/kimchi/model/debugreports.py b/plugins/kimchi/model/debugreports.py
index 5f74da8..6cc8819 100644
--- a/plugins/kimchi/model/debugreports.py
+++ b/plugins/kimchi/model/debugreports.py
@@ -25,12 +25,12 @@ import shutil
 import subprocess
 import time
 
-from kimchi import config
-from kimchi.exception import InvalidParameter, KimchiException, NotFoundError
-from kimchi.exception import OperationFailed
-from kimchi.model.tasks import TaskModel
-from kimchi.utils import add_task, kimchi_log
-from kimchi.utils import run_command
+from .. import config
+from wok.exception import InvalidParameter, KimchiException, NotFoundError
+from wok.exception import OperationFailed
+from tasks import TaskModel
+from wok.utils import add_task, kimchi_log
+from wok.utils import run_command
 
 
 class DebugReportsModel(object):
diff --git a/plugins/kimchi/model/diskutils.py b/plugins/kimchi/model/diskutils.py
index 0be2024..041a135 100644
--- a/plugins/kimchi/model/diskutils.py
+++ b/plugins/kimchi/model/diskutils.py
@@ -18,10 +18,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 
-from kimchi.exception import OperationFailed, NotFoundError
-from kimchi.model.vms import VMModel, VMsModel
-from kimchi.utils import kimchi_log
-from kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks
+from wok.exception import OperationFailed, NotFoundError
+from vms import VMModel, VMsModel
+from wok.utils import kimchi_log
+from ..xmlutils.disk import get_vm_disk_info, get_vm_disks
 
 """
     Functions that multiple storage-related models (e.g. VMStoragesModel,
diff --git a/plugins/kimchi/model/featuretests.py b/plugins/kimchi/model/featuretests.py
index 047108f..16fd25e 100644
--- a/plugins/kimchi/model/featuretests.py
+++ b/plugins/kimchi/model/featuretests.py
@@ -25,8 +25,8 @@ import subprocess
 
 from lxml.builder import E
 
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.utils import kimchi_log, run_command, servermethod
+from wok.rollbackcontext import RollbackContext
+from wok.utils import kimchi_log, run_command, servermethod
 
 FEATURETEST_VM_NAME = "FEATURETEST_VM"
 FEATURETEST_POOL_NAME = "FEATURETEST_POOL"
diff --git a/plugins/kimchi/model/groups.py b/plugins/kimchi/model/groups.py
index 0af3f8f..fc63d68 100644
--- a/plugins/kimchi/model/groups.py
+++ b/plugins/kimchi/model/groups.py
@@ -19,7 +19,7 @@
 
 import grp
 
-from kimchi.config import config
+from wok.config import config
 
 
 class GroupsModel(object):
diff --git a/plugins/kimchi/model/host.py b/plugins/kimchi/model/host.py
index b2fa379..f1f0b83 100644
--- a/plugins/kimchi/model/host.py
+++ b/plugins/kimchi/model/host.py
@@ -26,19 +26,19 @@ from collections import defaultdict
 import psutil
 from cherrypy.process.plugins import BackgroundTask
 
-from kimchi import disks
-from kimchi import netinfo
-from kimchi.basemodel import Singleton
-from kimchi.model import hostdev
-from kimchi.exception import InvalidOperation, InvalidParameter
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.model.config import CapabilitiesModel
-from kimchi.model.tasks import TaskModel
-from kimchi.model.vms import DOM_STATE_MAP
-from kimchi.repositories import Repositories
-from kimchi.swupdate import SoftwareUpdate
-from kimchi.utils import add_task, kimchi_log
-from kimchi.xmlutils.utils import xpath_get_text
+from .. import disks
+from wok import netinfo
+from wok.basemodel import Singleton
+import hostdev
+from wok.exception import InvalidOperation, InvalidParameter
+from wok.exception import NotFoundError, OperationFailed
+from config import CapabilitiesModel
+from tasks import TaskModel
+from vms import DOM_STATE_MAP
+from ..repositories import Repositories
+from ..swupdate import SoftwareUpdate
+from wok.utils import add_task, kimchi_log
+from wok.xmlutils.utils import xpath_get_text
 
 
 HOST_STATS_INTERVAL = 1
diff --git a/plugins/kimchi/model/hostdev.py b/plugins/kimchi/model/hostdev.py
index 2a4a311..34a8e1b 100644
--- a/plugins/kimchi/model/hostdev.py
+++ b/plugins/kimchi/model/hostdev.py
@@ -21,9 +21,9 @@ import os
 from pprint import pformat
 from pprint import pprint
 
-from kimchi.model.libvirtconnection import LibvirtConnection
-from kimchi.utils import kimchi_log
-from kimchi.xmlutils.utils import dictize
+from libvirtconnection import LibvirtConnection
+from wok.utils import kimchi_log
+from wok.xmlutils.utils import dictize
 
 
 def _get_all_host_dev_infos(libvirt_conn):
diff --git a/plugins/kimchi/model/interfaces.py b/plugins/kimchi/model/interfaces.py
index 4069caf..5ccadc7 100644
--- a/plugins/kimchi/model/interfaces.py
+++ b/plugins/kimchi/model/interfaces.py
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-from kimchi import netinfo
-from kimchi.exception import NotFoundError
-from kimchi.model.networks import NetworksModel
+from wok import netinfo
+from wok.exception import NotFoundError
+from networks import NetworksModel
 
 
 class InterfacesModel(object):
diff --git a/plugins/kimchi/model/libvirtconnection.py b/plugins/kimchi/model/libvirtconnection.py
index 7a5337c..4a4eee4 100644
--- a/plugins/kimchi/model/libvirtconnection.py
+++ b/plugins/kimchi/model/libvirtconnection.py
@@ -23,7 +23,7 @@ import time
 import cherrypy
 import libvirt
 
-from kimchi.utils import kimchi_log
+from wok.utils import kimchi_log
 
 
 class LibvirtConnection(object):
diff --git a/plugins/kimchi/model/libvirtstoragepool.py b/plugins/kimchi/model/libvirtstoragepool.py
index c6deafc..b7a8291 100644
--- a/plugins/kimchi/model/libvirtstoragepool.py
+++ b/plugins/kimchi/model/libvirtstoragepool.py
@@ -24,10 +24,10 @@ from lxml.builder import E
 
 import libvirt
 
-from kimchi.exception import InvalidParameter, OperationFailed, TimeoutExpired
-from kimchi.iscsi import TargetClient
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.utils import kimchi_log, parse_cmd_output, run_command
+from wok.exception import InvalidParameter, OperationFailed, TimeoutExpired
+from ..iscsi import TargetClient
+from wok.rollbackcontext import RollbackContext
+from wok.utils import kimchi_log, parse_cmd_output, run_command
 
 
 class StoragePoolDef(object):
diff --git a/plugins/kimchi/model/model.py b/plugins/kimchi/model/model.py
index 40ebc98..33dea12 100644
--- a/plugins/kimchi/model/model.py
+++ b/plugins/kimchi/model/model.py
@@ -20,10 +20,10 @@
 import inspect
 import os
 
-from kimchi.basemodel import BaseModel
-from kimchi.model.libvirtconnection import LibvirtConnection
-from kimchi.objectstore import ObjectStore
-from kimchi.utils import import_module, listPathModules
+from wok.basemodel import BaseModel
+from libvirtconnection import LibvirtConnection
+from wok.objectstore import ObjectStore
+from wok.utils import import_module, listPathModules
 
 
 class Model(BaseModel):
@@ -41,7 +41,7 @@ class Model(BaseModel):
             if mod_name.startswith("_") or mod_name == this_mod:
                 continue
 
-            module = import_module('model.' + mod_name)
+            module = import_module('plugins.kimchi.model.' + mod_name)
             members = inspect.getmembers(module, inspect.isclass)
             for cls_name, instance in members:
                 if inspect.getmodule(instance) == module:
diff --git a/plugins/kimchi/model/networks.py b/plugins/kimchi/model/networks.py
index 275e12b..7a3dfc8 100644
--- a/plugins/kimchi/model/networks.py
+++ b/plugins/kimchi/model/networks.py
@@ -25,17 +25,17 @@ import libvirt
 
 from xml.sax.saxutils import escape
 
-from kimchi import netinfo
-from kimchi import network as knetwork
-from kimchi.config import paths
-from kimchi.exception import InvalidOperation, InvalidParameter
-from kimchi.exception import MissingParameter, NotFoundError, OperationFailed
-from kimchi.osinfo import defaults as tmpl_defaults
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.utils import kimchi_log, run_command
-from kimchi.xmlutils.network import create_vlan_tagged_bridge_xml
-from kimchi.xmlutils.network import to_network_xml
-from kimchi.xmlutils.utils import xpath_get_text
+from wok import netinfo
+from wok import network as knetwork
+from wok.config import paths
+from wok.exception import InvalidOperation, InvalidParameter
+from wok.exception import MissingParameter, NotFoundError, OperationFailed
+from ..osinfo import defaults as tmpl_defaults
+from wok.rollbackcontext import RollbackContext
+from wok.utils import kimchi_log, run_command
+from ..xmlutils.network import create_vlan_tagged_bridge_xml
+from ..xmlutils.network import to_network_xml
+from wok.xmlutils.utils import xpath_get_text
 
 
 KIMCHI_BRIDGE_PREFIX = 'kb'
diff --git a/plugins/kimchi/model/peers.py b/plugins/kimchi/model/peers.py
index 0d4227b..ef70b1e 100644
--- a/plugins/kimchi/model/peers.py
+++ b/plugins/kimchi/model/peers.py
@@ -21,8 +21,8 @@ import cherrypy
 import re
 import socket
 
-from kimchi.config import config
-from kimchi.utils import kimchi_log, run_command
+from wok.config import config
+from wok.utils import kimchi_log, run_command
 
 
 class PeersModel(object):
diff --git a/plugins/kimchi/model/storagepools.py b/plugins/kimchi/model/storagepools.py
index aa075cd..e84dc33 100644
--- a/plugins/kimchi/model/storagepools.py
+++ b/plugins/kimchi/model/storagepools.py
@@ -23,16 +23,17 @@ import sys
 
 from lxml.builder import E
 
-from kimchi.config import config, paths
-from kimchi.scan import Scanner
-from kimchi.exception import InvalidOperation, MissingParameter
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.model.config import CapabilitiesModel
-from kimchi.model.host import DeviceModel
-from kimchi.model.libvirtstoragepool import StoragePoolDef
-from kimchi.osinfo import defaults as tmpl_defaults
-from kimchi.utils import add_task, kimchi_log, pool_name_from_uri, run_command
-from kimchi.xmlutils.utils import xpath_get_text
+from wok.config import config, paths
+from ..scan import Scanner
+from wok.exception import InvalidOperation, MissingParameter
+from wok.exception import NotFoundError, OperationFailed
+from config import CapabilitiesModel
+from host import DeviceModel
+from libvirtstoragepool import StoragePoolDef
+from ..osinfo import defaults as tmpl_defaults
+from wok.utils import add_task, kimchi_log, run_command
+from ..utils import pool_name_from_uri
+from wok.xmlutils.utils import xpath_get_text
 
 
 ISO_POOL_NAME = u'kimchi_isos'
diff --git a/plugins/kimchi/model/storageservers.py b/plugins/kimchi/model/storageservers.py
index dcdb74a..17e1289 100644
--- a/plugins/kimchi/model/storageservers.py
+++ b/plugins/kimchi/model/storageservers.py
@@ -17,8 +17,8 @@
 # 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 kimchi.exception import NotFoundError
-from kimchi.model.storagepools import StoragePoolModel, StoragePoolsModel
+from wok.exception import NotFoundError
+from storagepools import StoragePoolModel, StoragePoolsModel
 
 # Types of remote storage servers supported
 STORAGE_SERVERS = ['netfs', 'iscsi']
diff --git a/plugins/kimchi/model/storagetargets.py b/plugins/kimchi/model/storagetargets.py
index 159f987..dd88fec 100644
--- a/plugins/kimchi/model/storagetargets.py
+++ b/plugins/kimchi/model/storagetargets.py
@@ -22,9 +22,9 @@ import lxml.etree as ET
 from lxml import objectify
 from lxml.builder import E
 
-from kimchi.model.config import CapabilitiesModel
-from kimchi.model.storageservers import STORAGE_SERVERS
-from kimchi.utils import kimchi_log, patch_find_nfs_target
+from config import CapabilitiesModel
+from storageservers import STORAGE_SERVERS
+from wok.utils import kimchi_log, patch_find_nfs_target
 
 
 class StorageTargetsModel(object):
diff --git a/plugins/kimchi/model/storagevolumes.py b/plugins/kimchi/model/storagevolumes.py
index 22856ff..92e1c7c 100644
--- a/plugins/kimchi/model/storagevolumes.py
+++ b/plugins/kimchi/model/storagevolumes.py
@@ -28,16 +28,16 @@ from lxml.builder import E
 
 import libvirt
 
-from kimchi.config import READONLY_POOL_TYPE
-from kimchi.exception import InvalidOperation, InvalidParameter, IsoFormatError
-from kimchi.exception import MissingParameter, NotFoundError, OperationFailed
-from kimchi.isoinfo import IsoImage
-from kimchi.model.diskutils import get_disk_used_by, set_disk_used_by
-from kimchi.model.storagepools import StoragePoolModel
-from kimchi.model.tasks import TaskModel
-from kimchi.utils import add_task, get_next_clone_name, get_unique_file_name
-from kimchi.utils import kimchi_log
-from kimchi.xmlutils.utils import xpath_get_text
+from ..config import READONLY_POOL_TYPE
+from wok.exception import InvalidOperation, InvalidParameter, IsoFormatError
+from wok.exception import MissingParameter, NotFoundError, OperationFailed
+from ..isoinfo import IsoImage
+from diskutils import get_disk_used_by, set_disk_used_by
+from storagepools import StoragePoolModel
+from tasks import TaskModel
+from wok.utils import add_task, get_next_clone_name, get_unique_file_name
+from wok.utils import kimchi_log
+from wok.xmlutils.utils import xpath_get_text
 
 
 VOLUME_TYPE_MAP = {0: 'file',
diff --git a/plugins/kimchi/model/tasks.py b/plugins/kimchi/model/tasks.py
index 61bc2f3..678fdc2 100644
--- a/plugins/kimchi/model/tasks.py
+++ b/plugins/kimchi/model/tasks.py
@@ -20,7 +20,7 @@
 
 import time
 
-from kimchi.exception import TimeoutExpired
+from wok.exception import TimeoutExpired
 
 
 class TasksModel(object):
diff --git a/plugins/kimchi/model/templates.py b/plugins/kimchi/model/templates.py
index ef83706..0f1f6be 100644
--- a/plugins/kimchi/model/templates.py
+++ b/plugins/kimchi/model/templates.py
@@ -23,14 +23,14 @@ import stat
 
 import libvirt
 
-from kimchi.exception import InvalidOperation, InvalidParameter
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.kvmusertests import UserTests
-from kimchi.model.cpuinfo import CPUInfoModel
-from kimchi.utils import pool_name_from_uri
-from kimchi.utils import probe_file_permission_as_user, run_setfacl_set_attr
-from kimchi.vmtemplate import VMTemplate
-from kimchi.xmlutils.utils import xpath_get_text
+from wok.exception import InvalidOperation, InvalidParameter
+from wok.exception import NotFoundError, OperationFailed
+from ..kvmusertests import UserTests
+from cpuinfo import CPUInfoModel
+from ..utils import pool_name_from_uri
+from wok.utils import probe_file_permission_as_user, run_setfacl_set_attr
+from ..vmtemplate import VMTemplate
+from wok.xmlutils.utils import xpath_get_text
 
 
 class TemplatesModel(object):
diff --git a/plugins/kimchi/model/users.py b/plugins/kimchi/model/users.py
index 1422bae..2fa65dd 100644
--- a/plugins/kimchi/model/users.py
+++ b/plugins/kimchi/model/users.py
@@ -20,8 +20,8 @@
 import ldap
 import pwd
 
-from kimchi.config import config
-from kimchi.exception import NotFoundError
+from wok.config import config
+from wok.exception import NotFoundError
 
 
 class UsersModel(object):
diff --git a/plugins/kimchi/model/utils.py b/plugins/kimchi/model/utils.py
index 7f27edd..878390f 100644
--- a/plugins/kimchi/model/utils.py
+++ b/plugins/kimchi/model/utils.py
@@ -21,7 +21,7 @@ import libvirt
 from lxml import etree, objectify
 from lxml.builder import E, ElementMaker
 
-from kimchi.exception import OperationFailed
+from wok.exception import OperationFailed
 
 KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi"
 KIMCHI_NAMESPACE = "kimchi"
diff --git a/plugins/kimchi/model/vmhostdevs.py b/plugins/kimchi/model/vmhostdevs.py
index ea75fce..f8c87dd 100644
--- a/plugins/kimchi/model/vmhostdevs.py
+++ b/plugins/kimchi/model/vmhostdevs.py
@@ -24,14 +24,14 @@ import libvirt
 from lxml import etree, objectify
 from lxml.builder import E
 
-from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError
-from kimchi.exception import OperationFailed
-from kimchi.model.config import CapabilitiesModel
-from kimchi.model.host import DeviceModel, DevicesModel
-from kimchi.model.utils import get_vm_config_flag
-from kimchi.model.vms import DOM_STATE_MAP, VMModel
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.utils import kimchi_log, run_command
+from wok.exception import InvalidOperation, InvalidParameter, NotFoundError
+from wok.exception import OperationFailed
+from config import CapabilitiesModel
+from host import DeviceModel, DevicesModel
+from utils import get_vm_config_flag
+from vms import DOM_STATE_MAP, VMModel
+from wok.rollbackcontext import RollbackContext
+from wok.utils import kimchi_log, run_command
 import platform
 
 
diff --git a/plugins/kimchi/model/vmifaces.py b/plugins/kimchi/model/vmifaces.py
index 93a769b..6e14cc3 100644
--- a/plugins/kimchi/model/vmifaces.py
+++ b/plugins/kimchi/model/vmifaces.py
@@ -22,11 +22,11 @@ import random
 import libvirt
 from lxml import etree, objectify
 
-from kimchi.exception import InvalidParameter, MissingParameter
-from kimchi.exception import NotFoundError, InvalidOperation
-from kimchi.model.config import CapabilitiesModel
-from kimchi.model.vms import DOM_STATE_MAP, VMModel
-from kimchi.xmlutils.interface import get_iface_xml
+from wok.exception import InvalidParameter, MissingParameter
+from wok.exception import NotFoundError, InvalidOperation
+from config import CapabilitiesModel
+from vms import DOM_STATE_MAP, VMModel
+from ..xmlutils.interface import get_iface_xml
 
 
 class VMIfacesModel(object):
diff --git a/plugins/kimchi/model/vms.py b/plugins/kimchi/model/vms.py
index 106e9bc..a874ca1 100644
--- a/plugins/kimchi/model/vms.py
+++ b/plugins/kimchi/model/vms.py
@@ -29,25 +29,27 @@ from xml.etree import ElementTree
 
 import libvirt
 
-from kimchi import model, vnc
-from kimchi.config import READONLY_POOL_TYPE, config
-from kimchi.exception import InvalidOperation, InvalidParameter
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.kvmusertests import UserTests
-from kimchi.model.config import CapabilitiesModel
-from kimchi.model.tasks import TaskModel
-from kimchi.model.templates import TemplateModel
-from kimchi.model.utils import get_vm_name
-from kimchi.model.utils import get_metadata_node
-from kimchi.model.utils import set_metadata_node
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.screenshot import VMScreenshot
-from kimchi.utils import add_task, convert_data_size, get_next_clone_name
-from kimchi.utils import import_class, kimchi_log, run_setfacl_set_attr
-from kimchi.utils import template_name_from_uri
-from kimchi.xmlutils.cpu import get_cpu_xml, get_numa_xml
-from kimchi.xmlutils.utils import xpath_get_text, xml_item_update
-from kimchi.xmlutils.utils import dictize
+from wok import vnc
+from .. import model
+from wok.config import config
+from ..config import READONLY_POOL_TYPE
+from wok.exception import InvalidOperation, InvalidParameter
+from wok.exception import NotFoundError, OperationFailed
+from ..kvmusertests import UserTests
+from config import CapabilitiesModel
+from tasks import TaskModel
+from templates import TemplateModel
+from utils import get_vm_name
+from utils import get_metadata_node
+from utils import set_metadata_node
+from wok.rollbackcontext import RollbackContext
+from ..screenshot import VMScreenshot
+from wok.utils import add_task, convert_data_size, get_next_clone_name
+from wok.utils import import_class, kimchi_log, run_setfacl_set_attr
+from ..utils import template_name_from_uri
+from ..xmlutils.cpu import get_cpu_xml, get_numa_xml
+from wok.xmlutils.utils import xpath_get_text, xml_item_update
+from wok.xmlutils.utils import dictize
 
 
 DOM_STATE_MAP = {0: 'nostate',
@@ -182,16 +184,16 @@ class VMModel(object):
         self.objstore = kargs['objstore']
         self.caps = CapabilitiesModel(**kargs)
         self.vmscreenshot = VMScreenshotModel(**kargs)
-        self.users = import_class('kimchi.model.users.UsersModel')(**kargs)
-        self.groups = import_class('kimchi.model.groups.GroupsModel')(**kargs)
+        self.users = import_class('plugins.kimchi.model.users.UsersModel')(**kargs)
+        self.groups = import_class('plugins.kimchi.model.groups.GroupsModel')(**kargs)
         self.vms = VMsModel(**kargs)
         self.task = TaskModel(**kargs)
         self.storagepool = model.storagepools.StoragePoolModel(**kargs)
         self.storagevolume = model.storagevolumes.StorageVolumeModel(**kargs)
         self.storagevolumes = model.storagevolumes.StorageVolumesModel(**kargs)
-        cls = import_class('kimchi.model.vmsnapshots.VMSnapshotModel')
+        cls = import_class('plugins.kimchi.model.vmsnapshots.VMSnapshotModel')
         self.vmsnapshot = cls(**kargs)
-        cls = import_class('kimchi.model.vmsnapshots.VMSnapshotsModel')
+        cls = import_class('plugins.kimchi.model.vmsnapshots.VMSnapshotsModel')
         self.vmsnapshots = cls(**kargs)
         self.stats = {}
 
diff --git a/plugins/kimchi/model/vmsnapshots.py b/plugins/kimchi/model/vmsnapshots.py
index 3a92cdc..60de253 100644
--- a/plugins/kimchi/model/vmsnapshots.py
+++ b/plugins/kimchi/model/vmsnapshots.py
@@ -24,12 +24,12 @@ import lxml.etree as ET
 from lxml import objectify
 from lxml.builder import E
 
-from kimchi.exception import InvalidOperation, NotFoundError, OperationFailed
-from kimchi.model.tasks import TaskModel
-from kimchi.model.vms import DOM_STATE_MAP, VMModel
-from kimchi.model.vmstorages import VMStorageModel, VMStoragesModel
-from kimchi.utils import add_task
-from kimchi.xmlutils.utils import xpath_get_text
+from wok.exception import InvalidOperation, NotFoundError, OperationFailed
+from tasks import TaskModel
+from vms import DOM_STATE_MAP, VMModel
+from vmstorages import VMStorageModel, VMStoragesModel
+from wok.utils import add_task
+from wok.xmlutils.utils import xpath_get_text
 
 
 class VMSnapshotsModel(object):
diff --git a/plugins/kimchi/model/vmstorages.py b/plugins/kimchi/model/vmstorages.py
index 142b177..29f8f30 100644
--- a/plugins/kimchi/model/vmstorages.py
+++ b/plugins/kimchi/model/vmstorages.py
@@ -21,17 +21,17 @@ import string
 
 from lxml import etree
 
-from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError
-from kimchi.exception import OperationFailed
-from kimchi.model.config import CapabilitiesModel
-from kimchi.model.vms import DOM_STATE_MAP, VMModel
-from kimchi.model.storagevolumes import StorageVolumeModel
-from kimchi.model.utils import get_vm_config_flag
-from kimchi.osinfo import lookup
-from kimchi.model.diskutils import get_disk_used_by, set_disk_used_by
-from kimchi.utils import kimchi_log
-from kimchi.xmlutils.disk import get_device_node, get_disk_xml
-from kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks
+from wok.exception import InvalidOperation, InvalidParameter, NotFoundError
+from wok.exception import OperationFailed
+from config import CapabilitiesModel
+from vms import DOM_STATE_MAP, VMModel
+from storagevolumes import StorageVolumeModel
+from utils import get_vm_config_flag
+from ..osinfo import lookup
+from diskutils import get_disk_used_by, set_disk_used_by
+from wok.utils import kimchi_log
+from ..xmlutils.disk import get_device_node, get_disk_xml
+from ..xmlutils.disk import get_vm_disk_info, get_vm_disks
 
 HOTPLUG_TYPE = ['scsi', 'virtio']
 
diff --git a/plugins/kimchi/osinfo.py b/plugins/kimchi/osinfo.py
index 78eb828..d2aab71 100644
--- a/plugins/kimchi/osinfo.py
+++ b/plugins/kimchi/osinfo.py
@@ -26,7 +26,7 @@ from collections import defaultdict
 from configobj import ConfigObj
 from distutils.version import LooseVersion
 
-from kimchi.config import paths
+from wok.config import paths
 
 
 SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'),
diff --git a/plugins/kimchi/repositories.py b/plugins/kimchi/repositories.py
index 20b7311..926bd45 100644
--- a/plugins/kimchi/repositories.py
+++ b/plugins/kimchi/repositories.py
@@ -24,12 +24,12 @@ import urlparse
 
 from ConfigParser import ConfigParser
 
-from kimchi.basemodel import Singleton
-from kimchi.config import kimchiLock
-from kimchi.exception import InvalidOperation, InvalidParameter
-from kimchi.exception import OperationFailed, NotFoundError, MissingParameter
-from kimchi.utils import validate_repo_url
-from kimchi.yumparser import get_yum_repositories, write_repo_to_file
+from wok.basemodel import Singleton
+from config import kimchiLock
+from wok.exception import InvalidOperation, InvalidParameter
+from wok.exception import OperationFailed, NotFoundError, MissingParameter
+from wok.utils import validate_repo_url
+from yumparser import get_yum_repositories, write_repo_to_file
 
 
 class Repositories(object):
diff --git a/plugins/kimchi/scan.py b/plugins/kimchi/scan.py
index 86999b4..8e42fbc 100644
--- a/plugins/kimchi/scan.py
+++ b/plugins/kimchi/scan.py
@@ -26,8 +26,8 @@ import tempfile
 import time
 
 
-from kimchi.isoinfo import IsoImage, probe_iso
-from kimchi.utils import kimchi_log
+from isoinfo import IsoImage, probe_iso
+from wok.utils import kimchi_log
 
 
 SCAN_IGNORE = ['/tmp/kimchi-scan-*']
diff --git a/plugins/kimchi/screenshot.py b/plugins/kimchi/screenshot.py
index e599d40..765e1a6 100644
--- a/plugins/kimchi/screenshot.py
+++ b/plugins/kimchi/screenshot.py
@@ -32,8 +32,8 @@ except ImportError:
     import Image
 
 
-from kimchi import config
-from kimchi.utils import kimchi_log
+import config
+from wok.utils import kimchi_log
 
 
 (fd, pipe) = tempfile.mkstemp()
diff --git a/plugins/kimchi/swupdate.py b/plugins/kimchi/swupdate.py
index 70db2ef..592fb84 100644
--- a/plugins/kimchi/swupdate.py
+++ b/plugins/kimchi/swupdate.py
@@ -20,11 +20,11 @@
 import subprocess
 import time
 
-from kimchi.basemodel import Singleton
-from kimchi.config import kimchiLock
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.utils import kimchi_log, run_command
-from kimchi.yumparser import get_yum_packages_list_update
+from wok.basemodel import Singleton
+from config import kimchiLock
+from wok.exception import NotFoundError, OperationFailed
+from wok.utils import kimchi_log, run_command
+from yumparser import get_yum_packages_list_update
 
 
 class SoftwareUpdate(object):
diff --git a/plugins/kimchi/tests/iso_gen.py b/plugins/kimchi/tests/iso_gen.py
index 096161d..7e92622 100644
--- a/plugins/kimchi/tests/iso_gen.py
+++ b/plugins/kimchi/tests/iso_gen.py
@@ -20,7 +20,7 @@
 import platform
 import struct
 
-from kimchi.isoinfo import IsoImage
+from wok.plugins.kimchi.isoinfo import IsoImage
 
 iso_des = [
     ('openbsd', lambda v: True,
diff --git a/plugins/kimchi/tests/run_tests.sh.in b/plugins/kimchi/tests/run_tests.sh.in
index d1f4b38..beef75e 100644
--- a/plugins/kimchi/tests/run_tests.sh.in
+++ b/plugins/kimchi/tests/run_tests.sh.in
@@ -52,4 +52,4 @@ for ((i=0;i<${#LIST[@]};i++)); do
     fi
 done
 
-PYTHONPATH=../src:../ $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]}
+PYTHONPATH=../plugins:../src:../ $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]}
diff --git a/plugins/kimchi/tests/test_authorization.py b/plugins/kimchi/tests/test_authorization.py
index 959dcf8..6513b67 100644
--- a/plugins/kimchi/tests/test_authorization.py
+++ b/plugins/kimchi/tests/test_authorization.py
@@ -23,7 +23,7 @@ import unittest
 
 from functools import partial
 
-import kimchi.mockmodel
+from wok.plugins.kimchi import mockmodel
 from iso_gen import construct_fake_iso
 from utils import get_free_port, patch_auth, request
 from utils import run_server, wait_task
@@ -41,7 +41,7 @@ def setUpModule():
     global test_server, model, host, port, ssl_port
 
     patch_auth(sudo=False)
-    model = kimchi.mockmodel.MockModel('/tmp/obj-store-test')
+    model = mockmodel.MockModel('/tmp/obj-store-test')
     host = '127.0.0.1'
     port = get_free_port('http')
     ssl_port = get_free_port('https')
@@ -123,7 +123,7 @@ class AuthorizationTests(unittest.TestCase):
         wait_task(model.task_lookup, task_info['id'])
 
         model.vm_update(u'test-me',
-                        {'users': [kimchi.mockmodel.fake_user.keys()[0]],
+                        {'users': [mockmodel.fake_user.keys()[0]],
                          'groups': []})
 
         task_info = model.vms_create({'name': u'test-usera',
diff --git a/plugins/kimchi/tests/test_config.py.in b/plugins/kimchi/tests/test_config.py.in
index 6123f66..337218e 100644
--- a/plugins/kimchi/tests/test_config.py.in
+++ b/plugins/kimchi/tests/test_config.py.in
@@ -19,8 +19,8 @@
 
 import unittest
 
-from kimchi import config
-from kimchi.config import Paths, PluginPaths, KimchiConfig
+from wok import config
+from wok.config import Paths, PluginPaths, KimchiConfig
 
 get_prefix = None
 
diff --git a/plugins/kimchi/tests/test_exception.py b/plugins/kimchi/tests/test_exception.py
index a533015..834a275 100644
--- a/plugins/kimchi/tests/test_exception.py
+++ b/plugins/kimchi/tests/test_exception.py
@@ -22,8 +22,8 @@ import os
 import unittest
 
 
-import kimchi.mockmodel
-import kimchi.server
+from wok.plugins.kimchi import mockmodel
+import wok.server
 from utils import get_free_port, patch_auth, request, run_server
 
 
@@ -38,7 +38,7 @@ def setup_server(environment='development'):
     global test_server, model, host, port, ssl_port
 
     patch_auth()
-    model = kimchi.mockmodel.MockModel('/tmp/obj-store-test')
+    model = mockmodel.MockModel('/tmp/obj-store-test')
     host = '127.0.0.1'
     port = get_free_port('http')
     ssl_port = get_free_port('https')
diff --git a/plugins/kimchi/tests/test_host.py b/plugins/kimchi/tests/test_host.py
index 1273457..7770148 100644
--- a/plugins/kimchi/tests/test_host.py
+++ b/plugins/kimchi/tests/test_host.py
@@ -28,7 +28,7 @@ import unittest
 
 from functools import partial
 
-from kimchi.mockmodel import MockModel
+from wok.plugins.kimchi.mockmodel import MockModel
 from utils import get_free_port, patch_auth, request, run_server, wait_task
 
 test_server = None
diff --git a/plugins/kimchi/tests/test_mock_network.py b/plugins/kimchi/tests/test_mock_network.py
index 4416c04..4e390b1 100644
--- a/plugins/kimchi/tests/test_mock_network.py
+++ b/plugins/kimchi/tests/test_mock_network.py
@@ -24,7 +24,7 @@ import unittest
 
 from functools import partial
 
-from kimchi.mockmodel import MockModel
+from wok.plugins.kimchi.mockmodel import MockModel
 from test_model_network import _do_network_test
 from utils import get_free_port, patch_auth, request, run_server
 
diff --git a/plugins/kimchi/tests/test_mock_storagepool.py b/plugins/kimchi/tests/test_mock_storagepool.py
index 1dc9277..c72708b 100644
--- a/plugins/kimchi/tests/test_mock_storagepool.py
+++ b/plugins/kimchi/tests/test_mock_storagepool.py
@@ -24,7 +24,7 @@ import unittest
 
 from functools import partial
 
-from kimchi.mockmodel import MockModel
+from wok.plugins.kimchi.mockmodel import MockModel
 from utils import get_free_port, patch_auth, request, run_server
 
 
diff --git a/plugins/kimchi/tests/test_mock_storagevolume.py b/plugins/kimchi/tests/test_mock_storagevolume.py
index f59aa13..3dd16b7 100644
--- a/plugins/kimchi/tests/test_mock_storagevolume.py
+++ b/plugins/kimchi/tests/test_mock_storagevolume.py
@@ -24,7 +24,7 @@ import unittest
 
 from functools import partial
 
-from kimchi.mockmodel import MockModel
+from wok.plugins.kimchi.mockmodel import MockModel
 from test_model_storagevolume import _do_volume_test
 from utils import get_free_port, patch_auth, request, run_server
 
diff --git a/plugins/kimchi/tests/test_mockmodel.py b/plugins/kimchi/tests/test_mockmodel.py
index 52972f0..03ad445 100644
--- a/plugins/kimchi/tests/test_mockmodel.py
+++ b/plugins/kimchi/tests/test_mockmodel.py
@@ -24,9 +24,9 @@ import time
 import unittest
 
 
-import kimchi.mockmodel
+from wok.plugins.kimchi import mockmodel
 from utils import get_free_port, patch_auth, request, run_server, wait_task
-from kimchi.osinfo import get_template_default
+from wok.plugins.kimchi.osinfo import get_template_default
 
 
 test_server = None
@@ -40,7 +40,7 @@ fake_iso = None
 def setUpModule():
     global host, port, ssl_port, model, test_server, fake_iso
     cherrypy.request.headers = {'Accept': 'application/json'}
-    model = kimchi.mockmodel.MockModel('/tmp/obj-store-test')
+    model = mockmodel.MockModel('/tmp/obj-store-test')
     patch_auth()
     port = get_free_port('http')
     ssl_port = get_free_port('https')
diff --git a/plugins/kimchi/tests/test_model.py b/plugins/kimchi/tests/test_model.py
index 3828342..7f90274 100644
--- a/plugins/kimchi/tests/test_model.py
+++ b/plugins/kimchi/tests/test_model.py
@@ -29,18 +29,18 @@ import uuid
 
 
 import iso_gen
-import kimchi.objectstore
+import wok.objectstore
 import utils
-from kimchi import netinfo
-from kimchi.basemodel import Singleton
-from kimchi.config import config
-from kimchi.exception import InvalidOperation
-from kimchi.exception import InvalidParameter, NotFoundError, OperationFailed
-from kimchi.osinfo import get_template_default
-from kimchi.model import model
-from kimchi.model.libvirtconnection import LibvirtConnection
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.utils import add_task
+from wok import netinfo
+from wok.basemodel import Singleton
+from wok.config import config
+from wok.exception import InvalidOperation
+from wok.exception import InvalidParameter, NotFoundError, OperationFailed
+from wok.plugins.kimchi.osinfo import get_template_default
+from wok.plugins.kimchi.model import model
+from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection
+from wok.rollbackcontext import RollbackContext
+from wok.utils import add_task
 
 
 invalid_repository_urls = ['www.fedora.org',       # missing protocol
@@ -1217,7 +1217,7 @@ class BaseModelTests(unittest.TestCase):
         def get_list(self):
             return list(self.data)
 
-    class TestModel(kimchi.basemodel.BaseModel):
+    class TestModel(wok.basemodel.BaseModel):
         def __init__(self):
             foo = BaseModelTests.FoosModel()
             super(BaseModelTests.TestModel, self).__init__([foo])
diff --git a/plugins/kimchi/tests/test_model_network.py b/plugins/kimchi/tests/test_model_network.py
index 5dbe54d..d557b3c 100644
--- a/plugins/kimchi/tests/test_model_network.py
+++ b/plugins/kimchi/tests/test_model_network.py
@@ -24,8 +24,8 @@ import unittest
 
 from functools import partial
 
-from kimchi.model.model import Model
-from kimchi.rollbackcontext import RollbackContext
+from wok.plugins.kimchi.model.model import Model
+from wok.rollbackcontext import RollbackContext
 from utils import get_free_port, patch_auth, request, rollback_wrapper
 from utils import run_server
 
diff --git a/plugins/kimchi/tests/test_model_storagepool.py b/plugins/kimchi/tests/test_model_storagepool.py
index 70f3c7b..dda0cdc 100644
--- a/plugins/kimchi/tests/test_model_storagepool.py
+++ b/plugins/kimchi/tests/test_model_storagepool.py
@@ -25,8 +25,8 @@ import unittest
 
 from functools import partial
 
-from kimchi.model.model import Model
-from kimchi.rollbackcontext import RollbackContext
+from wok.plugins.kimchi.model.model import Model
+from wok.rollbackcontext import RollbackContext
 from utils import get_free_port, patch_auth, request
 from utils import run_server
 
diff --git a/plugins/kimchi/tests/test_model_storagevolume.py b/plugins/kimchi/tests/test_model_storagevolume.py
index 5e76d3d..d47b4e3 100644
--- a/plugins/kimchi/tests/test_model_storagevolume.py
+++ b/plugins/kimchi/tests/test_model_storagevolume.py
@@ -25,10 +25,11 @@ import unittest
 
 from functools import partial
 
-from kimchi.config import paths, READONLY_POOL_TYPE
-from kimchi.model.model import Model
-from kimchi.mockmodel import MockModel
-from kimchi.rollbackcontext import RollbackContext
+from wok.config import paths
+from wok.plugins.kimchi.config import READONLY_POOL_TYPE
+from wok.plugins.kimchi.model.model import Model
+from wok.plugins.kimchi.mockmodel import MockModel
+from wok.rollbackcontext import RollbackContext
 from utils import fake_auth_header, get_free_port, patch_auth, request
 from utils import rollback_wrapper, run_server, wait_task
 
diff --git a/plugins/kimchi/tests/test_networkxml.py b/plugins/kimchi/tests/test_networkxml.py
index 3706a71..139f051 100644
--- a/plugins/kimchi/tests/test_networkxml.py
+++ b/plugins/kimchi/tests/test_networkxml.py
@@ -23,8 +23,8 @@ import lxml.etree as ET
 
 import utils
 
-from kimchi.xmlutils import network as nxml
-from kimchi.xmlutils.utils import xpath_get_text
+from wok.plugins.kimchi.xmlutils import network as nxml
+from wok.xmlutils.utils import xpath_get_text
 
 
 class NetworkXmlTests(unittest.TestCase):
diff --git a/plugins/kimchi/tests/test_objectstore.py b/plugins/kimchi/tests/test_objectstore.py
index f62217e..412a7f2 100644
--- a/plugins/kimchi/tests/test_objectstore.py
+++ b/plugins/kimchi/tests/test_objectstore.py
@@ -23,8 +23,8 @@ import tempfile
 import threading
 import unittest
 
-from kimchi.exception import NotFoundError
-from kimchi import objectstore
+from wok.exception import NotFoundError
+from wok import objectstore
 
 tmpfile = None
 
diff --git a/plugins/kimchi/tests/test_osinfo.py b/plugins/kimchi/tests/test_osinfo.py
index e617c54..1712ded 100644
--- a/plugins/kimchi/tests/test_osinfo.py
+++ b/plugins/kimchi/tests/test_osinfo.py
@@ -20,8 +20,8 @@
 import unittest
 
 
-from kimchi.osinfo import _get_arch, get_template_default, lookup
-from kimchi.osinfo import modern_version_bases
+from wok.plugins.kimchi.osinfo import _get_arch, get_template_default, lookup
+from wok.plugins.kimchi.osinfo import modern_version_bases
 
 
 class OSInfoTests(unittest.TestCase):
diff --git a/plugins/kimchi/tests/test_plugin.py b/plugins/kimchi/tests/test_plugin.py
index 9eb6e0a..2f2475a 100644
--- a/plugins/kimchi/tests/test_plugin.py
+++ b/plugins/kimchi/tests/test_plugin.py
@@ -25,9 +25,9 @@ import unittest
 from functools import partial
 
 
-import kimchi.mockmodel
-import kimchi.server
-from kimchi.utils import get_enabled_plugins
+from wok.plugins.kimchi import mockmodel
+import wok.server
+from wok.utils import get_enabled_plugins
 import utils
 
 
@@ -42,7 +42,7 @@ def setUpModule():
     global test_server, model, host, port, ssl_port
 
     utils.patch_auth()
-    model = kimchi.mockmodel.MockModel('/tmp/obj-store-test')
+    model = mockmodel.MockModel('/tmp/obj-store-test')
     host = '127.0.0.1'
     port = utils.get_free_port('http')
     ssl_port = utils.get_free_port('https')
diff --git a/plugins/kimchi/tests/test_rest.py b/plugins/kimchi/tests/test_rest.py
index c2d142f..f390abb 100644
--- a/plugins/kimchi/tests/test_rest.py
+++ b/plugins/kimchi/tests/test_rest.py
@@ -29,11 +29,11 @@ import urlparse
 from functools import partial
 
 import iso_gen
-import kimchi.mockmodel
-import kimchi.server
-from kimchi.osinfo import get_template_default
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.utils import add_task
+from wok.plugins.kimchi import mockmodel
+import wok.server
+from wok.plugins.kimchi.osinfo import get_template_default
+from wok.rollbackcontext import RollbackContext
+from wok.utils import add_task
 from utils import get_free_port, patch_auth, request
 from utils import run_server, wait_task
 
@@ -51,7 +51,7 @@ def setUpModule():
     global test_server, model, host, port, ssl_port, cherrypy_port
 
     patch_auth()
-    model = kimchi.mockmodel.MockModel('/tmp/obj-store-test')
+    model = mockmodel.MockModel('/tmp/obj-store-test')
     host = '127.0.0.1'
     port = get_free_port('http')
     ssl_port = get_free_port('https')
diff --git a/plugins/kimchi/tests/test_rollbackcontext.py b/plugins/kimchi/tests/test_rollbackcontext.py
index 1492d33..6eac6d0 100644
--- a/plugins/kimchi/tests/test_rollbackcontext.py
+++ b/plugins/kimchi/tests/test_rollbackcontext.py
@@ -19,7 +19,7 @@
 
 import unittest
 
-from kimchi.rollbackcontext import RollbackContext
+from wok.rollbackcontext import RollbackContext
 
 
 class FirstError(Exception):
diff --git a/plugins/kimchi/tests/test_server.py b/plugins/kimchi/tests/test_server.py
index a4d31d0..228a9b5 100644
--- a/plugins/kimchi/tests/test_server.py
+++ b/plugins/kimchi/tests/test_server.py
@@ -28,8 +28,8 @@ import unittest
 from functools import partial
 
 import utils
-from kimchi import mockmodel
-from kimchi.control.base import Collection, Resource
+from wok.plugins.kimchi import mockmodel
+from wok.control.base import Collection, Resource
 
 test_server = None
 model = None
diff --git a/plugins/kimchi/tests/test_storagepoolxml.py b/plugins/kimchi/tests/test_storagepoolxml.py
index c508c58..7e45cca 100644
--- a/plugins/kimchi/tests/test_storagepoolxml.py
+++ b/plugins/kimchi/tests/test_storagepoolxml.py
@@ -20,7 +20,7 @@
 import lxml.etree as ET
 import unittest
 
-from kimchi.model.libvirtstoragepool import StoragePoolDef
+from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef
 
 
 class StoragepoolXMLTests(unittest.TestCase):
diff --git a/plugins/kimchi/tests/test_template.py b/plugins/kimchi/tests/test_template.py
index acdb7c6..b263b63 100644
--- a/plugins/kimchi/tests/test_template.py
+++ b/plugins/kimchi/tests/test_template.py
@@ -24,8 +24,8 @@ import unittest
 
 from functools import partial
 
-from kimchi.config import READONLY_POOL_TYPE
-from kimchi.mockmodel import MockModel
+from wok.plugins.kimchi.config import READONLY_POOL_TYPE
+from wok.plugins.kimchi.mockmodel import MockModel
 from utils import get_free_port, patch_auth, request, run_server
 
 
diff --git a/plugins/kimchi/tests/test_utils.py b/plugins/kimchi/tests/test_utils.py
index b8ff621..bcb14e2 100644
--- a/plugins/kimchi/tests/test_utils.py
+++ b/plugins/kimchi/tests/test_utils.py
@@ -19,8 +19,8 @@
 
 import unittest
 
-from kimchi.exception import InvalidParameter
-from kimchi.utils import convert_data_size
+from wok.exception import InvalidParameter
+from wok.utils import convert_data_size
 
 
 class UtilsTests(unittest.TestCase):
diff --git a/plugins/kimchi/tests/test_vmtemplate.py b/plugins/kimchi/tests/test_vmtemplate.py
index 0ca9adb..6213900 100644
--- a/plugins/kimchi/tests/test_vmtemplate.py
+++ b/plugins/kimchi/tests/test_vmtemplate.py
@@ -22,9 +22,9 @@ import unittest
 import uuid
 
 
-from kimchi.osinfo import get_template_default
-from kimchi.vmtemplate import VMTemplate
-from kimchi.xmlutils.utils import xpath_get_text
+from wok.plugins.kimchi.osinfo import get_template_default
+from wok.plugins.kimchi.vmtemplate import VMTemplate
+from wok.xmlutils.utils import xpath_get_text
 
 
 class VMTemplateTests(unittest.TestCase):
diff --git a/plugins/kimchi/tests/test_yumparser.py b/plugins/kimchi/tests/test_yumparser.py
index 53a2d80..99a757d 100644
--- a/plugins/kimchi/tests/test_yumparser.py
+++ b/plugins/kimchi/tests/test_yumparser.py
@@ -21,12 +21,12 @@ import os
 import tempfile
 import unittest
 
-from kimchi.model import model
-from kimchi.rollbackcontext import RollbackContext
-from kimchi.yumparser import delete_repo_from_file, get_repo_files
-from kimchi.yumparser import get_yum_packages_list_update
-from kimchi.yumparser import get_yum_repositories, write_repo_to_file
-from kimchi.yumparser import YumRepoObject
+from wok.plugins.kimchi.model import model
+from wok.rollbackcontext import RollbackContext
+from wok.plugins.kimchi.yumparser import delete_repo_from_file, get_repo_files
+from wok.plugins.kimchi.yumparser import get_yum_packages_list_update
+from wok.plugins.kimchi.yumparser import get_yum_repositories, write_repo_to_file
+from wok.plugins.kimchi.yumparser import YumRepoObject
 
 
 TEMP_REPO_FILE = ''
diff --git a/plugins/kimchi/tests/utils.py b/plugins/kimchi/tests/utils.py
index 2ffe776..6144dc7 100644
--- a/plugins/kimchi/tests/utils.py
+++ b/plugins/kimchi/tests/utils.py
@@ -36,12 +36,12 @@ from contextlib import closing
 from lxml import etree
 
 
-import kimchi.mockmodel
-import kimchi.server
-from kimchi.config import config, paths
-from kimchi.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs
-from kimchi.exception import NotFoundError, OperationFailed
-from kimchi.utils import kimchi_log
+from wok.plugins.kimchi import mockmodel
+import wok.server
+from wok.config import config, paths
+from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs
+from wok.exception import NotFoundError, OperationFailed
+from wok.utils import kimchi_log
 
 _ports = {}
 
@@ -118,7 +118,7 @@ def run_server(host, port, ssl_port, test_mode, cherrypy_port=None,
     if model is not None:
         setattr(args, 'model', model)
 
-    s = kimchi.server.Server(args)
+    s = wok.server.Server(args)
     t = threading.Thread(target=s.start)
     t.setDaemon(True)
     t.start()
@@ -142,7 +142,7 @@ def _request(conn, path, data, method, headers):
         headers = {'Content-Type': 'application/json',
                    'Accept': 'application/json'}
     if 'AUTHORIZATION' not in headers.keys():
-        user, pw = kimchi.mockmodel.fake_user.items()[0]
+        user, pw = mockmodel.fake_user.items()[0]
         hdr = "Basic " + base64.b64encode("%s:%s" % (user, pw))
         headers['AUTHORIZATION'] = hdr
     conn.request(method, path, data, headers)
@@ -203,7 +203,7 @@ class FakeUser(User):
     @staticmethod
     def authenticate(username, password, service="passwd"):
         try:
-            return kimchi.mockmodel.fake_user[username] == password
+            return mockmodel.fake_user[username] == password
         except KeyError, e:
             raise OperationFailed("KCHAUTH0001E", {'username': 'username',
                                                    'code': e.message})
@@ -254,7 +254,7 @@ def rollback_wrapper(func, resource, *args):
 # requests lib take care of encode part, so use this lib instead
 def fake_auth_header():
     headers = {'Accept': 'application/json'}
-    user, pw = kimchi.mockmodel.fake_user.items()[0]
+    user, pw = mockmodel.fake_user.items()[0]
     hdr = "Basic " + base64.b64encode("%s:%s" % (user, pw))
     headers['AUTHORIZATION'] = hdr
     return headers
diff --git a/plugins/kimchi/ui/pages/guest-add.html.tmpl b/plugins/kimchi/ui/pages/guest-add.html.tmpl
index f479d3d..2668391 100644
--- a/plugins/kimchi/ui/pages/guest-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/guest-add.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl b/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
index 504316c..a26e0f9 100644
--- a/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/guest.html.tmpl b/plugins/kimchi/ui/pages/guest.html.tmpl
index a192413..a876f38 100644
--- a/plugins/kimchi/ui/pages/guest.html.tmpl
+++ b/plugins/kimchi/ui/pages/guest.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/i18n.json.tmpl b/plugins/kimchi/ui/pages/i18n.json.tmpl
index f705613..cd320e0 100644
--- a/plugins/kimchi/ui/pages/i18n.json.tmpl
+++ b/plugins/kimchi/ui/pages/i18n.json.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/report-add.html.tmpl b/plugins/kimchi/ui/pages/report-add.html.tmpl
index da6d912..25bf0a9 100644
--- a/plugins/kimchi/ui/pages/report-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/report-add.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/report-rename.html.tmpl b/plugins/kimchi/ui/pages/report-rename.html.tmpl
index f4f5f4e..90a0a80 100644
--- a/plugins/kimchi/ui/pages/report-rename.html.tmpl
+++ b/plugins/kimchi/ui/pages/report-rename.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/repository-add.html.tmpl b/plugins/kimchi/ui/pages/repository-add.html.tmpl
index beae45c..950252a 100644
--- a/plugins/kimchi/ui/pages/repository-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/repository-add.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/repository-edit.html.tmpl b/plugins/kimchi/ui/pages/repository-edit.html.tmpl
index 0d525a4..e5a3cfb 100644
--- a/plugins/kimchi/ui/pages/repository-edit.html.tmpl
+++ b/plugins/kimchi/ui/pages/repository-edit.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl b/plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl
index 0a0d07e..ab10939 100644
--- a/plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl
+++ b/plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/tabs/guests.html.tmpl b/plugins/kimchi/ui/pages/tabs/guests.html.tmpl
index 7bbf570..b96dd21 100644
--- a/plugins/kimchi/ui/pages/tabs/guests.html.tmpl
+++ b/plugins/kimchi/ui/pages/tabs/guests.html.tmpl
@@ -19,7 +19,7 @@
 #unicode UTF-8
 #import gettext
 #from Cheetah.Template import Template
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/tabs/host.html.tmpl b/plugins/kimchi/ui/pages/tabs/host.html.tmpl
index c4bf7f0..192a7eb 100644
--- a/plugins/kimchi/ui/pages/tabs/host.html.tmpl
+++ b/plugins/kimchi/ui/pages/tabs/host.html.tmpl
@@ -18,7 +18,7 @@
 
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/tabs/network.html.tmpl b/plugins/kimchi/ui/pages/tabs/network.html.tmpl
index e2b1639..8d72f77 100644
--- a/plugins/kimchi/ui/pages/tabs/network.html.tmpl
+++ b/plugins/kimchi/ui/pages/tabs/network.html.tmpl
@@ -18,7 +18,7 @@
 
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/tabs/templates.html.tmpl b/plugins/kimchi/ui/pages/tabs/templates.html.tmpl
index 4f91254..cd9b8e5 100644
--- a/plugins/kimchi/ui/pages/tabs/templates.html.tmpl
+++ b/plugins/kimchi/ui/pages/tabs/templates.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/template-add.html.tmpl b/plugins/kimchi/ui/pages/template-add.html.tmpl
index 7f8ca65..d0292a0 100644
--- a/plugins/kimchi/ui/pages/template-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/template-add.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/ui/pages/template-edit.html.tmpl b/plugins/kimchi/ui/pages/template-edit.html.tmpl
index ec14d44..0588294 100644
--- a/plugins/kimchi/ui/pages/template-edit.html.tmpl
+++ b/plugins/kimchi/ui/pages/template-edit.html.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/plugins/kimchi/vmtemplate.py b/plugins/kimchi/vmtemplate.py
index 79e04ed..f45f80d 100644
--- a/plugins/kimchi/vmtemplate.py
+++ b/plugins/kimchi/vmtemplate.py
@@ -26,17 +26,18 @@ import uuid
 from lxml import etree
 from lxml.builder import E
 
-from kimchi import imageinfo
-from kimchi import osinfo
-from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter
-from kimchi.exception import ImageFormatError, OperationFailed
-from kimchi.isoinfo import IsoImage
-from kimchi.utils import check_url_path, pool_name_from_uri
-from kimchi.xmlutils.cpu import get_cpu_xml
-from kimchi.xmlutils.disk import get_disk_xml
-from kimchi.xmlutils.graphics import get_graphics_xml
-from kimchi.xmlutils.interface import get_iface_xml
-from kimchi.xmlutils.qemucmdline import get_qemucmdline_xml
+import imageinfo
+import osinfo
+from wok.exception import InvalidParameter, IsoFormatError, MissingParameter
+from wok.exception import ImageFormatError, OperationFailed
+from isoinfo import IsoImage
+from wok.utils import check_url_path
+from utils import pool_name_from_uri
+from xmlutils.cpu import get_cpu_xml
+from xmlutils.disk import get_disk_xml
+from xmlutils.graphics import get_graphics_xml
+from xmlutils.interface import get_iface_xml
+from xmlutils.qemucmdline import get_qemucmdline_xml
 
 
 class VMTemplate(object):
diff --git a/plugins/kimchi/xmlutils/disk.py b/plugins/kimchi/xmlutils/disk.py
index 64e243a..a451c43 100644
--- a/plugins/kimchi/xmlutils/disk.py
+++ b/plugins/kimchi/xmlutils/disk.py
@@ -27,8 +27,8 @@ import urlparse
 from lxml import objectify
 from lxml.builder import E
 
-from kimchi.exception import InvalidParameter, NotFoundError
-from kimchi.utils import check_url_path
+from wok.exception import InvalidParameter, NotFoundError
+from wok.utils import check_url_path
 
 BUS_TO_DEV_MAP = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'}
 DEV_TYPE_SRC_ATTR_MAP = {'file': 'file', 'block': 'dev'}
diff --git a/plugins/kimchi/xmlutils/interface.py b/plugins/kimchi/xmlutils/interface.py
index 82ac505..70b63bd 100644
--- a/plugins/kimchi/xmlutils/interface.py
+++ b/plugins/kimchi/xmlutils/interface.py
@@ -22,7 +22,7 @@ import lxml.etree as ET
 from distutils.version import LooseVersion
 from lxml.builder import E
 
-from kimchi import osinfo
+from .. import osinfo
 
 
 def get_iface_xml(params, arch=None, os_distro=None, os_version=None):
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 10c244c..d741ddb 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -24,9 +24,9 @@ import os
 from cherrypy import expose
 
 
-from kimchi.config import PluginPaths
-from kimchi.control.base import Collection, Resource
-from kimchi.root import Root
+from wok.config import PluginPaths
+from wok.control.base import Collection, Resource
+from wok.root import Root
 from plugins.sample.i18n import messages
 from plugins.sample.model import Model
 
diff --git a/plugins/sample/model.py b/plugins/sample/model.py
index ce43761..8edcc85 100644
--- a/plugins/sample/model.py
+++ b/plugins/sample/model.py
@@ -17,8 +17,8 @@
 # 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 kimchi.exception import InvalidOperation, NotFoundError
-from kimchi.basemodel import BaseModel
+from wok.exception import InvalidOperation, NotFoundError
+from wok.basemodel import BaseModel
 
 
 class CirclesModel(object):
diff --git a/plugins/sample/sample.conf.in b/plugins/sample/sample.conf.in
index ac7e27f..28ae891 100644
--- a/plugins/sample/sample.conf.in
+++ b/plugins/sample/sample.conf.in
@@ -24,4 +24,4 @@ tools.kimchiauth.on = True
 [/help]
 tools.staticdir.on = True
 tools.nocache.on = True
-tools.staticdir.dir = kimchi.config.PluginPaths('sample').ui_dir + '/pages/help'
+tools.staticdir.dir = wok.config.PluginPaths('sample').ui_dir + '/pages/help'
diff --git a/plugins/sample/ui/pages/i18n.json.tmpl b/plugins/sample/ui/pages/i18n.json.tmpl
index ed9b66f..737bb39 100644
--- a/plugins/sample/ui/pages/i18n.json.tmpl
+++ b/plugins/sample/ui/pages/i18n.json.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py
index b5673b2..1e0ec4b 100644
--- a/src/wok/asynctask.py
+++ b/src/wok/asynctask.py
@@ -22,7 +22,7 @@ import threading
 import traceback
 
 
-from kimchi.exception import OperationFailed
+from wok.exception import OperationFailed
 
 
 class AsyncTask(object):
diff --git a/src/wok/auth.py b/src/wok/auth.py
index 1a52185..6bd1566 100644
--- a/src/wok/auth.py
+++ b/src/wok/auth.py
@@ -30,10 +30,10 @@ import termios
 import time
 import urllib2
 
-from kimchi import template
-from kimchi.config import config
-from kimchi.exception import InvalidOperation, OperationFailed
-from kimchi.utils import get_all_tabs, run_command
+from wok import template
+from wok.config import config
+from wok.exception import InvalidOperation, OperationFailed
+from wok.utils import get_all_tabs, run_command
 
 USER_NAME = 'username'
 USER_GROUPS = 'groups'
diff --git a/src/wok/cachebust.py b/src/wok/cachebust.py
index e2e2c9f..d7cf111 100644
--- a/src/wok/cachebust.py
+++ b/src/wok/cachebust.py
@@ -20,7 +20,7 @@
 import os
 
 
-from kimchi.config import paths
+from wok.config import paths
 
 
 def href(url):
diff --git a/src/wok/control/__init__.py b/src/wok/control/__init__.py
index 98d42d3..4ad9459 100644
--- a/src/wok/control/__init__.py
+++ b/src/wok/control/__init__.py
@@ -20,7 +20,7 @@
 import os
 
 
-from kimchi.control.utils import load_url_sub_node
+from wok.control.utils import load_url_sub_node
 
 
 sub_nodes = load_url_sub_node(os.path.dirname(__file__), __name__)
diff --git a/src/wok/control/base.py b/src/wok/control/base.py
index 006a6f7..d926a63 100644
--- a/src/wok/control/base.py
+++ b/src/wok/control/base.py
@@ -22,14 +22,14 @@ import re
 import urllib2
 
 
-import kimchi.template
-from kimchi.auth import USER_GROUPS, USER_NAME, USER_ROLES
-from kimchi.control.utils import get_class_name, internal_redirect, model_fn
-from kimchi.control.utils import parse_request, validate_method
-from kimchi.control.utils import validate_params
-from kimchi.exception import InvalidOperation, InvalidParameter
-from kimchi.exception import KimchiException, MissingParameter, NotFoundError
-from kimchi.exception import OperationFailed, UnauthorizedError
+import wok.template
+from wok.auth import USER_GROUPS, USER_NAME, USER_ROLES
+from wok.control.utils import get_class_name, internal_redirect, model_fn
+from wok.control.utils import parse_request, validate_method
+from wok.control.utils import validate_params
+from wok.exception import InvalidOperation, InvalidParameter
+from wok.exception import KimchiException, MissingParameter, NotFoundError
+from wok.exception import OperationFailed, UnauthorizedError
 
 
 class Resource(object):
@@ -90,7 +90,7 @@ class Resource(object):
     def generate_action_handler_task(self, action_name, action_args=None):
         def _render_task(self, task):
             cherrypy.response.status = 202
-            return kimchi.template.render('Task', task)
+            return wok.template.render('Task', task)
 
         return self._generate_action_handler_base(action_name, _render_task,
                                                   action_args=action_args)
@@ -213,7 +213,7 @@ class Resource(object):
 
     def get(self):
         self.lookup()
-        return kimchi.template.render(get_class_name(self), self.data)
+        return wok.template.render(get_class_name(self), self.data)
 
     @property
     def data(self):
@@ -314,7 +314,7 @@ class Collection(object):
         flag_filter, fields_filter = _split_filter(filter_params)
         resources = self._get_resources(flag_filter)
         data = self.filter_data(resources, fields_filter)
-        return kimchi.template.render(get_class_name(self), data)
+        return wok.template.render(get_class_name(self), data)
 
     @cherrypy.expose
     def index(self, *args, **kwargs):
@@ -361,7 +361,7 @@ class AsyncCollection(Collection):
         args = self.model_args + [params]
         task = create(*args)
         cherrypy.response.status = 202
-        return kimchi.template.render("Task", task)
+        return wok.template.render("Task", task)
 
 
 class SimpleCollection(Collection):
@@ -378,4 +378,4 @@ class SimpleCollection(Collection):
             res_list = get_list(*self.model_args)
         except AttributeError:
             pass
-        return kimchi.template.render(get_class_name(self), res_list)
+        return wok.template.render(get_class_name(self), res_list)
diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py
index 39fd851..1cc1d5a 100644
--- a/src/wok/control/plugins.py
+++ b/src/wok/control/plugins.py
@@ -17,8 +17,8 @@
 # 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 kimchi.control.base import SimpleCollection
-from kimchi.control.utils import UrlSubNode
+from wok.control.base import SimpleCollection
+from wok.control.utils import UrlSubNode
 
 
 @UrlSubNode("plugins")
diff --git a/src/wok/control/utils.py b/src/wok/control/utils.py
index d26fe48..d617dcd 100644
--- a/src/wok/control/utils.py
+++ b/src/wok/control/utils.py
@@ -25,9 +25,9 @@ import json
 from jsonschema import Draft3Validator, ValidationError, FormatChecker
 
 
-from kimchi.auth import USER_ROLES
-from kimchi.exception import InvalidParameter, OperationFailed
-from kimchi.utils import import_module, listPathModules
+from wok.auth import USER_ROLES
+from wok.exception import InvalidParameter, OperationFailed
+from wok.utils import import_module, listPathModules
 
 
 def get_class_name(cls):
diff --git a/src/wok/exception.py b/src/wok/exception.py
index 039152a..f41028b 100644
--- a/src/wok/exception.py
+++ b/src/wok/exception.py
@@ -21,8 +21,8 @@ import cherrypy
 import gettext
 
 
-from kimchi.i18n import messages as _messages
-from kimchi.template import get_lang, validate_language
+from wok.i18n import messages as _messages
+from wok.template import get_lang, validate_language
 
 
 class KimchiException(Exception):
diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py
index 1b4d21b..e350f1e 100644
--- a/src/wok/model/plugins.py
+++ b/src/wok/model/plugins.py
@@ -17,7 +17,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-from kimchi.utils import get_enabled_plugins
+from wok.utils import get_enabled_plugins
 
 
 class PluginsModel(object):
diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py
index 3e91a26..7c2a5cc 100644
--- a/src/wok/objectstore.py
+++ b/src/wok/objectstore.py
@@ -28,9 +28,9 @@ except ImportError:
     from ordereddict import OrderedDict
 
 
-from kimchi import config
-from kimchi.exception import NotFoundError
-from kimchi.utils import kimchi_log
+from wok import config
+from wok.exception import NotFoundError
+from wok.utils import kimchi_log
 
 
 class ObjectStoreSession(object):
diff --git a/src/wok/proxy.py b/src/wok/proxy.py
index 5dcca65..1c46c11 100644
--- a/src/wok/proxy.py
+++ b/src/wok/proxy.py
@@ -27,8 +27,8 @@ import pwd
 import subprocess
 from string import Template
 
-from kimchi import sslcert
-from kimchi.config import paths
+from wok import sslcert
+from wok.config import paths
 
 
 def _create_proxy_config(options):
diff --git a/src/wok/root.py b/src/wok/root.py
index cd338d9..a3b8be1 100644
--- a/src/wok/root.py
+++ b/src/wok/root.py
@@ -23,14 +23,14 @@ import os
 
 
 from distutils.version import LooseVersion
-from kimchi import auth
-from kimchi import template
-from kimchi.i18n import messages
-from kimchi.config import paths
-from kimchi.control import sub_nodes
-from kimchi.control.base import Resource
-from kimchi.control.utils import parse_request
-from kimchi.exception import MissingParameter, OperationFailed
+from wok import auth
+from wok import template
+from wok.i18n import messages
+from wok.config import paths
+from wok.control import sub_nodes
+from wok.control.base import Resource
+from wok.control.utils import parse_request
+from wok.exception import MissingParameter, OperationFailed
 
 
 class Root(Resource):
diff --git a/src/wok/server.py b/src/wok/server.py
index eb58465..5394d24 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -23,16 +23,16 @@ import logging
 import logging.handlers
 import os
 
-from kimchi import auth
-from kimchi import config
-from kimchi.model import model
-from kimchi import mockmodel
-from kimchi import vnc
-from kimchi.config import KimchiConfig, PluginConfig
-from kimchi.control import sub_nodes
-from kimchi.proxy import start_proxy, terminate_proxy
-from kimchi.root import KimchiRoot
-from kimchi.utils import get_enabled_plugins, import_class
+from wok import auth
+from wok import config
+from wok.model import model
+from wok import mockmodel
+from wok import vnc
+from wok.config import KimchiConfig, PluginConfig
+from wok.control import sub_nodes
+from wok.proxy import start_proxy, terminate_proxy
+from wok.root import KimchiRoot
+from wok.utils import get_enabled_plugins, import_class
 
 
 LOGGING_LEVEL = {"debug": logging.DEBUG,
diff --git a/src/wok/template.py b/src/wok/template.py
index aaba0c9..46c0f3c 100644
--- a/src/wok/template.py
+++ b/src/wok/template.py
@@ -22,7 +22,7 @@ import errno
 import json
 
 
-from kimchi.config import paths
+from wok.config import paths
 from Cheetah.Template import Template
 from glob import iglob
 
diff --git a/src/wok/utils.py b/src/wok/utils.py
index ff3a5da..d8ad25f 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -35,9 +35,9 @@ from threading import Timer
 from urlparse import urlparse
 from cherrypy.lib.reprconf import Parser
 
-from kimchi.asynctask import AsyncTask
-from kimchi.config import paths, PluginPaths
-from kimchi.exception import InvalidParameter, TimeoutExpired
+from wok.asynctask import AsyncTask
+from wok.config import paths, PluginPaths
+from wok.exception import InvalidParameter, TimeoutExpired
 
 
 kimchi_log = cherrypy.log.error_log
diff --git a/src/wok/vnc.py b/src/wok/vnc.py
index b4194b1..e50e9f2 100644
--- a/src/wok/vnc.py
+++ b/src/wok/vnc.py
@@ -25,7 +25,7 @@ import os
 from multiprocessing import Process
 from websockify import WebSocketProxy
 
-from kimchi.config import config, paths
+from wok.config import config, paths
 
 
 WS_TOKENS_DIR = '/var/lib/kimchi/vnc-tokens'
diff --git a/src/wokd.in b/src/wokd.in
index 4ea7a42..62a8504 100644
--- a/src/wokd.in
+++ b/src/wokd.in
@@ -25,8 +25,8 @@ sys.path.insert(1, '@pythondir@')
 
 from optparse import OptionParser
 
-import kimchi.server
-import kimchi.config as config
+import wok.server
+import wok.config as config
 
 
 if not config.paths.installed:
@@ -93,7 +93,7 @@ def main(options):
     setattr(options, 'max_body_size',
             config.config.get('server', 'max_body_size'))
 
-    kimchi.server.main(options)
+    wok.server.main(options)
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv[1:]))
diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl
index d8e16e6..068f2a6 100644
--- a/ui/pages/error.html.tmpl
+++ b/ui/pages/error.html.tmpl
@@ -18,7 +18,7 @@
 
 #encoding UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
index f705613..cd320e0 100644
--- a/ui/pages/i18n.json.tmpl
+++ b/ui/pages/i18n.json.tmpl
@@ -17,7 +17,7 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl
index 760d4d4..f878d45 100644
--- a/ui/pages/login.html.tmpl
+++ b/ui/pages/login.html.tmpl
@@ -17,12 +17,12 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
 #silent next = "?next=%s" % $getVar('data.next', '') if $getVar('data.next', '') else ""
-#from kimchi.config import get_version
+#from wok.config import get_version
 <!DOCTYPE html>
 <html lang="$lang.lang[0]">
 <head>
diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
index 3450e7f..88911d0 100644
--- a/ui/pages/wok-ui.html.tmpl
+++ b/ui/pages/wok-ui.html.tmpl
@@ -17,11 +17,11 @@
  *#
 #unicode UTF-8
 #import gettext
-#from kimchi.cachebust import href
+#from wok.cachebust import href
 #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True)
 #silent _ = t.gettext
 #silent _t = t.gettext
-#from kimchi.config import get_version
+#from wok.config import get_version
 <!DOCTYPE html>
 <html lang="$lang.lang[0]">
 <head>
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:45 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:45 -0300
Subject: [Kimchi-devel] [PATCH V3 13/34] Update server references to wok
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-14-git-send-email-luciojhc@linux.vnet.ibm.com>

- Renames kimchi references to wok.
- Rename kimchi_log to wok_log
- It now uses wok.min.js for server JS API.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/disks.py                            |    8 +-
 plugins/kimchi/distroloader.py                     |    6 +-
 plugins/kimchi/imageinfo.py                        |    4 +-
 plugins/kimchi/isoinfo.py                          |    4 +-
 plugins/kimchi/mockmodel.py                        |    6 +-
 plugins/kimchi/model/config.py                     |    8 +-
 plugins/kimchi/model/cpuinfo.py                    |    6 +-
 plugins/kimchi/model/debugreports.py               |   18 +-
 plugins/kimchi/model/diskutils.py                  |    6 +-
 plugins/kimchi/model/featuretests.py               |    8 +-
 plugins/kimchi/model/host.py                       |    8 +-
 plugins/kimchi/model/hostdev.py                    |    8 +-
 plugins/kimchi/model/libvirtconnection.py          |    8 +-
 plugins/kimchi/model/libvirtstoragepool.py         |    4 +-
 plugins/kimchi/model/networks.py                   |   16 +-
 plugins/kimchi/model/peers.py                      |   14 +-
 plugins/kimchi/model/storagepools.py               |   32 ++--
 plugins/kimchi/model/storagetargets.py             |    6 +-
 plugins/kimchi/model/storagevolumes.py             |    6 +-
 plugins/kimchi/model/vmhostdevs.py                 |    6 +-
 plugins/kimchi/model/vms.py                        |   22 +-
 plugins/kimchi/model/vmstorages.py                 |    8 +-
 plugins/kimchi/scan.py                             |    4 +-
 plugins/kimchi/screenshot.py                       |    6 +-
 plugins/kimchi/swupdate.py                         |    8 +-
 plugins/kimchi/tests/utils.py                      |    6 +-
 plugins/kimchi/ui/js/src/kimchi.api.js             |  234 ++++++++++----------
 plugins/kimchi/ui/js/src/kimchi.guest_add_main.js  |   14 +-
 plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js |   56 +++---
 plugins/kimchi/ui/js/src/kimchi.guest_main.js      |   36 ++--
 .../kimchi/ui/js/src/kimchi.guest_media_main.js    |    8 +-
 .../ui/js/src/kimchi.guest_storage_add.main.js     |   14 +-
 plugins/kimchi/ui/js/src/kimchi.host.js            |   90 ++++----
 plugins/kimchi/ui/js/src/kimchi.network.js         |   36 ++--
 plugins/kimchi/ui/js/src/kimchi.report_add_main.js |   10 +-
 .../kimchi/ui/js/src/kimchi.report_rename_main.js  |   10 +-
 .../kimchi/ui/js/src/kimchi.repository_add_main.js |    6 +-
 .../ui/js/src/kimchi.repository_edit_main.js       |   10 +-
 plugins/kimchi/ui/js/src/kimchi.storage_main.js    |   66 +++---
 .../ui/js/src/kimchi.storagepool_add_main.js       |   26 +-
 .../js/src/kimchi.storagepool_add_volume_main.js   |   18 +-
 .../kimchi/ui/js/src/kimchi.template_add_main.js   |   38 ++--
 .../kimchi/ui/js/src/kimchi.template_edit_main.js  |   16 +-
 plugins/kimchi/ui/js/src/kimchi.template_main.js   |   16 +-
 .../kimchi/ui/spice-html5/pages/spice_auto.html    |    2 +-
 plugins/sample/API.json                            |    2 +-
 plugins/sample/__init__.py                         |    2 +-
 plugins/sample/sample.conf.in                      |   10 +-
 plugins/sample/ui/js/util.js                       |    4 +-
 .../sample/ui/pages/help/en_US/sample-tab1.html    |    2 +-
 .../sample/ui/pages/help/en_US/sample-tab2.html    |    2 +-
 src/nginx/wok.conf.in                              |    8 +-
 src/wok.conf.in                                    |   14 +-
 src/wok/auth.py                                    |   10 +-
 src/wok/config.py.in                               |   40 ++--
 src/wok/control/base.py                            |    8 +-
 src/wok/exception.py                               |   22 +-
 src/wok/objectstore.py                             |    4 +-
 src/wok/proxy.py                                   |   18 +-
 src/wok/server.py                                  |   14 +-
 src/wok/template.py                                |    4 +-
 src/wok/utils.py                                   |   22 +-
 src/wok/vnc.py                                     |    6 +-
 src/wokd.in                                        |    6 +-
 ui/css/theme-default/grid.css                      |    2 +-
 ui/js/src/wok.cookie.js                            |    2 +-
 ui/js/src/wok.grid.js                              |   12 +-
 ui/js/src/wok.lang.js                              |    6 +-
 ui/js/src/wok.line-chart.js                        |    8 +-
 ui/js/src/wok.login.js                             |   14 +-
 ui/js/src/wok.main.js                              |   84 ++++----
 ui/js/src/wok.message.js                           |   20 +-
 ui/js/src/wok.popable.js                           |    4 +-
 ui/js/src/wok.select.js                            |    2 +-
 ui/js/src/wok.substitute.js                        |    2 +-
 ui/js/src/wok.topic.js                             |    8 +-
 ui/js/src/wok.user.js                              |    6 +-
 ui/js/src/wok.utils.js                             |   18 +-
 ui/js/src/wok.window.js                            |    4 +-
 ui/js/widgets/button-dropDown.js                   |    2 +-
 ui/js/widgets/button-flat.js                       |    2 +-
 ui/js/widgets/checkbox-flat.js                     |    4 +-
 ui/js/widgets/circleGauge.js                       |    4 +-
 ui/js/widgets/combobox.js                          |    2 +-
 ui/js/widgets/dialog-flat.js                       |    4 +-
 ui/js/widgets/filter-select.js                     |    2 +-
 ui/js/widgets/gauge-flat.js                        |    2 +-
 ui/js/widgets/grid.js                              |    2 +-
 ui/js/widgets/line.js                              |    2 +-
 ui/js/widgets/list-flat.js                         |    4 +-
 ui/js/widgets/menu-flat.js                         |    4 +-
 ui/js/widgets/message-flat.js                      |    4 +-
 ui/js/widgets/messagebar-flat.js                   |    4 +-
 ui/js/widgets/radio-flat.js                        |    4 +-
 ui/js/widgets/samples/grid.html                    |    4 +-
 ui/js/widgets/samples/line.html                    |    4 +-
 ui/js/widgets/samples/tabs.html                    |    4 +-
 ui/js/widgets/select-menu.js                       |    2 +-
 ui/js/widgets/selectmenu-flat.js                   |    4 +-
 ui/js/widgets/textbox-flat.js                      |    4 +-
 ui/pages/error.html.tmpl                           |    4 +-
 ui/pages/login.html.tmpl                           |    4 +-
 ui/pages/websockify/console.html                   |   12 +-
 ui/pages/wok-ui.html.tmpl                          |    8 +-
 104 files changed, 714 insertions(+), 714 deletions(-)

diff --git a/plugins/kimchi/disks.py b/plugins/kimchi/disks.py
index 59e52f9..88a69f4 100644
--- a/plugins/kimchi/disks.py
+++ b/plugins/kimchi/disks.py
@@ -25,7 +25,7 @@ from parted import Device as PDevice
 from parted import Disk as PDisk
 
 from wok.exception import OperationFailed
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 
 
 def _get_dev_node_path(maj_min):
@@ -82,7 +82,7 @@ def _is_dev_leaf(devNodePath):
     except OperationFailed as e:
         # lsblk is known to fail on multipath devices
         # Assume these devices contain children
-        kimchi_log.error(
+        wok_log.error(
             "Error getting device info for %s: %s", devNodePath, e)
         return False
 
@@ -97,7 +97,7 @@ def _is_dev_extended_partition(devType, devNodePath):
     try:
         extended_part = PDisk(device).getExtendedPartition()
     except NotImplementedError as e:
-        kimchi_log.warning(
+        wok_log.warning(
             "Error getting extended partition info for dev %s type %s: %s",
             devNodePath, devType, e.message)
         # Treate disk with unsupported partiton table as if it does not
@@ -180,7 +180,7 @@ def get_partition_details(name):
     try:
         dev = _get_lsblk_devs(keys, [dev_path])[0]
     except OperationFailed as e:
-        kimchi_log.error(
+        wok_log.error(
             "Error getting partition info for %s: %s", name, e)
         return {}
 
diff --git a/plugins/kimchi/distroloader.py b/plugins/kimchi/distroloader.py
index 8ad34d2..a593246 100644
--- a/plugins/kimchi/distroloader.py
+++ b/plugins/kimchi/distroloader.py
@@ -25,7 +25,7 @@ import os
 
 import config
 from wok.exception import NotFoundError, OperationFailed
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 
 
 ARCHS = {'x86_64': ['x86_64', 'amd64', 'i686', 'x86', 'i386'],
@@ -43,7 +43,7 @@ class DistroLoader(object):
         msg_args = {'filename': fname}
         if not os.path.isfile(fname):
             msg = "DistroLoader: failed to find distro file: %s" % fname
-            kimchi_log.error(msg)
+            wok_log.error(msg)
             raise NotFoundError("KCHDL0001E", msg_args)
         try:
             with open(fname) as f:
@@ -51,7 +51,7 @@ class DistroLoader(object):
             return data
         except ValueError:
             msg = "DistroLoader: failed to parse distro file: %s" % fname
-            kimchi_log.error(msg)
+            wok_log.error(msg)
             raise OperationFailed("KCHDL0002E", msg_args)
 
     def get(self):
diff --git a/plugins/kimchi/imageinfo.py b/plugins/kimchi/imageinfo.py
index fbd1396..7d92f54 100644
--- a/plugins/kimchi/imageinfo.py
+++ b/plugins/kimchi/imageinfo.py
@@ -23,7 +23,7 @@ import sys
 import guestfs
 
 from wok.exception import ImageFormatError, InvalidParameter, TimeoutExpired
-from wok.utils import run_command, kimchi_log
+from wok.utils import run_command, wok_log
 
 
 def probe_img_info(path):
@@ -32,7 +32,7 @@ def probe_img_info(path):
     try:
         out = run_command(cmd, 10)[0]
     except TimeoutExpired:
-        kimchi_log.warning("Cannot decide format of base img %s", path)
+        wok_log.warning("Cannot decide format of base img %s", path)
         return None
 
     info = json.loads(out)
diff --git a/plugins/kimchi/isoinfo.py b/plugins/kimchi/isoinfo.py
index de9c359..cec20b1 100644
--- a/plugins/kimchi/isoinfo.py
+++ b/plugins/kimchi/isoinfo.py
@@ -29,7 +29,7 @@ import urllib2
 
 
 from wok.exception import IsoFormatError
-from wok.utils import check_url_path, kimchi_log
+from wok.utils import check_url_path, wok_log
 
 
 iso_dir = [
@@ -178,7 +178,7 @@ class IsoImage(object):
                 return (distro, version)
 
         msg = "probe_iso: Unable to identify ISO %s with Volume ID: %s"
-        kimchi_log.debug(msg, self.path, self.volume_id)
+        wok_log.debug(msg, self.path, self.volume_id)
 
         return ('unknown', 'unknown')
 
diff --git a/plugins/kimchi/mockmodel.py b/plugins/kimchi/mockmodel.py
index 384ce9b..88eb033 100644
--- a/plugins/kimchi/mockmodel.py
+++ b/plugins/kimchi/mockmodel.py
@@ -43,7 +43,7 @@ from model.templates import LibvirtVMTemplate
 from model.users import PAMUsersModel
 from model.groups import PAMGroupsModel
 from wok.objectstore import ObjectStore
-from wok.utils import add_task, get_next_clone_name, kimchi_log
+from wok.utils import add_task, get_next_clone_name, wok_log
 from vmtemplate import VMTemplate
 from wok.xmlutils.utils import xml_item_update
 
@@ -276,10 +276,10 @@ class MockModel(Model):
         conn.storagePoolDefineXML(ET.tostring(root), 0)
 
     def _mock_host_shutdown(self, *name):
-        kimchi_log.info("The host system will be shutted down")
+        wok_log.info("The host system will be shutted down")
 
     def _mock_host_reboot(self, *name):
-        kimchi_log.info("The host system will be rebooted")
+        wok_log.info("The host system will be rebooted")
 
     def _mock_storagevolumes_create(self, pool, params):
         vol_source = ['url', 'capacity']
diff --git a/plugins/kimchi/model/config.py b/plugins/kimchi/model/config.py
index 6f593e3..d0799fe 100644
--- a/plugins/kimchi/model/config.py
+++ b/plugins/kimchi/model/config.py
@@ -33,7 +33,7 @@ from featuretests import FEATURETEST_VM_NAME
 from ..repositories import Repositories
 from ..screenshot import VMScreenshot
 from ..swupdate import SoftwareUpdate
-from wok.utils import check_url_path, kimchi_log, run_command
+from wok.utils import check_url_path, wok_log, run_command
 
 
 class ConfigModel(object):
@@ -86,7 +86,7 @@ class CapabilitiesModel(object):
         FeatureTests.enable_libvirt_error_logging()
 
     def _set_capabilities(self):
-        kimchi_log.info("*** Running feature tests ***")
+        wok_log.info("*** Running feature tests ***")
         conn = self.conn.get()
         self.qemu_stream = FeatureTests.qemu_supports_iso_stream()
         self.nfs_target_probe = FeatureTests.libvirt_support_nfs_probe(conn)
@@ -100,14 +100,14 @@ class CapabilitiesModel(object):
             if FeatureTests.libvirt_supports_iso_stream(conn, p):
                 self.libvirt_stream_protocols.append(p)
 
-        kimchi_log.info("*** Feature tests completed ***")
+        wok_log.info("*** Feature tests completed ***")
     _set_capabilities.priority = 90
 
     def _qemu_support_spice(self):
         qemu_path = find_qemu_binary(find_emulator=True)
         out, err, rc = run_command(['ldd', qemu_path])
         if rc != 0:
-            kimchi_log.error('Failed to find qemu binary dependencies: %s',
+            wok_log.error('Failed to find qemu binary dependencies: %s',
                              err)
             return False
         for line in out.split('\n'):
diff --git a/plugins/kimchi/model/cpuinfo.py b/plugins/kimchi/model/cpuinfo.py
index 54d6eaa..61d1ec6 100644
--- a/plugins/kimchi/model/cpuinfo.py
+++ b/plugins/kimchi/model/cpuinfo.py
@@ -22,7 +22,7 @@ import platform
 from xml.etree import ElementTree as ET
 
 from wok.exception import InvalidParameter, InvalidOperation
-from wok.utils import kimchi_log, run_command
+from wok.utils import wok_log, run_command
 
 ARCH = 'power' if platform.machine().startswith('ppc') else 'x86'
 
@@ -59,11 +59,11 @@ class CPUInfoModel(object):
             connect = self.conn.get()
             libvirt_topology = get_topo_capabilities(connect)
         except Exception as e:
-            kimchi_log.info("Unable to get CPU topology capabilities: %s"
+            wok_log.info("Unable to get CPU topology capabilities: %s"
                             % e.message)
             return
         if libvirt_topology is None:
-            kimchi_log.info("cpu_info topology not supported.")
+            wok_log.info("cpu_info topology not supported.")
             return
 
         if ARCH == 'power':
diff --git a/plugins/kimchi/model/debugreports.py b/plugins/kimchi/model/debugreports.py
index 6cc8819..ea5853d 100644
--- a/plugins/kimchi/model/debugreports.py
+++ b/plugins/kimchi/model/debugreports.py
@@ -26,10 +26,10 @@ import subprocess
 import time
 
 from .. import config
-from wok.exception import InvalidParameter, KimchiException, NotFoundError
+from wok.exception import InvalidParameter, WokException, NotFoundError
 from wok.exception import OperationFailed
 from tasks import TaskModel
-from wok.utils import add_task, kimchi_log
+from wok.utils import add_task, wok_log
 from wok.utils import run_command
 
 
@@ -95,7 +95,7 @@ class DebugReportsModel(object):
                     break
             # Some error in sosreport happened
             if reportFile is None:
-                kimchi_log.error('Debug report file not found. See sosreport '
+                wok_log.error('Debug report file not found. See sosreport '
                                  'output for detail:\n%s', output)
                 fname = (patterns[0] % name).split('/')[-1]
                 raise OperationFailed('KCHDR0004E', {'name': fname})
@@ -107,19 +107,19 @@ class DebugReportsModel(object):
             # Moving report
             msg = 'Moving debug report file "%s" to "%s"' % (reportFile,
                                                              target)
-            kimchi_log.info(msg)
+            wok_log.info(msg)
             shutil.move(reportFile, target)
             # Deleting md5
             msg = 'Deleting report md5 file: "%s"' % (md5_report_file)
-            kimchi_log.info(msg)
+            wok_log.info(msg)
             with open(md5_report_file) as f:
                 md5 = f.read().strip()
-                kimchi_log.info('Md5 file content: "%s"', md5)
+                wok_log.info('Md5 file content: "%s"', md5)
             os.remove(md5_report_file)
             cb('OK', True)
             return
 
-        except KimchiException as e:
+        except WokException as e:
             log_error(e)
             raise
 
@@ -151,7 +151,7 @@ class DebugReportsModel(object):
                 if retcode == 0:
                     return helper_tool['fn']
             except Exception, e:
-                kimchi_log.info('Exception running command: %s', e)
+                wok_log.info('Exception running command: %s', e)
 
         return None
 
@@ -189,7 +189,7 @@ class DebugReportModel(object):
             raise InvalidParameter('KCHDR0008E', {'name': params['name']})
 
         shutil.move(file_source, file_target)
-        kimchi_log.info('%s renamed to %s' % (file_source, file_target))
+        wok_log.info('%s renamed to %s' % (file_source, file_target))
         return params['name']
 
     def delete(self, name):
diff --git a/plugins/kimchi/model/diskutils.py b/plugins/kimchi/model/diskutils.py
index 041a135..49bf17d 100644
--- a/plugins/kimchi/model/diskutils.py
+++ b/plugins/kimchi/model/diskutils.py
@@ -20,7 +20,7 @@
 
 from wok.exception import OperationFailed, NotFoundError
 from vms import VMModel, VMsModel
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 from ..xmlutils.disk import get_vm_disk_info, get_vm_disks
 
 """
@@ -35,7 +35,7 @@ def get_disk_used_by(objstore, conn, path):
             try:
                 used_by = session.get('storagevolume', path)['used_by']
             except (KeyError, NotFoundError):
-                kimchi_log.info('Volume %s not found in obj store.' % path)
+                wok_log.info('Volume %s not found in obj store.' % path)
                 used_by = []
                 # try to find this volume in existing vm
                 vms_list = VMsModel.get_vms(conn)
@@ -54,7 +54,7 @@ def get_disk_used_by(objstore, conn, path):
                     #   used_by to be out of sync, data corruption could
                     #   occour if a disk is added to two guests
                     #   unknowingly.
-                    kimchi_log.error('Unable to store storage volume id in'
+                    wok_log.error('Unable to store storage volume id in'
                                      ' objectstore due error: %s',
                                      e.message)
                     raise OperationFailed('KCHVOL0017E',
diff --git a/plugins/kimchi/model/featuretests.py b/plugins/kimchi/model/featuretests.py
index 16fd25e..eb41edb 100644
--- a/plugins/kimchi/model/featuretests.py
+++ b/plugins/kimchi/model/featuretests.py
@@ -26,7 +26,7 @@ import subprocess
 from lxml.builder import E
 
 from wok.rollbackcontext import RollbackContext
-from wok.utils import kimchi_log, run_command, servermethod
+from wok.utils import wok_log, run_command, servermethod
 
 FEATURETEST_VM_NAME = "FEATURETEST_VM"
 FEATURETEST_POOL_NAME = "FEATURETEST_POOL"
@@ -132,7 +132,7 @@ class FeatureTests(object):
             dom.undefine()
             return True
         except libvirt.libvirtError, e:
-            kimchi_log.error(e.message)
+            wok_log.error(e.message)
             return False
         finally:
             FeatureTests.enable_libvirt_error_logging()
@@ -147,7 +147,7 @@ class FeatureTests(object):
             FeatureTests.disable_libvirt_error_logging()
             conn.findStoragePoolSources('netfs', _get_xml(), 0)
         except libvirt.libvirtError as e:
-            kimchi_log.error(e.message)
+            wok_log.error(e.message)
             if e.get_error_code() == 38:
                 # if libvirt cannot find showmount,
                 # it returns 38--general system call failure
@@ -213,7 +213,7 @@ class FeatureTests(object):
     def kernel_support_vfio():
         out, err, rc = run_command(['modprobe', 'vfio-pci'])
         if rc != 0:
-            kimchi_log.warning("Unable to load Kernal module vfio-pci.")
+            wok_log.warning("Unable to load Kernal module vfio-pci.")
             return False
         return True
 
diff --git a/plugins/kimchi/model/host.py b/plugins/kimchi/model/host.py
index f1f0b83..2a78a88 100644
--- a/plugins/kimchi/model/host.py
+++ b/plugins/kimchi/model/host.py
@@ -37,7 +37,7 @@ from tasks import TaskModel
 from vms import DOM_STATE_MAP
 from ..repositories import Repositories
 from ..swupdate import SoftwareUpdate
-from wok.utils import add_task, kimchi_log
+from wok.utils import add_task, wok_log
 from wok.xmlutils.utils import xpath_get_text
 
 
@@ -131,7 +131,7 @@ class HostModel(object):
         if pkgs == 0:
             raise OperationFailed('KCHPKGUPD0001E')
 
-        kimchi_log.debug('Host is going to be updated.')
+        wok_log.debug('Host is going to be updated.')
         taskid = add_task('/host/swupdate', swupdate.doUpdate, self.objstore,
                           None)
         return self.task.lookup(taskid)
@@ -142,7 +142,7 @@ class HostModel(object):
         if len(running_vms) > 0:
             raise OperationFailed("KCHHOST0001E")
 
-        kimchi_log.info('Host is going to shutdown.')
+        wok_log.info('Host is going to shutdown.')
         os.system('shutdown -h now')
 
     def reboot(self, args=None):
@@ -151,7 +151,7 @@ class HostModel(object):
         if len(running_vms) > 0:
             raise OperationFailed("KCHHOST0002E")
 
-        kimchi_log.info('Host is going to reboot.')
+        wok_log.info('Host is going to reboot.')
         os.system('reboot')
 
     def _get_vms_list_by_state(self, state):
diff --git a/plugins/kimchi/model/hostdev.py b/plugins/kimchi/model/hostdev.py
index 34a8e1b..9ebc3c3 100644
--- a/plugins/kimchi/model/hostdev.py
+++ b/plugins/kimchi/model/hostdev.py
@@ -22,7 +22,7 @@ from pprint import pformat
 from pprint import pprint
 
 from libvirtconnection import LibvirtConnection
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 from wok.xmlutils.utils import dictize
 
 
@@ -42,7 +42,7 @@ def _get_dev_info_tree(dev_infos):
         try:
             parent = devs[dev_info['parent']]
         except KeyError:
-            kimchi_log.error('Parent %s of device %s does not exist.',
+            wok_log.error('Parent %s of device %s does not exist.',
                              dev_info['parent'], dev_info['name'])
             continue
 
@@ -97,7 +97,7 @@ def _get_same_iommugroup_devices(dev_infos, device_info):
             try:
                 parent_info = dev_dict[parent]
             except KeyError:
-                kimchi_log.error("Parent %s of device %s does not exist",
+                wok_log.error("Parent %s of device %s does not exist",
                                  parent, dev_info['name'])
                 break
 
@@ -184,7 +184,7 @@ def get_dev_info(node_dev):
     if dev_type in ('net', 'pci', 'scsi_host', 'storage', 'usb_device'):
         return globals()['_get_%s_dev_info' % dev_type](info)
 
-    kimchi_log.error("Unknown device type: %s", dev_type)
+    wok_log.error("Unknown device type: %s", dev_type)
     return info
 
 
diff --git a/plugins/kimchi/model/libvirtconnection.py b/plugins/kimchi/model/libvirtconnection.py
index 4a4eee4..d2ce031 100644
--- a/plugins/kimchi/model/libvirtconnection.py
+++ b/plugins/kimchi/model/libvirtconnection.py
@@ -23,7 +23,7 @@ import time
 import cherrypy
 import libvirt
 
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 
 
 class LibvirtConnection(object):
@@ -75,7 +75,7 @@ class LibvirtConnection(object):
                               libvirt.VIR_ERR_NO_CONNECT,
                               libvirt.VIR_ERR_INVALID_CONN)
                     if edom in EDOMAINS and ecode in ECODES:
-                        kimchi_log.error('Connection to libvirt broken. '
+                        wok_log.error('Connection to libvirt broken. '
                                          'Recycling. ecode: %d edom: %d' %
                                          (ecode, edom))
                         with LibvirtConnection._connectionLock:
@@ -95,9 +95,9 @@ class LibvirtConnection(object):
                         conn = libvirt.open(self.uri)
                         break
                     except libvirt.libvirtError:
-                        kimchi_log.error('Unable to connect to libvirt.')
+                        wok_log.error('Unable to connect to libvirt.')
                         if not retries:
-                            kimchi_log.error("Unable to establish connection "
+                            wok_log.error("Unable to establish connection "
                                              "with libvirt. Please check "
                                              "your libvirt URI which is often "
                                              "defined in "
diff --git a/plugins/kimchi/model/libvirtstoragepool.py b/plugins/kimchi/model/libvirtstoragepool.py
index b7a8291..6c1f031 100644
--- a/plugins/kimchi/model/libvirtstoragepool.py
+++ b/plugins/kimchi/model/libvirtstoragepool.py
@@ -27,7 +27,7 @@ import libvirt
 from wok.exception import InvalidParameter, OperationFailed, TimeoutExpired
 from ..iscsi import TargetClient
 from wok.rollbackcontext import RollbackContext
-from wok.utils import kimchi_log, parse_cmd_output, run_command
+from wok.utils import wok_log, parse_cmd_output, run_command
 
 
 class StoragePoolDef(object):
@@ -165,7 +165,7 @@ class ScsiPoolDef(StoragePoolDef):
             msg = "Libvirt version <= 1.0.5. Setting SCSI host name as '%s'; "\
                   "setting SCSI adapter type as 'scsi_host'; "\
                   "ignoring wwnn and wwpn." % tmp_name
-            kimchi_log.info(msg)
+            wok_log.info(msg)
         # Path for Fibre Channel scsi hosts
         self.poolArgs['path'] = '/dev/disk/by-path'
         if not self.poolArgs['source']['adapter']['type']:
diff --git a/plugins/kimchi/model/networks.py b/plugins/kimchi/model/networks.py
index 7a3dfc8..594bfca 100644
--- a/plugins/kimchi/model/networks.py
+++ b/plugins/kimchi/model/networks.py
@@ -32,7 +32,7 @@ from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import MissingParameter, NotFoundError, OperationFailed
 from ..osinfo import defaults as tmpl_defaults
 from wok.rollbackcontext import RollbackContext
-from wok.utils import kimchi_log, run_command
+from wok.utils import wok_log, run_command
 from ..xmlutils.network import create_vlan_tagged_bridge_xml
 from ..xmlutils.network import to_network_xml
 from wok.xmlutils.utils import xpath_get_text
@@ -59,9 +59,9 @@ class NetworksModel(object):
                 net = conn.networkLookupByName(net_name)
             except libvirt.libvirtError, e:
                 msg = "Fatal: Unable to find network %s."
-                kimchi_log.error(msg, net_name)
-                kimchi_log.error(error_msg)
-                kimchi_log.error("Details: %s", e.message)
+                wok_log.error(msg, net_name)
+                wok_log.error(error_msg)
+                wok_log.error("Details: %s", e.message)
                 sys.exit(1)
 
             if net.isActive() == 0:
@@ -69,9 +69,9 @@ class NetworksModel(object):
                     net.create()
                 except libvirt.libvirtError as e:
                     msg = "Fatal: Unable to activate network %s."
-                    kimchi_log.error(msg, net_name)
-                    kimchi_log.error(error_msg)
-                    kimchi_log.error("Details: %s", e.message)
+                    wok_log.error(msg, net_name)
+                    wok_log.error(error_msg)
+                    wok_log.error("Details: %s", e.message)
                     sys.exit(1)
 
     def create(self, params):
@@ -211,7 +211,7 @@ class NetworksModel(object):
             try:
                 bridges.append(net.bridgeName())
             except libvirt.libvirtError, e:
-                kimchi_log.error(e.message)
+                wok_log.error(e.message)
 
         if br_name in bridges:
             raise InvalidOperation("KCHNET0010E", {'iface': br_name})
diff --git a/plugins/kimchi/model/peers.py b/plugins/kimchi/model/peers.py
index ef70b1e..a9cf3b7 100644
--- a/plugins/kimchi/model/peers.py
+++ b/plugins/kimchi/model/peers.py
@@ -22,7 +22,7 @@ import re
 import socket
 
 from wok.config import config
-from wok.utils import kimchi_log, run_command
+from wok.utils import wok_log, run_command
 
 
 class PeersModel(object):
@@ -37,19 +37,19 @@ class PeersModel(object):
         self.url = hostname + ":" + port
 
         cmd = ["slptool", "register",
-               "service:kimchid://%s" % self.url]
+               "service:wokd://%s" % self.url]
         out, error, ret = run_command(cmd)
         if out and len(out) != 0:
-            kimchi_log.error("Unable to register server on openSLP."
+            wok_log.error("Unable to register server on openSLP."
                              " Details: %s" % out)
         cherrypy.engine.subscribe('exit', self._peer_deregister)
 
     def _peer_deregister(self):
         cmd = ["slptool", "deregister",
-               "service:kimchid://%s" % self.url]
+               "service:wokd://%s" % self.url]
         out, error, ret = run_command(cmd)
         if out and len(out) != 0:
-            kimchi_log.error("Unable to deregister server on openSLP."
+            wok_log.error("Unable to deregister server on openSLP."
                              " Details: %s" % out)
 
     def get_list(self):
@@ -57,14 +57,14 @@ class PeersModel(object):
         if config.get("server", "federation") == "off":
             return []
 
-        cmd = ["slptool", "findsrvs", "service:kimchid"]
+        cmd = ["slptool", "findsrvs", "service:wokd"]
         out, error, ret = run_command(cmd)
         if ret != 0:
             return []
 
         peers = []
         for server in out.strip().split("\n"):
-            match = re.match("service:kimchid://(.*?),.*", server)
+            match = re.match("service:wokd://(.*?),.*", server)
             peer = match.group(1)
             if peer != self.url:
                 peers.append("https://" + peer)
diff --git a/plugins/kimchi/model/storagepools.py b/plugins/kimchi/model/storagepools.py
index e84dc33..681fafc 100644
--- a/plugins/kimchi/model/storagepools.py
+++ b/plugins/kimchi/model/storagepools.py
@@ -31,7 +31,7 @@ from config import CapabilitiesModel
 from host import DeviceModel
 from libvirtstoragepool import StoragePoolDef
 from ..osinfo import defaults as tmpl_defaults
-from wok.utils import add_task, kimchi_log, run_command
+from wok.utils import add_task, wok_log, run_command
 from ..utils import pool_name_from_uri
 from wok.xmlutils.utils import xpath_get_text
 
@@ -92,8 +92,8 @@ class StoragePoolsModel(object):
                 pool_path = pools[pool_name].get('path')
                 if pool_path is None:
                     msg = "Fatal: Unable to find storage pool %s. " + error_msg
-                    kimchi_log.error(msg % pool_name)
-                    kimchi_log.error("Details: %s", e.message)
+                    wok_log.error(msg % pool_name)
+                    wok_log.error("Details: %s", e.message)
                     sys.exit(1)
 
                 # Try to create the pool
@@ -105,8 +105,8 @@ class StoragePoolsModel(object):
                 except libvirt.libvirtError, e:
                     msg = "Fatal: Unable to create storage pool %s. "
                     msg += error_msg
-                    kimchi_log.error(msg % pool_name)
-                    kimchi_log.error("Details: %s", e.message)
+                    wok_log.error(msg % pool_name)
+                    wok_log.error("Details: %s", e.message)
                     sys.exit(1)
 
                 # Build and set autostart value to pool
@@ -126,8 +126,8 @@ class StoragePoolsModel(object):
                 except libvirt.libvirtError, e:
                     msg = "Fatal: Unable to craete storage pool %s. "
                     msg += error_msg
-                    kimchi_log.error(msg % pool_name)
-                    kimchi_log.error("Details: %s", e.message)
+                    wok_log.error(msg % pool_name)
+                    wok_log.error("Details: %s", e.message)
                     sys.exit(1)
 
     def get_list(self):
@@ -192,7 +192,7 @@ class StoragePoolsModel(object):
 
             pool = conn.storagePoolDefineXML(xml, 0)
         except libvirt.libvirtError as e:
-            kimchi_log.error("Problem creating Storage Pool: %s", e)
+            wok_log.error("Problem creating Storage Pool: %s", e)
             raise OperationFailed("KCHPOOL0007E",
                                   {'name': name, 'err': e.get_error_message()})
 
@@ -212,7 +212,7 @@ class StoragePoolsModel(object):
             output, error, returncode = run_command(['setsebool', '-P',
                                                     'virt_use_nfs=1'])
             if error or returncode:
-                kimchi_log.error("Unable to set virt_use_nfs=1. If you use "
+                wok_log.error("Unable to set virt_use_nfs=1. If you use "
                                  "SELinux, this may prevent NFS pools from "
                                  "being used.")
         return name
@@ -226,7 +226,7 @@ class StoragePoolsModel(object):
                 session.delete('scanning', pool_name)
         except Exception, e:
             err = "Exception %s occured when cleaning scan result"
-            kimchi_log.debug(err % e.message)
+            wok_log.debug(err % e.message)
 
     def _do_deep_scan(self, params):
         scan_params = dict(ignore_list=[])
@@ -241,7 +241,7 @@ class StoragePoolsModel(object):
                     scan_params['ignore_list'].append(res['path'])
             except Exception, e:
                 err = "Exception %s occured when get ignore path"
-                kimchi_log.debug(err % e.message)
+                wok_log.debug(err % e.message)
 
         params['path'] = self.scanner.scan_dir_prepare(params['name'])
         scan_params['pool_path'] = params['path']
@@ -283,9 +283,9 @@ class StoragePoolModel(object):
             # If something (say a busy pool) prevents the refresh,
             # throwing an Exception here would prevent all pools from
             # displaying information -- so return None for busy
-            kimchi_log.error("ERROR: Storage Pool get vol count: %s "
+            wok_log.error("ERROR: Storage Pool get vol count: %s "
                              % e.get_error_message())
-            kimchi_log.error("ERROR: Storage Pool get vol count error no: %s "
+            wok_log.error("ERROR: Storage Pool get vol count error no: %s "
                              % e.get_error_code())
             return 0
         except Exception as e:
@@ -338,7 +338,7 @@ class StoragePoolModel(object):
         # FIXME: nfs workaround - prevent any libvirt operation
         # for a nfs if the corresponding NFS server is down.
         if pool_type == 'netfs' and not self._nfs_status_online(pool):
-            kimchi_log.debug("NFS pool %s is offline, reason: NFS "
+            wok_log.debug("NFS pool %s is offline, reason: NFS "
                              "server %s is unreachable.", name,
                              source['addr'])
             # Mark state as '4' => inaccessible.
@@ -377,7 +377,7 @@ class StoragePoolModel(object):
             lsblk_cmd = ['lsblk', disk]
             output, error, returncode = run_command(lsblk_cmd)
             if returncode != 0:
-                kimchi_log.error('%s is not a valid disk/partition. Could not '
+                wok_log.error('%s is not a valid disk/partition. Could not '
                                  'add it to the pool %s.', disk, pool_name)
                 raise OperationFailed('KCHPOOL0027E', {'disk': disk,
                                                        'pool': pool_name})
@@ -387,7 +387,7 @@ class StoragePoolModel(object):
         output, error, returncode = run_command(vgextend_cmd)
         if returncode != 0:
             msg = "Could not add disks to pool %s, error: %s"
-            kimchi_log.error(msg, pool_name, error)
+            wok_log.error(msg, pool_name, error)
             raise OperationFailed('KCHPOOL0028E', {'pool': pool_name,
                                                    'err': error})
         # refreshing pool state
diff --git a/plugins/kimchi/model/storagetargets.py b/plugins/kimchi/model/storagetargets.py
index dd88fec..bbcfb0d 100644
--- a/plugins/kimchi/model/storagetargets.py
+++ b/plugins/kimchi/model/storagetargets.py
@@ -24,7 +24,7 @@ from lxml.builder import E
 
 from config import CapabilitiesModel
 from storageservers import STORAGE_SERVERS
-from wok.utils import kimchi_log, patch_find_nfs_target
+from wok.utils import wok_log, patch_find_nfs_target
 
 
 class StorageTargetsModel(object):
@@ -51,7 +51,7 @@ class StorageTargetsModel(object):
                     ret = conn.findStoragePoolSources(target_type, xml, 0)
                 except libvirt.libvirtError as e:
                     err = "Query storage pool source fails because of %s"
-                    kimchi_log.warning(err, e.get_error_message())
+                    wok_log.warning(err, e.get_error_message())
                     continue
 
                 targets = self._parse_target_source_result(target_type, ret)
@@ -78,7 +78,7 @@ class StorageTargetsModel(object):
 
         except libvirt.libvirtError as e:
             err = "Query storage pool source fails because of %s"
-            kimchi_log.warning(err, e.get_error_message())
+            wok_log.warning(err, e.get_error_message())
 
         # Filter target_list to not not show the used paths
         target_list = [elem for elem in target_list
diff --git a/plugins/kimchi/model/storagevolumes.py b/plugins/kimchi/model/storagevolumes.py
index 92e1c7c..908fbc4 100644
--- a/plugins/kimchi/model/storagevolumes.py
+++ b/plugins/kimchi/model/storagevolumes.py
@@ -36,7 +36,7 @@ from diskutils import get_disk_used_by, set_disk_used_by
 from storagepools import StoragePoolModel
 from tasks import TaskModel
 from wok.utils import add_task, get_next_clone_name, get_unique_file_name
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 from wok.xmlutils.utils import xpath_get_text
 
 
@@ -233,7 +233,7 @@ class StorageVolumesModel(object):
                     if virt_vol:
                         virt_vol.delete(0)
                 except libvirt.libvirtError, virt_e:
-                    kimchi_log.error(virt_e.message)
+                    wok_log.error(virt_e.message)
                 finally:
                     raise OperationFailed('KCHVOL0007E', {'name': name,
                                                           'pool': pool_name,
@@ -528,7 +528,7 @@ class IsoVolumesModel(object):
                 volumes = pool.listVolumes()
             except Exception, e:
                 # Skip inactive pools
-                kimchi_log.debug("Shallow scan: skipping pool %s because of "
+                wok_log.debug("Shallow scan: skipping pool %s because of "
                                  "error: %s", (pool_name, e.message))
                 continue
 
diff --git a/plugins/kimchi/model/vmhostdevs.py b/plugins/kimchi/model/vmhostdevs.py
index f8c87dd..18f4e1f 100644
--- a/plugins/kimchi/model/vmhostdevs.py
+++ b/plugins/kimchi/model/vmhostdevs.py
@@ -31,7 +31,7 @@ from host import DeviceModel, DevicesModel
 from utils import get_vm_config_flag
 from vms import DOM_STATE_MAP, VMModel
 from wok.rollbackcontext import RollbackContext
-from wok.utils import kimchi_log, run_command
+from wok.utils import wok_log, run_command
 import platform
 
 
@@ -169,7 +169,7 @@ class VMHostDevsModel(object):
             out, err, rc = run_command(['setsebool', '-P',
                                         'virt_use_sysfs=on'])
             if rc != 0:
-                kimchi_log.warning("Unable to turn on sebool virt_use_sysfs")
+                wok_log.warning("Unable to turn on sebool virt_use_sysfs")
 
     def _attach_pci_device(self, vmid, dev_info):
         self._validate_pci_passthrough_env()
@@ -205,7 +205,7 @@ class VMHostDevsModel(object):
                 try:
                     dom.attachDeviceFlags(xmlstr, device_flags)
                 except libvirt.libvirtError:
-                    kimchi_log.error(
+                    wok_log.error(
                         'Failed to attach host device %s to VM %s: \n%s',
                         pci_info['name'], vmid, xmlstr)
                     raise
diff --git a/plugins/kimchi/model/vms.py b/plugins/kimchi/model/vms.py
index a874ca1..2e9721d 100644
--- a/plugins/kimchi/model/vms.py
+++ b/plugins/kimchi/model/vms.py
@@ -45,7 +45,7 @@ from utils import set_metadata_node
 from wok.rollbackcontext import RollbackContext
 from ..screenshot import VMScreenshot
 from wok.utils import add_task, convert_data_size, get_next_clone_name
-from wok.utils import import_class, kimchi_log, run_setfacl_set_attr
+from wok.utils import import_class, wok_log, run_setfacl_set_attr
 from ..utils import template_name_from_uri
 from ..xmlutils.cpu import get_cpu_xml, get_numa_xml
 from wok.xmlutils.utils import xpath_get_text, xml_item_update
@@ -134,7 +134,7 @@ class VMsModel(object):
             except Exception as e:
                 # It is possible to continue Kimchi executions without store
                 # vm icon info
-                kimchi_log.error('Error trying to update database with guest '
+                wok_log.error('Error trying to update database with guest '
                                  'icon information due error: %s', e.message)
 
         # If storagepool is SCSI, volumes will be LUNs and must be passed by
@@ -396,7 +396,7 @@ class VMModel(object):
                 # a new volume with the same size, the pool 'default' should
                 # be used
                 if orig_vol['capacity'] > orig_pool['available']:
-                    kimchi_log.warning('storage pool \'%s\' doesn\'t have '
+                    wok_log.warning('storage pool \'%s\' doesn\'t have '
                                        'enough free space to store image '
                                        '\'%s\'; falling back to \'default\'',
                                        orig_pool_name, path)
@@ -412,7 +412,7 @@ class VMModel(object):
 
             elif orig_pool['type'] in ['scsi', 'iscsi']:
                 # SCSI and iSCSI always fall back to the storage pool 'default'
-                kimchi_log.warning('cannot create new volume for clone in '
+                wok_log.warning('cannot create new volume for clone in '
                                    'storage pool \'%s\'; falling back to '
                                    '\'default\'', orig_pool_name)
                 new_pool_name = u'default'
@@ -866,7 +866,7 @@ class VMModel(object):
         except Exception as e:
             # VM might be deleted just after we get the list.
             # This is OK, just skip.
-            kimchi_log.debug('Error processing VM stats: %s', e.message)
+            wok_log.debug('Error processing VM stats: %s', e.message)
 
     def _get_percentage_cpu_usage(self, vm_uuid, info, seconds):
         prevCpuTime = self.stats[vm_uuid].get('cputime', 0)
@@ -1042,7 +1042,7 @@ class VMModel(object):
         try:
             snapshot_names = self.vmsnapshots.get_list(name)
         except OperationFailed, e:
-            kimchi_log.error('cannot list snapshots: %s; '
+            wok_log.error('cannot list snapshots: %s; '
                              'skipping snapshot deleting...' % e.message)
         else:
             for s in snapshot_names:
@@ -1067,7 +1067,7 @@ class VMModel(object):
                         session.delete('storagevolume', path,
                                        ignore_missing=True)
             except libvirt.libvirtError as e:
-                kimchi_log.error('Unable to get storage volume by path: %s' %
+                wok_log.error('Unable to get storage volume by path: %s' %
                                  e.message)
             except Exception as e:
                 raise OperationFailed('KCHVOL0017E', {'err': e.message})
@@ -1087,7 +1087,7 @@ class VMModel(object):
                 session.delete('vm', dom.UUIDString(), ignore_missing=True)
         except Exception as e:
             # It is possible to delete vm without delete its database info
-            kimchi_log.error('Error deleting vm information from database: '
+            wok_log.error('Error deleting vm information from database: '
                              '%s', e.message)
 
         vnc.remove_proxy_token(name)
@@ -1183,7 +1183,7 @@ class VMModel(object):
         except Exception as e:
             # It is possible to continue Kimchi executions without delete
             # screenshots
-            kimchi_log.error('Error trying to delete vm screenshot from '
+            wok_log.error('Error trying to delete vm screenshot from '
                              'database due error: %s', e.message)
 
     def suspend(self, name):
@@ -1249,7 +1249,7 @@ class VMScreenshotModel(object):
         except Exception as e:
             # It is possible to continue Kimchi executions without store
             # screenshots
-            kimchi_log.error('Error trying to update database with guest '
+            wok_log.error('Error trying to update database with guest '
                              'screenshot information due error: %s', e.message)
         return img_path
 
@@ -1267,7 +1267,7 @@ class VMScreenshotModel(object):
             # exception from '__exit__' when calling 'session.store'
             # It is possible to continue Kimchi vm executions without
             # screenshots
-            kimchi_log.error('Error trying to update database with guest '
+            wok_log.error('Error trying to update database with guest '
                              'screenshot information due error: %s', e.message)
         return LibvirtVMScreenshot(params, conn)
 
diff --git a/plugins/kimchi/model/vmstorages.py b/plugins/kimchi/model/vmstorages.py
index 29f8f30..f7cef52 100644
--- a/plugins/kimchi/model/vmstorages.py
+++ b/plugins/kimchi/model/vmstorages.py
@@ -29,7 +29,7 @@ from storagevolumes import StorageVolumeModel
 from utils import get_vm_config_flag
 from ..osinfo import lookup
 from diskutils import get_disk_used_by, set_disk_used_by
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 from ..xmlutils.disk import get_device_node, get_disk_xml
 from ..xmlutils.disk import get_vm_disk_info, get_vm_disks
 
@@ -191,7 +191,7 @@ class VMStorageModel(object):
             if path is not None:
                 used_by = get_disk_used_by(self.objstore, self.conn, path)
             else:
-                kimchi_log.error("Unable to decrement volume used_by on"
+                wok_log.error("Unable to decrement volume used_by on"
                                  " delete because no path could be found.")
             dom.detachDeviceFlags(etree.tostring(disk),
                                   get_vm_config_flag(dom, 'all'))
@@ -202,7 +202,7 @@ class VMStorageModel(object):
             used_by.remove(vm_name)
             set_disk_used_by(self.objstore, path, used_by)
         else:
-            kimchi_log.error("Unable to update %s:%s used_by on delete."
+            wok_log.error("Unable to update %s:%s used_by on delete."
                              % (vm_name, dev_name))
 
     def update(self, vm_name, dev_name, params):
@@ -246,6 +246,6 @@ class VMStorageModel(object):
                 set_disk_used_by(self.objstore, new_disk_path,
                                  new_disk_used_by)
         except Exception as e:
-            kimchi_log.error("Unable to update dev used_by on update due to"
+            wok_log.error("Unable to update dev used_by on update due to"
                              " %s:" % e.message)
         return dev
diff --git a/plugins/kimchi/scan.py b/plugins/kimchi/scan.py
index 8e42fbc..663b838 100644
--- a/plugins/kimchi/scan.py
+++ b/plugins/kimchi/scan.py
@@ -27,7 +27,7 @@ import time
 
 
 from isoinfo import IsoImage, probe_iso
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 
 
 SCAN_IGNORE = ['/tmp/kimchi-scan-*']
@@ -58,7 +58,7 @@ class Scanner(object):
                     self.clean_cb(transient_pool)
         except OSError as e:
             msg = "Exception %s occured when cleaning stale pool, ignore"
-            kimchi_log.debug(msg % e.message)
+            wok_log.debug(msg % e.message)
 
     def scan_dir_prepare(self, name):
         # clean stale scan storage pools
diff --git a/plugins/kimchi/screenshot.py b/plugins/kimchi/screenshot.py
index 765e1a6..05701dd 100644
--- a/plugins/kimchi/screenshot.py
+++ b/plugins/kimchi/screenshot.py
@@ -33,7 +33,7 @@ except ImportError:
 
 
 import config
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 
 
 (fd, pipe) = tempfile.mkstemp()
@@ -164,7 +164,7 @@ class VMScreenshot(object):
             try:
                 self._generate_scratch(thumbnail)
             except:
-                kimchi_log.error("screenshot_creation: Unable to create "
+                wok_log.error("screenshot_creation: Unable to create "
                                  "screenshot image %s." % thumbnail)
         else:
             self._create_black_image(thumbnail)
@@ -178,7 +178,7 @@ class VMScreenshot(object):
                 # work around pic truncate validation in thumbnail generation
                 im.thumbnail(self.THUMBNAIL_SIZE)
             except Exception as e:
-                kimchi_log.warning("Image load with warning: %s." % e)
+                wok_log.warning("Image load with warning: %s." % e)
             im.save(thumbnail, "PNG")
 
         self.info['thumbnail'] = thumbnail
diff --git a/plugins/kimchi/swupdate.py b/plugins/kimchi/swupdate.py
index 592fb84..cd56707 100644
--- a/plugins/kimchi/swupdate.py
+++ b/plugins/kimchi/swupdate.py
@@ -23,7 +23,7 @@ import time
 from wok.basemodel import Singleton
 from config import kimchiLock
 from wok.exception import NotFoundError, OperationFailed
-from wok.utils import kimchi_log, run_command
+from wok.utils import wok_log, run_command
 from yumparser import get_yum_packages_list_update
 
 
@@ -49,18 +49,18 @@ class SoftwareUpdate(object):
         # correct package management system
         try:
             __import__('yum')
-            kimchi_log.info("Loading YumUpdate features.")
+            wok_log.info("Loading YumUpdate features.")
             self._pkg_mnger = YumUpdate()
         except ImportError:
             try:
                 __import__('apt')
-                kimchi_log.info("Loading AptUpdate features.")
+                wok_log.info("Loading AptUpdate features.")
                 self._pkg_mnger = AptUpdate()
             except ImportError:
                 zypper_help = ["zypper", "--help"]
                 (stdout, stderr, returncode) = run_command(zypper_help)
                 if returncode == 0:
-                    kimchi_log.info("Loading ZypperUpdate features.")
+                    wok_log.info("Loading ZypperUpdate features.")
                     self._pkg_mnger = ZypperUpdate()
                 else:
                     raise Exception("There is no compatible package manager "
diff --git a/plugins/kimchi/tests/utils.py b/plugins/kimchi/tests/utils.py
index 6144dc7..e22bffa 100644
--- a/plugins/kimchi/tests/utils.py
+++ b/plugins/kimchi/tests/utils.py
@@ -41,7 +41,7 @@ import wok.server
 from wok.config import config, paths
 from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs
 from wok.exception import NotFoundError, OperationFailed
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 
 _ports = {}
 
@@ -227,12 +227,12 @@ def wait_task(task_lookup, taskid, timeout=10):
     for i in range(0, timeout):
         task_info = task_lookup(taskid)
         if task_info['status'] == "running":
-            kimchi_log.info("Waiting task %s, message: %s",
+            wok_log.info("Waiting task %s, message: %s",
                             taskid, task_info['message'])
             time.sleep(1)
         else:
             return
-    kimchi_log.error("Timeout while process long-run task, "
+    wok_log.error("Timeout while process long-run task, "
                      "try to increase timeout value.")
 
 
diff --git a/plugins/kimchi/ui/js/src/kimchi.api.js b/plugins/kimchi/ui/js/src/kimchi.api.js
index a7c3b2d..81e44fd 100644
--- a/plugins/kimchi/ui/js/src/kimchi.api.js
+++ b/plugins/kimchi/ui/js/src/kimchi.api.js
@@ -53,7 +53,7 @@ var kimchi = {
      */
     getCapabilities : function(suc, err, done) {
         done = typeof done !== 'undefined' ? done: function(){};
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : "config/capabilities",
             type : "GET",
             contentType : "application/json",
@@ -68,7 +68,7 @@ var kimchi = {
      * Get the i18 strings.
      */
     getI18n: function(suc, err, url, sync) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url ? url : 'i18n.json',
             type : 'GET',
             resend: true,
@@ -83,7 +83,7 @@ var kimchi = {
      * Get the host static information.
      */
     getHost: function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host',
             type : 'GET',
             resend: true,
@@ -98,11 +98,11 @@ var kimchi = {
      * Get the dynamic host stats (usually used for monitoring).
      */
     getHostStats : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/stats',
             type : 'GET',
             contentType : 'application/json',
-            headers: {'Kimchi-Robot': 'kimchi-robot'},
+            headers: {'Wok-Robot': 'wok-robot'},
             dataType : 'json',
             success : suc,
             error: err
@@ -113,12 +113,12 @@ var kimchi = {
      * Get the historic host stats.
      */
     getHostStatsHistory : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/stats/history',
             type : 'GET',
             resend: true,
             contentType : 'application/json',
-            headers: {'Kimchi-Robot': 'kimchi-robot'},
+            headers: {'Wok-Robot': 'wok-robot'},
             dataType : 'json',
             success : suc,
             error: err
@@ -137,7 +137,7 @@ var kimchi = {
      * suc: callback if succeed err: callback if failed
      */
     createVM : function(settings, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : "vms",
             type : "POST",
             contentType : "application/json",
@@ -153,7 +153,7 @@ var kimchi = {
      * if failed
      */
     createTemplate : function(settings, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : "templates",
             type : "POST",
             contentType : "application/json",
@@ -165,7 +165,7 @@ var kimchi = {
     },
 
     deleteTemplate : function(tem, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'templates/' + encodeURIComponent(tem),
             type : 'DELETE',
             contentType : 'application/json',
@@ -176,7 +176,7 @@ var kimchi = {
     },
 
     cloneTemplate : function(tem, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'templates/' + encodeURIComponent(tem) + "/clone",
             type : 'POST',
             contentType : 'application/json',
@@ -187,7 +187,7 @@ var kimchi = {
     },
 
     listTemplates : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'templates',
             type : 'GET',
             contentType : 'application/json',
@@ -201,7 +201,7 @@ var kimchi = {
      * Retrieve the information of a template by the given name.
      */
     retrieveTemplate : function(templateName, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : "templates/" + encodeURIComponent(templateName),
             type : 'GET',
             contentType : 'application/json',
@@ -231,7 +231,7 @@ var kimchi = {
      * The unit is MBytes suc: callback if succeed err: callback if failed
      */
     createStoragePool : function(settings, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'storagepools',
             type : 'POST',
             contentType : 'application/json',
@@ -248,12 +248,12 @@ var kimchi = {
             dataType : 'json',
             data : JSON.stringify(content)
         }).done(suc).fail(err ? err : function(data) {
-            kimchi.message.error(data.responseJSON.reason);
+            wok.message.error(data.responseJSON.reason);
         });
     },
 
     startVM : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm) + '/start',
             type : 'POST',
             contentType : 'application/json',
@@ -264,7 +264,7 @@ var kimchi = {
     },
 
     poweroffVM : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm) + '/poweroff',
             type : 'POST',
             contentType : 'application/json',
@@ -275,7 +275,7 @@ var kimchi = {
     },
 
     shutdownVM : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm) + '/shutdown',
             type : 'POST',
             contentType : 'application/json',
@@ -286,7 +286,7 @@ var kimchi = {
     },
 
     resetVM : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm) + '/reset',
             type : 'POST',
             contentType : 'application/json',
@@ -297,7 +297,7 @@ var kimchi = {
     },
 
     suspendVM : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm) + '/suspend',
             type : 'POST',
             contentType : 'application/json',
@@ -308,7 +308,7 @@ var kimchi = {
     },
 
     resumeVM : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm) + '/resume',
             type : 'POST',
             contentType : 'application/json',
@@ -352,7 +352,7 @@ var kimchi = {
     },
 
     deleteVM : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm),
             type : 'DELETE',
             contentType : 'application/json',
@@ -363,13 +363,13 @@ var kimchi = {
     },
 
     vncToVM : function(vm) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'config',
             type : 'GET',
             dataType : 'json'
         }).done(function(data, textStatus, xhr) {
             proxy_port = data['display_proxy_port'];
-            kimchi.requestJSON({
+            wok.requestJSON({
                 url : "vms/" + encodeURIComponent(vm) + "/connect",
                 type : "POST",
                 dataType : "json"
@@ -384,24 +384,24 @@ var kimchi = {
                  * contain = which is not safe in a URL query component.
                  * So remove it when needed as base64 can work well without it.
                  * */
-                url += "&path=?token=" + kimchi.urlSafeB64Encode(vm).replace(/=*$/g, "");
-                url += "&kimchi=" + location.port;
+                url += "&path=?token=" + wok.urlSafeB64Encode(vm).replace(/=*$/g, "");
+                url += "&wok=" + location.port;
                 url += '&encrypt=1';
                 window.open(url);
             });
         }).error(function() {
-            kimchi.message.error.code('KCHAPI6002E');
+            wok.message.error.code('KCHAPI6002E');
         });
     },
 
     spiceToVM : function(vm) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'config',
             type : 'GET',
             dataType : 'json'
         }).done(function(data, textStatus, xhr) {
             proxy_port = data['display_proxy_port'];
-            kimchi.requestJSON({
+            wok.requestJSON({
                 url : "vms/" + encodeURIComponent(vm) + "/connect",
                 type : "POST",
                 dataType : "json"
@@ -416,22 +416,22 @@ var kimchi = {
                  * contain = which is not safe in a URL query component.
                  * So remove it when needed as base64 can work well without it.
                  * */
-                url += "&token=" + kimchi.urlSafeB64Encode(vm).replace(/=*$/g, "");
-                url += "&kimchi=" + location.port;
+                url += "&token=" + wok.urlSafeB64Encode(vm).replace(/=*$/g, "");
+                url += "&wok=" + location.port;
                 url += '&encrypt=1';
                 window.open(url);
             });
         }).error(function() {
-            kimchi.message.error.code('KCHAPI6002E');
+            wok.message.error.code('KCHAPI6002E');
         });
     },
 
     listVMs : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms',
             type : 'GET',
             contentType : 'application/json',
-            headers: {'Kimchi-Robot': 'kimchi-robot'},
+            headers: {'Wok-Robot': 'wok-robot'},
             dataType : 'json',
             resend: true,
             success : suc,
@@ -440,7 +440,7 @@ var kimchi = {
     },
 
     listTemplates : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'templates',
             type : 'GET',
             contentType : 'application/json',
@@ -452,7 +452,7 @@ var kimchi = {
     },
 
     listStoragePools : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'storagepools',
             type : 'GET',
             contentType : 'application/json',
@@ -475,7 +475,7 @@ var kimchi = {
     },
 
     listIsos : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'storagepools/kimchi_isos/storagevolumes',
             type : 'GET',
             contentType : 'application/json',
@@ -486,7 +486,7 @@ var kimchi = {
     },
 
     listDistros : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'config/distros',
             type : 'GET',
             contentType : 'application/json',
@@ -548,7 +548,7 @@ var kimchi = {
     },
 
     getTask : function(taskId, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'tasks/' + encodeURIComponent(taskId),
             type : 'GET',
             contentType : 'application/json',
@@ -559,7 +559,7 @@ var kimchi = {
     },
 
     getTasksByFilter : function(filter, suc, err, sync) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'tasks?' + filter,
             type : 'GET',
             contentType : 'application/json',
@@ -626,7 +626,7 @@ var kimchi = {
      },
 
     listNetworks : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'networks',
             type : 'GET',
             contentType : 'application/json',
@@ -634,27 +634,27 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     toggleNetwork : function(name, on, suc, err) {
         var action = on ? "activate" : "deactivate";
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'networks/' + encodeURIComponent(name) + '/' + action,
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     createNetwork : function(network, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'networks',
             type : 'POST',
             contentType : 'application/json',
@@ -662,13 +662,13 @@ var kimchi = {
             data : JSON.stringify(network),
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getInterfaces : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'interfaces',
             type : 'GET',
             contentType : 'application/json',
@@ -676,26 +676,26 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     deleteNetwork : function(name, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'networks/' + encodeURIComponent(name),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     listReports : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'debugreports',
             type : 'GET',
             contentType : 'application/json',
@@ -738,7 +738,7 @@ var kimchi = {
             kimchi.trackTask(taskID, suc, err, progress);
         };
 
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'debugreports',
             type : "POST",
             contentType : "application/json",
@@ -763,7 +763,7 @@ var kimchi = {
 
     deleteReport: function(settings, suc, err) {
         var reportName = encodeURIComponent(settings['name']);
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'debugreports/' + reportName,
             type : 'DELETE',
             contentType : 'application/json',
@@ -780,7 +780,7 @@ var kimchi = {
     shutdown: function(settings, suc, err) {
         var reboot = settings && settings['reboot'] === true;
         var url = 'host/' + (reboot ? 'reboot' : 'shutdown');
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'POST',
             contentType : 'application/json',
@@ -791,7 +791,7 @@ var kimchi = {
     },
 
     listHostPartitions : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/partitions',
             type : 'GET',
             contentType : 'application/json',
@@ -803,21 +803,21 @@ var kimchi = {
 
     getStorageServers: function(type, suc, err) {
         var url = 'storageservers?_target_type=' + type;
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getStorageTargets: function(server,type, suc, err) {
         var url = 'storageservers/' + server + '/storagetargets?_target_type=' + type;
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'GET',
             contentType : 'application/json',
@@ -830,7 +830,7 @@ var kimchi = {
 
     getStoragePool: function(poolName, suc, err) {
         var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName);
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'GET',
             contentType : 'application/json',
@@ -843,7 +843,7 @@ var kimchi = {
 
     getStoragePoolVolume: function(poolName, volumeName, suc, err) {
         var url = 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName);
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'GET',
             contentType : 'application/json',
@@ -857,7 +857,7 @@ var kimchi = {
     addVMStorage : function(settings, suc, err) {
         var vm = encodeURIComponent(settings['vm']);
         delete settings['vm'];
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + vm + '/storages',
             type : 'POST',
             contentType : 'application/json',
@@ -871,7 +871,7 @@ var kimchi = {
     retrieveVMStorage : function(settings, suc, err) {
         var vm = encodeURIComponent(settings['vm']);
         var dev = encodeURIComponent(settings['dev']);
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : "vms/" + vm + '/storages/' + dev,
             type : 'GET',
             contentType : 'application/json',
@@ -884,7 +884,7 @@ var kimchi = {
     replaceVMStorage : function(settings, suc, err) {
         var vm = encodeURIComponent(settings['vm']);
         var dev = encodeURIComponent(settings['dev']);
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + vm + '/storages/' + dev,
             type : 'PUT',
             contentType : 'application/json',
@@ -900,7 +900,7 @@ var kimchi = {
     deleteVMStorage : function(settings, suc, err) {
         var vm = settings['vm'];
         var dev = settings['dev'];
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/' + encodeURIComponent(vm) +
                       '/storages/' + encodeURIComponent(dev),
             type : 'DELETE',
@@ -918,7 +918,7 @@ var kimchi = {
         if(type) {
             url += '?type=' + type;
         }
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'GET',
             contentType : 'application/json',
@@ -929,7 +929,7 @@ var kimchi = {
     },
 
     listSoftwareUpdates : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/packagesupdate',
             type : 'GET',
             contentType : 'application/json',
@@ -969,7 +969,7 @@ var kimchi = {
             }
         };
 
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/swupdate',
             type : "POST",
             contentType : "application/json",
@@ -980,7 +980,7 @@ var kimchi = {
     },
 
     createRepository : function(settings, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : "host/repositories",
             type : "POST",
             contentType : "application/json",
@@ -993,7 +993,7 @@ var kimchi = {
 
     retrieveRepository : function(repository, suc, err) {
         var reposID = encodeURIComponent(repository);
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : "host/repositories/" + reposID,
             type : 'GET',
             contentType : 'application/json',
@@ -1031,7 +1031,7 @@ var kimchi = {
 
     deleteRepository : function(repository, suc, err) {
         var reposID = encodeURIComponent(repository);
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/repositories/' + reposID,
             type : 'DELETE',
             contentType : 'application/json',
@@ -1042,7 +1042,7 @@ var kimchi = {
     },
 
     listRepositories : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/repositories',
             type : 'GET',
             contentType : 'application/json',
@@ -1055,34 +1055,34 @@ var kimchi = {
 
     getHostFCDevices: function(suc, err) {
         var url = 'host/devices?_cap=fc_host';
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getGuestInterfaces: function(name, suc, err) {
         var url = 'vms/'+encodeURIComponent(name)+'/ifaces';
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err || function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     createGuestInterface : function(name, interface, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(name)+'/ifaces',
             type : 'POST',
             contentType : 'application/json',
@@ -1090,20 +1090,20 @@ var kimchi = {
             data : JSON.stringify(interface),
             success : suc,
             error : err || function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     deleteGuestInterface : function(vm, mac, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(vm)+'/ifaces/'+encodeURIComponent(mac),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
@@ -1117,13 +1117,13 @@ var kimchi = {
             dataType : 'json',
             success: suc,
             error: err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getUserById : function(data, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'users?_user_id=' + data.user_id,
             type : 'GET',
             contentType : 'application/json',
@@ -1132,13 +1132,13 @@ var kimchi = {
             async : false,
             success : suc && suc(data),
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getUsers : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'users',
             type : 'GET',
             contentType : 'application/json',
@@ -1146,13 +1146,13 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getGroups : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'groups',
             type : 'GET',
             contentType : 'application/json',
@@ -1160,13 +1160,13 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getHostPCIDevices : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/devices?_passthrough=true&_cap=pci',
             type : 'GET',
             contentType : 'application/json',
@@ -1174,13 +1174,13 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getPCIDeviceCompanions : function(pcidev, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/devices?_passthrough_affected_by=' + pcidev,
             type : 'GET',
             contentType : 'application/json',
@@ -1188,7 +1188,7 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
@@ -1196,7 +1196,7 @@ var kimchi = {
     getISCSITargets : function(server, port, suc, err) {
         server = encodeURIComponent(server);
         port = port ? '&_server_port='+encodeURIComponent(port) : '';
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'storageservers/'+server+'/storagetargets?_target_type=iscsi'+port,
             type : 'GET',
             contentType : 'application/json',
@@ -1204,13 +1204,13 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getPeers : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'peers',
             type : 'GET',
             contentType : 'application/json',
@@ -1218,13 +1218,13 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getVMPCIDevices : function(id, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(id)+'/hostdevs',
             type : 'GET',
             contentType : 'application/json',
@@ -1232,13 +1232,13 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     addVMPCIDevice : function(vm, device, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+ encodeURIComponent(vm) +'/hostdevs',
             type : 'POST',
             contentType : 'application/json',
@@ -1246,20 +1246,20 @@ var kimchi = {
             data : JSON.stringify(device),
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     removeVMPCIDevice : function(vm, device, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+ encodeURIComponent(vm) +'/hostdevs/' + encodeURIComponent(device),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
@@ -1268,7 +1268,7 @@ var kimchi = {
      * Create a new volume with capacity
      */
     createVolumeWithCapacity: function(poolName, settings, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes',
             type : 'POST',
             contentType : "application/json",
@@ -1285,7 +1285,7 @@ var kimchi = {
     uploadVolumeToSP: function(poolName, volumeName, settings, suc, err) {
         var url = 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName);
         var fd = settings['formData'];
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : url,
             type : 'PUT',
             data : fd,
@@ -1303,7 +1303,7 @@ var kimchi = {
     downloadVolumeToSP: function(settings, suc, err) {
         var sp = encodeURIComponent(settings['sp']);
         delete settings['sp'];
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'storagepools/' + sp + '/storagevolumes',
             type : 'POST',
             data : JSON.stringify(settings),
@@ -1315,20 +1315,20 @@ var kimchi = {
     },
 
     cloneGuest: function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(vm)+"/clone",
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     listSnapshots : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(vm)+'/snapshots',
             type : 'GET',
             contentType : 'application/json',
@@ -1336,13 +1336,13 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getCurrentSnapshot : function(vm, suc, err, sync) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(vm)+'/snapshots/current',
             type : 'GET',
             contentType : 'application/json',
@@ -1351,52 +1351,52 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     revertSnapshot : function(vm, snapshot, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot)+'/revert',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     createSnapshot : function(vm, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(vm)+'/snapshots',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     deleteSnapshot : function(vm, snapshot, suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     },
 
     getCPUInfo : function(suc, err) {
-        kimchi.requestJSON({
+        wok.requestJSON({
             url : 'host/cpuinfo',
             type : 'GET',
             contentType : 'application/json',
@@ -1404,7 +1404,7 @@ var kimchi = {
             resend : true,
             success : suc,
             error : err ? err : function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
             }
         });
     }
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
index df76975..1008d85 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
@@ -17,7 +17,7 @@
  */
 kimchi.guest_add_main = function() {
     var showTemplates = function() {
-        kimchi.topic('templateCreated').unsubscribe(showTemplates);
+        wok.topic('templateCreated').unsubscribe(showTemplates);
         kimchi.listTemplates(function(result) {
             if (result && result.length) {
                 $('#prompt-create-template').addClass('hidden');
@@ -25,16 +25,16 @@ kimchi.guest_add_main = function() {
                 var html = '';
                 var tmpl = $('#tmpl-template').html();
                 $.each(result, function(index, value) {
-                    html += kimchi.substitute(tmpl, value);
+                    html += wok.substitute(tmpl, value);
                 });
                 $('#templateTile').html(html);
                 return;
             }
 
             $('#btn-create-template').on('click', function(event) {
-                kimchi.topic('templateCreated').subscribe(showTemplates);
+                wok.topic('templateCreated').subscribe(showTemplates);
 
-                kimchi.window.open('template-add.html');
+                wok.window.open('template-add.html');
 
                 event.preventDefault();
             });
@@ -42,7 +42,7 @@ kimchi.guest_add_main = function() {
             $('#prompt-choose-template').addClass('hidden');
             $('#prompt-create-template').removeClass('hidden');
         }, function(err) {
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
         });
     };
 
@@ -66,14 +66,14 @@ kimchi.guest_add_main = function() {
         var formData = $('#form-vm-add').serializeObject();
         kimchi.createVM(formData, function() {
             kimchi.listVmsAuto();
-            kimchi.window.close();
+            wok.window.close();
         }, function(jqXHR, textStatus, errorThrown) {
             $('#vm-doAdd').attr('style', 'display');
             $('#vm-doAdding').attr('style', 'display:none');
             var reason = jqXHR &&
                 jqXHR['responseJSON'] &&
                 jqXHR['responseJSON']['reason'];
-            kimchi.message.error(reason);
+            wok.message.error(reason);
         });
 
         return false;
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
index 7671e43..28c2163 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
@@ -46,7 +46,7 @@ kimchi.guest_edit_main = function() {
             $.each(storages, function(index, storage) {
                 storage['vm'] = kimchi.selectedGuest;
                 rowHTML = $('#' + storage['type'] + '-row-tmpl').html();
-                var templated = kimchi.substitute(rowHTML, storage);
+                var templated = wok.substitute(rowHTML, storage);
                 container.append(templated);
             });
 
@@ -120,12 +120,12 @@ kimchi.guest_edit_main = function() {
                 settings['content'] = i18n['KCHVMCD6009M'];
 
             var dev = $(this).data('dev');
-            kimchi.confirm(settings, function() {
+            wok.confirm(settings, function() {
                 kimchi.deleteVMStorage({
                     vm: kimchi.selectedGuest,
                     dev: dev
                 }, function() {
-                    kimchi.topic('kimchi/vmCDROMDetached').publish();
+                    wok.topic('kimchi/vmCDROMDetached').publish();
                 });
             });
         });
@@ -140,13 +140,13 @@ kimchi.guest_edit_main = function() {
             };
 
             kimchi.replaceVMStorage(settings, function(result) {
-                kimchi.topic('kimchi/vmCDROMReplaced').publish({
+                wok.topic('kimchi/vmCDROMReplaced').publish({
                     result: result
                 });
             }, function(result) {
                 var errText = result['reason'] ||
                     result['responseJSON']['reason'];
-                kimchi.message.error(errText);
+                wok.message.error(errText);
             });
         });
 
@@ -183,7 +183,7 @@ kimchi.guest_edit_main = function() {
             if (data.id == -1) {
                 data.id = $('#form-guest-edit-interface > .body').children().size()
             }
-            var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data));
+            var itemNode = $.parseHTML(wok.substitute($('#interface-tmpl').html(),data));
             $(".body", "#form-guest-edit-interface").append(itemNode);
             $("select", itemNode).append(networkOptions);
             if(data.network!==""){
@@ -283,7 +283,7 @@ kimchi.guest_edit_main = function() {
             });
         });
         var addItem = function(data) {
-            var itemNode = $.parseHTML(kimchi.substitute($('#ldap-user-tmpl').html(),data));
+            var itemNode = $.parseHTML(wok.substitute($('#ldap-user-tmpl').html(),data));
             $(".body", "#form-guest-edit-permission .ldap").append(itemNode);
             $(".delete", itemNode).button({
                 icons: { primary: "ui-icon-trash" },
@@ -314,7 +314,7 @@ kimchi.guest_edit_main = function() {
         };
         //set up for PAM
         var userNodes = {}, groupNodes = {};
-        authType = kimchi.capabilities['auth']
+        authType = wok.capabilities['auth']
         if (authType == 'pam') {
             $("#form-guest-edit-permission .ldap").hide();
             kimchi.retrieveVM(kimchi.selectedGuest, function(vm){
@@ -367,7 +367,7 @@ kimchi.guest_edit_main = function() {
         var init = function(availUsers, availGroups, selUsers, selGroups){
             var initNode = function(key, isUserNode){
                 var nodeGroups = isUserNode ? userNodes : groupNodes;
-                nodeGroups[key] = $.parseHTML(kimchi.substitute($('#permission-item-pam').html(), {
+                nodeGroups[key] = $.parseHTML(wok.substitute($('#permission-item-pam').html(), {
                     val: key,
                     class: isUserNode? "user-icon" : "group-icon"
                 }));
@@ -432,9 +432,9 @@ kimchi.guest_edit_main = function() {
     var setupPCIDevice = function(){
         kimchi.getHostPCIDevices(function(hostPCIs){
             kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){
-                var pciEnabled = kimchi.capabilities.kernel_vfio;
+                var pciEnabled = wok.capabilities.kernel_vfio;
                 for(var i=0; i<hostPCIs.length; i++){
-                    var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{
+                    var itemNode = $.parseHTML(wok.substitute($('#pci-tmpl').html(),{
                         name: hostPCIs[i].name,
                         product: hostPCIs[i].product.description,
                         vendor: hostPCIs[i].vendor.description
@@ -545,7 +545,7 @@ kimchi.guest_edit_main = function() {
             }
         };
         var addItem = function(data, container) {
-            var itemNode = $.parseHTML(kimchi.substitute($('#snapshot-tmpl').html(),data));
+            var itemNode = $.parseHTML(wok.substitute($('#snapshot-tmpl').html(),data));
             $("."+container, "#form-guest-edit-snapshot").append(itemNode);
             $(".delete", itemNode).button({
                 icons: { primary: "ui-icon-trash" },
@@ -559,7 +559,7 @@ kimchi.guest_edit_main = function() {
                     setCurrentSnapshot();
                     $("button", "#form-guest-edit-snapshot").button("enable");
                 }, function(data){
-                    kimchi.message.error(data.responseJSON.reason);
+                    wok.message.error(data.responseJSON.reason);
                     $("button", "#form-guest-edit-snapshot").button("enable");
                 });
             });
@@ -577,9 +577,9 @@ kimchi.guest_edit_main = function() {
                     $("button", "#form-guest-edit-snapshot").button("enable");
                     setCurrentSnapshot(item.prop("id"));
                     kimchi.listVmsAuto();
-                    kimchi.window.close();
+                    wok.window.close();
                 }, function(data){
-                    kimchi.message.error(data.responseJSON.reason);
+                    wok.message.error(data.responseJSON.reason);
                     $(".icon", item).addClass("hide");
                     $("button", "#form-guest-edit-snapshot").button("enable");
                 });
@@ -598,7 +598,7 @@ kimchi.guest_edit_main = function() {
                     listGeneratingSnapshots();
                     $("button", "#form-guest-edit-snapshot").button("enable");
                 }, function(err){
-                    kimchi.message.error(err.message);
+                    wok.message.error(err.message);
                     listGeneratingSnapshots();
                     $("button", "#form-guest-edit-snapshot").button("enable");
                 });
@@ -650,7 +650,7 @@ kimchi.guest_edit_main = function() {
                 text: false
             }).click(function(event) {
                 event.preventDefault();
-                kimchi.window.open("guest-storage-add.html");
+                wok.window.open("guest-storage-add.html");
             });
         if(kimchi.thisVMState === "running") {
             $("#form-guest-edit-general input").prop("disabled", true);
@@ -674,14 +674,14 @@ kimchi.guest_edit_main = function() {
         setupPCIDevice();
         setupSnapshot();
 
-        kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached);
-        kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced);
-        kimchi.topic('kimchi/vmCDROMDetached').subscribe(onDetached);
+        wok.topic('kimchi/vmCDROMAttached').subscribe(onAttached);
+        wok.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced);
+        wok.topic('kimchi/vmCDROMDetached').subscribe(onDetached);
 
         kimchi.clearGuestEdit = function() {
-            kimchi.topic('kimchi/vmCDROMAttached').unsubscribe(onAttached);
-            kimchi.topic('kimchi/vmCDROMReplaced').unsubscribe(onReplaced);
-            kimchi.topic('kimchi/vmCDROMDetached').unsubscribe(onDetached);
+            wok.topic('kimchi/vmCDROMAttached').unsubscribe(onAttached);
+            wok.topic('kimchi/vmCDROMReplaced').unsubscribe(onReplaced);
+            wok.topic('kimchi/vmCDROMDetached').unsubscribe(onDetached);
         };
     };
 
@@ -699,16 +699,16 @@ kimchi.guest_edit_main = function() {
 
         kimchi.updateVM(kimchi.selectedGuest, data, function() {
             kimchi.listVmsAuto();
-            kimchi.window.close();
+            wok.window.close();
         }, function(err) {
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
             $(saveButton).prop('disabled', false);
         });
     }
 
     var permissionSubmit = function(event) {
         var content = { users: [], groups: [] };
-        authType = kimchi.capabilities['auth']
+        authType = wok.capabilities['auth']
         if (authType == 'pam') {
             $("#permission-sel-users").children().each(function(){
                 content.users.push($("label", this).text());
@@ -717,7 +717,7 @@ kimchi.guest_edit_main = function() {
                 content.groups.push($("label", this).text());
             });
             kimchi.updateVM(kimchi.selectedGuest, content, function(){
-                kimchi.window.close();
+                wok.window.close();
             });
         } else if (authType == 'ldap') {
             $(saveButton).prop('disabled', true);
@@ -737,7 +737,7 @@ kimchi.guest_edit_main = function() {
             });
             if (errors == 0) {
                 kimchi.updateVM(kimchi.selectedGuest, content, function(){
-                   kimchi.window.close();
+                   wok.window.close();
                 });
             } else {
                 $(saveButton).prop('disabled', false);
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_main.js
index 7e25b68..a0f927b 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_main.js
@@ -55,7 +55,7 @@ kimchi.vmstart = function(event) {
             kimchi.listVmsAuto();
             }, function(err) {
                 button.removeClass('loading');
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             }
         );
     } else {
@@ -76,7 +76,7 @@ kimchi.vmsuspend = function(event) {
             kimchi.listVmsAuto();
             }, function(err) {
                 button.removeClass('pause-gray');
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             }
         );
     } else {
@@ -97,7 +97,7 @@ kimchi.vmresume = function(event) {
             kimchi.listVmsAuto();
             }, function(err) {
                 button.removeClass('resume-gray');
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             }
         );
     } else {
@@ -123,12 +123,12 @@ kimchi.vmpoweroff = function(event) {
             confirm : i18n['KCHAPI6002M'],
             cancel : i18n['KCHAPI6003M']
         };
-        kimchi.confirm(settings, function() {
+        wok.confirm(settings, function() {
             kimchi.poweroffVM(vm_id, function(result) {
                 button.removeClass('loading');
                 kimchi.listVmsAuto();
             }, function(err) {
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             });
         }, function() {
         });
@@ -147,11 +147,11 @@ kimchi.vmshutdown = function(event){
         confirm : i18n['KCHAPI6002M'],
         cancel : i18n['KCHAPI6003M']
     };
-    kimchi.confirm(settings, function() {
+    wok.confirm(settings, function() {
         kimchi.shutdownVM(vm_id, function(result) {
                 kimchi.listVmsAuto();
             }, function(err) {
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             }
         );
     }, function() {
@@ -167,11 +167,11 @@ kimchi.vmreset = function(event){
         confirm : i18n['KCHAPI6002M'],
         cancel : i18n['KCHAPI6003M']
     };
-    kimchi.confirm(settings, function() {
+    wok.confirm(settings, function() {
         kimchi.resetVM(vm_id, function(result) {
                 kimchi.listVmsAuto();
             }, function(err) {
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             }
         );
     }, function() {
@@ -187,11 +187,11 @@ kimchi.vmdelete = function(event) {
         confirm : i18n['KCHAPI6002M'],
         cancel : i18n['KCHAPI6003M']
     };
-    kimchi.confirm(settings, function() {
+    wok.confirm(settings, function() {
         kimchi.deleteVM(vm_id, function(result) {
             kimchi.listVmsAuto();
         }, function(err) {
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
         });
     }, function() {
     });
@@ -201,7 +201,7 @@ kimchi.vmedit = function(event) {
     var vm = $(this).closest('li[name=guest]');
     var vm_id=vm.attr("id");
     kimchi.selectedGuest = vm_id;
-    kimchi.window.open({
+    wok.window.open({
         url: 'guest-edit.html',
         close: function() {
             kimchi.clearGuestEdit();
@@ -252,7 +252,7 @@ kimchi.listVmsAuto = function() {
                 guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCreating: true}));
                 if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1)
                     kimchi.trackTask(tasks[i].id, null, function(err){
-                        kimchi.message.error(err.message);
+                        wok.message.error(err.message);
                     }, null);
             }
         }, null, true);
@@ -267,7 +267,7 @@ kimchi.listVmsAuto = function() {
                 guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true}));
                 if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1)
                     kimchi.trackTask(tasks[i].id, null, function(err){
-                        kimchi.message.error(err.message);
+                        wok.message.error(err.message);
                     }, null);
             }
         }, null, true);
@@ -299,7 +299,7 @@ kimchi.listVmsAuto = function() {
         kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000);
     }, function(errorResponse, textStatus, errorThrown) {
         if(errorResponse.responseJSON && errorResponse.responseJSON.reason) {
-            kimchi.message.error(errorResponse.responseJSON.reason);
+            wok.message.error(errorResponse.responseJSON.reason);
         }
         kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000);
     });
@@ -439,7 +439,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) {
         guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete});
         guestActions.find("[name=vm-clone]").click(function(){
             var guest = $(this).closest('li[name=guest]').attr("id");
-            kimchi.confirm({
+            wok.confirm({
                 title : i18n['KCHAPI6006M'],
                 content : i18n['KCHVM6010M'],
                 confirm : i18n['KCHAPI6002M'],
@@ -489,10 +489,10 @@ kimchi.guestSetRequestHeader = function(xhr) {
 };
 
 kimchi.guest_main = function() {
-    if(kimchi.tabMode['guests'] === 'admin') {
+    if(wok.tabMode['guests'] === 'admin') {
         $('.tools').attr('style','display');
         $("#vm-add").on("click", function(event) {
-            kimchi.window.open('guest-add.html');
+            wok.window.open('guest-add.html');
         });
     }
     kimchi.guestTemplate = $('#guest-tmpl').html();
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
index 82bceb4..2e4e7e8 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
@@ -28,14 +28,14 @@ kimchi.guest_media_main = function() {
 
             $.each(storages, function(index, storage) {
                 storage['vm'] = kimchi.selectedGuest;
-                var templated = kimchi.substitute(rowHTML, storage);
+                var templated = wok.substitute(rowHTML, storage);
                 container.append(templated);
             });
 
             var replaceCDROM = function(event) {
                 event.preventDefault();
                 kimchi.selectedGuestStorage = $(this).data('dev');
-                kimchi.window.open("guest-cdrom-edit.html");
+                wok.window.open("guest-cdrom-edit.html");
             };
 
             $('input[type="text"][name="cdrom"]', container).on('click', replaceCDROM);
@@ -48,9 +48,9 @@ kimchi.guest_media_main = function() {
     var onReplaced = function(params) {
         refreshCDROMs();
     };
-    kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced);
+    wok.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced);
 
     kimchi.clearGuestMedia = function() {
-        kimchi.topic('kimchi/vmCDROMReplaced').unsubscribe(onReplaced);
+        wok.topic('kimchi/vmCDROMReplaced').unsubscribe(onReplaced);
     };
 };
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js b/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
index 3581c34..bc162e8 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
@@ -69,7 +69,7 @@ kimchi.guest_storage_add_main = function() {
                         });
                     }
                 });
-                kimchi.select('guest-add-storage-pool-list', options);
+                wok.select('guest-add-storage-pool-list', options);
         }
     });
 
@@ -117,13 +117,13 @@ kimchi.guest_storage_add_main = function() {
         poolTextbox.change();
     }
     var selectType = $(typeTextbox).val();
-    kimchi.select('guest-storage-type-list', types);
+    wok.select('guest-storage-type-list', types);
 
     var validateCDROM = function(settings) {
         if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path']))
             return true;
         else {
-            kimchi.message.error.code('KCHVMSTOR0001E');
+            wok.message.error.code('KCHVMSTOR0001E');
             return false;
         }
     }
@@ -132,7 +132,7 @@ kimchi.guest_storage_add_main = function() {
         if (settings['pool'] && settings['vol'])
             return true;
         else {
-            kimchi.message.error.code('KCHVMSTOR0002E');
+            wok.message.error.code('KCHVMSTOR0002E');
             return false;
         }
     }
@@ -169,14 +169,14 @@ kimchi.guest_storage_add_main = function() {
         $(submitButton).addClass('loading').text(i18n['KCHVMCD6003M']);
 
         kimchi.addVMStorage(settings, function(result) {
-            kimchi.window.close();
-            kimchi.topic('kimchi/vmCDROMAttached').publish({
+            wok.window.close();
+            wok.topic('kimchi/vmCDROMAttached').publish({
                 result: result
             });
         }, function(result) {
             var errText = result['reason'] ||
                 result['responseJSON']['reason'];
-            kimchi.message.error(errText);
+            wok.message.error(errText);
 
             $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) {
                 $(c).prop('disabled', false);
diff --git a/plugins/kimchi/ui/js/src/kimchi.host.js b/plugins/kimchi/ui/js/src/kimchi.host.js
index b75b9e4..5b15ad0 100644
--- a/plugins/kimchi/ui/js/src/kimchi.host.js
+++ b/plugins/kimchi/ui/js/src/kimchi.host.js
@@ -78,7 +78,7 @@ kimchi.host_main = function() {
                     'class': 'repository-baseurl'
                 }];
         }
-        repositoriesGrid = new kimchi.widget.Grid({
+        repositoriesGrid = new wok.widget.Grid({
             container: 'repositories-grid-container',
             id: 'repositories-grid',
             title: i18n['KCHREPO6003M'],
@@ -86,7 +86,7 @@ kimchi.host_main = function() {
                 id: 'repositories-grid-add-button',
                 label: i18n['KCHREPO6012M'],
                 onClick: function(event) {
-                    kimchi.window.open({url:'repository-add.html', class: repo_type});
+                    wok.window.open({url:'repository-add.html', class: repo_type});
                 }
             }, {
                 id: 'repositories-grid-enable-button',
@@ -101,7 +101,7 @@ kimchi.host_main = function() {
                     var enable = !repository['enabled'];
                     $(this).prop('disabled', true);
                     kimchi.enableRepository(name, enable, function() {
-                        kimchi.topic('kimchi/repositoryUpdated').publish();
+                        wok.topic('kimchi/repositoryUpdated').publish();
                     });
                 }
             }, {
@@ -114,7 +114,7 @@ kimchi.host_main = function() {
                         return;
                     }
                     kimchi.selectedRepository = repository['repo_id'];
-                    kimchi.window.open({url:'repository-edit.html', class: repo_type});
+                    wok.window.open({url:'repository-edit.html', class: repo_type});
                 }
             }, {
                 id: 'repositories-grid-remove-button',
@@ -133,11 +133,11 @@ kimchi.host_main = function() {
                         cancel : i18n['KCHAPI6003M']
                     };
 
-                    kimchi.confirm(settings, function() {
+                    wok.confirm(settings, function() {
                         kimchi.deleteRepository(
                             repository['repo_id'],
                             function(result) {
-                                kimchi.topic('kimchi/repositoryDeleted').publish(result);
+                                wok.topic('kimchi/repositoryDeleted').publish(result);
                             }, function(error) {
                             }
                         );
@@ -203,7 +203,7 @@ kimchi.host_main = function() {
     };
 
     var initSoftwareUpdatesGrid = function(softwareUpdates) {
-        softwareUpdatesGrid = new kimchi.widget.Grid({
+        softwareUpdatesGrid = new wok.widget.Grid({
             container: 'software-updates-grid-container',
             id: softwareUpdatesGridID,
             title: i18n['KCHUPD6001M'],
@@ -217,19 +217,19 @@ kimchi.host_main = function() {
                     var progressArea = $('#' + progressAreaID)[0];
                     $('#software-updates-progress-container').removeClass('hidden');
                     $(progressArea).text('');
-                    !kimchi.isElementInViewport(progressArea) &&
+                    !wok.isElementInViewport(progressArea) &&
                         progressArea.scrollIntoView();
                     $(updateButton).text(i18n['KCHUPD6007M']).prop('disabled', true);
 
                     kimchi.updateSoftware(function(result) {
                         reloadProgressArea(result);
                         $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false);
-                        kimchi.topic('kimchi/softwareUpdated').publish({
+                        wok.topic('kimchi/softwareUpdated').publish({
                             result: result
                         });
                     }, function(error) {
                         var message = error && error['responseJSON'] && error['responseJSON']['reason'];
-                        kimchi.message.error(message || i18n['KCHUPD6009M']);
+                        wok.message.error(message || i18n['KCHUPD6009M']);
                         $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false);
                     }, reloadProgressArea);
                 }
@@ -287,14 +287,14 @@ kimchi.host_main = function() {
     var enableReportButtons = function(toEnable) {
         var buttonID = '#{grid}-{btn}-button';
         $.each(['rename', 'remove', 'download'], function(i, n) {
-            $(kimchi.substitute(buttonID, {
+            $(wok.substitute(buttonID, {
                 grid: reportGridID,
                 btn: n
             })).prop('disabled', !toEnable);
         });
     };
     var initReportGrid = function(reports) {
-        reportGrid = new kimchi.widget.Grid({
+        reportGrid = new wok.widget.Grid({
             container: 'available-reports-grid-container',
             id: reportGridID,
             title: i18n['KCHDR6002M'],
@@ -302,7 +302,7 @@ kimchi.host_main = function() {
                 id: reportGridID + '-generate-button',
                 label: i18n['KCHDR6006M'],
                 onClick: function(event) {
-                    kimchi.window.open('report-add.html');
+                    wok.window.open('report-add.html');
                 }
             }, {
                 id: reportGridID + '-rename-button',
@@ -315,7 +315,7 @@ kimchi.host_main = function() {
                     }
 
                     kimchi.selectedReport = report['name'];
-                    kimchi.window.open('report-rename.html');
+                    wok.window.open('report-rename.html');
                 }
             }, {
                 id: reportGridID + '-remove-button',
@@ -334,13 +334,13 @@ kimchi.host_main = function() {
                         cancel : i18n['KCHAPI6003M']
                     };
 
-                    kimchi.confirm(settings, function() {
+                    wok.confirm(settings, function() {
                         kimchi.deleteReport({
                             name: report['name']
                         }, function(result) {
                             listDebugReports();
                         }, function(error) {
-                           kimchi.message.error(error.responseJSON.reason);
+                           wok.message.error(error.responseJSON.reason);
                         });
                     });
                 }
@@ -401,7 +401,7 @@ kimchi.host_main = function() {
                 }
 
                 kimchi.trackTask(tasks[i].id, function(result) {
-                    kimchi.topic('kimchi/debugReportAdded').publish();
+                    wok.topic('kimchi/debugReportAdded').publish();
                 }, function(result) {
                     // Error message from Async Task status
                     if (result['message']) {
@@ -411,8 +411,8 @@ kimchi.host_main = function() {
                     else {
                         var errText = result['responseJSON']['reason'];
                     }
-                    result && kimchi.message.error(errText);
-                    kimchi.topic('kimchi/debugReportAdded').publish();
+                    result && wok.message.error(errText);
+                    wok.topic('kimchi/debugReportAdded').publish();
                 }, null);
             }
         }, null, true);
@@ -462,7 +462,7 @@ kimchi.host_main = function() {
             cancel : i18n['KCHAPI6003M']
         };
 
-        kimchi.confirm(settings, function() {
+        wok.confirm(settings, function() {
             kimchi.shutdown(params);
             $(shutdownButtonID).prop('disabled', true);
             $(restartButtonID).prop('disabled', true);
@@ -470,7 +470,7 @@ kimchi.host_main = function() {
             kimchi.listVMs(function(vms) {
                 for(var i = 0; i < vms.length; i++) {
                     if(vms[i]['state'] === 'running') {
-                        kimchi.message.error.code('KCHHOST6001E');
+                        wok.message.error.code('KCHHOST6001E');
                         $(shutdownButtonID).prop('disabled', false);
                         $(restartButtonID).prop('disabled', false);
                         return;
@@ -505,37 +505,37 @@ kimchi.host_main = function() {
         });
 
         var setupUI = function() {
-            if (kimchi.capabilities == undefined) {
+            if (wok.capabilities == undefined) {
                 setTimeout(setupUI, 2000);
                 return;
             }
 
-            if((kimchi.capabilities['repo_mngt_tool']) && (kimchi.capabilities['repo_mngt_tool']!="None")) {
-                initRepositoriesGrid(kimchi.capabilities['repo_mngt_tool']);
-                $('#repositories-section').switchClass('hidden', kimchi.capabilities['repo_mngt_tool']);
-                kimchi.topic('kimchi/repositoryAdded')
+            if((wok.capabilities['repo_mngt_tool']) && (wok.capabilities['repo_mngt_tool']!="None")) {
+                initRepositoriesGrid(wok.capabilities['repo_mngt_tool']);
+                $('#repositories-section').switchClass('hidden', wok.capabilities['repo_mngt_tool']);
+                wok.topic('kimchi/repositoryAdded')
                     .subscribe(listRepositories);
-                kimchi.topic('kimchi/repositoryUpdated')
+                wok.topic('kimchi/repositoryUpdated')
                     .subscribe(listRepositories);
-                kimchi.topic('kimchi/repositoryDeleted')
+                wok.topic('kimchi/repositoryDeleted')
                     .subscribe(listRepositories);
             }
 
-            if(kimchi.capabilities['update_tool']) {
+            if(wok.capabilities['update_tool']) {
                 $('#software-update-section').removeClass('hidden');
                 initSoftwareUpdatesGrid();
-                kimchi.topic('kimchi/softwareUpdated')
+                wok.topic('kimchi/softwareUpdated')
                     .subscribe(listSoftwareUpdates);
                 $('#software-updates-progress-container').accordion({
                     collapsible: true
                 });
             }
 
-            if(kimchi.capabilities['system_report_tool']) {
+            if(wok.capabilities['system_report_tool']) {
                 listDebugReports();
-                kimchi.topic('kimchi/debugReportAdded')
+                wok.topic('kimchi/debugReportAdded')
                     .subscribe(listDebugReports);
-                kimchi.topic('kimchi/debugReportRenamed')
+                wok.topic('kimchi/debugReportRenamed')
                     .subscribe(listDebugReports);
             }
         };
@@ -545,10 +545,10 @@ kimchi.host_main = function() {
     kimchi.getHost(function(data) {
         var htmlTmpl = $('#host-tmpl').html();
         data['logo'] = data['logo'] || '';
-        data['memory'] = kimchi.formatMeasurement(data['memory'], {
+        data['memory'] = wok.formatMeasurement(data['memory'], {
             fixed: 2
         });
-        var templated = kimchi.substitute(htmlTmpl, data);
+        var templated = wok.substitute(htmlTmpl, data);
         $('#host-content-container').html(templated);
 
         initPage();
@@ -801,22 +801,22 @@ kimchi.host_main = function() {
         }
 
         var trackedCharts = {
-            cpu: new kimchi.widget.LineChart({
+            cpu: new wok.widget.LineChart({
                 id: 'chart-cpu',
                 node: 'container-chart-cpu',
                 type: 'percent'
             }),
-            memory: new kimchi.widget.LineChart({
+            memory: new wok.widget.LineChart({
                 id: 'chart-memory',
                 node: 'container-chart-memory',
                 type: 'value'
             }),
-            diskIO: new kimchi.widget.LineChart({
+            diskIO: new wok.widget.LineChart({
                 id: 'chart-disk-io',
                 node: 'container-chart-disk-io',
                 type: 'value'
             }),
-            networkIO: new kimchi.widget.LineChart({
+            networkIO: new wok.widget.LineChart({
                 id: 'chart-network-io',
                 node: 'container-chart-network-io',
                 type: 'value'
@@ -839,18 +839,18 @@ kimchi.host_main = function() {
             }
 
         repositoriesGrid && repositoriesGrid.destroy();
-        kimchi.topic('kimchi/repositoryAdded')
+        wok.topic('kimchi/repositoryAdded')
             .unsubscribe(listRepositories);
-        kimchi.topic('kimchi/repositoryUpdated')
+        wok.topic('kimchi/repositoryUpdated')
             .unsubscribe(listRepositories);
-        kimchi.topic('kimchi/repositoryDeleted')
+        wok.topic('kimchi/repositoryDeleted')
             .unsubscribe(listRepositories);
 
         softwareUpdatesGrid && softwareUpdatesGrid.destroy();
-        kimchi.topic('kimchi/softwareUpdated').unsubscribe(listSoftwareUpdates);
+        wok.topic('kimchi/softwareUpdated').unsubscribe(listSoftwareUpdates);
 
         reportGrid && reportGrid.destroy();
-        kimchi.topic('kimchi/debugReportAdded').unsubscribe(listDebugReports);
-        kimchi.topic('kimchi/debugReportRenamed').unsubscribe(listDebugReports);
+        wok.topic('kimchi/debugReportAdded').unsubscribe(listDebugReports);
+        wok.topic('kimchi/debugReportRenamed').unsubscribe(listDebugReports);
     });
 };
diff --git a/plugins/kimchi/ui/js/src/kimchi.network.js b/plugins/kimchi/ui/js/src/kimchi.network.js
index 0421e19..c43b59a 100644
--- a/plugins/kimchi/ui/js/src/kimchi.network.js
+++ b/plugins/kimchi/ui/js/src/kimchi.network.js
@@ -19,7 +19,7 @@
 kimchi.NETWORK_TYPE_BRIDGE = "bridged";
 
 kimchi.initNetwork = function() {
-    if(kimchi.tabMode['network'] === 'admin') {
+    if(wok.tabMode['network'] === 'admin') {
         $('.tools').attr('style','display');
         $('#network-content .header span:last-child').attr('style','display');
         kimchi.initNetworkCreation();
@@ -57,7 +57,7 @@ kimchi.initNetworkListView = function() {
 kimchi.addNetworkItem = function(network) {
     var itemNode = $.parseHTML(kimchi.getNetworkItemHtml(network));
     $("#networkBody").append(itemNode);
-    if(kimchi.tabMode["network"] === "admin") {
+    if(wok.tabMode["network"] === "admin") {
         $(".column-action").attr("style","display");
     } else {
         $(".column-space").addClass('column-space-no-border-right');
@@ -78,7 +78,7 @@ kimchi.getNetworkItemHtml = function(network) {
     }
 
     var disable_in_use = network.in_use ? "ui-state-disabled" : "";
-    var networkItem = kimchi.substitute($('#networkItem').html(), {
+    var networkItem = wok.substitute($('#networkItem').html(), {
         name : network.name,
         state : network.state,
         type : network.type,
@@ -94,7 +94,7 @@ kimchi.getNetworkItemHtml = function(network) {
 };
 
 kimchi.stopNetwork = function(network,menu) {
-    $(".network-state", $("#" + kimchi.escapeStr(network.name))).switchClass("up", "nw-loading");
+    $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("up", "nw-loading");
     $("[nwAct='stop']", menu).addClass("ui-state-disabled");
     kimchi.toggleNetwork(network.name, false, function() {
         $("[nwAct='start']", menu).removeClass("hide-action-item");
@@ -104,23 +104,23 @@ kimchi.stopNetwork = function(network,menu) {
             $("[nwAct='delete']", menu).removeClass("ui-state-disabled");
             $(":first-child", $("[nwAct='delete']", menu)).removeAttr("disabled");
         }
-        $(".network-state", $("#" + kimchi.escapeStr(network.name))).switchClass("nw-loading", "down");
+        $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("nw-loading", "down");
     }, function(err) {
-        $(".network-state", $("#" + kimchi.escapeStr(network.name))).switchClass("nw-loading", "up");
+        $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("nw-loading", "up");
         if (!network.in_use) {
             $("[nwAct='stop']", menu).removeClass("ui-state-disabled");
         }
-        kimchi.message.error(err.responseJSON.reason);
+        wok.message.error(err.responseJSON.reason);
     });
 }
 
 kimchi.addNetworkActions = function(network) {
-    $(".menu-container", "#" + kimchi.escapeStr(network.name)).menu();
+    $(".menu-container", "#" + wok.escapeStr(network.name)).menu();
 
-    $('#' + kimchi.escapeStr(network.name)).on('click', '.menu-container li', function(evt) {
+    $('#' + wok.escapeStr(network.name)).on('click', '.menu-container li', function(evt) {
         var menu = $(evt.currentTarget).parent();
         if ($(evt.currentTarget).attr("nwAct") === "start") {
-            $(".network-state", $("#" + kimchi.escapeStr(network.name))).switchClass("down", "nw-loading");
+            $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("down", "nw-loading");
             $("[nwAct='start']", menu).addClass("ui-state-disabled");
             $("[nwAct='delete']", menu).addClass("ui-state-disabled");
             $(":first-child", $("[nwAct='delete']", menu)).attr("disabled", true);
@@ -132,15 +132,15 @@ kimchi.addNetworkActions = function(network) {
                 if (network.in_use) {
                     $("[nwAct='stop']", menu).addClass("ui-state-disabled");
                 }
-                $(".network-state", $("#" + kimchi.escapeStr(network.name))).switchClass("nw-loading", "up");
+                $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("nw-loading", "up");
             }, function(err) {
-                $(".network-state", $("#" + kimchi.escapeStr(network.name))).switchClass("nw-loading","down");
+                $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("nw-loading","down");
                 $("[nwAct='start']", menu).removeClass("ui-state-disabled");
                 if (!network.in_use) {
                     $("[nwAct='delete']", menu).removeClass("ui-state-disabled");
                 }
                 $(":first-child", $("[nwAct='delete']", menu)).removeAttr("disabled");
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             });
         } else if ($(evt.currentTarget).attr("nwAct") === "stop") {
             if (network.in_use) {
@@ -153,7 +153,7 @@ kimchi.addNetworkActions = function(network) {
                     confirm : i18n['KCHAPI6002M'],
                     cancel : i18n['KCHAPI6003M']
                 };
-                kimchi.confirm(settings, function() {
+                wok.confirm(settings, function() {
                     kimchi.stopNetwork(network, menu);
                     $('#networkGrid').grid('deleteRow', $(evt.currentTarget).parents(".row"));
                 }, null);
@@ -166,7 +166,7 @@ kimchi.addNetworkActions = function(network) {
             if (network.state === "up" || network.in_use) {
                 return false;
             }
-            kimchi.confirm({
+            wok.confirm({
                 title : i18n['KCHAPI6006M'],
                 content : i18n['KCHNET6002M'],
                 confirm : i18n['KCHAPI6002M'],
@@ -206,7 +206,7 @@ kimchi.initNetworkCreation = function() {
                 if ($("#enableVlan").prop("checked")) {
                     data.vlan_id = network.vlan_id;
                     if (!(data.vlan_id >=1 && data.vlan_id <= 4094)) {
-                        kimchi.message.error.code('KCHNET6001E');
+                        wok.message.error.code('KCHNET6001E');
                         errorCallback();
                         return;
                     }
@@ -220,7 +220,7 @@ kimchi.initNetworkCreation = function() {
                 $('#networkGrid').grid('addRow', kimchi.addNetworkItem(network));
                 $("#networkConfig").dialog("close");
             }, function(data) {
-                kimchi.message.error(data.responseJSON.reason);
+                wok.message.error(data.responseJSON.reason);
                 errorCallback();
             });
         });
@@ -375,7 +375,7 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail) {
         $("#networkBriDisabledLabel").show();
     } else {
         if (kimchi.capabilities && kimchi.capabilities.nm_running) {
-            kimchi.message.warn(i18n['KCHNET6001W']);
+            wok.message.warn(i18n['KCHNET6001W']);
         }
         $("#bridgeOptions").slideDown(100);
         $("#networkVlanID").toggle(false);
diff --git a/plugins/kimchi/ui/js/src/kimchi.report_add_main.js b/plugins/kimchi/ui/js/src/kimchi.report_add_main.js
index 9a7df2c..5f098d3 100644
--- a/plugins/kimchi/ui/js/src/kimchi.report_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.report_add_main.js
@@ -29,7 +29,7 @@ kimchi.report_add_main = function() {
         var reportName = nameTextbox.val();
         var validator = RegExp("^[_A-Za-z0-9-]*$");
         if (!validator.test(reportName)) {
-            kimchi.message.error.code('KCHDR6011M');
+            wok.message.error.code('KCHDR6011M');
             return false;
         }
         var formData = addReportForm.serializeObject();
@@ -39,13 +39,13 @@ kimchi.report_add_main = function() {
                 return;
             }
             taskAccepted = true;
-            kimchi.window.close();
-            kimchi.topic('kimchi/debugReportAdded').publish();
+            wok.window.close();
+            wok.topic('kimchi/debugReportAdded').publish();
         };
 
         kimchi.createReport(formData, function(result) {
             onTaskAccepted();
-            kimchi.topic('kimchi/debugReportAdded').publish();
+            wok.topic('kimchi/debugReportAdded').publish();
         }, function(result) {
             // Error message from Async Task status
             if (result['message']) {
@@ -55,7 +55,7 @@ kimchi.report_add_main = function() {
             else {
                 var errText = result['responseJSON']['reason'];
             }
-            result && kimchi.message.error(errText);
+            result && wok.message.error(errText);
 
             taskAccepted &&
                 $('.grid-body-view table tr:first-child',
diff --git a/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js b/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
index 6ee56d9..1bdb8d9 100644
--- a/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
@@ -28,13 +28,13 @@ kimchi.report_rename_main = function() {
         // if the user hasn't changed the report's name,
         // nothing should be done.
         if (reportName == kimchi.selectedReport) {
-            kimchi.message.error.code('KCHDR6013M');
+            wok.message.error.code('KCHDR6013M');
             return false;
         }
 
         var validator = RegExp("^[A-Za-z0-9-]*$");
         if (!validator.test(reportName)) {
-            kimchi.message.error.code('KCHDR6011M');
+            wok.message.error.code('KCHDR6011M');
             return false;
         }
         var formData = renameReportForm.serializeObject();
@@ -43,15 +43,15 @@ kimchi.report_rename_main = function() {
         kimchi.renameReport(kimchi.selectedReport, formData, function(result) {
             submitButton.prop('disabled', false);
             nameTextbox.prop('disabled', false);
-            kimchi.window.close();
-            kimchi.topic('kimchi/debugReportRenamed').publish({
+            wok.window.close();
+            wok.topic('kimchi/debugReportRenamed').publish({
                 result: result
             });
         }, function(result) {
             var errText = result &&
                 result['responseJSON'] &&
                 result['responseJSON']['reason'];
-            kimchi.message.error(errText);
+            wok.message.error(errText);
             submitButton.prop('disabled', false);
             nameTextbox.prop('disabled', false).focus();
         });
diff --git a/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
index 2a277fd..656306b 100644
--- a/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
@@ -81,13 +81,13 @@ kimchi.repository_add_main = function() {
         }
 
         kimchi.createRepository(formData, function() {
-            kimchi.topic('kimchi/repositoryAdded').publish();
-            kimchi.window.close();
+            wok.topic('kimchi/repositoryAdded').publish();
+            wok.window.close();
         }, function(jqXHR, textStatus, errorThrown) {
             var reason = jqXHR &&
                 jqXHR['responseJSON'] &&
                 jqXHR['responseJSON']['reason'];
-            kimchi.message.error(reason);
+            wok.message.error(reason);
         });
         return false;
     };
diff --git a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
index a9a0ca6..85e24d4 100644
--- a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
@@ -21,10 +21,10 @@ kimchi.repository_edit_main = function() {
 
     var saveButton = $('#repository-edit-button-save');
 
-    if(kimchi.capabilities['repo_mngt_tool']=="yum") {
+    if(wok.capabilities['repo_mngt_tool']=="yum") {
         editForm.find('input.deb').prop('disabled', true);
     }
-    else if(kimchi.capabilities['repo_mngt_tool']=="deb") {
+    else if(wok.capabilities['repo_mngt_tool']=="deb") {
         editForm.find('input.yum').prop('disabled', true);
     }
 
@@ -57,13 +57,13 @@ kimchi.repository_edit_main = function() {
         }
 
         kimchi.updateRepository(kimchi.selectedRepository, formData, function() {
-            kimchi.topic('kimchi/repositoryUpdated').publish();
-            kimchi.window.close();
+            wok.topic('kimchi/repositoryUpdated').publish();
+            wok.window.close();
         }, function(jqXHR, textStatus, errorThrown) {
             var reason = jqXHR &&
                 jqXHR['responseJSON'] &&
                 jqXHR['responseJSON']['reason'];
-            kimchi.message.error(reason);
+            wok.message.error(reason);
         });
 
         return false;
diff --git a/plugins/kimchi/ui/js/src/kimchi.storage_main.js b/plugins/kimchi/ui/js/src/kimchi.storage_main.js
index 6125da9..6019cea 100644
--- a/plugins/kimchi/ui/js/src/kimchi.storage_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.storage_main.js
@@ -22,17 +22,17 @@ kimchi.doListStoragePools = function() {
             var listHtml = '';
             $.each(result, function(index, value) {
                 value.usage = Math.round(value.allocated / value.capacity * 100) || 0;
-                value.capacity = kimchi.changetoProperUnit(value.capacity,1);
-                value.allocated = kimchi.changetoProperUnit(value.allocated,1);
+                value.capacity = wok.changetoProperUnit(value.capacity,1);
+                value.allocated = wok.changetoProperUnit(value.allocated,1);
                 value.enableExt = value.type==="logical" ? "" : "hide-content";
                 if ('kimchi-iso' !== value.type) {
-                    listHtml += kimchi.substitute(storageHtml, value);
+                    listHtml += wok.substitute(storageHtml, value);
                 }
             });
             if($('#storageGrid').hasClass('grid'))
                 $('#storageGrid').grid('destroy');
             $('#storagepoolsList').html(listHtml);
-            if(kimchi.tabMode['storage'] === 'admin') {
+            if(wok.tabMode['storage'] === 'admin') {
                 $('.storage-button').attr('style','display');
             } else {
                 $('.storage-allocate').addClass('storage-allocate-padding-user');
@@ -46,7 +46,7 @@ kimchi.doListStoragePools = function() {
             $('#storagepoolsList').html('');
         }
     }, function(err) {
-        kimchi.message.error(err.responseJSON.reason);
+        wok.message.error(err.responseJSON.reason);
     });
 }
 
@@ -97,7 +97,7 @@ kimchi.storageBindClick = function() {
         }
     });
 
-    if(kimchi.tabMode['storage'] === 'admin') {
+    if(wok.tabMode['storage'] === 'admin') {
         $('.pool-delete').on('click', function(event) {
             var $pool = $(this);
             var settings = {
@@ -106,12 +106,12 @@ kimchi.storageBindClick = function() {
                 confirm : i18n['KCHAPI6002M'],
                 cancel : i18n['KCHAPI6003M']
             };
-            kimchi.confirm(settings, function() {
+            wok.confirm(settings, function() {
                 var poolName = $pool.data('name');
                 kimchi.deleteStoragePool(poolName, function() {
                     kimchi.doListStoragePools();
                 }, function(err) {
-                    kimchi.message.error(err.responseJSON.reason);
+                    wok.message.error(err.responseJSON.reason);
                 });
             });
         });
@@ -121,7 +121,7 @@ kimchi.storageBindClick = function() {
             kimchi.changePoolState(poolName, 'activate', function() {
                 kimchi.doListStoragePools();
             }, function(err) {
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             });
         });
 
@@ -134,11 +134,11 @@ kimchi.storageBindClick = function() {
                 cancel : i18n['KCHAPI6003M']
             };
             if (!$(this).data('persistent')) {
-                kimchi.confirm(settings, function() {
+                wok.confirm(settings, function() {
                     kimchi.changePoolState(poolName, 'deactivate', function() {
                         kimchi.doListStoragePools();
                     }, function(err) {
-                        kimchi.message.error(err.responseJSON.reason);
+                        wok.message.error(err.responseJSON.reason);
                     });
                 }, function() {
                     return false;
@@ -148,7 +148,7 @@ kimchi.storageBindClick = function() {
                 kimchi.changePoolState(poolName, 'deactivate', function() {
                     kimchi.doListStoragePools();
                 }, function(err) {
-                    kimchi.message.error(err.responseJSON.reason);
+                    wok.message.error(err.responseJSON.reason);
                 });
             }
         });
@@ -156,7 +156,7 @@ kimchi.storageBindClick = function() {
         $('.pool-add-volume').on('click', function(event) {
             var poolName = $(this).data('name');
             kimchi.selectedSP = poolName;
-            kimchi.window.open('storagepool-add-volume.html');
+            wok.window.open('storagepool-add-volume.html');
         });
 
         $('.storage-action').on('click', function() {
@@ -201,9 +201,9 @@ kimchi._generateVolumeHTML = function(volume) {
         return '';
     }
     var volumeHtml = $('#volumeTmpl').html();
-    volume.capacity = kimchi.changetoProperUnit(volume.capacity,1);
-    volume.allocation = kimchi.changetoProperUnit(volume.allocation,1);
-    return kimchi.substitute(volumeHtml, volume);
+    volume.capacity = wok.changetoProperUnit(volume.capacity,1);
+    volume.allocation = wok.changetoProperUnit(volume.allocation,1);
+    return wok.substitute(volumeHtml, volume);
 };
 
 kimchi.doListVolumes = function(poolObj) {
@@ -222,11 +222,11 @@ kimchi.doListVolumes = function(poolObj) {
                 }
 
                 kimchi.trackTask(tasks[i].id, function(result) {
-                    kimchi.topic('kimchi/volumeTransferFinished').publish(result);
+                    wok.topic('kimchi/volumeTransferFinished').publish(result);
                 }, function(result) {
-                    kimchi.topic('kimchi/volumeTransferError').publish(result);
+                    wok.topic('kimchi/volumeTransferError').publish(result);
                 }, function(result) {
-                    kimchi.topic('kimchi/volumeTransferProgress').publish(result);
+                    wok.topic('kimchi/volumeTransferProgress').publish(result);
                 });
             }
         }, null, true);
@@ -274,14 +274,14 @@ kimchi.doListVolumes = function(poolObj) {
         }
 
         $.each(ongoingVolumesMap, function(volumeName, task) {
-            kimchi.topic('kimchi/volumeTransferProgress').publish(task);
+            wok.topic('kimchi/volumeTransferProgress').publish(task);
         });
 
         poolObj.removeClass('in');
         kimchi.changeArrow(handleArrow);
         slide.slideDown('slow');
     }, function(err) {
-        kimchi.message.error(err.responseJSON.reason);
+        wok.message.error(err.responseJSON.reason);
     });
 }
 
@@ -300,7 +300,7 @@ kimchi.initLogicalPoolExtend = function() {
                 if (data.length > 0) {
                     for(var i=0;i<data.length;i++){
                         if (data[i].type === 'part' || data[i].type === 'disk') {
-                            $('.host-partition', '#logicalPoolExtend').append(kimchi.substitute($('#logicalPoolExtendTmpl').html(), data[i]));
+                            $('.host-partition', '#logicalPoolExtend').append(wok.substitute($('#logicalPoolExtendTmpl').html(), data[i]));
                         }
                     }
                 } else {
@@ -325,8 +325,8 @@ kimchi.initLogicalPoolExtend = function() {
                 kimchi.updateStoragePool($("#logicalPoolExtend").dialog("option", "poolName"),{disks: devicePaths},function(data){
                     var item = $("#"+$("#logicalPoolExtend").dialog("option", "poolName"));
                     $(".usage", $(".storage-name", item)).text((Math.round(data.allocated/data.capacity*100)||0)+"%");
-                    $(".storage-text", $(".storage-capacity", item)).text(kimchi.changetoProperUnit(data.capacity,1));
-                    $(".storage-text", $(".storage-allocate", item)).text(kimchi.changetoProperUnit(data.allocated,1));
+                    $(".storage-text", $(".storage-capacity", item)).text(wok.changetoProperUnit(data.capacity,1));
+                    $(".storage-text", $(".storage-allocate", item)).text(wok.changetoProperUnit(data.allocated,1));
                 });
                 $(this).dialog("close");
             }
@@ -335,23 +335,23 @@ kimchi.initLogicalPoolExtend = function() {
 }
 
 kimchi.storage_main = function() {
-    if(kimchi.tabMode['storage'] === 'admin') {
+    if(wok.tabMode['storage'] === 'admin') {
         $('.tools').attr('style','display');
         $('#storage-pool-add').on('click', function() {
-            kimchi.window.open('storagepool-add.html');
+            wok.window.open('storagepool-add.html');
         });
         $('.list-title .title-actions').attr('style','display');
     }
     kimchi.doListStoragePools();
     kimchi.initLogicalPoolExtend();
 
-    kimchi.topic('kimchi/storageVolumeAdded').subscribe(function() {
+    wok.topic('kimchi/storageVolumeAdded').subscribe(function() {
         pool = kimchi.selectedSP;
         var poolNode = $('.storage-li[data-name="' + pool + '"]');
         kimchi.doListVolumes(poolNode);
     });
 
-    kimchi.topic('kimchi/volumeTransferProgress').subscribe(function(result) {
+    wok.topic('kimchi/volumeTransferProgress').subscribe(function(result) {
         var extractProgressData = function(data) {
             var sizeArray = /(\d+)\/(\d+)/g.exec(data) || [0, 0, 0];
             var downloaded = sizeArray[1];
@@ -362,7 +362,7 @@ kimchi.storage_main = function() {
                     percent = downloaded / total * 100;
                 }
             }
-            var formatted = kimchi.formatMeasurement(downloaded);
+            var formatted = wok.formatMeasurement(downloaded);
             var size = (1.0 * formatted['v']).toFixed(1) + formatted['s'];
             return {
                 size: size,
@@ -386,7 +386,7 @@ kimchi.storage_main = function() {
         $('.progress-status', volumeBox).text(i18n['KCHPOOL6014M']);
     });
 
-    kimchi.topic('kimchi/volumeTransferFinished').subscribe(function(result) {
+    wok.topic('kimchi/volumeTransferFinished').subscribe(function(result) {
         var uriElements = result.target_uri.split('/');
         var poolName = uriElements[2];
         var volumeName = uriElements.pop();
@@ -396,11 +396,11 @@ kimchi.storage_main = function() {
             var html = kimchi._generateVolumeHTML(volume);
             $(volumeBox).replaceWith(html);
         }, function(err) {
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
         });
     });
 
-    kimchi.topic('kimchi/volumeTransferError').subscribe(function(result) {
+    wok.topic('kimchi/volumeTransferError').subscribe(function(result) {
         // Error message from Async Task status
         if (result['message']) {
             var errText = result['message'];
@@ -409,7 +409,7 @@ kimchi.storage_main = function() {
         else {
             var errText = result['responseJSON']['reason'];
         }
-        result && kimchi.message.error(errText);
+        result && wok.message.error(errText);
 
         var uriElements = result.target_uri.split('/');
         var poolName = uriElements[2];
diff --git a/plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js b/plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js
index 3c75df3..8c27539 100644
--- a/plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js
@@ -79,7 +79,7 @@ kimchi.setupISCSI = function(){
         }, function(data){
             $('input', "#iSCSITarget").attr("placeholder", i18n['KCHPOOL6008M']);
             callback();
-            kimchi.message.error(data.responseJSON.reason);
+            wok.message.error(data.responseJSON.reason);
         });
     };
     var triggerLoadTarget = function(){
@@ -128,7 +128,7 @@ kimchi.initStorageAddPage = function() {
             valid_types = ['part', 'disk', 'mpath'];
             $.each(data, function(index, value) {
                 if (valid_types.indexOf(value.type) != -1) {
-                    listHtml += kimchi.substitute(deviceHtml, value);
+                    listHtml += wok.substitute(deviceHtml, value);
                 }
             });
             $('.host-partition', '#form-pool-add').html(listHtml);
@@ -198,7 +198,7 @@ kimchi.initStorageAddPage = function() {
             }
         });
         $('#nfsserverId').on("change keyup",function() {
-            if ($(this).val() !== '' && kimchi.isServer($(this).val())) {
+            if ($(this).val() !== '' && wok.isServer($(this).val())) {
                 $('#nfspathId').prop('disabled',false);
                 $(this).removeClass("invalid-field");
             } else {
@@ -247,9 +247,9 @@ kimchi.initStorageAddPage = function() {
         $(this).toggleClass("invalid-field",!/^[0-9]*$/.test($(this).val()));
     });
     $('#iscsiserverId').keyup(function(event) {
-        $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim()));
+        $(this).toggleClass("invalid-field",!wok.isServer($(this).val().trim()));
     }).change(function(event) {
-        $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim()));
+        $(this).toggleClass("invalid-field",!wok.isServer($(this).val().trim()));
     });
     kimchi.setupISCSI();
 };
@@ -298,7 +298,7 @@ kimchi.validateForm = function() {
 kimchi.validateDirForm = function () {
     var path = $('#pathId').val();
     if (!/(^\/.*)$/.test(path)) {
-        kimchi.message.error.code('KCHAPI6003E');
+        wok.message.error.code('KCHAPI6003E');
         return false;
     }
     return true;
@@ -311,7 +311,7 @@ kimchi.validateNfsForm = function () {
         return false;
     }
     if (!/((\/([0-9a-zA-Z-_\.]+)))$/.test(nfspath)) {
-        kimchi.message.error.code('KCHPOOL6005E');
+        wok.message.error.code('KCHPOOL6005E');
         return false;
     }
     $('#nfs-mount-loading').removeClass('hidden');
@@ -328,8 +328,8 @@ kimchi.validateIscsiForm = function() {
 };
 
 kimchi.validateServer = function(serverField) {
-    if(!kimchi.isServer(serverField)) {
-        kimchi.message.error.code('KCHPOOL6009E');
+    if(!wok.isServer(serverField)) {
+        wok.message.error.code('KCHPOOL6009E');
         return false;
     }
     return true;
@@ -337,7 +337,7 @@ kimchi.validateServer = function(serverField) {
 
 kimchi.validateLogicalForm = function () {
     if ($("input[name=devices]:checked").length === 0) {
-        kimchi.message.error.code('KCHPOOL6006E');
+        wok.message.error.code('KCHPOOL6006E');
         return false;
     } else {
         return true;
@@ -388,9 +388,9 @@ kimchi.addPool = function(event) {
             $('#pool-loading').show();
             kimchi.createStoragePool(formData, function() {
                     kimchi.doListStoragePools();
-                    kimchi.window.close();
+                    wok.window.close();
                 }, function(err) {
-                    kimchi.message.error(err.responseJSON.reason);
+                    wok.message.error(err.responseJSON.reason);
                     $('input', '#form-pool-add').removeAttr('disabled');
                     $('#pool-loading').hide();
                     $('#pool-doAdd').show();
@@ -403,7 +403,7 @@ kimchi.addPool = function(event) {
                 confirm : i18n['KCHAPI6002M'],
                 cancel : i18n['KCHAPI6003M']
             };
-            kimchi.confirm(settings, function() {
+            wok.confirm(settings, function() {
                 storagePoolAddingFunc();
             }, function() {
             });
diff --git a/plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js b/plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js
index c56f68c..8479ab2 100644
--- a/plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js
@@ -63,7 +63,7 @@ kimchi.sp_add_volume_main = function() {
         var msg = result['message'] || (
             result['responseJSON'] && result['responseJSON']['reason']
         );
-        kimchi.message.error(msg);
+        wok.message.error(msg);
     };
 
     var fetchRemoteFile = function() {
@@ -73,8 +73,8 @@ kimchi.sp_add_volume_main = function() {
             sp: kimchi.selectedSP,
             url: volumeURL
         }, function(result) {
-            kimchi.window.close();
-            kimchi.topic('kimchi/storageVolumeAdded').publish();
+            wok.window.close();
+            wok.topic('kimchi/storageVolumeAdded').publish();
         }, onError);
     };
 
@@ -91,7 +91,7 @@ kimchi.sp_add_volume_main = function() {
                 capacity: blobFile.size,
                 upload: true
             }, function(result) {
-                kimchi.window.close();
+                wok.window.close();
                 trackVolCreation(result.id);
             }, onError);
         };
@@ -117,14 +117,14 @@ kimchi.sp_add_volume_main = function() {
             var reader = new FileReader();
             reader.onloadend = function(e) {
                 if (e.loaded == 0)
-                    kimchi.message.error.code('KCHAPI6008E');
+                    wok.message.error.code('KCHAPI6008E');
                 else
                     createUploadVol();
             };
 
             reader.readAsBinaryString(blob);
         } catch (err) {
-            kimchi.message.error.code('KCHAPI6008E');
+            wok.message.error.code('KCHAPI6008E');
             return;
         }
 
@@ -134,14 +134,14 @@ kimchi.sp_add_volume_main = function() {
                 var reader = new FileReader();
                 reader.onloadend = function(e) {
                     if (e.loaded == 0)
-                        kimchi.message.error.code('KCHAPI6009E');
+                        wok.message.error.code('KCHAPI6009E');
                     else
                         uploadRequest(blob);
                 };
 
                 reader.readAsBinaryString(blob);
             } catch (err) {
-                kimchi.message.error.code('KCHAPI6009E');
+                wok.message.error.code('KCHAPI6009E');
                 return;
             }
         }
@@ -156,7 +156,7 @@ kimchi.sp_add_volume_main = function() {
                             trackVolCreation(taskid);
                         }, 2000);
                     } else {
-                        kimchi.topic('kimchi/storageVolumeAdded').publish();
+                        wok.topic('kimchi/storageVolumeAdded').publish();
                         doUpload();
                     }
                 }
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_add_main.js b/plugins/kimchi/ui/js/src/kimchi.template_add_main.js
index e449212..5528eb2 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_add_main.js
@@ -56,7 +56,7 @@ kimchi.template_add_main = function() {
                 $('#iso-search').show();
             }
         }, function(err) {
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
         });
     });
 
@@ -71,7 +71,7 @@ kimchi.template_add_main = function() {
         var settings = {
             content : i18n['KCHTMPL6002M']
         };
-        kimchi.confirm(settings, function() {
+        wok.confirm(settings, function() {
             $('#iso-search').hide();
             $('#iso-search-loading').show();
             deepScan('#iso-search');
@@ -82,7 +82,7 @@ kimchi.template_add_main = function() {
         var settings = {
             content : i18n['KCHTMPL6002M']
         };
-        kimchi.confirm(settings, function() {
+        wok.confirm(settings, function() {
             $('#iso-more').hide();
             $('#iso-more-loading').show();
             deepScan('#iso-more');
@@ -116,7 +116,7 @@ kimchi.template_add_main = function() {
                 showLocalIsoField(isos);
             } else {
                 if (isFinished) {
-                    kimchi.message.warn(i18n['KCHTMPL6001W']);
+                    wok.message.warn(i18n['KCHTMPL6001W']);
                 }
             }
             if (isFinished) {
@@ -124,7 +124,7 @@ kimchi.template_add_main = function() {
                 $(button).show();
             }
         }, function(err) {
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
             $(button + '-loading').hide();
             $(button).show();
         });
@@ -150,9 +150,9 @@ kimchi.template_add_main = function() {
             var isoId = volume.os_distro + '*' + volume.name + '*' + volume.os_version;
             if (!kimchi.isoInfo[isoId]) {
                 volume.isoId = isoId;
-                volume.capacity = kimchi.changetoProperUnit(volume.capacity, 1);
+                volume.capacity = wok.changetoProperUnit(volume.capacity, 1);
                 kimchi.isoInfo[isoId] = volume;
-                html += kimchi.substitute(template, volume);
+                html += wok.substitute(template, volume);
             }
         });
         $('#list-local-iso').append(html);
@@ -211,7 +211,7 @@ kimchi.template_add_main = function() {
     $('#btn-template-file-create').click(function() {
         var isoFile = $('#iso-file').val();
         if (!kimchi.template_check_path(isoFile)) {
-            kimchi.message.error.code('KCHAPI6003E');
+            wok.message.error.code('KCHAPI6003E');
             return;
         }
         var data = {
@@ -224,12 +224,12 @@ kimchi.template_add_main = function() {
     $('#iso-remote').css('opacity', 0.3).css('cursor', 'not-allowed');
 
     var enabledRemoteIso = function() {
-        if (kimchi.capabilities == undefined) {
+        if (wok.capabilities == undefined) {
             setTimeout(enabledRemoteIso, 2000);
             return;
         }
 
-        if (kimchi.capabilities.qemu_stream != true) {
+        if (wok.capabilities.qemu_stream != true) {
             return;
         }
 
@@ -269,7 +269,7 @@ kimchi.template_add_main = function() {
                 if (!kimchi.isoInfo[isoId]) {
                     volume.isoId = isoId;
                     kimchi.isoInfo[isoId] = volume;
-                    html += kimchi.substitute(template, volume);
+                    html += wok.substitute(template, volume);
                 }
             });
             $('#list-remote-iso').html(html);
@@ -279,7 +279,7 @@ kimchi.template_add_main = function() {
         } else {
             $('#load-remote-iso').hide()
             $('#iso-url-field').show();
-            kimchi.message.warn(i18n['KCHTMPL6001W']);
+            wok.message.warn(i18n['KCHTMPL6001W']);
         }
     };
 
@@ -365,7 +365,7 @@ kimchi.template_add_main = function() {
     $('#btn-template-url-create').click(function() {
         var isoUrl = $('#iso-url').val();
         if (!kimchi.template_check_url(isoUrl)) {
-            kimchi.message.error.code('KCHAPI6004E');
+            wok.message.error.code('KCHAPI6004E');
             return;
         }
         var data = {
@@ -379,11 +379,11 @@ kimchi.template_add_main = function() {
         kimchi.createTemplate(data, function() {
             if(callback) callback();
             kimchi.doListTemplates();
-            kimchi.window.close();
-            kimchi.topic('templateCreated').publish();
+            wok.window.close();
+            wok.topic('templateCreated').publish();
         }, function(err) {
             if(callback) callback();
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
         });
     };
 
@@ -403,12 +403,12 @@ kimchi.template_add_main = function() {
                     $('input[value="' + isoInfo.isoId + '"]').prop('checked', false);
                     $('.check-all>input').prop('checked', false);
                     kimchi.doListTemplates();
-                    kimchi.topic('templateCreated').publish(data);
+                    wok.topic('templateCreated').publish(data);
                     if (successNum === length) {
-                        kimchi.window.close();
+                        wok.window.close();
                     }
                 }, function(err) {
-                    kimchi.message.error(err.responseJSON.reason);
+                    wok.message.error(err.responseJSON.reason);
                 });
             };
             if (formData.iso instanceof Array) {
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
index 21f5575..885fe54 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
@@ -47,15 +47,15 @@ kimchi.template_edit_main = function() {
         var vncOpt = [{label: 'VNC', value: 'vnc'}];
         $('#template-edit-graphics').append('<option selected>VNC</option>');
         $('#template-edit-graphics').append('<option>Spice</option>');
-        kimchi.select('template-edit-graphics-list', vncOpt);
+        wok.select('template-edit-graphics-list', vncOpt);
         var enableSpice = function() {
-            if (kimchi.capabilities == undefined) {
+            if (wok.capabilities == undefined) {
                 setTimeout(enableSpice, 2000);
                 return;
             }
-            if (kimchi.capabilities.qemu_spice == true) {
+            if (wok.capabilities.qemu_spice == true) {
                 spiceOpt = [{label: 'Spice', value: 'spice'}]
-                kimchi.select('template-edit-graphics-list', spiceOpt);
+                wok.select('template-edit-graphics-list', spiceOpt);
             }
         };
         enableSpice();
@@ -63,7 +63,7 @@ kimchi.template_edit_main = function() {
             var scsipools = {};
             var addStorageItem = function(storageData) {
                 var thisName = storageData.storageName;
-                var nodeStorage = $.parseHTML(kimchi.substitute($('#template-storage-pool-tmpl').html(), storageData));
+                var nodeStorage = $.parseHTML(wok.substitute($('#template-storage-pool-tmpl').html(), storageData));
                 $('.template-tab-body', '#form-template-storage').append(nodeStorage);
                 var storageOptions = '';
                 var scsiOptions = '';
@@ -185,7 +185,7 @@ kimchi.template_edit_main = function() {
             var networkItemNum = 0;
             var addInterfaceItem = function(networkData) {
                 var networkName = networkData.networkV;
-                var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData));
+                var nodeInterface = $.parseHTML(wok.substitute($('#template-interface-tmpl').html(), networkData));
                 $('.template-tab-body', '#form-template-interface').append(nodeInterface);
                 $('.delete', '#form-template-interface').button({
                     icons : {primary : 'ui-icon-trash'},
@@ -335,9 +335,9 @@ kimchi.template_edit_main = function() {
 
         kimchi.updateTemplate($('#template-name').val(), data, function() {
             kimchi.doListTemplates();
-            kimchi.window.close();
+            wok.window.close();
         }, function(err) {
-            kimchi.message.error(err.responseJSON.reason);
+            wok.message.error(err.responseJSON.reason);
         });
     });
 };
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_main.js b/plugins/kimchi/ui/js/src/kimchi.template_main.js
index 775cb0b..5d474bd 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_main.js
@@ -38,7 +38,7 @@ kimchi.doListTemplates = function() {
                 }else{
                     value.location = "images/theme-default/icon-remote.png";
                 }
-                listHtml += kimchi.substitute(templateHtml, value);
+                listHtml += wok.substitute(templateHtml, value);
             });
             $('#templateList').html(listHtml);
             kimchi.templateBindClick();
@@ -48,7 +48,7 @@ kimchi.doListTemplates = function() {
         }
         $('html').removeClass('processing');
     }, function(err) {
-        kimchi.message.error(err.responseJSON.reason);
+        wok.message.error(err.responseJSON.reason);
         $('html').removeClass('processing');
     });
 };
@@ -57,7 +57,7 @@ kimchi.templateBindClick = function() {
     $('.template-edit').on('click', function(event) {
         var templateName = $(this).data('template');
         kimchi.selectedTemplate = templateName;
-        kimchi.window.open("template-edit.html");
+        wok.window.open("template-edit.html");
     });
     $('.template-clone').on('click', function(event) {
         kimchi.selectedTemplate = $(this).data('template');
@@ -65,7 +65,7 @@ kimchi.templateBindClick = function() {
         kimchi.cloneTemplate(kimchi.selectedTemplate, function() {
                 kimchi.doListTemplates();
             }, function(err) {
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
                 kimchi.doListTemplates();
             });
     });
@@ -77,12 +77,12 @@ kimchi.templateBindClick = function() {
             confirm : i18n['KCHAPI6002M'],
             cancel : i18n['KCHAPI6003M']
         };
-        kimchi.confirm(settings, function() {
+        wok.confirm(settings, function() {
             var templateName = $template.data('template');
             kimchi.deleteTemplate(templateName, function() {
                 kimchi.doListTemplates();
             }, function(err) {
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             });
         }, function() {
         });
@@ -93,10 +93,10 @@ kimchi.hideTitle = function() {
 };
 
 kimchi.template_main = function() {
-    if(kimchi.tabMode['templates'] === 'admin') {
+    if(wok.tabMode['templates'] === 'admin') {
         $('.tools').attr('style','display');
         $("#template-add").on("click", function(event) {
-            kimchi.window.open({
+            wok.window.open({
                 url: 'template-add.html',
                 close: function() {
                     if (kimchi.deepScanHandler) {
diff --git a/plugins/kimchi/ui/spice-html5/pages/spice_auto.html b/plugins/kimchi/ui/spice-html5/pages/spice_auto.html
index 40afea4..c87f5c2 100644
--- a/plugins/kimchi/ui/spice-html5/pages/spice_auto.html
+++ b/plugins/kimchi/ui/spice-html5/pages/spice_auto.html
@@ -140,7 +140,7 @@
                  *
                  * 'uri = scheme + host + ":" + port;'
                  *
-                 * to point Kimchi user to a specific console represented by
+                 * to point wok.user to a specific console represented by
                  * token value.
                  */
                 uri = scheme + host + ":" + port + "/?token=" + token;
diff --git a/plugins/sample/API.json b/plugins/sample/API.json
index ebc596b..6ee7d91 100644
--- a/plugins/sample/API.json
+++ b/plugins/sample/API.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft-03/schema#",
     "title": "Plugin Sample API",
-    "description": "Json schema for Kimchi's Sample Plugin API",
+    "description": "Json schema for Wok's Sample Plugin API",
     "type": "object",
     "error": "SPAPI0001E",
     "properties": {
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index d741ddb..786832f 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -48,7 +48,7 @@ class Drawings(Root):
 
     @expose
     def index(self):
-        return 'This is a sample plugin for Kimchi'
+        return 'This is a sample plugin for Wok'
 
 
 class Description(Resource):
diff --git a/plugins/sample/sample.conf.in b/plugins/sample/sample.conf.in
index 28ae891..9da33e1 100644
--- a/plugins/sample/sample.conf.in
+++ b/plugins/sample/sample.conf.in
@@ -1,4 +1,4 @@
-[kimchi]
+[wok]
 enable = @ENABLE_SAMPLE@
 plugin_class = "Drawings"
 uri = "/plugins/sample"
@@ -7,19 +7,19 @@ uri = "/plugins/sample"
 tools.nocache.on = True
 tools.trailing_slash.on = False
 tools.sessions.on = True
-tools.sessions.name = 'kimchi'
+tools.sessions.name = 'wok'
 tools.sessions.httponly = True
 tools.sessions.locking = 'explicit'
 tools.sessions.storage_type = 'ram'
 
 [/description]
-tools.kimchiauth.on = True
+tools.wokauth.on = True
 
 [/rectangles]
-tools.kimchiauth.on = True
+tools.wokauth.on = True
 
 [/circles]
-tools.kimchiauth.on = True
+tools.wokauth.on = True
 
 [/help]
 tools.staticdir.on = True
diff --git a/plugins/sample/ui/js/util.js b/plugins/sample/ui/js/util.js
index 157ddde..1e6c4df 100644
--- a/plugins/sample/ui/js/util.js
+++ b/plugins/sample/ui/js/util.js
@@ -19,7 +19,7 @@
 sample = {};
 
 sample.description = function(suc, err){
-    kimchi.requestJSON({
+    wok.requestJSON({
         url : kimchi.url + 'plugins/sample/description',
         type : 'GET',
         contentType : 'application/json',
@@ -27,7 +27,7 @@ sample.description = function(suc, err){
         resend : true,
         success : suc,
         error : err || function(data) {
-            kimchi.message.error(data.responseJSON.reason);
+            wok.message.error(data.responseJSON.reason);
         }
     });
 };
diff --git a/plugins/sample/ui/pages/help/en_US/sample-tab1.html b/plugins/sample/ui/pages/help/en_US/sample-tab1.html
index 70aa1c0..7122124 100644
--- a/plugins/sample/ui/pages/help/en_US/sample-tab1.html
+++ b/plugins/sample/ui/pages/help/en_US/sample-tab1.html
@@ -1 +1 @@
-Help page for TAB 1 of Kimchi's Sample plugin.
+Help page for TAB 1 of Wok's Sample plugin.
diff --git a/plugins/sample/ui/pages/help/en_US/sample-tab2.html b/plugins/sample/ui/pages/help/en_US/sample-tab2.html
index 367318f..1bfe448 100644
--- a/plugins/sample/ui/pages/help/en_US/sample-tab2.html
+++ b/plugins/sample/ui/pages/help/en_US/sample-tab2.html
@@ -1 +1 @@
-Help page for TAB 2 of Kimchi's Sample plugin.
+Help page for TAB 2 of Wok's Sample plugin.
diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in
index b0faea3..ce99115 100644
--- a/src/nginx/wok.conf.in
+++ b/src/nginx/wok.conf.in
@@ -18,7 +18,7 @@
 # 02110-1301  USA
 
 # This is a template file to be used to generate a nginx
-# proxy config file at kimchid script.
+# proxy config file at wokd script.
 
 user  ${user};
 worker_processes  1;
@@ -41,7 +41,7 @@ http {
     client_max_body_size ${max_body_size}k;
 
     # Timeout set to 10 minutes to avoid the 504 Gateway Timeout
-    # when Kimchi is processing a request.
+    # when Wok is processing a request.
     proxy_connect_timeout       600;
     proxy_send_timeout          600;
     proxy_read_timeout          600;
@@ -63,11 +63,11 @@ http {
         add_header X-XSS-Protection "1; mode=block";
 
         location / {
-            proxy_pass http://127.0.0.1:${kimchid_port};
+            proxy_pass http://127.0.0.1:${wokd_port};
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_redirect http://127.0.0.1:${kimchid_port}/ https://$host:${proxy_ssl_port}/;
+            proxy_redirect http://127.0.0.1:${wokd_port}/ https://$host:${proxy_ssl_port}/;
         }
     }
 
diff --git a/src/wok.conf.in b/src/wok.conf.in
index cd141f5..60d826f 100644
--- a/src/wok.conf.in
+++ b/src/wok.conf.in
@@ -1,5 +1,5 @@
 #
-# Configuration file for Kimchi Web Server
+# Configuration file for Wok Web Server
 #
 
 [server]
@@ -16,17 +16,17 @@
 #cherrypy_port = 8010
 
 # The full path to an SSL Certificate in PEM format.  If left unspecified,
-# Kimchi will generate a self-signed certificate automatically.
+# Wok will generate a self-signed certificate automatically.
 #ssl_cert =
 
 # The corresponding private key in PEM format for the SSL Certificate supplied
-# above.  If left blank, Kimchi will generate a self-signed certificate.
+# above.  If left blank, Wok will generate a self-signed certificate.
 #ssl_key =
 
 # Running environment of the server
 #environment = production
 
-# Federation feature: register Kimchi server on openSLP and discover peers
+# Federation feature: register Wok server on openSLP and discover peers
 # in the same network. Check README-federation for more details.
 #federation = off
 
@@ -38,7 +38,7 @@
 
 [logging]
 # Log directory
-#log_dir = @localstatedir@/log/kimchi
+#log_dir = @localstatedir@/log/wok
 
 # Logging level: debug, info, warning, error or critical
 #log_level = debug
@@ -56,10 +56,10 @@
 # ldap_server = "localhost"
 
 # Search tree base in ldap
-# ldap_search_base = "ou=People, dc=kimchi, dc=org"
+# ldap_search_base = "ou=People, dc=wok, dc=org"
 
 # User id filter
 # ldap_search_filter = "uid=%(username)s"
 
-# User IDs regarded as kimchi admin
+# User IDs regarded as Wok admin
 # ldap_admin_id = "foo at foo.com, bar at bar.com"
diff --git a/src/wok/auth.py b/src/wok/auth.py
index 6bd1566..cc470b6 100644
--- a/src/wok/auth.py
+++ b/src/wok/auth.py
@@ -259,8 +259,8 @@ def check_auth_session():
     cherrypy.session.release_lock()
     if session is not None:
         debug("Session authenticated for user %s" % session)
-        kimchiRobot = cherrypy.request.headers.get('Kimchi-Robot')
-        if kimchiRobot == "kimchi-robot":
+        wokRobot = cherrypy.request.headers.get('Wok-Robot')
+        if wokRobot == "wok-robot":
             if (time.time() - cherrypy.session[REFRESH] >
                     cherrypy.session.timeout * 60):
                 cherrypy.session[USER_NAME] = None
@@ -327,8 +327,8 @@ def logout():
     cherrypy.lib.sessions.close()
 
 
-def kimchiauth():
-    debug("Entering kimchiauth...")
+def wokauth():
+    debug("Entering wokauth...")
     session_missing = cherrypy.session.missing
     if check_auth_session():
         return
@@ -346,7 +346,7 @@ def kimchiauth():
         raise cherrypy.HTTPError(401, "sessionTimeout")
 
     if not from_browser():
-        cherrypy.response.headers['WWW-Authenticate'] = 'Basic realm=kimchi'
+        cherrypy.response.headers['WWW-Authenticate'] = 'Basic realm=wok'
 
     e = InvalidOperation('KCHAUTH0002E')
     raise cherrypy.HTTPError(401, e.message.encode('utf-8'))
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 1408024..3fc46a4 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -29,8 +29,8 @@ from ConfigParser import SafeConfigParser
 
 from kimchi.xmlutils.utils import xpath_get_text
 
-__version__ = "@kimchiversion@"
-__release__ = "@kimchirelease@"
+__version__ = "@wokversion@"
+__release__ = "@wokrelease@"
 __with_spice__ = "@withspice@"
 
 DEFAULT_LOG_LEVEL = "debug"
@@ -113,11 +113,11 @@ class Paths(object):
 
         if self.installed:
             self.nginx_conf_dir = '@sysconfdir@/nginx/conf.d'
-            self.state_dir = '@localstatedir@/lib/kimchi'
-            self.log_dir = '@localstatedir@/log/kimchi'
-            self.conf_dir = '@sysconfdir@/kimchi'
-            self.src_dir = '@kimchidir@'
-            self.plugins_dir = '@kimchidir@/plugins'
+            self.state_dir = '@localstatedir@/lib/wok'
+            self.log_dir = '@localstatedir@/log/wok'
+            self.conf_dir = '@sysconfdir@/wok'
+            self.src_dir = '@wokdir@'
+            self.plugins_dir = '@wokdir@/plugins'
             self.mo_dir = '@prefix@/share/locale'
             self.spice_css_file = os.path.join(self.spice_dir, 'spice.css')
         else:
@@ -125,7 +125,7 @@ class Paths(object):
             self.state_dir = self.add_prefix('data')
             self.log_dir = self.add_prefix('log')
             self.conf_dir = self.add_prefix('src')
-            self.src_dir = self.add_prefix('src/kimchi')
+            self.src_dir = self.add_prefix('src/wok')
             self.plugins_dir = self.add_prefix('plugins')
             self.mo_dir = self.add_prefix('mo')
             self.spice_css_file = os.path.join(self.spice_dir, 'css/spice.css')
@@ -158,8 +158,8 @@ class PluginPaths(Paths):
         self.plugin_dir = os.path.join('plugins', name)
 
         if self.installed:
-            self.conf_dir = '@sysconfdir@/kimchi/plugins.d'
-            self.src_dir = os.path.join('@kimchidir@', self.plugin_dir)
+            self.conf_dir = '@sysconfdir@/wok/plugins.d'
+            self.src_dir = os.path.join('@wokdir@', self.plugin_dir)
         else:
             self.conf_dir = self.add_prefix(self.plugin_dir)
             self.src_dir = self.add_prefix(self.plugin_dir)
@@ -188,30 +188,30 @@ class UIConfig(dict):
         self.update(ui_configs)
 
 
-class KimchiConfig(dict):
+class WokConfig(dict):
     # session time out is 10 minutes
     SESSIONSTIMEOUT = 10
 
-    kimchi_config = {
+    wok_config = {
         '/': {
             'tools.trailing_slash.on': False,
             'request.methods_with_bodies': ('POST', 'PUT'),
             'tools.nocache.on': True,
             'tools.proxy.on': True,
             'tools.sessions.on': True,
-            'tools.sessions.name': 'kimchi',
+            'tools.sessions.name': 'wok',
             'tools.sessions.secure': True,
             'tools.sessions.httponly': True,
             'tools.sessions.locking': 'explicit',
             'tools.sessions.storage_type': 'ram',
             'tools.sessions.timeout': SESSIONSTIMEOUT,
-            'tools.kimchiauth.on': False
+            'tools.wokauth.on': False
         },
         '/novnc': {
             'tools.staticdir.on': True,
             'tools.staticdir.dir': paths.novnc_dir,
             'tools.nocache.on': True,
-            'tools.kimchiauth.on': True
+            'tools.wokauth.on': True
         },
         '/spice_auto.html': {
             'tools.staticfile.on': True,
@@ -229,8 +229,8 @@ class KimchiConfig(dict):
             'tools.staticfile.filename': paths.spice_css_file,
             'tools.nocache.on': True,
         },
-        '/kimchi-ui.html': {
-            'tools.kimchiauth.on': True
+        '/wok-ui.html': {
+            'tools.wokauth.on': True
         },
         '/data/screenshots': {
             'tools.staticdir.on': True,
@@ -267,8 +267,8 @@ class KimchiConfig(dict):
     }
 
     def __init__(self):
-        super(KimchiConfig, self).__init__(self)
-        self.update(self.kimchi_config)
+        super(WokConfig, self).__init__(self)
+        self.update(self.wok_config)
         self.update(UIConfig(paths))
 
 
@@ -311,7 +311,7 @@ def _get_config():
     config.add_section("display")
     config.set("display", "display_proxy_port", "64667")
 
-    config_file = os.path.join(paths.conf_dir, 'kimchi.conf')
+    config_file = os.path.join(paths.conf_dir, 'wok.conf')
     if os.path.exists(config_file):
         config.read(config_file)
     return config
diff --git a/src/wok/control/base.py b/src/wok/control/base.py
index d926a63..8cfa51c 100644
--- a/src/wok/control/base.py
+++ b/src/wok/control/base.py
@@ -28,7 +28,7 @@ from wok.control.utils import get_class_name, internal_redirect, model_fn
 from wok.control.utils import parse_request, validate_method
 from wok.control.utils import validate_params
 from wok.exception import InvalidOperation, InvalidParameter
-from wok.exception import KimchiException, MissingParameter, NotFoundError
+from wok.exception import WokException, MissingParameter, NotFoundError
 from wok.exception import OperationFailed, UnauthorizedError
 
 
@@ -127,7 +127,7 @@ class Resource(object):
                 raise cherrypy.HTTPError(404, e.message)
             except OperationFailed, e:
                 raise cherrypy.HTTPError(500, e.message)
-            except KimchiException, e:
+            except WokException, e:
                 raise cherrypy.HTTPError(500, e.message)
 
         wrapper.__name__ = action_name
@@ -178,7 +178,7 @@ class Resource(object):
             raise cherrypy.HTTPError(404, e.message)
         except OperationFailed, e:
             raise cherrypy.HTTPError(500, e.message)
-        except KimchiException, e:
+        except WokException, e:
             raise cherrypy.HTTPError(500, e.message)
 
     def is_authorized(self):
@@ -338,7 +338,7 @@ class Collection(object):
             raise cherrypy.HTTPError(404, e.message)
         except OperationFailed, e:
             raise cherrypy.HTTPError(500, e.message)
-        except KimchiException, e:
+        except WokException, e:
             raise cherrypy.HTTPError(500, e.message)
 
 
diff --git a/src/wok/exception.py b/src/wok/exception.py
index f41028b..6f5e9d9 100644
--- a/src/wok/exception.py
+++ b/src/wok/exception.py
@@ -25,7 +25,7 @@ from wok.i18n import messages as _messages
 from wok.template import get_lang, validate_language
 
 
-class KimchiException(Exception):
+class WokException(Exception):
     def __init__(self, code='', args={}):
         self.code = code
 
@@ -38,7 +38,7 @@ class KimchiException(Exception):
                 # In case the value formats itself to an ascii string.
                 args[key] = unicode(str(value), 'utf-8')
             except UnicodeEncodeError:
-                # In case the value is a KimchiException or it formats
+                # In case the value is a WokException or it formats
                 # itself to a unicode string.
                 args[key] = unicode(value)
 
@@ -66,37 +66,37 @@ class KimchiException(Exception):
         return translation.gettext(text)
 
 
-class NotFoundError(KimchiException):
+class NotFoundError(WokException):
     pass
 
 
-class OperationFailed(KimchiException):
+class OperationFailed(WokException):
     pass
 
 
-class MissingParameter(KimchiException):
+class MissingParameter(WokException):
     pass
 
 
-class InvalidParameter(KimchiException):
+class InvalidParameter(WokException):
     pass
 
 
-class InvalidOperation(KimchiException):
+class InvalidOperation(WokException):
     pass
 
 
-class IsoFormatError(KimchiException):
+class IsoFormatError(WokException):
     pass
 
 
-class ImageFormatError(KimchiException):
+class ImageFormatError(WokException):
     pass
 
 
-class TimeoutExpired(KimchiException):
+class TimeoutExpired(WokException):
     pass
 
 
-class UnauthorizedError(KimchiException):
+class UnauthorizedError(WokException):
     pass
diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py
index 7c2a5cc..87a30d1 100644
--- a/src/wok/objectstore.py
+++ b/src/wok/objectstore.py
@@ -30,7 +30,7 @@ except ImportError:
 
 from wok import config
 from wok.exception import NotFoundError
-from wok.utils import kimchi_log
+from wok.utils import wok_log
 
 
 class ObjectStoreSession(object):
@@ -129,5 +129,5 @@ class ObjectStore(object):
         if type is not None and issubclass(type, sqlite3.DatabaseError):
                 # Logs the error and return False, which makes __exit__ raise
                 # exception again
-                kimchi_log.error(traceback.format_exc())
+                wok_log.error(traceback.format_exc())
                 return False
diff --git a/src/wok/proxy.py b/src/wok/proxy.py
index 1c46c11..961f8a7 100644
--- a/src/wok/proxy.py
+++ b/src/wok/proxy.py
@@ -34,13 +34,13 @@ from wok.config import paths
 def _create_proxy_config(options):
     """Create nginx configuration file based on current ports config
 
-    To allow flexibility in which port kimchi runs, we need the same
+    To allow flexibility in which port wok runs, we need the same
     flexibility with the nginx proxy. This method creates the config
     file dynamically by using 'nginx.conf.in' as a template, creating
-    the file 'kimchi.conf' which will be used to launch the proxy.
+    the file 'wok.conf' which will be used to launch the proxy.
 
     Arguments:
-    options - OptionParser object with Kimchi config options
+    options - OptionParser object with Wok config options
     """
     # User that will run the worker process of the proxy. Fedora,
     # RHEL and Suse creates an user called 'nginx' when installing
@@ -58,8 +58,8 @@ def _create_proxy_config(options):
 
     # No certificates specified by the user
     if not cert or not key:
-        cert = '%s/kimchi-cert.pem' % config_dir
-        key = '%s/kimchi-key.pem' % config_dir
+        cert = '%s/wok-cert.pem' % config_dir
+        key = '%s/wok-key.pem' % config_dir
         # create cert files if they don't exist
         if not os.path.exists(cert) or not os.path.exists(key):
             ssl_gen = sslcert.SSLCert()
@@ -73,19 +73,19 @@ def _create_proxy_config(options):
 
     # Read template file and create a new config file
     # with the specified parameters.
-    with open(os.path.join(nginx_config_dir, "kimchi.conf.in")) as template:
+    with open(os.path.join(nginx_config_dir, "wok.conf.in")) as template:
         data = template.read()
     data = Template(data)
     data = data.safe_substitute(user=user_proxy,
                                 proxy_port=options.port,
-                                kimchid_port=options.cherrypy_port,
+                                wokd_port=options.cherrypy_port,
                                 proxy_ssl_port=options.ssl_port,
                                 cert_pem=cert, cert_key=key,
                                 max_body_size=eval(options.max_body_size),
                                 dhparams_pem=dhparams_pem)
 
     # Write file to be used for nginx.
-    config_file = open(os.path.join(nginx_config_dir, "kimchi.conf"), "w")
+    config_file = open(os.path.join(nginx_config_dir, "wok.conf"), "w")
     config_file.write(data)
     config_file.close()
 
@@ -94,7 +94,7 @@ def start_proxy(options):
     """Start nginx reverse proxy."""
     _create_proxy_config(options)
     nginx_config_dir = paths.nginx_conf_dir
-    config_file = "%s/kimchi.conf" % nginx_config_dir
+    config_file = "%s/wok.conf" % nginx_config_dir
     cmd = ['nginx', '-c', config_file]
     subprocess.call(cmd)
 
diff --git a/src/wok/server.py b/src/wok/server.py
index 5394d24..0f99663 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -80,9 +80,9 @@ class Server(object):
         # thus it is safe to unsubscribe.
         cherrypy.engine.timeout_monitor.unsubscribe()
         cherrypy.tools.nocache = cherrypy.Tool('on_end_resource', set_no_cache)
-        cherrypy.tools.kimchiauth = cherrypy.Tool('before_handler',
-                                                  auth.kimchiauth)
-        # Setting host to 127.0.0.1. This makes kimchi runs
+        cherrypy.tools.wokauth = cherrypy.Tool('before_handler',
+                                                   auth.wokauth)
+        # Setting host to 127.0.0.1. This makes wok run
         # as a localhost app, inaccessible to the outside
         # directly. You must go through the proxy.
         cherrypy.server.socket_host = '127.0.0.1'
@@ -139,7 +139,7 @@ class Server(object):
             if node.url_auth:
                 cfg = self.configObj
                 ident = "/%s" % ident
-                cfg[ident] = {'tools.kimchiauth.on': True}
+                cfg[ident] = {'tools.wokauth.on': True}
 
         self.app = cherrypy.tree.mount(KimchiRoot(model_instance, dev_env),
                                        config=self.configObj)
@@ -155,9 +155,9 @@ class Server(object):
             try:
                 plugin_class = ('plugins.%s.%s' %
                                 (plugin_name,
-                                 plugin_config['kimchi']['plugin_class']))
-                script_name = plugin_config['kimchi']['uri']
-                del plugin_config['kimchi']
+                                 plugin_config['wok']['plugin_class']))
+                script_name = plugin_config['wok']['uri']
+                del plugin_config['wok']
 
                 plugin_config.update(PluginConfig(plugin_name))
             except KeyError:
diff --git a/src/wok/template.py b/src/wok/template.py
index 46c0f3c..e192ca4 100644
--- a/src/wok/template.py
+++ b/src/wok/template.py
@@ -29,8 +29,8 @@ from glob import iglob
 
 def get_lang():
     cookie = cherrypy.request.cookie
-    if "kimchiLang" in cookie.keys():
-        return [cookie["kimchiLang"].value]
+    if "wokLang" in cookie.keys():
+        return [cookie["wokLang"].value]
 
     lang = cherrypy.request.headers.get("Accept-Language", "en_US")
 
diff --git a/src/wok/utils.py b/src/wok/utils.py
index d8ad25f..f5058d5 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -40,7 +40,7 @@ from wok.config import paths, PluginPaths
 from wok.exception import InvalidParameter, TimeoutExpired
 
 
-kimchi_log = cherrypy.log.error_log
+wok_log = cherrypy.log.error_log
 task_id = 0
 
 
@@ -106,7 +106,7 @@ def get_enabled_plugins():
         if os.path.isdir(os.path.join(plugin_dir, name)):
             plugin_config = _load_plugin_conf(name)
             try:
-                if plugin_config['kimchi']['enable']:
+                if plugin_config['wok']['enable']:
                     yield (name, plugin_config)
             except (TypeError, KeyError):
                 continue
@@ -200,22 +200,22 @@ def run_command(cmd, timeout=None):
             timer.start()
 
         out, error = proc.communicate()
-        kimchi_log.debug("Run command: '%s'", " ".join(cmd))
+        wok_log.debug("Run command: '%s'", " ".join(cmd))
 
         if out:
-            kimchi_log.debug("out:\n%s", out)
+            wok_log.debug("out:\n%s", out)
 
         if proc.returncode != 0:
-            kimchi_log.error("rc: %s error: %s returned from cmd: %s",
+            wok_log.error("rc: %s error: %s returned from cmd: %s",
                              proc.returncode, error, ' '.join(cmd))
         elif error:
-            kimchi_log.debug("error: %s returned from cmd: %s",
+            wok_log.debug("error: %s returned from cmd: %s",
                              error, ' '.join(cmd))
 
         if timeout_flag[0]:
             msg = ("subprocess is killed by signal.SIGKILL for "
                    "timeout %s seconds" % timeout)
-            kimchi_log.error(msg)
+            wok_log.error(msg)
 
             msg_args = {'cmd': " ".join(cmd), 'seconds': str(timeout)}
             raise TimeoutExpired("KCHUTILS0002E", msg_args)
@@ -225,13 +225,13 @@ def run_command(cmd, timeout=None):
         raise
     except OSError as e:
         msg = "Impossible to execute '%s'" % ' '.join(cmd)
-        kimchi_log.debug("%s", msg)
+        wok_log.debug("%s", msg)
 
         return None, "%s %s" % (msg, e), -1
     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 %s", msg, e)
+        wok_log.error("%s %s", msg, e)
 
         if proc:
             return out, error, proc.returncode
@@ -255,7 +255,7 @@ def patch_find_nfs_target(nfs_server):
     try:
         out = run_command(cmd, 10)[0]
     except TimeoutExpired:
-        kimchi_log.warning("server %s query timeout, may not have any path "
+        wok_log.warning("server %s query timeout, may not have any path "
                            "exported", nfs_server)
         return list()
 
@@ -293,7 +293,7 @@ def probe_file_permission_as_user(file, user):
             with open(file):
                 q.put((True, None))
         except Exception as e:
-            kimchi_log.debug(traceback.format_exc())
+            wok_log.debug(traceback.format_exc())
             q.put((False, e))
 
     queue = Queue()
diff --git a/src/wok/vnc.py b/src/wok/vnc.py
index e50e9f2..3b6a80b 100644
--- a/src/wok/vnc.py
+++ b/src/wok/vnc.py
@@ -28,7 +28,7 @@ from websockify import WebSocketProxy
 from wok.config import config, paths
 
 
-WS_TOKENS_DIR = '/var/lib/kimchi/vnc-tokens'
+WS_TOKENS_DIR = '/var/lib/wok/vnc-tokens'
 
 
 def new_ws_proxy():
@@ -41,8 +41,8 @@ def new_ws_proxy():
     cert = config.get('server', 'ssl_cert')
     key = config.get('server', 'ssl_key')
     if not (cert and key):
-        cert = '%s/kimchi-cert.pem' % paths.conf_dir
-        key = '%s/kimchi-key.pem' % paths.conf_dir
+        cert = '%s/wok-cert.pem' % paths.conf_dir
+        key = '%s/wok-key.pem' % paths.conf_dir
 
     params = {'web': os.path.join(paths.ui_dir, 'pages/websockify'),
               'listen_port': config.get('display', 'display_proxy_port'),
diff --git a/src/wokd.in b/src/wokd.in
index 62a8504..f225361 100644
--- a/src/wokd.in
+++ b/src/wokd.in
@@ -32,8 +32,8 @@ import wok.config as config
 if not config.paths.installed:
     sys.path.append(config.paths.prefix)
 
-ACCESS_LOG = "kimchi-access.log"
-ERROR_LOG = "kimchi-error.log"
+ACCESS_LOG = "wok-access.log"
+ERROR_LOG = "wok-error.log"
 
 
 def main(options):
@@ -69,7 +69,7 @@ def main(options):
                       default=os.path.join(logDir, ERROR_LOG),
                       help="Error log file")
     parser.add_option('--environment', default=runningEnv,
-                      help="Running environment of kimchi server")
+                      help="Running environment of wok server")
     parser.add_option('--federation', default=federation,
                       help="Register and discover Kimchi peers in the same "
                            "network using openSLP. Check README-federation for"
diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css
index a6a845e..dfc20ff 100644
--- a/ui/css/theme-default/grid.css
+++ b/ui/css/theme-default/grid.css
@@ -236,7 +236,7 @@
 }
 
 .grid-loading-icon {
-    background: url("../images/theme-default/kimchi-loading.gif") no-repeat left top;
+    background: url("../images/theme-default/wok-loading.gif") no-repeat left top;
     height: 48px;
     width: 49px;
 }
diff --git a/ui/js/src/wok.cookie.js b/ui/js/src/wok.cookie.js
index f1b52db..bc0a06d 100644
--- a/ui/js/src/wok.cookie.js
+++ b/ui/js/src/wok.cookie.js
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.cookie = {
+wok.cookie = {
     set: function(key, value, expireDays) {
         value = encodeURIComponent(value);
         value += '; secure'
diff --git a/ui/js/src/wok.grid.js b/ui/js/src/wok.grid.js
index 6fed753..84f8d33 100644
--- a/ui/js/src/wok.grid.js
+++ b/ui/js/src/wok.grid.js
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.widget.Grid = function(opts) {
+wok.widget.Grid = function(opts) {
     this.opts = $.extend({}, this.opts, opts);
     this.createDOM();
     this.reload();
 };
 
-kimchi.widget.Grid.prototype = (function() {
+wok.widget.Grid.prototype = (function() {
     var htmlStr = [
         '<div id="{id}" class="grid">',
             '<div class="grid-content">',
@@ -237,7 +237,7 @@ kimchi.widget.Grid.prototype = (function() {
 
     var startResizing = function(container, event) {
         var grid = event.data.grid;
-        kimchi.widget.Grid.beingResized = grid;
+        wok.widget.Grid.beingResized = grid;
         if(!($('body').hasClass('resizing')
                 && $(grid.resizer).hasClass('hidden'))) {
             return;
@@ -263,7 +263,7 @@ kimchi.widget.Grid.prototype = (function() {
     };
 
     var endResizing = function(event) {
-        var grid = kimchi.widget.Grid.beingResized;
+        var grid = wok.widget.Grid.beingResized;
         if(!$('body').hasClass('resizing')) {
             return;
         }
@@ -282,7 +282,7 @@ kimchi.widget.Grid.prototype = (function() {
         );
         fixTableLayout.call(grid);
         grid.columnBeingResized = null;
-        kimchi.widget.Grid.beingResized = null;
+        wok.widget.Grid.beingResized = null;
     };
 
     var resizeColumnWidth = function(index, width) {
@@ -376,7 +376,7 @@ kimchi.widget.Grid.prototype = (function() {
         var container = $('#' + containerID);
         var gridID = this['opts']['id'];
         var rowSelection = this['opts']['rowSelection'] || 'single';
-        var domNode = $(kimchi.substitute(htmlStr, {
+        var domNode = $(wok.substitute(htmlStr, {
             id: gridID,
             loading: i18n['KCHGRD6001M'],
             message: i18n['KCHGRD6002M'],
diff --git a/ui/js/src/wok.lang.js b/ui/js/src/wok.lang.js
index 1d2de4e..ef8e923 100644
--- a/ui/js/src/wok.lang.js
+++ b/ui/js/src/wok.lang.js
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.lang = {
+wok.lang = {
     all: function() {
         return {
           'en_US': 'English (US)',
@@ -39,12 +39,12 @@ kimchi.lang = {
      * 3) DEFAULT (en_US).
      */
     get: function() {
-        return kimchi.cookie.get('kimchiLang') ||
+        return wok.cookie.get('wokLang') ||
             $('html').prop('lang') ||
             'en_US';
     },
 
     set: function(lang) {
-        kimchi.cookie.set('kimchiLang', lang, 365);
+        wok.cookie.set('wokLang', lang, 365);
     }
 };
diff --git a/ui/js/src/wok.line-chart.js b/ui/js/src/wok.line-chart.js
index d2f40db..8b40288 100644
--- a/ui/js/src/wok.line-chart.js
+++ b/ui/js/src/wok.line-chart.js
@@ -17,13 +17,13 @@
  */
 
 /**
- * new kimchi.widget.LineChart({
+ * new wok.widget.LineChart({
  *   node: 'line-chart-cpu',
  *   id: 'line-chart',
  *   type: 'value'
  * });
  */
-kimchi.widget.LineChart = function(params) {
+wok.widget.LineChart = function(params) {
     var container = $('#' + params['node']);
     container.addClass('chart-container');
     var height = container.height();
@@ -109,7 +109,7 @@ kimchi.widget.LineChart = function(params) {
 
         var maxValueLabel = i18n['KCHHOST6001M'] + ' ' +
             (type === 'value'
-                ? kimchi.formatMeasurement(maxValue, formatSettings)
+                ? wok.formatMeasurement(maxValue, formatSettings)
                 : '100%');
         if(!chartVAxis) {
             chartVAxis = $('<div class="chart-vaxis-container">' +
@@ -182,7 +182,7 @@ kimchi.widget.LineChart = function(params) {
             var latestPoint = data[i]['points'].slice(-1).pop();
             var latestValue = latestPoint['y'];
             if(type === 'value') {
-                latestValue = kimchi.formatMeasurement(
+                latestValue = wok.formatMeasurement(
                     latestValue,
                     formatSettings
                 );
diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js
index c737d26..926d80c 100644
--- a/ui/js/src/wok.login.js
+++ b/ui/js/src/wok.login.js
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.login_main = function() {
+wok.login_main = function() {
 
-    var selectedLanguage = kimchi.lang.get();
+    var selectedLanguage = wok.lang.get();
     $('#userLang').val(selectedLanguage);
 
     $('#userLang').on('change', function() {
-        kimchi.lang.set($(this).val());
+        wok.lang.set($(this).val());
         location.reload();
     });
 
@@ -40,23 +40,23 @@ kimchi.login_main = function() {
         $("#logging").show();
 
         var userName = userNameBox.val();
-        userName && kimchi.user.setUserName(userName);
+        userName && wok.user.setUserName(userName);
         var settings = {
             username: userName,
             password: passwordBox.val()
         };
 
-        kimchi.login(settings, function(data) {
+        wok.login(settings, function(data) {
             var query = window.location.search;
             var next  = /.*next=(.*?)(&|$)/g.exec(query);
             if (next) {
                 var next_url = decodeURIComponent(next[1]);
             }
             else {
-                var lastPage = kimchi.cookie.get('lastPage');
+                var lastPage = wok.cookie.get('lastPage');
                 var next_url = lastPage ? lastPage.replace(/\"/g,'') : "/";
             }
-            kimchi.cookie.set('roles',JSON.stringify(data.roles));
+            wok.cookie.set('roles',JSON.stringify(data.roles));
             window.location.replace(window.location.pathname.replace(/\/+login.html/, '') + next_url)
         }, function() {
             $("#messUserPass").show();
diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js
index 0d4ad43..089b523 100644
--- a/ui/js/src/wok.main.js
+++ b/ui/js/src/wok.main.js
@@ -15,21 +15,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.tabMode = {};
+wok.tabMode = {};
 
-kimchi.capabilities = undefined;
-kimchi.getCapabilities(function(result) {
-    kimchi.capabilities = result;
+wok.capabilities = undefined;
+wok.getCapabilities(function(result) {
+    wok.capabilities = result;
 
-    if(kimchi.capabilities.federation=="on")
+    if(wok.capabilities.federation=="on")
         $('#peers').removeClass('hide-content');
 }, function() {
-    kimchi.capabilities = {};
+    wok.capabilities = {};
 });
 
-kimchi.main = function() {
-    kimchi.isLoggingOut = false;
-    kimchi.popable();
+wok.main = function() {
+    wok.isLoggingOut = false;
+    wok.popable();
 
     var genTabs = function(tabs) {
         var tabsHtml = [];
@@ -38,7 +38,7 @@ kimchi.main = function() {
             var path = tab['path'];
             var mode = tab['mode'];
             if (mode != 'none') {
-                var helpPath = kimchi.checkHelpFile(path);
+                var helpPath = wok.checkHelpFile(path);
                 var disableHelp = (helpPath.length == 0 ? "disableHelp" : helpPath);
                 tabsHtml.push(
                     '<li>',
@@ -60,11 +60,11 @@ kimchi.main = function() {
             var titleKey = $tab.find('title').text();
             var title = i18n[titleKey] ? i18n[titleKey] : titleKey;
             var path = $tab.find('path').text();
-            var roles = kimchi.cookie.get('roles');
+            var roles = wok.cookie.get('roles');
             if (roles) {
                 var role = JSON.parse(roles)[titleKey.toLowerCase()];
                 var mode = $tab.find('[role="' + role + '"]').attr('mode');
-                kimchi.tabMode[titleKey.toLowerCase()] = mode;
+                wok.tabMode[titleKey.toLowerCase()] = mode;
                 tabs.push({
                     title: title,
                     path: path,
@@ -96,15 +96,15 @@ kimchi.main = function() {
     var DEFAULT_HASH;
     var buildTabs = function(callback) {
         var tabs = retrieveTabs(tabConfigUrl);
-        kimchi.listPlugins(function(plugins) {
+        wok.listPlugins(function(plugins) {
             $(plugins).each(function(i, p) {
-                var url = kimchi.substitute(pluginConfigUrl, {
+                var url = wok.substitute(pluginConfigUrl, {
                     plugin: p
                 });
-                var i18nUrl = kimchi.substitute(pluginI18nUrl, {
+                var i18nUrl = wok.substitute(pluginI18nUrl, {
                     plugin: p
                 });
-                kimchi.getI18n(function(i18nObj){ $.extend(i18n, i18nObj)},
+                wok.getI18n(function(i18nObj){ $.extend(i18n, i18nObj)},
                                function(i18nObj){ //i18n is not define by plugin
                                }, i18nUrl, true);
                 tabs.push.apply(tabs, retrieveTabs(url));
@@ -121,12 +121,12 @@ kimchi.main = function() {
 
             callback && callback();
         }, function(data) {
-           kimchi.message.error(data.responseJSON.reason);
+           wok.message.error(data.responseJSON.reason);
         }, true);
     };
 
     var onLanguageChanged = function(lang) {
-        kimchi.lang.set(lang);
+        wok.lang.set(lang);
         location.reload();
     };
 
@@ -140,7 +140,7 @@ kimchi.main = function() {
      *      Move the page tab indicator to the right position;
      *      Load the page content via Ajax.
      */
-    var onKimchiRedirect = function(url) {
+    var onWokRedirect = function(url) {
         /*
          * Find the corresponding tab node and animate the arrow indicator to
          * point to the tab. If nothing found, inform user the URL is invalid
@@ -170,7 +170,7 @@ kimchi.main = function() {
         }
         else {
             $('#btn-help').css('cursor', "pointer");
-            $('#btn-help').on("click", kimchi.openHelp);
+            $('#btn-help').on("click", wok.openHelp);
         }
         // Load page content.
         loadPage(url);
@@ -209,13 +209,13 @@ kimchi.main = function() {
             location.hash = DEFAULT_HASH;
         }
         else {
-            kimchi.topic('redirect').publish(hashString + '.html');
+            wok.topic('redirect').publish(hashString + '.html');
         }
     };
 
     /**
      * Register listeners including:
-     * 1) Kimchi redirect event
+     * 1) wok redirect event
      * 2) hashchange event
      * 3) Tab list click event
      * 4) Log-out button click event
@@ -225,8 +225,8 @@ kimchi.main = function() {
      */
     var searchingPeers = false;
     var initListeners = function() {
-        kimchi.topic('languageChanged').subscribe(onLanguageChanged);
-        kimchi.topic('redirect').subscribe(onKimchiRedirect);
+        wok.topic('languageChanged').subscribe(onLanguageChanged);
+        wok.topic('redirect').subscribe(onWokRedirect);
 
         /*
          * If hash value is changed, then we know the user is intended to load
@@ -246,7 +246,7 @@ kimchi.main = function() {
              * We use the HTML file name for hash, like: guests for guests.html
              * and templates for templates.html.
              *     Retrieve hash value from the given URL and update location's
-             * hash part. It has 2 effects: one is to publish Kimchi "redirect"
+             * hash part. It has 2 effects: one is to publish Wok "redirect"
              * event to trigger listener, the other is to put an entry into the
              * browser's address history to make pages be bookmark-able.
              */
@@ -256,22 +256,22 @@ kimchi.main = function() {
 
         // Perform logging out via Ajax request.
         $('#btn-logout').on('click', function() {
-            kimchi.logout(function() {
-                kimchi.isLoggingOut = true;
+            wok.logout(function() {
+                wok.isLoggingOut = true;
                 document.location.href = "login.html";
             }, function(err) {
-                kimchi.message.error(err.responseJSON.reason);
+                wok.message.error(err.responseJSON.reason);
             });
         });
 
         // Set handler for about button
         $('#btn-about').on('click', function(event) {
-            kimchi.window.open({"content": $('#about-tmpl').html()});
+            wok.window.open({"content": $('#about-tmpl').html()});
             event.preventDefault();
             });
 
         // Set handler for help button
-        $('#btn-help').on('click', kimchi.openHelp);
+        $('#btn-help').on('click', wok.openHelp);
 
         // Set handler to peers drop down
         $('#peers').on('click', function() {
@@ -301,46 +301,46 @@ kimchi.main = function() {
 
     var initUI = function() {
         $(document).bind('ajaxError', function(event, jqXHR, ajaxSettings, errorThrown) {
-            if (!ajaxSettings['kimchi']) {
+            if (!ajaxSettings['wok']) {
                 return;
             }
 
             if (jqXHR['status'] === 401) {
                 var isSessionTimeout = jqXHR['responseText'].indexOf("sessionTimeout")!=-1;
-                kimchi.user.showUser(false);
-                kimchi.previousAjax = ajaxSettings;
+                wok.user.showUser(false);
+                wok.previousAjax = ajaxSettings;
                 $(".empty-when-logged-off").empty();
                 $(".remove-when-logged-off").remove();
                 document.location.href= isSessionTimeout ? 'login.html?error=sessionTimeout' : 'login.html';
                 return;
             }
-            else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText) && !kimchi.isLoggingOut) {
-                kimchi.message.error(i18n['KCHAPI6007E'].replace("%1", jqXHR.state()));
+            else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText) && !wok.isLoggingOut) {
+                wok.message.error(i18n['KCHAPI6007E'].replace("%1", jqXHR.state()));
             }
             if(ajaxSettings['originalError']) {
                 ajaxSettings['originalError'](jqXHR, jqXHR.statusText, errorThrown);
             }
         });
 
-        kimchi.user.showUser(true);
+        wok.user.showUser(true);
         initListeners();
         updatePage();
     };
 
     // Load i18n translation strings first and then render the page.
-    kimchi.getI18n(
+    wok.getI18n(
         function(i18nStrings){ //success
             i18n = i18nStrings;
             buildTabs(initUI);
             },
         function(data){ //error
-            kimchi.message.error(data.responseJSON.reason);
+            wok.message.error(data.responseJSON.reason);
             });
 };
 
 
-kimchi.checkHelpFile = function(path) {
-    var lang = kimchi.lang.get();
+wok.checkHelpFile = function(path) {
+    var lang = wok.lang.get();
     var url = ""
     // Find help page path according to tab name
     if (/^tabs/.test(path))
@@ -358,9 +358,9 @@ kimchi.checkHelpFile = function(path) {
 };
 
 
-kimchi.openHelp = function(e) {
+wok.openHelp = function(e) {
     var tab = $('#nav-menu a.current');
     var url = $(tab).parent().find("input[name='helpPath']").val();
-    window.open(url, "Kimchi Help");
+    window.open(url, "Wok Help");
     e.preventDefault();
 };
diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js
index 241626f..db1dc36 100644
--- a/ui/js/src/wok.message.js
+++ b/ui/js/src/wok.message.js
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.message = function(msg, level, node) {
+wok.message = function(msg, level, node) {
     var container = node || $('#messageField');
     if ($(container).size() < 1) {
         container = $('<div id="messageField"/>').appendTo(document.body);
@@ -61,7 +61,7 @@ kimchi.message = function(msg, level, node) {
  * @param cancelCallback
  *            The callback function of click the cancel and X button.
  */
-kimchi.confirm = function(settings, confirmCallback, cancelCallback) {
+wok.confirm = function(settings, confirmCallback, cancelCallback) {
     if ($('#confirmbox-container ').size() < 1) {
         $(document.body).append('<div id="confirmbox-container" class="bgmask"></div>');
     }
@@ -101,16 +101,16 @@ kimchi.confirm = function(settings, confirmCallback, cancelCallback) {
     });
 };
 
-kimchi.message.warn = function(msg, node) {
-    kimchi.message(msg, 'warn', node);
+wok.message.warn = function(msg, node) {
+    wok.message(msg, 'warn', node);
 };
-kimchi.message.error = function(msg, node) {
-    kimchi.message(msg, 'error', node);
+wok.message.error = function(msg, node) {
+    wok.message(msg, 'error', node);
 };
-kimchi.message.error.code = function(code) {
+wok.message.error.code = function(code) {
     msg = code + ": " + i18n[code]
-    kimchi.message(msg, 'error');
+    wok.message(msg, 'error');
 };
-kimchi.message.success = function(msg, node) {
-    kimchi.message(msg, 'success', node);
+wok.message.success = function(msg, node) {
+    wok.message(msg, 'success', node);
 };
diff --git a/ui/js/src/wok.popable.js b/ui/js/src/wok.popable.js
index fb57010..7c01a0e 100644
--- a/ui/js/src/wok.popable.js
+++ b/ui/js/src/wok.popable.js
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.popable = function() {
+wok.popable = function() {
     $(document).click(function(e) {
         $('.popable').each(function(i, n) {
             n === e.target || $.contains(n, e.target) ||
@@ -28,7 +28,7 @@ kimchi.popable = function() {
 
         // Scroll the popup menu into viewport if invisible.
         !$(popup).is(':visible') ||
-            kimchi.isElementInViewport(popup) ||
+            wok.isElementInViewport(popup) ||
             popup.scrollIntoView();
     });
 };
diff --git a/ui/js/src/wok.select.js b/ui/js/src/wok.select.js
index 751167f..60830a5 100644
--- a/ui/js/src/wok.select.js
+++ b/ui/js/src/wok.select.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-kimchi.select = function(id, options) {
+wok.select = function(id, options) {
     var listControl = $('#'+ id);
     var targetId = listControl.data('target');
     var labelId = listControl.data('label');
diff --git a/ui/js/src/wok.substitute.js b/ui/js/src/wok.substitute.js
index 434d9d3..225f967 100644
--- a/ui/js/src/wok.substitute.js
+++ b/ui/js/src/wok.substitute.js
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.substitute = function(templateStr, data, tag) {
+wok.substitute = function(templateStr, data, tag) {
     tag = tag || /\{([^\}]+)\}/g;
 
     var escapeHtml = function(html) {
diff --git a/ui/js/src/wok.topic.js b/ui/js/src/wok.topic.js
index fd62ffe..0b8b148 100644
--- a/ui/js/src/wok.topic.js
+++ b/ui/js/src/wok.topic.js
@@ -19,11 +19,11 @@
 /**
  * pub/sub
  * Usage:
- *   Publish - kimchi.topic('eventname').publish(params);
- *   Subscribe - kimchi.topic('eventname').subscribe(listener);
- *   Unsubscribe - kimchi.topic('eventname').unsubscribe(listener);
+ *   Publish - wok.topic('eventname').publish(params);
+ *   Subscribe - wok.topic('eventname').subscribe(listener);
+ *   Unsubscribe - wok.topic('eventname').unsubscribe(listener);
  */
-kimchi.topic = (function() {
+wok.topic = (function() {
 
     var topics = {};
 
diff --git a/ui/js/src/wok.user.js b/ui/js/src/wok.user.js
index c036155..e642801 100644
--- a/ui/js/src/wok.user.js
+++ b/ui/js/src/wok.user.js
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.user = (function() {
+wok.user = (function() {
     var getUserName = function() {
-        return kimchi.cookie.get('username');
+        return wok.cookie.get('username');
     };
 
     var setUserName = function(userName) {
-        kimchi.cookie.set('username', userName, 365);
+        wok.cookie.set('username', userName, 365);
     };
 
     var showUser = function(toShow) {
diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js
index f26a560..23aa30c 100644
--- a/ui/js/src/wok.utils.js
+++ b/ui/js/src/wok.utils.js
@@ -26,7 +26,7 @@
  *     false if the node is not entirely visible, or
  *     undefined if the given parameter is invalid.
  */
-kimchi.isElementInViewport = function(el) {
+wok.isElementInViewport = function(el) {
     if (!el || !el.getBoundingClientRect) {
         return undefined;
     }
@@ -47,7 +47,7 @@ kimchi.isElementInViewport = function(el) {
  * @param digits after the decimal point.
  * @returns str with unit.
  */
-kimchi.changetoProperUnit = function(numOrg, digits, base) {
+wok.changetoProperUnit = function(numOrg, digits, base) {
     if (numOrg === undefined) {
         return "";
     }
@@ -65,7 +65,7 @@ kimchi.changetoProperUnit = function(numOrg, digits, base) {
 };
 
 /**
- * kimchi.formatMeasurement util.
+ * wok.formatMeasurement util.
  *
  * Refer to "Units of information" (
  *   http://en.wikipedia.org/wiki/Units_of_information
@@ -158,15 +158,15 @@ kimchi.changetoProperUnit = function(numOrg, digits, base) {
         return new Formatted(fixed ? number.toFixed(fixed) : number, unit);
     };
 
-    kimchi.formatMeasurement = format;
+    wok.formatMeasurement = format;
 })();
 
-kimchi.isUnsignedNumeric = function(number) {
+wok.isUnsignedNumeric = function(number) {
     var reg = /^d+(.d+)?$/
     return reg.test(number);
 }
 
-kimchi.isServer = function(server) {
+wok.isServer = function(server) {
     var domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}";
     var ip = "(\\d{1,3}\.){3}\\d{1,3}";
     regex = new RegExp('^' + domain + '|' + ip + '$');
@@ -177,17 +177,17 @@ kimchi.isServer = function(server) {
     }
 };
 
-kimchi.escapeStr = function(str) {
+wok.escapeStr = function(str) {
     if (str)
         return str.replace(/([ #;?%&,.+*~\\':"!^$[\]()<=>`{|}\/@])/g,'\\$&');
 
     return str;
 };
 
-kimchi.urlSafeB64Decode = function(str) {
+wok.urlSafeB64Decode = function(str) {
     return atob(str.replace(/-/g, '+').replace(/_/g, '/'));
 }
 
-kimchi.urlSafeB64Encode = function(str) {
+wok.urlSafeB64Encode = function(str) {
     return btoa(str).replace(/\+/g, '-').replace(/\//g, '_');
 }
diff --git a/ui/js/src/wok.window.js b/ui/js/src/wok.window.js
index 3ac8699..5542270 100644
--- a/ui/js/src/wok.window.js
+++ b/ui/js/src/wok.window.js
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-kimchi.window = (function() {
+wok.window = (function() {
     var _windows = [];
     var _listeners = {};
     var open = function(settings) {
@@ -39,7 +39,7 @@ kimchi.window = (function() {
         $(windowNode).css(settings['style'] || '');
 
         $(windowNode).appendTo('body').on('click', '.window .close', function() {
-            kimchi.window.close();
+            wok.window.close();
         });
 
         if (settings['url']) {
diff --git a/ui/js/widgets/button-dropDown.js b/ui/js/widgets/button-dropDown.js
index 9157dde..ec6bd2a 100644
--- a/ui/js/widgets/button-dropDown.js
+++ b/ui/js/widgets/button-dropDown.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 (function($) {
-    $.widget('kimchi.dropdownButton', {
+    $.widget('wok.dropdownButton', {
 
         _create : function() {
             this.actionDiv = this.element;
diff --git a/ui/js/widgets/button-flat.js b/ui/js/widgets/button-flat.js
index 70a9b6d..bc72544 100755
--- a/ui/js/widgets/button-flat.js
+++ b/ui/js/widgets/button-flat.js
@@ -59,7 +59,7 @@ var lastActive,
         return radios;
     };
 
-$.widget( "kimchi.buttonFlat", {
+$.widget( "wok.buttonFlat", {
     version: "@VERSION",
     defaultElement: "<button>",
     options: {
diff --git a/ui/js/widgets/checkbox-flat.js b/ui/js/widgets/checkbox-flat.js
index 877a52d..8a2564f 100644
--- a/ui/js/widgets/checkbox-flat.js
+++ b/ui/js/widgets/checkbox-flat.js
@@ -29,7 +29,7 @@
 //     });
 
  (function($) {
-    $.widget("kimchi.checkboxFlat", {
+    $.widget("wok.checkboxFlat", {
         options: {
             id: "",
             name: "",
@@ -83,4 +83,4 @@
             this.element.remove();
         }
     });
- })(jQuery);
\ No newline at end of file
+ })(jQuery);
diff --git a/ui/js/widgets/circleGauge.js b/ui/js/widgets/circleGauge.js
index 32973ac..52ec027 100644
--- a/ui/js/widgets/circleGauge.js
+++ b/ui/js/widgets/circleGauge.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
  (function($) {
-    $.widget('kimchi.circleGauge', {
+    $.widget('wok.circleGauge', {
 
         options : {
             color : '#87C004',
@@ -95,6 +95,6 @@
     });
 }(jQuery));
 
-kimchi.circleGauge = function(selector) {
+wok.circleGauge = function(selector) {
     $(selector).circleGauge();
 };
diff --git a/ui/js/widgets/combobox.js b/ui/js/widgets/combobox.js
index b0edd88..92244a2 100644
--- a/ui/js/widgets/combobox.js
+++ b/ui/js/widgets/combobox.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 (function($) {
-    $.widget('kimchi.combobox', {
+    $.widget('wok.combobox', {
         _create : function() {
             this.selectDiv = this.element;
             this.listControl = this.selectDiv.find('ul').first();
diff --git a/ui/js/widgets/dialog-flat.js b/ui/js/widgets/dialog-flat.js
index 44f5432..22fc1f0 100644
--- a/ui/js/widgets/dialog-flat.js
+++ b/ui/js/widgets/dialog-flat.js
@@ -30,7 +30,7 @@
  */
 
 (function( $ ) {
-    $.widget("kimchi.dialogFlat", {
+    $.widget("wok.dialogFlat", {
         options: {
             title: "",
             autoOpen: true,
@@ -117,4 +117,4 @@
             $("#dialog-overlay").remove();
         }
     });
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js
index 020c567..db6b4b0 100644
--- a/ui/js/widgets/filter-select.js
+++ b/ui/js/widgets/filter-select.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 (function($) {
-    $.widget('kimchi.filterselect', {
+    $.widget('wok.filterselect', {
         _create : function() {
             this.selectDiv = this.element;
             this.listControl = this.selectDiv.find('ul').first();
diff --git a/ui/js/widgets/gauge-flat.js b/ui/js/widgets/gauge-flat.js
index 2b807ae..f715bb6 100755
--- a/ui/js/widgets/gauge-flat.js
+++ b/ui/js/widgets/gauge-flat.js
@@ -33,7 +33,7 @@
 
 (function( $ ) {
 
-return $.widget( "kimchi.gaugeFlat", {
+return $.widget( "wok.gaugeFlat", {
     version: "@VERSION",
     options: {
         max: 100,
diff --git a/ui/js/widgets/grid.js b/ui/js/widgets/grid.js
index 21316fb..bc6a11d 100644
--- a/ui/js/widgets/grid.js
+++ b/ui/js/widgets/grid.js
@@ -17,7 +17,7 @@
  */
 
 $(function(){
-$.widget("kimchi.grid", {
+$.widget("wok.grid", {
     options: {
         enableSorting: true
     },
diff --git a/ui/js/widgets/line.js b/ui/js/widgets/line.js
index 4c63917..8fcc4ba 100644
--- a/ui/js/widgets/line.js
+++ b/ui/js/widgets/line.js
@@ -17,7 +17,7 @@
  */
 
 $(function(){
-$.widget("kimchi.line", {
+$.widget("wok.line", {
     options: {
         xShift: true,
         minVal: 0,
diff --git a/ui/js/widgets/list-flat.js b/ui/js/widgets/list-flat.js
index f76eec6..8e9ea84 100644
--- a/ui/js/widgets/list-flat.js
+++ b/ui/js/widgets/list-flat.js
@@ -26,7 +26,7 @@
 
  (function($) {
 
-    $.widget("kimchi.listFlat", {
+    $.widget("wok.listFlat", {
 
         options: {
             title: null
@@ -73,4 +73,4 @@
             this.element.remove();
         }
     });
- })(jQuery);
\ No newline at end of file
+ })(jQuery);
diff --git a/ui/js/widgets/menu-flat.js b/ui/js/widgets/menu-flat.js
index 8d1a546..8263393 100644
--- a/ui/js/widgets/menu-flat.js
+++ b/ui/js/widgets/menu-flat.js
@@ -33,7 +33,7 @@
 
 
  (function( $ ) {
-    $.widget("kimchi.menuFlat", {
+    $.widget("wok.menuFlat", {
 
         options: {
             content: null,
@@ -111,4 +111,4 @@
             this.element.remove();
         }
     });
- })(jQuery);
\ No newline at end of file
+ })(jQuery);
diff --git a/ui/js/widgets/message-flat.js b/ui/js/widgets/message-flat.js
index 1ab6aa3..d59d452 100644
--- a/ui/js/widgets/message-flat.js
+++ b/ui/js/widgets/message-flat.js
@@ -28,7 +28,7 @@
 */
 
 (function( $ ) {
-    $.widget("kimchi.messageFlat", {
+    $.widget("wok.messageFlat", {
         options: {
             autoOpen: true,
             contentMain: null,
@@ -94,4 +94,4 @@
             $("#overlay").remove();
         }
     });
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js
index 203d194..b7bd86f 100644
--- a/ui/js/widgets/messagebar-flat.js
+++ b/ui/js/widgets/messagebar-flat.js
@@ -27,7 +27,7 @@
 */
 
 (function($) {
-    $.widget("kimchi.messagebarFlat", {
+    $.widget("wok.messagebarFlat", {
         options : {
             content : null,
             color : "red",
@@ -68,4 +68,4 @@
             });
         }
     });
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/ui/js/widgets/radio-flat.js b/ui/js/widgets/radio-flat.js
index 7be55f7..401ef62 100644
--- a/ui/js/widgets/radio-flat.js
+++ b/ui/js/widgets/radio-flat.js
@@ -36,7 +36,7 @@
 
  (function($) {
 
-    $.widget("kimchi.radioFlat", {
+    $.widget("wok.radioFlat", {
         options: {
             id: "",
             name: "",
@@ -83,4 +83,4 @@
             this.element.remove();
         }
     });
- })(jQuery);
\ No newline at end of file
+ })(jQuery);
diff --git a/ui/js/widgets/samples/grid.html b/ui/js/widgets/samples/grid.html
index 873a7db..9b92d62 100644
--- a/ui/js/widgets/samples/grid.html
+++ b/ui/js/widgets/samples/grid.html
@@ -22,7 +22,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Kimchi</title>
+<title>Wok</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
 
@@ -34,7 +34,7 @@
 <script src="../../../libs/jquery-1.10.0.min.js"></script>
 <script src="../../../libs/jquery-ui.min.js"></script>
 <script src="../../../libs/jquery-ui-i18n.min.js"></script>
-<script src="../../../js/kimchi.min.js"></script>
+<script src="../../../js/wok.min.js"></script>
 
 <style type="text/css">
 body {
diff --git a/ui/js/widgets/samples/line.html b/ui/js/widgets/samples/line.html
index 794cb7f..cc0b738 100644
--- a/ui/js/widgets/samples/line.html
+++ b/ui/js/widgets/samples/line.html
@@ -22,7 +22,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Kimchi</title>
+<title>Wok</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
 
@@ -34,7 +34,7 @@
 <script src="../../../libs/jquery-1.10.0.min.js"></script>
 <script src="../../../libs/jquery-ui.min.js"></script>
 <script src="../../../libs/jquery-ui-i18n.min.js"></script>
-<script src="../../../js/kimchi.min.js"></script>
+<script src="../../../js/wok.min.js"></script>
 
 <style type="text/css">
 body {
diff --git a/ui/js/widgets/samples/tabs.html b/ui/js/widgets/samples/tabs.html
index 8aea118..a8c4b4d 100644
--- a/ui/js/widgets/samples/tabs.html
+++ b/ui/js/widgets/samples/tabs.html
@@ -22,7 +22,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>Kimchi</title>
+<title>Wok</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
 
@@ -34,7 +34,7 @@
 <script src="../../../libs/jquery-1.10.0.min.js"></script>
 <script src="../../../libs/jquery-ui.min.js"></script>
 <script src="../../../libs/jquery-ui-i18n.min.js"></script>
-<script src="../../../js/kimchi.min.js"></script>
+<script src="../../../js/wok.min.js"></script>
 
 <style type="text/css">
 body {
diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js
index 4a79605..bd7a207 100644
--- a/ui/js/widgets/select-menu.js
+++ b/ui/js/widgets/select-menu.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 (function($) {
-    $.widget('kimchi.selectMenu', {
+    $.widget('wok.selectMenu', {
 
         _create : function() {
             this.selectDiv = this.element;
diff --git a/ui/js/widgets/selectmenu-flat.js b/ui/js/widgets/selectmenu-flat.js
index 6bf791b..de17dcd 100644
--- a/ui/js/widgets/selectmenu-flat.js
+++ b/ui/js/widgets/selectmenu-flat.js
@@ -28,7 +28,7 @@
 
 
  (function( $ ) {
-    $.widget("kimchi.selectmenuFlat", {
+    $.widget("wok.selectmenuFlat", {
 
         options: {
             content: null,
@@ -127,4 +127,4 @@
             this.element.remove();
         }
     });
- })(jQuery);
\ No newline at end of file
+ })(jQuery);
diff --git a/ui/js/widgets/textbox-flat.js b/ui/js/widgets/textbox-flat.js
index 80192ef..cd9eca0 100644
--- a/ui/js/widgets/textbox-flat.js
+++ b/ui/js/widgets/textbox-flat.js
@@ -22,7 +22,7 @@
 //     });
 
  (function($) {
-    $.widget("kimchi.textboxFlat", {
+    $.widget("wok.textboxFlat", {
         optons: {
             hint: ""
         },
@@ -36,4 +36,4 @@
             this.element.remove();
         }
     });
- })(jQuery);
\ No newline at end of file
+ })(jQuery);
diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl
index 068f2a6..dfe7ce3 100644
--- a/ui/pages/error.html.tmpl
+++ b/ui/pages/error.html.tmpl
@@ -27,7 +27,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Kimchi</title>
+    <title>Wok</title>
     <link rel="stylesheet" href="$href("/css/theme-default.min.css")">
 </head>
 
@@ -35,7 +35,7 @@
 <body>
     <div class="error-background">
         <h1 id="logo">
-            <img src="/images/theme-default/logo-white.png" alt="Kimchi">
+            <img src="/images/theme-default/logo-white.png" alt="Wok">
         </h1>
     </div>
     <div class="error-msg error-icon">
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl
index f878d45..12ca69f 100644
--- a/ui/pages/login.html.tmpl
+++ b/ui/pages/login.html.tmpl
@@ -35,7 +35,7 @@
 <script src="$href('libs/jquery-1.10.0.min.js')"></script>
 <script src="$href('libs/jquery-ui.min.js')"></script>
 <script src="$href('libs/jquery-ui-i18n.min.js')"></script>
-<script src="$href('js/kimchi.min.js')"></script>
+<script src="$href('js/wok.min.js')"></script>
 <style type="text/css">
 .topbar select {
     float: right;
@@ -57,7 +57,7 @@
 }
 </style>
 </head>
-<body onload="kimchi.login_main()">
+<body onload="wok.login_main()">
 <div class="container topbar">
     <span id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></span>
     <select id="userLang">
diff --git a/ui/pages/websockify/console.html b/ui/pages/websockify/console.html
index 3be317f..e0a3cd4 100644
--- a/ui/pages/websockify/console.html
+++ b/ui/pages/websockify/console.html
@@ -2,18 +2,18 @@
 <html>
   <head>
     <script type="text/javascript">
-      redirectToKimchi = function() {
+      redirectToWok = function() {
         var query = window.location.search;
 
         var path = /.*url=(.*?)(&|$)/g.exec(query)[1];
         query = query.replace("url=" + path + "&", "")
         query = query.replace("url=" + path, "")
 
-        var kimchi_port = /.*kimchi=(.*?)(&|$)/g.exec(query)[1];
-        query = query.replace("kimchi=" + kimchi_port + "&", "")
-        query = query.replace("kimchi=" + kimchi_port, "")
+        var wok_port = /.*wok=(.*?)(&|$)/g.exec(query)[1];
+        query = query.replace("wok=" + wok_port + "&", "")
+        query = query.replace("wok=" + wok_port, "")
 
-        var url = "https://" + location.hostname + ":" + kimchi_port + "/";
+        var url = "https://" + location.hostname + ":" + wok_port + "/";
         url += decodeURIComponent(path) + query
 
         window.location.replace(url)
@@ -21,5 +21,5 @@
     </script>
   </head>
 
-  <body onload="redirectToKimchi()"/>
+  <body onload="redirectToWok()"/>
 </html>
diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
index 88911d0..a2fd4e1 100644
--- a/ui/pages/wok-ui.html.tmpl
+++ b/ui/pages/wok-ui.html.tmpl
@@ -38,7 +38,7 @@
 <script src="$href('libs/jquery-1.10.0.min.js')"></script>
 <script src="$href('libs/jquery-ui.min.js')"></script>
 <script src="$href('libs/jquery-ui-i18n.min.js')"></script>
-<script src="$href('js/kimchi.min.js')"></script>
+<script src="$href('js/wok.min.js')"></script>
 
 <!-- This is used for detecting if the UI needs to be built -->
 <style type="text/css">
@@ -66,7 +66,7 @@
 }
 </style>
 </head>
-<body onload="kimchi.main()">
+<body onload="wok.main()">
 <div class="container">
 <header class="topbar">
     <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1>
@@ -112,12 +112,12 @@
 
 <div id="buildme">
     <div><p>Oops!  It looks like I am running from a source tree and you forgot to build!
-    Please run the following command from the kimchi directory and reload this page:</p>
+    Please run the following command from the wok and kimchi directories and reload this page:</p>
     <p><code>make</code></p>
     </div>
 </div>
 
-<script id="about-tmpl" type="kimchi/template">
+<script id="about-tmpl" type="wok/template">
     <div class="window about-window">
         <header>
             <h1 class="title"><img alt="Kimchi logo" src="images/logo.ico"/> $_("About")</h1>
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:17:46 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:17:46 -0300
Subject: [Kimchi-devel] [PATCH V3 14/34] Use plugin relative URLs
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-15-git-send-email-luciojhc@linux.vnet.ibm.com>

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/API.json                            |   12 +-
 plugins/kimchi/mockmodel.py                        |    8 +-
 plugins/kimchi/model/debugreports.py               |    7 +-
 plugins/kimchi/model/host.py                       |    4 +-
 plugins/kimchi/model/networks.py                   |    4 +-
 plugins/kimchi/model/storagepools.py               |    7 +-
 plugins/kimchi/model/storagevolumes.py             |    4 +-
 plugins/kimchi/model/vms.py                        |   11 +-
 plugins/kimchi/model/vmsnapshots.py                |    4 +-
 plugins/kimchi/osinfo.py                           |   14 +-
 plugins/kimchi/screenshot.py                       |    2 +-
 plugins/kimchi/tests/test_authorization.py         |   56 ++--
 plugins/kimchi/tests/test_exception.py             |   12 +-
 plugins/kimchi/tests/test_host.py                  |   47 ++-
 plugins/kimchi/tests/test_mock_network.py          |    2 +-
 plugins/kimchi/tests/test_mock_storagepool.py      |   10 +-
 plugins/kimchi/tests/test_mock_storagevolume.py    |    8 +-
 plugins/kimchi/tests/test_mockmodel.py             |   21 +-
 plugins/kimchi/tests/test_model.py                 |   45 ++-
 plugins/kimchi/tests/test_model_network.py         |   14 +-
 plugins/kimchi/tests/test_model_storagepool.py     |   14 +-
 plugins/kimchi/tests/test_model_storagevolume.py   |   15 +-
 plugins/kimchi/tests/test_rest.py                  |  454 ++++++++++----------
 plugins/kimchi/tests/test_server.py                |   34 +-
 plugins/kimchi/tests/test_template.py              |   76 ++--
 plugins/kimchi/ui/css/theme-default/guest-edit.css |    6 +-
 plugins/kimchi/ui/css/theme-default/host.css       |    4 +-
 plugins/kimchi/ui/css/theme-default/list.css       |    2 +-
 plugins/kimchi/ui/css/theme-default/network.css    |    4 +-
 .../kimchi/ui/css/theme-default/report-rename.css  |    2 +-
 plugins/kimchi/ui/css/theme-default/storage.css    |    2 +-
 .../kimchi/ui/css/theme-default/template_add.css   |    6 +-
 plugins/kimchi/ui/js/src/kimchi.api.js             |  193 ++++-----
 plugins/kimchi/ui/js/src/kimchi.guest_add_main.js  |    2 +-
 plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js |    6 +-
 plugins/kimchi/ui/js/src/kimchi.guest_main.js      |   12 +-
 .../kimchi/ui/js/src/kimchi.guest_media_main.js    |    2 +-
 plugins/kimchi/ui/js/src/kimchi.host.js            |   14 +-
 plugins/kimchi/ui/js/src/kimchi.storage_main.js    |    6 +-
 .../kimchi/ui/js/src/kimchi.template_edit_main.js  |    2 +-
 plugins/kimchi/ui/js/src/kimchi.template_main.js   |    8 +-
 plugins/kimchi/ui/pages/guest-add.html.tmpl        |    2 +-
 plugins/kimchi/ui/pages/guest.html.tmpl            |    2 +-
 plugins/kimchi/ui/pages/storagepool-add.html.tmpl  |    2 +-
 plugins/kimchi/ui/pages/tabs/storage.html.tmpl     |    2 +-
 plugins/kimchi/ui/pages/template-add.html.tmpl     |    2 +-
 plugins/sample/ui/js/util.js                       |    2 +-
 ui/pages/error.html.tmpl                           |    4 +-
 48 files changed, 604 insertions(+), 568 deletions(-)

diff --git a/plugins/kimchi/API.json b/plugins/kimchi/API.json
index e8da7d9..f1f58ff 100644
--- a/plugins/kimchi/API.json
+++ b/plugins/kimchi/API.json
@@ -257,14 +257,14 @@
                 "template": {
                     "description": "The URI of a template to use when building a VM",
                     "type": "string",
-                    "pattern": "^/templates/(.*?)/?$",
+                    "pattern": "^/plugins/kimchi/templates/(.*?)/?$",
                     "required": true,
                     "error": "KCHVM0012E"
                 },
                 "storagepool": {
                     "description": "Assign a specefic Storage Pool to the new VM",
                     "type": "string",
-                    "pattern": "^/storagepools/[^/]+/?$",
+                    "pattern": "^/plugins/kimchi/storagepools/[^/]+/?$",
                     "error": "KCHVM0013E"
                 },
                 "graphics": { "$ref": "#/kimchitype/graphics" }
@@ -428,7 +428,7 @@
                 "icon": {
                     "description": "The template icon path",
                     "type": "string",
-                    "pattern": "^images/",
+                    "pattern": "^/plugins/kimchi/images/",
                     "error": "KCHTMPL0009E"
                 },
                 "os_distro": {
@@ -493,7 +493,7 @@
                 "storagepool": {
                     "description": "Location of the storage pool",
                     "type": "string",
-                    "pattern": "^/storagepools/[^/]+/?$",
+                    "pattern": "^/plugins/kimchi/storagepools/[^/]+/?$",
                     "error": "KCHTMPL0015E"
                 },
                 "networks": {
@@ -600,7 +600,7 @@
                 "icon": {
                     "description": "The template icon path",
                     "type": "string",
-                    "pattern": "^images/",
+                    "pattern": "^/plugins/kimchi/images/",
                     "error": "KCHTMPL0009E"
                 },
                 "os_distro": {
@@ -664,7 +664,7 @@
                 "storagepool": {
                     "description": "Location of the storage pool",
                     "type": "string",
-                    "pattern": "^/storagepools/[^/]+/?$",
+                    "pattern": "^/plugins/kimchi/storagepools/[^/]+/?$",
                     "error": "KCHTMPL0015E"
                 },
                 "networks": {
diff --git a/plugins/kimchi/mockmodel.py b/plugins/kimchi/mockmodel.py
index 88eb033..d51ab9e 100644
--- a/plugins/kimchi/mockmodel.py
+++ b/plugins/kimchi/mockmodel.py
@@ -49,7 +49,7 @@ from wok.xmlutils.utils import xml_item_update
 
 
 fake_user = {'root': 'letmein!'}
-mockmodel_defaults = {'storagepool': '/storagepools/default-pool',
+mockmodel_defaults = {'storagepool': '/plugins/kimchi/storagepools/default-pool',
                       'domain': 'test', 'arch': 'i686'}
 
 
@@ -246,7 +246,7 @@ class MockModel(Model):
         return MockModel._libvirt_get_vol_path(pool, vol)
 
     def _gen_debugreport_file(self, name):
-        return add_task('/debugreports/%s' % name, self._create_log,
+        return add_task('/plugins/kimchi/debugreports/%s' % name, self._create_log,
                         self.objstore, name)
 
     def _create_log(self, cb, name):
@@ -355,7 +355,7 @@ class MockModel(Model):
         return self._mock_swupdate.pkgs[pkg_name]
 
     def _mock_host_swupdate(self, args=None):
-        task_id = add_task('/host/swupdate', self._mock_swupdate.doUpdate,
+        task_id = add_task('/plugins/kimchi/host/swupdate', self._mock_swupdate.doUpdate,
                            self.objstore)
         return self.task_lookup(task_id)
 
@@ -407,7 +407,7 @@ class MockModel(Model):
     def _mock_vmsnapshots_create(self, vm_name, params):
         name = params.get('name', unicode(int(time.time())))
         params = {'vm_name': vm_name, 'name': name}
-        taskid = add_task(u'/vms/%s/snapshots/%s' % (vm_name, name),
+        taskid = add_task(u'/plugins/kimchi/vms/%s/snapshots/%s' % (vm_name, name),
                           self._vmsnapshots_create_task, self.objstore, params)
         return self.task_lookup(taskid)
 
diff --git a/plugins/kimchi/model/debugreports.py b/plugins/kimchi/model/debugreports.py
index ea5853d..aff2152 100644
--- a/plugins/kimchi/model/debugreports.py
+++ b/plugins/kimchi/model/debugreports.py
@@ -62,8 +62,8 @@ class DebugReportsModel(object):
         gen_cmd = self.get_system_report_tool()
 
         if gen_cmd is not None:
-            return add_task('/debugreports/%s' % name, gen_cmd, self.objstore,
-                            name)
+            return add_task('/plugins/kimchi/debugreports/%s' % name, gen_cmd,
+                            self.objstore, name)
 
         raise OperationFailed("KCHDR0002E")
 
@@ -172,7 +172,8 @@ class DebugReportModel(object):
         ctime = os.stat(file_target).st_mtime
         ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime))
         file_target = os.path.split(file_target)[-1]
-        file_target = os.path.join("/data/debugreports", file_target)
+        file_target = os.path.join("plugins/kimchi/data/debugreports",
+                                   file_target)
         return {'uri': file_target,
                 'ctime': ctime}
 
diff --git a/plugins/kimchi/model/host.py b/plugins/kimchi/model/host.py
index 2a78a88..09b0a09 100644
--- a/plugins/kimchi/model/host.py
+++ b/plugins/kimchi/model/host.py
@@ -132,8 +132,8 @@ class HostModel(object):
             raise OperationFailed('KCHPKGUPD0001E')
 
         wok_log.debug('Host is going to be updated.')
-        taskid = add_task('/host/swupdate', swupdate.doUpdate, self.objstore,
-                          None)
+        taskid = add_task('/plugins/kimchi/host/swupdate', swupdate.doUpdate,
+                          self.objstore, None)
         return self.task.lookup(taskid)
 
     def shutdown(self, args=None):
diff --git a/plugins/kimchi/model/networks.py b/plugins/kimchi/model/networks.py
index 594bfca..3723e4c 100644
--- a/plugins/kimchi/model/networks.py
+++ b/plugins/kimchi/model/networks.py
@@ -27,7 +27,7 @@ from xml.sax.saxutils import escape
 
 from wok import netinfo
 from wok import network as knetwork
-from wok.config import paths
+from wok.config import PluginPaths
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import MissingParameter, NotFoundError, OperationFailed
 from ..osinfo import defaults as tmpl_defaults
@@ -52,7 +52,7 @@ class NetworksModel(object):
         conn = self.conn.get()
 
         error_msg = ("Please, check the configuration in %s/template.conf to "
-                     "ensure it lists only valid networks." % paths.conf_dir)
+         "ensure it lists only valid networks." % PluginPaths('kimchi').conf_dir)
 
         for net_name in networks:
             try:
diff --git a/plugins/kimchi/model/storagepools.py b/plugins/kimchi/model/storagepools.py
index 681fafc..920d29a 100644
--- a/plugins/kimchi/model/storagepools.py
+++ b/plugins/kimchi/model/storagepools.py
@@ -23,7 +23,7 @@ import sys
 
 from lxml.builder import E
 
-from wok.config import config, paths
+from wok.config import config, PluginPaths
 from ..scan import Scanner
 from wok.exception import InvalidOperation, MissingParameter
 from wok.exception import NotFoundError, OperationFailed
@@ -82,7 +82,8 @@ class StoragePoolsModel(object):
             pools['ISO'] = {'path': '/var/lib/kimchi/isos'}
 
         error_msg = ("Please, check the configuration in %s/template.conf to "
-                     "ensure it has a valid storage pool." % paths.conf_dir)
+                     "ensure it has a valid storage pool." %
+                     PluginPaths('kimchi').conf_dir)
 
         conn = self.conn.get()
         for pool_name in pools:
@@ -245,7 +246,7 @@ class StoragePoolsModel(object):
 
         params['path'] = self.scanner.scan_dir_prepare(params['name'])
         scan_params['pool_path'] = params['path']
-        task_id = add_task('/storagepools/%s' % ISO_POOL_NAME,
+        task_id = add_task('/plugins/kimchi/storagepools/%s' % ISO_POOL_NAME,
                            self.scanner.start_scan, self.objstore, scan_params)
         # Record scanning-task/storagepool mapping for future querying
         try:
diff --git a/plugins/kimchi/model/storagevolumes.py b/plugins/kimchi/model/storagevolumes.py
index 908fbc4..6bc203a 100644
--- a/plugins/kimchi/model/storagevolumes.py
+++ b/plugins/kimchi/model/storagevolumes.py
@@ -114,7 +114,7 @@ class StorageVolumesModel(object):
             raise InvalidParameter('KCHVOL0001E', {'name': name})
 
         params['pool'] = pool_name
-        targeturi = '/storagepools/%s/storagevolumes/%s' % (pool_name, name)
+        targeturi = '/plugins/kimchi/storagepools/%s/storagevolumes/%s' % (pool_name, name)
         taskid = add_task(targeturi, create_func, self.objstore, params)
         return self.task.lookup(taskid)
 
@@ -403,7 +403,7 @@ class StorageVolumeModel(object):
                   'name': name,
                   'new_pool': new_pool,
                   'new_name': new_name}
-        taskid = add_task(u'/storagepools/%s/storagevolumes/%s' %
+        taskid = add_task(u'/plugins/kimchi/storagepools/%s/storagevolumes/%s' %
                           (pool, new_name), self._clone_task, self.objstore,
                           params)
         return self.task.lookup(taskid)
diff --git a/plugins/kimchi/model/vms.py b/plugins/kimchi/model/vms.py
index 2e9721d..96e5084 100644
--- a/plugins/kimchi/model/vms.py
+++ b/plugins/kimchi/model/vms.py
@@ -107,7 +107,7 @@ class VMsModel(object):
         t.validate()
         data = {'name': name, 'template': t,
                 'graphics': params.get('graphics', {})}
-        taskid = add_task(u'/vms/%s' % name, self._create_task,
+        taskid = add_task(u'/plugins/kimchi/vms/%s' % name, self._create_task,
                           self.objstore, data)
 
         return self.task.lookup(taskid)
@@ -245,16 +245,17 @@ class VMModel(object):
             task_names = session.get_list('task')
             for tn in task_names:
                 t = session.get('task', tn)
-                if t['target_uri'].startswith('/vms/'):
-                    uri_name = t['target_uri'][5:]  # 5 = len('/vms/')
+                if t['target_uri'].startswith('/plugins/kimchi/vms/'):
+                    uri_name = t['target_uri'].lstrip('/plugins/kimchi/vms/')
                     vms_being_created.append(uri_name)
 
         current_vm_names = self.vms.get_list() + vms_being_created
         new_name = get_next_clone_name(current_vm_names, name)
 
         # create a task with the actual clone function
-        taskid = add_task(u'/vms/%s/clone' % new_name, self._clone_task,
-                          self.objstore, {'name': name, 'new_name': new_name})
+        taskid = add_task(u'/plugins/kimchi/vms/%s/clone' % new_name,
+                          self._clone_task, self.objstore,
+                          {'name': name, 'new_name': new_name})
 
         return self.task.lookup(taskid)
 
diff --git a/plugins/kimchi/model/vmsnapshots.py b/plugins/kimchi/model/vmsnapshots.py
index 60de253..0724adc 100644
--- a/plugins/kimchi/model/vmsnapshots.py
+++ b/plugins/kimchi/model/vmsnapshots.py
@@ -72,8 +72,8 @@ class VMSnapshotsModel(object):
         name = params.get('name', unicode(int(time.time())))
 
         task_params = {'vm_name': vm_name, 'name': name}
-        taskid = add_task(u'/vms/%s/snapshots/%s' % (vm_name, name),
-                          self._create_task, self.objstore, task_params)
+        taskid = add_task(u'/plugins/kimchi/vms/%s/snapshots/%s' % (vm_name,
+                          name), self._create_task, self.objstore, task_params)
         return self.task.lookup(taskid)
 
     def _create_task(self, cb, params):
diff --git a/plugins/kimchi/osinfo.py b/plugins/kimchi/osinfo.py
index d2aab71..5fe1e07 100644
--- a/plugins/kimchi/osinfo.py
+++ b/plugins/kimchi/osinfo.py
@@ -26,7 +26,7 @@ from collections import defaultdict
 from configobj import ConfigObj
 from distutils.version import LooseVersion
 
-from wok.config import paths
+from wok.config import PluginPaths
 
 
 SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'),
@@ -86,7 +86,7 @@ modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10',
 
 
 icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/'
-                          % paths.ui_dir, 'icon-*.png')]
+                          % PluginPaths('kimchi').ui_dir, 'icon-*.png')]
 
 
 def _get_tmpl_defaults():
@@ -116,7 +116,7 @@ def _get_tmpl_defaults():
     default_config = ConfigObj(tmpl_defaults)
 
     # Load template configuration file
-    config_file = os.path.join(paths.conf_dir, 'template.conf')
+    config_file = os.path.join(PluginPaths('kimchi').conf_dir, 'template.conf')
     config = ConfigObj(config_file)
 
     # Merge default configuration with file configuration
@@ -133,7 +133,8 @@ def _get_tmpl_defaults():
 
     # Parse storage section to get storage pool and disks values
     storage_section = default_config.pop('storage')
-    defaults['storagepool'] = '/storagepools/' + storage_section.pop('pool')
+    defaults['storagepool'] = '/plugins/kimchi/storagepools/' + \
+                              storage_section.pop('pool')
     defaults['disks'] = []
     for disk in storage_section.keys():
         data = storage_section[disk]
@@ -206,8 +207,9 @@ def lookup(distro, version):
     params.update(custom_specs.get(distro, {}).get(version, {}))
 
     if distro in icon_available_distros:
-        params['icon'] = 'images/icon-%s.png' % distro
+        params['icon'] = 'plugins/kimchi/images/icon-%s.png' % distro
     else:
-        params['icon'] = 'images/icon-vm.png'
+        params['icon'] = 'plugins/kimchi/images/icon-vm.png'
+
 
     return params
diff --git a/plugins/kimchi/screenshot.py b/plugins/kimchi/screenshot.py
index 05701dd..1cac964 100644
--- a/plugins/kimchi/screenshot.py
+++ b/plugins/kimchi/screenshot.py
@@ -68,7 +68,7 @@ class VMScreenshot(object):
         if now - last_update > self.OUTDATED_SECS:
             self._clean_extra(self.LIVE_WINDOW)
             self._generate_thumbnail()
-        return '/data/screenshots/%s' %\
+        return 'plugins/kimchi/data/screenshots/%s' %\
                os.path.basename(self.info['thumbnail'])
 
     def _clean_extra(self, window=-1):
diff --git a/plugins/kimchi/tests/test_authorization.py b/plugins/kimchi/tests/test_authorization.py
index 6513b67..695b512 100644
--- a/plugins/kimchi/tests/test_authorization.py
+++ b/plugins/kimchi/tests/test_authorization.py
@@ -64,62 +64,62 @@ class AuthorizationTests(unittest.TestCase):
 
     def test_nonroot_access(self):
         # Non-root users can access static host information
-        resp = self.request('/host', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/host', '{}', 'GET')
         self.assertEquals(403, resp.status)
 
         # Non-root users can access host stats
-        resp = self.request('/host/stats', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/host/stats', '{}', 'GET')
         self.assertEquals(403, resp.status)
 
         # Non-root users can not reboot/shutdown host system
-        resp = self.request('/host/reboot', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/host/reboot', '{}', 'POST')
         self.assertEquals(403, resp.status)
-        resp = self.request('/host/shutdown', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/host/shutdown', '{}', 'POST')
         self.assertEquals(403, resp.status)
 
         # Non-root users can not get or debug reports
-        resp = self.request('/debugreports', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/debugreports', '{}', 'GET')
         self.assertEquals(403, resp.status)
-        resp = self.request('/debugreports', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/debugreports', '{}', 'POST')
         self.assertEquals(403, resp.status)
 
         # Non-root users can not create or delete network (only get)
-        resp = self.request('/networks', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/networks', '{}', 'GET')
         self.assertEquals(200, resp.status)
-        resp = self.request('/networks', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/networks', '{}', 'POST')
         self.assertEquals(403, resp.status)
-        resp = self.request('/networks/default/activate', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/networks/default/activate', '{}', 'POST')
         self.assertEquals(403, resp.status)
-        resp = self.request('/networks/default', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/networks/default', '{}', 'DELETE')
         self.assertEquals(403, resp.status)
 
         # Non-root users can not create or delete storage pool (only get)
-        resp = self.request('/storagepools', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/storagepools', '{}', 'GET')
         self.assertEquals(200, resp.status)
-        resp = self.request('/storagepools', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/storagepools', '{}', 'POST')
         self.assertEquals(403, resp.status)
-        resp = self.request('/storagepools/default/activate', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/storagepools/default/activate', '{}', 'POST')
         self.assertEquals(403, resp.status)
-        resp = self.request('/storagepools/default', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/storagepools/default', '{}', 'DELETE')
         self.assertEquals(403, resp.status)
 
         # Non-root users can not update or delete a template
         # but he can get and create a new one
-        resp = self.request('/templates', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/templates', '{}', 'GET')
         self.assertEquals(403, resp.status)
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(403, resp.status)
-        resp = self.request('/templates/test', '{}', 'PUT')
+        resp = self.request('/plugins/kimchi/templates/test', '{}', 'PUT')
         self.assertEquals(403, resp.status)
-        resp = self.request('/templates/test', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/templates/test', '{}', 'DELETE')
         self.assertEquals(403, resp.status)
 
         # Non-root users can only get vms authorized to them
         model.templates_create({'name': u'test', 'cdrom': fake_iso})
 
         task_info = model.vms_create({'name': u'test-me',
-                                      'template': '/templates/test'})
+                                 'template': '/plugins/kimchi/templates/test'})
         wait_task(model.task_lookup, task_info['id'])
 
         model.vm_update(u'test-me',
@@ -127,39 +127,39 @@ class AuthorizationTests(unittest.TestCase):
                          'groups': []})
 
         task_info = model.vms_create({'name': u'test-usera',
-                                      'template': '/templates/test'})
+                                 'template': '/plugins/kimchi/templates/test'})
         wait_task(model.task_lookup, task_info['id'])
 
         non_root = list(set(model.users_get_list()) - set(['root']))[0]
         model.vm_update(u'test-usera', {'users': [non_root], 'groups': []})
 
         task_info = model.vms_create({'name': u'test-groupa',
-                                      'template': '/templates/test'})
+                                 'template': '/plugins/kimchi/templates/test'})
         wait_task(model.task_lookup, task_info['id'])
         a_group = model.groups_get_list()[0]
         model.vm_update(u'test-groupa', {'groups': [a_group]})
 
-        resp = self.request('/vms', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms', '{}', 'GET')
         self.assertEquals(200, resp.status)
         vms_data = json.loads(resp.read())
         self.assertEquals([u'test-groupa', u'test-me'],
                           sorted([v['name'] for v in vms_data]))
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(403, resp.status)
 
         # Create a vm using mockmodel directly to test Resource access
         task_info = model.vms_create({'name': 'kimchi-test',
-                                      'template': '/templates/test'})
+                                 'template': '/plugins/kimchi/templates/test'})
         wait_task(model.task_lookup, task_info['id'])
-        resp = self.request('/vms/kimchi-test', '{}', 'PUT')
+        resp = self.request('/plugins/kimchi/vms/kimchi-test', '{}', 'PUT')
         self.assertEquals(403, resp.status)
-        resp = self.request('/vms/kimchi-test', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/kimchi-test', '{}', 'DELETE')
         self.assertEquals(403, resp.status)
 
         # Non-root users can only update VMs authorized by them
-        resp = self.request('/vms/test-me/start', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-me/start', '{}', 'POST')
         self.assertEquals(200, resp.status)
-        resp = self.request('/vms/test-usera/start', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-usera/start', '{}', 'POST')
         self.assertEquals(403, resp.status)
 
         model.template_delete('test')
diff --git a/plugins/kimchi/tests/test_exception.py b/plugins/kimchi/tests/test_exception.py
index 834a275..32b6baf 100644
--- a/plugins/kimchi/tests/test_exception.py
+++ b/plugins/kimchi/tests/test_exception.py
@@ -57,7 +57,7 @@ class ExceptionTests(unittest.TestCase):
         """
         setup_server('production')
         # test 404
-        resp = json.loads(request(host, ssl_port, '/vms/blah').read())
+        resp = json.loads(request(host, ssl_port, '/plugins/kimchi/vms/blah').read())
         self.assertEquals('404 Not Found', resp.get('code'))
 
         # test 405 wrong method
@@ -67,7 +67,7 @@ class ExceptionTests(unittest.TestCase):
         self.assertEquals(msg, resp.get('reason'))
 
         # test 400 parse error
-        resp = json.loads(request(host, ssl_port, '/vms', '{', 'POST').read())
+        resp = json.loads(request(host, ssl_port, '/plugins/kimchi/vms', '{', 'POST').read())
         msg = u'KCHAPI0006E: Unable to parse JSON request'
         self.assertEquals('400 Bad Request', resp.get('code'))
         self.assertEquals(msg, resp.get('reason'))
@@ -75,7 +75,7 @@ class ExceptionTests(unittest.TestCase):
 
         # test 400 missing required parameter
         req = json.dumps({})
-        resp = json.loads(request(host, ssl_port, '/vms', req, 'POST').read())
+        resp = json.loads(request(host, ssl_port, '/plugins/kimchi/vms', req, 'POST').read())
         self.assertEquals('400 Bad Request', resp.get('code'))
         m = u"KCHVM0016E: Specify a template to create a virtual machine from"
         self.assertEquals(m, resp.get('reason'))
@@ -87,7 +87,7 @@ class ExceptionTests(unittest.TestCase):
         """
         setup_server()
         # test 404
-        resp = json.loads(request(host, ssl_port, '/vms/blah').read())
+        resp = json.loads(request(host, ssl_port, '/plugins/kimchi/vms/blah').read())
         self.assertEquals('404 Not Found', resp.get('code'))
 
         # test 405 wrong method
@@ -97,7 +97,7 @@ class ExceptionTests(unittest.TestCase):
         self.assertEquals(msg, resp.get('reason'))
 
         # test 400 parse error
-        resp = json.loads(request(host, ssl_port, '/vms', '{', 'POST').read())
+        resp = json.loads(request(host, ssl_port, '/plugins/kimchi/vms', '{', 'POST').read())
         msg = u'KCHAPI0006E: Unable to parse JSON request'
         self.assertEquals('400 Bad Request', resp.get('code'))
         self.assertEquals(msg, resp.get('reason'))
@@ -105,7 +105,7 @@ class ExceptionTests(unittest.TestCase):
 
         # test 400 missing required parameter
         req = json.dumps({})
-        resp = json.loads(request(host, ssl_port, '/vms', req, 'POST').read())
+        resp = json.loads(request(host, ssl_port, '/plugins/kimchi/vms', req, 'POST').read())
         m = u"KCHVM0016E: Specify a template to create a virtual machine from"
         self.assertEquals('400 Bad Request', resp.get('code'))
         self.assertEquals(m, resp.get('reason'))
diff --git a/plugins/kimchi/tests/test_host.py b/plugins/kimchi/tests/test_host.py
index 7770148..5a18490 100644
--- a/plugins/kimchi/tests/test_host.py
+++ b/plugins/kimchi/tests/test_host.py
@@ -62,7 +62,7 @@ class HostTests(unittest.TestCase):
         self.request = partial(request, host, ssl_port)
 
     def test_hostinfo(self):
-        resp = self.request('/host').read()
+        resp = self.request('/plugins/kimchi/host').read()
         info = json.loads(resp)
         keys = ['os_distro', 'os_version', 'os_codename', 'cpu_model',
                 'memory', 'cpus']
@@ -78,7 +78,7 @@ class HostTests(unittest.TestCase):
         time.sleep(1)
         stats_keys = ['cpu_utilization', 'memory', 'disk_read_rate',
                       'disk_write_rate', 'net_recv_rate', 'net_sent_rate']
-        resp = self.request('/host/stats').read()
+        resp = self.request('/plugins/kimchi/host/stats').read()
         stats = json.loads(resp)
         self.assertEquals(sorted(stats_keys), sorted(stats.keys()))
 
@@ -94,41 +94,43 @@ class HostTests(unittest.TestCase):
         self.assertIn('buffers', memory_stats)
         self.assertIn('avail', memory_stats)
 
-        resp = self.request('/host/stats/history').read()
+        resp = self.request('/plugins/kimchi/host/stats/history').read()
         history = json.loads(resp)
         self.assertEquals(sorted(stats_keys), sorted(history.keys()))
 
     def test_host_actions(self):
         def _task_lookup(taskid):
-            return json.loads(self.request('/tasks/%s' % taskid).read())
+            return json.loads(self.request('/plugins/kimchi/tasks/%s' %
+                                           taskid).read())
 
-        resp = self.request('/host/shutdown', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/host/shutdown', '{}', 'POST')
         self.assertEquals(200, resp.status)
-        resp = self.request('/host/reboot', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/host/reboot', '{}', 'POST')
         self.assertEquals(200, resp.status)
 
         # Test system update
-        resp = self.request('/host/packagesupdate', None, 'GET')
+        resp = self.request('/plugins/kimchi/host/packagesupdate', None, 'GET')
         pkgs = json.loads(resp.read())
         self.assertEquals(3, len(pkgs))
 
         pkg_keys = ['package_name', 'repository', 'arch', 'version']
         for p in pkgs:
             name = p['package_name']
-            resp = self.request('/host/packagesupdate/' + name, None, 'GET')
+            resp = self.request('/plugins/kimchi/host/packagesupdate/' + name,
+                                None, 'GET')
             info = json.loads(resp.read())
             self.assertEquals(sorted(pkg_keys), sorted(info.keys()))
 
-        resp = self.request('/host/swupdate', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/host/swupdate', '{}', 'POST')
         task = json.loads(resp.read())
         task_params = [u'id', u'message', u'status', u'target_uri']
         self.assertEquals(sorted(task_params), sorted(task.keys()))
 
-        resp = self.request('/tasks/' + task[u'id'], None, 'GET')
+        resp = self.request('/plugins/kimchi/tasks/' + task[u'id'], None, 'GET')
         task_info = json.loads(resp.read())
         self.assertEquals(task_info['status'], 'running')
         wait_task(_task_lookup, task_info['id'])
-        resp = self.request('/tasks/' + task[u'id'], None, 'GET')
+        resp = self.request('/plugins/kimchi/tasks/' + task[u'id'], None, 'GET')
         task_info = json.loads(resp.read())
         self.assertEquals(task_info['status'], 'finished')
         self.assertIn(u'All packages updated', task_info['message'])
@@ -136,14 +138,15 @@ class HostTests(unittest.TestCase):
         self.assertEquals(0, len(pkgs))
 
     def test_host_partitions(self):
-        resp = self.request('/host/partitions')
+        resp = self.request('/plugins/kimchi/host/partitions')
         self.assertEquals(200, resp.status)
         partitions = json.loads(resp.read())
 
         keys = ['name', 'path', 'type', 'fstype', 'size', 'mountpoint',
                 'available']
         for item in partitions:
-            resp = self.request('/host/partitions/%s' % item['name'])
+            resp = self.request('/plugins/kimchi/host/partitions/%s' % 
+                                item['name'])
             info = json.loads(resp.read())
             self.assertEquals(sorted(info.keys()), sorted(keys))
 
@@ -152,33 +155,36 @@ class HostTests(unittest.TestCase):
             for dev in devices:
                 self.assertEquals(dev['device_type'], dev_type)
 
-        resp = self.request('/host/devices?_cap=scsi_host')
+        resp = self.request('/plugins/kimchi/host/devices?_cap=scsi_host')
         nodedevs = json.loads(resp.read())
         # Mockmodel brings 3 preconfigured scsi fc_host
         self.assertEquals(3, len(nodedevs))
 
-        nodedev = json.loads(self.request('/host/devices/scsi_host2').read())
+        nodedev = json.loads(self.request(
+                             '/plugins/kimchi/host/devices/scsi_host2').read())
         # Mockmodel generates random wwpn and wwnn
         self.assertEquals('scsi_host2', nodedev['name'])
         self.assertEquals('fc_host', nodedev['adapter']['type'])
         self.assertEquals(16, len(nodedev['adapter']['wwpn']))
         self.assertEquals(16, len(nodedev['adapter']['wwnn']))
 
-        devs = json.loads(self.request('/host/devices').read())
+        devs = json.loads(self.request('/plugins/kimchi/host/devices').read())
         dev_names = [dev['name'] for dev in devs]
         for dev_type in ('pci', 'usb_device', 'scsi'):
-            resp = self.request('/host/devices?_cap=%s' % dev_type)
+            resp = self.request('/plugins/kimchi/host/devices?_cap=%s' % 
+                                dev_type)
             devsByType = json.loads(resp.read())
             names = [dev['name'] for dev in devsByType]
             self.assertTrue(set(names) <= set(dev_names))
             asset_devices_type(devsByType, dev_type)
 
-        resp = self.request('/host/devices?_passthrough=true')
+        resp = self.request('/plugins/kimchi/host/devices?_passthrough=true')
         passthru_devs = [dev['name'] for dev in json.loads(resp.read())]
         self.assertTrue(set(passthru_devs) <= set(dev_names))
 
         for dev_type in ('pci', 'usb_device', 'scsi'):
-            resp = self.request('/host/devices?_cap=%s&_passthrough=true' %
+            resp = self.request(
+                   '/plugins/kimchi/host/devices?_cap=%s&_passthrough=true' %
                                 dev_type)
             filteredDevs = json.loads(resp.read())
             filteredNames = [dev['name'] for dev in filteredDevs]
@@ -186,7 +192,8 @@ class HostTests(unittest.TestCase):
             asset_devices_type(filteredDevs, dev_type)
 
         for dev in passthru_devs:
-            resp = self.request('/host/devices?_passthrough_affected_by=%s' %
+            resp = self.request(
+                   '/plugins/kimchi/host/devices?_passthrough_affected_by=%s' %
                                 dev)
             affected_devs = [dev['name'] for dev in json.loads(resp.read())]
             self.assertTrue(set(affected_devs) <= set(dev_names))
diff --git a/plugins/kimchi/tests/test_mock_network.py b/plugins/kimchi/tests/test_mock_network.py
index 4e390b1..749b9c3 100644
--- a/plugins/kimchi/tests/test_mock_network.py
+++ b/plugins/kimchi/tests/test_mock_network.py
@@ -63,7 +63,7 @@ class MockNetworkTests(unittest.TestCase):
     def test_vlan_tag_bridge(self):
         # Verify the current system has at least one interface to create a
         # bridged network
-        interfaces = json.loads(self.request('/interfaces?type=nic').read())
+        interfaces = json.loads(self.request('/plugins/kimchi/interfaces?type=nic').read())
         if len(interfaces) > 0:
             iface = interfaces[0]['name']
             _do_network_test(self, model, {'name': u'bridge-network',
diff --git a/plugins/kimchi/tests/test_mock_storagepool.py b/plugins/kimchi/tests/test_mock_storagepool.py
index c72708b..b96d72d 100644
--- a/plugins/kimchi/tests/test_mock_storagepool.py
+++ b/plugins/kimchi/tests/test_mock_storagepool.py
@@ -60,15 +60,15 @@ class MockStoragepoolTests(unittest.TestCase):
         model.reset()
 
     def _task_lookup(self, taskid):
-        return json.loads(self.request('/tasks/%s' % taskid).read())
+        return json.loads(self.request('/plugins/kimchi/tasks/%s' % taskid).read())
 
     def test_storagepool(self):
         # MockModel always returns 2 partitions (vdx, vdz)
-        partitions = json.loads(self.request('/host/partitions').read())
+        partitions = json.loads(self.request('/plugins/kimchi/host/partitions').read())
         devs = [dev['path'] for dev in partitions]
 
         # MockModel always returns 3 FC devices
-        fc_devs = json.loads(self.request('/host/devices?_cap=fc_host').read())
+        fc_devs = json.loads(self.request('/plugins/kimchi/host/devices?_cap=fc_host').read())
         fc_devs = [dev['name'] for dev in fc_devs]
 
         poolDefs = [
@@ -87,10 +87,10 @@ class MockStoragepoolTests(unittest.TestCase):
 
         def _do_test(params):
             name = params['name']
-            uri = '/storagepools/%s' % name.encode('utf-8')
+            uri = '/plugins/kimchi/storagepools/%s' % name.encode('utf-8')
 
             req = json.dumps(params)
-            resp = self.request('/storagepools', req, 'POST')
+            resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
             self.assertEquals(201, resp.status)
 
             # activate the storage pool
diff --git a/plugins/kimchi/tests/test_mock_storagevolume.py b/plugins/kimchi/tests/test_mock_storagevolume.py
index 3dd16b7..0065305 100644
--- a/plugins/kimchi/tests/test_mock_storagevolume.py
+++ b/plugins/kimchi/tests/test_mock_storagevolume.py
@@ -61,11 +61,11 @@ class MockStorageVolumeTests(unittest.TestCase):
 
     def test_storagevolume(self):
         # MockModel always returns 2 partitions (vdx, vdz)
-        partitions = json.loads(self.request('/host/partitions').read())
+        partitions = json.loads(self.request('/plugins/kimchi/host/partitions').read())
         devs = [dev['path'] for dev in partitions]
 
         # MockModel always returns 3 FC devices
-        fc_devs = json.loads(self.request('/host/devices?_cap=fc_host').read())
+        fc_devs = json.loads(self.request('/plugins/kimchi/host/devices?_cap=fc_host').read())
         fc_devs = [dev['name'] for dev in fc_devs]
 
         poolDefs = [
@@ -84,9 +84,9 @@ class MockStorageVolumeTests(unittest.TestCase):
 
         for pool in poolDefs:
             pool_name = pool['name']
-            uri = '/storagepools/%s' % pool_name.encode('utf-8')
+            uri = '/plugins/kimchi/storagepools/%s' % pool_name.encode('utf-8')
             req = json.dumps(pool)
-            resp = self.request('/storagepools', req, 'POST')
+            resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
             self.assertEquals(201, resp.status)
             # activate the storage pool
             resp = self.request(uri + '/activate', '{}', 'POST')
diff --git a/plugins/kimchi/tests/test_mockmodel.py b/plugins/kimchi/tests/test_mockmodel.py
index 03ad445..133a61e 100644
--- a/plugins/kimchi/tests/test_mockmodel.py
+++ b/plugins/kimchi/tests/test_mockmodel.py
@@ -64,18 +64,18 @@ class MockModelTests(unittest.TestCase):
     def test_screenshot_refresh(self):
         # Create a VM
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        request(host, ssl_port, '/templates', req, 'POST')
+        request(host, ssl_port, '/plugins/kimchi/templates', req, 'POST')
         req = json.dumps({'name': 'test-vm', 'template': '/templates/test'})
-        resp = request(host, ssl_port, '/vms', req, 'POST')
+        resp = request(host, ssl_port, '/plugins/kimchi/vms', req, 'POST')
         task = json.loads(resp.read())
         wait_task(model.task_lookup, task['id'])
 
         # Test screenshot refresh for running vm
-        request(host, ssl_port, '/vms/test-vm/start', '{}', 'POST')
-        resp = request(host, ssl_port, '/vms/test-vm/screenshot')
+        request(host, ssl_port, '/plugins/kimchi/vms/test-vm/start', '{}', 'POST')
+        resp = request(host, ssl_port, '/plugins/kimchi/vms/test-vm/screenshot')
         self.assertEquals(200, resp.status)
         self.assertEquals('image/png', resp.getheader('content-type'))
-        resp1 = request(host, ssl_port, '/vms/test-vm')
+        resp1 = request(host, ssl_port, '/plugins/kimchi/vms/test-vm')
         rspBody = resp1.read()
         testvm_Data = json.loads(rspBody)
         screenshotURL = testvm_Data['screenshot']
@@ -91,13 +91,14 @@ class MockModelTests(unittest.TestCase):
 
     def test_vm_list_sorted(self):
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        request(host, ssl_port, '/templates', req, 'POST')
+        request(host, ssl_port, '/plugins/kimchi/templates', req, 'POST')
 
         def add_vm(name):
             # Create a VM
-            req = json.dumps({'name': name, 'template': '/templates/test'})
-            task = json.loads(request(host, ssl_port, '/vms', req,
-                              'POST').read())
+            req = json.dumps({'name': name,
+                              'template': '/plugins/kimchi/templates/test'})
+            task = json.loads(request(host, ssl_port, '/plugins/kimchi/vms',
+                              req, 'POST').read())
             wait_task(model.task_lookup, task['id'])
 
         vms = [u'abc', u'bca', u'cab', u'xba']
@@ -111,7 +112,7 @@ class MockModelTests(unittest.TestCase):
         model.templates_create({'name': u'test',
                                 'cdrom': fake_iso})
         task = model.vms_create({'name': u'test-vm',
-                                 'template': '/templates/test'})
+                                 'template': '/plugins/kimchi/templates/test'})
         wait_task(model.task_lookup, task['id'])
         vms = model.vms_get_list()
         self.assertEquals(2, len(vms))
diff --git a/plugins/kimchi/tests/test_model.py b/plugins/kimchi/tests/test_model.py
index 7f90274..157ba62 100644
--- a/plugins/kimchi/tests/test_model.py
+++ b/plugins/kimchi/tests/test_model.py
@@ -128,7 +128,7 @@ class ModelTests(unittest.TestCase):
             inst.templates_create(params)
             rollback.prependDefer(inst.template_delete, 'test')
 
-            params = {'name': 'kimchi-vm', 'template': '/templates/test'}
+            params = {'name': 'kimchi-vm', 'template': '/plugins/kimchi/templates/test'}
             task = inst.vms_create(params)
             rollback.prependDefer(inst.vm_delete, 'kimchi-vm')
             inst.task_wait(task['id'], 10)
@@ -264,12 +264,13 @@ class ModelTests(unittest.TestCase):
                          "icon": "images/icon-vm.png",
                          "os_distro": "unknown", "os_version": "unknown",
                          "disks": [{"base": vol_path, "size": 10}],
-                         "storagepool": "/storagepools/default"}
+                         "storagepool": "/plugins/kimchi/storagepools/default"}
 
             with inst.objstore as session:
                 session.store('template', tmpl_name, tmpl_info)
 
-            params = {'name': 'kimchi-vm', 'template': '/templates/img-tmpl'}
+            params = {'name': 'kimchi-vm',
+                      'template': '/plugins/kimchi/templates/img-tmpl'}
             task = inst.vms_create(params)
             inst.task_wait(task['id'])
             rollback.prependDefer(inst.vm_delete, 'kimchi-vm')
@@ -289,7 +290,8 @@ class ModelTests(unittest.TestCase):
         params = {'name': 'test', 'disks': [], 'cdrom': UBUNTU_ISO}
         inst.templates_create(params)
         with RollbackContext() as rollback:
-            params = {'name': 'kimchi-vnc', 'template': '/templates/test'}
+            params = {'name': 'kimchi-vnc',
+                      'template': '/plugins/kimchi/templates/test'}
             task1 = inst.vms_create(params)
             inst.task_wait(task1['id'])
             rollback.prependDefer(inst.vm_delete, 'kimchi-vnc')
@@ -299,7 +301,7 @@ class ModelTests(unittest.TestCase):
             self.assertEquals('127.0.0.1', info['graphics']['listen'])
 
             graphics = {'type': 'spice', 'listen': '127.0.0.1'}
-            params = {'name': 'kimchi-spice', 'template': '/templates/test',
+            params = {'name': 'kimchi-spice', 'template': '/plugins/kimchi/templates/test',
                       'graphics': graphics}
             task2 = inst.vms_create(params)
             inst.task_wait(task2['id'])
@@ -330,7 +332,8 @@ class ModelTests(unittest.TestCase):
             rollback.prependDefer(inst.network_deactivate, net_name)
 
             for vm_name in ['kimchi-ifaces', 'kimchi-ifaces-running']:
-                params = {'name': vm_name, 'template': '/templates/test'}
+                params = {'name': vm_name,
+                          'template': '/plugins/kimchi/templates/test'}
                 task = inst.vms_create(params)
                 inst.task_wait(task['id'])
                 rollback.prependDefer(inst.vm_delete, vm_name)
@@ -433,7 +436,8 @@ class ModelTests(unittest.TestCase):
             params = {'name': 'test', 'disks': [], 'cdrom': UBUNTU_ISO}
             inst.templates_create(params)
             rollback.prependDefer(inst.template_delete, 'test')
-            params = {'name': vm_name, 'template': '/templates/test'}
+            params = {'name': vm_name,
+                      'template': '/plugins/kimchi/templates/test'}
             task1 = inst.vms_create(params)
             inst.task_wait(task1['id'])
             rollback.prependDefer(inst.vm_delete, vm_name)
@@ -477,7 +481,7 @@ class ModelTests(unittest.TestCase):
             inst.templates_create(params)
             rollback.prependDefer(inst.template_delete, 'old_distro_template')
             params = {'name': vm_name,
-                      'template': '/templates/old_distro_template'}
+                   'template': '/plugins/kimchi/templates/old_distro_template'}
             task2 = inst.vms_create(params)
             inst.task_wait(task2['id'])
             rollback.prependDefer(inst.vm_delete, vm_name)
@@ -499,7 +503,8 @@ class ModelTests(unittest.TestCase):
             params = {'name': 'test', 'disks': [], 'cdrom': UBUNTU_ISO}
             inst.templates_create(params)
             rollback.prependDefer(inst.template_delete, 'test')
-            params = {'name': vm_name, 'template': '/templates/test'}
+            params = {'name': vm_name,
+                      'template': '/plugins/kimchi/templates/test'}
             task = inst.vms_create(params)
             inst.task_wait(task['id'])
             rollback.prependDefer(inst.vm_delete, vm_name)
@@ -589,7 +594,8 @@ class ModelTests(unittest.TestCase):
             inst.templates_create(params)
             rollback.prependDefer(inst.template_delete, 'test')
 
-            params = {'name': 'test-vm-1', 'template': '/templates/test'}
+            params = {'name': 'test-vm-1',
+                      'template': '/plugins/kimchi/templates/test'}
             task = inst.vms_create(params)
             inst.task_wait(task['id'])
             rollback.prependDefer(inst.vm_delete, 'test-vm-1')
@@ -607,7 +613,8 @@ class ModelTests(unittest.TestCase):
         inst.templates_create(orig_params)
 
         with RollbackContext() as rollback:
-            params = {'name': 'kimchi-vm1', 'template': '/templates/test'}
+            params = {'name': 'kimchi-vm1',
+                      'template': '/plugins/kimchi/templates/test'}
             task1 = inst.vms_create(params)
             inst.task_wait(task1['id'])
             rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete,
@@ -639,8 +646,10 @@ class ModelTests(unittest.TestCase):
         inst.templates_create(orig_params)
 
         with RollbackContext() as rollback:
-            params_1 = {'name': 'kimchi-vm1', 'template': '/templates/test'}
-            params_2 = {'name': 'kimchi-vm2', 'template': '/templates/test'}
+            params_1 = {'name': 'kimchi-vm1',
+                        'template': '/plugins/kimchi/templates/test'}
+            params_2 = {'name': 'kimchi-vm2',
+                        'template': '/plugins/kimchi/templates/test'}
             task1 = inst.vms_create(params_1)
             inst.task_wait(task1['id'])
             rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete,
@@ -824,7 +833,8 @@ class ModelTests(unittest.TestCase):
             inst.templates_create(params)
             rollback.prependDefer(inst.template_delete, 'test')
 
-            params = {'name': u'k??????h??-?????', 'template': u'/templates/test'}
+            params = {'name': u'k??????h??-?????',
+                      'template': u'/plugins/kimchi/templates/test'}
             task = inst.vms_create(params)
             inst.task_wait(task['id'])
             rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete,
@@ -849,7 +859,8 @@ class ModelTests(unittest.TestCase):
             inst.templates_create(params)
             rollback.prependDefer(inst.template_delete, 'test')
 
-            params = {'name': 'kimchi-vm', 'template': '/templates/test'}
+            params = {'name': 'kimchi-vm',
+                      'template': '/plugins/kimchi/templates/test'}
             task = inst.vms_create(params)
             inst.task_wait(task['id'])
             rollback.prependDefer(inst.vm_delete, 'kimchi-vm')
@@ -914,7 +925,7 @@ class ModelTests(unittest.TestCase):
 
         with RollbackContext() as rollback:
             params = {'name': 'test', 'disks': [], 'cdrom': UBUNTU_ISO,
-                      'storagepool': '/storagepools/default-pool',
+                      'storagepool': '/plugins/kimchi/storagepools/default-pool',
                       'domain': 'test',
                       'arch': 'i686'}
 
@@ -922,7 +933,7 @@ class ModelTests(unittest.TestCase):
             rollback.prependDefer(inst.template_delete, 'test')
 
             params = {'name': 'kimchi-vm',
-                      'template': '/templates/test'}
+                      'template': '/plugins/kimchi/templates/test'}
             task = inst.vms_create(params)
             inst.task_wait(task['id'])
             rollback.prependDefer(inst.vm_delete, 'kimchi-vm')
diff --git a/plugins/kimchi/tests/test_model_network.py b/plugins/kimchi/tests/test_model_network.py
index d557b3c..37f5652 100644
--- a/plugins/kimchi/tests/test_model_network.py
+++ b/plugins/kimchi/tests/test_model_network.py
@@ -59,11 +59,11 @@ def tearDownModule():
 def _do_network_test(self, model, params):
     with RollbackContext() as rollback:
         net_name = params['name']
-        uri = '/networks/%s' % net_name.encode('utf-8')
+        uri = '/plugins/kimchi/networks/%s' % net_name.encode('utf-8')
 
         # Create a network
         req = json.dumps(params)
-        resp = self.request('/networks', req, 'POST')
+        resp = self.request('/plugins/kimchi/networks', req, 'POST')
         rollback.prependDefer(rollback_wrapper, model.network_delete,
                               net_name)
         self.assertEquals(201, resp.status)
@@ -100,7 +100,7 @@ class NetworkTests(unittest.TestCase):
         self.request = partial(request, host, ssl_port)
 
     def test_get_networks(self):
-        networks = json.loads(self.request('/networks').read())
+        networks = json.loads(self.request('/plugins/kimchi/networks').read())
         self.assertIn('default', [net['name'] for net in networks])
 
         with RollbackContext() as rollback:
@@ -111,16 +111,16 @@ class NetworkTests(unittest.TestCase):
                                   'connection': 'nat',
                                   'subnet': '127.0.10%i.0/24' % i})
 
-                resp = self.request('/networks', req, 'POST')
+                resp = self.request('/plugins/kimchi/networks', req, 'POST')
                 rollback.prependDefer(model.network_delete, name)
                 self.assertEquals(201, resp.status)
                 network = json.loads(resp.read())
                 self.assertEquals([], network["vms"])
 
-            nets = json.loads(self.request('/networks').read())
+            nets = json.loads(self.request('/plugins/kimchi/networks').read())
             self.assertEquals(len(networks) + 5, len(nets))
 
-            network = json.loads(self.request('/networks/network-1').read())
+            network = json.loads(self.request('/plugins/kimchi/networks/network-1').read())
             keys = [u'name', u'connection', u'interface', u'subnet', u'dhcp',
                     u'vms', u'in_use', u'autostart', u'state', u'persistent']
             self.assertEquals(sorted(keys), sorted(network.keys()))
@@ -134,7 +134,7 @@ class NetworkTests(unittest.TestCase):
 
         # Verify the current system has at least one interface to create a
         # bridged network
-        interfaces = json.loads(self.request('/interfaces?type=nic').read())
+        interfaces = json.loads(self.request('/plugins/kimchi/interfaces?type=nic').read())
         if len(interfaces) > 0:
             iface = interfaces[0]['name']
             networks.append({'name': u'bridge-network', 'connection': 'bridge',
diff --git a/plugins/kimchi/tests/test_model_storagepool.py b/plugins/kimchi/tests/test_model_storagepool.py
index dda0cdc..ec11dc1 100644
--- a/plugins/kimchi/tests/test_model_storagepool.py
+++ b/plugins/kimchi/tests/test_model_storagepool.py
@@ -62,7 +62,7 @@ class StoragepoolTests(unittest.TestCase):
         self.request = partial(request, host, ssl_port)
 
     def test_get_storagepools(self):
-        storagepools = json.loads(self.request('/storagepools').read())
+        storagepools = json.loads(self.request('/plugins/kimchi/storagepools').read())
         self.assertIn('default', [pool['name'] for pool in storagepools])
 
         with RollbackContext() as rollback:
@@ -71,7 +71,7 @@ class StoragepoolTests(unittest.TestCase):
                 name = u'k??????h??-storagepool-%i' % i
                 req = json.dumps({'name': name, 'type': 'dir',
                                   'path': '/var/lib/libvirt/images/%i' % i})
-                resp = self.request('/storagepools', req, 'POST')
+                resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
                 rollback.prependDefer(model.storagepool_delete, name)
 
                 self.assertEquals(201, resp.status)
@@ -79,11 +79,11 @@ class StoragepoolTests(unittest.TestCase):
                 # Pool name must be unique
                 req = json.dumps({'name': name, 'type': 'dir',
                                   'path': '/var/lib/libvirt/images/%i' % i})
-                resp = self.request('/storagepools', req, 'POST')
+                resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
                 self.assertEquals(400, resp.status)
 
                 # Verify pool information
-                resp = self.request('/storagepools/%s' % name.encode("utf-8"))
+                resp = self.request('/plugins/kimchi/storagepools/%s' % name.encode("utf-8"))
                 p = json.loads(resp.read())
                 keys = [u'name', u'state', u'capacity', u'allocated',
                         u'available', u'path', u'source', u'type',
@@ -95,7 +95,7 @@ class StoragepoolTests(unittest.TestCase):
                 self.assertEquals(True, p['autostart'])
                 self.assertEquals(0, p['nr_volumes'])
 
-            pools = json.loads(self.request('/storagepools').read())
+            pools = json.loads(self.request('/plugins/kimchi/storagepools').read())
             self.assertEquals(len(storagepools) + 3, len(pools))
 
             # Create a pool with an existing path
@@ -103,12 +103,12 @@ class StoragepoolTests(unittest.TestCase):
             rollback.prependDefer(os.rmdir, tmp_path)
             req = json.dumps({'name': 'existing_path', 'type': 'dir',
                               'path': tmp_path})
-            resp = self.request('/storagepools', req, 'POST')
+            resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
             rollback.prependDefer(model.storagepool_delete, 'existing_path')
             self.assertEquals(201, resp.status)
 
             # Reserved pool return 400
             req = json.dumps({'name': 'kimchi_isos', 'type': 'dir',
                               'path': '/var/lib/libvirt/images/%i' % i})
-            resp = request(host, ssl_port, '/storagepools', req, 'POST')
+            resp = request(host, ssl_port, '/plugins/kimchi/storagepools', req, 'POST')
             self.assertEquals(400, resp.status)
diff --git a/plugins/kimchi/tests/test_model_storagevolume.py b/plugins/kimchi/tests/test_model_storagevolume.py
index d47b4e3..103948e 100644
--- a/plugins/kimchi/tests/test_model_storagevolume.py
+++ b/plugins/kimchi/tests/test_model_storagevolume.py
@@ -62,13 +62,13 @@ def tearDownModule():
 
 def _do_volume_test(self, model, host, ssl_port, pool_name):
     def _task_lookup(taskid):
-        return json.loads(self.request('/tasks/%s' % taskid).read())
+        return json.loads(self.request('/plugins/kimchi/tasks/%s' % taskid).read())
 
-    uri = '/storagepools/%s/storagevolumes' % pool_name.encode('utf-8')
+    uri = '/plugins/kimchi/storagepools/%s/storagevolumes' % pool_name.encode('utf-8')
     resp = self.request(uri)
     self.assertEquals(200, resp.status)
 
-    resp = self.request('/storagepools/%s' % pool_name.encode('utf-8'))
+    resp = self.request('/plugins/kimchi/storagepools/%s' % pool_name.encode('utf-8'))
     pool_info = json.loads(resp.read())
     with RollbackContext() as rollback:
         # Create storage volume with 'capacity'
@@ -85,7 +85,7 @@ def _do_volume_test(self, model, host, ssl_port, pool_name):
             self.assertEquals(202, resp.status)
             task_id = json.loads(resp.read())['id']
             wait_task(_task_lookup, task_id)
-            status = json.loads(self.request('/tasks/%s' % task_id).read())
+            status = json.loads(self.request('/plugins/kimchi/tasks/%s' % task_id).read())
             self.assertEquals('finished', status['status'])
             vol_info = json.loads(self.request(vol_uri).read())
             vol_info['name'] = vol
@@ -129,7 +129,7 @@ def _do_volume_test(self, model, host, ssl_port, pool_name):
             rollback.prependDefer(model.storagevolume_delete, pool_name,
                                   cloned_vol_name)
             wait_task(_task_lookup, task['id'])
-            task = json.loads(self.request('/tasks/%s' % task['id']).read())
+            task = json.loads(self.request('/plugins/kimchi/tasks/%s' % task['id']).read())
             self.assertEquals('finished', task['status'])
             resp = self.request(uri + '/' + cloned_vol_name.encode('utf-8'))
 
@@ -168,7 +168,8 @@ def _do_volume_test(self, model, host, ssl_port, pool_name):
             self.assertEquals(202, resp.status)
             task_id = json.loads(resp.read())['id']
             wait_task(_task_lookup, task_id)
-            status = json.loads(self.request('/tasks/%s' % task_id).read())
+            status = json.loads(self.request('/plugins/kimchi/tasks/%s' %
+                                             task_id).read())
             self.assertEquals('ready for upload', status['message'])
 
             # Upload volume content
@@ -249,7 +250,7 @@ class StorageVolumeTests(unittest.TestCase):
         self.request = partial(request, host, ssl_port)
 
     def test_get_storagevolume(self):
-        uri = '/storagepools/default/storagevolumes'
+        uri = '/plugins/kimchi/storagepools/default/storagevolumes'
         resp = self.request(uri)
         self.assertEquals(200, resp.status)
 
diff --git a/plugins/kimchi/tests/test_rest.py b/plugins/kimchi/tests/test_rest.py
index f390abb..69db7a7 100644
--- a/plugins/kimchi/tests/test_rest.py
+++ b/plugins/kimchi/tests/test_rest.py
@@ -96,14 +96,14 @@ class RestTests(unittest.TestCase):
         self.assertEquals(code, resp.status)
 
     def test_get_vms(self):
-        vms = json.loads(self.request('/vms').read())
+        vms = json.loads(self.request('/plugins/kimchi/vms').read())
         # test_rest.py uses MockModel() which connects to libvirt URI
         # test:///default. By default this driver already has one VM created
         self.assertEquals(1, len(vms))
 
         # Create a template as a base for our VMs
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         test_users = ['root']
@@ -111,17 +111,17 @@ class RestTests(unittest.TestCase):
         # Now add a couple of VMs to the mock model
         for i in xrange(10):
             name = 'vm-%i' % i
-            req = json.dumps({'name': name, 'template': '/templates/test',
+            req = json.dumps({'name': name, 'template': '/plugins/kimchi/templates/test',
                              'users': test_users, 'groups': test_groups})
-            resp = self.request('/vms', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms', req, 'POST')
             self.assertEquals(202, resp.status)
             task = json.loads(resp.read())
             wait_task(self._task_lookup, task['id'])
 
-        vms = json.loads(self.request('/vms').read())
+        vms = json.loads(self.request('/plugins/kimchi/vms').read())
         self.assertEquals(11, len(vms))
 
-        vm = json.loads(self.request('/vms/vm-1').read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/vm-1').read())
         self.assertEquals('vm-1', vm['name'])
         self.assertEquals('shutoff', vm['state'])
         self.assertEquals([], vm['users'])
@@ -129,123 +129,124 @@ class RestTests(unittest.TestCase):
 
     def test_edit_vm(self):
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
-        req = json.dumps({'name': 'vm-1', 'template': '/templates/test'})
-        resp = self.request('/vms', req, 'POST')
+        req = json.dumps({'name': 'vm-1',
+                          'template': '/plugins/kimchi/templates/test'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
 
-        vm = json.loads(self.request('/vms/vm-1').read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/vm-1').read())
         self.assertEquals('vm-1', vm['name'])
 
-        resp = self.request('/vms/vm-1/start', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/vm-1/start', '{}', 'POST')
         self.assertEquals(200, resp.status)
 
         req = json.dumps({'unsupported-attr': 'attr'})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'name': 'new-vm'})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'cpus': 3})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(200, resp.status)
 
         # Check if there is support to memory hotplug, once vm is running
-        resp = self.request('/config/capabilities').read()
+        resp = self.request('/plugins/kimchi/config/capabilities').read()
         conf = json.loads(resp)
         req = json.dumps({'memory': 2048})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         if conf['mem_hotplug_support']:
             self.assertEquals(200, resp.status)
         else:
             self.assertEquals(400, resp.status)
 
         req = json.dumps({"graphics": {'passwd': "abcdef"}})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         info = json.loads(resp.read())
         self.assertEquals('abcdef', info["graphics"]["passwd"])
         self.assertEquals(None, info["graphics"]["passwdValidTo"])
 
-        resp = self.request('/vms/vm-1/poweroff', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/vm-1/poweroff', '{}', 'POST')
         self.assertEquals(200, resp.status)
 
         req = json.dumps({"graphics": {'passwd': "123456",
                                        'passwdValidTo': 20}})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         info = json.loads(resp.read())
         self.assertEquals('123456', info["graphics"]["passwd"])
         self.assertGreaterEqual(20, info["graphics"]["passwdValidTo"])
 
         req = json.dumps({'name': 12})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'name': ''})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'cpus': -2})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'cpus': 'four'})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'memory': 100})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'memory': 'ten gigas'})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         req = json.dumps({'name': 'new-name', 'cpus': 5, 'UUID': 'notallowed'})
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         params = {'name': u'?????-????d??t??d', 'cpus': 5, 'memory': 3072}
         req = json.dumps(params)
-        resp = self.request('/vms/vm-1', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT')
         self.assertEquals(303, resp.status)
-        vm = json.loads(self.request('/vms/?????-????d??t??d', req).read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/?????-????d??t??d', req).read())
         for key in params.keys():
             self.assertEquals(params[key], vm[key])
 
         # change only VM users - groups are not changed (default is empty)
-        resp = self.request('/users', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/users', '{}', 'GET')
         users = json.loads(resp.read())
         req = json.dumps({'users': users})
-        resp = self.request('/vms/?????-????d??t??d', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/?????-????d??t??d', req, 'PUT')
         self.assertEquals(200, resp.status)
-        info = json.loads(self.request('/vms/?????-????d??t??d', '{}').read())
+        info = json.loads(self.request('/plugins/kimchi/vms/?????-????d??t??d', '{}').read())
         self.assertEquals(users, info['users'])
 
         # change only VM groups - users are not changed (default is empty)
-        resp = self.request('/groups', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/groups', '{}', 'GET')
         groups = json.loads(resp.read())
         req = json.dumps({'groups': groups})
-        resp = self.request('/vms/?????-????d??t??d', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/?????-????d??t??d', req, 'PUT')
         self.assertEquals(200, resp.status)
-        info = json.loads(self.request('/vms/?????-????d??t??d', '{}').read())
+        info = json.loads(self.request('/plugins/kimchi/vms/?????-????d??t??d', '{}').read())
         self.assertEquals(groups, info['groups'])
 
         # change VM users (wrong value) and groups
         # when an error occurs, everything fails and nothing is changed
         req = json.dumps({'users': ['userdoesnotexist'], 'groups': []})
-        resp = self.request('/vms/?????-????d??t??d', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/?????-????d??t??d', req, 'PUT')
         self.assertEquals(400, resp.status)
 
         # change VM users and groups (wrong value)
         # when an error occurs, everything fails and nothing is changed
         req = json.dumps({'users': [], 'groups': ['groupdoesnotexist']})
-        resp = self.request('/vms/?????-????d??t??d', req, 'PUT')
+        resp = self.request('/plugins/kimchi/vms/?????-????d??t??d', req, 'PUT')
         self.assertEquals(400, resp.status)
 
     def test_vm_lifecycle(self):
@@ -253,31 +254,32 @@ class RestTests(unittest.TestCase):
         req = json.dumps({'name': 'test', 'disks': [{'size': 1}],
                           'icon': 'images/icon-debian.png',
                           'cdrom': fake_iso})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Create a VM
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test'})
-        resp = self.request('/vms', req, 'POST')
+        req = json.dumps({'name': 'test-vm',
+                          'template': '/plugins/kimchi/templates/test'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
         self.assertEquals(202, resp.status)
 
         # Verify the VM
-        vm = json.loads(self.request('/vms/test-vm').read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('shutoff', vm['state'])
         self.assertEquals('images/icon-debian.png', vm['icon'])
 
         # Verify the volume was created
-        vol_uri = '/storagepools/default-pool/storagevolumes/%s-0.img'
+        vol_uri = '/plugins/kimchi/storagepools/default-pool/storagevolumes/%s-0.img'
         resp = self.request(vol_uri % vm['uuid'])
         vol = json.loads(resp.read())
         self.assertEquals(1 << 30, vol['capacity'])
         self.assertEquals(['test-vm'], vol['used_by'])
 
         # Start the VM
-        resp = self.request('/vms/test-vm/start', '{}', 'POST')
-        vm = json.loads(self.request('/vms/test-vm').read())
+        resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', 'POST')
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('running', vm['state'])
 
         # Test screenshot
@@ -286,32 +288,32 @@ class RestTests(unittest.TestCase):
         self.assertTrue(resp.getheader('Content-type').startswith('image'))
 
         # Clone a running VM
-        resp = self.request('/vms/test-vm/clone', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/clone', '{}', 'POST')
         self.assertEquals(400, resp.status)
 
         # Force poweroff the VM
-        resp = self.request('/vms/test-vm/poweroff', '{}', 'POST')
-        vm = json.loads(self.request('/vms/test-vm').read())
+        resp = self.request('/plugins/kimchi/vms/test-vm/poweroff', '{}', 'POST')
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('shutoff', vm['state'])
 
         # Test create VM with same name fails with 400
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test'})
-        resp = self.request('/vms', req, 'POST')
+        req = json.dumps({'name': 'test-vm', 'template': '/plugins/kimchi/templates/test'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(400, resp.status)
 
         # Clone a VM
-        resp = self.request('/vms/test-vm/clone', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/clone', '{}', 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
-        task = json.loads(self.request('/tasks/%s' % task['id'], '{}').read())
+        task = json.loads(self.request('/plugins/kimchi/tasks/%s' % task['id'], '{}').read())
         self.assertEquals('finished', task['status'])
         clone_vm_name = task['target_uri'].split('/')[-2]
         self.assertTrue(re.match(u'test-vm-clone-\d+', clone_vm_name))
 
-        resp = self.request('/vms/test-vm', '{}')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}')
         original_vm_info = json.loads(resp.read())
-        resp = self.request('/vms/%s' % clone_vm_name, '{}')
+        resp = self.request('/plugins/kimchi/vms/%s' % clone_vm_name, '{}')
         self.assertEquals(200, resp.status)
         clone_vm_info = json.loads(resp.read())
 
@@ -327,20 +329,21 @@ class RestTests(unittest.TestCase):
 
         # Create a snapshot on a stopped VM
         params = {'name': 'test-snap'}
-        resp = self.request('/vms/test-vm/snapshots', json.dumps(params),
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots', json.dumps(params),
                             'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
-        task = json.loads(self.request('/tasks/%s' % task['id']).read())
+        task = json.loads(self.request('/plugins/kimchi/tasks/%s' % task['id']).read())
         self.assertEquals('finished', task['status'])
 
         # Look up a non-existing snapshot
-        resp = self.request('/vms/test-vm/snapshots/snap404', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots/snap404',
+                            '{}', 'GET')
         self.assertEquals(404, resp.status)
 
         # Look up a snapshot
-        resp = self.request('/vms/test-vm/snapshots/%s' % params['name'], '{}',
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots/%s' % params['name'], '{}',
                             'GET')
         self.assertEquals(200, resp.status)
         snap = json.loads(resp.read())
@@ -349,90 +352,90 @@ class RestTests(unittest.TestCase):
         self.assertEquals(u'', snap['parent'])
         self.assertEquals(u'shutoff', snap['state'])
 
-        resp = self.request('/vms/test-vm/snapshots', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots', '{}', 'GET')
         self.assertEquals(200, resp.status)
         snaps = json.loads(resp.read())
         self.assertEquals(1, len(snaps))
 
         # Look up current snapshot (the one created above)
-        resp = self.request('/vms/test-vm/snapshots/current', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots/current', '{}', 'GET')
         self.assertEquals(200, resp.status)
         snap = json.loads(resp.read())
         self.assertEquals(params['name'], snap['name'])
 
-        resp = self.request('/vms/test-vm/snapshots', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots', '{}', 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         snap_name = task['target_uri'].split('/')[-1]
         wait_task(self._task_lookup, task['id'])
-        resp = self.request('/tasks/%s' % task['id'], '{}', 'GET')
+        resp = self.request('/plugins/kimchi/tasks/%s' % task['id'], '{}', 'GET')
         task = json.loads(resp.read())
         self.assertEquals('finished', task['status'])
 
-        resp = self.request('/vms/test-vm/snapshots', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots', '{}', 'GET')
         self.assertEquals(200, resp.status)
         snaps = json.loads(resp.read())
         self.assertEquals(2, len(snaps))
 
         # Look up current snapshot (the one created above)
-        resp = self.request('/vms/test-vm/snapshots/current', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots/current', '{}', 'GET')
         self.assertEquals(200, resp.status)
         snap = json.loads(resp.read())
         self.assertEquals(snap_name, snap['name'])
 
         # Revert to snapshot
-        resp = self.request('/vms/test-vm/snapshots/%s/revert' %
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots/%s/revert' %
                             params['name'], '{}', 'POST')
         self.assertEquals(200, resp.status)
         snap = json.loads(resp.read())
-        resp = self.request('/vms/test-vm', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'GET')
         self.assertEquals(200, resp.status)
         vm = json.loads(resp.read())
         self.assertEquals(vm['state'], snap['state'])
-        resp = self.request('/vms/test-vm/snapshots/current', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots/current', '{}', 'GET')
         self.assertEquals(200, resp.status)
         current_snap = json.loads(resp.read())
         self.assertEquals(snap, current_snap)
 
         # Delete a snapshot
-        resp = self.request('/vms/test-vm/snapshots/%s' % params['name'],
+        resp = self.request('/plugins/kimchi/vms/test-vm/snapshots/%s' % params['name'],
                             '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Suspend the VM
-        resp = self.request('/vms/test-vm', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'GET')
         self.assertEquals(200, resp.status)
         vm = json.loads(resp.read())
         self.assertEquals(vm['state'], 'shutoff')
-        resp = self.request('/vms/test-vm/suspend', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/suspend', '{}', 'POST')
         self.assertEquals(400, resp.status)
-        resp = self.request('/vms/test-vm/start', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', 'POST')
         self.assertEquals(200, resp.status)
-        resp = self.request('/vms/test-vm', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'GET')
         self.assertEquals(200, resp.status)
         vm = json.loads(resp.read())
         self.assertEquals(vm['state'], 'running')
-        resp = self.request('/vms/test-vm/suspend', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/suspend', '{}', 'POST')
         self.assertEquals(200, resp.status)
-        resp = self.request('/vms/test-vm', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'GET')
         self.assertEquals(200, resp.status)
         vm = json.loads(resp.read())
         self.assertEquals(vm['state'], 'paused')
 
         # Resume the VM
-        resp = self.request('/vms/test-vm/resume', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/resume', '{}', 'POST')
         self.assertEquals(200, resp.status)
-        resp = self.request('/vms/test-vm', '{}', 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'GET')
         self.assertEquals(200, resp.status)
         vm = json.loads(resp.read())
         self.assertEquals(vm['state'], 'running')
 
         # Delete the VM
-        resp = self.request('/vms/test-vm', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Delete the Template
-        resp = self.request('/templates/test', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/templates/test', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Verify the volume was deleted
@@ -441,87 +444,88 @@ class RestTests(unittest.TestCase):
     def test_vm_graphics(self):
         # Create a Template
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Create a VM with default args
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test'})
-        resp = self.request('/vms', req, 'POST')
+        req = json.dumps({'name': 'test-vm',
+                          'template': '/plugins/kimchi/templates/test'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
         # Verify the VM
-        vm = json.loads(self.request('/vms/test-vm').read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('127.0.0.1', vm['graphics']['listen'])
         self.assertEquals('vnc', vm['graphics']['type'])
         # Delete the VM
-        resp = self.request('/vms/test-vm', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Create a VM with specified graphics type and listen
         graphics = {'type': 'vnc', 'listen': '127.0.0.1'}
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test',
+        req = json.dumps({'name': 'test-vm', 'template': '/plugins/kimchi/templates/test',
                           'graphics': graphics})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
         # Verify the VM
-        vm = json.loads(self.request('/vms/test-vm').read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('127.0.0.1', vm['graphics']['listen'])
         self.assertEquals('vnc', vm['graphics']['type'])
         # Delete the VM
-        resp = self.request('/vms/test-vm', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Create a VM with listen as ipv6 address
         graphics = {'type': 'spice', 'listen': 'fe00::0'}
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test',
+        req = json.dumps({'name': 'test-vm', 'template': '/plugins/kimchi/templates/test',
                           'graphics': graphics})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
         # Verify the VM
-        vm = json.loads(self.request('/vms/test-vm').read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('fe00::0', vm['graphics']['listen'])
         self.assertEquals('spice', vm['graphics']['type'])
         # Delete the VM
-        resp = self.request('/vms/test-vm', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Create a VM with specified graphics type and default listen
         graphics = {'type': 'spice'}
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test',
+        req = json.dumps({'name': 'test-vm', 'template': '/plugins/kimchi/templates/test',
                           'graphics': graphics})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
         # Verify the VM
-        vm = json.loads(self.request('/vms/test-vm').read())
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('127.0.0.1', vm['graphics']['listen'])
         self.assertEquals('spice', vm['graphics']['type'])
         # Delete the VM
-        resp = self.request('/vms/test-vm', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Try to create a VM with invalid graphics type
         graphics = {'type': 'invalid'}
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test',
+        req = json.dumps({'name': 'test-vm', 'template': '/plugins/kimchi/templates/test',
                           'graphics': graphics})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(400, resp.status)
 
         # Try to create a VM with invalid graphics listen
         graphics = {'type': 'spice', 'listen': 'invalid'}
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test',
+        req = json.dumps({'name': 'test-vm', 'template': '/plugins/kimchi/templates/test',
                           'graphics': graphics})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(400, resp.status)
 
         # Delete the Template
-        resp = self.request('/templates/test', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/templates/test', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
     def test_vm_storage_devices(self):
@@ -529,25 +533,25 @@ class RestTests(unittest.TestCase):
         with RollbackContext() as rollback:
             # Create a template as a base for our VMs
             req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-            resp = self.request('/templates', req, 'POST')
+            resp = self.request('/plugins/kimchi/templates', req, 'POST')
             self.assertEquals(201, resp.status)
             # Delete the template
             rollback.prependDefer(self.request,
-                                  '/templates/test', '{}', 'DELETE')
+                                  '/plugins/kimchi/templates/test', '{}', 'DELETE')
 
             # Create a VM with default args
             req = json.dumps({'name': 'test-vm',
-                              'template': '/templates/test'})
-            resp = self.request('/vms', req, 'POST')
+                              'template': '/plugins/kimchi/templates/test'})
+            resp = self.request('/plugins/kimchi/vms', req, 'POST')
             self.assertEquals(202, resp.status)
             task = json.loads(resp.read())
             wait_task(self._task_lookup, task['id'])
             # Delete the VM
             rollback.prependDefer(self.request,
-                                  '/vms/test-vm', '{}', 'DELETE')
+                                  '/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
 
             # Check storage devices
-            resp = self.request('/vms/test-vm/storages', '{}', 'GET')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages', '{}', 'GET')
             devices = json.loads(resp.read())
             self.assertEquals(2, len(devices))
             dev_types = []
@@ -563,7 +567,7 @@ class RestTests(unittest.TestCase):
             req = json.dumps({'dev': 'hdx',
                               'type': 'cdrom',
                               'path': '/tmp/nonexistent.iso'})
-            resp = self.request('/vms/test-vm/storages', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages', req, 'POST')
             self.assertEquals(400, resp.status)
 
             # Create temp storage pool
@@ -572,9 +576,9 @@ class RestTests(unittest.TestCase):
                               'allocated': 512,
                               'path': '/tmp',
                               'type': 'dir'})
-            resp = self.request('/storagepools', req, 'POST')
+            resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
             self.assertEquals(201, resp.status)
-            resp = self.request('/storagepools/tmp/activate', req, 'POST')
+            resp = self.request('/plugins/kimchi/storagepools/tmp/activate', req, 'POST')
             self.assertEquals(200, resp.status)
 
             # 'name' is required for this type of volume
@@ -582,7 +586,7 @@ class RestTests(unittest.TestCase):
                               'allocation': 512,
                               'type': 'disk',
                               'format': 'raw'})
-            resp = self.request('/storagepools/tmp/storagevolumes',
+            resp = self.request('/plugins/kimchi/storagepools/tmp/storagevolumes',
                                 req, 'POST')
             self.assertEquals(400, resp.status)
             req = json.dumps({'name': "attach-volume",
@@ -590,7 +594,7 @@ class RestTests(unittest.TestCase):
                               'allocation': 512,
                               'type': 'disk',
                               'format': 'raw'})
-            resp = self.request('/storagepools/tmp/storagevolumes',
+            resp = self.request('/plugins/kimchi/storagepools/tmp/storagevolumes',
                                 req, 'POST')
             self.assertEquals(202, resp.status)
             time.sleep(1)
@@ -602,7 +606,7 @@ class RestTests(unittest.TestCase):
                               'pool': 'tmp',
                               'vol': 'attach-volume',
                               'path': '/tmp/existent.iso'})
-            resp = self.request('/vms/test-vm/storages', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages', req, 'POST')
             self.assertEquals(400, resp.status)
 
             # Attach disk with both path and volume specified
@@ -611,21 +615,21 @@ class RestTests(unittest.TestCase):
                               'pool': 'tmp',
                               'vol': 'attach-volume',
                               'path': '/tmp/existent.iso'})
-            resp = self.request('/vms/test-vm/storages', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages', req, 'POST')
             self.assertEquals(400, resp.status)
 
             # Attach disk with only pool specified
             req = json.dumps({'dev': 'hdx',
                               'type': 'cdrom',
                               'pool': 'tmp'})
-            resp = self.request('/vms/test-vm/storages', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages', req, 'POST')
             self.assertEquals(400, resp.status)
 
             # Attach disk with pool and vol specified
             req = json.dumps({'type': 'disk',
                               'pool': 'tmp',
                               'vol': 'attach-volume'})
-            resp = self.request('/vms/test-vm/storages', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages', req, 'POST')
             self.assertEquals(201, resp.status)
             cd_info = json.loads(resp.read())
             self.assertEquals('disk', cd_info['type'])
@@ -633,7 +637,7 @@ class RestTests(unittest.TestCase):
             # Attach a cdrom with existent dev name
             req = json.dumps({'type': 'cdrom',
                               'path': '/tmp/existent.iso'})
-            resp = self.request('/vms/test-vm/storages', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages', req, 'POST')
             self.assertEquals(201, resp.status)
             cd_info = json.loads(resp.read())
             cd_dev = cd_info['dev']
@@ -641,34 +645,34 @@ class RestTests(unittest.TestCase):
             self.assertEquals('/tmp/existent.iso', cd_info['path'])
             # Delete the file and cdrom
             rollback.prependDefer(self.request,
-                                  '/vms/test-vm/storages/hdx', '{}', 'DELETE')
+                                  '/plugins/kimchi/vms/test-vm/storages/hdx', '{}', 'DELETE')
             os.remove('/tmp/existent.iso')
 
             # Change path of storage cdrom
             cdrom = u'http://fedora.mirrors.tds.net/pub/fedora/releases/20/'\
                     'Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso'
             req = json.dumps({'path': cdrom})
-            resp = self.request('/vms/test-vm/storages/' + cd_dev, req, 'PUT')
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages/' + cd_dev, req, 'PUT')
             self.assertEquals(200, resp.status)
             cd_info = json.loads(resp.read())
             self.assertEquals(urlparse.urlparse(cdrom).path,
                               urlparse.urlparse(cd_info['path']).path)
 
             # Test GET
-            devs = json.loads(self.request('/vms/test-vm/storages').read())
+            devs = json.loads(self.request('/plugins/kimchi/vms/test-vm/storages').read())
             self.assertEquals(4, len(devs))
 
             # Detach storage cdrom
-            resp = self.request('/vms/test-vm/storages/' + cd_dev,
+            resp = self.request('/plugins/kimchi/vms/test-vm/storages/' + cd_dev,
                                 '{}', 'DELETE')
             self.assertEquals(204, resp.status)
 
             # Test GET
-            devs = json.loads(self.request('/vms/test-vm/storages').read())
+            devs = json.loads(self.request('/plugins/kimchi/vms/test-vm/storages').read())
             self.assertEquals(3, len(devs))
-            resp = self.request('/storagepools/tmp/deactivate', {}, 'POST')
+            resp = self.request('/plugins/kimchi/storagepools/tmp/deactivate', {}, 'POST')
             self.assertEquals(200, resp.status)
-            resp = self.request('/storagepools/tmp', {}, 'DELETE')
+            resp = self.request('/plugins/kimchi/storagepools/tmp', {}, 'DELETE')
             self.assertEquals(204, resp.status)
 
     def test_vm_iface(self):
@@ -676,38 +680,38 @@ class RestTests(unittest.TestCase):
         with RollbackContext() as rollback:
             # Create a template as a base for our VMs
             req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-            resp = self.request('/templates', req, 'POST')
+            resp = self.request('/plugins/kimchi/templates', req, 'POST')
             self.assertEquals(201, resp.status)
             # Delete the template
             rollback.prependDefer(self.request,
-                                  '/templates/test', '{}', 'DELETE')
+                                  '/plugins/kimchi/templates/test', '{}', 'DELETE')
 
             # Create a VM with default args
             req = json.dumps({'name': 'test-vm',
-                              'template': '/templates/test'})
-            resp = self.request('/vms', req, 'POST')
+                              'template': '/plugins/kimchi/templates/test'})
+            resp = self.request('/plugins/kimchi/vms', req, 'POST')
             self.assertEquals(202, resp.status)
             task = json.loads(resp.read())
             wait_task(self._task_lookup, task['id'])
             # Delete the VM
             rollback.prependDefer(self.request,
-                                  '/vms/test-vm', '{}', 'DELETE')
+                                  '/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
 
             # Create a network
             req = json.dumps({'name': 'test-network',
                               'connection': 'nat',
                               'net': '127.0.1.0/24'})
-            resp = self.request('/networks', req, 'POST')
+            resp = self.request('/plugins/kimchi/networks', req, 'POST')
             self.assertEquals(201, resp.status)
             # Delete the network
             rollback.prependDefer(self.request,
-                                  '/networks/test-network', '{}', 'DELETE')
+                                  '/plugins/kimchi/networks/test-network', '{}', 'DELETE')
 
-            ifaces = json.loads(self.request('/vms/test-vm/ifaces').read())
+            ifaces = json.loads(self.request('/plugins/kimchi/vms/test-vm/ifaces').read())
             self.assertEquals(1, len(ifaces))
 
             for iface in ifaces:
-                res = json.loads(self.request('/vms/test-vm/ifaces/%s' %
+                res = json.loads(self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' %
                                               iface['mac']).read())
                 self.assertEquals('default', res['network'])
                 self.assertEquals(17, len(res['mac']))
@@ -716,14 +720,15 @@ class RestTests(unittest.TestCase):
 
             # try to attach an interface without specifying 'model'
             req = json.dumps({'type': 'network'})
-            resp = self.request('/vms/test-vm/ifaces', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req,
+                                'POST')
             self.assertEquals(400, resp.status)
 
             # attach network interface to vm
             req = json.dumps({"type": "network",
                               "network": "test-network",
                               "model": "virtio"})
-            resp = self.request('/vms/test-vm/ifaces', req, 'POST')
+            resp = self.request('/plugins/kimchi/vms/test-vm/ifaces', req, 'POST')
             self.assertEquals(201, resp.status)
             iface = json.loads(resp.read())
 
@@ -736,15 +741,15 @@ class RestTests(unittest.TestCase):
             newMacAddr = '54:50:e3:44:8a:af'
             req = json.dumps({"network": "default", "model": "virtio",
                              "type": "network", "mac": newMacAddr})
-            resp = self.request('/vms/test-vm/ifaces/%s' % iface['mac'],
-                                req, 'PUT')
+            resp = self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' %
+                                iface['mac'], req, 'PUT')
             self.assertEquals(303, resp.status)
-            iface = json.loads(self.request('/vms/test-vm/ifaces/%s' %
+            iface = json.loads(self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' %
                                             newMacAddr).read())
             self.assertEquals(newMacAddr, iface['mac'])
 
             # detach network interface from vm
-            resp = self.request('/vms/test-vm/ifaces/%s' % iface['mac'],
+            resp = self.request('/plugins/kimchi/vms/test-vm/ifaces/%s' % iface['mac'],
                                 '{}', 'DELETE')
             self.assertEquals(204, resp.status)
 
@@ -752,7 +757,7 @@ class RestTests(unittest.TestCase):
         # Create a Template
         req = json.dumps({'name': 'test', 'cdrom': fake_iso,
                                           'disks': [{'size': 1}]})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Create alternate storage
@@ -761,33 +766,34 @@ class RestTests(unittest.TestCase):
                           'allocated': 512,
                           'path': '/tmp',
                           'type': 'dir'})
-        resp = self.request('/storagepools', req, 'POST')
+        resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
         self.assertEquals(201, resp.status)
-        resp = self.request('/storagepools/alt/activate', req, 'POST')
+        resp = self.request('/plugins/kimchi/storagepools/alt/activate', req, 'POST')
         self.assertEquals(200, resp.status)
 
         # Create a VM
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test',
-                          'storagepool': '/storagepools/alt'})
-        resp = self.request('/vms', req, 'POST')
+        req = json.dumps({'name': 'test-vm',
+                          'template': '/plugins/kimchi/templates/test',
+                          'storagepool': '/plugins/kimchi/storagepools/alt'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
-        resp = self.request('/vms/test-vm', {}, 'GET')
+        resp = self.request('/plugins/kimchi/vms/test-vm', {}, 'GET')
         vm_info = json.loads(resp.read())
 
         # Test template not changed after vm customise its pool
-        t = json.loads(self.request('/templates/test').read())
-        self.assertEquals(t['storagepool'], '/storagepools/default-pool')
+        t = json.loads(self.request('/plugins/kimchi/templates/test').read())
+        self.assertEquals(t['storagepool'], '/plugins/kimchi/storagepools/default-pool')
 
         # Verify the volume was created
-        vol_uri = '/storagepools/alt/storagevolumes/%s-0.img' % vm_info['uuid']
+        vol_uri = '/plugins/kimchi/storagepools/alt/storagevolumes/%s-0.img' % vm_info['uuid']
         resp = self.request(vol_uri)
         vol = json.loads(resp.read())
         self.assertEquals(1 << 30, vol['capacity'])
 
         # Delete the VM
-        resp = self.request('/vms/test-vm', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Verify the volume was deleted
@@ -798,71 +804,72 @@ class RestTests(unittest.TestCase):
         req = json.dumps({'name': 'scsi_fc_pool',
                           'type': 'scsi',
                           'source': {'adapter_name': 'scsi_host2'}})
-        resp = self.request('/storagepools', req, 'POST')
+        resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Test create vms using lun of this pool
         # activate the storage pool
-        resp = self.request('/storagepools/scsi_fc_pool/activate', '{}',
+        resp = self.request('/plugins/kimchi/storagepools/scsi_fc_pool/activate', '{}',
                             'POST')
 
         # Create template fails because SCSI volume is missing
         tmpl_params = {'name': 'test_fc_pool', 'cdrom': fake_iso,
-                       'storagepool': '/storagepools/scsi_fc_pool'}
+                       'storagepool': '/plugins/kimchi/storagepools/scsi_fc_pool'}
         req = json.dumps(tmpl_params)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(400, resp.status)
 
         # Choose SCSI volume to create template
-        resp = self.request('/storagepools/scsi_fc_pool/storagevolumes')
+        resp = self.request('/plugins/kimchi/storagepools/scsi_fc_pool/storagevolumes')
         lun_name = json.loads(resp.read())[0]['name']
 
         tmpl_params['disks'] = [{'index': 0, 'volume': lun_name}]
         req = json.dumps(tmpl_params)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Create vm in scsi pool
         req = json.dumps({'name': 'test-vm',
-                          'template': '/templates/test_fc_pool'})
-        resp = self.request('/vms', req, 'POST')
+                         'template': '/plugins/kimchi/templates/test_fc_pool'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
 
         # Start the VM
-        resp = self.request('/vms/test-vm/start', '{}', 'POST')
-        vm = json.loads(self.request('/vms/test-vm').read())
+        resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', 'POST')
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('running', vm['state'])
 
         # Force poweroff the VM
-        resp = self.request('/vms/test-vm/poweroff', '{}', 'POST')
-        vm = json.loads(self.request('/vms/test-vm').read())
+        resp = self.request('/plugins/kimchi/vms/test-vm/poweroff', '{}', 'POST')
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         self.assertEquals('shutoff', vm['state'])
 
         # Delete the VM
-        resp = self.request('/vms/test-vm', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
     def test_unnamed_vms(self):
         # Create a Template
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Create 5 unnamed vms from this template
         for i in xrange(1, 6):
-            req = json.dumps({'template': '/templates/test'})
-            task = json.loads(self.request('/vms', req, 'POST').read())
+            req = json.dumps({'template': '/plugins/kimchi/templates/test'})
+            task = json.loads(self.request('/plugins/kimchi/vms', 
+                              req, 'POST').read())
             wait_task(self._task_lookup, task['id'])
-            resp = self.request('/vms/test-vm-%i' % i, {}, 'GET')
+            resp = self.request('/plugins/kimchi/vms/test-vm-%i' % i, {}, 'GET')
             self.assertEquals(resp.status, 200)
-        count = len(json.loads(self.request('/vms').read()))
+        count = len(json.loads(self.request('/plugins/kimchi/vms').read()))
         self.assertEquals(6, count)
 
     def test_create_vm_without_template(self):
         req = json.dumps({'name': 'vm-without-template'})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(400, resp.status)
         resp = json.loads(resp.read())
         self.assertIn(u"KCHVM0016E:", resp['reason'])
@@ -870,32 +877,32 @@ class RestTests(unittest.TestCase):
     def test_create_vm_with_bad_template_uri(self):
         req = json.dumps({'name': 'vm-bad-template',
                           'template': '/mytemplate'})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(400, resp.status)
         resp = json.loads(resp.read())
         self.assertIn(u"KCHVM0012E", resp['reason'])
 
     def test_create_vm_with_img_based_template(self):
         resp = json.loads(
-            self.request('/storagepools/default-pool/storagevolumes').read())
+            self.request('/plugins/kimchi/storagepools/default-pool/storagevolumes').read())
         self.assertEquals(0, len(resp))
 
         # Create a Template
         mock_base = '/tmp/mock.img'
         open(mock_base, 'w').close()
         req = json.dumps({'name': 'test', 'disks': [{'base': mock_base}]})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
-        req = json.dumps({'template': '/templates/test'})
-        resp = self.request('/vms', req, 'POST')
+        req = json.dumps({'template': '/plugins/kimchi/templates/test'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         self.assertEquals(202, resp.status)
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
 
         # Test storage volume created with backing store of base file
         resp = json.loads(
-            self.request('/storagepools/default-pool/storagevolumes').read())
+            self.request('/plugins/kimchi/storagepools/default-pool/storagevolumes').read())
         self.assertEquals(1, len(resp))
 
     def _create_pool(self, name):
@@ -904,24 +911,24 @@ class RestTests(unittest.TestCase):
                           'allocated': 5120,
                           'path': '/var/lib/libvirt/images/',
                           'type': 'dir'})
-        resp = self.request('/storagepools', req, 'POST')
+        resp = self.request('/plugins/kimchi/storagepools', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Verify the storage pool
-        storagepool = json.loads(self.request('/storagepools/%s'
+        storagepool = json.loads(self.request('/plugins/kimchi/storagepools/%s'
                                               % name).read())
         self.assertEquals('inactive', storagepool['state'])
         return name
 
     def _delete_pool(self, name):
         # Delete the storage pool
-        resp = self.request('/storagepools/%s' % name, '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/storagepools/%s' % name, '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
     def test_iso_scan_shallow(self):
         # fake environment preparation
         self._create_pool('pool-3')
-        self.request('/storagepools/pool-3/activate', '{}', 'POST')
+        self.request('/plugins/kimchi/storagepools/pool-3/activate', '{}', 'POST')
         params = {'name': 'fedora.iso',
                   'capacity': 1073741824,  # 1 GiB
                   'type': 'file',
@@ -930,7 +937,7 @@ class RestTests(unittest.TestCase):
         wait_task(self._task_lookup, task_info['id'])
 
         storagevolume = json.loads(self.request(
-            '/storagepools/kimchi_isos/storagevolumes/').read())[0]
+            '/plugins/kimchi/storagepools/kimchi_isos/storagevolumes/').read())[0]
         self.assertEquals('fedora.iso', storagevolume['name'])
         self.assertEquals('iso', storagevolume['format'])
         self.assertEquals('/var/lib/libvirt/images/fedora.iso',
@@ -948,83 +955,84 @@ class RestTests(unittest.TestCase):
                           'cdrom': storagevolume['path'],
                           'os_distro': storagevolume['os_distro'],
                           'os_version': storagevolume['os_version']})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Verify the template
-        t = json.loads(self.request('/templates/test').read())
+        t = json.loads(self.request('/plugins/kimchi/templates/test').read())
         self.assertEquals('test', t['name'])
         self.assertEquals('fedora', t['os_distro'])
         self.assertEquals('17', t['os_version'])
         self.assertEquals(get_template_default('old', 'memory'), t['memory'])
 
         # Deactivate or destroy scan pool return 405
-        resp = self.request('/storagepools/kimchi_isos/storagevolumes'
+        resp = self.request('/plugins/kimchi/storagepools/kimchi_isos/storagevolumes'
                             '/deactivate', '{}', 'POST')
         self.assertEquals(405, resp.status)
 
-        resp = self.request('/storagepools/kimchi_isos/storagevolumes',
+        resp = self.request('/plugins/kimchi/storagepools/kimchi_isos/storagevolumes',
                             '{}', 'DELETE')
         self.assertEquals(405, resp.status)
 
         # Delete the template
-        resp = self.request('/templates/%s' % t['name'], '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/templates/%s' % t['name'], '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
-        resp = self.request('/storagepools/pool-3/deactivate', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/storagepools/pool-3/deactivate', '{}', 'POST')
         self.assertEquals(200, resp.status)
         self._delete_pool('pool-3')
 
     def test_screenshot_refresh(self):
         # Create a VM
         req = json.dumps({'name': 'test', 'cdrom': fake_iso})
-        resp = self.request('/templates', req, 'POST')
-        req = json.dumps({'name': 'test-vm', 'template': '/templates/test'})
-        resp = self.request('/vms', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
+        req = json.dumps({'name': 'test-vm',
+                          'template': '/plugins/kimchi/templates/test'})
+        resp = self.request('/plugins/kimchi/vms', req, 'POST')
         task = json.loads(resp.read())
         wait_task(self._task_lookup, task['id'])
 
         # Test screenshot for shut-off state vm
-        resp = self.request('/vms/test-vm/screenshot')
+        resp = self.request('/plugins/kimchi/vms/test-vm/screenshot')
         self.assertEquals(404, resp.status)
 
         # Test screenshot for running vm
-        resp = self.request('/vms/test-vm/start', '{}', 'POST')
-        vm = json.loads(self.request('/vms/test-vm').read())
+        resp = self.request('/plugins/kimchi/vms/test-vm/start', '{}', 'POST')
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
 
         resp = self.request(vm['screenshot'], method='HEAD')
         self.assertEquals(200, resp.status)
         self.assertTrue(resp.getheader('Content-type').startswith('image'))
 
         # Test screenshot sub-resource redirect
-        resp = self.request('/vms/test-vm/screenshot')
+        resp = self.request('/plugins/kimchi/vms/test-vm/screenshot')
         self.assertEquals(200, resp.status)
         self.assertEquals('image/png', resp.getheader('content-type'))
         lastMod1 = resp.getheader('last-modified')
 
         # Take another screenshot instantly and compare the last Modified date
-        resp = self.request('/vms/test-vm/screenshot')
+        resp = self.request('/plugins/kimchi/vms/test-vm/screenshot')
         lastMod2 = resp.getheader('last-modified')
         self.assertEquals(lastMod2, lastMod1)
 
-        resp = self.request('/vms/test-vm/screenshot', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/vms/test-vm/screenshot', '{}', 'DELETE')
         self.assertEquals(405, resp.status)
 
         # No screenshot after stopped the VM
-        self.request('/vms/test-vm/poweroff', '{}', 'POST')
-        resp = self.request('/vms/test-vm/screenshot')
+        self.request('/plugins/kimchi/vms/test-vm/poweroff', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/vms/test-vm/screenshot')
         self.assertEquals(404, resp.status)
 
         # Picture link not available after VM deleted
-        self.request('/vms/test-vm/start', '{}', 'POST')
-        vm = json.loads(self.request('/vms/test-vm').read())
+        self.request('/plugins/kimchi/vms/test-vm/start', '{}', 'POST')
+        vm = json.loads(self.request('/plugins/kimchi/vms/test-vm').read())
         img_lnk = vm['screenshot']
-        self.request('/vms/test-vm', '{}', 'DELETE')
+        self.request('/plugins/kimchi/vms/test-vm', '{}', 'DELETE')
         resp = self.request(img_lnk)
         self.assertEquals(404, resp.status)
 
     def test_interfaces(self):
-        resp = self.request('/interfaces').read()
+        resp = self.request('/plugins/kimchi/interfaces').read()
         self.assertIn('name', resp)
         interfaces = json.loads(resp)
         keys = ['name', 'type', 'ipaddr', 'netmask', 'status']
@@ -1032,39 +1040,39 @@ class RestTests(unittest.TestCase):
             self.assertEquals(sorted(keys), sorted(interface.keys()))
 
     def _task_lookup(self, taskid):
-        return json.loads(self.request('/tasks/%s' % taskid).read())
+        return json.loads(self.request('/plugins/kimchi/tasks/%s' % taskid).read())
 
     def test_tasks(self):
-        id1 = add_task('/tasks/1', self._async_op, model.objstore)
-        id2 = add_task('/tasks/2', self._except_op, model.objstore)
-        id3 = add_task('/tasks/3', self._intermid_op, model.objstore)
+        id1 = add_task('/plugins/kimchi/tasks/1', self._async_op, model.objstore)
+        id2 = add_task('/plugins/kimchi/tasks/2', self._except_op, model.objstore)
+        id3 = add_task('/plugins/kimchi/tasks/3', self._intermid_op, model.objstore)
 
         target_uri = urllib2.quote('^/tasks/*', safe="")
         filter_data = 'status=running&target_uri=%s' % target_uri
-        tasks = json.loads(self.request('/tasks?%s' % filter_data).read())
+        tasks = json.loads(self.request('/plugins/kimchi/tasks?%s' % filter_data).read())
         self.assertEquals(3, len(tasks))
 
-        tasks = json.loads(self.request('/tasks').read())
+        tasks = json.loads(self.request('/plugins/kimchi/tasks').read())
         tasks_ids = [int(t['id']) for t in tasks]
         self.assertEquals(set([id1, id2, id3]) - set(tasks_ids), set([]))
         wait_task(self._task_lookup, id2)
-        foo2 = json.loads(self.request('/tasks/%s' % id2).read())
+        foo2 = json.loads(self.request('/plugins/kimchi/tasks/%s' % id2).read())
         keys = ['id', 'status', 'message', 'target_uri']
         self.assertEquals(sorted(keys), sorted(foo2.keys()))
         self.assertEquals('failed', foo2['status'])
         wait_task(self._task_lookup, id3)
-        foo3 = json.loads(self.request('/tasks/%s' % id3).read())
+        foo3 = json.loads(self.request('/plugins/kimchi/tasks/%s' % id3).read())
         self.assertEquals('in progress', foo3['message'])
         self.assertEquals('running', foo3['status'])
 
     def test_config(self):
-        resp = self.request('/config').read()
+        resp = self.request('/plugins/kimchi/config').read()
         conf = json.loads(resp)
         keys = ["display_proxy_port", "version"]
         self.assertEquals(keys, sorted(conf.keys()))
 
     def test_capabilities(self):
-        resp = self.request('/config/capabilities').read()
+        resp = self.request('/plugins/kimchi/config/capabilities').read()
         conf = json.loads(resp)
 
         keys = [u'libvirt_stream_protocols', u'qemu_stream', u'qemu_spice',
@@ -1074,11 +1082,11 @@ class RestTests(unittest.TestCase):
         self.assertEquals(sorted(keys), sorted(conf.keys()))
 
     def test_peers(self):
-        resp = self.request('/peers').read()
+        resp = self.request('/plugins/kimchi/peers').read()
         self.assertEquals([], json.loads(resp))
 
     def test_distros(self):
-        resp = self.request('/config/distros').read()
+        resp = self.request('/plugins/kimchi/config/distros').read()
         distros = json.loads(resp)
         for distro in distros:
             self.assertIn('name', distro)
@@ -1088,7 +1096,8 @@ class RestTests(unittest.TestCase):
 
         # Test in X86
         ident = "Fedora 20"
-        resp = self.request('/config/distros/%s' % urllib2.quote(ident)).read()
+        resp = self.request('/plugins/kimchi/config/distros/%s' %
+                            urllib2.quote(ident)).read()
         distro = json.loads(resp)
         if os.uname()[4] in ['x86_64', 'amd64']:
             self.assertEquals(distro['name'], ident)
@@ -1102,7 +1111,8 @@ class RestTests(unittest.TestCase):
 
         # Test in PPC
         ident = "Fedora 20 (PPC64)"
-        resp = self.request('/config/distros/%s' % urllib2.quote(ident)).read()
+        resp = self.request('/plugins/kimchi/config/distros/%s' %
+                            urllib2.quote(ident)).read()
         distro = json.loads(resp)
         if os.uname()[4] == 'ppc64':
             self.assertEquals(distro['name'], ident)
@@ -1115,48 +1125,48 @@ class RestTests(unittest.TestCase):
             self.assertIn('KCHDISTRO0001E', distro.get('reason'))
 
     def test_debugreports(self):
-        resp = request(host, ssl_port, '/debugreports')
+        resp = request(host, ssl_port, '/plugins/kimchi/debugreports')
         self.assertEquals(200, resp.status)
 
     def _report_delete(self, name):
-        request(host, ssl_port, '/debugreports/%s' % name, '{}', 'DELETE')
+        request(host, ssl_port, '/plugins/kimchi/debugreports/%s' % name, '{}', 'DELETE')
 
     def test_create_debugreport(self):
         req = json.dumps({'name': 'report1'})
         with RollbackContext() as rollback:
-            resp = request(host, ssl_port, '/debugreports', req, 'POST')
+            resp = request(host, ssl_port, '/plugins/kimchi/debugreports', req, 'POST')
             self.assertEquals(202, resp.status)
             task = json.loads(resp.read())
             # make sure the debugreport doesn't exist until the
             # the task is finished
             wait_task(self._task_lookup, task['id'])
             rollback.prependDefer(self._report_delete, 'report2')
-            resp = request(host, ssl_port, '/debugreports/report1')
+            resp = request(host, ssl_port, '/plugins/kimchi/debugreports/report1')
             debugreport = json.loads(resp.read())
             self.assertEquals("report1", debugreport['name'])
             self.assertEquals(200, resp.status)
             req = json.dumps({'name': 'report2'})
-            resp = request(host, ssl_port, '/debugreports/report1',
+            resp = request(host, ssl_port, '/plugins/kimchi/debugreports/report1',
                            req, 'PUT')
             self.assertEquals(303, resp.status)
 
     def test_debugreport_download(self):
         req = json.dumps({'name': 'report1'})
         with RollbackContext() as rollback:
-            resp = request(host, ssl_port, '/debugreports', req, 'POST')
+            resp = request(host, ssl_port, '/plugins/kimchi/debugreports', req, 'POST')
             self.assertEquals(202, resp.status)
             task = json.loads(resp.read())
             # make sure the debugreport doesn't exist until the
             # the task is finished
             wait_task(self._task_lookup, task['id'], 20)
             rollback.prependDefer(self._report_delete, 'report1')
-            resp = request(host, ssl_port, '/debugreports/report1')
+            resp = request(host, ssl_port, '/plugins/kimchi/debugreports/report1')
             debugreport = json.loads(resp.read())
             self.assertEquals("report1", debugreport['name'])
             self.assertEquals(200, resp.status)
-            resp = request(host, ssl_port, '/debugreports/report1/content')
+            resp = request(host, ssl_port, '/plugins/kimchi/debugreports/report1/content')
             self.assertEquals(200, resp.status)
-            resp = request(host, ssl_port, '/debugreports/report1')
+            resp = request(host, ssl_port, '/plugins/kimchi/debugreports/report1')
             debugre = json.loads(resp.read())
             resp = request(host, ssl_port, debugre['uri'])
             self.assertEquals(200, resp.status)
@@ -1167,7 +1177,7 @@ class RestTests(unittest.TestCase):
                 if field in t.keys():
                     self.assertEquals(t[field], res[field])
 
-        base_uri = '/host/repositories'
+        base_uri = '/plugins/kimchi/host/repositories'
         resp = self.request(base_uri)
         self.assertEquals(200, resp.status)
         # Already have one repo in Kimchi's system
diff --git a/plugins/kimchi/tests/test_server.py b/plugins/kimchi/tests/test_server.py
index 228a9b5..48a8589 100644
--- a/plugins/kimchi/tests/test_server.py
+++ b/plugins/kimchi/tests/test_server.py
@@ -132,13 +132,13 @@ class ServerTests(unittest.TestCase):
         """
         A non-existent path should return HTTP:404
         """
-        url_list = ['/doesnotexist', '/vms/blah']
+        url_list = ['/plugins/kimchi/doesnotexist', '/plugins/kimchi/vms/blah']
         for url in url_list:
             resp = self.request(url)
             self.assertEquals(404, resp.status)
 
         # Verify it works for DELETE too
-        resp = self.request('/templates/blah', '', 'DELETE')
+        resp = self.request('/plugins/kimchi/templates/blah', '', 'DELETE')
         self.assertEquals(404, resp.status)
 
     def test_accepts(self):
@@ -177,10 +177,10 @@ class ServerTests(unittest.TestCase):
 
     def test_auth_unprotected(self):
         hdrs = {'AUTHORIZATION': ''}
-        uris = ['/js/kimchi.min.js',
-                '/css/theme-default.min.css',
+        uris = ['/plugins/kimchi/js/kimchi.min.js',
+                '/plugins/kimchi/css/theme-default.min.css',
+                '/plugins/kimchi/images/icon-vm.png',
                 '/libs/jquery-1.10.0.min.js',
-                '/images/icon-vm.png',
                 '/login.html',
                 '/logout']
 
@@ -190,9 +190,9 @@ class ServerTests(unittest.TestCase):
 
     def test_auth_protected(self):
         hdrs = {'AUTHORIZATION': ''}
-        uris = ['/vms',
-                '/vms/doesnotexist',
-                '/tasks']
+        uris = ['/plugins/kimchi/vms',
+                '/plugins/kimchi/vms/doesnotexist',
+                '/plugins/kimchi/tasks']
 
         for uri in uris:
             resp = self.request(uri, None, 'GET', hdrs)
@@ -201,7 +201,7 @@ class ServerTests(unittest.TestCase):
     def test_auth_bad_creds(self):
         # Test HTTPBA
         hdrs = {'AUTHORIZATION': "Basic " + base64.b64encode("nouser:badpass")}
-        resp = self.request('/vms', None, 'GET', hdrs)
+        resp = self.request('/plugins/kimchi/vms', None, 'GET', hdrs)
         self.assertEquals(401, resp.status)
 
         # Test REST API
@@ -216,7 +216,7 @@ class ServerTests(unittest.TestCase):
         hdrs = {"X-Requested-With": "XMLHttpRequest"}
 
         # Try our request (Note that request() will add a valid HTTPBA header)
-        resp = self.request('/vms', None, 'GET', hdrs)
+        resp = self.request('/plugins/kimchi/vms', None, 'GET', hdrs)
         self.assertEquals(401, resp.status)
         self.assertEquals(None, resp.getheader('WWW-Authenticate'))
 
@@ -226,7 +226,7 @@ class ServerTests(unittest.TestCase):
                 'Accept': 'application/json'}
 
         # Test we are logged out
-        resp = self.request('/tasks', None, 'GET', hdrs)
+        resp = self.request('/plugins/kimchi/tasks', None, 'GET', hdrs)
         self.assertEquals(401, resp.status)
 
         # Execute a login call
@@ -246,7 +246,7 @@ class ServerTests(unittest.TestCase):
         hdrs['Cookie'] = cookie
 
         # Test we are logged in with the cookie
-        resp = self.request('/tasks', None, 'GET', hdrs)
+        resp = self.request('/plugins/kimchi/tasks', None, 'GET', hdrs)
         self.assertEquals(200, resp.status)
 
         # Execute a logout call
@@ -255,7 +255,7 @@ class ServerTests(unittest.TestCase):
         del hdrs['Cookie']
 
         # Test we are logged out
-        resp = self.request('/tasks', None, 'GET', hdrs)
+        resp = self.request('/plugins/kimchi/tasks', None, 'GET', hdrs)
         self.assertEquals(401, resp.status)
 
     def test_get_param(self):
@@ -265,22 +265,22 @@ class ServerTests(unittest.TestCase):
 
         # Create 2 different templates
         req = json.dumps({'name': 'test-tmpl1', 'cdrom': mockiso})
-        self.request('/templates', req, 'POST')
+        self.request('/plugins/kimchi/templates', req, 'POST')
 
         req = json.dumps({'name': 'test-tmpl2', 'cdrom': mockiso})
-        self.request('/templates', req, 'POST')
+        self.request('/plugins/kimchi/templates', req, 'POST')
 
         # Remove mock iso
         os.unlink(mockiso)
 
         # Get the templates
-        resp = self.request('/templates')
+        resp = self.request('/plugins/kimchi/templates')
         self.assertEquals(200, resp.status)
         res = json.loads(resp.read())
         self.assertEquals(2, len(res))
 
         # Get a specific template
-        resp = self.request('/templates?name=test-tmpl1')
+        resp = self.request('/plugins/kimchi/templates?name=test-tmpl1')
         self.assertEquals(200, resp.status)
         res = json.loads(resp.read())
         self.assertEquals(1, len(res))
diff --git a/plugins/kimchi/tests/test_template.py b/plugins/kimchi/tests/test_template.py
index b263b63..a1a828b 100644
--- a/plugins/kimchi/tests/test_template.py
+++ b/plugins/kimchi/tests/test_template.py
@@ -61,58 +61,58 @@ class TemplateTests(unittest.TestCase):
         model.reset()
 
     def test_tmpl_lifecycle(self):
-        resp = self.request('/templates')
+        resp = self.request('/plugins/kimchi/templates')
         self.assertEquals(200, resp.status)
         self.assertEquals(0, len(json.loads(resp.read())))
 
         # Create a template without cdrom and disk specified fails with 400
         t = {'name': 'test', 'os_distro': 'ImagineOS',
              'os_version': '1.0', 'memory': 1024, 'cpus': 1,
-             'storagepool': '/storagepools/alt'}
+             'storagepool': '/plugins/kimchi/storagepools/alt'}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(400, resp.status)
 
         # Create a template
         t = {'name': 'test', 'cdrom': '/tmp/mock.iso'}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Verify the template
         keys = ['name', 'icon', 'invalid', 'os_distro', 'os_version', 'cpus',
                 'memory', 'cdrom', 'disks', 'storagepool', 'networks',
                 'folder', 'graphics', 'cpu_info']
-        tmpl = json.loads(self.request('/templates/test').read())
+        tmpl = json.loads(self.request('/plugins/kimchi/templates/test').read())
         self.assertEquals(sorted(tmpl.keys()), sorted(keys))
 
         # Verify if default disk format was configured
         self.assertEquals(tmpl['disks'][0]['format'], 'qcow2')
 
         # Clone a template
-        resp = self.request('/templates/test/clone', '{}', 'POST')
+        resp = self.request('/plugins/kimchi/templates/test/clone', '{}', 'POST')
         self.assertEquals(303, resp.status)
 
         # Verify the cloned template
-        tmpl_cloned = json.loads(self.request('/templates/test-clone1').read())
+        tmpl_cloned = json.loads(self.request('/plugins/kimchi/templates/test-clone1').read())
         del tmpl['name']
         del tmpl_cloned['name']
         self.assertEquals(tmpl, tmpl_cloned)
 
         # Delete the cloned template
-        resp = self.request('/templates/test-clone1', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/templates/test-clone1', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Create a template with same name fails with 400
         req = json.dumps({'name': 'test', 'cdrom': '/tmp/mock.iso'})
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(400, resp.status)
 
         # Create an image based template
         open('/tmp/mock.img', 'w').close()
         t = {'name': 'test_img_template', 'disks': [{'base': '/tmp/mock.img'}]}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
         os.remove('/tmp/mock.img')
 
@@ -120,24 +120,24 @@ class TemplateTests(unittest.TestCase):
         t = {'name': 'test-format', 'cdrom': '/tmp/mock.iso',
              'disks': [{'index': 0, 'size': 10, 'format': 'vmdk'}]}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
-        tmpl = json.loads(self.request('/templates/test-format').read())
+        tmpl = json.loads(self.request('/plugins/kimchi/templates/test-format').read())
         self.assertEquals(tmpl['disks'][0]['format'], 'vmdk')
 
     def test_customized_tmpl(self):
         # Create a template
         t = {'name': 'test', 'cdrom': '/tmp/mock.iso'}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
-        tmpl = json.loads(self.request('/templates/test').read())
+        tmpl = json.loads(self.request('/plugins/kimchi/templates/test').read())
 
         # Update name
         new_name = u'k??????h??Tmpl'
-        new_tmpl_uri = '/templates/%s' % new_name.encode('utf-8')
+        new_tmpl_uri = '/plugins/kimchi/templates/%s' % new_name.encode('utf-8')
         req = json.dumps({'name': new_name})
-        resp = self.request('/templates/test', req, 'PUT')
+        resp = self.request('/plugins/kimchi/templates/test', req, 'PUT')
         self.assertEquals(303, resp.status)
         resp = self.request(new_tmpl_uri)
         update_tmpl = json.loads(resp.read())
@@ -147,11 +147,11 @@ class TemplateTests(unittest.TestCase):
         self.assertEquals(tmpl, update_tmpl)
 
         # Update icon
-        req = json.dumps({'icon': 'images/icon-fedora.png'})
+        req = json.dumps({'icon': 'kimchi/images/icon-fedora.png'})
         resp = self.request(new_tmpl_uri, req, 'PUT')
         self.assertEquals(200, resp.status)
         update_tmpl = json.loads(resp.read())
-        self.assertEquals('images/icon-fedora.png', update_tmpl['icon'])
+        self.assertEquals('kimchi/images/icon-fedora.png', update_tmpl['icon'])
 
         # Update os_distro and os_version
         req = json.dumps({'os_distro': 'fedora', 'os_version': '21'})
@@ -246,7 +246,7 @@ class TemplateTests(unittest.TestCase):
         # Create a template
         t = {'name': 'test', 'cdrom': '/tmp/mock.iso'}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Create networks to be used for testing
@@ -257,7 +257,7 @@ class TemplateTests(unittest.TestCase):
 
         # Verify the current system has at least one interface to create a
         # bridged network
-        interfaces = json.loads(self.request('/interfaces?type=nic').read())
+        interfaces = json.loads(self.request('/plugins/kimchi/interfaces?type=nic').read())
         if len(interfaces) > 0:
             iface = interfaces[0]['name']
             networks.append({'name': u'bridge-network', 'connection': 'bridge',
@@ -267,25 +267,25 @@ class TemplateTests(unittest.TestCase):
 
         tmpl_nets = []
         for net in networks:
-            self.request('/networks', json.dumps(net), 'POST')
+            self.request('/plugins/kimchi/networks', json.dumps(net), 'POST')
             tmpl_nets.append(net['name'])
             req = json.dumps({'networks': tmpl_nets})
-            resp = self.request('/templates/test', req, 'PUT')
+            resp = self.request('/plugins/kimchi/templates/test', req, 'PUT')
             self.assertEquals(200, resp.status)
 
     def test_customized_storagepool(self):
         # Create a template
         t = {'name': 'test', 'cdrom': '/tmp/mock.iso'}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # MockModel always returns 2 partitions (vdx, vdz)
-        partitions = json.loads(self.request('/host/partitions').read())
+        partitions = json.loads(self.request('/plugins/kimchi/host/partitions').read())
         devs = [dev['path'] for dev in partitions]
 
         # MockModel always returns 3 FC devices
-        fc_devs = json.loads(self.request('/host/devices?_cap=fc_host').read())
+        fc_devs = json.loads(self.request('/plugins/kimchi/host/devices?_cap=fc_host').read())
         fc_devs = [dev['name'] for dev in fc_devs]
 
         poolDefs = [
@@ -303,8 +303,8 @@ class TemplateTests(unittest.TestCase):
              'source': {'devices': [devs[0]]}}]
 
         for pool in poolDefs:
-            self.request('/storagepools', json.dumps(pool), 'POST')
-            pool_uri = '/storagepools/%s' % pool['name'].encode('utf-8')
+            self.request('/plugins/kimchi/storagepools', json.dumps(pool), 'POST')
+            pool_uri = '/plugins/kimchi/storagepools/%s' % pool['name'].encode('utf-8')
             self.request(pool_uri + '/activate', '{}', 'POST')
 
             req = None
@@ -319,44 +319,44 @@ class TemplateTests(unittest.TestCase):
                 req = json.dumps({'storagepool': pool_uri})
 
             if req is not None:
-                resp = self.request('/templates/test', req, 'PUT')
+                resp = self.request('/plugins/kimchi/templates/test', req, 'PUT')
                 self.assertEquals(200, resp.status)
 
     def test_tmpl_integrity(self):
         # Create a network and a pool for testing template integrity
         net = {'name': u'nat-network', 'connection': 'nat'}
-        self.request('/networks', json.dumps(net), 'POST')
+        self.request('/plugins/kimchi/networks', json.dumps(net), 'POST')
 
         pool = {'type': 'dir', 'name': 'dir-pool', 'path': '/tmp/dir-pool'}
-        self.request('/storagepools', json.dumps(pool), 'POST')
-        pool_uri = '/storagepools/%s' % pool['name'].encode('utf-8')
+        self.request('/plugins/kimchi/storagepools', json.dumps(pool), 'POST')
+        pool_uri = '/plugins/kimchi/storagepools/%s' % pool['name'].encode('utf-8')
         self.request(pool_uri + '/activate', '{}', 'POST')
 
         # Create a template using the custom network and pool
         t = {'name': 'test', 'cdrom': '/tmp/mock.iso',
              'networks': ['nat-network'],
-             'storagepool': '/storagepools/dir-pool'}
+             'storagepool': '/plugins/kimchi/storagepools/dir-pool'}
         req = json.dumps(t)
-        resp = self.request('/templates', req, 'POST')
+        resp = self.request('/plugins/kimchi/templates', req, 'POST')
         self.assertEquals(201, resp.status)
 
         # Try to delete network
         # It should fail as it is associated to a template
-        resp = self.request('/networks/nat-network', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/networks/nat-network', '{}', 'DELETE')
         self.assertIn("KCHNET0017E", json.loads(resp.read())["reason"])
 
         # Update template to release network and then delete it
         params = {'networks': []}
         req = json.dumps(params)
-        self.request('/templates/test', req, 'PUT')
-        resp = self.request('/networks/nat-network', '{}', 'DELETE')
+        self.request('/plugins/kimchi/templates/test', req, 'PUT')
+        resp = self.request('/plugins/kimchi/networks/nat-network', '{}', 'DELETE')
         self.assertEquals(204, resp.status)
 
         # Try to delete the storagepool
         # It should fail as it is associated to a template
-        resp = self.request('/storagepools/dir-pool', '{}', 'DELETE')
+        resp = self.request('/plugins/kimchi/storagepools/dir-pool', '{}', 'DELETE')
         self.assertEquals(400, resp.status)
 
         # Verify the template
-        res = json.loads(self.request('/templates/test').read())
+        res = json.loads(self.request('/plugins/kimchi/templates/test').read())
         self.assertEquals(res['invalid']['cdrom'], ['/tmp/mock.iso'])
diff --git a/plugins/kimchi/ui/css/theme-default/guest-edit.css b/plugins/kimchi/ui/css/theme-default/guest-edit.css
index cf71b78..b661159 100644
--- a/plugins/kimchi/ui/css/theme-default/guest-edit.css
+++ b/plugins/kimchi/ui/css/theme-default/guest-edit.css
@@ -134,7 +134,7 @@
 }
 
 .guest-edit-snapshot .icon {
-    background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat;
+    background: url('../images/theme-default/kimchi-loading15x15.gif') no-repeat;
     display: block;
     width: 16px;
     height: 16px;
@@ -256,12 +256,12 @@
 }
 
 .guest-edit-permission .pam .body .item .user-icon {
-    background: url('/images/theme-default/user.png') no-repeat scroll;
+    background: url('../images/theme-default/user.png') no-repeat scroll;
     background-size: 15px 15px;
 }
 
 .guest-edit-permission .pam .body .item .group-icon {
-    background: url('/images/theme-default/group.png') no-repeat scroll;
+    background: url('../images/theme-default/group.png') no-repeat scroll;
     background-size: 15px 15px;
 }
 
diff --git a/plugins/kimchi/ui/css/theme-default/host.css b/plugins/kimchi/ui/css/theme-default/host.css
index 9e9cb01..a0cccb1 100644
--- a/plugins/kimchi/ui/css/theme-default/host.css
+++ b/plugins/kimchi/ui/css/theme-default/host.css
@@ -33,7 +33,7 @@
 }
 
 .host-panel .logo {
-    background: url("../images/icon-vm.png") no-repeat left top;
+    background: url("plugins/kimchi/images/icon-vm.png") no-repeat left top;
     height: 128px;
     width: 128px;
 }
@@ -220,7 +220,7 @@
 }
 
 #id-debug-img {
-    background: url(../../images/theme-default/kimchi-loading15x15.gif) 12px
+    background: url(../images/theme-default/kimchi-loading15x15.gif) 12px
             center no-repeat;
     padding-left: 23px;
 }
diff --git a/plugins/kimchi/ui/css/theme-default/list.css b/plugins/kimchi/ui/css/theme-default/list.css
index 718c855..8c78623 100644
--- a/plugins/kimchi/ui/css/theme-default/list.css
+++ b/plugins/kimchi/ui/css/theme-default/list.css
@@ -312,7 +312,7 @@
 }
 
 .guest-pending .icon {
-    background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat;
+    background: url('../images/theme-default/kimchi-loading15x15.gif') no-repeat;
     display: inline-block;
     width: 20px;
     height: 20px;
diff --git a/plugins/kimchi/ui/css/theme-default/network.css b/plugins/kimchi/ui/css/theme-default/network.css
index e5a8e47..fc8a24f 100644
--- a/plugins/kimchi/ui/css/theme-default/network.css
+++ b/plugins/kimchi/ui/css/theme-default/network.css
@@ -92,7 +92,7 @@
 }
 
 .network .list .nw-loading {
-    background: #c0c0c0 url(../../images/theme-default/loading.gif)
+    background: #c0c0c0 url(../images/theme-default/loading.gif)
                 center no-repeat;
 }
 
@@ -264,4 +264,4 @@
 
 #networkConfig {
     padding-left: 30px;
-}
\ No newline at end of file
+}
diff --git a/plugins/kimchi/ui/css/theme-default/report-rename.css b/plugins/kimchi/ui/css/theme-default/report-rename.css
index 84bdf17..2fb2698 100644
--- a/plugins/kimchi/ui/css/theme-default/report-rename.css
+++ b/plugins/kimchi/ui/css/theme-default/report-rename.css
@@ -36,4 +36,4 @@
     color: #999999;
     font-weight: lighter;
     font-family: 'Helvetica Neue', Helvetica, Arial;
-}
\ No newline at end of file
+}
diff --git a/plugins/kimchi/ui/css/theme-default/storage.css b/plugins/kimchi/ui/css/theme-default/storage.css
index 771cc7f..31e8f5b 100644
--- a/plugins/kimchi/ui/css/theme-default/storage.css
+++ b/plugins/kimchi/ui/css/theme-default/storage.css
@@ -489,7 +489,7 @@
 
 #pool-loading {
     margin: 10px 15px;
-    background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px
+    background: #C0C0C0 url(../images/theme-default/loading.gif) 7px
                 center no-repeat;
     padding: 0 20px 0 26px;
 }
diff --git a/plugins/kimchi/ui/css/theme-default/template_add.css b/plugins/kimchi/ui/css/theme-default/template_add.css
index 668c785..f1e28c5 100644
--- a/plugins/kimchi/ui/css/theme-default/template_add.css
+++ b/plugins/kimchi/ui/css/theme-default/template_add.css
@@ -175,7 +175,7 @@
     margin: 0 5px 0 0;
     border: 1px solid #CCCCCC;
     border-radius: 8px;
-    background: url(../../images/icon-vm.png) center center no-repeat;
+    background: url(../images/icon-vm.png) center center no-repeat;
     background-size: 58px;
 }
 
@@ -284,13 +284,13 @@
 
 #iso-search-loading {
     margin: 10px 15px;
-    background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px
+    background: #C0C0C0 url(../images/theme-default/loading.gif) 7px
                 center no-repeat;
     padding: 0 20px 0 26px;
 }
 
 #iso-more-loading {
-    background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px
+    background: #C0C0C0 url(../images/theme-default/loading.gif) 7px
                 center no-repeat;
     padding: 0 20px 0 26px;
 }
diff --git a/plugins/kimchi/ui/js/src/kimchi.api.js b/plugins/kimchi/ui/js/src/kimchi.api.js
index 81e44fd..d4d0c83 100644
--- a/plugins/kimchi/ui/js/src/kimchi.api.js
+++ b/plugins/kimchi/ui/js/src/kimchi.api.js
@@ -17,8 +17,6 @@
  */
 var kimchi = {
 
-    url : "../../../",
-
     widget: {},
 
     trackingTasks: [],
@@ -54,7 +52,7 @@ var kimchi = {
     getCapabilities : function(suc, err, done) {
         done = typeof done !== 'undefined' ? done: function(){};
         wok.requestJSON({
-            url : "config/capabilities",
+            url : "plugins/kimchi/config/capabilities",
             type : "GET",
             contentType : "application/json",
             dataType : "json",
@@ -69,7 +67,7 @@ var kimchi = {
      */
     getI18n: function(suc, err, url, sync) {
         wok.requestJSON({
-            url : url ? url : 'i18n.json',
+            url : url ? url : 'plugins/kimchi/i18n.json',
             type : 'GET',
             resend: true,
             dataType : 'json',
@@ -84,7 +82,7 @@ var kimchi = {
      */
     getHost: function(suc, err) {
         wok.requestJSON({
-            url : 'host',
+            url : 'plugins/kimchi/host',
             type : 'GET',
             resend: true,
             contentType : 'application/json',
@@ -99,7 +97,7 @@ var kimchi = {
      */
     getHostStats : function(suc, err) {
         wok.requestJSON({
-            url : 'host/stats',
+            url : 'plugins/kimchi/host/stats',
             type : 'GET',
             contentType : 'application/json',
             headers: {'Wok-Robot': 'wok-robot'},
@@ -114,7 +112,7 @@ var kimchi = {
      */
     getHostStatsHistory : function(suc, err) {
         wok.requestJSON({
-            url : 'host/stats/history',
+            url : 'plugins/kimchi/host/stats/history',
             type : 'GET',
             resend: true,
             contentType : 'application/json',
@@ -138,7 +136,7 @@ var kimchi = {
      */
     createVM : function(settings, suc, err) {
         wok.requestJSON({
-            url : "vms",
+            url : "plugins/kimchi/vms",
             type : "POST",
             contentType : "application/json",
             data : JSON.stringify(settings),
@@ -154,7 +152,7 @@ var kimchi = {
      */
     createTemplate : function(settings, suc, err) {
         wok.requestJSON({
-            url : "templates",
+            url : "plugins/kimchi/templates",
             type : "POST",
             contentType : "application/json",
             data : JSON.stringify(settings),
@@ -166,7 +164,7 @@ var kimchi = {
 
     deleteTemplate : function(tem, suc, err) {
         wok.requestJSON({
-            url : 'templates/' + encodeURIComponent(tem),
+            url : 'plugins/kimchi/templates/' + encodeURIComponent(tem),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -177,7 +175,7 @@ var kimchi = {
 
     cloneTemplate : function(tem, suc, err) {
         wok.requestJSON({
-            url : 'templates/' + encodeURIComponent(tem) + "/clone",
+            url : 'plugins/kimchi/templates/' + encodeURIComponent(tem) + "/clone",
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -188,7 +186,7 @@ var kimchi = {
 
     listTemplates : function(suc, err) {
         wok.requestJSON({
-            url : 'templates',
+            url : 'plugins/kimchi/templates',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -202,7 +200,7 @@ var kimchi = {
      */
     retrieveTemplate : function(templateName, suc, err) {
         wok.requestJSON({
-            url : "templates/" + encodeURIComponent(templateName),
+            url : 'plugins/kimchi/templates/' + encodeURIComponent(templateName),
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json'
@@ -216,7 +214,7 @@ var kimchi = {
      */
     updateTemplate : function(name, settings, suc, err) {
         $.ajax({
-            url : "templates/" + encodeURIComponent(name),
+            url : 'plugins/kimchi/templates/' + encodeURIComponent(name),
             type : 'PUT',
             contentType : 'application/json',
             data : JSON.stringify(settings),
@@ -232,7 +230,7 @@ var kimchi = {
      */
     createStoragePool : function(settings, suc, err) {
         wok.requestJSON({
-            url : 'storagepools',
+            url : 'plugins/kimchi/storagepools',
             type : 'POST',
             contentType : 'application/json',
             data : JSON.stringify(settings),
@@ -242,7 +240,7 @@ var kimchi = {
 
     updateStoragePool : function(name, content, suc, err) {
         $.ajax({
-            url : "storagepools/" + encodeURIComponent(name),
+            url : "plugins/kimchi/storagepools/" + encodeURIComponent(name),
             type : 'PUT',
             contentType : 'application/json',
             dataType : 'json',
@@ -254,7 +252,7 @@ var kimchi = {
 
     startVM : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm) + '/start',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/start',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -265,7 +263,7 @@ var kimchi = {
 
     poweroffVM : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm) + '/poweroff',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/poweroff',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -276,7 +274,7 @@ var kimchi = {
 
     shutdownVM : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm) + '/shutdown',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/shutdown',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -287,7 +285,7 @@ var kimchi = {
 
     resetVM : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm) + '/reset',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/reset',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -298,7 +296,7 @@ var kimchi = {
 
     suspendVM : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm) + '/suspend',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/suspend',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -309,7 +307,7 @@ var kimchi = {
 
     resumeVM : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm) + '/resume',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/resume',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -327,7 +325,7 @@ var kimchi = {
      */
     retrieveVM : function(vm, suc, err) {
         $.ajax({
-            url : 'vms/' + encodeURIComponent(vm),
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm),
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -341,7 +339,7 @@ var kimchi = {
      */
     updateVM : function(name, settings, suc, err) {
         $.ajax({
-            url : "vms/" + encodeURIComponent(name),
+            url : "plugins/kimchi/vms/" + encodeURIComponent(name),
             type : 'PUT',
             contentType : 'application/json',
             data : JSON.stringify(settings),
@@ -353,7 +351,7 @@ var kimchi = {
 
     deleteVM : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm),
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -364,18 +362,19 @@ var kimchi = {
 
     vncToVM : function(vm) {
         wok.requestJSON({
-            url : 'config',
+            url : 'plugins/kimchi/config',
             type : 'GET',
             dataType : 'json'
         }).done(function(data, textStatus, xhr) {
             proxy_port = data['display_proxy_port'];
             wok.requestJSON({
-                url : "vms/" + encodeURIComponent(vm) + "/connect",
+                url : "plugins/kimchi/vms/" + encodeURIComponent(vm) + "/connect",
                 type : "POST",
                 dataType : "json"
             }).done(function() {
                 url = 'https://' + location.hostname + ':' + proxy_port;
-                url += "/console.html?url=" + encodeURIComponent("novnc/vnc_auto.html");
+                url += "/console.html?url=";
+                url += encodeURIComponent("plugins/kimchi/novnc/vnc_auto.html");
                 url += "&port=" + proxy_port;
                 /*
                  * From python documentation base64.urlsafe_b64encode(s)
@@ -396,19 +395,19 @@ var kimchi = {
 
     spiceToVM : function(vm) {
         wok.requestJSON({
-            url : 'config',
+            url : 'plugins/kimchi/config',
             type : 'GET',
             dataType : 'json'
         }).done(function(data, textStatus, xhr) {
             proxy_port = data['display_proxy_port'];
             wok.requestJSON({
-                url : "vms/" + encodeURIComponent(vm) + "/connect",
+                url : "plugins/kimchi/vms/" + encodeURIComponent(vm) + "/connect",
                 type : "POST",
                 dataType : "json"
             }).done(function(data, textStatus, xhr) {
                 url = 'https://' + location.hostname + ':' + proxy_port;
-                url += "/console.html?url=spice_auto.html&port=" + proxy_port;
-                url += "&listen=" + location.hostname;
+                url += "/console.html?url=plugins/kimchi/spice_auto.html";
+                url += "&port=" + proxy_port + "&listen=" + location.hostname;
                 /*
                  * From python documentation base64.urlsafe_b64encode(s)
                  * substitutes - instead of + and _ instead of / in the
@@ -428,7 +427,7 @@ var kimchi = {
 
     listVMs : function(suc, err) {
         wok.requestJSON({
-            url : 'vms',
+            url : 'plugins/kimchi/vms',
             type : 'GET',
             contentType : 'application/json',
             headers: {'Wok-Robot': 'wok-robot'},
@@ -441,7 +440,7 @@ var kimchi = {
 
     listTemplates : function(suc, err) {
         wok.requestJSON({
-            url : 'templates',
+            url : 'plugins/kimchi/templates',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -453,7 +452,7 @@ var kimchi = {
 
     listStoragePools : function(suc, err) {
         wok.requestJSON({
-            url : 'storagepools',
+            url : 'plugins/kimchi/storagepools',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -465,7 +464,7 @@ var kimchi = {
 
     listStorageVolumes : function(poolName, suc, err) {
         $.ajax({
-            url : 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes',
+            url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName) + '/storagevolumes',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -476,7 +475,7 @@ var kimchi = {
 
     listIsos : function(suc, err) {
         wok.requestJSON({
-            url : 'storagepools/kimchi_isos/storagevolumes',
+            url : 'plugins/kimchi/storagepools/kimchi_isos/storagevolumes',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -487,7 +486,7 @@ var kimchi = {
 
     listDistros : function(suc, err) {
         wok.requestJSON({
-            url : 'config/distros',
+            url : 'plugins/kimchi/config/distros',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -549,7 +548,7 @@ var kimchi = {
 
     getTask : function(taskId, suc, err) {
         wok.requestJSON({
-            url : 'tasks/' + encodeURIComponent(taskId),
+            url : 'plugins/kimchi/tasks/' + encodeURIComponent(taskId),
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -560,7 +559,7 @@ var kimchi = {
 
     getTasksByFilter : function(filter, suc, err, sync) {
         wok.requestJSON({
-            url : 'tasks?' + filter,
+            url : 'plugins/kimchi/tasks?' + filter,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -591,7 +590,7 @@ var kimchi = {
 
     deleteStoragePool : function(poolName, suc, err) {
         $.ajax({
-            url : 'storagepools/' + encodeURIComponent(poolName),
+            url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -603,7 +602,7 @@ var kimchi = {
     changePoolState : function(poolName, state, suc, err) {
         if (state === 'activate' || state === 'deactivate')
             $.ajax({
-                url : 'storagepools/' + encodeURIComponent(poolName) + '/' + state,
+                url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName) + '/' + state,
                 type : 'POST',
                 contentType : 'application/json',
                 dataType : 'json',
@@ -627,7 +626,7 @@ var kimchi = {
 
     listNetworks : function(suc, err) {
         wok.requestJSON({
-            url : 'networks',
+            url : 'plugins/kimchi/networks',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -642,7 +641,7 @@ var kimchi = {
     toggleNetwork : function(name, on, suc, err) {
         var action = on ? "activate" : "deactivate";
         wok.requestJSON({
-            url : 'networks/' + encodeURIComponent(name) + '/' + action,
+            url : 'plugins/kimchi/networks/' + encodeURIComponent(name) + '/' + action,
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -655,7 +654,7 @@ var kimchi = {
 
     createNetwork : function(network, suc, err) {
         wok.requestJSON({
-            url : 'networks',
+            url : 'plugins/kimchi/networks',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -669,7 +668,7 @@ var kimchi = {
 
     getInterfaces : function(suc, err) {
         wok.requestJSON({
-            url : 'interfaces',
+            url : 'plugins/kimchi/interfaces',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -683,7 +682,7 @@ var kimchi = {
 
     deleteNetwork : function(name, suc, err) {
         wok.requestJSON({
-            url : 'networks/' + encodeURIComponent(name),
+            url : 'plugins/kimchi/networks/' + encodeURIComponent(name),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -696,7 +695,7 @@ var kimchi = {
 
     listReports : function(suc, err) {
         wok.requestJSON({
-            url : 'debugreports',
+            url : 'plugins/kimchi/debugreports',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -739,7 +738,7 @@ var kimchi = {
         };
 
         wok.requestJSON({
-            url : 'debugreports',
+            url : 'plugins/kimchi/debugreports',
             type : "POST",
             contentType : "application/json",
             data : JSON.stringify(settings),
@@ -751,7 +750,7 @@ var kimchi = {
 
     renameReport : function(name, settings, suc, err) {
         $.ajax({
-            url : "debugreports/" + encodeURIComponent(name),
+            url : "plugins/kimchi/debugreports/" + encodeURIComponent(name),
             type : 'PUT',
             contentType : 'application/json',
             data : JSON.stringify(settings),
@@ -764,7 +763,7 @@ var kimchi = {
     deleteReport: function(settings, suc, err) {
         var reportName = encodeURIComponent(settings['name']);
         wok.requestJSON({
-            url : 'debugreports/' + reportName,
+            url : 'plugins/kimchi/debugreports/' + reportName,
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -779,7 +778,7 @@ var kimchi = {
 
     shutdown: function(settings, suc, err) {
         var reboot = settings && settings['reboot'] === true;
-        var url = 'host/' + (reboot ? 'reboot' : 'shutdown');
+        var url = 'plugins/kimchi/host/' + (reboot ? 'reboot' : 'shutdown');
         wok.requestJSON({
             url : url,
             type : 'POST',
@@ -792,7 +791,7 @@ var kimchi = {
 
     listHostPartitions : function(suc, err) {
         wok.requestJSON({
-            url : 'host/partitions',
+            url : 'plugins/kimchi/host/partitions',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -802,7 +801,7 @@ var kimchi = {
     },
 
     getStorageServers: function(type, suc, err) {
-        var url = 'storageservers?_target_type=' + type;
+        var url = 'plugins/kimchi/storageservers?_target_type=' + type;
         wok.requestJSON({
             url : url,
             type : 'GET',
@@ -816,7 +815,7 @@ var kimchi = {
     },
 
     getStorageTargets: function(server,type, suc, err) {
-        var url = 'storageservers/' + server + '/storagetargets?_target_type=' + type;
+        var url = 'plugins/kimchi/storageservers/' + server + '/storagetargets?_target_type=' + type;
         wok.requestJSON({
             url : url,
             type : 'GET',
@@ -829,7 +828,7 @@ var kimchi = {
     },
 
     getStoragePool: function(poolName, suc, err) {
-        var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName);
+        var url = 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName);
         wok.requestJSON({
             url : url,
             type : 'GET',
@@ -842,7 +841,7 @@ var kimchi = {
     },
 
     getStoragePoolVolume: function(poolName, volumeName, suc, err) {
-        var url = 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName);
+        var url = 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName);
         wok.requestJSON({
             url : url,
             type : 'GET',
@@ -858,7 +857,7 @@ var kimchi = {
         var vm = encodeURIComponent(settings['vm']);
         delete settings['vm'];
         wok.requestJSON({
-            url : 'vms/' + vm + '/storages',
+            url : 'plugins/kimchi/vms/' + vm + '/storages',
             type : 'POST',
             contentType : 'application/json',
             data : JSON.stringify(settings),
@@ -872,7 +871,7 @@ var kimchi = {
         var vm = encodeURIComponent(settings['vm']);
         var dev = encodeURIComponent(settings['dev']);
         wok.requestJSON({
-            url : "vms/" + vm + '/storages/' + dev,
+            url : "plugins/kimchi/vms/" + vm + '/storages/' + dev,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -885,7 +884,7 @@ var kimchi = {
         var vm = encodeURIComponent(settings['vm']);
         var dev = encodeURIComponent(settings['dev']);
         wok.requestJSON({
-            url : 'vms/' + vm + '/storages/' + dev,
+            url : 'plugins/kimchi/vms/' + vm + '/storages/' + dev,
             type : 'PUT',
             contentType : 'application/json',
             data : JSON.stringify({
@@ -901,8 +900,8 @@ var kimchi = {
         var vm = settings['vm'];
         var dev = settings['dev'];
         wok.requestJSON({
-            url : 'vms/' + encodeURIComponent(vm) +
-                      '/storages/' + encodeURIComponent(dev),
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) +
+                  '/storages/' + encodeURIComponent(dev),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -914,7 +913,7 @@ var kimchi = {
     listVMStorages : function(params, suc, err) {
         var vm = encodeURIComponent(params['vm']);
         var type = params['storageType'];
-        var url = 'vms/' + vm + '/storages';
+        var url = 'plugins/kimchi/vms/' + vm + '/storages';
         if(type) {
             url += '?type=' + type;
         }
@@ -930,7 +929,7 @@ var kimchi = {
 
     listSoftwareUpdates : function(suc, err) {
         wok.requestJSON({
-            url : 'host/packagesupdate',
+            url : 'plugins/kimchi/host/packagesupdate',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -970,7 +969,7 @@ var kimchi = {
         };
 
         wok.requestJSON({
-            url : 'host/swupdate',
+            url : 'plugins/kimchi/host/swupdate',
             type : "POST",
             contentType : "application/json",
             dataType : "json",
@@ -981,7 +980,7 @@ var kimchi = {
 
     createRepository : function(settings, suc, err) {
         wok.requestJSON({
-            url : "host/repositories",
+            url : "plugins/kimchi/host/repositories",
             type : "POST",
             contentType : "application/json",
             data : JSON.stringify(settings),
@@ -994,7 +993,7 @@ var kimchi = {
     retrieveRepository : function(repository, suc, err) {
         var reposID = encodeURIComponent(repository);
         wok.requestJSON({
-            url : "host/repositories/" + reposID,
+            url : "plugins/kimchi/host/repositories/" + reposID,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1006,7 +1005,7 @@ var kimchi = {
     updateRepository : function(name, settings, suc, err) {
         var reposID = encodeURIComponent(name);
         $.ajax({
-            url : "host/repositories/" + reposID,
+            url : "plugins/kimchi/host/repositories/" + reposID,
             type : 'PUT',
             contentType : 'application/json',
             data : JSON.stringify(settings),
@@ -1019,8 +1018,8 @@ var kimchi = {
     enableRepository : function(name, enable, suc, err) {
         var reposID = encodeURIComponent(name);
         $.ajax({
-            url : "host/repositories/" + reposID +
-                '/' + (enable === true ? 'enable' : 'disable'),
+            url : "plugins/kimchi/host/repositories/" + reposID +
+                  '/' + (enable === true ? 'enable' : 'disable'),
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -1032,7 +1031,7 @@ var kimchi = {
     deleteRepository : function(repository, suc, err) {
         var reposID = encodeURIComponent(repository);
         wok.requestJSON({
-            url : 'host/repositories/' + reposID,
+            url : 'plugins/kimchi/host/repositories/' + reposID,
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -1043,7 +1042,7 @@ var kimchi = {
 
     listRepositories : function(suc, err) {
         wok.requestJSON({
-            url : 'host/repositories',
+            url : 'plugins/kimchi/host/repositories',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1054,7 +1053,7 @@ var kimchi = {
     },
 
     getHostFCDevices: function(suc, err) {
-        var url = 'host/devices?_cap=fc_host';
+        var url = 'plugins/kimchi/host/devices?_cap=fc_host';
         wok.requestJSON({
             url : url,
             type : 'GET',
@@ -1068,7 +1067,7 @@ var kimchi = {
     },
 
     getGuestInterfaces: function(name, suc, err) {
-        var url = 'vms/'+encodeURIComponent(name)+'/ifaces';
+        var url = 'plugins/kimchi/vms/' + encodeURIComponent(name) + '/ifaces';
         wok.requestJSON({
             url : url,
             type : 'GET',
@@ -1083,7 +1082,7 @@ var kimchi = {
 
     createGuestInterface : function(name, interface, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(name)+'/ifaces',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(name) + '/ifaces',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -1097,7 +1096,7 @@ var kimchi = {
 
     deleteGuestInterface : function(vm, mac, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(vm)+'/ifaces/'+encodeURIComponent(mac),
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/ifaces/' + encodeURIComponent(mac),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -1110,7 +1109,7 @@ var kimchi = {
 
     updateGuestInterface : function(vm, mac, interface, suc, err) {
         $.ajax({
-            url : 'vms/'+encodeURIComponent(vm)+'/ifaces/'+encodeURIComponent(mac),
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/ifaces/' + encodeURIComponent(mac),
             type : 'PUT',
             contentType : 'application/json',
             data : JSON.stringify(interface),
@@ -1124,7 +1123,7 @@ var kimchi = {
 
     getUserById : function(data, suc, err) {
         wok.requestJSON({
-            url : 'users?_user_id=' + data.user_id,
+            url : 'plugins/kimchi/users?_user_id=' + data.user_id,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1139,7 +1138,7 @@ var kimchi = {
 
     getUsers : function(suc, err) {
         wok.requestJSON({
-            url : 'users',
+            url : 'plugins/kimchi/users',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1153,7 +1152,7 @@ var kimchi = {
 
     getGroups : function(suc, err) {
         wok.requestJSON({
-            url : 'groups',
+            url : 'plugins/kimchi/groups',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1167,7 +1166,7 @@ var kimchi = {
 
     getHostPCIDevices : function(suc, err) {
         wok.requestJSON({
-            url : 'host/devices?_passthrough=true&_cap=pci',
+            url : 'plugins/kimchi/host/devices?_passthrough=true&_cap=pci',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1181,7 +1180,7 @@ var kimchi = {
 
     getPCIDeviceCompanions : function(pcidev, suc, err) {
         wok.requestJSON({
-            url : 'host/devices?_passthrough_affected_by=' + pcidev,
+            url : 'plugins/kimchi/host/devices?_passthrough_affected_by=' + pcidev,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1197,7 +1196,7 @@ var kimchi = {
         server = encodeURIComponent(server);
         port = port ? '&_server_port='+encodeURIComponent(port) : '';
         wok.requestJSON({
-            url : 'storageservers/'+server+'/storagetargets?_target_type=iscsi'+port,
+            url : 'plugins/kimchi/storageservers/' + server + '/storagetargets?_target_type=iscsi' + port,
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1211,7 +1210,7 @@ var kimchi = {
 
     getPeers : function(suc, err) {
         wok.requestJSON({
-            url : 'peers',
+            url : 'plugins/kimchi/peers',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1225,7 +1224,7 @@ var kimchi = {
 
     getVMPCIDevices : function(id, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(id)+'/hostdevs',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(id) + '/hostdevs',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1239,7 +1238,7 @@ var kimchi = {
 
     addVMPCIDevice : function(vm, device, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+ encodeURIComponent(vm) +'/hostdevs',
+            url : 'plugins/kimchi/vms/'+ encodeURIComponent(vm) +'/hostdevs',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -1253,7 +1252,7 @@ var kimchi = {
 
     removeVMPCIDevice : function(vm, device, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+ encodeURIComponent(vm) +'/hostdevs/' + encodeURIComponent(device),
+            url : 'plugins/kimchi/vms/'+ encodeURIComponent(vm) +'/hostdevs/' + encodeURIComponent(device),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -1269,7 +1268,7 @@ var kimchi = {
      */
     createVolumeWithCapacity: function(poolName, settings, suc, err) {
         wok.requestJSON({
-            url : 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes',
+            url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName) + '/storagevolumes',
             type : 'POST',
             contentType : "application/json",
             data : JSON.stringify(settings),
@@ -1283,7 +1282,7 @@ var kimchi = {
      * Upload volume content
      */
     uploadVolumeToSP: function(poolName, volumeName, settings, suc, err) {
-        var url = 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName);
+        var url = 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName);
         var fd = settings['formData'];
         wok.requestJSON({
             url : url,
@@ -1304,7 +1303,7 @@ var kimchi = {
         var sp = encodeURIComponent(settings['sp']);
         delete settings['sp'];
         wok.requestJSON({
-            url : 'storagepools/' + sp + '/storagevolumes',
+            url : 'plugins/kimchi/storagepools/' + sp + '/storagevolumes',
             type : 'POST',
             data : JSON.stringify(settings),
             contentType : 'application/json',
@@ -1316,7 +1315,7 @@ var kimchi = {
 
     cloneGuest: function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(vm)+"/clone",
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + "/clone",
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -1329,7 +1328,7 @@ var kimchi = {
 
     listSnapshots : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(vm)+'/snapshots',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/snapshots',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1343,7 +1342,7 @@ var kimchi = {
 
     getCurrentSnapshot : function(vm, suc, err, sync) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(vm)+'/snapshots/current',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/snapshots/current',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
@@ -1358,7 +1357,7 @@ var kimchi = {
 
     revertSnapshot : function(vm, snapshot, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot)+'/revert',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/snapshots/' + encodeURIComponent(snapshot) + '/revert',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -1371,7 +1370,7 @@ var kimchi = {
 
     createSnapshot : function(vm, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(vm)+'/snapshots',
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/snapshots',
             type : 'POST',
             contentType : 'application/json',
             dataType : 'json',
@@ -1384,7 +1383,7 @@ var kimchi = {
 
     deleteSnapshot : function(vm, snapshot, suc, err) {
         wok.requestJSON({
-            url : 'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot),
+            url : 'plugins/kimchi/vms/' + encodeURIComponent(vm) + '/snapshots/' + encodeURIComponent(snapshot),
             type : 'DELETE',
             contentType : 'application/json',
             dataType : 'json',
@@ -1397,7 +1396,7 @@ var kimchi = {
 
     getCPUInfo : function(suc, err) {
         wok.requestJSON({
-            url : 'host/cpuinfo',
+            url : 'plugins/kimchi/host/cpuinfo',
             type : 'GET',
             contentType : 'application/json',
             dataType : 'json',
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
index 1008d85..6be6f9a 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
@@ -34,7 +34,7 @@ kimchi.guest_add_main = function() {
             $('#btn-create-template').on('click', function(event) {
                 wok.topic('templateCreated').subscribe(showTemplates);
 
-                wok.window.open('template-add.html');
+                wok.window.open('plugins/kimchi/template-add.html');
 
                 event.preventDefault();
             });
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
index 28c2163..25e3703 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js
@@ -604,7 +604,7 @@ kimchi.guest_edit_main = function() {
                 });
         };
         var listGeneratingSnapshots = function(){
-            kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/snapshots/*'), function(tasks) {
+            kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/plugins/kimchi/snapshots/*'), function(tasks) {
                 $(".task", "#form-guest-edit-snapshot").empty();
                 for(var i=0;i<tasks.length;i++){
                     addOngoingItem(tasks[i]);
@@ -639,7 +639,7 @@ kimchi.guest_edit_main = function() {
     };
 
     var initContent = function(guest) {
-        guest['icon'] = guest['icon'] || 'images/icon-vm.png';
+        guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png';
         $('#form-guest-edit-general').fillWithObject(guest);
         kimchi.thisVMState = guest['state'];
         refreshCDROMs();
@@ -650,7 +650,7 @@ kimchi.guest_edit_main = function() {
                 text: false
             }).click(function(event) {
                 event.preventDefault();
-                wok.window.open("guest-storage-add.html");
+                wok.window.open("plugins/kimchi/guest-storage-add.html");
             });
         if(kimchi.thisVMState === "running") {
             $("#form-guest-edit-general input").prop("disabled", true);
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_main.js
index a0f927b..7dd5d84 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_main.js
@@ -202,7 +202,7 @@ kimchi.vmedit = function(event) {
     var vm_id=vm.attr("id");
     kimchi.selectedGuest = vm_id;
     wok.window.open({
-        url: 'guest-edit.html',
+        url: 'plugins/kimchi/guest-edit.html',
         close: function() {
             kimchi.clearGuestEdit();
         }
@@ -245,7 +245,7 @@ kimchi.listVmsAuto = function() {
     }
     var getCreatingGuests = function(){
         var guests = [];
-        kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/[^/]+$'), function(tasks) {
+        kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/plugins/kimchi/vms/[^/]+$'), function(tasks) {
             for(var i=0;i<tasks.length;i++){
                 var guestUri = tasks[i].target_uri;
                 var guestName = guestUri.split('/')[2]
@@ -260,7 +260,7 @@ kimchi.listVmsAuto = function() {
     };
     var getCloningGuests = function(){
         var guests = [];
-        kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/.+/clone'), function(tasks) {
+        kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/plugins/kimchi/vms/.+/clone'), function(tasks) {
             for(var i=0;i<tasks.length;i++){
                 var guestUri = tasks[i].target_uri;
                 var guestName = guestUri.split('/')[2]
@@ -325,7 +325,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) {
     if (vmObject.screenshot) {
         curImg = vmObject.screenshot.replace(/^\//,'');
     }
-    var load_src = curImg || 'images/icon-vm.png';
+    var load_src = curImg || 'plugins/kimchi/images/icon-vm.png';
     var tile_src = prevScreenImage || vmObject['load-src'];
     var liveTile=result.find('div[name=guest-tile] > .tile');
     liveTile.addClass(vmObject.state);
@@ -352,7 +352,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) {
 	    liveTile.off("click", kimchi.openVmConsole);
             liveTile.on("click", kimchi.vmresume);
 	    if(vmObject.state="paused") {
-	        liveTile.find('.overlay').attr('src',"/images/theme-default/ac24_resume.png");
+	        liveTile.find('.overlay').attr('src',"plugins/kimchi/images/theme-default/ac24_resume.png");
 	        liveTile.find('.overlay').attr('alt',"Resume");
 	    }
             liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()});
@@ -492,7 +492,7 @@ kimchi.guest_main = function() {
     if(wok.tabMode['guests'] === 'admin') {
         $('.tools').attr('style','display');
         $("#vm-add").on("click", function(event) {
-            wok.window.open('guest-add.html');
+            wok.window.open('plugins/kimchi/guest-add.html');
         });
     }
     kimchi.guestTemplate = $('#guest-tmpl').html();
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
index 2e4e7e8..b920527 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
@@ -35,7 +35,7 @@ kimchi.guest_media_main = function() {
             var replaceCDROM = function(event) {
                 event.preventDefault();
                 kimchi.selectedGuestStorage = $(this).data('dev');
-                wok.window.open("guest-cdrom-edit.html");
+                wok.window.open("plugins/kimchi/guest-cdrom-edit.html");
             };
 
             $('input[type="text"][name="cdrom"]', container).on('click', replaceCDROM);
diff --git a/plugins/kimchi/ui/js/src/kimchi.host.js b/plugins/kimchi/ui/js/src/kimchi.host.js
index 5b15ad0..afca992 100644
--- a/plugins/kimchi/ui/js/src/kimchi.host.js
+++ b/plugins/kimchi/ui/js/src/kimchi.host.js
@@ -86,7 +86,8 @@ kimchi.host_main = function() {
                 id: 'repositories-grid-add-button',
                 label: i18n['KCHREPO6012M'],
                 onClick: function(event) {
-                    wok.window.open({url:'repository-add.html', class: repo_type});
+                    wok.window.open({url:'plugins/kimchi/repository-add.html',
+                                    class: repo_type});
                 }
             }, {
                 id: 'repositories-grid-enable-button',
@@ -114,7 +115,8 @@ kimchi.host_main = function() {
                         return;
                     }
                     kimchi.selectedRepository = repository['repo_id'];
-                    wok.window.open({url:'repository-edit.html', class: repo_type});
+                    wok.window.open({url:'plugins/kimchi/repository-edit.html',
+                                    class: repo_type});
                 }
             }, {
                 id: 'repositories-grid-remove-button',
@@ -302,7 +304,7 @@ kimchi.host_main = function() {
                 id: reportGridID + '-generate-button',
                 label: i18n['KCHDR6006M'],
                 onClick: function(event) {
-                    wok.window.open('report-add.html');
+                    wok.window.open('plugins/kimchi/report-add.html');
                 }
             }, {
                 id: reportGridID + '-rename-button',
@@ -315,7 +317,7 @@ kimchi.host_main = function() {
                     }
 
                     kimchi.selectedReport = report['name'];
-                    wok.window.open('report-rename.html');
+                    wok.window.open('plugins/kimchi/report-rename.html');
                 }
             }, {
                 id: reportGridID + '-remove-button',
@@ -389,11 +391,11 @@ kimchi.host_main = function() {
 
     var getPendingReports = function() {
         var reports = []
-        var filter = 'status=running&target_uri=' + encodeURIComponent('^/debugreports/*')
+        var filter = 'status=running&target_uri=' + encodeURIComponent('^/plugins/kimchi/debugreports/*')
 
         kimchi.getTasksByFilter(filter, function(tasks) {
             for(var i = 0; i < tasks.length; i++) {
-                reportName = tasks[i].target_uri.replace(/^\/debugreports\//, '') || i18n['KCHDR6012M'];
+                reportName = tasks[i].target_uri.replace(/^\/plugins\/kimchi\/debugreports\//, '') || i18n['KCHDR6012M'];
                 reports.push({'name': reportName, 'time': i18n['KCHDR6007M']})
 
                 if(kimchi.trackingTasks.indexOf(tasks[i].id) >= 0) {
diff --git a/plugins/kimchi/ui/js/src/kimchi.storage_main.js b/plugins/kimchi/ui/js/src/kimchi.storage_main.js
index 6019cea..40a43f6 100644
--- a/plugins/kimchi/ui/js/src/kimchi.storage_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.storage_main.js
@@ -156,7 +156,7 @@ kimchi.storageBindClick = function() {
         $('.pool-add-volume').on('click', function(event) {
             var poolName = $(this).data('name');
             kimchi.selectedSP = poolName;
-            wok.window.open('storagepool-add-volume.html');
+            wok.window.open('plugins/kimchi/storagepool-add-volume.html');
         });
 
         $('.storage-action').on('click', function() {
@@ -211,7 +211,7 @@ kimchi.doListVolumes = function(poolObj) {
 
     var getOngoingVolumes = function() {
         var result = {}
-        var filter = 'status=running&target_uri=' + encodeURIComponent('^/storagepools/' + poolName + '/*')
+        var filter = 'status=running&target_uri=' + encodeURIComponent('^/plugins/kimchi/storagepools/' + poolName + '/*')
         kimchi.getTasksByFilter(filter, function(tasks) {
             for(var i = 0; i < tasks.length; i++) {
                 var volumeName = tasks[i].target_uri.split('/').pop();
@@ -338,7 +338,7 @@ kimchi.storage_main = function() {
     if(wok.tabMode['storage'] === 'admin') {
         $('.tools').attr('style','display');
         $('#storage-pool-add').on('click', function() {
-            wok.window.open('storagepool-add.html');
+            wok.window.open('plugins/kimchi/storagepool-add.html');
         });
         $('.list-title .title-actions').attr('style','display');
     }
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
index 885fe54..87bba3d 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
@@ -283,7 +283,7 @@ kimchi.template_edit_main = function() {
         if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() == 'scsi') {
             tempNameTail = tempName[tempName.length-1];
         }
-        tempName = '/storagepools/' + tempNameHead;
+        tempName = '/plugins/kimchi/storagepools/' + tempNameHead;
         data['storagepool'] = tempName;
         $.each(editableFields, function(i, field) {
             /* Support only 1 disk at this moment */
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_main.js b/plugins/kimchi/ui/js/src/kimchi.template_main.js
index 5d474bd..b09fe12 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_main.js
@@ -34,9 +34,9 @@ kimchi.doListTemplates = function() {
                     }
                 }
                 if(isLocal){
-                    value.location = "images/theme-default/icon-local.png";
+                    value.location = "plugins/kimchi/images/theme-default/icon-local.png";
                 }else{
-                    value.location = "images/theme-default/icon-remote.png";
+                    value.location = "plugins/kimchi/images/theme-default/icon-remote.png";
                 }
                 listHtml += wok.substitute(templateHtml, value);
             });
@@ -57,7 +57,7 @@ kimchi.templateBindClick = function() {
     $('.template-edit').on('click', function(event) {
         var templateName = $(this).data('template');
         kimchi.selectedTemplate = templateName;
-        wok.window.open("template-edit.html");
+        wok.window.open("plugins/kimchi/template-edit.html");
     });
     $('.template-clone').on('click', function(event) {
         kimchi.selectedTemplate = $(this).data('template');
@@ -97,7 +97,7 @@ kimchi.template_main = function() {
         $('.tools').attr('style','display');
         $("#template-add").on("click", function(event) {
             wok.window.open({
-                url: 'template-add.html',
+                url: 'plugins/kimchi/template-add.html',
                 close: function() {
                     if (kimchi.deepScanHandler) {
                         kimchi.deepScanHandler.stop = true;
diff --git a/plugins/kimchi/ui/pages/guest-add.html.tmpl b/plugins/kimchi/ui/pages/guest-add.html.tmpl
index 2668391..3770d96 100644
--- a/plugins/kimchi/ui/pages/guest-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/guest-add.html.tmpl
@@ -61,7 +61,7 @@
                 <script type="html/text" id="tmpl-template" class="tmpl-html">
                     <li>
                         <label>
-                            <input type="radio" name="template" value="/templates/{name}">
+                            <input type="radio" name="template" value="/plugins/kimchi/templates/{name}">
                             <div class="info">
                                 <div class="summary os-icon">
                                     <img src="{icon}">
diff --git a/plugins/kimchi/ui/pages/guest.html.tmpl b/plugins/kimchi/ui/pages/guest.html.tmpl
index a876f38..78e9161 100644
--- a/plugins/kimchi/ui/pages/guest.html.tmpl
+++ b/plugins/kimchi/ui/pages/guest.html.tmpl
@@ -45,7 +45,7 @@
                 <div class="tile ">
                     <img class="imgactive" alt="" src="">
                     <img class="imgload" alt="" src="">
-                    <img class="overlay shutoff-hidden" alt="$_("Start")" src="images/theme-default/icon-power-down.png" >
+                    <img class="overlay shutoff-hidden" alt="$_("Start")" src="plugins/kimchi/images/theme-default/icon-power-down.png" >
                 </div>
             </div>
            <div class="sortable guest-actions" name="guest-actions">
diff --git a/plugins/kimchi/ui/pages/storagepool-add.html.tmpl b/plugins/kimchi/ui/pages/storagepool-add.html.tmpl
index fc2ca2a..a697af5 100644
--- a/plugins/kimchi/ui/pages/storagepool-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/storagepool-add.html.tmpl
@@ -105,7 +105,7 @@
                             <div class="icon-info-circled light-grey c1 help-inline"></div>
                             <p class="text-help help-inline">
                                 $_("Looking for available partitions ...")
-                                <img src = "images/theme-default/loading.gif" />
+                                <img src = "plugins/kimchi/images/theme-default/loading.gif" />
                             </p>
                         </div>
                     </section>
diff --git a/plugins/kimchi/ui/pages/tabs/storage.html.tmpl b/plugins/kimchi/ui/pages/tabs/storage.html.tmpl
index 13ebbe9..2f89d22 100644
--- a/plugins/kimchi/ui/pages/tabs/storage.html.tmpl
+++ b/plugins/kimchi/ui/pages/tabs/storage.html.tmpl
@@ -45,7 +45,7 @@
 </div>
 <div id="logicalPoolExtend" title="$_("Device path")">
      <p id="loading-info" class="text-help">
-         <img src = "images/theme-default/loading.gif" />
+         <img src = "plugins/kimchi/images/theme-default/loading.gif" />
          $_("Looking for available partitions ...")
      </p>
      <div class="host-partition">
diff --git a/plugins/kimchi/ui/pages/template-add.html.tmpl b/plugins/kimchi/ui/pages/template-add.html.tmpl
index d0292a0..b44db79 100644
--- a/plugins/kimchi/ui/pages/template-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/template-add.html.tmpl
@@ -146,7 +146,7 @@
                 <div id="load-remote-iso">
                     <h3 class="step-subtitle">
                         <label>
-                            <img src = "images/theme-default/loading.gif" />
+                            <img src = "plugins/kimchi/images/theme-default/loading.gif" />
                             $_("Loading default remote ISOs ...")
                         </label>
                     </h3>
diff --git a/plugins/sample/ui/js/util.js b/plugins/sample/ui/js/util.js
index 1e6c4df..7689a81 100644
--- a/plugins/sample/ui/js/util.js
+++ b/plugins/sample/ui/js/util.js
@@ -20,7 +20,7 @@ sample = {};
 
 sample.description = function(suc, err){
     wok.requestJSON({
-        url : kimchi.url + 'plugins/sample/description',
+        url : 'plugins/sample/description',
         type : 'GET',
         contentType : 'application/json',
         dataType : 'json',
diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl
index dfe7ce3..eea1179 100644
--- a/ui/pages/error.html.tmpl
+++ b/ui/pages/error.html.tmpl
@@ -28,14 +28,14 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Wok</title>
-    <link rel="stylesheet" href="$href("/css/theme-default.min.css")">
+    <link rel="stylesheet" href="$href("css/theme-default.min.css")">
 </head>
 
 
 <body>
     <div class="error-background">
         <h1 id="logo">
-            <img src="/images/theme-default/logo-white.png" alt="Wok">
+            <img src="images/theme-default/logo-white.png" alt="Wok">
         </h1>
     </div>
     <div class="error-msg error-icon">
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 19:18:05 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 16:18:05 -0300
Subject: [Kimchi-devel] [PATCH V3 33/34] Split error messages between wok
	and kimchi plugin
In-Reply-To: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
References: <1436383086-19140-1-git-send-email-luciojhc@linux.vnet.ibm.com>
Message-ID: <1436383086-19140-34-git-send-email-luciojhc@linux.vnet.ibm.com>

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 plugins/kimchi/i18n.py       |   18 -
 plugins/kimchi/po/de_DE.po   |  516 +++++------
 plugins/kimchi/po/en_US.po   |  417 ++++-----
 plugins/kimchi/po/es_ES.po   |  558 +++++------
 plugins/kimchi/po/fr_FR.po   |  562 ++++++------
 plugins/kimchi/po/it_IT.po   |  544 +++++------
 plugins/kimchi/po/ja_JP.po   |  506 +++++------
 plugins/kimchi/po/kimchi.pot |  416 ++++-----
 plugins/kimchi/po/ko_KR.po   |  489 +++++------
 plugins/kimchi/po/pt_BR.po   |  557 ++++++------
 plugins/kimchi/po/ru_RU.po   |  504 +++++------
 plugins/kimchi/po/zh_CN.po   |  500 +++++-----
 plugins/kimchi/po/zh_TW.po   |  484 +++++-----
 po/de_DE.po                  | 1725 ++++++++++++++++++++++++++++++++++
 po/en_US.po                  |  554 +++++++++++
 po/es_ES.po                  | 1736 ++++++++++++++++++++++++++++++++++
 po/fr_FR.po                  | 1969 ++++++++++++++++++++++++++++++++++++++
 po/it_IT.po                  | 1708 +++++++++++++++++++++++++++++++++
 po/ja_JP.po                  | 1681 +++++++++++++++++++++++++++++++++
 po/ko_KR.po                  | 1608 +++++++++++++++++++++++++++++++
 po/pt_BR.po                  | 2142 ++++++++++++++++++++++++++++++++++++++++++
 po/ru_RU.po                  | 1614 +++++++++++++++++++++++++++++++
 po/wok.pot                   | 1685 +--------------------------------
 po/zh_CN.po                  | 1926 +++++++++++++++++++++++++++++++++++++
 po/zh_TW.po                  | 1534 ++++++++++++++++++++++++++++++
 src/wok/i18n.py              |  307 ------
 26 files changed, 21016 insertions(+), 5244 deletions(-)
 create mode 100644 po/de_DE.po
 create mode 100644 po/en_US.po
 create mode 100644 po/es_ES.po
 create mode 100644 po/fr_FR.po
 create mode 100644 po/it_IT.po
 create mode 100644 po/ja_JP.po
 create mode 100644 po/ko_KR.po
 create mode 100644 po/pt_BR.po
 create mode 100644 po/ru_RU.po
 create mode 100644 po/zh_CN.po
 create mode 100644 po/zh_TW.po

diff --git a/plugins/kimchi/i18n.py b/plugins/kimchi/i18n.py
index d2ffa34..220bd24 100644
--- a/plugins/kimchi/i18n.py
+++ b/plugins/kimchi/i18n.py
@@ -24,23 +24,10 @@ _ = gettext.gettext
 
 messages = {
     "KCHAPI0001E": _("Unknown parameter %(value)s"),
-    "KCHAPI0002E": _("Delete is not allowed for %(resource)s"),
-    "KCHAPI0003E": _("%(resource)s does not implement update method"),
-    "KCHAPI0005E": _("Create is not allowed for %(resource)s"),
-    "KCHAPI0006E": _("Unable to parse JSON request"),
-    "KCHAPI0007E": _("This API only supports JSON"),
-    "KCHAPI0008E": _("Parameters does not match requirement in schema: %(err)s"),
-    "KCHAPI0009E": _("You don't have permission to perform this operation."),
-
-    "KCHASYNC0001E": _("Datastore is not initiated in the model object."),
-    "KCHASYNC0002E": _("Unable to start task due error: %(err)s"),
+
     "KCHASYNC0003E": _("Timeout of %(seconds)s seconds expired while running task '%(task)s."),
 
-    "KCHAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"),
-    "KCHAUTH0002E": _("You are not authorized to access Kimchi"),
-    "KCHAUTH0003E": _("Specify %(item)s to login into Kimchi"),
     "KCHAUTH0004E": _("User %(user_id)s not found with given LDAP settings."),
-    "KCHAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"),
 
     "KCHDEVS0001E": _('Unknown "_cap" specified'),
     "KCHDEVS0002E": _('"_passthrough" should be "true" or "false"'),
@@ -282,13 +269,8 @@ messages = {
     "KCHPKGUPD0003E": _("Error while getting packages marked to be updated. Details: %(err)s"),
     "KCHPKGUPD0004E": _("There is no compatible package manager for this system."),
 
-    "KCHOBJST0001E": _("Unable to find %(item)s in datastore"),
-
     "KCHUTILS0001E": _("Invalid URI %(uri)s"),
-    "KCHUTILS0002E": _("Timeout while running command '%(cmd)s' after %(seconds)s seconds"),
     "KCHUTILS0003E": _("Unable to choose a virtual machine name"),
-    "KCHUTILS0004E": _("Invalid data value '%(value)s'"),
-    "KCHUTILS0005E": _("Invalid data unit '%(unit)s'"),
 
     "KCHVMSTOR0002E": _("Invalid storage type. Types supported: 'cdrom', 'disk'"),
     "KCHVMSTOR0003E": _("The path '%(value)s' is not a valid local/remote path for the device"),
diff --git a/plugins/kimchi/po/de_DE.po b/plugins/kimchi/po/de_DE.po
index bfd82d0..d3f3cc3 100644
--- a/plugins/kimchi/po/de_DE.po
+++ b/plugins/kimchi/po/de_DE.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -21,63 +21,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "L??schen ist nicht zul??ssig f??r %(resource)s"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s implementiert keine Aktualisierungsmethode"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "Erstellen ist nicht zul??ssig f??r %(resource)s"
-
-msgid "Unable to parse JSON request"
-msgstr "JSON-Anfrage konnte nicht analysiert werden"
-
-msgid "This API only supports JSON"
-msgstr "Diese API unterst??tzt nur JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr "Datenspeicher wird nicht im Modellobjekt initialisiert."
-
-#, python-format
-msgid "Unable to start task due error: %(err)s"
-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: "
-"%(code)s]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen"
-
-#, python-format
-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 ""
 
@@ -142,15 +92,15 @@ msgstr ""
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Ung??ltiges Format beim Lesen des Datentr??gerdeskriptors in ISO-Datei "
-"%(filename)s"
+"Ung??ltiges Format beim Lesen des Datentr??gerdeskriptors in ISO-Datei %"
+"(filename)s"
 
 #, python-format
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "Der Hypervisor hat nicht die Berechtigung, die ISO-Datei %(filename)s zu "
@@ -562,8 +512,8 @@ msgstr "Speicherpool %(name)s konnte nicht erstellt werden. Details: %(err)s"
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 "Anzahl der Speicherdatentr??ger im Speicherpool %(name)s konnte nicht "
 "abgerufen werden. Details: %(err)s"
@@ -591,8 +541,8 @@ msgstr ""
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"NFS-Pool konnte nicht erstellt werden, weil das Mounten des Exportpfads"
-"%(path)s fehlgeschlagen ist"
+"NFS-Pool konnte nicht erstellt werden, weil das Mounten des Exportpfads%"
+"(path)s fehlgeschlagen ist"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
@@ -641,8 +591,8 @@ msgstr "Geben Sie Name und Typ an, um einen Speicherpool zu erstellen"
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
 "%(disk)s ist keine g??ltige Platte/Partition. Sie konnte nicht hinzugef??gt "
 "werden zum Pool %(pool)s."
@@ -667,16 +617,16 @@ msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Der NFS-Speicherpool %(name)s konnte nicht aktiviert werden. NFS-Server "
-"%(server)s ist nicht erreichbar."
+"Der NFS-Speicherpool %(name)s konnte nicht aktiviert werden. NFS-Server %"
+"(server)s ist nicht erreichbar."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Der NFS-Speicherpool %(name)s konnte nicht inaktiviert werden. NFS-Server "
-"%(server)s ist nicht erreichbar."
+"Der NFS-Speicherpool %(name)s konnte nicht inaktiviert werden. NFS-Server %"
+"(server)s ist nicht erreichbar."
 
 #, python-format
 msgid ""
@@ -728,13 +678,13 @@ msgstr "Geben Sie %(item)s an, um Speicherdatentr??ger %(volume)s zu erstellen"
 msgid ""
 "Unable to list storage volumes because storage pool %(pool)s is not active"
 msgstr ""
-"Speicherdatentr??ger konnten nicht aufgelistet werden, weil Speicherpool "
-"%(pool)s nicht aktiv ist"
+"Speicherdatentr??ger konnten nicht aufgelistet werden, weil Speicherpool %"
+"(pool)s nicht aktiv ist"
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 "Speicherdatentr??ger %(name)s konnte nicht in Speicherpool %(pool)s erstellt "
 "werden. Details: %(err)s"
@@ -809,8 +759,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -912,8 +862,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 "Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
 "Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verkn??pft."
@@ -1019,30 +969,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "Es gibt keinen kompatiblen Paketmanager f??r dieses System."
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "%(item)s konnten nicht im Datenspeicher gefunden werden"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "Ung??ltiger URI %(uri)s"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-"Zeitlimit??berschreitung beim Ausf??hren des Befehls '%(cmd)s' nach "
-"%(seconds)s Sekunden"
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "Ung??ltiger Speichertyp. Unterst??tzte Typen: 'cdrom'"
 
@@ -1055,8 +987,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -1106,8 +1038,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1231,8 +1163,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1251,20 +1183,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1337,6 +1269,9 @@ msgstr "Erstellen"
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr "Abbrechen"
+
 msgid "Edit Guest"
 msgstr "Gast bearbeiten"
 
@@ -1424,12 +1359,57 @@ msgstr "Ersetzen"
 msgid "Detach"
 msgstr "Abh??ngen"
 
-msgid "Cancel"
-msgstr "Abbrechen"
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "Starten"
+
+msgid "Reset"
+msgstr "Zur??cksetzen"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr "Aktionen"
+
+msgid "Connect"
+msgstr "Verbinden"
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Shut Down"
+msgstr "Herunterfahren"
+
+msgid "Delete"
+msgstr "L??schen"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "Platten-E/A"
+
+msgid "Network I/O"
+msgstr "Netz-E/A"
+
+msgid "Livetile"
+msgstr "Live Tile"
+
+msgid "No guests found."
+msgstr "Keine G??ste gefunden."
+
 msgid "Add a Storage Device to VM"
 msgstr "Speichereinheit zur virtuellen Maschine hinzuf??gen"
 
@@ -1460,38 +1440,41 @@ msgstr "Der ISO-Dateipfad auf dem Server f??r die CD-ROM."
 msgid "Attach"
 msgstr "Anh??ngen"
 
-msgid "Start"
-msgstr "Starten"
-
-msgid "Reset"
-msgstr "Zur??cksetzen"
+msgid "Shut down"
+msgstr "Herunterfahren"
 
-msgid "Pause"
-msgstr ""
+msgid "Restart"
+msgstr "Erneut starten"
 
-msgid "Resume"
-msgstr ""
+msgid "Basic Information"
+msgstr "Basisinformationen"
 
-msgid "Power Off"
-msgstr ""
+msgid "OS Distro"
+msgstr "BS-Distro"
 
-msgid "Actions"
-msgstr "Aktionen"
+msgid "OS Code Name"
+msgstr "BS-Codename"
 
-msgid "Connect"
-msgstr "Verbinden"
+msgid "Processor"
+msgstr "Prozessor"
 
-msgid "Clone"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Edit"
-msgstr "Bearbeiten"
+msgid "System Statistics"
+msgstr "Systemstatistik"
 
-msgid "Shut Down"
-msgstr "Herunterfahren"
+msgid "Software Updates"
+msgstr "Software-Updates"
 
-msgid "Delete"
-msgstr "L??schen"
+msgid "Update Progress"
+msgstr "Aktualisierungsfortschritt"
+
+msgid "Repositories"
+msgstr "Repositorys"
+
+msgid "Debug Reports"
+msgstr "Debugberichte"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
@@ -1621,9 +1604,6 @@ msgstr ""
 "Repository wird dauerhaft entfernt und kann nicht wiederhergestellt werden. "
 "M??chten Sie fortfahren?"
 
-msgid "Repositories"
-msgstr "Repositorys"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1657,9 +1637,6 @@ msgstr "Aktivieren"
 msgid "Disable"
 msgstr "Inaktivieren"
 
-msgid "Software Updates"
-msgstr "Software-Updates"
-
 msgid "Package Name"
 msgstr "Paketname"
 
@@ -1691,9 +1668,6 @@ msgstr ""
 "Debugbericht wird dauerhaft entfernt und kann nicht wiederhergestellt "
 "werden. M??chten Sie fortfahren?"
 
-msgid "Debug Reports"
-msgstr "Debugberichte"
-
 msgid "Generated Time"
 msgstr "Generierte Zeit"
 
@@ -1923,35 +1897,48 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "Der Speicherpoolname darf nicht leer sein."
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "Netzname"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "Status"
 
-msgid "Help"
-msgstr "Hilfe"
+msgid "Network Type"
+msgstr "Netztyp"
+
+msgid "Address Space"
+msgstr "Adressraum"
 
-msgid "About"
-msgstr "Informationen"
+msgid "Name should not contain '/' and '\"'."
+msgstr "Ung??ltiger Speicherpoolname. Er darf nicht '/' enthalten."
 
-msgid "Log out"
-msgstr "Abmelden"
+msgid "Isolated: no external network connection"
+msgstr "Isolatiert: keine physisische Netzverbindung"
 
-msgid "Version:"
-msgstr "Version:"
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: nur ausgehende physische Netzverbindung"
 
-msgid "Session timeout, please re-login."
+msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
+"??berbr??ckt: Virtuelle Maschinen sind direkt mit physischem Netz verbunden"
 
-msgid "User Name"
-msgstr "Benutzername"
+msgid "(No interfaces found)"
+msgstr ""
 
-msgid "Password"
-msgstr "Kennwort"
+msgid "Destination"
+msgstr "Ziel:"
+
+msgid "Enable VLAN"
+msgstr "Virtuelles LAN (VLAN) aktivieren:"
+
+msgid "VLAN ID"
+msgstr "VLAN-ID:"
+
+msgid "Stop"
+msgstr "Stoppen"
 
 msgid "Generate a New Debug Report"
 msgstr "Neuen Debugbericht erstellen"
@@ -2030,21 +2017,45 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-msgid "Add a Volume to Storage Pool"
-msgstr ""
+msgid "Capacity"
+msgstr "Kapazit??t"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "Zugeordnet"
 
-msgid "Enter the remote URL here."
-msgstr ""
+msgid "Location"
+msgstr "Position"
 
-msgid "Upload a file"
+msgid "Device path"
+msgstr "Einheitenpfad"
+
+msgid "active"
+msgstr "aktiv"
+
+msgid "inactive"
+msgstr "inaktiv"
+
+msgid "Deactivate"
+msgstr "Inaktivieren"
+
+msgid "Activate"
+msgstr "Aktivieren"
+
+msgid "Add Volume"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "Extend"
 msgstr ""
 
+msgid "Undefine"
+msgstr "Definition aufheben"
+
+msgid "Format"
+msgstr "Format:"
+
+msgid "Allocation"
+msgstr "Zuordnung:"
+
 msgid "Define a New Storage Pool"
 msgstr "Neuen Speicherpool definieren"
 
@@ -2090,21 +2101,18 @@ msgstr "NFS-Pfad"
 msgid "The NFS exported path on NFS server."
 msgstr "Der NFS-Exportpfad auf dem NFS-Server."
 
-msgid "Device path"
-msgstr "Einheitenpfad"
-
 msgid "iSCSI Server"
 msgstr "iSCSI-Server"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP oder Hostname des iSCSI-Servers. Diese(r) darf nicht leer sein."
-
 msgid "Server"
 msgstr "Server"
 
 msgid "Port"
 msgstr "Port"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "IP oder Hostname des iSCSI-Servers. Diese(r) darf nicht leer sein."
+
 msgid "Target"
 msgstr "Ziel"
 
@@ -2117,12 +2125,33 @@ msgstr "iSCSI-Authentifizierung hinzuf??gen"
 msgid "iSCSI Authentication"
 msgstr "iSCSI-Authentifizierung"
 
+msgid "User Name"
+msgstr "Benutzername"
+
+msgid "Password"
+msgstr "Kennwort"
+
 msgid "SCSI Adapter"
 msgstr "SCSI-Adapter"
 
 msgid "Please, wait..."
 msgstr "Bitte warten..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "Vorlage hinzuf??gen"
 
@@ -2174,9 +2203,6 @@ msgstr "Ich m??chte einen benutzerdefinierten URL verwenden"
 msgid "Edit Template"
 msgstr "Vorlage bearbeiten"
 
-msgid "Processor"
-msgstr "Prozessor"
-
 msgid "CDROM"
 msgstr "CD-ROM"
 
@@ -2204,123 +2230,59 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "Platten-E/A"
-
-msgid "Network I/O"
-msgstr "Netz-E/A"
-
-msgid "Livetile"
-msgstr "Live Tile"
-
-msgid "No guests found."
-msgstr "Keine G??ste gefunden."
-
-msgid "Shut down"
-msgstr "Herunterfahren"
-
-msgid "Restart"
-msgstr "Erneut starten"
-
-msgid "Basic Information"
-msgstr "Basisinformationen"
-
-msgid "OS Distro"
-msgstr "BS-Distro"
-
-msgid "OS Code Name"
-msgstr "BS-Codename"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "Systemstatistik"
-
-msgid "Update Progress"
-msgstr "Aktualisierungsfortschritt"
-
-msgid "Network Name"
-msgstr "Netzname"
-
-msgid "State"
-msgstr "Status"
-
-msgid "Network Type"
-msgstr "Netztyp"
-
-msgid "Address Space"
-msgstr "Adressraum"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr "Ung??ltiger Speicherpoolname. Er darf nicht '/' enthalten."
-
-msgid "Isolated: no external network connection"
-msgstr "Isolatiert: keine physisische Netzverbindung"
-
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: nur ausgehende physische Netzverbindung"
-
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-"??berbr??ckt: Virtuelle Maschinen sind direkt mit physischem Netz verbunden"
-
-msgid "(No interfaces found)"
-msgstr ""
-
-msgid "Destination"
-msgstr "Ziel:"
-
-msgid "Enable VLAN"
-msgstr "Virtuelles LAN (VLAN) aktivieren:"
+msgid "No templates found."
+msgstr "Keine Vorlagen gefunden."
 
-msgid "VLAN ID"
-msgstr "VLAN-ID:"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "L??schen ist nicht zul??ssig f??r %(resource)s"
 
-msgid "Stop"
-msgstr "Stoppen"
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s implementiert keine Aktualisierungsmethode"
 
-msgid "%Used"
-msgstr ""
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "Erstellen ist nicht zul??ssig f??r %(resource)s"
 
-msgid "Location"
-msgstr "Position"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "JSON-Anfrage konnte nicht analysiert werden"
 
-msgid "Capacity"
-msgstr "Kapazit??t"
+#~ msgid "This API only supports JSON"
+#~ msgstr "Diese API unterst??tzt nur JSON"
 
-msgid "Allocated"
-msgstr "Zugeordnet"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "Datenspeicher wird nicht im Modellobjekt initialisiert."
 
-msgid "active"
-msgstr "aktiv"
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr ""
+#~ "Task kann aufgrund des folgenden Fehlers nicht gestartet werden: %(err)s"
 
-msgid "inactive"
-msgstr "inaktiv"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr ""
+#~ "Authentifizierung f??r Benutzer '%(username)s' fehlgeschlagen. "
+#~ "[Fehlercode: %(code)s]"
 
-msgid "Deactivate"
-msgstr "Inaktivieren"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen"
 
-msgid "Activate"
-msgstr "Aktivieren"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "Geben Sie %(item)s an, um sich bei Kimchi anzumelden"
 
-msgid "Add Volume"
-msgstr ""
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "%(item)s konnten nicht im Datenspeicher gefunden werden"
 
-msgid "Extend"
-msgstr ""
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr ""
+#~ "Zeitlimit??berschreitung beim Ausf??hren des Befehls '%(cmd)s' nach %"
+#~ "(seconds)s Sekunden"
 
-msgid "Undefine"
-msgstr "Definition aufheben"
+#~ msgid "Help"
+#~ msgstr "Hilfe"
 
-msgid "Format"
-msgstr "Format:"
+#~ msgid "About"
+#~ msgstr "Informationen"
 
-msgid "Allocation"
-msgstr "Zuordnung:"
+#~ msgid "Log out"
+#~ msgstr "Abmelden"
 
-msgid "No templates found."
-msgstr "Keine Vorlagen gefunden."
+#~ msgid "Version:"
+#~ msgstr "Version:"
diff --git a/plugins/kimchi/po/en_US.po b/plugins/kimchi/po/en_US.po
index 9331bde..a5d0d44 100644
--- a/plugins/kimchi/po/en_US.po
+++ b/plugins/kimchi/po/en_US.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -22,60 +22,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr ""
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr ""
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr ""
-
-msgid "Unable to parse JSON request"
-msgstr ""
-
-msgid "This API only supports JSON"
-msgstr ""
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr ""
-
-#, python-format
-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 ""
-
-msgid "You are not authorized to access Kimchi"
-msgstr ""
-
-#, python-format
-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 ""
 
@@ -142,8 +95,8 @@ msgstr ""
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 
@@ -519,8 +472,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -589,8 +542,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
 
 #, python-format
@@ -662,8 +615,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -726,8 +679,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -820,8 +773,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 
 #, python-format
@@ -915,28 +868,12 @@ msgid "There is no compatible package manager for this system."
 msgstr ""
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr ""
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr ""
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr ""
 
@@ -949,8 +886,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -994,8 +931,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1113,8 +1050,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1133,20 +1070,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1217,6 +1154,9 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr ""
+
 msgid "Edit Guest"
 msgstr ""
 
@@ -1304,10 +1244,55 @@ msgstr ""
 msgid "Detach"
 msgstr ""
 
-msgid "Cancel"
+msgid "revert"
 msgstr ""
 
-msgid "revert"
+msgid "Start"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Shut Down"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "Disk I/O"
+msgstr ""
+
+msgid "Network I/O"
+msgstr ""
+
+msgid "Livetile"
+msgstr ""
+
+msgid "No guests found."
 msgstr ""
 
 msgid "Add a Storage Device to VM"
@@ -1340,37 +1325,40 @@ msgstr ""
 msgid "Attach"
 msgstr ""
 
-msgid "Start"
+msgid "Shut down"
 msgstr ""
 
-msgid "Reset"
+msgid "Restart"
 msgstr ""
 
-msgid "Pause"
+msgid "Basic Information"
 msgstr ""
 
-msgid "Resume"
+msgid "OS Distro"
 msgstr ""
 
-msgid "Power Off"
+msgid "OS Code Name"
 msgstr ""
 
-msgid "Actions"
+msgid "Processor"
 msgstr ""
 
-msgid "Connect"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Clone"
+msgid "System Statistics"
 msgstr ""
 
-msgid "Edit"
+msgid "Software Updates"
 msgstr ""
 
-msgid "Shut Down"
+msgid "Update Progress"
 msgstr ""
 
-msgid "Delete"
+msgid "Repositories"
+msgstr ""
+
+msgid "Debug Reports"
 msgstr ""
 
 msgid "The username or password you entered is incorrect. Please try again."
@@ -1490,9 +1478,6 @@ msgid ""
 "to continue?"
 msgstr ""
 
-msgid "Repositories"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -1526,9 +1511,6 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-msgid "Software Updates"
-msgstr ""
-
 msgid "Package Name"
 msgstr ""
 
@@ -1558,9 +1540,6 @@ msgid ""
 "to continue?"
 msgstr ""
 
-msgid "Debug Reports"
-msgstr ""
-
 msgid "Generated Time"
 msgstr ""
 
@@ -1774,34 +1753,46 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr ""
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
+msgid "Network Name"
 msgstr ""
 
-msgid "No peers found."
+msgid "State"
 msgstr ""
 
-msgid "Help"
+msgid "Network Type"
 msgstr ""
 
-msgid "About"
+msgid "Address Space"
 msgstr ""
 
-msgid "Log out"
+msgid "Name should not contain '/' and '\"'."
 msgstr ""
 
-msgid "Version:"
+msgid "Isolated: no external network connection"
 msgstr ""
 
-msgid "Session timeout, please re-login."
+msgid "NAT: outbound physical network connection only"
 msgstr ""
 
-msgid "User Name"
+msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
 
-msgid "Password"
+msgid "(No interfaces found)"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Enable VLAN"
+msgstr ""
+
+msgid "VLAN ID"
+msgstr ""
+
+msgid "Stop"
 msgstr ""
 
 msgid "Generate a New Debug Report"
@@ -1875,19 +1866,43 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-msgid "Add a Volume to Storage Pool"
+msgid "Capacity"
 msgstr ""
 
-msgid "Fetch from remote URL"
+msgid "Allocated"
 msgstr ""
 
-msgid "Enter the remote URL here."
+msgid "Location"
 msgstr ""
 
-msgid "Upload a file"
+msgid "Device path"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "active"
+msgstr ""
+
+msgid "inactive"
+msgstr ""
+
+msgid "Deactivate"
+msgstr ""
+
+msgid "Activate"
+msgstr ""
+
+msgid "Add Volume"
+msgstr ""
+
+msgid "Extend"
+msgstr ""
+
+msgid "Undefine"
+msgstr ""
+
+msgid "Format"
+msgstr ""
+
+msgid "Allocation"
 msgstr ""
 
 msgid "Define a New Storage Pool"
@@ -1927,21 +1942,18 @@ msgstr ""
 msgid "The NFS exported path on NFS server."
 msgstr ""
 
-msgid "Device path"
-msgstr ""
-
 msgid "iSCSI Server"
 msgstr ""
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr ""
-
 msgid "Server"
 msgstr ""
 
 msgid "Port"
 msgstr ""
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr ""
+
 msgid "Target"
 msgstr ""
 
@@ -1954,12 +1966,33 @@ msgstr ""
 msgid "iSCSI Authentication"
 msgstr ""
 
+msgid "User Name"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
 msgid "SCSI Adapter"
 msgstr ""
 
 msgid "Please, wait..."
 msgstr ""
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr ""
 
@@ -2011,9 +2044,6 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-msgid "Processor"
-msgstr ""
-
 msgid "CDROM"
 msgstr ""
 
@@ -2041,122 +2071,5 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr ""
-
-msgid "Disk I/O"
-msgstr ""
-
-msgid "Network I/O"
-msgstr ""
-
-msgid "Livetile"
-msgstr ""
-
-msgid "No guests found."
-msgstr ""
-
-msgid "Shut down"
-msgstr ""
-
-msgid "Restart"
-msgstr ""
-
-msgid "Basic Information"
-msgstr ""
-
-msgid "OS Distro"
-msgstr ""
-
-msgid "OS Code Name"
-msgstr ""
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr ""
-
-msgid "Update Progress"
-msgstr ""
-
-msgid "Network Name"
-msgstr ""
-
-msgid "State"
-msgstr ""
-
-msgid "Network Type"
-msgstr ""
-
-msgid "Address Space"
-msgstr ""
-
-msgid "Name should not contain '/' and '\"'."
-msgstr ""
-
-msgid "Isolated: no external network connection"
-msgstr ""
-
-msgid "NAT: outbound physical network connection only"
-msgstr ""
-
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-
-msgid "(No interfaces found)"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Enable VLAN"
-msgstr ""
-
-msgid "VLAN ID"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "%Used"
-msgstr ""
-
-msgid "Location"
-msgstr ""
-
-msgid "Capacity"
-msgstr ""
-
-msgid "Allocated"
-msgstr ""
-
-msgid "active"
-msgstr ""
-
-msgid "inactive"
-msgstr ""
-
-msgid "Deactivate"
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Add Volume"
-msgstr ""
-
-msgid "Extend"
-msgstr ""
-
-msgid "Undefine"
-msgstr ""
-
-msgid "Format"
-msgstr ""
-
-msgid "Allocation"
-msgstr ""
-
 msgid "No templates found."
 msgstr ""
diff --git a/plugins/kimchi/po/es_ES.po b/plugins/kimchi/po/es_ES.po
index 5389718..d71e621 100644
--- a/plugins/kimchi/po/es_ES.po
+++ b/plugins/kimchi/po/es_ES.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_ES\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -21,62 +21,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "Suprimir no est?? permitido para %(resource)s"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s no implementa m??todo de actualizaci??n"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "Crear no est?? permitido para %(resource)s"
-
-msgid "Unable to parse JSON request"
-msgstr "No se puede analizar la solicitud JSON"
-
-msgid "This API only supports JSON"
-msgstr "Esta API s??lo da soporte a JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr "El almac??n de datos no se ha iniciado en el objeto de modelo."
-
-#, python-format
-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 "
-"error: %(code)s]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "No tiene autorizaci??n para acceder a Kimchi"
-
-#, python-format
-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 ""
 
@@ -150,15 +101,15 @@ msgstr ""
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Formato incorrecto mientras se le??a el descriptor de volumen en ISO "
-"%(filename)s"
+"Formato incorrecto mientras se le??a el descriptor de volumen en ISO %"
+"(filename)s"
 
 #, python-format
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "El hipervisor no tiene permiso para utilizar este ISO %(filename)s. "
@@ -441,14 +392,14 @@ msgstr ""
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
 msgstr ""
-"La agrupaci??n de almacenamiento %(pool)s especificada para la plantilla "
-"%(template)s no existe"
+"La agrupaci??n de almacenamiento %(pool)s especificada para la plantilla %"
+"(template)s no existe"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
 msgstr ""
-"La agrupaci??n de almacenamiento %(pool)s especificada para la plantilla "
-"%(template)s no est?? activa"
+"La agrupaci??n de almacenamiento %(pool)s especificada para la plantilla %"
+"(template)s no est?? activa"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
@@ -543,8 +494,8 @@ msgstr "La agrupaci??n de almacenamiento %(name)s no existe"
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
 msgstr ""
-"Especifique %(item)s para poder crear la agrupaci??n de almacenamiento "
-"%(name)s"
+"Especifique %(item)s para poder crear la agrupaci??n de almacenamiento %(name)"
+"s"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
@@ -561,8 +512,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 "No se puede obtener el n??mero de vol??menes de almacenamiento en la "
 "agrupaci??n de almacenamiento %(name)s. Detalles: %(err)s"
@@ -570,20 +521,20 @@ msgstr ""
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede activar la agrupaci??n de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede activar la agrupaci??n de almacenamiento %(name)s. Detalles: %"
+"(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede desactivar la agrupaci??n de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede desactivar la agrupaci??n de almacenamiento %(name)s. Detalles: %"
+"(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede suprimir la agrupaci??n de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede suprimir la agrupaci??n de almacenamiento %(name)s. Detalles: %"
+"(err)s"
 
 #, python-format
 msgid ""
@@ -649,11 +600,11 @@ msgstr ""
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
-"%(disk)s no es un disco/partici??n. No se ha podido a??adir a la agrupaci??n "
-"%(pool)s."
+"%(disk)s no es un disco/partici??n. No se ha podido a??adir a la agrupaci??n %"
+"(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
@@ -744,8 +695,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 "No se puede crear el volumen de almacenamiento %(name)s en la agrupaci??n de "
 "almacenamiento %(pool)s. Detalles: %(err)s"
@@ -760,8 +711,8 @@ msgstr ""
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
 msgstr ""
-"No se pueden borrar los vol??menes de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se pueden borrar los vol??menes de almacenamiento %(name)s. Detalles: %"
+"(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
@@ -771,8 +722,8 @@ msgstr ""
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede redimensionar el volumen de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede redimensionar el volumen de almacenamiento %(name)s. Detalles: %"
+"(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
@@ -820,8 +771,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -920,11 +871,11 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
-"No se puede desactivar la red %(name)s. Hay algunas m??quinas virtuales "
-"%(vms)s y/o plantillas enlazadas a esta red."
+"No se puede desactivar la red %(name)s. Hay algunas m??quinas virtuales %(vms)"
+"s y/o plantillas enlazadas a esta red."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1031,30 +982,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "No hay ning??n gestor de paquetes compatible para este sistema."
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "No se puede encontrar %(item)s en el almac??n de datos"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "URI %(uri)s no v??lido"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-"Tiempo de espera excedido al ejecutar el mandato '%(cmd)s' despu??s de "
-"%(seconds)s segundos"
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "Tipo de almacenamiento no v??lido. Tipos soportados: 'cdrom'"
 
@@ -1067,27 +1000,27 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
 msgstr ""
-"Se ha producido un error al crear el nuevo dispositivo de almacenamiento: "
-"%(error)s"
+"Se ha producido un error al crear el nuevo dispositivo de almacenamiento: %"
+"(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
 msgstr ""
-"Se ha producido un error al actualizar el dispositivo de almacenamiento: "
-"%(error)s"
+"Se ha producido un error al actualizar el dispositivo de almacenamiento: %"
+"(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
 msgstr ""
-"Se ha producido un error al eliminar el dispositivo de almacenamiento: "
-"%(error)s"
+"Se ha producido un error al eliminar el dispositivo de almacenamiento: %"
+"(error)s"
 
 msgid "Do not support IDE device hot plug"
 msgstr ""
@@ -1123,8 +1056,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1193,8 +1126,8 @@ msgstr "No se ha podido eliminar el repositorio %(repo_id)s."
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
 msgstr ""
-"No se ha podido grabar el archivo de configuraci??n del repositorio "
-"%(repo_file)s"
+"No se ha podido grabar el archivo de configuraci??n del repositorio %"
+"(repo_file)s"
 
 msgid "Specify repository distribution in order to create a DEB repository."
 msgstr ""
@@ -1248,8 +1181,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1268,20 +1201,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1354,6 +1287,9 @@ msgstr "Crear"
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr "Cancelar"
+
 msgid "Edit Guest"
 msgstr "Editar invitado"
 
@@ -1441,12 +1377,57 @@ msgstr "Sustituir"
 msgid "Detach"
 msgstr "Desconectar"
 
-msgid "Cancel"
-msgstr "Cancelar"
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Reset"
+msgstr "Restablecer"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr "Acciones"
+
+msgid "Connect"
+msgstr "Conectar"
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Shut Down"
+msgstr "Concluir"
+
+msgid "Delete"
+msgstr "Suprimir"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "E/S de disco"
+
+msgid "Network I/O"
+msgstr "E/S de red"
+
+msgid "Livetile"
+msgstr "Livetile"
+
+msgid "No guests found."
+msgstr "No se ha encontrado invitados."
+
 msgid "Add a Storage Device to VM"
 msgstr "A??adir un dispositivo de almacenamiento a VM"
 
@@ -1477,38 +1458,41 @@ msgstr "La v??a de acceso del archivo ISO en el servidor para el CDROM."
 msgid "Attach"
 msgstr "Conectar"
 
-msgid "Start"
-msgstr "Iniciar"
-
-msgid "Reset"
-msgstr "Restablecer"
+msgid "Shut down"
+msgstr "Concluir"
 
-msgid "Pause"
-msgstr ""
+msgid "Restart"
+msgstr "Reiniciar"
 
-msgid "Resume"
-msgstr ""
+msgid "Basic Information"
+msgstr "Informaci??n b??sica"
 
-msgid "Power Off"
-msgstr ""
+msgid "OS Distro"
+msgstr "Distro de SO"
 
-msgid "Actions"
-msgstr "Acciones"
+msgid "OS Code Name"
+msgstr "Nombre de c??digo de SO"
 
-msgid "Connect"
-msgstr "Conectar"
+msgid "Processor"
+msgstr "Procesador"
 
-msgid "Clone"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Edit"
-msgstr "Editar"
+msgid "System Statistics"
+msgstr "Estad??sticas del sistema"
 
-msgid "Shut Down"
-msgstr "Concluir"
+msgid "Software Updates"
+msgstr "Actualizaciones de software"
 
-msgid "Delete"
-msgstr "Suprimir"
+msgid "Update Progress"
+msgstr "Actualizar progreso"
+
+msgid "Repositories"
+msgstr "Repositorios"
+
+msgid "Debug Reports"
+msgstr "Informes de depuraci??n"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
@@ -1638,9 +1622,6 @@ msgstr ""
 "El repositorio se eliminar?? de forma permanente y no se puede recuperar. "
 "??Desea continuar?"
 
-msgid "Repositories"
-msgstr "Repositorios"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1674,9 +1655,6 @@ msgstr "Habilitar"
 msgid "Disable"
 msgstr "Inhabilitar"
 
-msgid "Software Updates"
-msgstr "Actualizaciones de software"
-
 msgid "Package Name"
 msgstr "Nombre de paquete"
 
@@ -1708,9 +1686,6 @@ msgstr ""
 "El informe de depuraci??n se eliminar?? permanentemente y no se puede "
 "recuperar. ??Desea continuar?"
 
-msgid "Debug Reports"
-msgstr "Informes de depuraci??n"
-
 msgid "Generated Time"
 msgstr "Tiempo generado"
 
@@ -1940,35 +1915,50 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "El nombre de la agrupaci??n de almacenamiento no puede estar en blanco."
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "Nombre de red"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "Estado"
 
-msgid "Help"
-msgstr "Ayuda"
+msgid "Network Type"
+msgstr "Tipo de red"
+
+msgid "Address Space"
+msgstr "Espacio de direcciones"
 
-msgid "About"
-msgstr "Acerca de"
+msgid "Name should not contain '/' and '\"'."
+msgstr ""
+"Nombre de agrupaci??n de almacenamiento no v??lido. No debe contener '/'."
 
-msgid "Log out"
-msgstr "Finalizar sesi??n"
+msgid "Isolated: no external network connection"
+msgstr "Aislado: no hay conexi??n de red f??sica"
 
-msgid "Version:"
-msgstr "Versi??n:"
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: conexi??n de red f??sica saliente solamente"
 
-msgid "Session timeout, please re-login."
+msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
+"Puenteado: Las m??quinas virtuales est??n conectadas a la red f??sica "
+"directamente"
 
-msgid "User Name"
-msgstr "Nombre de usuario"
+msgid "(No interfaces found)"
+msgstr ""
 
-msgid "Password"
-msgstr "Contrase??a"
+msgid "Destination"
+msgstr "Destino:"
+
+msgid "Enable VLAN"
+msgstr "Habilitar VLAN:"
+
+msgid "VLAN ID"
+msgstr "ID de VLAN:"
+
+msgid "Stop"
+msgstr "Detener"
 
 msgid "Generate a New Debug Report"
 msgstr "Generar un Informe de depuraci??n nuevo"
@@ -2047,21 +2037,45 @@ msgstr "S??"
 msgid "No"
 msgstr "No"
 
-msgid "Add a Volume to Storage Pool"
-msgstr ""
+msgid "Capacity"
+msgstr "Capacidad"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "Asignado"
 
-msgid "Enter the remote URL here."
-msgstr ""
+msgid "Location"
+msgstr "Ubicaci??n"
 
-msgid "Upload a file"
+msgid "Device path"
+msgstr "V??a de acceso del dispositivo"
+
+msgid "active"
+msgstr "activo"
+
+msgid "inactive"
+msgstr "inactivo"
+
+msgid "Deactivate"
+msgstr "Desactivar"
+
+msgid "Activate"
+msgstr "Activar"
+
+msgid "Add Volume"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "Extend"
 msgstr ""
 
+msgid "Undefine"
+msgstr "No definir"
+
+msgid "Format"
+msgstr "Formato:"
+
+msgid "Allocation"
+msgstr "Asignado:"
+
 msgid "Define a New Storage Pool"
 msgstr "Definir una agrupaci??n de almacenamiento nueva"
 
@@ -2105,21 +2119,18 @@ msgstr "V??a de acceso NFS"
 msgid "The NFS exported path on NFS server."
 msgstr "La v??a de acceso exportada de NFS en el servidor NFS."
 
-msgid "Device path"
-msgstr "V??a de acceso del dispositivo"
-
 msgid "iSCSI Server"
 msgstr "Servidor iSCSI"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP o nombre de host de servidor iSCSI. No debe estar vac??o."
-
 msgid "Server"
 msgstr "Servidor"
 
 msgid "Port"
 msgstr "Puerto"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "IP o nombre de host de servidor iSCSI. No debe estar vac??o."
+
 msgid "Target"
 msgstr "Destino"
 
@@ -2132,12 +2143,33 @@ msgstr "A??adir Autenticaci??n iSCSI"
 msgid "iSCSI Authentication"
 msgstr "Autenticaci??n iSCSI"
 
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+msgid "Password"
+msgstr "Contrase??a"
+
 msgid "SCSI Adapter"
 msgstr "Adaptador SCSI"
 
 msgid "Please, wait..."
 msgstr "Por favor, espere..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "A??adir plantilla"
 
@@ -2189,9 +2221,6 @@ msgstr "Deseo utilizar un URL personalizado"
 msgid "Edit Template"
 msgstr "Editar plantilla"
 
-msgid "Processor"
-msgstr "Procesador"
-
 msgid "CDROM"
 msgstr "CDROM"
 
@@ -2219,125 +2248,58 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "E/S de disco"
-
-msgid "Network I/O"
-msgstr "E/S de red"
-
-msgid "Livetile"
-msgstr "Livetile"
-
-msgid "No guests found."
-msgstr "No se ha encontrado invitados."
-
-msgid "Shut down"
-msgstr "Concluir"
-
-msgid "Restart"
-msgstr "Reiniciar"
-
-msgid "Basic Information"
-msgstr "Informaci??n b??sica"
-
-msgid "OS Distro"
-msgstr "Distro de SO"
-
-msgid "OS Code Name"
-msgstr "Nombre de c??digo de SO"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "Estad??sticas del sistema"
-
-msgid "Update Progress"
-msgstr "Actualizar progreso"
-
-msgid "Network Name"
-msgstr "Nombre de red"
-
-msgid "State"
-msgstr "Estado"
-
-msgid "Network Type"
-msgstr "Tipo de red"
-
-msgid "Address Space"
-msgstr "Espacio de direcciones"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr ""
-"Nombre de agrupaci??n de almacenamiento no v??lido. No debe contener '/'."
-
-msgid "Isolated: no external network connection"
-msgstr "Aislado: no hay conexi??n de red f??sica"
-
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: conexi??n de red f??sica saliente solamente"
+msgid "No templates found."
+msgstr "No se han encontrado plantillas."
 
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-"Puenteado: Las m??quinas virtuales est??n conectadas a la red f??sica "
-"directamente"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "Suprimir no est?? permitido para %(resource)s"
 
-msgid "(No interfaces found)"
-msgstr ""
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s no implementa m??todo de actualizaci??n"
 
-msgid "Destination"
-msgstr "Destino:"
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "Crear no est?? permitido para %(resource)s"
 
-msgid "Enable VLAN"
-msgstr "Habilitar VLAN:"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "No se puede analizar la solicitud JSON"
 
-msgid "VLAN ID"
-msgstr "ID de VLAN:"
+#~ msgid "This API only supports JSON"
+#~ msgstr "Esta API s??lo da soporte a JSON"
 
-msgid "Stop"
-msgstr "Detener"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "El almac??n de datos no se ha iniciado en el objeto de modelo."
 
-msgid "%Used"
-msgstr ""
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "No se puede iniciar la tarea debido a un error: %(err)s"
 
-msgid "Location"
-msgstr "Ubicaci??n"
+#~ 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 "
+#~ "error: %(code)s]"
 
-msgid "Capacity"
-msgstr "Capacidad"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "No tiene autorizaci??n para acceder a Kimchi"
 
-msgid "Allocated"
-msgstr "Asignado"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "Especifique %(item)s para iniciar la sesi??n en Kimchi"
 
-msgid "active"
-msgstr "activo"
-
-msgid "inactive"
-msgstr "inactivo"
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "No se puede encontrar %(item)s en el almac??n de datos"
 
-msgid "Deactivate"
-msgstr "Desactivar"
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr ""
+#~ "Tiempo de espera excedido al ejecutar el mandato '%(cmd)s' despu??s de %"
+#~ "(seconds)s segundos"
 
-msgid "Activate"
-msgstr "Activar"
+#~ msgid "Help"
+#~ msgstr "Ayuda"
 
-msgid "Add Volume"
-msgstr ""
+#~ msgid "About"
+#~ msgstr "Acerca de"
 
-msgid "Extend"
-msgstr ""
+#~ msgid "Log out"
+#~ msgstr "Finalizar sesi??n"
 
-msgid "Undefine"
-msgstr "No definir"
-
-msgid "Format"
-msgstr "Formato:"
-
-msgid "Allocation"
-msgstr "Asignado:"
-
-msgid "No templates found."
-msgstr "No se han encontrado plantillas."
+#~ msgid "Version:"
+#~ msgstr "Versi??n:"
diff --git a/plugins/kimchi/po/fr_FR.po b/plugins/kimchi/po/fr_FR.po
index 5bfc492..b996e8a 100644
--- a/plugins/kimchi/po/fr_FR.po
+++ b/plugins/kimchi/po/fr_FR.po
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2014-08-27 21:30+0000\n"
 "Last-Translator: BobSynfig\n"
 "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/"
 "fr/)\n"
-"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr_FR\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -22,64 +22,13 @@ msgid "Unknown parameter %(value)s"
 msgstr "Param??tre inconnu %(value)s"
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "La suppression n'est pas autoris??e pour %(resource)s"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s n'impl??mente pas de m??thode de mise ?? jour"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "La cr??ation n'est pas autoris??e pour %(resource)s"
-
-msgid "Unable to parse JSON request"
-msgstr "Impossible de parser la requ??te JSON"
-
-msgid "This API only supports JSON"
-msgstr "Cette API supporte uniquement le JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-"Les param??tres ne correspondent pas ?? ce qui est requis dans le sch??ma: "
-"%(err)s"
-
-msgid "You don't have permission to perform this operation."
-msgstr "Vous n'avez pas la permission d'effectuer cette op??ration."
-
-msgid "Datastore is not initiated in the model object."
-msgstr "Le magasin de donn??es n'est pas initi?? dans l'objet mod??le."
-
-#, python-format
-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 "
-"d'Erreur: %(code)s]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "Vous n'??tes pas autoris?? ?? acc??der ?? Kimchi"
-
-#, python-format
-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"
 
@@ -96,8 +45,8 @@ msgstr "Erreur durant l'acc??s aux p??riph??riques de bloc. D??tails: %(err)s"
 #, python-format
 msgid "Error while getting block device information for %(device)s."
 msgstr ""
-"Erreur durant l'obtention de l'information sur le p??riph??rique de bloc "
-"%(device)s."
+"Erreur durant l'obtention de l'information sur le p??riph??rique de bloc %"
+"(device)s."
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
@@ -148,15 +97,15 @@ msgstr ""
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Mauvais format durant la lecture du descripteur de volume dans l'ISO "
-"%(filename)s"
+"Mauvais format durant la lecture du descripteur de volume dans l'ISO %"
+"(filename)s"
 
 #, python-format
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "L'hyperviseur n'a pas la permission d'utiliser cet ISO %(filename)s. "
@@ -260,8 +209,8 @@ msgstr "Impossible de d??marrer la machine virtuelle %(name)s. D??tails: %(err)s
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de mettre hors tension la machine virtuelle %(name)s. D??tails: "
-"%(err)s"
+"Impossible de mettre hors tension la machine virtuelle %(name)s. D??tails: %"
+"(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
@@ -577,8 +526,8 @@ msgstr "Impossilble de cr??er le pool de stockage %(name)s. D??tails: %(err)s"
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 "Impossible d'obtenir le nombre de volumes de stockage dans le pool de "
 "stockage%(name)s. D??tails: %(err)s"
@@ -607,8 +556,8 @@ msgstr ""
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"Impossible de cr??er le pool NFS du fait que le montage du chemin d'export  "
-"%(path)s  a ??chou??"
+"Impossible de cr??er le pool NFS du fait que le montage du chemin d'export  %"
+"(path)s  a ??chou??"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
@@ -660,11 +609,11 @@ msgstr "Sp??cifier un nom et un type pour cr??er un pool de stockage"
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
-"%(disk)s n'est pas un(e) disque/partition valide. N'a pu l'ajouter au pool "
-"%(pool)s."
+"%(disk)s n'est pas un(e) disque/partition valide. N'a pu l'ajouter au pool %"
+"(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
@@ -686,16 +635,16 @@ msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossible d'activer le pool de stockage NFS%(name)s. Le serveur NFS "
-"%(server)s n'est pas joignable."
+"Impossible d'activer le pool de stockage NFS%(name)s. Le serveur NFS %"
+"(server)s n'est pas joignable."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossible de d??sactiver le pool de stockage NFS%(name)s. Le serveur NFS "
-"%(server)s n'est pas joignable."
+"Impossible de d??sactiver le pool de stockage NFS%(name)s. Le serveur NFS %"
+"(server)s n'est pas joignable."
 
 #, python-format
 msgid ""
@@ -749,23 +698,23 @@ msgstr "Sp??cifier %(item)s afin de cr??er le volume de stockage %(volume)s"
 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 "
-"%(pool)s n'est pas actif"
+"Impossible de lister les volumes de stockage car le pool de stockage %(pool)"
+"s n'est pas actif"
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
-"Impossible de cr??er le volume de stockage %(name)s dans le pool de stockage "
-"%(pool)s. D??tails: %(err)s"
+"Impossible de cr??er le volume de stockage %(name)s dans le pool de stockage %"
+"(pool)s. D??tails: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"Impossible de lister les volumes de stockage dans le pool de stockage "
-"%(pool)s. D??tails: %(err)s"
+"Impossible de lister les volumes de stockage dans le pool de stockage %(pool)"
+"s. D??tails: %(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
@@ -829,8 +778,8 @@ 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"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -925,16 +874,16 @@ msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
-"Impossible de supprimer le r??seau %(name)s. Il y a des machines virtuelles "
-"%(vms)s et/ou des mod??les li??s ?? ce r??seau. "
+"Impossible de supprimer le r??seau %(name)s. Il y a des machines virtuelles %"
+"(vms)s et/ou des mod??les li??s ?? ce r??seau. "
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
-"Impossible de d??sactiver r??seau %(name)s. Il y a des machines virtuelles"
-"%(vms)s et/ou des mod??les li??s ?? ce r??seau. "
+"Impossible de d??sactiver r??seau %(name)s. Il y a des machines virtuelles%"
+"(vms)s et/ou des mod??les li??s ?? ce r??seau. "
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1043,30 +992,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "Il n'y a pas de gestionnaire de paquets compatible avec ce syst??me."
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "Impossible de trouver %(item)s dans le magasin de donn??es"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "URI %(uri)s invalide"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-"Timeout durant l'ex??cution de la commande '%(cmd)s' apr??s %(seconds)s "
-"secondes"
-
 msgid "Unable to choose a virtual machine name"
 msgstr "Impossible de s??lectionner un nom de machine virtuelle"
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "Type de stockage invalide. Les Types support??s sont: 'cdrom', 'disk'"
 
@@ -1079,8 +1010,8 @@ msgstr "Seulement le chemin d'un CDROM peut ??tre modifi??."
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"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"
@@ -1133,8 +1064,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"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"
@@ -1261,8 +1192,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1281,20 +1212,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1367,6 +1298,9 @@ msgstr "Cr??er"
 msgid "Creating..."
 msgstr "Cr??ation en cours..."
 
+msgid "Cancel"
+msgstr "Annuler"
+
 msgid "Edit Guest"
 msgstr "??diter l'Invit??"
 
@@ -1454,12 +1388,57 @@ msgstr "Remplacer"
 msgid "Detach"
 msgstr "D??tacher"
 
-msgid "Cancel"
-msgstr "Annuler"
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "D??marrer"
+
+msgid "Reset"
+msgstr "R??initialiser"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr "Mettre hors tension"
+
+msgid "Actions"
+msgstr "Actions"
+
+msgid "Connect"
+msgstr "Connecter"
+
+msgid "Clone"
+msgstr "Cloner"
+
+msgid "Edit"
+msgstr "??diter"
+
+msgid "Shut Down"
+msgstr "??teindre"
+
+msgid "Delete"
+msgstr "Supprimer"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "E/S Disque"
+
+msgid "Network I/O"
+msgstr "E/S R??seau"
+
+msgid "Livetile"
+msgstr "Livetile"
+
+msgid "No guests found."
+msgstr "Aucun invit?? trouv??."
+
 msgid "Add a Storage Device to VM"
 msgstr "Ajouter un P??riph??rique de Stockage ?? la VM"
 
@@ -1491,38 +1470,41 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM."
 msgid "Attach"
 msgstr "Attacher"
 
-msgid "Start"
-msgstr "D??marrer"
+msgid "Shut down"
+msgstr "??teindre"
 
-msgid "Reset"
-msgstr "R??initialiser"
+msgid "Restart"
+msgstr "Red??marrer"
 
-msgid "Pause"
-msgstr ""
+msgid "Basic Information"
+msgstr "Informations de Base"
 
-msgid "Resume"
-msgstr ""
+msgid "OS Distro"
+msgstr "Distro de l'OS"
 
-msgid "Power Off"
-msgstr "Mettre hors tension"
+msgid "OS Code Name"
+msgstr "Nom de code de l'OS"
 
-msgid "Actions"
-msgstr "Actions"
+msgid "Processor"
+msgstr "Processeur"
 
-msgid "Connect"
-msgstr "Connecter"
+msgid "CPU(s)"
+msgstr ""
 
-msgid "Clone"
-msgstr "Cloner"
+msgid "System Statistics"
+msgstr "Statistiques Syst??me"
 
-msgid "Edit"
-msgstr "??diter"
+msgid "Software Updates"
+msgstr "Mises ?? jour Logiciel"
 
-msgid "Shut Down"
-msgstr "??teindre"
+msgid "Update Progress"
+msgstr "Progr??s de la Mise ?? Jour"
 
-msgid "Delete"
-msgstr "Supprimer"
+msgid "Repositories"
+msgstr "D??p??ts"
+
+msgid "Debug Reports"
+msgstr "Rapports de D??boggage"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
@@ -1564,8 +1546,8 @@ msgid ""
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
 "Ne peut contacter le syst??me h??te. V??rifiez que le syst??me h??te est allum?? "
-"et que vous avez une connectivit?? r??seau avec lui. R??ponse de requ??te HTTP "
-"%1."
+"et que vous avez une connectivit?? r??seau avec lui. R??ponse de requ??te HTTP %"
+"1."
 
 msgid "Unable to read file."
 msgstr ""
@@ -1653,9 +1635,6 @@ msgstr ""
 "Le d??p??t sera retir?? de fa??on permanente et ne pourra ??tre r??tabli. Voulez-"
 "vous continuer ?"
 
-msgid "Repositories"
-msgstr "D??p??ts"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1689,9 +1668,6 @@ msgstr "Activer"
 msgid "Disable"
 msgstr "D??sactiver"
 
-msgid "Software Updates"
-msgstr "Mises ?? jour Logiciel"
-
 msgid "Package Name"
 msgstr "Nom de paquet"
 
@@ -1723,9 +1699,6 @@ msgstr ""
 "Le rapport de d??boggage sera enlev?? de fa??on permanente et ne pourra ??tre "
 "r??tabli. Voulez-vous continuer ?"
 
-msgid "Debug Reports"
-msgstr "Rapports de D??boggage"
-
 msgid "Generated Time"
 msgstr "Horodatage de g??n??ration"
 
@@ -1964,35 +1937,49 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "Le pool de disque ou le volume ne peut ??tre vierge."
 
-msgid "Peers"
-msgstr ""
+#, fuzzy
+msgid "Filter"
+msgstr "Filtre"
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "Nom de R??seau"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "??tat"
 
-msgid "Help"
-msgstr "Aide"
+msgid "Network Type"
+msgstr "Type de R??seau"
 
-msgid "About"
-msgstr "A propos..."
+msgid "Address Space"
+msgstr "Espace d'adressage"
 
-msgid "Log out"
-msgstr "Se d??connecter"
+msgid "Name should not contain '/' and '\"'."
+msgstr "Le nom ne devrait pas contenir '/' et '\"'."
 
-msgid "Version:"
-msgstr "Version:"
+msgid "Isolated: no external network connection"
+msgstr "Isol??: pas de connexion ?? un r??seau externe"
 
-msgid "Session timeout, please re-login."
-msgstr "Session expir??e, veuillez vous reconnecter."
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: connexion physique au r??seau sortant uniquement"
 
-msgid "User Name"
-msgstr "Nom d'Utilisateur"
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr ""
+"Bridg??: Les macines virtuelles sont connect??es directement au r??seau physique"
 
-msgid "Password"
-msgstr "Mot de Passe"
+msgid "(No interfaces found)"
+msgstr "(Aucune interface trouv??e)"
+
+msgid "Destination"
+msgstr "Destination"
+
+msgid "Enable VLAN"
+msgstr "Activer le VLAN"
+
+msgid "VLAN ID"
+msgstr "ID de VLAN"
+
+msgid "Stop"
+msgstr "Arr??ter"
 
 msgid "Generate a New Debug Report"
 msgstr "G??n??rer un Nouveau Rapport de D??boggage"
@@ -2070,20 +2057,44 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-msgid "Add a Volume to Storage Pool"
-msgstr "iAjouter un Volume au Pool de Stockage"
+msgid "Capacity"
+msgstr "Capacit??"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "Allou??"
 
-msgid "Enter the remote URL here."
-msgstr "Saisir une URL distante ici"
+msgid "Location"
+msgstr "Emplacement"
 
-msgid "Upload a file"
-msgstr "Charger un fichier"
+msgid "Device path"
+msgstr "Chemin du P??riph??rique"
 
-msgid "Choose the file you want to upload."
-msgstr ""
+msgid "active"
+msgstr "actif"
+
+msgid "inactive"
+msgstr "inactif"
+
+msgid "Deactivate"
+msgstr "D??sactiver"
+
+msgid "Activate"
+msgstr "Activer"
+
+msgid "Add Volume"
+msgstr "Ajouter un Volume"
+
+msgid "Extend"
+msgstr "??tendre"
+
+msgid "Undefine"
+msgstr "Supprimer"
+
+msgid "Format"
+msgstr "Format"
+
+msgid "Allocation"
+msgstr "Allocation"
 
 msgid "Define a New Storage Pool"
 msgstr "D??finir un Nouveau Pool de Stockage"
@@ -2130,21 +2141,18 @@ msgstr "Chemin NFS"
 msgid "The NFS exported path on NFS server."
 msgstr "Le chemin NFS export?? sur le serveur NFS."
 
-msgid "Device path"
-msgstr "Chemin du P??riph??rique"
-
 msgid "iSCSI Server"
 msgstr "Serveur iSCSI"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP du Serveur iSCSI ou nom d'h??te. Il ne devrait pas ??tre vide."
-
 msgid "Server"
 msgstr "Serveur"
 
 msgid "Port"
 msgstr "Port"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "IP du Serveur iSCSI ou nom d'h??te. Il ne devrait pas ??tre vide."
+
 msgid "Target"
 msgstr "Cible"
 
@@ -2157,12 +2165,33 @@ msgstr "Ajouter l'Authentification iSCSI"
 msgid "iSCSI Authentication"
 msgstr "Authentification iSCSI"
 
+msgid "User Name"
+msgstr "Nom d'Utilisateur"
+
+msgid "Password"
+msgstr "Mot de Passe"
+
 msgid "SCSI Adapter"
 msgstr "Adaptateur SCSI"
 
 msgid "Please, wait..."
 msgstr "Veuillez patienter..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr "iAjouter un Volume au Pool de Stockage"
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr "Saisir une URL distante ici"
+
+msgid "Upload a file"
+msgstr "Charger un fichier"
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "Ajouter un Mod??le"
 
@@ -2214,9 +2243,6 @@ msgstr "Je veux utiliser une URL personnalis??e"
 msgid "Edit Template"
 msgstr "??diter un Mod??le"
 
-msgid "Processor"
-msgstr "Processeur"
-
 msgid "CDROM"
 msgstr "CDROM"
 
@@ -2244,123 +2270,69 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "E/S Disque"
-
-msgid "Network I/O"
-msgstr "E/S R??seau"
-
-msgid "Livetile"
-msgstr "Livetile"
-
-msgid "No guests found."
-msgstr "Aucun invit?? trouv??."
-
-msgid "Shut down"
-msgstr "??teindre"
-
-msgid "Restart"
-msgstr "Red??marrer"
-
-msgid "Basic Information"
-msgstr "Informations de Base"
-
-msgid "OS Distro"
-msgstr "Distro de l'OS"
-
-msgid "OS Code Name"
-msgstr "Nom de code de l'OS"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "Statistiques Syst??me"
-
-msgid "Update Progress"
-msgstr "Progr??s de la Mise ?? Jour"
-
-msgid "Network Name"
-msgstr "Nom de R??seau"
-
-msgid "State"
-msgstr "??tat"
-
-msgid "Network Type"
-msgstr "Type de R??seau"
-
-msgid "Address Space"
-msgstr "Espace d'adressage"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr "Le nom ne devrait pas contenir '/' et '\"'."
-
-msgid "Isolated: no external network connection"
-msgstr "Isol??: pas de connexion ?? un r??seau externe"
+msgid "No templates found."
+msgstr "Aucun mod??le trouv??."
 
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: connexion physique au r??seau sortant uniquement"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "La suppression n'est pas autoris??e pour %(resource)s"
 
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-"Bridg??: Les macines virtuelles sont connect??es directement au r??seau physique"
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s n'impl??mente pas de m??thode de mise ?? jour"
 
-msgid "(No interfaces found)"
-msgstr "(Aucune interface trouv??e)"
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "La cr??ation n'est pas autoris??e pour %(resource)s"
 
-msgid "Destination"
-msgstr "Destination"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "Impossible de parser la requ??te JSON"
 
-msgid "Enable VLAN"
-msgstr "Activer le VLAN"
+#~ msgid "This API only supports JSON"
+#~ msgstr "Cette API supporte uniquement le JSON"
 
-msgid "VLAN ID"
-msgstr "ID de VLAN"
+#~ msgid "Parameters does not match requirement in schema: %(err)s"
+#~ msgstr ""
+#~ "Les param??tres ne correspondent pas ?? ce qui est requis dans le sch??ma: %"
+#~ "(err)s"
 
-msgid "Stop"
-msgstr "Arr??ter"
+#~ msgid "You don't have permission to perform this operation."
+#~ msgstr "Vous n'avez pas la permission d'effectuer cette op??ration."
 
-msgid "%Used"
-msgstr ""
-
-msgid "Location"
-msgstr "Emplacement"
-
-msgid "Capacity"
-msgstr "Capacit??"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "Le magasin de donn??es n'est pas initi?? dans l'objet mod??le."
 
-msgid "Allocated"
-msgstr "Allou??"
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "Impossible de d??marrer la t??che ?? cause de l'erreur: %(err)s"
 
-msgid "active"
-msgstr "actif"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr ""
+#~ "L'authentification a ??chou?? pour l'utilisateur '%(username)s'. [Code "
+#~ "d'Erreur: %(code)s]"
 
-msgid "inactive"
-msgstr "inactif"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "Vous n'??tes pas autoris?? ?? acc??der ?? Kimchi"
 
-msgid "Deactivate"
-msgstr "D??sactiver"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "Sp??cifiez %(item)s pour vous logguer dans Kimchi"
 
-msgid "Activate"
-msgstr "Activer"
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "Impossible de trouver %(item)s dans le magasin de donn??es"
 
-msgid "Add Volume"
-msgstr "Ajouter un Volume"
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr ""
+#~ "Timeout durant l'ex??cution de la commande '%(cmd)s' apr??s %(seconds)s "
+#~ "secondes"
 
-msgid "Extend"
-msgstr "??tendre"
+#~ msgid "Help"
+#~ msgstr "Aide"
 
-msgid "Undefine"
-msgstr "Supprimer"
+#~ msgid "About"
+#~ msgstr "A propos..."
 
-msgid "Format"
-msgstr "Format"
+#~ msgid "Log out"
+#~ msgstr "Se d??connecter"
 
-msgid "Allocation"
-msgstr "Allocation"
+#~ msgid "Version:"
+#~ msgstr "Version:"
 
-msgid "No templates found."
-msgstr "Aucun mod??le trouv??."
+#~ msgid "Session timeout, please re-login."
+#~ msgstr "Session expir??e, veuillez vous reconnecter."
diff --git a/plugins/kimchi/po/it_IT.po b/plugins/kimchi/po/it_IT.po
index bfc1a84..257c306 100644
--- a/plugins/kimchi/po/it_IT.po
+++ b/plugins/kimchi/po/it_IT.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -21,62 +21,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "Eliminazione non consentita per %(resource)s"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s non implementa il metodo di aggiornamento"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "Creazione non consentita per %(resource)s"
-
-msgid "Unable to parse JSON request"
-msgstr "Impossibile analizzare la richiesta JSON"
-
-msgid "This API only supports JSON"
-msgstr "L'API supporta solo JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr "Archivio dati non inizializzato nell'oggetto modello."
-
-#, python-format
-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: "
-"%(code)s]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi"
-
-#, python-format
-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 ""
 
@@ -111,8 +62,8 @@ msgstr ""
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
 msgstr ""
-"Impossibile accedere a %(portal)s di destinazione host iSCSI. Dettagli: "
-"%(err)s"
+"Impossibile accedere a %(portal)s di destinazione host iSCSI. Dettagli: %"
+"(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
@@ -145,22 +96,22 @@ msgstr "Tipo di volume imprevisto per il volume primario in ISO %(filename)s"
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Formato non corretto durante la lettura del descrittore volume in ISO "
-"%(filename)s"
+"Formato non corretto durante la lettura del descrittore volume in ISO %"
+"(filename)s"
 
 #, python-format
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"L'hypervisor non dispone dell'autorizzazione per utilizzare questo ISO "
-"%(filename)s. Spostarlo in /var/lib/libvirt o impostare l'autorizzazione di "
-"ricerca per gli elenchi di controllo accesso ai file per l'utente "
-"'%(user)s',  se possibile, o aggiungere '%(user)s' al gruppo percorso ISO o "
-"(non consigliato) 'chmod -R o+x 'path_to_iso'. Dettagli: %(err)s"
+"L'hypervisor non dispone dell'autorizzazione per utilizzare questo ISO %"
+"(filename)s. Spostarlo in /var/lib/libvirt o impostare l'autorizzazione di "
+"ricerca per gli elenchi di controllo accesso ai file per l'utente '%(user)"
+"s',  se possibile, o aggiungere '%(user)s' al gruppo percorso ISO o (non "
+"consigliato) 'chmod -R o+x 'path_to_iso'. Dettagli: %(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
@@ -552,11 +503,11 @@ msgstr "Impossibile creare il pool di memoria %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
-"Impossibile ottenere il numero di volumi di memoria nel pool di memoria "
-"%(name)s. Dettagli: %(err)s"
+"Impossibile ottenere il numero di volumi di memoria nel pool di memoria %"
+"(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
@@ -630,11 +581,11 @@ msgstr "Specificare nome e tipo per creare un pool di memoria"
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
-"%(disk)s non ?? un disco/partizione valido. Impossibile aggiungerlo al pool "
-"%(pool)s."
+"%(disk)s non ?? un disco/partizione valido. Impossibile aggiungerlo al pool %"
+"(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
@@ -655,16 +606,16 @@ msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossibile attivare il pool di memoria NFS %(name)s. Il server NFS "
-"%(server)s ?? irraggiungibile."
+"Impossibile attivare il pool di memoria NFS %(name)s. Il server NFS %(server)"
+"s ?? irraggiungibile."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossibile disattivare il pool di memoria NFS %(name)s. Il server NFS "
-"%(server)s ?? irraggiungibile."
+"Impossibile disattivare il pool di memoria NFS %(name)s. Il server NFS %"
+"(server)s ?? irraggiungibile."
 
 #, python-format
 msgid ""
@@ -718,11 +669,11 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
-"Impossibile creare il volume di memoria %(name)s nel pool di memoria "
-"%(pool)s. Dettagli: %(err)s"
+"Impossibile creare il volume di memoria %(name)s nel pool di memoria %(pool)"
+"s. Dettagli: %(err)s"
 
 #, python-format
 msgid ""
@@ -791,8 +742,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -889,16 +840,16 @@ msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
-"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali "
-"%(vms)s e/o modelli collegati a tale rete."
+"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali %"
+"(vms)s e/o modelli collegati a tale rete."
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
-"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie "
-"%(vms)s e/o modelli collegati a tale rete."
+"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie %"
+"(vms)s e/o modelli collegati a tale rete."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1003,30 +954,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "Non ?? presente un gestore pacchetti compatibile per questo sistema."
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "Impossibile trovare %(item)s nell'archivio dati"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "URI %(uri)s non valido"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-"?? stato raggiunto il timeout durante l'esecuzione del comando '%(cmd)s' dopo "
-"%(seconds)s secondi"
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "Tipo di memoria non valido. I tipi supportati sono: 'cdrom'"
 
@@ -1039,8 +972,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -1090,8 +1023,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1217,8 +1150,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1237,20 +1170,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1323,6 +1256,9 @@ msgstr "Crea"
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr "Annulla"
+
 msgid "Edit Guest"
 msgstr "Modifica guest"
 
@@ -1410,12 +1346,57 @@ msgstr "Sostituisci"
 msgid "Detach"
 msgstr "Scollega"
 
-msgid "Cancel"
-msgstr "Annulla"
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "Avvia"
+
+msgid "Reset"
+msgstr "Reimposta"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr "Azioni"
+
+msgid "Connect"
+msgstr "Connetti"
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr "Modifica"
+
+msgid "Shut Down"
+msgstr "Arresta"
+
+msgid "Delete"
+msgstr "Elimina"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "I/O disco"
+
+msgid "Network I/O"
+msgstr "I/O di rete"
+
+msgid "Livetile"
+msgstr "Riquadro animato"
+
+msgid "No guests found."
+msgstr "Nessuna macchina guest trovata."
+
 msgid "Add a Storage Device to VM"
 msgstr "Aggiungi un dispositivo di memoria alla VM"
 
@@ -1446,38 +1427,41 @@ msgstr "Il percorso file ISO nel server per CDROM."
 msgid "Attach"
 msgstr "Allega"
 
-msgid "Start"
-msgstr "Avvia"
-
-msgid "Reset"
-msgstr "Reimposta"
+msgid "Shut down"
+msgstr "Arresta"
 
-msgid "Pause"
-msgstr ""
+msgid "Restart"
+msgstr "Riavvia"
 
-msgid "Resume"
-msgstr ""
+msgid "Basic Information"
+msgstr "Informazioni di base"
 
-msgid "Power Off"
-msgstr ""
+msgid "OS Distro"
+msgstr "Distro SO"
 
-msgid "Actions"
-msgstr "Azioni"
+msgid "OS Code Name"
+msgstr "Nome codice SO"
 
-msgid "Connect"
-msgstr "Connetti"
+msgid "Processor"
+msgstr "Processore"
 
-msgid "Clone"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Edit"
-msgstr "Modifica"
+msgid "System Statistics"
+msgstr "Statistiche di sistema"
 
-msgid "Shut Down"
-msgstr "Arresta"
+msgid "Software Updates"
+msgstr "Aggiornamenti del software"
 
-msgid "Delete"
-msgstr "Elimina"
+msgid "Update Progress"
+msgstr "Avanzamento aggiornamento"
+
+msgid "Repositories"
+msgstr "Repository"
+
+msgid "Debug Reports"
+msgstr "Report di debug"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
@@ -1607,9 +1591,6 @@ msgstr ""
 "Il repository verr?? rimosso permanentemente e non potr?? essere ripristinato. "
 "Si desidera continuare?"
 
-msgid "Repositories"
-msgstr "Repository"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1643,9 +1624,6 @@ msgstr "Abilita"
 msgid "Disable"
 msgstr "Disabilita"
 
-msgid "Software Updates"
-msgstr "Aggiornamenti del software"
-
 msgid "Package Name"
 msgstr "Nome pacchetto"
 
@@ -1677,9 +1655,6 @@ msgstr ""
 "Il report del debug verr?? rimosso permanentemente e non potr?? essere "
 "ripristinato. Si desidera continuare?"
 
-msgid "Debug Reports"
-msgstr "Report di debug"
-
 msgid "Generated Time"
 msgstr "Ora di creazione"
 
@@ -1908,35 +1883,48 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "Il campo per il nome del pool di memoria non pu?? essere vuoto."
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "Nome rete"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "Stato"
+
+msgid "Network Type"
+msgstr "Tipo di Rete"
 
-msgid "Help"
-msgstr "Guida"
+msgid "Address Space"
+msgstr "Spazio indirizzo"
 
-msgid "About"
-msgstr "Info su"
+msgid "Name should not contain '/' and '\"'."
+msgstr "Nome pool di memoria non valido. Non deve contenere '/'."
 
-msgid "Log out"
-msgstr "Disconnetti"
+msgid "Isolated: no external network connection"
+msgstr "Isolata: nessuna connessione di rete fisica"
 
-msgid "Version:"
-msgstr "Versione:"
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: solo connessione di rete fisica in uscita"
 
-msgid "Session timeout, please re-login."
+msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
+"Con bridge: le macchine virtuali sono connesse direttamente alla rete fisica"
 
-msgid "User Name"
-msgstr "Nome utente"
+msgid "(No interfaces found)"
+msgstr ""
 
-msgid "Password"
-msgstr "Password"
+msgid "Destination"
+msgstr "Destinazione:"
+
+msgid "Enable VLAN"
+msgstr "Abilita VLAN:"
+
+msgid "VLAN ID"
+msgstr "ID VLAN:"
+
+msgid "Stop"
+msgstr "Arresta"
 
 msgid "Generate a New Debug Report"
 msgstr "Crea un nuovo report di debug"
@@ -2015,21 +2003,45 @@ msgstr "S??"
 msgid "No"
 msgstr "No"
 
-msgid "Add a Volume to Storage Pool"
-msgstr ""
+msgid "Capacity"
+msgstr "Capacit??"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "Assegnato"
 
-msgid "Enter the remote URL here."
-msgstr ""
+msgid "Location"
+msgstr "Ubicazione"
 
-msgid "Upload a file"
+msgid "Device path"
+msgstr "Percorso dispositivo"
+
+msgid "active"
+msgstr "attivo"
+
+msgid "inactive"
+msgstr "non attivo"
+
+msgid "Deactivate"
+msgstr "Disattiva"
+
+msgid "Activate"
+msgstr "Attiva"
+
+msgid "Add Volume"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "Extend"
 msgstr ""
 
+msgid "Undefine"
+msgstr "Rimuovi definizione"
+
+msgid "Format"
+msgstr "Formato:"
+
+msgid "Allocation"
+msgstr "Allocazione:"
+
 msgid "Define a New Storage Pool"
 msgstr "Definisci un nuovo pool di memoria"
 
@@ -2074,23 +2086,20 @@ msgstr "Percorso NFS"
 msgid "The NFS exported path on NFS server."
 msgstr "Il percorso esportato NFS sul server NFS."
 
-msgid "Device path"
-msgstr "Percorso dispositivo"
-
 msgid "iSCSI Server"
 msgstr "Server iSCSI"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr ""
-"Il nome host o l'indirizzo IP del server iSCSI. Il campo non deve essere "
-"vuoto."
-
 msgid "Server"
 msgstr "Server"
 
 msgid "Port"
 msgstr "Porta"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr ""
+"Il nome host o l'indirizzo IP del server iSCSI. Il campo non deve essere "
+"vuoto."
+
 msgid "Target"
 msgstr "Destinazione"
 
@@ -2103,12 +2112,33 @@ msgstr "Aggiungi autenticazione iSCSI"
 msgid "iSCSI Authentication"
 msgstr "Autenticazione iSCSI"
 
+msgid "User Name"
+msgstr "Nome utente"
+
+msgid "Password"
+msgstr "Password"
+
 msgid "SCSI Adapter"
 msgstr "Adattatore SCSI"
 
 msgid "Please, wait..."
 msgstr "Attendere..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "Aggiungi modello"
 
@@ -2160,9 +2190,6 @@ msgstr "Utilizzare un URL personalizzato"
 msgid "Edit Template"
 msgstr "Modifica modello"
 
-msgid "Processor"
-msgstr "Processore"
-
 msgid "CDROM"
 msgstr "CDROM"
 
@@ -2190,123 +2217,58 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "I/O disco"
-
-msgid "Network I/O"
-msgstr "I/O di rete"
-
-msgid "Livetile"
-msgstr "Riquadro animato"
-
-msgid "No guests found."
-msgstr "Nessuna macchina guest trovata."
-
-msgid "Shut down"
-msgstr "Arresta"
-
-msgid "Restart"
-msgstr "Riavvia"
-
-msgid "Basic Information"
-msgstr "Informazioni di base"
-
-msgid "OS Distro"
-msgstr "Distro SO"
-
-msgid "OS Code Name"
-msgstr "Nome codice SO"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "Statistiche di sistema"
-
-msgid "Update Progress"
-msgstr "Avanzamento aggiornamento"
-
-msgid "Network Name"
-msgstr "Nome rete"
-
-msgid "State"
-msgstr "Stato"
-
-msgid "Network Type"
-msgstr "Tipo di Rete"
-
-msgid "Address Space"
-msgstr "Spazio indirizzo"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr "Nome pool di memoria non valido. Non deve contenere '/'."
-
-msgid "Isolated: no external network connection"
-msgstr "Isolata: nessuna connessione di rete fisica"
-
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: solo connessione di rete fisica in uscita"
-
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-"Con bridge: le macchine virtuali sono connesse direttamente alla rete fisica"
-
-msgid "(No interfaces found)"
-msgstr ""
-
-msgid "Destination"
-msgstr "Destinazione:"
-
-msgid "Enable VLAN"
-msgstr "Abilita VLAN:"
+msgid "No templates found."
+msgstr "Nessun modello trovato."
 
-msgid "VLAN ID"
-msgstr "ID VLAN:"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "Eliminazione non consentita per %(resource)s"
 
-msgid "Stop"
-msgstr "Arresta"
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s non implementa il metodo di aggiornamento"
 
-msgid "%Used"
-msgstr ""
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "Creazione non consentita per %(resource)s"
 
-msgid "Location"
-msgstr "Ubicazione"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "Impossibile analizzare la richiesta JSON"
 
-msgid "Capacity"
-msgstr "Capacit??"
+#~ msgid "This API only supports JSON"
+#~ msgstr "L'API supporta solo JSON"
 
-msgid "Allocated"
-msgstr "Assegnato"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "Archivio dati non inizializzato nell'oggetto modello."
 
-msgid "active"
-msgstr "attivo"
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "Impossibile avviare l'attivit?? a causa dell'errore: %(err)s"
 
-msgid "inactive"
-msgstr "non attivo"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr ""
+#~ "Autenticazione non riuscita per l'utente '%(username)s'. [Codice di "
+#~ "errore: %(code)s]"
 
-msgid "Deactivate"
-msgstr "Disattiva"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi"
 
-msgid "Activate"
-msgstr "Attiva"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "Specificare %(item)s per accedere a Kimchi"
 
-msgid "Add Volume"
-msgstr ""
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "Impossibile trovare %(item)s nell'archivio dati"
 
-msgid "Extend"
-msgstr ""
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr ""
+#~ "?? stato raggiunto il timeout durante l'esecuzione del comando '%(cmd)s' "
+#~ "dopo %(seconds)s secondi"
 
-msgid "Undefine"
-msgstr "Rimuovi definizione"
+#~ msgid "Help"
+#~ msgstr "Guida"
 
-msgid "Format"
-msgstr "Formato:"
+#~ msgid "About"
+#~ msgstr "Info su"
 
-msgid "Allocation"
-msgstr "Allocazione:"
+#~ msgid "Log out"
+#~ msgstr "Disconnetti"
 
-msgid "No templates found."
-msgstr "Nessun modello trovato."
+#~ msgid "Version:"
+#~ msgstr "Versione:"
diff --git a/plugins/kimchi/po/ja_JP.po b/plugins/kimchi/po/ja_JP.po
index 52770fb..a3d3be3 100644
--- a/plugins/kimchi/po/ja_JP.po
+++ b/plugins/kimchi/po/ja_JP.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -21,61 +21,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "%(resource)s ?????????????????????????????????"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s ????????????????????????????????????????????????"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "%(resource)s ?????????????????????????????????"
-
-msgid "Unable to parse JSON request"
-msgstr "JSON ??????????????????????????????"
-
-msgid "This API only supports JSON"
-msgstr "?????? API ??? JSON ???????????????????????????"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
-
-#, python-format
-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]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "Kimchi ????????????????????????????????????????????????"
-
-#, python-format
-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 ""
 
@@ -151,8 +103,8 @@ msgstr ""
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "????????????????????????????????? ISO %(filename)s ??????????????????????????????????????????/var/lib/"
@@ -560,8 +512,8 @@ msgstr "??????????????????????????? %(name)s ?????????????????????????????????:
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 "??????????????????????????? %(name)s ????????????????????????????????????????????????????????????????????????"
 "???:%(err)s"
@@ -638,8 +590,8 @@ msgstr "????????????????????????????????????????????????????????????????????????
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
 "%(disk)s ???????????????????????????/??????????????????????????????????????????????????? %(pool)s ??????"
 "??????????????????????????????"
@@ -664,16 +616,16 @@ msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"NFS ??????????????????????????? %(name)s ???????????????????????????????????????NFS ???????????? "
-"%(server)s ???????????????????????????"
+"NFS ??????????????????????????? %(name)s ???????????????????????????????????????NFS ???????????? %"
+"(server)s ???????????????????????????"
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"NFS ??????????????????????????? %(name)s ??????????????????????????????????????????NFS ???????????? "
-"%(server)s ???????????????????????????"
+"NFS ??????????????????????????? %(name)s ??????????????????????????????????????????NFS ???????????? %"
+"(server)s ???????????????????????????"
 
 #, python-format
 msgid ""
@@ -699,8 +651,8 @@ msgstr ""
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
 msgstr ""
-"?????????????????????????????????????????????????????????????????????????????????????????????????????????: "
-"%(err)s"
+"?????????????????????????????????????????????????????????????????????????????????????????????????????????: %"
+"(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
@@ -733,8 +685,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 "????????????????????????????????? %(name)s ?????????????????????????????? %(pool)s ?????????????????????"
 "????????????: %(err)s"
@@ -782,8 +734,8 @@ msgstr "????????????????????????????????????????????????????????????????????????
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
 msgstr ""
-"???????????????????????????????????????????????????????????????????????????????????????????????????????????????: "
-"%(err)s"
+"???????????????????????????????????????????????????????????????????????????????????????????????????????????????: %"
+"(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
@@ -805,8 +757,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -908,8 +860,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 
 #, python-format
@@ -1012,30 +964,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "%(item)s ????????????????????????????????????????????????"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "????????? URI %(uri)s"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-"???????????????%(cmd)s????????????????????????????????????%(seconds)s ????????????????????????????????????"
-"??????????????????"
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr ""
 "???????????????????????????????????????????????????????????????????????????????????????cdrom????????????"
@@ -1049,8 +983,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -1097,8 +1031,8 @@ msgstr "????????????????????????????????????????????????????????????????????????
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1226,8 +1160,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1246,20 +1180,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1332,6 +1266,9 @@ msgstr "??????"
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr "??????"
+
 msgid "Edit Guest"
 msgstr "??????????????????"
 
@@ -1419,12 +1356,57 @@ msgstr "??????"
 msgid "Detach"
 msgstr "????????????"
 
-msgid "Cancel"
-msgstr "??????"
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "??????"
+
+msgid "Reset"
+msgstr "????????????"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr "???????????????"
+
+msgid "Connect"
+msgstr "??????"
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Shut Down"
+msgstr "?????????????????????"
+
+msgid "Delete"
+msgstr "??????"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "?????????????????????"
+
+msgid "Network I/O"
+msgstr "???????????????????????????"
+
+msgid "Livetile"
+msgstr "??????????????????"
+
+msgid "No guests found."
+msgstr "????????????????????????????????????"
+
 msgid "Add a Storage Device to VM"
 msgstr "VM ??????????????????????????????????????????"
 
@@ -1455,38 +1437,41 @@ msgstr "????????????????????? CDROM ??? ISO ????????????????????????"
 msgid "Attach"
 msgstr "??????"
 
-msgid "Start"
-msgstr "??????"
-
-msgid "Reset"
-msgstr "????????????"
+msgid "Shut down"
+msgstr "?????????????????????"
 
-msgid "Pause"
-msgstr ""
+msgid "Restart"
+msgstr "?????????"
 
-msgid "Resume"
-msgstr ""
+msgid "Basic Information"
+msgstr "????????????"
 
-msgid "Power Off"
-msgstr ""
+msgid "OS Distro"
+msgstr "OS ?????????????????????????????????"
 
-msgid "Actions"
-msgstr "???????????????"
+msgid "OS Code Name"
+msgstr "OS ????????????"
 
-msgid "Connect"
-msgstr "??????"
+msgid "Processor"
+msgstr "??????????????????"
 
-msgid "Clone"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Edit"
-msgstr "??????"
+msgid "System Statistics"
+msgstr "????????????????????????"
 
-msgid "Shut Down"
-msgstr "?????????????????????"
+msgid "Software Updates"
+msgstr "????????????????????????"
 
-msgid "Delete"
-msgstr "??????"
+msgid "Update Progress"
+msgstr "?????????????????????"
+
+msgid "Repositories"
+msgstr "??????????????????"
+
+msgid "Debug Reports"
+msgstr "???????????????????????????"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
@@ -1611,9 +1596,6 @@ msgid ""
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-msgid "Repositories"
-msgstr "??????????????????"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1647,9 +1629,6 @@ msgstr "????????????"
 msgid "Disable"
 msgstr "????????????"
 
-msgid "Software Updates"
-msgstr "????????????????????????"
-
 msgid "Package Name"
 msgstr "??????????????????"
 
@@ -1680,9 +1659,6 @@ msgid ""
 msgstr ""
 "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-msgid "Debug Reports"
-msgstr "???????????????????????????"
-
 msgid "Generated Time"
 msgstr "????????????"
 
@@ -1906,35 +1882,47 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "?????????????????????????????????????????????????????????????????????????????????"
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "?????????????????????"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "??????"
 
-msgid "Help"
-msgstr "?????????"
+msgid "Network Type"
+msgstr "??????????????????????????????"
 
-msgid "About"
-msgstr "????????????"
+msgid "Address Space"
+msgstr "???????????????????????????"
 
-msgid "Log out"
-msgstr "???????????????"
+msgid "Name should not contain '/' and '\"'."
+msgstr ""
 
-msgid "Version:"
-msgstr "???????????????: "
+msgid "Isolated: no external network connection"
+msgstr "??????: ????????????????????????????????????"
 
-msgid "Session timeout, please re-login."
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: ?????????????????????????????????????????????????????????"
+
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr "????????????: ??????????????????????????????????????????????????????????????????"
+
+msgid "(No interfaces found)"
 msgstr ""
 
-msgid "User Name"
-msgstr "???????????????"
+msgid "Destination"
+msgstr "??????:"
 
-msgid "Password"
-msgstr "???????????????"
+msgid "Enable VLAN"
+msgstr "VLAN ????????????????????????:"
+
+msgid "VLAN ID"
+msgstr "VLAN ID:"
+
+msgid "Stop"
+msgstr "??????"
 
 msgid "Generate a New Debug Report"
 msgstr "??????????????????????????????????????????"
@@ -2013,21 +2001,45 @@ msgstr " ??????"
 msgid "No"
 msgstr " ?????????"
 
-msgid "Add a Volume to Storage Pool"
-msgstr ""
+msgid "Capacity"
+msgstr "??????"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "??????????????????"
 
-msgid "Enter the remote URL here."
-msgstr ""
+msgid "Location"
+msgstr "??????????????????"
 
-msgid "Upload a file"
+msgid "Device path"
+msgstr "?????????????????????"
+
+msgid "active"
+msgstr "???????????????"
+
+msgid "inactive"
+msgstr "??????????????????"
+
+msgid "Deactivate"
+msgstr "???????????????????????????"
+
+msgid "Activate"
+msgstr "????????????????????????"
+
+msgid "Add Volume"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "Extend"
 msgstr ""
 
+msgid "Undefine"
+msgstr "?????????????????????"
+
+msgid "Format"
+msgstr "??????????????????:"
+
+msgid "Allocation"
+msgstr "????????????:"
+
 msgid "Define a New Storage Pool"
 msgstr "??????????????????????????????????????????"
 
@@ -2072,21 +2084,18 @@ msgstr "NFS ??????"
 msgid "The NFS exported path on NFS server."
 msgstr "NFS ???????????? NFS ????????????????????????????????????????????????"
 
-msgid "Device path"
-msgstr "?????????????????????"
-
 msgid "iSCSI Server"
 msgstr "iSCSI ????????????"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "iSCSI ???????????? IP ???????????????????????????????????????????????????????????????"
-
 msgid "Server"
 msgstr "????????????"
 
 msgid "Port"
 msgstr "?????????"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "iSCSI ???????????? IP ???????????????????????????????????????????????????????????????"
+
 msgid "Target"
 msgstr "???????????????"
 
@@ -2099,12 +2108,33 @@ msgstr "iSCSI ???????????????"
 msgid "iSCSI Authentication"
 msgstr "iSCSI ??????"
 
+msgid "User Name"
+msgstr "???????????????"
+
+msgid "Password"
+msgstr "???????????????"
+
 msgid "SCSI Adapter"
 msgstr "SCSI ???????????????"
 
 msgid "Please, wait..."
 msgstr "?????????????????????..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "???????????????????????????"
 
@@ -2156,9 +2186,6 @@ msgstr "???????????? URL ???????????????"
 msgid "Edit Template"
 msgstr "???????????????????????????"
 
-msgid "Processor"
-msgstr "??????????????????"
-
 msgid "CDROM"
 msgstr "CDROM"
 
@@ -2186,122 +2213,57 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "?????????????????????"
-
-msgid "Network I/O"
-msgstr "???????????????????????????"
-
-msgid "Livetile"
-msgstr "??????????????????"
-
-msgid "No guests found."
-msgstr "????????????????????????????????????"
-
-msgid "Shut down"
-msgstr "?????????????????????"
-
-msgid "Restart"
-msgstr "?????????"
-
-msgid "Basic Information"
-msgstr "????????????"
-
-msgid "OS Distro"
-msgstr "OS ?????????????????????????????????"
-
-msgid "OS Code Name"
-msgstr "OS ????????????"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "????????????????????????"
-
-msgid "Update Progress"
-msgstr "?????????????????????"
-
-msgid "Network Name"
-msgstr "?????????????????????"
-
-msgid "State"
-msgstr "??????"
-
-msgid "Network Type"
-msgstr "??????????????????????????????"
-
-msgid "Address Space"
-msgstr "???????????????????????????"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr ""
-
-msgid "Isolated: no external network connection"
-msgstr "??????: ????????????????????????????????????"
-
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: ?????????????????????????????????????????????????????????"
-
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "????????????: ??????????????????????????????????????????????????????????????????"
-
-msgid "(No interfaces found)"
-msgstr ""
-
-msgid "Destination"
-msgstr "??????:"
-
-msgid "Enable VLAN"
-msgstr "VLAN ????????????????????????:"
+msgid "No templates found."
+msgstr "?????????????????????????????????????????????"
 
-msgid "VLAN ID"
-msgstr "VLAN ID:"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "%(resource)s ?????????????????????????????????"
 
-msgid "Stop"
-msgstr "??????"
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s ????????????????????????????????????????????????"
 
-msgid "%Used"
-msgstr ""
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "%(resource)s ?????????????????????????????????"
 
-msgid "Location"
-msgstr "??????????????????"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "JSON ??????????????????????????????"
 
-msgid "Capacity"
-msgstr "??????"
+#~ msgid "This API only supports JSON"
+#~ msgstr "?????? API ??? JSON ???????????????????????????"
 
-msgid "Allocated"
-msgstr "??????????????????"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
-msgid "active"
-msgstr "???????????????"
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "????????????????????????????????????????????????????????????: %(err)s"
 
-msgid "inactive"
-msgstr "??????????????????"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr ""
+#~ "???????????????%(username)s????????????????????????????????????[?????????????????????: %(code)s]"
 
-msgid "Deactivate"
-msgstr "???????????????????????????"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "Kimchi ????????????????????????????????????????????????"
 
-msgid "Activate"
-msgstr "????????????????????????"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "Kimchi ??????????????????????????????%(item)s ??????????????????"
 
-msgid "Add Volume"
-msgstr ""
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "%(item)s ????????????????????????????????????????????????"
 
-msgid "Extend"
-msgstr ""
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr ""
+#~ "???????????????%(cmd)s????????????????????????????????????%(seconds)s ??????????????????????????????"
+#~ "????????????????????????"
 
-msgid "Undefine"
-msgstr "?????????????????????"
+#~ msgid "Help"
+#~ msgstr "?????????"
 
-msgid "Format"
-msgstr "??????????????????:"
+#~ msgid "About"
+#~ msgstr "????????????"
 
-msgid "Allocation"
-msgstr "????????????:"
+#~ msgid "Log out"
+#~ msgstr "???????????????"
 
-msgid "No templates found."
-msgstr "?????????????????????????????????????????????"
+#~ msgid "Version:"
+#~ msgstr "???????????????: "
diff --git a/plugins/kimchi/po/kimchi.pot b/plugins/kimchi/po/kimchi.pot
index 81fac83..d4605c7 100755
--- a/plugins/kimchi/po/kimchi.pot
+++ b/plugins/kimchi/po/kimchi.pot
@@ -8,11 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,60 +21,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr ""
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr ""
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr ""
-
-msgid "Unable to parse JSON request"
-msgstr ""
-
-msgid "This API only supports JSON"
-msgstr ""
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr ""
-
-#, python-format
-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 ""
-
-msgid "You are not authorized to access Kimchi"
-msgstr ""
-
-#, python-format
-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 ""
 
@@ -142,8 +94,8 @@ msgstr ""
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 
@@ -519,8 +471,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -589,8 +541,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
 
 #, python-format
@@ -662,8 +614,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -726,8 +678,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -820,8 +772,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 
 #, python-format
@@ -915,28 +867,12 @@ msgid "There is no compatible package manager for this system."
 msgstr ""
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr ""
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr ""
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr ""
 
@@ -949,8 +885,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -994,8 +930,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1113,8 +1049,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1133,20 +1069,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1217,6 +1153,9 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr ""
+
 msgid "Edit Guest"
 msgstr ""
 
@@ -1304,10 +1243,55 @@ msgstr ""
 msgid "Detach"
 msgstr ""
 
-msgid "Cancel"
+msgid "revert"
 msgstr ""
 
-msgid "revert"
+msgid "Start"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Shut Down"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "Disk I/O"
+msgstr ""
+
+msgid "Network I/O"
+msgstr ""
+
+msgid "Livetile"
+msgstr ""
+
+msgid "No guests found."
 msgstr ""
 
 msgid "Add a Storage Device to VM"
@@ -1340,37 +1324,40 @@ msgstr ""
 msgid "Attach"
 msgstr ""
 
-msgid "Start"
+msgid "Shut down"
 msgstr ""
 
-msgid "Reset"
+msgid "Restart"
 msgstr ""
 
-msgid "Pause"
+msgid "Basic Information"
 msgstr ""
 
-msgid "Resume"
+msgid "OS Distro"
 msgstr ""
 
-msgid "Power Off"
+msgid "OS Code Name"
 msgstr ""
 
-msgid "Actions"
+msgid "Processor"
 msgstr ""
 
-msgid "Connect"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Clone"
+msgid "System Statistics"
 msgstr ""
 
-msgid "Edit"
+msgid "Software Updates"
 msgstr ""
 
-msgid "Shut Down"
+msgid "Update Progress"
 msgstr ""
 
-msgid "Delete"
+msgid "Repositories"
+msgstr ""
+
+msgid "Debug Reports"
 msgstr ""
 
 msgid "The username or password you entered is incorrect. Please try again."
@@ -1490,9 +1477,6 @@ msgid ""
 "to continue?"
 msgstr ""
 
-msgid "Repositories"
-msgstr ""
-
 msgid "ID"
 msgstr ""
 
@@ -1526,9 +1510,6 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-msgid "Software Updates"
-msgstr ""
-
 msgid "Package Name"
 msgstr ""
 
@@ -1558,9 +1539,6 @@ msgid ""
 "to continue?"
 msgstr ""
 
-msgid "Debug Reports"
-msgstr ""
-
 msgid "Generated Time"
 msgstr ""
 
@@ -1774,34 +1752,46 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr ""
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
+msgid "Network Name"
 msgstr ""
 
-msgid "No peers found."
+msgid "State"
 msgstr ""
 
-msgid "Help"
+msgid "Network Type"
 msgstr ""
 
-msgid "About"
+msgid "Address Space"
 msgstr ""
 
-msgid "Log out"
+msgid "Name should not contain '/' and '\"'."
 msgstr ""
 
-msgid "Version:"
+msgid "Isolated: no external network connection"
 msgstr ""
 
-msgid "Session timeout, please re-login."
+msgid "NAT: outbound physical network connection only"
 msgstr ""
 
-msgid "User Name"
+msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
 
-msgid "Password"
+msgid "(No interfaces found)"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Enable VLAN"
+msgstr ""
+
+msgid "VLAN ID"
+msgstr ""
+
+msgid "Stop"
 msgstr ""
 
 msgid "Generate a New Debug Report"
@@ -1875,19 +1865,43 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-msgid "Add a Volume to Storage Pool"
+msgid "Capacity"
 msgstr ""
 
-msgid "Fetch from remote URL"
+msgid "Allocated"
 msgstr ""
 
-msgid "Enter the remote URL here."
+msgid "Location"
 msgstr ""
 
-msgid "Upload a file"
+msgid "Device path"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "active"
+msgstr ""
+
+msgid "inactive"
+msgstr ""
+
+msgid "Deactivate"
+msgstr ""
+
+msgid "Activate"
+msgstr ""
+
+msgid "Add Volume"
+msgstr ""
+
+msgid "Extend"
+msgstr ""
+
+msgid "Undefine"
+msgstr ""
+
+msgid "Format"
+msgstr ""
+
+msgid "Allocation"
 msgstr ""
 
 msgid "Define a New Storage Pool"
@@ -1927,21 +1941,18 @@ msgstr ""
 msgid "The NFS exported path on NFS server."
 msgstr ""
 
-msgid "Device path"
-msgstr ""
-
 msgid "iSCSI Server"
 msgstr ""
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr ""
-
 msgid "Server"
 msgstr ""
 
 msgid "Port"
 msgstr ""
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr ""
+
 msgid "Target"
 msgstr ""
 
@@ -1954,12 +1965,33 @@ msgstr ""
 msgid "iSCSI Authentication"
 msgstr ""
 
+msgid "User Name"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
 msgid "SCSI Adapter"
 msgstr ""
 
 msgid "Please, wait..."
 msgstr ""
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr ""
 
@@ -2011,9 +2043,6 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-msgid "Processor"
-msgstr ""
-
 msgid "CDROM"
 msgstr ""
 
@@ -2041,122 +2070,5 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr ""
-
-msgid "Disk I/O"
-msgstr ""
-
-msgid "Network I/O"
-msgstr ""
-
-msgid "Livetile"
-msgstr ""
-
-msgid "No guests found."
-msgstr ""
-
-msgid "Shut down"
-msgstr ""
-
-msgid "Restart"
-msgstr ""
-
-msgid "Basic Information"
-msgstr ""
-
-msgid "OS Distro"
-msgstr ""
-
-msgid "OS Code Name"
-msgstr ""
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr ""
-
-msgid "Update Progress"
-msgstr ""
-
-msgid "Network Name"
-msgstr ""
-
-msgid "State"
-msgstr ""
-
-msgid "Network Type"
-msgstr ""
-
-msgid "Address Space"
-msgstr ""
-
-msgid "Name should not contain '/' and '\"'."
-msgstr ""
-
-msgid "Isolated: no external network connection"
-msgstr ""
-
-msgid "NAT: outbound physical network connection only"
-msgstr ""
-
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-
-msgid "(No interfaces found)"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Enable VLAN"
-msgstr ""
-
-msgid "VLAN ID"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "%Used"
-msgstr ""
-
-msgid "Location"
-msgstr ""
-
-msgid "Capacity"
-msgstr ""
-
-msgid "Allocated"
-msgstr ""
-
-msgid "active"
-msgstr ""
-
-msgid "inactive"
-msgstr ""
-
-msgid "Deactivate"
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Add Volume"
-msgstr ""
-
-msgid "Extend"
-msgstr ""
-
-msgid "Undefine"
-msgstr ""
-
-msgid "Format"
-msgstr ""
-
-msgid "Allocation"
-msgstr ""
-
 msgid "No templates found."
 msgstr ""
diff --git a/plugins/kimchi/po/ko_KR.po b/plugins/kimchi/po/ko_KR.po
index 5007684..08bf222 100644
--- a/plugins/kimchi/po/ko_KR.po
+++ b/plugins/kimchi/po/ko_KR.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -21,60 +21,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "%(resource)s??? ????????? ???????????? ??????"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s????????? ???????????? ???????????? ???????????? ??????"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "%(resource)s??? ????????? ???????????? ??????"
-
-msgid "Unable to parse JSON request"
-msgstr "JSON ????????? ?????? ????????? ??? ????????????."
-
-msgid "This API only supports JSON"
-msgstr "??? API??? JSON??? ???????????????."
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr "????????? ???????????? ?????? ?????????????????? ???????????? ???????????????."
-
-#, python-format
-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]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "Kimchi??? ???????????? ????????? ????????????."
-
-#, python-format
-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 ""
 
@@ -146,8 +99,8 @@ msgstr ""
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "????????????????????? ??? ISO %(filename)s???(???) ????????? ????????? ????????????. ?????? /var/"
@@ -535,8 +488,8 @@ msgstr "???????????? ??? %(name)s???(???) ????????? ??? ????????????. ?????????
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 "???????????? ??? %(name)s??? ?????? ???????????? ????????? ?????? ????????? ??? ????????????. ?????????"
 "???: %(err)s"
@@ -610,8 +563,8 @@ msgstr "???????????? ?????? ??????????????? ?????? ??? ????????? ???????????????
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
 "%(disk)s???(???) ????????? ?????????/???????????? ????????????. ?????? %(pool)s ?????? ????????? ??? "
 "????????????."
@@ -695,8 +648,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 "???????????? ?????? %(name)s???(???) ???????????? ??? %(pool)s??? ????????? ??? ????????????. ??????"
 "??????: %(err)s"
@@ -763,8 +716,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -862,8 +815,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 
 #, python-format
@@ -956,35 +909,19 @@ msgstr "????????? %(name)s???(???) ????????????????????? ???????????? ?????????
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
 msgstr ""
-"????????????????????? ????????? ???????????? ???????????? ?????? ????????? ??????????????????. ????????????: "
-"%(err)s"
+"????????????????????? ????????? ???????????? ???????????? ?????? ????????? ??????????????????. ????????????: %"
+"(err)s"
 
 msgid "There is no compatible package manager for this system."
 msgstr "??? ???????????? ?????? ?????? ????????? ????????? ???????????? ????????????."
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "????????? ??????????????? %(item)s???(???) ?????? ??? ????????????."
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "???????????? ?????? URI %(uri)s"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "%(seconds)s??? ?????? '%(cmd)s' ?????? ?????? ??? ??????????????? ?????????????????????."
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "???????????? ?????? ???????????? ???????????????. ???????????? ??????: 'cdrom'"
 
@@ -997,8 +934,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -1042,8 +979,8 @@ msgstr "??? ?????? ?????? ???????????? ????????? ?????? ??? ????????? ?????????
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1161,8 +1098,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1181,20 +1118,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1267,6 +1204,9 @@ msgstr "??????"
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr "??????"
+
 msgid "Edit Guest"
 msgstr "????????? ??????"
 
@@ -1354,12 +1294,57 @@ msgstr "??????"
 msgid "Detach"
 msgstr "??????"
 
-msgid "Cancel"
-msgstr "??????"
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "??????"
+
+msgid "Reset"
+msgstr "?????? ??????"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr "??????"
+
+msgid "Connect"
+msgstr "??????"
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Shut Down"
+msgstr "????????? ??????"
+
+msgid "Delete"
+msgstr "??????"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "????????? I/O"
+
+msgid "Network I/O"
+msgstr "???????????? I/O"
+
+msgid "Livetile"
+msgstr "???????????????"
+
+msgid "No guests found."
+msgstr "???????????? ????????????."
+
 msgid "Add a Storage Device to VM"
 msgstr "???????????? ????????? VM??? ??????"
 
@@ -1390,38 +1375,41 @@ msgstr "CDROM??? ?????? ????????? ISO ?????? ???????????????."
 msgid "Attach"
 msgstr "??????"
 
-msgid "Start"
-msgstr "??????"
-
-msgid "Reset"
-msgstr "?????? ??????"
+msgid "Shut down"
+msgstr "????????? ??????"
 
-msgid "Pause"
-msgstr ""
+msgid "Restart"
+msgstr "?????? ??????"
 
-msgid "Resume"
-msgstr ""
+msgid "Basic Information"
+msgstr "?????? ??????"
 
-msgid "Power Off"
-msgstr ""
+msgid "OS Distro"
+msgstr "OS Distro"
 
-msgid "Actions"
-msgstr "??????"
+msgid "OS Code Name"
+msgstr "OS ?????? ??????"
 
-msgid "Connect"
-msgstr "??????"
+msgid "Processor"
+msgstr "????????????"
 
-msgid "Clone"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Edit"
-msgstr "??????"
+msgid "System Statistics"
+msgstr "????????? ??????"
 
-msgid "Shut Down"
-msgstr "????????? ??????"
+msgid "Software Updates"
+msgstr "??????????????? ????????????"
 
-msgid "Delete"
-msgstr "??????"
+msgid "Update Progress"
+msgstr "???????????? ????????????"
+
+msgid "Repositories"
+msgstr "?????????"
+
+msgid "Debug Reports"
+msgstr "????????? ?????????"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
@@ -1545,9 +1533,6 @@ msgid ""
 "to continue?"
 msgstr "???????????? ??????????????? ???????????? ????????? ??? ????????????. ?????????????????????????"
 
-msgid "Repositories"
-msgstr "?????????"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1581,9 +1566,6 @@ msgstr "??????"
 msgid "Disable"
 msgstr "?????? ??????"
 
-msgid "Software Updates"
-msgstr "??????????????? ????????????"
-
 msgid "Package Name"
 msgstr "????????? ??????"
 
@@ -1614,9 +1596,6 @@ msgid ""
 msgstr ""
 "????????? ???????????? ??????????????? ???????????? ????????? ??? ????????????. ?????????????????????????"
 
-msgid "Debug Reports"
-msgstr "????????? ?????????"
-
 msgid "Generated Time"
 msgstr "?????? ??????"
 
@@ -1839,35 +1818,47 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "???????????? ??? ????????? ????????? ??? ????????????."
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "???????????? ??????"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "??????"
+
+msgid "Network Type"
+msgstr "???????????? ??????"
 
-msgid "Help"
-msgstr "?????????"
+msgid "Address Space"
+msgstr "?????? ??????"
 
-msgid "About"
-msgstr "??????"
+msgid "Name should not contain '/' and '\"'."
+msgstr "???????????? ?????? ???????????? ??? ???????????????. '/'??? ???????????? ????????? ?????????."
 
-msgid "Log out"
-msgstr "????????????"
+msgid "Isolated: no external network connection"
+msgstr "?????????: ????????? ???????????? ?????? ??????"
 
-msgid "Version:"
-msgstr "??????: "
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: ??????????????? ????????? ???????????? ?????????"
 
-msgid "Session timeout, please re-login."
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr "????????????: ?????? ????????? ????????? ??????????????? ?????? ?????????"
+
+msgid "(No interfaces found)"
 msgstr ""
 
-msgid "User Name"
-msgstr "????????? ??????"
+msgid "Destination"
+msgstr "??????:"
 
-msgid "Password"
-msgstr "????????????"
+msgid "Enable VLAN"
+msgstr "VLAN ??????:"
+
+msgid "VLAN ID"
+msgstr "VLAN ID:"
+
+msgid "Stop"
+msgstr "??????"
 
 msgid "Generate a New Debug Report"
 msgstr "??? ????????? ????????? ??????"
@@ -1944,21 +1935,45 @@ msgstr "???"
 msgid "No"
 msgstr "?????????"
 
-msgid "Add a Volume to Storage Pool"
-msgstr ""
+msgid "Capacity"
+msgstr "??????"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "?????????"
 
-msgid "Enter the remote URL here."
-msgstr ""
+msgid "Location"
+msgstr "??????"
 
-msgid "Upload a file"
+msgid "Device path"
+msgstr "?????? ??????"
+
+msgid "active"
+msgstr "??????"
+
+msgid "inactive"
+msgstr "?????????"
+
+msgid "Deactivate"
+msgstr "????????????"
+
+msgid "Activate"
+msgstr "?????????"
+
+msgid "Add Volume"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "Extend"
 msgstr ""
 
+msgid "Undefine"
+msgstr "?????? ??????"
+
+msgid "Format"
+msgstr "??????:"
+
+msgid "Allocation"
+msgstr "??????:"
+
 msgid "Define a New Storage Pool"
 msgstr "??? ???????????? ??? ??????"
 
@@ -1999,21 +2014,18 @@ msgstr "NFS ??????"
 msgid "The NFS exported path on NFS server."
 msgstr "NFS ???????????? NFS??? ????????? ???????????????."
 
-msgid "Device path"
-msgstr "?????? ??????"
-
 msgid "iSCSI Server"
 msgstr "iSCSI ??????"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "iSCSI ?????? IP ?????? ????????? ???????????????. ?????? ?????? ????????? ?????????."
-
 msgid "Server"
 msgstr "??????"
 
 msgid "Port"
 msgstr "??????"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "iSCSI ?????? IP ?????? ????????? ???????????????. ?????? ?????? ????????? ?????????."
+
 msgid "Target"
 msgstr "??????"
 
@@ -2026,12 +2038,33 @@ msgstr "iSCSI ?????? ??????"
 msgid "iSCSI Authentication"
 msgstr "iSCSI ??????"
 
+msgid "User Name"
+msgstr "????????? ??????"
+
+msgid "Password"
+msgstr "????????????"
+
 msgid "SCSI Adapter"
 msgstr "SCSI ?????????"
 
 msgid "Please, wait..."
 msgstr "?????? ????????? ????????????."
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "???????????? ??????"
 
@@ -2083,9 +2116,6 @@ msgstr "????????? ?????? URL??? ??????????????? ?????????."
 msgid "Edit Template"
 msgstr "???????????? ??????"
 
-msgid "Processor"
-msgstr "????????????"
-
 msgid "CDROM"
 msgstr "CDROM"
 
@@ -2113,122 +2143,55 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "????????? I/O"
-
-msgid "Network I/O"
-msgstr "???????????? I/O"
-
-msgid "Livetile"
-msgstr "???????????????"
-
-msgid "No guests found."
-msgstr "???????????? ????????????."
-
-msgid "Shut down"
-msgstr "????????? ??????"
-
-msgid "Restart"
-msgstr "?????? ??????"
-
-msgid "Basic Information"
-msgstr "?????? ??????"
-
-msgid "OS Distro"
-msgstr "OS Distro"
-
-msgid "OS Code Name"
-msgstr "OS ?????? ??????"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "????????? ??????"
-
-msgid "Update Progress"
-msgstr "???????????? ????????????"
-
-msgid "Network Name"
-msgstr "???????????? ??????"
-
-msgid "State"
-msgstr "??????"
-
-msgid "Network Type"
-msgstr "???????????? ??????"
-
-msgid "Address Space"
-msgstr "?????? ??????"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr "???????????? ?????? ???????????? ??? ???????????????. '/'??? ???????????? ????????? ?????????."
-
-msgid "Isolated: no external network connection"
-msgstr "?????????: ????????? ???????????? ?????? ??????"
-
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: ??????????????? ????????? ???????????? ?????????"
+msgid "No templates found."
+msgstr "??????????????? ????????????."
 
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "????????????: ?????? ????????? ????????? ??????????????? ?????? ?????????"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "%(resource)s??? ????????? ???????????? ??????"
 
-msgid "(No interfaces found)"
-msgstr ""
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s????????? ???????????? ???????????? ???????????? ??????"
 
-msgid "Destination"
-msgstr "??????:"
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "%(resource)s??? ????????? ???????????? ??????"
 
-msgid "Enable VLAN"
-msgstr "VLAN ??????:"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "JSON ????????? ?????? ????????? ??? ????????????."
 
-msgid "VLAN ID"
-msgstr "VLAN ID:"
+#~ msgid "This API only supports JSON"
+#~ msgstr "??? API??? JSON??? ???????????????."
 
-msgid "Stop"
-msgstr "??????"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "????????? ???????????? ?????? ?????????????????? ???????????? ???????????????."
 
-msgid "%Used"
-msgstr ""
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "?????? ????????? ????????? ????????? ??? ??????: %(err)s"
 
-msgid "Location"
-msgstr "??????"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr "????????? '%(username)s'??? ????????? ??????????????????. [?????? ??????: %(code)s]"
 
-msgid "Capacity"
-msgstr "??????"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "Kimchi??? ???????????? ????????? ????????????."
 
-msgid "Allocated"
-msgstr "?????????"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "Kimchi??? ?????????????????? %(item)s???(???) ??????????????????."
 
-msgid "active"
-msgstr "??????"
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "????????? ??????????????? %(item)s???(???) ?????? ??? ????????????."
 
-msgid "inactive"
-msgstr "?????????"
-
-msgid "Deactivate"
-msgstr "????????????"
-
-msgid "Activate"
-msgstr "?????????"
-
-msgid "Add Volume"
-msgstr ""
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr ""
+#~ "%(seconds)s??? ?????? '%(cmd)s' ?????? ?????? ??? ??????????????? ?????????????????????."
 
-msgid "Extend"
-msgstr ""
+#~ msgid "Help"
+#~ msgstr "?????????"
 
-msgid "Undefine"
-msgstr "?????? ??????"
+#~ msgid "About"
+#~ msgstr "??????"
 
-msgid "Format"
-msgstr "??????:"
+#~ msgid "Log out"
+#~ msgstr "????????????"
 
-msgid "Allocation"
-msgstr "??????:"
-
-msgid "No templates found."
-msgstr "??????????????? ????????????."
+#~ msgid "Version:"
+#~ msgstr "??????: "
diff --git a/plugins/kimchi/po/pt_BR.po b/plugins/kimchi/po/pt_BR.po
index 5f44740..c2cb4e9 100644
--- a/plugins/kimchi/po/pt_BR.po
+++ b/plugins/kimchi/po/pt_BR.po
@@ -20,16 +20,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2015-03-23 12:57+0000\n"
 "Last-Translator: Cr??stian Deives dos Santos Viana <cristiandeives at gmail."
 "com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "kimchi/language/pt_BR/)\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, python-format
@@ -37,63 +37,15 @@ msgid "Unknown parameter %(value)s"
 msgstr "Par??metro desconhecido: %(value)s"
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "M??todo de remo????o n??o ?? permitido em %(resource)s"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s n??o implementa m??todo de atualiza????o"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "M??todo de cria????o n??o ?? permitido em %(resource)s"
-
-msgid "Unable to parse JSON request"
-msgstr "N??o ?? poss??vel realizar a leitura da requisi????o do JSON"
-
-msgid "This API only supports JSON"
-msgstr "Essa API suporta apenas JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr "Par??metros n??o correspondem ?? especifica????o do esquema: %(err)s"
-
-msgid "You don't have permission to perform this operation."
-msgstr "Voc?? n??o tem permiss??o para executar esta opera????o."
-
-msgid "Datastore is not initiated in the model object."
-msgstr "Datastore n??o est?? inicializado no objeto modelo."
-
-#, python-format
-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 ""
-"Limite de tempo de %(seconds)s segundos expirado ao executar a tarefa "
-"'%(task)s'."
-
-#, 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]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "Voc?? n??o est?? autorizado para acessar o Kimchi"
-
-#, python-format
-msgid "Specify %(item)s to login into Kimchi"
-msgstr "Especifique %(item)s para autenticar no Kimchi"
+"Limite de tempo de %(seconds)s segundos expirado ao executar a tarefa '%"
+"(task)s'."
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
 msgstr "Usu??rio %(user_id)s n??o encontrado com as configura????es LDAP dadas."
 
-#, python-format
-msgid "Invalid LDAP configuration: %(item)s : %(value)s"
-msgstr "Configura????es LDAP inv??lidas: %(item)s : %(value)s"
-
 msgid "Unknown \"_cap\" specified"
 msgstr "\"_cap\" desconhecido especificado"
 
@@ -164,8 +116,8 @@ msgstr "Formato errado na leitura do descritor de volume na ISO %(filename)s"
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "O servidor n??o tem permiss??o para acessar a ISO %(filename)s. Considere mud??-"
@@ -383,8 +335,8 @@ msgstr ""
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
-"A VM %(vmid)s n??o cont??m o dispositivo de host atribu??do diretamente "
-"%(dev_name)s."
+"A VM %(vmid)s n??o cont??m o dispositivo de host atribu??do diretamente %"
+"(dev_name)s."
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
@@ -584,8 +536,8 @@ msgstr "N??o foi poss??vel criar o storage pool %(name)s. Detalhes: %(err)s"
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 "N??o foi poss??vel saber o n??mero de volumes no storage pool %(name)s. "
 "Detalhes: %(err)s"
@@ -664,8 +616,8 @@ msgstr "Especifique o nome e o tipo para criar um storage pool"
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
 "%(disk)s n??o ?? um disco/parti????o v??lido. N??o foi poss??vel adicion??-lo ao "
 "pool %(pool)s."
@@ -697,8 +649,8 @@ msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"N??o foi poss??vel desativar o storage pool NFS %(name)s. Servidor NFS "
-"%(server)s est?? inacess??vel."
+"N??o foi poss??vel desativar o storage pool NFS %(name)s. Servidor NFS %"
+"(server)s est?? inacess??vel."
 
 #, python-format
 msgid ""
@@ -740,8 +692,8 @@ msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
 msgstr ""
-"N??o foi poss??vel criar o storaget volume %(volume)s pois o storage pool "
-"%(pool)s n??o est?? ativo"
+"N??o foi poss??vel criar o storaget volume %(volume)s pois o storage pool %"
+"(pool)s n??o est?? ativo"
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
@@ -755,8 +707,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 "N??o foi poss??vel criar o volume %(name)s no storage pool %(pool)s. Detalhes: "
 "%(err)s"
@@ -765,8 +717,8 @@ msgstr ""
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"N??o foi poss??vel listar os volumes do storage pool %(pool)s. Detalhes: "
-"%(err)s"
+"N??o foi poss??vel listar os volumes do storage pool %(pool)s. Detalhes: %(err)"
+"s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
@@ -828,8 +780,8 @@ 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"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 "N??o foi poss??vel clonar o volume de storage '%(name)s' no pool '%(pool)s'. "
 "Detalhes: %(err)s"
@@ -924,16 +876,16 @@ msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
-"N??o foi poss??vel desativar a rede %(name)s. H?? alguma m??quina virtual "
-"%(vms)s e/ou modelo associados a esta rede."
+"N??o foi poss??vel desativar a rede %(name)s. H?? alguma m??quina virtual %(vms)"
+"s e/ou modelo associados a esta rede."
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
-"N??o foi poss??vel desativar a rede %(name)s. H?? alguma m??quina virtual "
-"%(vms)s e/ou modelo associados a esta rede."
+"N??o foi poss??vel desativar a rede %(name)s. H?? alguma m??quina virtual %(vms)"
+"s e/ou modelo associados a esta rede."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1038,29 +990,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "N??o h?? gerenciador de pacotes compat??vel para este sistema."
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "N??o foi poss??vel encontrar %(item)s no datastore"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "URI %(uri)s inv??lida"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr ""
-"Fim do limite de tempo ao rodar comando '%(cmd)s' ap??s %(seconds)s segundos"
-
 msgid "Unable to choose a virtual machine name"
 msgstr "N??o foi poss??vel escolher um nome para a m??quina virtual"
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr "Valor inv??lido '%(value)s'"
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr "Unidade inv??lida '%(unit)s'"
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "Tipo de storage inv??lido. Tipos suportados: 'cdrom', 'disco'"
 
@@ -1075,8 +1010,8 @@ msgstr "Apenas o caminho do CD-ROM pode ser atualizado."
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr "O disco %(dev_name)s n??o existe na m??quina virtual %(vm_name)s"
 
 #, python-format
@@ -1128,11 +1063,11 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
-"Volume escolhido com formato %(format)s n??o se enquadra no tipo de storage "
-"%(type)s"
+"Volume escolhido com formato %(format)s n??o se enquadra no tipo de storage %"
+"(type)s"
 
 msgid "YUM Repository ID must be one word only string."
 msgstr "ID do reposit??rio YUM deve ser apenas uma palavra."
@@ -1202,8 +1137,8 @@ msgstr "N??o foi poss??vel remover o reposit??rio %(repo_id)s."
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
 msgstr ""
-"N??o foi poss??vel gravar o arquivo de configura????o do reposit??rio "
-"%(repo_file)s"
+"N??o foi poss??vel gravar o arquivo de configura????o do reposit??rio %(repo_file)"
+"s"
 
 msgid "Specify repository distribution in order to create a DEB repository."
 msgstr ""
@@ -1261,8 +1196,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 "N??o foi poss??vel criar o snapshot '%(name)s' na m??quina virtual '%(vm)s'. "
 "Detalhes: %(err)s"
@@ -1276,38 +1211,38 @@ msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
-"N??o foi poss??vel recuperar o snapshot '%(name)s' da m??quina virtual "
-"'%(vm)s'. Detalhes: %(err)s"
+"N??o foi poss??vel recuperar o snapshot '%(name)s' da m??quina virtual '%(vm)"
+"s'. Detalhes: %(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
-"N??o foi poss??vel listar os snapshots da m??quina virtual '%(vm)s'. Detalhes: "
-"%(err)s"
+"N??o foi poss??vel listar os snapshots da m??quina virtual '%(vm)s'. Detalhes: %"
+"(err)s"
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 "N??o foi poss??vel remover o snapshot '%(name)s' da m??quina virtual '%(vm)s'. "
 "Detalhes: %(err)s"
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 "N??o foi poss??vel recuperar o snapshot atual da m??quina virtual '%(vm)s'. "
 "Detalhes: %(err)s."
 
 #, python-format
 msgid ""
-"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
-"%(err)s"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
-"N??o foi poss??vel reverter a m??quina virtual '%(vm)s' para o snapshot "
-"'%(name)s'. Detalhes: %(err)s"
+"N??o foi poss??vel reverter a m??quina virtual '%(vm)s' para o snapshot '%(name)"
+"s'. Detalhes: %(err)s"
 
 #, python-format
 msgid ""
@@ -1381,6 +1316,9 @@ msgstr "Criar"
 msgid "Creating..."
 msgstr "Criando..."
 
+msgid "Cancel"
+msgstr "Cancelar"
+
 msgid "Edit Guest"
 msgstr "Editar Guest"
 
@@ -1468,12 +1406,57 @@ msgstr "Substituir"
 msgid "Detach"
 msgstr "Remover"
 
-msgid "Cancel"
-msgstr "Cancelar"
-
 msgid "revert"
 msgstr "Reverter"
 
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Reset"
+msgstr "Reiniciar"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr "For??ar desligamento"
+
+msgid "Actions"
+msgstr "A????es"
+
+msgid "Connect"
+msgstr "Conectar"
+
+msgid "Clone"
+msgstr "Clonar"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Shut Down"
+msgstr "Desligar"
+
+msgid "Delete"
+msgstr "Remover"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "Disco E/S"
+
+msgid "Network I/O"
+msgstr "Rede E/S"
+
+msgid "Livetile"
+msgstr "Tela ao vivo"
+
+msgid "No guests found."
+msgstr "Nenhum guest encontrado."
+
 msgid "Add a Storage Device to VM"
 msgstr "Adicionar um dispositivo de storage ?? VM"
 
@@ -1505,38 +1488,41 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor."
 msgid "Attach"
 msgstr "Adicionar"
 
-msgid "Start"
-msgstr "Iniciar"
+msgid "Shut down"
+msgstr "Desligar"
 
-msgid "Reset"
+msgid "Restart"
 msgstr "Reiniciar"
 
-msgid "Pause"
-msgstr ""
+msgid "Basic Information"
+msgstr "Informa????es b??sicas"
 
-msgid "Resume"
-msgstr ""
+msgid "OS Distro"
+msgstr "Distribui????o"
 
-msgid "Power Off"
-msgstr "For??ar desligamento"
+msgid "OS Code Name"
+msgstr "Nome-c??digo do sistema operacional"
 
-msgid "Actions"
-msgstr "A????es"
+msgid "Processor"
+msgstr "Processador"
 
-msgid "Connect"
-msgstr "Conectar"
+msgid "CPU(s)"
+msgstr "CPU(s)"
 
-msgid "Clone"
-msgstr "Clonar"
+msgid "System Statistics"
+msgstr "Estat??sticas do sistema"
 
-msgid "Edit"
-msgstr "Editar"
+msgid "Software Updates"
+msgstr "Atualiza????es de software"
 
-msgid "Shut Down"
-msgstr "Desligar"
+msgid "Update Progress"
+msgstr "Progresso da atualiza????o"
 
-msgid "Delete"
-msgstr "Remover"
+msgid "Repositories"
+msgstr "Reposit??rios"
+
+msgid "Debug Reports"
+msgstr "Relat??rios de Debug"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
@@ -1665,9 +1651,6 @@ msgstr ""
 "Reposit??rio ser?? removido permanentemente e n??o poder?? ser recuperado. "
 "Deseja continuar?"
 
-msgid "Repositories"
-msgstr "Reposit??rios"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1701,9 +1684,6 @@ msgstr "Ativar"
 msgid "Disable"
 msgstr "Desativar"
 
-msgid "Software Updates"
-msgstr "Atualiza????es de software"
-
 msgid "Package Name"
 msgstr "Nome do pacote"
 
@@ -1735,9 +1715,6 @@ msgstr ""
 "Relat??rio de debug ser?? permanentemente removido e n??o poder?? ser "
 "recuperado. Deseja continuar?"
 
-msgid "Debug Reports"
-msgstr "Relat??rios de Debug"
-
 msgid "Generated Time"
 msgstr "Tempo gerado"
 
@@ -1979,35 +1956,49 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "Pool ou volume do disco n??o pode ser vazio."
 
-msgid "Peers"
-msgstr "Peers"
+#, fuzzy
+msgid "Filter"
+msgstr "filtro"
 
-msgid "Searching"
-msgstr "Procurando"
+msgid "Network Name"
+msgstr "Nome da rede"
 
-msgid "No peers found."
-msgstr "Nenhum peer encontrado."
+msgid "State"
+msgstr "Estado"
 
-msgid "Help"
-msgstr "Ajuda"
+msgid "Network Type"
+msgstr "Tipo da rede"
 
-msgid "About"
-msgstr "Sobre"
+msgid "Address Space"
+msgstr "Espa??o de endere??o"
 
-msgid "Log out"
-msgstr "Sair"
+msgid "Name should not contain '/' and '\"'."
+msgstr "O nome n??o deve conter '/' and '\"'."
 
-msgid "Version:"
-msgstr "Vers??o:"
+msgid "Isolated: no external network connection"
+msgstr "Isolada: nenhuma conex??o externa"
 
-msgid "Session timeout, please re-login."
-msgstr "Fim do limite do tempo da sess??o, por favor se autentique novamente."
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: somente conex??o de rede f??sica de sa??da"
 
-msgid "User Name"
-msgstr "Usu??rio"
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr ""
+"Bridged: M??quinas virtuais est??o conectadas diretamente com a rede f??sica"
 
-msgid "Password"
-msgstr "Senha"
+msgid "(No interfaces found)"
+msgstr "(Nenhuma interface encontrada)"
+
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Enable VLAN"
+msgstr "Habilitar VLAN"
+
+msgid "VLAN ID"
+msgstr "ID da VLAN"
+
+msgid "Stop"
+msgstr "Parar"
 
 msgid "Generate a New Debug Report"
 msgstr "Gerar um novo Relat??rio de Debug"
@@ -2085,20 +2076,44 @@ msgstr "Sim"
 msgid "No"
 msgstr "N??o"
 
-msgid "Add a Volume to Storage Pool"
-msgstr "Adicionar um volume ao Storage Pool"
+msgid "Capacity"
+msgstr "Capacidade"
 
-msgid "Fetch from remote URL"
-msgstr "Fazer download de uma URL remota"
+msgid "Allocated"
+msgstr "Alocado"
 
-msgid "Enter the remote URL here."
-msgstr "Digite a URL remota aqui."
+msgid "Location"
+msgstr "Localiza????o"
 
-msgid "Upload a file"
-msgstr "Fazer upload de um arquivo"
+msgid "Device path"
+msgstr "Caminho do dispositivo"
 
-msgid "Choose the file you want to upload."
-msgstr "Escolha o arquivo que voc?? quer fazer upload."
+msgid "active"
+msgstr "ativo"
+
+msgid "inactive"
+msgstr "inativo"
+
+msgid "Deactivate"
+msgstr "Desativar"
+
+msgid "Activate"
+msgstr "Ativar"
+
+msgid "Add Volume"
+msgstr "Adicionar volume"
+
+msgid "Extend"
+msgstr "Aumentar"
+
+msgid "Undefine"
+msgstr "Indefinir"
+
+msgid "Format"
+msgstr "Formato"
+
+msgid "Allocation"
+msgstr "Aloca????o"
 
 msgid "Define a New Storage Pool"
 msgstr "Definir novo Storage Pool"
@@ -2140,21 +2155,18 @@ msgstr "Caminho do NFS"
 msgid "The NFS exported path on NFS server."
 msgstr "O caminho exportado do servidor NFS."
 
-msgid "Device path"
-msgstr "Caminho do dispositivo"
-
 msgid "iSCSI Server"
 msgstr "Servidor iSCSI"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP ou hostname do servidor iSCSI. N??o deve ser vazio."
-
 msgid "Server"
 msgstr "Servidor"
 
 msgid "Port"
 msgstr "Porta"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "IP ou hostname do servidor iSCSI. N??o deve ser vazio."
+
 msgid "Target"
 msgstr "Alvo"
 
@@ -2167,12 +2179,33 @@ msgstr "Adicionar as credenciais do iSCSI"
 msgid "iSCSI Authentication"
 msgstr "Credenciais do iSCSI"
 
+msgid "User Name"
+msgstr "Usu??rio"
+
+msgid "Password"
+msgstr "Senha"
+
 msgid "SCSI Adapter"
 msgstr "Adaptador SCSI"
 
 msgid "Please, wait..."
 msgstr "Por favor, aguarde..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr "Adicionar um volume ao Storage Pool"
+
+msgid "Fetch from remote URL"
+msgstr "Fazer download de uma URL remota"
+
+msgid "Enter the remote URL here."
+msgstr "Digite a URL remota aqui."
+
+msgid "Upload a file"
+msgstr "Fazer upload de um arquivo"
+
+msgid "Choose the file you want to upload."
+msgstr "Escolha o arquivo que voc?? quer fazer upload."
+
 msgid "Add Template"
 msgstr "Adicionar Modelo"
 
@@ -2224,9 +2257,6 @@ msgstr "Eu quero usar uma URL personalizada"
 msgid "Edit Template"
 msgstr "Editar Modelo"
 
-msgid "Processor"
-msgstr "Processador"
-
 msgid "CDROM"
 msgstr "CD-ROM"
 
@@ -2254,123 +2284,86 @@ msgstr "Cores"
 msgid "Threads"
 msgstr "Threads"
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "Disco E/S"
-
-msgid "Network I/O"
-msgstr "Rede E/S"
+msgid "No templates found."
+msgstr "Nenhum modelo encontrado."
 
-msgid "Livetile"
-msgstr "Tela ao vivo"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "M??todo de remo????o n??o ?? permitido em %(resource)s"
 
-msgid "No guests found."
-msgstr "Nenhum guest encontrado."
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s n??o implementa m??todo de atualiza????o"
 
-msgid "Shut down"
-msgstr "Desligar"
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "M??todo de cria????o n??o ?? permitido em %(resource)s"
 
-msgid "Restart"
-msgstr "Reiniciar"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "N??o ?? poss??vel realizar a leitura da requisi????o do JSON"
 
-msgid "Basic Information"
-msgstr "Informa????es b??sicas"
+#~ msgid "This API only supports JSON"
+#~ msgstr "Essa API suporta apenas JSON"
 
-msgid "OS Distro"
-msgstr "Distribui????o"
+#~ msgid "Parameters does not match requirement in schema: %(err)s"
+#~ msgstr "Par??metros n??o correspondem ?? especifica????o do esquema: %(err)s"
 
-msgid "OS Code Name"
-msgstr "Nome-c??digo do sistema operacional"
+#~ msgid "You don't have permission to perform this operation."
+#~ msgstr "Voc?? n??o tem permiss??o para executar esta opera????o."
 
-msgid "CPU(s)"
-msgstr "CPU(s)"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "Datastore n??o est?? inicializado no objeto modelo."
 
-msgid "System Statistics"
-msgstr "Estat??sticas do sistema"
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "N??o foi poss??vel iniciar a tarefa devido a um erro: %(err)s"
 
-msgid "Update Progress"
-msgstr "Progresso da atualiza????o"
+#~ 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]"
 
-msgid "Network Name"
-msgstr "Nome da rede"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "Voc?? n??o est?? autorizado para acessar o Kimchi"
 
-msgid "State"
-msgstr "Estado"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "Especifique %(item)s para autenticar no Kimchi"
 
-msgid "Network Type"
-msgstr "Tipo da rede"
+#~ msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+#~ msgstr "Configura????es LDAP inv??lidas: %(item)s : %(value)s"
 
-msgid "Address Space"
-msgstr "Espa??o de endere??o"
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "N??o foi poss??vel encontrar %(item)s no datastore"
 
-msgid "Name should not contain '/' and '\"'."
-msgstr "O nome n??o deve conter '/' and '\"'."
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr ""
+#~ "Fim do limite de tempo ao rodar comando '%(cmd)s' ap??s %(seconds)s "
+#~ "segundos"
 
-msgid "Isolated: no external network connection"
-msgstr "Isolada: nenhuma conex??o externa"
+#~ msgid "Invalid data value '%(value)s'"
+#~ msgstr "Valor inv??lido '%(value)s'"
 
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: somente conex??o de rede f??sica de sa??da"
+#~ msgid "Invalid data unit '%(unit)s'"
+#~ msgstr "Unidade inv??lida '%(unit)s'"
 
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-"Bridged: M??quinas virtuais est??o conectadas diretamente com a rede f??sica"
+#~ msgid "Peers"
+#~ msgstr "Peers"
 
-msgid "(No interfaces found)"
-msgstr "(Nenhuma interface encontrada)"
+#~ msgid "Searching"
+#~ msgstr "Procurando"
 
-msgid "Destination"
-msgstr "Destino"
+#~ msgid "No peers found."
+#~ msgstr "Nenhum peer encontrado."
 
-msgid "Enable VLAN"
-msgstr "Habilitar VLAN"
-
-msgid "VLAN ID"
-msgstr "ID da VLAN"
-
-msgid "Stop"
-msgstr "Parar"
-
-msgid "%Used"
-msgstr ""
-
-msgid "Location"
-msgstr "Localiza????o"
-
-msgid "Capacity"
-msgstr "Capacidade"
-
-msgid "Allocated"
-msgstr "Alocado"
-
-msgid "active"
-msgstr "ativo"
-
-msgid "inactive"
-msgstr "inativo"
-
-msgid "Deactivate"
-msgstr "Desativar"
-
-msgid "Activate"
-msgstr "Ativar"
-
-msgid "Add Volume"
-msgstr "Adicionar volume"
+#~ msgid "Help"
+#~ msgstr "Ajuda"
 
-msgid "Extend"
-msgstr "Aumentar"
+#~ msgid "About"
+#~ msgstr "Sobre"
 
-msgid "Undefine"
-msgstr "Indefinir"
+#~ msgid "Log out"
+#~ msgstr "Sair"
 
-msgid "Format"
-msgstr "Formato"
+#~ msgid "Version:"
+#~ msgstr "Vers??o:"
 
-msgid "Allocation"
-msgstr "Aloca????o"
-
-msgid "No templates found."
-msgstr "Nenhum modelo encontrado."
+#~ msgid "Session timeout, please re-login."
+#~ msgstr ""
+#~ "Fim do limite do tempo da sess??o, por favor se autentique novamente."
diff --git a/plugins/kimchi/po/ru_RU.po b/plugins/kimchi/po/ru_RU.po
index 5c17518..a5dec2e 100644
--- a/plugins/kimchi/po/ru_RU.po
+++ b/plugins/kimchi/po/ru_RU.po
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2014-08-28 17:32+0000\n"
 "Last-Translator: Aline Manera <aline.manera at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/"
 "ru/)\n"
-"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -22,60 +22,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "???????????????? ?????????????????? ?????? %(resource)s"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s ???? ?????????????????? ?????????? ????????????????????"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "???????????????? ?????????????????? ?????? %(resource)s"
-
-msgid "Unable to parse JSON request"
-msgstr "???????????? ?????????????? ?????????????? JSON"
-
-msgid "This API only supports JSON"
-msgstr "?????? ?????????????? API ???????????????????????? ???????????? JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr "?????????????????? ???????????? ?? ?????????????? ???????????? ???? ????????????????????????????????."
-
-#, python-format
-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]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "?????? ???????? ?????????????? ?? Kimchi"
-
-#, python-format
-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 ""
 
@@ -144,16 +97,15 @@ msgstr "???????????????? ???????????? ?????????????????????? ???????? ?? ??????
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"?? ?????????????????????? ?????? ???????? ?????????????? ?????? ?????????????????????????? ?????????? ???????????? ISO "
-"%(filename)s. ?????????????????????? ?????? ?? ?????????????? /var/lib/libvirt, ???????????????? "
-"???????????????????? ???? ?????????? ?? ???????????? ???????????????? ?????????????? ?????? ???????????????????????? %(user)s, "
-"???????? ?????? ????????????????, ???????????????? %(user)s ?? ???????????? ???????? ?? ???????????? ISO ?????? (???? "
-"??????????????????????????) ?????????????????? ?????????????? 'chmod -R o+x 'path_to_iso'. ????????????????: "
-"%(err)s"
+"?? ?????????????????????? ?????? ???????? ?????????????? ?????? ?????????????????????????? ?????????? ???????????? ISO %(filename)"
+"s. ?????????????????????? ?????? ?? ?????????????? /var/lib/libvirt, ???????????????? ???????????????????? ???? ?????????? "
+"?? ???????????? ???????????????? ?????????????? ?????? ???????????????????????? %(user)s, ???????? ?????? ????????????????, "
+"???????????????? %(user)s ?? ???????????? ???????? ?? ???????????? ISO ?????? (???? ??????????????????????????) "
+"?????????????????? ?????????????? 'chmod -R o+x 'path_to_iso'. ????????????????: %(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
@@ -188,8 +140,8 @@ msgstr ""
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
 msgstr ""
-"???? ?????????????? ???????????????? ???????????? ???????????? ?????? ?????????????????????????? ?????????????????????? ???????????? "
-"%(name)s"
+"???? ?????????????? ???????????????? ???????????? ???????????? ?????? ?????????????????????????? ?????????????????????? ???????????? %"
+"(name)s"
 
 msgid "Remote ISO image is not supported by this server."
 msgstr "?????????????????? ?????????? ISO ???? ???????????????????????????? ???????? ????????????????."
@@ -533,8 +485,8 @@ msgstr "???? ?????????????? ?????????????? ?????? ???????????? %(name)s. ??????
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr ""
 "???? ?????????????? ???????????????? ?????????? ?????????? ?? ???????? ???????????? %(name)s. ????????????????: %(err)s"
 
@@ -560,8 +512,8 @@ msgstr ""
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"???? ?????????????? ?????????????? ?????? NFS: ???? ?????????????? ???????????????????????? ???????????????????????????????? ???????? "
-"%(path)s"
+"???? ?????????????? ?????????????? ?????? NFS: ???? ?????????????? ???????????????????????? ???????????????????????????????? ???????? %"
+"(path)s"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
@@ -608,8 +560,8 @@ msgstr "?????????????? ?????? ?? ?????? ?????? ???????????????? ???????? ??????
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr ""
 "%(disk)s ???? ???????????????? ???????????????????? ????????????/????????????????. ???? ?????????????? ???????????????? ?????? ?? "
 "?????? %(pool)s."
@@ -692,8 +644,8 @@ msgstr "???? ?????????????? ?????????????? ???????????? ??????????: ?????? ????
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr ""
 "???? ?????????????? ?????????????? ?????? %(name)s ?? ???????? ???????????? %(pool)s. ????????????????: %(err)s"
 
@@ -759,8 +711,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -857,8 +809,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 
 #, python-format
@@ -958,28 +910,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "?????? ???????????????????????? ???????????????????????????? ?????????????? ?????? ???????? ??????????????."
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "???? ???????????? %(item)s ?? ?????????????????? ????????????"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "???????????????????????? URI %(uri)s"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "?????????? ????????-?????? ???????????????????? ?????????????? %(cmd)s (%(seconds)s ??)"
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "???????????????????????? ?????? ????????????. ???????????????????????????? ????????: cdrom"
 
@@ -992,8 +928,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -1037,8 +973,8 @@ msgstr "?????????????? ?????? ?? ???????? ?????? ???????????????????? ??????????
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1161,8 +1097,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1181,20 +1117,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1267,6 +1203,9 @@ msgstr "??????????????"
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr "????????????"
+
 msgid "Edit Guest"
 msgstr "???????????????? ???????????????? ??????????????"
 
@@ -1354,12 +1293,57 @@ msgstr "????????????????"
 msgid "Detach"
 msgstr "??????????????????"
 
-msgid "Cancel"
-msgstr "????????????"
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "??????????????????"
+
+msgid "Reset"
+msgstr "????????????????"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr "??????????????????"
+
+msgid "Actions"
+msgstr "????????????????"
+
+msgid "Connect"
+msgstr "????????????????????"
+
+msgid "Clone"
+msgstr "??????????????????????"
+
+msgid "Edit"
+msgstr "??????????????????????????"
+
+msgid "Shut Down"
+msgstr "?????????????????? ????????????"
+
+msgid "Delete"
+msgstr "??????????????"
+
+msgid "CPU"
+msgstr "??????????????????"
+
+msgid "Disk I/O"
+msgstr "???????????????? ????????-??????????"
+
+msgid "Network I/O"
+msgstr "?????????????? ????????-??????????"
+
+msgid "Livetile"
+msgstr "Livetile"
+
+msgid "No guests found."
+msgstr "???? ?????????????? ???????????????? ??????????????."
+
 msgid "Add a Storage Device to VM"
 msgstr "???????????????? ???????????????????? ???????????????? ?? VM"
 
@@ -1390,38 +1374,41 @@ msgstr "???????? ?? ?????????? ISO ?????? CDROM ???? ??????????????."
 msgid "Attach"
 msgstr "????????????????????"
 
-msgid "Start"
-msgstr "??????????????????"
+msgid "Shut down"
+msgstr "????????????????"
 
-msgid "Reset"
-msgstr "????????????????"
+msgid "Restart"
+msgstr "????????????????????"
 
-msgid "Pause"
-msgstr ""
+msgid "Basic Information"
+msgstr "?????????????? ????????????????????"
 
-msgid "Resume"
-msgstr ""
+msgid "OS Distro"
+msgstr "?????????????? ????"
 
-msgid "Power Off"
-msgstr "??????????????????"
+msgid "OS Code Name"
+msgstr "?????????????? ?????? ????"
 
-msgid "Actions"
-msgstr "????????????????"
+msgid "Processor"
+msgstr "??????????????????"
 
-msgid "Connect"
-msgstr "????????????????????"
+msgid "CPU(s)"
+msgstr ""
 
-msgid "Clone"
-msgstr "??????????????????????"
+msgid "System Statistics"
+msgstr "?????????????????? ????????????????????"
 
-msgid "Edit"
-msgstr "??????????????????????????"
+msgid "Software Updates"
+msgstr "???????????????????? ???????????????????????? ??????????????????????"
 
-msgid "Shut Down"
-msgstr "?????????????????? ????????????"
+msgid "Update Progress"
+msgstr "?????? ????????????????????"
 
-msgid "Delete"
-msgstr "??????????????"
+msgid "Repositories"
+msgstr "??????????????????"
+
+msgid "Debug Reports"
+msgstr "???????????????????? ????????????"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr "?????????????? ???????????????? ?????? ???????????????????????? ?????? ????????????. ?????????????? ?????? ??????."
@@ -1546,9 +1533,6 @@ msgid ""
 "to continue?"
 msgstr "?????????????????? ?????????? ?????????????? ?????? ?????????????????????? ????????????????????????????. ?????????????????????"
 
-msgid "Repositories"
-msgstr "??????????????????"
-
 msgid "ID"
 msgstr "????"
 
@@ -1582,9 +1566,6 @@ msgstr "????????????????"
 msgid "Disable"
 msgstr "??????????????????"
 
-msgid "Software Updates"
-msgstr "???????????????????? ???????????????????????? ??????????????????????"
-
 msgid "Package Name"
 msgstr "?????? ????????????"
 
@@ -1615,9 +1596,6 @@ msgid ""
 msgstr ""
 "???????????????????? ?????????? ?????????? ???????????? ?????? ?????????????????????? ????????????????????????????. ?????????????????????"
 
-msgid "Debug Reports"
-msgstr "???????????????????? ????????????"
-
 msgid "Generated Time"
 msgstr "?????????? ????????????????"
 
@@ -1842,35 +1820,47 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "???? ?????????????? ?????? ???????? ????????????."
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "?????? ????????"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "??????????????????"
 
-msgid "Help"
-msgstr "????????????"
+msgid "Network Type"
+msgstr "?????? ????????"
+
+msgid "Address Space"
+msgstr "???????????????? ????????????????????????"
 
-msgid "About"
-msgstr "?? ??????????????????"
+msgid "Name should not contain '/' and '\"'."
+msgstr "???????????????????????? ?????? ???????? ????????????. ?? ?????????? ???? ???????????? ???????? ???????????????? '/'."
 
-msgid "Log out"
-msgstr "??????????"
+msgid "Isolated: no external network connection"
+msgstr "?????????????????????????? (?????? ???????????????????? ?????????????? ????????????????????)"
+
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT (???????????? ?????????????????? ???????????????????? ?????????????? ????????????????????)"
 
-msgid "Version:"
-msgstr "????????????:"
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr "?????????? ???????? (???????????? ?????????????????????? ?????????????????????? ?????????? ?? ???????????????????? ????????)"
 
-msgid "Session timeout, please re-login."
+msgid "(No interfaces found)"
 msgstr ""
 
-msgid "User Name"
-msgstr "?????? ????????????????????????"
+msgid "Destination"
+msgstr "?????????????? ????????????????????????:"
 
-msgid "Password"
-msgstr "????????????"
+msgid "Enable VLAN"
+msgstr "???????????????? VLAN:"
+
+msgid "VLAN ID"
+msgstr ""
+
+msgid "Stop"
+msgstr "??????????????????"
 
 msgid "Generate a New Debug Report"
 msgstr "?????????????? ?????????? ???????????????????? ??????????"
@@ -1947,21 +1937,45 @@ msgstr "????"
 msgid "No"
 msgstr "??????"
 
-msgid "Add a Volume to Storage Pool"
-msgstr ""
+msgid "Capacity"
+msgstr "??????????????"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "????????????????"
 
-msgid "Enter the remote URL here."
-msgstr ""
+msgid "Location"
+msgstr "????????????????????????"
 
-msgid "Upload a file"
+msgid "Device path"
+msgstr "???????? ?? ????????????????????"
+
+msgid "active"
+msgstr "??????????????"
+
+msgid "inactive"
+msgstr "??????????????????"
+
+msgid "Deactivate"
+msgstr "??????????????????"
+
+msgid "Activate"
+msgstr "????????????????????????"
+
+msgid "Add Volume"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "Extend"
 msgstr ""
 
+msgid "Undefine"
+msgstr "??????????????"
+
+msgid "Format"
+msgstr "????????????:"
+
+msgid "Allocation"
+msgstr "?????????????????? ????????????????:"
+
 msgid "Define a New Storage Pool"
 msgstr "?????????????? ?????? ????????????"
 
@@ -2001,21 +2015,18 @@ msgstr "???????? NFS"
 msgid "The NFS exported path on NFS server."
 msgstr "???????????????????????????????? ???????? NFS ???? ?????????????? NFS."
 
-msgid "Device path"
-msgstr "???????? ?? ????????????????????"
-
 msgid "iSCSI Server"
 msgstr "???????????? iSCSI"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP-?????????? ?????? ?????? ?????????? ?????????????? iSCSI. ???? ?????????? ???????? ????????????."
-
 msgid "Server"
 msgstr "????????????"
 
 msgid "Port"
 msgstr "????????"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "IP-?????????? ?????? ?????? ?????????? ?????????????? iSCSI. ???? ?????????? ???????? ????????????."
+
 msgid "Target"
 msgstr "?????????????? ????????????"
 
@@ -2028,12 +2039,33 @@ msgstr "???????????????? ?????????????????????????? iSCSI"
 msgid "iSCSI Authentication"
 msgstr "?????????????????????????? iSCSI"
 
+msgid "User Name"
+msgstr "?????? ????????????????????????"
+
+msgid "Password"
+msgstr "????????????"
+
 msgid "SCSI Adapter"
 msgstr "?????????????? SCSI"
 
 msgid "Please, wait..."
 msgstr "??????????????????..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "???????????????? ????????????"
 
@@ -2085,9 +2117,6 @@ msgstr "???????????????????????? ???????????? URL"
 msgid "Edit Template"
 msgstr "???????????????? ????????????"
 
-msgid "Processor"
-msgstr "??????????????????"
-
 msgid "CDROM"
 msgstr "CDROM"
 
@@ -2115,122 +2144,55 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "??????????????????"
-
-msgid "Disk I/O"
-msgstr "???????????????? ????????-??????????"
-
-msgid "Network I/O"
-msgstr "?????????????? ????????-??????????"
-
-msgid "Livetile"
-msgstr "Livetile"
-
-msgid "No guests found."
-msgstr "???? ?????????????? ???????????????? ??????????????."
-
-msgid "Shut down"
-msgstr "????????????????"
-
-msgid "Restart"
-msgstr "????????????????????"
-
-msgid "Basic Information"
-msgstr "?????????????? ????????????????????"
-
-msgid "OS Distro"
-msgstr "?????????????? ????"
-
-msgid "OS Code Name"
-msgstr "?????????????? ?????? ????"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "?????????????????? ????????????????????"
-
-msgid "Update Progress"
-msgstr "?????? ????????????????????"
-
-msgid "Network Name"
-msgstr "?????? ????????"
-
-msgid "State"
-msgstr "??????????????????"
-
-msgid "Network Type"
-msgstr "?????? ????????"
-
-msgid "Address Space"
-msgstr "???????????????? ????????????????????????"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr "???????????????????????? ?????? ???????? ????????????. ?? ?????????? ???? ???????????? ???????? ???????????????? '/'."
-
-msgid "Isolated: no external network connection"
-msgstr "?????????????????????????? (?????? ???????????????????? ?????????????? ????????????????????)"
-
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT (???????????? ?????????????????? ???????????????????? ?????????????? ????????????????????)"
+msgid "No templates found."
+msgstr "???? ?????????????? ??????????????."
 
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "?????????? ???????? (???????????? ?????????????????????? ?????????????????????? ?????????? ?? ???????????????????? ????????)"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "???????????????? ?????????????????? ?????? %(resource)s"
 
-msgid "(No interfaces found)"
-msgstr ""
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s ???? ?????????????????? ?????????? ????????????????????"
 
-msgid "Destination"
-msgstr "?????????????? ????????????????????????:"
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "???????????????? ?????????????????? ?????? %(resource)s"
 
-msgid "Enable VLAN"
-msgstr "???????????????? VLAN:"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "???????????? ?????????????? ?????????????? JSON"
 
-msgid "VLAN ID"
-msgstr ""
+#~ msgid "This API only supports JSON"
+#~ msgstr "?????? ?????????????? API ???????????????????????? ???????????? JSON"
 
-msgid "Stop"
-msgstr "??????????????????"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "?????????????????? ???????????? ?? ?????????????? ???????????? ???? ????????????????????????????????."
 
-msgid "%Used"
-msgstr ""
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????????? ???????????? ????-???? ???????????? %(err)s"
 
-msgid "Location"
-msgstr "????????????????????????"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr ""
+#~ "???????? ?????????????????????????? ???????????????????????? %(username)s. [?????? ????????????: %(code)s]"
 
-msgid "Capacity"
-msgstr "??????????????"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "?????? ???????? ?????????????? ?? Kimchi"
 
-msgid "Allocated"
-msgstr "????????????????"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "?????????????? %(item)s ?????? ?????????? ?? Kimchi"
 
-msgid "active"
-msgstr "??????????????"
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "???? ???????????? %(item)s ?? ?????????????????? ????????????"
 
-msgid "inactive"
-msgstr "??????????????????"
-
-msgid "Deactivate"
-msgstr "??????????????????"
-
-msgid "Activate"
-msgstr "????????????????????????"
-
-msgid "Add Volume"
-msgstr ""
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr "?????????? ????????-?????? ???????????????????? ?????????????? %(cmd)s (%(seconds)s ??)"
 
-msgid "Extend"
-msgstr ""
+#~ msgid "Help"
+#~ msgstr "????????????"
 
-msgid "Undefine"
-msgstr "??????????????"
+#~ msgid "About"
+#~ msgstr "?? ??????????????????"
 
-msgid "Format"
-msgstr "????????????:"
+#~ msgid "Log out"
+#~ msgstr "??????????"
 
-msgid "Allocation"
-msgstr "?????????????????? ????????????????:"
-
-msgid "No templates found."
-msgstr "???? ?????????????? ??????????????."
+#~ msgid "Version:"
+#~ msgstr "????????????:"
diff --git a/plugins/kimchi/po/zh_CN.po b/plugins/kimchi/po/zh_CN.po
index bb31f03..fc6dd84 100644
--- a/plugins/kimchi/po/zh_CN.po
+++ b/plugins/kimchi/po/zh_CN.po
@@ -20,14 +20,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-06-27 10:48+0000\n"
 "Last-Translator: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
 "Language-Team: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
@@ -38,60 +38,13 @@ msgid "Unknown parameter %(value)s"
 msgstr "???????????? %(value)s"
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "???????????????%(resource)s"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "???????????????%(resource)s"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "???????????????%(resource)s"
-
-msgid "Unable to parse JSON request"
-msgstr "????????????JSON??????"
-
-msgid "This API only supports JSON"
-msgstr "??????API?????????JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr "?????????????????????????????????%(err)s"
-
-msgid "You don't have permission to perform this operation."
-msgstr "????????????????????????????????????"
-
-msgid "Datastore is not initiated in the model object."
-msgstr "?????????model??????????????????????????????"
-
-#, python-format
-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 "??????'%(task)s??????%(seconds)s??????"
 
 #, python-format
-msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
-msgstr "??????'%(username)s'??????????????????.[???????????????%(code)s]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "????????????????????????Kimchi"
-
-#, python-format
-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 "???????????????LDAP???????????????%(user_id)s??????"
 
-#, python-format
-msgid "Invalid LDAP configuration: %(item)s : %(value)s"
-msgstr "?????????LDAP?????????%(item)s : %(value)s"
-
 msgid "Unknown \"_cap\" specified"
 msgstr "????????????\"_cap\""
 
@@ -158,8 +111,8 @@ msgstr "ISO??????%(filename)s???????????????????????????"
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "hypervisor????????????ISO??????%(filename)s?????????????????????ISO??????/var/lib/libvirt???"
@@ -546,8 +499,8 @@ msgstr "????????????????????? %(name)s???????????? %(err)s"
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr "?????????????????????%(name)s??????????????????????????? %(err)s"
 
 #, python-format
@@ -616,8 +569,8 @@ msgstr "????????????????????????????????????"
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr "%(disk)s ?????????????????????/????????????????????????????????????%(pool)s???"
 
 #, python-format
@@ -689,8 +642,8 @@ msgstr "???????????????????????????????????????%(pool)s????????????"
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr "??????????????????%(pool)s??????????????????%(name)s????????????%(err)s"
 
 #, python-format
@@ -755,8 +708,8 @@ msgstr "??????????????????%(url)s????????????????????????????????????"
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr "??????????????????'%(pool)s'???????????????'%(name)s'?????????????????????%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
@@ -849,8 +802,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 
 #, python-format
@@ -946,28 +899,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "??????????????????????????????????????????"
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "???????????????????????????%(item)s"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "?????????URI %(uri)s"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "??????'%(cmd)s'??????%(seconds)s???????????????"
-
 msgid "Unable to choose a virtual machine name"
 msgstr "?????????????????????????????????"
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "??????????????????????????????????????????'cdrom'???'disk'"
 
@@ -980,8 +917,8 @@ msgstr "?????????CDROM???????????????"
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr "????????????%(dev_name)s????????????%(vm_name)s????????????"
 
 #, python-format
@@ -1025,8 +962,8 @@ msgstr "?????????????????????????????????????????????????????????/????????????
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr "?????????%(format)s???????????????????????????%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
@@ -1144,8 +1081,8 @@ msgstr "?????????'%(vm)s'?????????????????????????????????"
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr "??????????????????'%(vm)s'????????????'%(name)s'????????????%(err)s"
 
 #, python-format
@@ -1164,20 +1101,20 @@ msgstr "?????????????????????'%(vm)s'?????????????????????%(err)s"
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr "?????????????????????'%(vm)s'??????'%(name)s'????????????%(err)s"
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr "?????????????????????'%(vm)s'????????????????????????%(err)s"
 
 #, python-format
 msgid ""
-"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
-"%(err)s"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr "?????????????????????'%(vm)s'?????????'%(name)s'????????????%(err)s"
 
 #, python-format
@@ -1250,6 +1187,9 @@ msgstr "??????"
 msgid "Creating..."
 msgstr "????????????..."
 
+msgid "Cancel"
+msgstr "??????"
+
 msgid "Edit Guest"
 msgstr "???????????????"
 
@@ -1337,12 +1277,57 @@ msgstr "??????"
 msgid "Detach"
 msgstr "??????"
 
-msgid "Cancel"
-msgstr "??????"
-
 msgid "revert"
 msgstr "??????"
 
+msgid "Start"
+msgstr "??????"
+
+msgid "Reset"
+msgstr "??????"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr "????????????"
+
+msgid "Actions"
+msgstr "??????"
+
+msgid "Connect"
+msgstr "?????????"
+
+msgid "Clone"
+msgstr "????????????"
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Shut Down"
+msgstr "??????"
+
+msgid "Delete"
+msgstr "??????"
+
+msgid "CPU"
+msgstr "?????????"
+
+msgid "Disk I/O"
+msgstr "??????I/O"
+
+msgid "Network I/O"
+msgstr "??????I/O"
+
+msgid "Livetile"
+msgstr "??????"
+
+msgid "No guests found."
+msgstr "?????????????????????"
+
 msgid "Add a Storage Device to VM"
 msgstr "????????????????????????????????????"
 
@@ -1373,38 +1358,41 @@ msgstr "????????????CDROM????????????ISO????????????"
 msgid "Attach"
 msgstr "??????"
 
-msgid "Start"
-msgstr "??????"
+msgid "Shut down"
+msgstr "??????"
 
-msgid "Reset"
-msgstr "??????"
+msgid "Restart"
+msgstr "??????"
 
-msgid "Pause"
-msgstr ""
+msgid "Basic Information"
+msgstr "????????????"
 
-msgid "Resume"
-msgstr ""
+msgid "OS Distro"
+msgstr "?????????????????????"
 
-msgid "Power Off"
-msgstr "????????????"
+msgid "OS Code Name"
+msgstr "??????????????????"
 
-msgid "Actions"
-msgstr "??????"
+msgid "Processor"
+msgstr "?????????"
 
-msgid "Connect"
-msgstr "?????????"
+msgid "CPU(s)"
+msgstr "CPU(s)"
 
-msgid "Clone"
-msgstr "????????????"
+msgid "System Statistics"
+msgstr "??????????????????"
 
-msgid "Edit"
-msgstr "??????"
+msgid "Software Updates"
+msgstr "????????????"
 
-msgid "Shut Down"
-msgstr "??????"
+msgid "Update Progress"
+msgstr "????????????"
 
-msgid "Delete"
-msgstr "??????"
+msgid "Repositories"
+msgstr "????????????"
+
+msgid "Debug Reports"
+msgstr "??????????????????"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr "?????????????????????????????????????????????"
@@ -1524,9 +1512,6 @@ msgid ""
 "to continue?"
 msgstr "???????????????????????????????????????????????????????????????"
 
-msgid "Repositories"
-msgstr "????????????"
-
 msgid "ID"
 msgstr "?????????"
 
@@ -1560,9 +1545,6 @@ msgstr "??????"
 msgid "Disable"
 msgstr "??????"
 
-msgid "Software Updates"
-msgstr "????????????"
-
 msgid "Package Name"
 msgstr "???????????????"
 
@@ -1592,9 +1574,6 @@ msgid ""
 "to continue?"
 msgstr "?????????????????????????????????????????????????????????????????????"
 
-msgid "Debug Reports"
-msgstr "??????????????????"
-
 msgid "Generated Time"
 msgstr "????????????"
 
@@ -1812,35 +1791,48 @@ msgstr "CDROM?????????????????????????????????/??????????????????????????????"
 msgid "Disk pool or volume cannot be blank."
 msgstr "???????????????????????????"
 
-msgid "Peers"
-msgstr "?????????"
+#, fuzzy
+msgid "Filter"
+msgstr "?????????"
 
-msgid "Searching"
-msgstr "????????????"
+msgid "Network Name"
+msgstr "????????????"
 
-msgid "No peers found."
-msgstr "????????????????????????"
+msgid "State"
+msgstr "??????"
 
-msgid "Help"
-msgstr "??????"
+msgid "Network Type"
+msgstr "????????????"
 
-msgid "About"
-msgstr "??????"
+msgid "Address Space"
+msgstr "????????????"
 
-msgid "Log out"
-msgstr "??????"
+msgid "Name should not contain '/' and '\"'."
+msgstr "????????????????????????/??????'\"'???"
 
-msgid "Version:"
-msgstr "?????????"
+msgid "Isolated: no external network connection"
+msgstr "??????: ????????????????????????"
 
-msgid "Session timeout, please re-login."
-msgstr "?????????????????????????????????"
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT: ???????????????????????????????????????"
 
-msgid "User Name"
-msgstr "?????????"
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr "?????????????????????????????????????????????????????????"
 
-msgid "Password"
-msgstr "??????"
+msgid "(No interfaces found)"
+msgstr "(????????????????????????)"
+
+msgid "Destination"
+msgstr "????????????"
+
+msgid "Enable VLAN"
+msgstr "??????VLAN"
+
+msgid "VLAN ID"
+msgstr "VLAN???"
+
+msgid "Stop"
+msgstr "??????"
 
 msgid "Generate a New Debug Report"
 msgstr "??????????????????????????????"
@@ -1915,20 +1907,44 @@ msgstr "???"
 msgid "No"
 msgstr "???"
 
-msgid "Add a Volume to Storage Pool"
-msgstr "???????????????????????????"
+msgid "Capacity"
+msgstr "??????"
 
-msgid "Fetch from remote URL"
-msgstr "?????????URL??????"
+msgid "Allocated"
+msgstr "?????????"
 
-msgid "Enter the remote URL here."
-msgstr "?????????????????????URL???"
+msgid "Location"
+msgstr "??????"
 
-msgid "Upload a file"
-msgstr "??????????????????"
+msgid "Device path"
+msgstr "????????????"
 
-msgid "Choose the file you want to upload."
-msgstr "??????????????????????????????"
+msgid "active"
+msgstr "?????????"
+
+msgid "inactive"
+msgstr "?????????"
+
+msgid "Deactivate"
+msgstr "??????"
+
+msgid "Activate"
+msgstr "??????"
+
+msgid "Add Volume"
+msgstr "?????????"
+
+msgid "Extend"
+msgstr "??????"
+
+msgid "Undefine"
+msgstr "????????????"
+
+msgid "Format"
+msgstr "??????"
+
+msgid "Allocation"
+msgstr "??????"
 
 msgid "Define a New Storage Pool"
 msgstr "???????????????????????????"
@@ -1967,21 +1983,18 @@ msgstr "NFS ??????"
 msgid "The NFS exported path on NFS server."
 msgstr "NFS?????????????????????NFS??????"
 
-msgid "Device path"
-msgstr "????????????"
-
 msgid "iSCSI Server"
 msgstr "iSCSI?????????"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "iSCSI?????????IP?????????????????? ???????????????"
-
 msgid "Server"
 msgstr "?????????"
 
 msgid "Port"
 msgstr "??????"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "iSCSI?????????IP?????????????????? ???????????????"
+
 msgid "Target"
 msgstr "??????"
 
@@ -1994,12 +2007,33 @@ msgstr "??????ISCSI??????"
 msgid "iSCSI Authentication"
 msgstr "iSCSI??????"
 
+msgid "User Name"
+msgstr "?????????"
+
+msgid "Password"
+msgstr "??????"
+
 msgid "SCSI Adapter"
 msgstr "SCSI?????????"
 
 msgid "Please, wait..."
 msgstr "?????????..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr "???????????????????????????"
+
+msgid "Fetch from remote URL"
+msgstr "?????????URL??????"
+
+msgid "Enter the remote URL here."
+msgstr "?????????????????????URL???"
+
+msgid "Upload a file"
+msgstr "??????????????????"
+
+msgid "Choose the file you want to upload."
+msgstr "??????????????????????????????"
+
 msgid "Add Template"
 msgstr "????????????"
 
@@ -2051,9 +2085,6 @@ msgstr "???????????????????????????URL"
 msgid "Edit Template"
 msgstr "????????????"
 
-msgid "Processor"
-msgstr "?????????"
-
 msgid "CDROM"
 msgstr "??????"
 
@@ -2081,122 +2112,75 @@ msgstr "?????????"
 msgid "Threads"
 msgstr "??????"
 
-msgid "CPU"
-msgstr "?????????"
-
-msgid "Disk I/O"
-msgstr "??????I/O"
-
-msgid "Network I/O"
-msgstr "??????I/O"
+msgid "No templates found."
+msgstr "??????????????????"
 
-msgid "Livetile"
-msgstr "??????"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "???????????????%(resource)s"
 
-msgid "No guests found."
-msgstr "?????????????????????"
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "???????????????%(resource)s"
 
-msgid "Shut down"
-msgstr "??????"
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "???????????????%(resource)s"
 
-msgid "Restart"
-msgstr "??????"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "????????????JSON??????"
 
-msgid "Basic Information"
-msgstr "????????????"
+#~ msgid "This API only supports JSON"
+#~ msgstr "??????API?????????JSON"
 
-msgid "OS Distro"
-msgstr "?????????????????????"
+#~ msgid "Parameters does not match requirement in schema: %(err)s"
+#~ msgstr "?????????????????????????????????%(err)s"
 
-msgid "OS Code Name"
-msgstr "??????????????????"
+#~ msgid "You don't have permission to perform this operation."
+#~ msgstr "????????????????????????????????????"
 
-msgid "CPU(s)"
-msgstr "CPU(s)"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "?????????model??????????????????????????????"
 
-msgid "System Statistics"
-msgstr "??????????????????"
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "????????????%(err)s??????????????????"
 
-msgid "Update Progress"
-msgstr "????????????"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr "??????'%(username)s'??????????????????.[???????????????%(code)s]"
 
-msgid "Network Name"
-msgstr "????????????"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "????????????????????????Kimchi"
 
-msgid "State"
-msgstr "??????"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "????????????Kimchi???%(item)s"
 
-msgid "Network Type"
-msgstr "????????????"
+#~ msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+#~ msgstr "?????????LDAP?????????%(item)s : %(value)s"
 
-msgid "Address Space"
-msgstr "????????????"
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "???????????????????????????%(item)s"
 
-msgid "Name should not contain '/' and '\"'."
-msgstr "????????????????????????/??????'\"'???"
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr "??????'%(cmd)s'??????%(seconds)s???????????????"
 
-msgid "Isolated: no external network connection"
-msgstr "??????: ????????????????????????"
+#~ msgid "Peers"
+#~ msgstr "?????????"
 
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT: ???????????????????????????????????????"
+#~ msgid "Searching"
+#~ msgstr "????????????"
 
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "?????????????????????????????????????????????????????????"
+#~ msgid "No peers found."
+#~ msgstr "????????????????????????"
 
-msgid "(No interfaces found)"
-msgstr "(????????????????????????)"
+#~ msgid "Help"
+#~ msgstr "??????"
 
-msgid "Destination"
-msgstr "????????????"
+#~ msgid "About"
+#~ msgstr "??????"
 
-msgid "Enable VLAN"
-msgstr "??????VLAN"
+#~ msgid "Log out"
+#~ msgstr "??????"
 
-msgid "VLAN ID"
-msgstr "VLAN???"
-
-msgid "Stop"
-msgstr "??????"
-
-msgid "%Used"
-msgstr ""
-
-msgid "Location"
-msgstr "??????"
-
-msgid "Capacity"
-msgstr "??????"
-
-msgid "Allocated"
-msgstr "?????????"
-
-msgid "active"
-msgstr "?????????"
-
-msgid "inactive"
-msgstr "?????????"
-
-msgid "Deactivate"
-msgstr "??????"
-
-msgid "Activate"
-msgstr "??????"
-
-msgid "Add Volume"
-msgstr "?????????"
-
-msgid "Extend"
-msgstr "??????"
+#~ msgid "Version:"
+#~ msgstr "?????????"
 
-msgid "Undefine"
-msgstr "????????????"
-
-msgid "Format"
-msgstr "??????"
-
-msgid "Allocation"
-msgstr "??????"
-
-msgid "No templates found."
-msgstr "??????????????????"
+#~ msgid "Session timeout, please re-login."
+#~ msgstr "?????????????????????????????????"
diff --git a/plugins/kimchi/po/zh_TW.po b/plugins/kimchi/po/zh_TW.po
index 342142a..90045b5 100644
--- a/plugins/kimchi/po/zh_TW.po
+++ b/plugins/kimchi/po/zh_TW.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:11-0300\n"
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -21,60 +21,13 @@ msgid "Unknown parameter %(value)s"
 msgstr ""
 
 #, python-format
-msgid "Delete is not allowed for %(resource)s"
-msgstr "??????????????? %(resource)s ????????????"
-
-#, python-format
-msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s ?????????????????????"
-
-#, python-format
-msgid "Create is not allowed for %(resource)s"
-msgstr "??????????????? %(resource)s ????????????"
-
-msgid "Unable to parse JSON request"
-msgstr "???????????? JSON ??????"
-
-msgid "This API only supports JSON"
-msgstr "??? API ????????? JSON"
-
-#, python-format
-msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr ""
-
-msgid "You don't have permission to perform this operation."
-msgstr ""
-
-msgid "Datastore is not initiated in the model object."
-msgstr "?????????????????????????????????????????????"
-
-#, python-format
-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]"
-
-msgid "You are not authorized to access Kimchi"
-msgstr "???????????????????????? Kimchi"
-
-#, python-format
-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 ""
 
@@ -141,8 +94,8 @@ msgstr "?????? ISO %(filename)s ?????????????????????????????????????????????"
 msgid ""
 "The hypervisor doesn't have permission to use this ISO %(filename)s. "
 "Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+"file access control lists for '%(user)s' user if possible, or add the '%"
+"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
 "Hypervisor ??????????????? ISO %(filename)s ??????????????????????????????????????? /var/lib/"
@@ -522,8 +475,8 @@ msgstr "????????????????????? %(name)s??????????????????%(err)s"
 
 #, python-format
 msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
+"Unable to get number of storage volumes in storage pool %(name)s. Details: %"
+"(err)s"
 msgstr "????????????????????? %(name)s ??????????????????????????????????????????%(err)s"
 
 #, python-format
@@ -592,8 +545,8 @@ msgstr "???????????????????????????????????????"
 
 #, python-format
 msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
+"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)"
+"s."
 msgstr "%(disk)s ?????????????????????/??????????????????????????????????????????%(pool)s???"
 
 #, python-format
@@ -665,8 +618,8 @@ msgstr "?????????????????????????????????????????? %(pool)s ??????????????????
 
 #, python-format
 msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
+"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %"
+"(err)s"
 msgstr "?????????????????? %(pool)s ????????????????????? %(name)s??????????????????%(err)s"
 
 #, python-format
@@ -729,8 +682,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
-"%(err)s"
+"Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)"
+"s"
 msgstr ""
 
 msgid "Specify chunk data and its size to upload a file."
@@ -823,8 +776,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines %(vms)"
+"s and/or templates linked to this network."
 msgstr ""
 
 #, python-format
@@ -918,28 +871,12 @@ msgid "There is no compatible package manager for this system."
 msgstr "?????????????????????????????????????????????"
 
 #, python-format
-msgid "Unable to find %(item)s in datastore"
-msgstr "?????????????????????????????? %(item)s"
-
-#, python-format
 msgid "Invalid URI %(uri)s"
 msgstr "URI %(uri)s ??????"
 
-#, python-format
-msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "???????????? '%(cmd)s' %(seconds)s ???????????????"
-
 msgid "Unable to choose a virtual machine name"
 msgstr ""
 
-#, python-format
-msgid "Invalid data value '%(value)s'"
-msgstr ""
-
-#, python-format
-msgid "Invalid data unit '%(unit)s'"
-msgstr ""
-
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
 msgstr "?????????????????????????????????????????????'cdrom'"
 
@@ -952,8 +889,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
+"The storage device %(dev_name)s does not exist in the virtual machine %"
+"(vm_name)s"
 msgstr ""
 
 #, python-format
@@ -997,8 +934,8 @@ msgstr "????????????????????????????????????????????????"
 
 #, python-format
 msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
+"Volume chosen with format %(format)s does not fit in the storage type %(type)"
+"s"
 msgstr ""
 
 msgid "YUM Repository ID must be one word only string."
@@ -1116,8 +1053,8 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1136,20 +1073,20 @@ msgstr ""
 
 #, python-format
 msgid ""
-"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
 msgid ""
-"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
-"%(err)s"
+"Unable to retrieve current snapshot of 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"
+"Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %"
+"(err)s"
 msgstr ""
 
 #, python-format
@@ -1220,6 +1157,9 @@ msgstr "??????"
 msgid "Creating..."
 msgstr ""
 
+msgid "Cancel"
+msgstr "?????? "
+
 msgid "Edit Guest"
 msgstr "????????????"
 
@@ -1307,12 +1247,57 @@ msgstr "??????"
 msgid "Detach"
 msgstr "??????"
 
-msgid "Cancel"
-msgstr "?????? "
-
 msgid "revert"
 msgstr ""
 
+msgid "Start"
+msgstr "??????"
+
+msgid "Reset"
+msgstr "??????"
+
+msgid "Pause"
+msgstr ""
+
+msgid "Resume"
+msgstr ""
+
+msgid "Power Off"
+msgstr ""
+
+msgid "Actions"
+msgstr "??????"
+
+msgid "Connect"
+msgstr "??????"
+
+msgid "Clone"
+msgstr ""
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Shut Down"
+msgstr "??????"
+
+msgid "Delete"
+msgstr "??????"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Disk I/O"
+msgstr "?????? I/O"
+
+msgid "Network I/O"
+msgstr "?????? I/O"
+
+msgid "Livetile"
+msgstr "Livetile"
+
+msgid "No guests found."
+msgstr "??????????????????"
+
 msgid "Add a Storage Device to VM"
 msgstr "???????????????????????? VM"
 
@@ -1343,38 +1328,41 @@ msgstr "CDROM ??? ISO ??????????????????????????????"
 msgid "Attach"
 msgstr "??????"
 
-msgid "Start"
-msgstr "??????"
-
-msgid "Reset"
-msgstr "??????"
+msgid "Shut down"
+msgstr "??????"
 
-msgid "Pause"
-msgstr ""
+msgid "Restart"
+msgstr "????????????"
 
-msgid "Resume"
-msgstr ""
+msgid "Basic Information"
+msgstr "????????????"
 
-msgid "Power Off"
-msgstr ""
+msgid "OS Distro"
+msgstr "OS Distro"
 
-msgid "Actions"
-msgstr "??????"
+msgid "OS Code Name"
+msgstr "OS ???????????????"
 
-msgid "Connect"
-msgstr "??????"
+msgid "Processor"
+msgstr "?????????"
 
-msgid "Clone"
+msgid "CPU(s)"
 msgstr ""
 
-msgid "Edit"
-msgstr "??????"
+msgid "System Statistics"
+msgstr "??????????????????"
 
-msgid "Shut Down"
-msgstr "??????"
+msgid "Software Updates"
+msgstr "????????????"
 
-msgid "Delete"
-msgstr "??????"
+msgid "Update Progress"
+msgstr "????????????"
+
+msgid "Repositories"
+msgstr "?????????"
+
+msgid "Debug Reports"
+msgstr "????????????"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr "????????????????????????????????????????????????????????????"
@@ -1495,9 +1483,6 @@ msgid ""
 "to continue?"
 msgstr "??????????????????????????????????????????????????????????????????"
 
-msgid "Repositories"
-msgstr "?????????"
-
 msgid "ID"
 msgstr "ID"
 
@@ -1531,9 +1516,6 @@ msgstr "??????"
 msgid "Disable"
 msgstr "??????"
 
-msgid "Software Updates"
-msgstr "????????????"
-
 msgid "Package Name"
 msgstr "????????????"
 
@@ -1563,9 +1545,6 @@ msgid ""
 "to continue?"
 msgstr "?????????????????????????????????????????????????????????????????????"
 
-msgid "Debug Reports"
-msgstr "????????????"
-
 msgid "Generated Time"
 msgstr "????????????"
 
@@ -1784,35 +1763,47 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr "??????????????????????????????"
 
-msgid "Peers"
+msgid "Filter"
 msgstr ""
 
-msgid "Searching"
-msgstr ""
+msgid "Network Name"
+msgstr "????????????"
 
-msgid "No peers found."
-msgstr ""
+msgid "State"
+msgstr "??????"
 
-msgid "Help"
-msgstr "??????"
+msgid "Network Type"
+msgstr "????????????"
 
-msgid "About"
-msgstr "??????"
+msgid "Address Space"
+msgstr "????????????"
 
-msgid "Log out"
-msgstr "??????"
+msgid "Name should not contain '/' and '\"'."
+msgstr "?????????????????????????????????????????? '/'???"
 
-msgid "Version:"
-msgstr "?????????"
+msgid "Isolated: no external network connection"
+msgstr "????????????????????????????????????"
+
+msgid "NAT: outbound physical network connection only"
+msgstr "NAT?????????????????????????????????"
+
+msgid "Bridged: Virtual machines are connected to physical network directly"
+msgstr "??????????????????????????????????????????????????????"
 
-msgid "Session timeout, please re-login."
+msgid "(No interfaces found)"
 msgstr ""
 
-msgid "User Name"
-msgstr "???????????????"
+msgid "Destination"
+msgstr "????????????"
 
-msgid "Password"
-msgstr "??????"
+msgid "Enable VLAN"
+msgstr "?????? VLAN???"
+
+msgid "VLAN ID"
+msgstr "VLAN ID???"
+
+msgid "Stop"
+msgstr "??????"
 
 msgid "Generate a New Debug Report"
 msgstr "????????????????????????"
@@ -1889,21 +1880,45 @@ msgstr "???"
 msgid "No"
 msgstr "???"
 
-msgid "Add a Volume to Storage Pool"
-msgstr ""
+msgid "Capacity"
+msgstr "??????"
 
-msgid "Fetch from remote URL"
-msgstr ""
+msgid "Allocated"
+msgstr "?????????"
 
-msgid "Enter the remote URL here."
-msgstr ""
+msgid "Location"
+msgstr "??????"
 
-msgid "Upload a file"
+msgid "Device path"
+msgstr "????????????"
+
+msgid "active"
+msgstr "?????????"
+
+msgid "inactive"
+msgstr "????????????"
+
+msgid "Deactivate"
+msgstr "????????????"
+
+msgid "Activate"
+msgstr "??????"
+
+msgid "Add Volume"
 msgstr ""
 
-msgid "Choose the file you want to upload."
+msgid "Extend"
 msgstr ""
 
+msgid "Undefine"
+msgstr "????????????"
+
+msgid "Format"
+msgstr "?????????"
+
+msgid "Allocation"
+msgstr "?????????"
+
 msgid "Define a New Storage Pool"
 msgstr "?????????????????????"
 
@@ -1941,21 +1956,18 @@ msgstr "NFS ??????"
 msgid "The NFS exported path on NFS server."
 msgstr "NFS ???????????? NFS ??????????????????"
 
-msgid "Device path"
-msgstr "????????????"
-
 msgid "iSCSI Server"
 msgstr "iSCSI ?????????"
 
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "iSCSI ????????? IP ??????????????????????????????????????????"
-
 msgid "Server"
 msgstr "?????????"
 
 msgid "Port"
 msgstr "???"
 
+msgid "iSCSI server IP or hostname. It should not be empty."
+msgstr "iSCSI ????????? IP ??????????????????????????????????????????"
+
 msgid "Target"
 msgstr "??????"
 
@@ -1968,12 +1980,33 @@ msgstr "?????? iSCSI ??????"
 msgid "iSCSI Authentication"
 msgstr "iSCSI ??????"
 
+msgid "User Name"
+msgstr "???????????????"
+
+msgid "Password"
+msgstr "??????"
+
 msgid "SCSI Adapter"
 msgstr "SCSI ?????????"
 
 msgid "Please, wait..."
 msgstr "?????????..."
 
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
 msgid "Add Template"
 msgstr "????????????"
 
@@ -2025,9 +2058,6 @@ msgstr "?????????????????? URL"
 msgid "Edit Template"
 msgstr "????????????"
 
-msgid "Processor"
-msgstr "?????????"
-
 msgid "CDROM"
 msgstr "CDROM"
 
@@ -2055,122 +2085,54 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-msgid "CPU"
-msgstr "CPU"
-
-msgid "Disk I/O"
-msgstr "?????? I/O"
-
-msgid "Network I/O"
-msgstr "?????? I/O"
-
-msgid "Livetile"
-msgstr "Livetile"
-
-msgid "No guests found."
-msgstr "??????????????????"
-
-msgid "Shut down"
-msgstr "??????"
-
-msgid "Restart"
-msgstr "????????????"
-
-msgid "Basic Information"
-msgstr "????????????"
-
-msgid "OS Distro"
-msgstr "OS Distro"
-
-msgid "OS Code Name"
-msgstr "OS ???????????????"
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr "??????????????????"
-
-msgid "Update Progress"
-msgstr "????????????"
-
-msgid "Network Name"
-msgstr "????????????"
-
-msgid "State"
-msgstr "??????"
-
-msgid "Network Type"
-msgstr "????????????"
-
-msgid "Address Space"
-msgstr "????????????"
-
-msgid "Name should not contain '/' and '\"'."
-msgstr "?????????????????????????????????????????? '/'???"
-
-msgid "Isolated: no external network connection"
-msgstr "????????????????????????????????????"
-
-msgid "NAT: outbound physical network connection only"
-msgstr "NAT?????????????????????????????????"
+msgid "No templates found."
+msgstr "??????????????????"
 
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "??????????????????????????????????????????????????????"
+#~ msgid "Delete is not allowed for %(resource)s"
+#~ msgstr "??????????????? %(resource)s ????????????"
 
-msgid "(No interfaces found)"
-msgstr ""
+#~ msgid "%(resource)s does not implement update method"
+#~ msgstr "%(resource)s ?????????????????????"
 
-msgid "Destination"
-msgstr "????????????"
+#~ msgid "Create is not allowed for %(resource)s"
+#~ msgstr "??????????????? %(resource)s ????????????"
 
-msgid "Enable VLAN"
-msgstr "?????? VLAN???"
+#~ msgid "Unable to parse JSON request"
+#~ msgstr "???????????? JSON ??????"
 
-msgid "VLAN ID"
-msgstr "VLAN ID???"
+#~ msgid "This API only supports JSON"
+#~ msgstr "??? API ????????? JSON"
 
-msgid "Stop"
-msgstr "??????"
+#~ msgid "Datastore is not initiated in the model object."
+#~ msgstr "?????????????????????????????????????????????"
 
-msgid "%Used"
-msgstr ""
+#~ msgid "Unable to start task due error: %(err)s"
+#~ msgstr "??????????????????????????????????????????%(err)s"
 
-msgid "Location"
-msgstr "??????"
+#~ msgid ""
+#~ "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+#~ msgstr "????????? '%(username)s' ??????????????????[????????????%(code)s]"
 
-msgid "Capacity"
-msgstr "??????"
+#~ msgid "You are not authorized to access Kimchi"
+#~ msgstr "???????????????????????? Kimchi"
 
-msgid "Allocated"
-msgstr "?????????"
+#~ msgid "Specify %(item)s to login into Kimchi"
+#~ msgstr "?????? %(item)s ????????? Kimchi"
 
-msgid "active"
-msgstr "?????????"
+#~ msgid "Unable to find %(item)s in datastore"
+#~ msgstr "?????????????????????????????? %(item)s"
 
-msgid "inactive"
-msgstr "????????????"
-
-msgid "Deactivate"
-msgstr "????????????"
-
-msgid "Activate"
-msgstr "??????"
-
-msgid "Add Volume"
-msgstr ""
+#~ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+#~ msgstr "???????????? '%(cmd)s' %(seconds)s ???????????????"
 
-msgid "Extend"
-msgstr ""
+#~ msgid "Help"
+#~ msgstr "??????"
 
-msgid "Undefine"
-msgstr "????????????"
+#~ msgid "About"
+#~ msgstr "??????"
 
-msgid "Format"
-msgstr "?????????"
+#~ msgid "Log out"
+#~ msgstr "??????"
 
-msgid "Allocation"
-msgstr "?????????"
-
-msgid "No templates found."
-msgstr "??????????????????"
+#~ msgid "Version:"
+#~ msgstr "?????????"
diff --git a/po/de_DE.po b/po/de_DE.po
new file mode 100644
index 0000000..f8fb97a
--- /dev/null
+++ b/po/de_DE.po
@@ -0,0 +1,1725 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "L??schen ist nicht zul??ssig f??r %(resource)s"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s implementiert keine Aktualisierungsmethode"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "Erstellen ist nicht zul??ssig f??r %(resource)s"
+
+msgid "Unable to parse JSON request"
+msgstr "JSON-Anfrage konnte nicht analysiert werden"
+
+msgid "This API only supports JSON"
+msgstr "Diese API unterst??tzt nur JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr "Datenspeicher wird nicht im Modellobjekt initialisiert."
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr ""
+"Task kann aufgrund des folgenden Fehlers nicht gestartet werden: %(err)s"
+
+#, python-format
+msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr ""
+"Authentifizierung f??r Benutzer '%(username)s' fehlgeschlagen. [Fehlercode: %"
+"(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "Geben Sie %(item)s an, um sich bei Kimchi anzumelden"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "%(item)s konnten nicht im Datenspeicher gefunden werden"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+"Zeitlimit??berschreitung beim Ausf??hren des Befehls '%(cmd)s' nach %(seconds)"
+"s Sekunden"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "Ung??ltiger URI %(uri)s"
+
+msgid "ERROR CODE"
+msgstr "FEHLERCODE"
+
+msgid "REASON"
+msgstr "GRUND"
+
+msgid "STACK"
+msgstr "STACK"
+
+msgid "Go to Homepage"
+msgstr "Gehe zu Homepage"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist "
+"falsch. Versuchen Sie es bitte erneut."
+
+msgid "This field is required."
+msgstr "Dieses Feld ist erforderlich."
+
+msgid "Log in"
+msgstr "Anmelden"
+
+msgid "Logging in..."
+msgstr "Wird angemeldet..."
+
+msgid "Host"
+msgstr "Host"
+
+msgid "Guests"
+msgstr "G??ste"
+
+msgid "Templates"
+msgstr "Vorlagen"
+
+msgid "Storage"
+msgstr "Speicher"
+
+msgid "Network"
+msgstr "Netz"
+
+msgid "Failed to get application configuration"
+msgstr "Anwendungskonfiguration konnte nicht abgerufen werden"
+
+msgid "This is not a valid Linux path"
+msgstr "Dies ist kein g??ltiger Linux-Pfad"
+
+msgid "This is not a valid URL."
+msgstr "Dies ist kein g??ltiger URL."
+
+msgid "No such data available."
+msgstr "Keine solchen Daten verf??gbar."
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"Hostsystem kann nicht kontaktiert werden. Pr??fen Sie, ob das Hostsystem "
+"aktiv ist und obNetzkonnektivit??t besteht. HTTP-Anforderungsantwort %1. "
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "L??schbest??tigung"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgid "Confirm"
+msgstr "Best??tigen"
+
+msgid "Create"
+msgstr "Erstellen"
+
+msgid "Warning"
+msgstr "Warnung"
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "Wird geladen..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "Wiederholen"
+
+msgid "Detailed message:"
+msgstr "Detaillierte Meldung:"
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr "Dies ist keine g??ltige ISO-Datei."
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "Dies wird einige Zeit dauern. M??chten Sie fortfahren?"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "Hiermit wird die Vorlage dauerhaft gel??scht. M??chten Sie fortfahren?"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+"System konnte nicht heruntergefahren werden, weil einige virtuellen "
+"Maschinen ausgef??hrt werden!"
+
+msgid "Max:"
+msgstr "Max:"
+
+msgid "Utilization"
+msgstr "Auslastung"
+
+msgid "Available"
+msgstr "Verf??gbar"
+
+msgid "Read Rate"
+msgstr "Leserate"
+
+msgid "Write Rate"
+msgstr "Schreibrate"
+
+msgid "Received"
+msgstr "Empfangen"
+
+msgid "Sent"
+msgstr "Gesendet"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"Durch das Herunterfahren oder Neustarten des Hosts k??nnen ungesicherte "
+"Arbeiten verloren gehen. M??chten Sie mit dem Herunterfahren/Neustarten "
+"fortfahren?"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Repository wird dauerhaft entfernt und kann nicht wiederhergestellt werden. "
+"M??chten Sie fortfahren?"
+
+msgid "Repositories"
+msgstr "Repositorys"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Base URL"
+msgstr "Basis-URL"
+
+msgid "Is Mirror"
+msgstr "Ist Spiegel"
+
+msgid "URL Args"
+msgstr "URL-Args"
+
+msgid "Enabled"
+msgstr "Aktiviert"
+
+msgid "GPG Check"
+msgstr "GPG-Pr??fung"
+
+msgid "GPG Key"
+msgstr "GPG-Schl??ssel"
+
+msgid "Add"
+msgstr "Hinzuf??gen"
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Remove"
+msgstr "Entfernen"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Disable"
+msgstr "Inaktivieren"
+
+msgid "Software Updates"
+msgstr "Software-Updates"
+
+msgid "Package Name"
+msgstr "Paketname"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "Architecture"
+msgstr "Architektur"
+
+msgid "Repository"
+msgstr "Repository"
+
+msgid "Update All"
+msgstr "Alle aktualisieren"
+
+msgid "Updating..."
+msgstr "Wird aktualisiert..."
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr "Pakete konnten nicht aktualisiert werden."
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Debugbericht wird dauerhaft entfernt und kann nicht wiederhergestellt "
+"werden. M??chten Sie fortfahren?"
+
+msgid "Debug Reports"
+msgstr "Debugberichte"
+
+msgid "Generated Time"
+msgstr "Generierte Zeit"
+
+msgid "Generate"
+msgstr "Generieren"
+
+msgid "Generating..."
+msgstr "Wird generiert..."
+
+msgid "Rename"
+msgstr "Umbenennen"
+
+msgid "Download"
+msgstr "Herunterladen"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+"Berichtsname darf nur Buchstaben, Zahlen und/oder Bindestriche ('-') "
+"enthalten."
+
+msgid "Pending..."
+msgstr "Wird geladen..."
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"Hiermit werden die virtuelle Maschine und deren virtuellen Platten gel??scht. "
+"Diese Operation kann nicht r??ckg??ngig gemacht werden. M??chten Sie fortfahren?"
+
+msgid "Power off Confirmation"
+msgstr "L??schbest??tigung"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr "L??schbest??tigung"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr "L??schbest??tigung"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "Hiermit wird die Vorlage dauerhaft gel??scht. M??chten Sie fortfahren?"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ""
+"Diese CD-ROM wird dauerhaft abgeh??ngt und Sie k??nnen sie neu anh??ngen. "
+"M??chten Sie mit dem Abh??ngen fortfahren?"
+
+msgid "Attach"
+msgstr "Anh??ngen"
+
+msgid "Attaching..."
+msgstr "Wird angeh??ngt..."
+
+msgid "Replace"
+msgstr "Ersetzen"
+
+msgid "Replacing..."
+msgstr "Wird ersetzt..."
+
+msgid "Successfully attached!"
+msgstr "Erfolgreich angeh??ngt!"
+
+msgid "Successfully replaced!"
+msgstr "Erfolgreich ersetzt!"
+
+msgid "Successfully detached!"
+msgstr "Erfolgreich abgeh??ngt!"
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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."
+
+msgid "unavailable"
+msgstr "nicht verf??gbar"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"Diese Aktion unterbricht die Netzkonnektivit??t f??r jede virtuelle Maschine, "
+"die von diesem Netz abh??ngt."
+
+msgid "Create a network"
+msgstr "Netz erstellen"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht "
+"inaktiviert, sondern permanent gel??scht. M??chten Sie fortfahren?"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr ""
+"Hiermit wird der Speicherpool dauerhaft gel??scht. M??chten Sie fortfahren?"
+
+msgid "This storage pool is empty."
+msgstr "Dieser Speicherpool ist leer."
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+"Hiermit wird Ihre Platte formatiert und Sie verlieren s??mtliche Daten "
+"darauf. Sind Sie sicher, dass Sie fortfahren m??chten? "
+
+msgid "SCSI Fibre Channel"
+msgstr "SCSI-Fibre Channel"
+
+msgid "No SCSI adapters found."
+msgstr "Keine SCSI-Adapter gefunden."
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "Der Speicherpoolname darf nicht leer sein."
+
+msgid "The storage pool path can not be blank."
+msgstr "Der Speicherpoolpfad darf nicht leer sein."
+
+msgid "NFS server mount path can not be blank."
+msgstr "Der Mountpfad des NFS-Servers darf nicht leer sein."
+
+msgid "Invalid NFS mount path."
+msgstr "Ung??ltiger NFS-Mountpfad."
+
+msgid "No logical device selected."
+msgstr "Keine logische Einheit ausgew??hlt."
+
+msgid "The iSCSI target can not be blank."
+msgstr "Das iSCSI-Ziel darf nicht leer sein."
+
+msgid "Server name can not be blank."
+msgstr "Servername darf nicht leer sein."
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "Es wird nach verf??gbaren Partitionen gesucht..."
+
+msgid "No available partitions found."
+msgstr "Keine g??ltigen Partitionen gefunden."
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht "
+"inaktiviert, sondern permanent gel??scht. M??chten Sie fortfahren?"
+
+msgid "Unable to retrieve partitions information."
+msgstr ""
+"Repository-Informationen konnten nicht abgerufen werden. Details: '%(err)s'"
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "Der Speicherpoolname darf nicht leer sein."
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr "Benutzername"
+
+msgid "Password"
+msgstr "Kennwort"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "Warnung"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "Keine G??ste gefunden."
+
+msgid "Help"
+msgstr "Hilfe"
+
+msgid "About"
+msgstr "Informationen"
+
+msgid "Log out"
+msgstr "Abmelden"
+
+msgid "Version:"
+msgstr "Version:"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr "Fehler beim Abrufen von Blockeinheiten. Details: %(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr "Fehler beim Abrufen von Blockeinheitinformationen f??r %(device)s."
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "Distro-Datei konnte nicht gefunden werden: %(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "Distro-Datei konnte nicht analysiert werden: %(filename)s. Stellen Sie "
+#~ "sicher, dass es sich um eine JSON-Datei handelt."
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Fehler beim Anmelden bei iSCSI-Hostziel %(portal)s. Details: %(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "Anmeldung bei iSCSI-Host %(host)s Ziel %(target)s nicht m??glich"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "Die ISO-Datei %(filename)s ist nicht bootf??hig"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr "Die ISO-Datei %(filename)s hat keinen g??ltigen El Torito-Bootsatz"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "Ung??ltiger El Torito-Pr??feintrag in ISO-Datei %(filename)s"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "Ung??ltiger El Torito-Boot-Indikator in ISO-Datei %(filename)s"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr ""
+#~ "Unerwarteter Datentr??gertyp f??r Prim??rdatentr??ger in ISO-Datei %(filename)"
+#~ "s"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr ""
+#~ "Ung??ltiges Format beim Lesen des Datentr??gerdeskriptors in ISO-Datei %"
+#~ "(filename)s"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "Der Hypervisor hat nicht die Berechtigung, die ISO-Datei %(filename)s zu "
+#~ "verwenden. Verschieben Sie sie entweder nach /var/lib/libvirt oder setzen "
+#~ "Sie, sofern m??glich, die Suchberechtigung auf "
+#~ "Dateizugriffssteuerungslisten f??r den Benutzer '%(user)s' oder f??gen Sie "
+#~ "'%(user)s' der ISO-Pfadgruppe hinzu oder (nicht empfohlen) 'chmod -R o+x "
+#~ "'path_to_iso'. Details: %(err)s"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "Virtuelle Maschine %(name)s ist bereits vorhanden"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "Virtuelle Maschine %(name)s ist nicht vorhanden"
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr ""
+#~ "Screenshot f??r gestoppte virtuelle Maschine %(name)s konnte nicht "
+#~ "abgerufen werden"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "Fernes ISO-Image wird von diesem Server nicht unterst??tzt."
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht erstellt werden. Details: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht erstellt werden. Details: %(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht abgerufen werden. Details: %(err)"
+#~ "s"
+
+#~ msgid "Unable to connect to powered off virtual machine %(name)s."
+#~ msgstr ""
+#~ "Verbindung zur abgeschalteten Maschine %(name)s konnte nicht hergestellt "
+#~ "werden."
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr "Zu ??berwachende Grafikadresse muss IPv4 oder IPv6 sein"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr ""
+#~ "Vorlage angeben, aus der eine virtuelle Maschine erstellt werden soll"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht gestartet werden. Details: %(err)"
+#~ "s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht gestoppt werden. Details: %(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht gel??scht werden. Details: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht umbenannt werden. Details: %(err)"
+#~ "s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "Netzname muss eine Zeichenfolge sein"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "Netzname muss eine Zeichenfolge sein"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "Benutzer '%(users)s' ist nicht vorhanden."
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "Benutzer '%(groups)s' ist nicht vorhanden."
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht gestoppt werden. Details: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr ""
+#~ "Virtuelle Maschine %(name)s konnte nicht gestartet werden. Details: %(err)"
+#~ "s"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr ""
+#~ "Schnittstelle %(iface)s ist in virtueller Maschine %(name)s nicht "
+#~ "vorhanden"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr ""
+#~ "Das f??r die virtuelle Maschine %(name)s angegebene Netz %(network)s ist "
+#~ "nicht vorhanden"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr ""
+#~ "Unterst??tzter Schnittstellentyp einer virtuellen Maschine ist nur Netz"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr ""
+#~ "Netzname f??r Schnittstelle einer virtuellen Maschine muss eine "
+#~ "Zeichenfolge sein"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "Ung??ltige Netzmodellkarte f??r Schnittstelle einer virtuellen Maschine "
+#~ "angegeben"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr ""
+#~ "Geben Sie Typ und Netz an, um eine neue Schnittstelle f??r eine virtuelle "
+#~ "Maschine hinzuzuf??gen"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "Vorlage %(name)s ist bereits vorhanden"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "Das f??r Vorlage %(template)s angegebene Netz '%(network)s' ist nicht "
+#~ "vorhanden"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "Der f??r Vorlage %(template)s angegebene Speicherpool '%(pool)s' ist nicht "
+#~ "vorhanden"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "Der f??r Vorlage %(template)s angegebene Speicherpool '%(pool)s' ist nicht "
+#~ "aktiv"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "Ung??ltiger Parameter '%(param)s' f??r CD-ROM angegeben."
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "Das f??r Vorlage %(template)s angegebene Netz %(network)s ist nicht aktiv"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "Vorlagenname muss eine Zeichenfolge sein"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "Vorlagensymbol muss ein Pfad zum Image sein"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "Vorlagenverteilung muss eine Zeichenfolge sein"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "Vorlagenverteilungsversion muss eine Zeichenfolge sein"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "Die Anzahl der CPUs muss eine Ganzzahl sein"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "Speicherkapazit??t (MB) muss eine Ganzzahl gr????er als 512 sein"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr "Ung??ltiger Speicherpool-URI %(value)s f??r Vorlage angegeben"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr "Geben Sie ein ISO-Image als CD-ROM an, um eine Vorlage zu erstellen"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr "Alle Netze f??r die Vorlage m??ssen in einer Liste angegeben werden."
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr ""
+#~ "Vorlage kann aufgrund des folgenden Fehlers nicht erstellt werden: %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr ""
+#~ "Vorlage kann aufgrund des folgenden Fehlers nicht gel??scht werden: %(err)s"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "Speicherpool %(name)s ist bereits vorhanden"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "Speicherpool %(name)s ist nicht vorhanden"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "Geben Sie %(item)s an, um den Speicherpool %(name)s zu erstellen"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "Aktiver Speicherpool %(name)s konnte nicht gel??scht werden"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "Speicherpools konnten nicht aufgelistet werden. Details: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherpool %(name)s konnte nicht erstellt werden. Details: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "Anzahl der Speicherdatentr??ger im Speicherpool %(name)s konnte nicht "
+#~ "abgerufen werden. Details: %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherpool %(name)s konnte nicht aktiviert werden. Details: %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherpool %(name)s konnte nicht inaktiviert werden. Details: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherpool %(name)s konnte nicht gel??scht werden. Details: %(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "NFS-Pool konnte nicht erstellt werden, weil Exportpfad %(path)s beim "
+#~ "Mounten blockieren kann"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "NFS-Pool konnte nicht erstellt werden, weil das Mounten des Exportpfads%"
+#~ "(path)s fehlgeschlagen ist"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "Nicht unterst??tzter Speicherpooltyp: %(type)s"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "Speicherpoolhost muss eine IP oder ein Hostname sein"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "Einheitenparameter des Speicherpools muss eine Liste sein"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "Ziel-IQN eines iSCSI-Pools muss eine Zeichenfolge sein"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr ""
+#~ "Port eines fernen Speicherservers muss eine Ganzzahl zwischen 1 und 65535 "
+#~ "sein"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "Geben Sie Name und Typ an, um einen Speicherpool zu erstellen"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s ist keine g??ltige Platte/Partition. Sie konnte nicht hinzugef??gt "
+#~ "werden zum Pool %(pool)s."
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr ""
+#~ "Die Parameterplatten k??nnen nur f??r den logischen Speicherpool "
+#~ "aktualisiert werden."
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "Der Name des SCSI-Hostadapters muss eine Zeichenfolge sein."
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr ""
+#~ "Der Speicherpool kimchi_isos ist f??r die interne Verwendung reserviert"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "Der NFS-Speicherpool %(name)s konnte nicht aktiviert werden. NFS-Server %"
+#~ "(server)s ist nicht erreichbar."
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "Der NFS-Speicherpool %(name)s konnte nicht inaktiviert werden. NFS-Server "
+#~ "%(server)s ist nicht erreichbar."
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "Pool %(name)s konnte nicht inaktiviert werden, weil er einigen Vorlagen "
+#~ "zugeordnet ist"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "Pool %(name)s konnte nicht gel??scht werden, weil er einigen Vorlagen "
+#~ "zugeordnet ist"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "Eine Datentr??gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. "
+#~ "W??hlen Sie einen anderen Namen aus, um den logischen Pool zu erstellen."
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "Datenbank mit Tiefenscaninformationen kann aufgrund des folgenden Fehlers "
+#~ "nicht aktualisiert werden: %(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "Speicherdatentr??ger %(name)s ist bereits vorhanden"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr ""
+#~ "Speicherdatentr??ger %(name)s ist nicht im Speicherpool %(pool)s vorhanden"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr ""
+#~ "Geben Sie %(item)s an, um Speicherdatentr??ger %(volume)s zu erstellen"
+
+#~ msgid ""
+#~ "Unable to list storage volumes because storage pool %(pool)s is not active"
+#~ msgstr ""
+#~ "Speicherdatentr??ger konnten nicht aufgelistet werden, weil Speicherpool %"
+#~ "(pool)s nicht aktiv ist"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherdatentr??ger %(name)s konnte nicht in Speicherpool %(pool)s "
+#~ "erstellt werden. Details: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherdatentr??ger konnten nicht in Speicherpool %(pool)s aufgelistet "
+#~ "werden. Details: %(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherdatentr??ger %(name)s konnten nicht bereinigt werden. Details: %"
+#~ "(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Speicherdatentr??ger %(name)s konnte nicht gel??scht werden. Details: %(err)"
+#~ "s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Gr????e des Speicherdatentr??gers %(name)s konnte nicht ge??ndert werden. "
+#~ "Details: %(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr ""
+#~ "Speichertyp %(type)s unterst??tzt nicht das Erstellen und L??schen von "
+#~ "Datentr??gern"
+
+#~ msgid "Storage volume name must be a string"
+#~ 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 requires a volume name"
+#~ msgstr "Speicherdatentr??ger erfordert einen Datentr??gernamen"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "Datenbank mit Datentr??gerinformationen kann aufgrund des folgenden "
+#~ "Fehlers nicht aktualisiert werden: %(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "Schnittstelle %(name)s ist nicht vorhanden"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "Netz %(name)s ist bereits vorhanden"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "Netz %(name)s ist nicht vorhanden"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr ""
+#~ "Das f??r das Netz %(network)s angegebene Teilnetz %(subnet)s ist nicht "
+#~ "g??ltig."
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr ""
+#~ "Geben Sie eine Netzschnittstelle an, um ??berbr??cktes Netz %(name)s zu "
+#~ "erstellen"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "Aktives Netz %(name)s konnte nicht gel??scht werden"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "Die f??r das Netz %(network)s angegebene Schnittstelle %(iface)s wird "
+#~ "bereits verwendet"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr "Schnittstelle sollte blo??es NIC, Bonding oder Br??ckeneinheit sein."
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr ""
+#~ "Es konnte keine freie IP-Adresse f??r Netz '%(name)s' gefunden werden"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "Unterst??tzte Netztypen sind Isoliert, NAT und Br??cke"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "Teilnetz des Netzes muss eine Zeichenfolge mit IP-Adresse und Pr??fix oder "
+#~ "Netzmaske sein"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "Netzschnittstelle muss eine Zeichenfolge sein"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "Netz-VLAN-ID muss eine Ganzzahl zwischen 1 und 4094 sein"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen"
+
+#~ msgid ""
+#~ "Unable to delete network %(name)s. There are some virtual machines %(vms)"
+#~ "s and/or templates linked to this network."
+#~ msgstr ""
+#~ "Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
+#~ "Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verkn??pft."
+
+#~ msgid ""
+#~ "Unable to deactivate network %(name)s. There are some virtual machines %"
+#~ "(vms)s and/or templates linked to this network."
+#~ msgstr ""
+#~ "Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
+#~ "Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verkn??pft."
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr ""
+#~ "Br??ckeneinheit %(name)s kann nicht die Trunkeinheit eines VLAN sein."
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "Schnittstelle %(iface)s konnte nicht aktiviert werden: %(err)s."
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "Schnittstelle %(iface)s konnte nicht aktiviert werden. Bitte ??berpr??fen "
+#~ "Sie den Status der physischen Verbindung."
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "Debugbericht %(name)s ist nicht vorhanden"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "Debugberichtstool nicht im System gefunden"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr ""
+#~ "Debugbericht %(name)s konnte nicht erstellt werden. Details: %(err)s."
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Debugbericht %(name)s konnte nicht generiert werden. Details: %(err)s"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "Eine Datentr??gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. "
+#~ "W??hlen Sie einen anderen Namen aus, um den logischen Pool zu erstellen."
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "Speicherserver %(server)s wurde nicht von Kimchi verwendet"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "Distro '%(name)s' ist nicht vorhanden"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "Partition %(name)s ist nicht im Host vorhanden"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "Hostmaschine konnte nicht heruntergefahren werden, weil virtuelle "
+#~ "Maschinen ausgef??hrt werden"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "Hostmaschine konnte nicht neu gestartet werden, weil virtuelle Maschinen "
+#~ "ausgef??hrt werden"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "Knoteneinheit '%(name)s' nicht gefunden"
+
+#~ msgid "No packages marked for update"
+#~ msgstr "Keine Pakete f??r Aktualisierung markiert"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "Paket %(name)s ist nicht f??r Aktualisierung markiert."
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr ""
+#~ "Fehler beim Abrufen von Paketen, die f??r die Aktualsierung markiert sind. "
+#~ "Details: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "Es gibt keinen kompatiblen Paketmanager f??r dieses System."
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "Ung??ltiger Speichertyp. Unterst??tzte Typen: 'cdrom'"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr "Fehler beim Erstellen einer neuen Speichereinheit: %(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr "Fehler beim Aktualisieren einer Speichereinheit: %(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "Fehler beim Entfernen einer Speichereinheit: %(error)s"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Geben Sie Typ und Pfad an, um einen neuen Datentr??ger f??r eine virtuelle "
+#~ "Maschine hinzuzf??gen"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr ""
+#~ "Geben Sie einen Pfad an, um die Platte der virtuellen Maschine zu "
+#~ "aktualisieren"
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Geben Sie Typ und Pfad an, um einen neuen Datentr??ger f??r eine virtuelle "
+#~ "Maschine hinzuzf??gen"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr ""
+#~ "YUM-Repository-ID darf nur ein aus einer Zeichenfolge bestehendes Wort "
+#~ "sein."
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "Repository-URL muss ein http://-, ftp://- oder file://-URL sein."
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr ""
+#~ "Repository-Konfiguration ist ein W??rterbuch mit bestimmten Werten "
+#~ "hinsichtlich Repository-Typ."
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "Verteilung an DEB-Repository muss eine Zeichenfolge sein"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr ""
+#~ "Komponenten f??r DEB-Repository m??ssen in einem Array aufgelistet sein"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "Komponenten f??r DEB-Repository m??ssen eine Zeichenfolge sein"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "Name des YUM-Repositorys muss eine Zeichenfolge sein."
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "GPG-Pr??fung muss ein boolescher Wert sein."
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr ""
+#~ "GPG-Schl??ssel muss ein URL sein, der auf die ASCII-Armor-Datei zeigt."
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "Repository %(repo_id)s konnte nicht aktualisiert werden."
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "Repository %(repo_id)s ist nicht vorhanden."
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr "Repository-Verwaltungstool wurde f??r Ihr System nicht erkannt."
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "Repository %(repo_id)s ist bereits aktiviert."
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "Repository %(repo_id)s ist bereits inaktiviert."
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "Repository %(repo_id)s konnte nicht entfernt werden."
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr ""
+#~ "Repository-Konfigurationsdatei %(repo_file)s konnte nicht geschrieben "
+#~ "werden"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr ""
+#~ "Geben Sie die Repository-Verteilung an, um ein DEB-Repository zu "
+#~ "erstellen."
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "Repository %(repo_id)s konnte nicht aktiviert werden."
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "Repository %(repo_id)s konnte nicht inaktiviert werden."
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "YUM-Repository-ID ist bereits vorhanden"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "YUM-Repository-Name muss eine Zeichenfolge sein"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "Repositorys konnten nicht aufgelistet werden. Details: '%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr ""
+#~ "Repository-Informationen konnten nicht abgerufen werden. Details: '%(err)"
+#~ "s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "Repository konnte nicht hinzugef??gt werden. Details: '%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "Repository konnte nicht entfernt werden. Details: '%(err)s'"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "Neue virtuelle Maschine erstellen"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "Name der virtuellen Maschine"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "Der f??r die Kennzeichnung der virtuellen Maschine verwendete Name. Falls "
+#~ "er ausgelassen wird, wird ein Name anhand der verwendeten Vorlage "
+#~ "ausgew??hlt."
+
+#~ msgid "Template"
+#~ msgstr "Vorlage"
+
+#~ msgid "Please create a template first."
+#~ msgstr "Erstellen Sie zun??chst eine Vorlage."
+
+#~ msgid "Create a Template"
+#~ msgstr "Vorlage erstellen"
+
+#~ msgid "Please choose a template."
+#~ msgstr "W??hlen Sie eine Vorlage aus."
+
+#~ msgid "OS"
+#~ msgstr "BS"
+
+#~ msgid "OS Version"
+#~ msgstr "BS-Version"
+
+#~ msgid "CPUS"
+#~ msgstr "CPUS"
+
+#~ msgid "Memory"
+#~ msgstr "Speicher"
+
+#~ msgid "Edit Guest"
+#~ msgstr "Gast bearbeiten"
+
+#~ msgid "General"
+#~ msgstr "Allgemein"
+
+#~ msgid "Interface"
+#~ msgstr "Schnittstelle"
+
+#~ msgid "Permission"
+#~ msgstr "Version"
+
+#~ msgid "CPUs"
+#~ msgstr "CPUs"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "Speicher"
+
+#~ msgid "Icon"
+#~ msgstr "Symbol"
+
+#~ msgid "Device"
+#~ msgstr "Einheitenname"
+
+#~ msgid "Path"
+#~ msgstr "NFS-Pfad"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "Vendor"
+#~ msgstr "Anbieter"
+
+#~ msgid "Detach"
+#~ msgstr "Abh??ngen"
+
+#~ msgid "Start"
+#~ msgstr "Starten"
+
+#~ msgid "Reset"
+#~ msgstr "Zur??cksetzen"
+
+#~ msgid "Actions"
+#~ msgstr "Aktionen"
+
+#~ msgid "Connect"
+#~ msgstr "Verbinden"
+
+#~ msgid "Shut Down"
+#~ msgstr "Herunterfahren"
+
+#~ msgid "Delete"
+#~ msgstr "L??schen"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "Platten-E/A"
+
+#~ msgid "Network I/O"
+#~ msgstr "Netz-E/A"
+
+#~ msgid "Livetile"
+#~ msgstr "Live Tile"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "Speichereinheit zur virtuellen Maschine hinzuf??gen"
+
+#~ msgid "Device Type"
+#~ msgstr "Einheitentyp"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterst??tzt."
+
+#~ msgid "Storage Pool"
+#~ msgstr "Speicherpool"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
+
+#~ msgid "Storage Volume"
+#~ msgstr "Speicherpoolname"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "Name des Speicherdatentr??gers muss eine Zeichenfolge sein"
+
+#~ msgid "File Path"
+#~ msgstr "Dateipfad"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "Der ISO-Dateipfad auf dem Server f??r die CD-ROM."
+
+#~ msgid "Shut down"
+#~ msgstr "Herunterfahren"
+
+#~ msgid "Restart"
+#~ msgstr "Erneut starten"
+
+#~ msgid "Basic Information"
+#~ msgstr "Basisinformationen"
+
+#~ msgid "OS Distro"
+#~ msgstr "BS-Distro"
+
+#~ msgid "OS Code Name"
+#~ msgstr "BS-Codename"
+
+#~ msgid "Processor"
+#~ msgstr "Prozessor"
+
+#~ msgid "System Statistics"
+#~ msgstr "Systemstatistik"
+
+#~ msgid "Update Progress"
+#~ msgstr "Aktualisierungsfortschritt"
+
+#~ msgid "Network Name"
+#~ msgstr "Netzname"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Network Type"
+#~ msgstr "Netztyp"
+
+#~ msgid "Address Space"
+#~ msgstr "Adressraum"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "Ung??ltiger Speicherpoolname. Er darf nicht '/' enthalten."
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "Isolatiert: keine physisische Netzverbindung"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: nur ausgehende physische Netzverbindung"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr ""
+#~ "??berbr??ckt: Virtuelle Maschinen sind direkt mit physischem Netz verbunden"
+
+#~ msgid "Destination"
+#~ msgstr "Ziel:"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "Virtuelles LAN (VLAN) aktivieren:"
+
+#~ msgid "VLAN ID"
+#~ msgstr "VLAN-ID:"
+
+#~ msgid "Stop"
+#~ msgstr "Stoppen"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "Neuen Debugbericht erstellen"
+
+#~ msgid "Report Name"
+#~ msgstr "Berichtsname"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "Der Name, mit dem der Bericht gekennzeichnet wird. Falls er ausgelassen "
+#~ "wird, wird ein Name basierend auf der aktuellen Zeit ausgew??hlt. Der Name "
+#~ "darf Buchstaben, Zahlen und Bindestriche (\"-\") enthalten."
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "Neuen Debugbericht erstellen"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "Der Name, mit dem der Bericht gekennzeichnet wird. Falls er ausgelassen "
+#~ "wird, wird ein Name basierend auf der aktuellen Zeit ausgew??hlt. Der Name "
+#~ "darf Buchstaben, Zahlen und Bindestriche (\"-\") enthalten."
+
+#~ msgid "Add a Repository"
+#~ msgstr "Repository hinzuf??gen"
+
+#~ msgid "Identifier"
+#~ msgstr "Kennung"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "Einzelnes Wort, eindeutige Kennung f??r das Repository."
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "Textname f??r das Repository."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "Erforderliches Feld"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr ""
+#~ "URL zum Repository. Unterst??tzte Protokolle sind http, ftp und file."
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "Repository ist ein Spiegel."
+
+#~ msgid "Distribution"
+#~ msgstr "Verteilung"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "Verteilung des DEB-Repositorys."
+
+#~ msgid "Components"
+#~ msgstr "Komponenten"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "Liste der Komponenten im DEB-Repository."
+
+#~ msgid "Edit Repository"
+#~ msgstr "Repository bearbeiten"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "Spiegellisten-URL"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nein"
+
+#~ msgid "Capacity"
+#~ msgstr "Kapazit??t"
+
+#~ msgid "Allocated"
+#~ msgstr "Zugeordnet"
+
+#~ msgid "Location"
+#~ msgstr "Position"
+
+#~ msgid "Device path"
+#~ msgstr "Einheitenpfad"
+
+#~ msgid "active"
+#~ msgstr "aktiv"
+
+#~ msgid "inactive"
+#~ msgstr "inaktiv"
+
+#~ msgid "Deactivate"
+#~ msgstr "Inaktivieren"
+
+#~ msgid "Activate"
+#~ msgstr "Aktivieren"
+
+#~ msgid "Undefine"
+#~ msgstr "Definition aufheben"
+
+#~ msgid "Format"
+#~ msgstr "Format:"
+
+#~ msgid "Allocation"
+#~ msgstr "Zuordnung:"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "Neuen Speicherpool definieren"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "Speicherpoolname"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr ""
+#~ "Der Name, mit dem die Speicherpools gekennzeichnet werden. Er darf nicht "
+#~ "leer sein."
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "Speicherpooltyp"
+
+#~ msgid "Storage Path"
+#~ msgstr "Speicherpfad"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr ""
+#~ "Der Pfad des Speicherpools. Jeder Speicherpool muss einen eindeutigen "
+#~ "Pfad haben."
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr ""
+#~ "Kimchi versucht, das Verzeichnis zu erstellen, wenn es noch nicht in "
+#~ "Ihrem System vorhanden ist."
+
+#~ msgid "NFS Server IP"
+#~ msgstr "NFS-Server-IP"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "IP oder Hostname des NFS-Servers. Diese(r) kann eingegeben oder aus dem "
+#~ "Verlauf ausgew??hlt werden."
+
+#~ msgid "NFS Path"
+#~ msgstr "NFS-Pfad"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "Der NFS-Exportpfad auf dem NFS-Server."
+
+#~ msgid "iSCSI Server"
+#~ msgstr "iSCSI-Server"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Port"
+#~ msgstr "Port"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "IP oder Hostname des iSCSI-Servers. Diese(r) darf nicht leer sein."
+
+#~ msgid "Target"
+#~ msgstr "Ziel"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "Das iSCSI-Ziel auf dem iSCSI-Server"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "iSCSI-Authentifizierung hinzuf??gen"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "iSCSI-Authentifizierung"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "SCSI-Adapter"
+
+#~ msgid "Please, wait..."
+#~ msgstr "Bitte warten..."
+
+#~ msgid "Add Template"
+#~ msgstr "Vorlage hinzuf??gen"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "Wo ist der Quellendatentr??ger f??r diese Vorlage?"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "Lokales ISO-Image"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "Fernes ISO-Image"
+
+#~ msgid "Search ISOs"
+#~ msgstr "ISOs suchen"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "Die folgenden ISOs sind verf??gbar:"
+
+#~ msgid "OS: "
+#~ msgstr "BS: "
+
+#~ msgid "Version: "
+#~ msgstr "Version: "
+
+#~ msgid "Size: "
+#~ msgstr "Gr????e: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "Weitere ISOs suchen"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "Vorlagen aus ausgew??hltem ISO erstellen"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "Ich m??chte eine bestimmte ISO-Datei verwenden"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "Standardm????ige ferne ISOs werden geladen ..."
+
+#~ msgid "Arch: "
+#~ msgstr "Arch: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "Ich m??chte einen benutzerdefinierten URL verwenden"
+
+#~ msgid "Edit Template"
+#~ msgstr "Vorlage bearbeiten"
+
+#~ msgid "CDROM"
+#~ msgstr "CD-ROM"
+
+#~ msgid "Graphics"
+#~ msgstr "Grafik"
+
+#~ msgid "CPU Number"
+#~ msgstr "CPU-Anzahl"
+
+#~ msgid "No templates found."
+#~ msgstr "Keine Vorlagen gefunden."
diff --git a/po/en_US.po b/po/en_US.po
new file mode 100644
index 0000000..fd667bc
--- /dev/null
+++ b/po/en_US.po
@@ -0,0 +1,554 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr ""
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr ""
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr ""
+
+msgid "Unable to parse JSON request"
+msgstr ""
+
+msgid "This API only supports JSON"
+msgstr ""
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr ""
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr ""
+
+#, python-format
+msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr ""
+
+msgid "You are not authorized to access Kimchi"
+msgstr ""
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr ""
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr ""
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr ""
+
+msgid "ERROR CODE"
+msgstr ""
+
+msgid "REASON"
+msgstr ""
+
+msgid "STACK"
+msgstr ""
+
+msgid "Go to Homepage"
+msgstr ""
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+
+msgid "This field is required."
+msgstr ""
+
+msgid "Log in"
+msgstr ""
+
+msgid "Logging in..."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Guests"
+msgstr ""
+
+msgid "Templates"
+msgstr ""
+
+msgid "Storage"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Failed to get application configuration"
+msgstr ""
+
+msgid "This is not a valid Linux path"
+msgstr ""
+
+msgid "This is not a valid URL."
+msgstr ""
+
+msgid "No such data available."
+msgstr ""
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Confirm"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr ""
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr ""
+
+msgid "Detailed message:"
+msgstr ""
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr ""
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr ""
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr ""
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+
+msgid "Max:"
+msgstr ""
+
+msgid "Utilization"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid "Read Rate"
+msgstr ""
+
+msgid "Write Rate"
+msgstr ""
+
+msgid "Received"
+msgstr ""
+
+msgid "Sent"
+msgstr ""
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+
+msgid "Repositories"
+msgstr ""
+
+msgid "ID"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Base URL"
+msgstr ""
+
+msgid "Is Mirror"
+msgstr ""
+
+msgid "URL Args"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "GPG Check"
+msgstr ""
+
+msgid "GPG Key"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Software Updates"
+msgstr ""
+
+msgid "Package Name"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Architecture"
+msgstr ""
+
+msgid "Repository"
+msgstr ""
+
+msgid "Update All"
+msgstr ""
+
+msgid "Updating..."
+msgstr ""
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr ""
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+
+msgid "Debug Reports"
+msgstr ""
+
+msgid "Generated Time"
+msgstr ""
+
+msgid "Generate"
+msgstr ""
+
+msgid "Generating..."
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+
+msgid "Pending..."
+msgstr ""
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+
+msgid "Power off Confirmation"
+msgstr ""
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr ""
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr ""
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr ""
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ""
+
+msgid "Attach"
+msgstr ""
+
+msgid "Attaching..."
+msgstr ""
+
+msgid "Replace"
+msgstr ""
+
+msgid "Replacing..."
+msgstr ""
+
+msgid "Successfully attached!"
+msgstr ""
+
+msgid "Successfully replaced!"
+msgstr ""
+
+msgid "Successfully detached!"
+msgstr ""
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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 ""
+
+msgid "unavailable"
+msgstr ""
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+
+msgid "Create a network"
+msgstr ""
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr ""
+
+msgid "This storage pool is empty."
+msgstr ""
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+
+msgid "SCSI Fibre Channel"
+msgstr ""
+
+msgid "No SCSI adapters found."
+msgstr ""
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr ""
+
+msgid "The storage pool path can not be blank."
+msgstr ""
+
+msgid "NFS server mount path can not be blank."
+msgstr ""
+
+msgid "Invalid NFS mount path."
+msgstr ""
+
+msgid "No logical device selected."
+msgstr ""
+
+msgid "The iSCSI target can not be blank."
+msgstr ""
+
+msgid "Server name can not be blank."
+msgstr ""
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr ""
+
+msgid "No available partitions found."
+msgstr ""
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+
+msgid "Unable to retrieve partitions information."
+msgstr ""
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr ""
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Peers"
+msgstr ""
+
+msgid "Searching"
+msgstr ""
+
+msgid "No peers found."
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+msgid "About"
+msgstr ""
+
+msgid "Log out"
+msgstr ""
+
+msgid "Version:"
+msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
new file mode 100644
index 0000000..6d8dad4
--- /dev/null
+++ b/po/es_ES.po
@@ -0,0 +1,1736 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_ES\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "Suprimir no est?? permitido para %(resource)s"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s no implementa m??todo de actualizaci??n"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "Crear no est?? permitido para %(resource)s"
+
+msgid "Unable to parse JSON request"
+msgstr "No se puede analizar la solicitud JSON"
+
+msgid "This API only supports JSON"
+msgstr "Esta API s??lo da soporte a JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr "El almac??n de datos no se ha iniciado en el objeto de modelo."
+
+#, python-format
+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 "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr ""
+"La autenticaci??n ha fallado para el usuario '%(username)s'. [C??digo de "
+"error: %(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "No tiene autorizaci??n para acceder a Kimchi"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "Especifique %(item)s para iniciar la sesi??n en Kimchi"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "No se puede encontrar %(item)s en el almac??n de datos"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+"Tiempo de espera excedido al ejecutar el mandato '%(cmd)s' despu??s de %"
+"(seconds)s segundos"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "URI %(uri)s no v??lido"
+
+msgid "ERROR CODE"
+msgstr "C??DIGO DE ERROR"
+
+msgid "REASON"
+msgstr "RAZ??N"
+
+msgid "STACK"
+msgstr "PILA"
+
+msgid "Go to Homepage"
+msgstr "Ir a la p??gina inicial"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+"El nombre de usuario o contrase??a que ha especificado es incorrecto. Por "
+"favor, vuelva a intentarlo."
+
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
+msgid "Log in"
+msgstr "Iniciar sesi??n"
+
+msgid "Logging in..."
+msgstr "Iniciando sesi??n..."
+
+msgid "Host"
+msgstr "Host"
+
+msgid "Guests"
+msgstr "Invitados"
+
+msgid "Templates"
+msgstr "Plantillas"
+
+msgid "Storage"
+msgstr "Almacenamiento"
+
+msgid "Network"
+msgstr "Red"
+
+msgid "Failed to get application configuration"
+msgstr "No se ha podido obtener la configuraci??n de la aplicaci??n"
+
+msgid "This is not a valid Linux path"
+msgstr "No es una v??a de acceso de Linux v??lida"
+
+msgid "This is not a valid URL."
+msgstr "No es un URL v??lido."
+
+msgid "No such data available."
+msgstr "No hay datos de ese tipo disponibles."
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"No se puede contactar con el sistema host, Verifique que el sistema host "
+"est?? activo y que tiene conectividad de red con ??l. Respuesta de solicitud "
+"HTTP %1. "
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "Confirmaci??n de supresi??n"
+
+msgid "OK"
+msgstr "Aceptar"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "Confirm"
+msgstr "Confirmar"
+
+msgid "Create"
+msgstr "Crear"
+
+msgid "Warning"
+msgstr "Aviso"
+
+msgid "Save"
+msgstr "Guardar"
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "Cargando..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "Reintentar"
+
+msgid "Detailed message:"
+msgstr "Mensaje detallado:"
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr "No es un archivo ISO v??lido."
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "Tardar?? mucho tiempo. ??Desea continuar?"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "Esto suprimir?? permanentemente la plantilla. ??Desea continuar?"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+"No se puede concluir el sistema ya que hay algunas m??quinas virtuales en "
+"ejecuci??n."
+
+msgid "Max:"
+msgstr "M??x.:"
+
+msgid "Utilization"
+msgstr "Utilizaci??n"
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid "Read Rate"
+msgstr "Velocidad de lectura"
+
+msgid "Write Rate"
+msgstr "Velocidad de escritura"
+
+msgid "Received"
+msgstr "Recibido"
+
+msgid "Sent"
+msgstr "Enviado"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"Concluir o reiniciar el host har?? que se pierda el trabajo no guardado. "
+"??Desea continuar para concluir/reiniciar?"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"El repositorio se eliminar?? de forma permanente y no se puede recuperar. "
+"??Desea continuar?"
+
+msgid "Repositories"
+msgstr "Repositorios"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Base URL"
+msgstr "URL base"
+
+msgid "Is Mirror"
+msgstr "Es duplicado"
+
+msgid "URL Args"
+msgstr "Args de URL"
+
+msgid "Enabled"
+msgstr "Habilitado"
+
+msgid "GPG Check"
+msgstr "Comprobaci??n GPG"
+
+msgid "GPG Key"
+msgstr "Clave GPG"
+
+msgid "Add"
+msgstr "A??adir"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Remove"
+msgstr "Eliminar"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "Disable"
+msgstr "Inhabilitar"
+
+msgid "Software Updates"
+msgstr "Actualizaciones de software"
+
+msgid "Package Name"
+msgstr "Nombre de paquete"
+
+msgid "Version"
+msgstr "Versi??n"
+
+msgid "Architecture"
+msgstr "Arquitectura"
+
+msgid "Repository"
+msgstr "Repositorio"
+
+msgid "Update All"
+msgstr "Actualizar todo"
+
+msgid "Updating..."
+msgstr "Actualizando..."
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr "No se han podido actualizar paquetes."
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"El informe de depuraci??n se eliminar?? permanentemente y no se puede "
+"recuperar. ??Desea continuar?"
+
+msgid "Debug Reports"
+msgstr "Informes de depuraci??n"
+
+msgid "Generated Time"
+msgstr "Tiempo generado"
+
+msgid "Generate"
+msgstr "Generar"
+
+msgid "Generating..."
+msgstr "Generando..."
+
+msgid "Rename"
+msgstr "Redenominar"
+
+msgid "Download"
+msgstr "Descargar"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+"El nombre de informe debe contener s??lo letras, d??gitos y/o gui??n ('-')."
+
+msgid "Pending..."
+msgstr "Cargando..."
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"Esto suprimir?? la m??quina virtual y sus discos virtuales. Esta operaci??n no "
+"puede deshacerse. ??Desea continuar?"
+
+msgid "Power off Confirmation"
+msgstr "Confirmaci??n de supresi??n"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr "Confirmaci??n de supresi??n"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr "Confirmaci??n de supresi??n"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "Esto suprimir?? permanentemente la plantilla. ??Desea continuar?"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ""
+"Este CDROM se desconectar?? de forma permanente pero puede volver a "
+"conectarlo. ??Desea continuar para desconectarlo?"
+
+msgid "Attach"
+msgstr "Conectar"
+
+msgid "Attaching..."
+msgstr "Conectando..."
+
+msgid "Replace"
+msgstr "Sustituir"
+
+msgid "Replacing..."
+msgstr "Sustituyendo..."
+
+msgid "Successfully attached!"
+msgstr "??Conectado correctamente!"
+
+msgid "Successfully replaced!"
+msgstr "??Sustituido correctamente!"
+
+msgid "Successfully detached!"
+msgstr "??Desconectado correctamente!"
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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."
+
+msgid "unavailable"
+msgstr "no disponible"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"Esta acci??n interrumpir?? la conectividad de red para cualquier m??quina "
+"virtual que dependa de esta red."
+
+msgid "Create a network"
+msgstr "Crear una red"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Esta agrupaci??n de almacenamiento no es persistente. En lugar de desactivar, "
+"esta acci??n la suprimir?? permanentemente. ??Desea continuar?"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr ""
+"Esto suprimir?? permanentemente la agrupaci??n de almacenamiento. ??Desea "
+"continuar?"
+
+msgid "This storage pool is empty."
+msgstr "Esta agrupaci??n de almacenamiento est?? vac??a."
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+"Dar?? formato al disco y se perder??n los datos que tenga en ??l. ??Est?? seguro "
+"de que desea continuar? "
+
+msgid "SCSI Fibre Channel"
+msgstr "Canal de fibra de SCSI"
+
+msgid "No SCSI adapters found."
+msgstr "No se han encontrado adaptadores SCSI."
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "El nombre de la agrupaci??n de almacenamiento no puede estar en blanco."
+
+msgid "The storage pool path can not be blank."
+msgstr ""
+"La v??a de acceso de la agrupaci??n de almacenamiento no puede estar en blanco."
+
+msgid "NFS server mount path can not be blank."
+msgstr "La v??a de acceso de montaje del servidor NFS no puede estar en blanco."
+
+msgid "Invalid NFS mount path."
+msgstr "V??a de acceso de montaje de NFS no v??lida."
+
+msgid "No logical device selected."
+msgstr "No se ha seleccionado ning??n dispositivo l??gico."
+
+msgid "The iSCSI target can not be blank."
+msgstr "El destino iSCSI no puede estar en blanco."
+
+msgid "Server name can not be blank."
+msgstr "El nombre de servidor no puede estar en blanco."
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "Buscando particiones disponibles..."
+
+msgid "No available partitions found."
+msgstr "No se han encontrado particiones disponibles."
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Esta agrupaci??n de almacenamiento no es persistente. En lugar de desactivar, "
+"esta acci??n la suprimir?? permanentemente. ??Desea continuar?"
+
+msgid "Unable to retrieve partitions information."
+msgstr "No se puede recuperar informaci??n del repositorio. Detalles: '%(err)s'"
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "El nombre de la agrupaci??n de almacenamiento no puede estar en blanco."
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+msgid "Password"
+msgstr "Contrase??a"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "Aviso"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "No se ha encontrado invitados."
+
+msgid "Help"
+msgstr "Ayuda"
+
+msgid "About"
+msgstr "Acerca de"
+
+msgid "Log out"
+msgstr "Finalizar sesi??n"
+
+msgid "Version:"
+msgstr "Versi??n:"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr ""
+#~ "Se ha producido un error al obtener dispositivos de bloque. Detalles: %"
+#~ "(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr ""
+#~ "Se ha producido un error al obtener informaci??n de dispositivo de bloque "
+#~ "para %(device)s."
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "No se puede encontrar el archivo distro: %(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "No se puede analizar el archivo distro: %(filename)s. Aseg??rese de que es "
+#~ "un archivo JSON."
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede iniciar la sesi??n en %(portal)s del destino de host iSCSI. "
+#~ "Detalles: %(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr ""
+#~ "No se puede iniciar la sesi??n en el destino %(target)s del %(host)s host "
+#~ "de iSCSI"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "El archivo ISO %(filename)s no es arrancable"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr ""
+#~ "El archivo ISO %(filename)s no tiene un registro de arranque de El Torito "
+#~ "v??lido"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "Entrada de validaci??n de El Torito no v??lida en ISO %(filename)s"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "Indicador de arranque de El Torito no v??lido en ISO %(filename)s"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr ""
+#~ "Tipo de volumen inesperado para el volumen primario en ISO %(filename)s"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr ""
+#~ "Formato incorrecto mientras se le??a el descriptor de volumen en ISO %"
+#~ "(filename)s"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "El hipervisor no tiene permiso para utilizar este ISO %(filename)s. "
+#~ "Considere moverlo a /var/lib/libvirt, o establezca el permiso de b??squeda "
+#~ "en listas de control de accesos de archivo para el usuario '%(user)s' si "
+#~ "es posible, o a??ada el '%(user)s' al grupo de v??as de acceso ISO, o (no "
+#~ "recomendado) 'chmod -R o+x 'path_to_iso'.Detalles: %(err)s"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "La m??quina virtual %(name)s ya existe"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "La m??quina virtual %(name)s no existe"
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr ""
+#~ "No se puede recuperar la captura de pantalla para la m??quina virtual "
+#~ "detenida %(name)s"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "La imagen ISO remota no est?? soportada por este servidor."
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "No se puede crear la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "No se puede crear la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede recuperar la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr ""
+#~ "La direcci??n de gr??ficos en que hay que estar a la escucha debe ser IPv4 "
+#~ "o IPv6"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr ""
+#~ "Especifique una plantilla a partir de la que se crear?? una m??quina virtual"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "No se puede iniciar la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "No se puede detener la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "No se puede suprimir la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede redenominar la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "El nombre de red debe ser una serie"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "El nombre de red debe ser una serie"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "El usuario '%(users)s' no existe."
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "El usuario '%(groups)s' no existe."
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "No se puede detener la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr "No se puede iniciar la m??quina virtual %(name)s. Detalles: %(err)s"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "La interfaz %(iface)s no existe en la m??quina virtual %(name)s"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr ""
+#~ "La red %(network)s especificada para la m??quina virtual %(name)s no existe"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr ""
+#~ "El tipo de interfaces de m??quina virtual soportado es de red solamente"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr ""
+#~ "El nombre de red para la interfaz de m??quina virtual debe ser una serie"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "Especificada tarjeta de modelo de red no v??lida para la interfaz de "
+#~ "m??quina virtual"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr ""
+#~ "Especifique el tipo y la red para a??adir una interfaz de m??quina virtual "
+#~ "nueva"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "La plantilla %(name)s ya existe"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "La red '%(network)s' especificada para la plantilla %(template)s no existe"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "La agrupaci??n de almacenamiento %(pool)s especificada para la plantilla %"
+#~ "(template)s no existe"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "La agrupaci??n de almacenamiento %(pool)s especificada para la plantilla %"
+#~ "(template)s no est?? activa"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "Par??metro no v??lido '%(param)s' especificado para CDROM."
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "La red %(network)s especificada para la plantilla %(template)s no est?? "
+#~ "activa"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "El nombre de plantilla debe ser una serie"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "El icono de plantilla debe ser una v??a de acceso a la imagen"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "La distribuci??n de plantilla debe ser una serie"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "La versi??n de distribuci??n de plantilla debe ser una serie"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "El n??mero de CPUs debe ser un entero"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "La cantidad de memoria (MB) debe ser un entero mayor que 512"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr ""
+#~ "URI de agrupaci??n de almacenamiento no v??lido %(value)s especificado para "
+#~ "la plantilla"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr "Especifique una imagen de ISO como CDROM para crear una plantilla"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr "Todas las redes para la plantilla deben especificarse en una lista."
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "No se puede crear la plantilla debido a un error: %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "No se puede suprimir la plantilla debido a un error: %(err)s"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto"
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "La agrupaci??n de almacenamiento %(name)s ya existe"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "La agrupaci??n de almacenamiento %(name)s no existe"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr ""
+#~ "Especifique %(item)s para poder crear la agrupaci??n de almacenamiento %"
+#~ "(name)s"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr ""
+#~ "No se puede suprimir la agrupaci??n de almacenamiento activa %(name)s"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr ""
+#~ "No se pueden listar agrupaciones de almacenamiento. Detalles: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede crear la agrupaci??n de almacenamiento %(name)s. Detalles: %"
+#~ "(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede obtener el n??mero de vol??menes de almacenamiento en la "
+#~ "agrupaci??n de almacenamiento %(name)s. Detalles: %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede activar la agrupaci??n de almacenamiento %(name)s. Detalles: %"
+#~ "(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede desactivar la agrupaci??n de almacenamiento %(name)s. "
+#~ "Detalles: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede suprimir la agrupaci??n de almacenamiento %(name)s. Detalles: %"
+#~ "(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "No se puede crear la agrupaci??n de NFS ya que la v??a de acceso de "
+#~ "exportaci??n %(path)s podr??a bloquearse durante el montaje"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "No se puede crear la agrupaci??n de NFS ya que el montaje de la v??a de "
+#~ "acceso de exportaci??n %(path)s ha fallado"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "Tipo de agrupaci??n de almacenamiento no soportado: %(type)s"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr ""
+#~ "La v??a de acceso de la agrupaci??n de almacenamiento debe ser una serie"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr ""
+#~ "El host de la agrupaci??n de almacenamiento debe ser un IP o nombre de host"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr ""
+#~ "El par??metro de los dispositivos de agrupaci??n de almacenamiento debe ser "
+#~ "una lista"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "El IQN destino de una agrupaci??n de iSCSI debe ser una serie"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr ""
+#~ "El puerto de un servidor de almacenamiento remoto debe ser un entero "
+#~ "entre 1 y 65535"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr ""
+#~ "Especifique el nombre y el tipo para crear una agrupaci??n de "
+#~ "almacenamiento"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s no es un disco/partici??n. No se ha podido a??adir a la agrupaci??n "
+#~ "%(pool)s."
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr ""
+#~ "Los discos de par??metro s??lo pueden actualizarse para la agrupaci??n de "
+#~ "almacenamiento l??gico."
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "El nombre del adaptador de host SCSI debe ser una serie."
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr ""
+#~ "La agrupaci??n de almacenamiento kimchi_isos est?? reservada para uso "
+#~ "interno"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "No se puede activar la agrupaci??n de almacenamiento NFS %(name)s. El "
+#~ "servidor NFS %(server)s est?? fuera de alcance."
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "No se puede desactivar la agrupaci??n de almacenamiento NFS %(name)s. El "
+#~ "servidor NFS %(server)s est?? fuera de alcance."
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "No se puede desactivar la agrupaci??n %(name)s ya que est?? asociada con "
+#~ "algunas plantillas"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "No se puede suprimir la agrupaci??n %(name)s ya que est?? asociada con "
+#~ "algunas plantillas"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "Un grupo de vol??menes denominado '%(name)s' ya existe. Elija otro nombre "
+#~ "para crear la agrupaci??n l??gica."
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "No se puede actualizar la base de datos con la informaci??n de exploraci??n "
+#~ "profunda debido a un error: %(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "El volumen de almacenamiento %(name)s ya existe"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr ""
+#~ "El volumen de almacenamiento %(name)s no existe en la agrupaci??n de "
+#~ "almacenamiento %(pool)s"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr ""
+#~ "Especifique %(item)s para poder crear el volumen de almacenamiento %"
+#~ "(volume)s"
+
+#~ 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 almacenamiento %(pool)s no est?? activa"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede crear el volumen de almacenamiento %(name)s en la agrupaci??n "
+#~ "de almacenamiento %(pool)s. Detalles: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se pueden listar vol??menes de almacenamiento en la agrupaci??n de "
+#~ "almacenamiento %(pool)s. Detalles: %(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se pueden borrar los vol??menes de almacenamiento %(name)s. Detalles: %"
+#~ "(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede suprimir el volumen de almacenamiento %(name)s. Detalles: %"
+#~ "(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede redimensionar el volumen de almacenamiento %(name)s. "
+#~ "Detalles: %(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr ""
+#~ "El tipo de almacenamiento %(type)s no da soporte a crear y suprimir "
+#~ "vol??menes"
+
+#~ msgid "Storage volume name must be a string"
+#~ 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 requires a volume name"
+#~ msgstr "El volumen de almacenamiento requiere un nombre de volumen"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "No se puede actualizar la base de datos con la informaci??n de volumen de "
+#~ "almacenamiento debido a un error: %(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "La interfaz %(name)s no existe"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "La red %(name)s ya existe"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "La red %(name)s no existe"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr ""
+#~ "La subred %(subnet)s especificada para la red %(network)s no es v??lida."
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr ""
+#~ "Especifique una interfaz de red para crear una red puenteada %(name)s"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "No se puede suprimir la red activa %(name)s"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "La interfaz %(iface)s especificada para la red %(network)s ya est?? en uso"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr "La interfaz debe ser dispositivo de puente, enlazado o NIC simple."
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "No se puede crear la red %(name)s. Detalles: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr "No se puede encontrar una direcci??n IP libre para la red '%(name)s'"
+
+#~ msgid "The interface %(iface)s already exists."
+#~ msgstr "La interfaz %(iface)s ya existe"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "Los tipos de red soportados son aislada, NAT y puente"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "La subred de red debe ser una serie con direcci??n IP y prefijo o m??scara "
+#~ "de red"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "La interfaz de red debe ser una serie"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "El ID de VLAN de red debe ser un entero entre 1 y 4094"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "Especifique el nombre y el tipo para crear una red"
+
+#~ msgid ""
+#~ "Unable to delete network %(name)s. There are some virtual machines %(vms)"
+#~ "s and/or templates linked to this network."
+#~ msgstr ""
+#~ "No se puede suprimir la red %(name)s. Hay algunas m??quinas virtuales %"
+#~ "(vms)s y/o plantillas enlazadas a esta red."
+
+#~ msgid ""
+#~ "Unable to deactivate network %(name)s. There are some virtual machines %"
+#~ "(vms)s and/or templates linked to this network."
+#~ msgstr ""
+#~ "No se puede desactivar la red %(name)s. Hay algunas m??quinas virtuales %"
+#~ "(vms)s y/o plantillas enlazadas a esta red."
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr ""
+#~ "El dispositivo de puente %(name)s no puede ser el dispositivo de conexi??n "
+#~ "troncal de una VLAN."
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "No se puede activar la interfaz %(iface)s: %(err)s."
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "No se puede activar la interfaz %(iface)s. Compruebe el estado del enlace "
+#~ "f??sico."
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "El informe de depuraci??n %(name)s no existe"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "Herramienta de informes de depuraci??n no encontrada en el sistema"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr ""
+#~ "No se puede crear el informe de depuraci??n %(name)s. Detalles: %(err)s."
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "No se puede generar el informe de depuraci??n %(name)s. Detalles: %(err)s"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "Un grupo de vol??menes denominado '%(name)s' ya existe. Elija otro nombre "
+#~ "para crear la agrupaci??n l??gica."
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "Kimchi no utilizaba el servidor de almacenamiento %(server)s"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "Distro '%(name)s' no existe"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "La partici??n %(name)s no existe en el host"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "No se puede concluir la m??quina host ya que hay m??quinas virtuales en "
+#~ "ejecuci??n"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "No se puede rearrancar la m??quina host ya que hay m??quinas virtuales en "
+#~ "ejecuci??n"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "No se ha encontrado el dispositivo de nodo '%(name)s'"
+
+#~ msgid "No packages marked for update"
+#~ msgstr "No hay paquetes marcados para su actualizaci??n"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "El paquete %(name)s no est?? marcado para su actualizaci??n."
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr ""
+#~ "Se ha producido un error al obtener paquetes marcados para su "
+#~ "actualizaci??n. Detalles: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "No hay ning??n gestor de paquetes compatible para este sistema."
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "Tipo de almacenamiento no v??lido. Tipos soportados: 'cdrom'"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr ""
+#~ "Se ha producido un error al crear el nuevo dispositivo de almacenamiento: "
+#~ "%(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr ""
+#~ "Se ha producido un error al actualizar el dispositivo de almacenamiento: %"
+#~ "(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr ""
+#~ "Se ha producido un error al eliminar el dispositivo de almacenamiento: %"
+#~ "(error)s"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Especifique el tipo y la v??a de acceso para a??adir un disco de m??quina "
+#~ "virtual nuevo"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr ""
+#~ "Especifique la v??a de acceso para actualizar el disco de m??quina virtual"
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Especifique el tipo y la v??a de acceso para a??adir un disco de m??quina "
+#~ "virtual nuevo"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr "El ID de repositorio YUM debe ser una serie de una sola palabra."
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "El URL de repositorio debe ser http://, ftp:// o archivo:// URL."
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr ""
+#~ "La configuraci??n de repositorio es un diccionario con valores espec??ficos "
+#~ "seg??n el tipo de repositorio."
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "El repositorio de Distribuci??n a DEB debe ser una serie"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr ""
+#~ "El repositorio de Componentes a DEB debe estar listado en una matriz"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "El repositorio de Componentes a DEB debe ser una serie"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "El nombre del repositorio YUM debe ser una serie."
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "La comprobaci??n de GPG debe ser un valor booleano."
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr ""
+#~ "La clave GPG debe ser un URL que apunta al archivo blindado por ASCII."
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "No se ha podido actualizar el repositorio %(repo_id)s."
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "El repositorio %(repo_id)s no existe."
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr ""
+#~ "La herramienta de gesti??n de repositorio no se ha reconocido para su "
+#~ "sistema."
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "El repositorio %(repo_id)s ya est?? habilitado."
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "El repositorio %(repo_id)s ya est?? inhabilitado."
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "No se ha podido eliminar el repositorio %(repo_id)s."
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr ""
+#~ "No se ha podido grabar el archivo de configuraci??n del repositorio %"
+#~ "(repo_file)s"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr ""
+#~ "Especifique la distribuci??n del repositorio para crear un repositorio de "
+#~ "DEB."
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "No se ha podido habilitar el repositorio %(repo_id)s."
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "No se ha podido inhabilitar el repositorio %(repo_id)s."
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "El ID de repositorio de YUM ya existe"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "El nombre del repositorio de YUM debe ser una serie"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "No se pueden listar repositorios. Detalles: '%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr ""
+#~ "No se puede recuperar informaci??n del repositorio. Detalles: '%(err)s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "No se puede a??adir el repositorio. Detalles: '%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "No se puede eliminar el repositorio. Detalles: '%(err)s'"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "Crear una nueva m??quina virtual"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "Nombre de m??quina virtual"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "El nombre que se utiliza para identificar la m??quina virtual. Si se "
+#~ "omite, se elegir?? un nombre bas??ndose en la plantilla utilizada."
+
+#~ msgid "Template"
+#~ msgstr "Plantilla"
+
+#~ msgid "Please create a template first."
+#~ msgstr "Cree una plantilla primero."
+
+#~ msgid "Create a Template"
+#~ msgstr "Crear una plantilla"
+
+#~ msgid "Please choose a template."
+#~ msgstr "Elija una plantilla."
+
+#~ msgid "OS"
+#~ msgstr "SO"
+
+#~ msgid "OS Version"
+#~ msgstr "Versi??n del SO"
+
+#~ msgid "CPUS"
+#~ msgstr "CPUS"
+
+#~ msgid "Memory"
+#~ msgstr "Memoria"
+
+#~ msgid "Edit Guest"
+#~ msgstr "Editar invitado"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Interface"
+#~ msgstr "Interfaz"
+
+#~ msgid "Permission"
+#~ msgstr "Versi??n"
+
+#~ msgid "CPUs"
+#~ msgstr "CPUs"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "Memoria"
+
+#~ msgid "Icon"
+#~ msgstr "Icono"
+
+#~ msgid "Device"
+#~ msgstr "Nombre de dispositivo"
+
+#~ msgid "Path"
+#~ msgstr "V??a de acceso NFS"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "All"
+#~ msgstr "Todo"
+
+#~ msgid "Vendor"
+#~ msgstr "Proveedor"
+
+#~ msgid "Detach"
+#~ msgstr "Desconectar"
+
+#~ msgid "Start"
+#~ msgstr "Iniciar"
+
+#~ msgid "Reset"
+#~ msgstr "Restablecer"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Connect"
+#~ msgstr "Conectar"
+
+#~ msgid "Shut Down"
+#~ msgstr "Concluir"
+
+#~ msgid "Delete"
+#~ msgstr "Suprimir"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "E/S de disco"
+
+#~ msgid "Network I/O"
+#~ msgstr "E/S de red"
+
+#~ msgid "Livetile"
+#~ msgstr "Livetile"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "A??adir un dispositivo de almacenamiento a VM"
+
+#~ msgid "Device Type"
+#~ msgstr "Tipo de dispositivo"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "El tipo de dispositivo. Actualmente s??lo est?? soportado \"cdrom\"."
+
+#~ msgid "Storage Pool"
+#~ msgstr "Agrupaci??n de almacenamiento"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr ""
+#~ "La v??a de acceso de la agrupaci??n de almacenamiento debe ser una serie"
+
+#~ msgid "Storage Volume"
+#~ msgstr "Nombre de agrupaci??n de almacenamiento"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "El nombre de volumen de almacenamiento debe ser una serie"
+
+#~ msgid "File Path"
+#~ msgstr "V??a de acceso de archivo"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "La v??a de acceso del archivo ISO en el servidor para el CDROM."
+
+#~ msgid "Shut down"
+#~ msgstr "Concluir"
+
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
+
+#~ msgid "Basic Information"
+#~ msgstr "Informaci??n b??sica"
+
+#~ msgid "OS Distro"
+#~ msgstr "Distro de SO"
+
+#~ msgid "OS Code Name"
+#~ msgstr "Nombre de c??digo de SO"
+
+#~ msgid "Processor"
+#~ msgstr "Procesador"
+
+#~ msgid "System Statistics"
+#~ msgstr "Estad??sticas del sistema"
+
+#~ msgid "Update Progress"
+#~ msgstr "Actualizar progreso"
+
+#~ msgid "Network Name"
+#~ msgstr "Nombre de red"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Network Type"
+#~ msgstr "Tipo de red"
+
+#~ msgid "Address Space"
+#~ msgstr "Espacio de direcciones"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr ""
+#~ "Nombre de agrupaci??n de almacenamiento no v??lido. No debe contener '/'."
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "Aislado: no hay conexi??n de red f??sica"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: conexi??n de red f??sica saliente solamente"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr ""
+#~ "Puenteado: Las m??quinas virtuales est??n conectadas a la red f??sica "
+#~ "directamente"
+
+#~ msgid "Destination"
+#~ msgstr "Destino:"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "Habilitar VLAN:"
+
+#~ msgid "VLAN ID"
+#~ msgstr "ID de VLAN:"
+
+#~ msgid "Stop"
+#~ msgstr "Detener"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "Generar un Informe de depuraci??n nuevo"
+
+#~ msgid "Report Name"
+#~ msgstr "Nombre de informe"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "El nombre que se utiliza para identificar el informe. Si se omite, se "
+#~ "elegir?? un nombre bas??ndose en la hora actual. El nombre puede contener: "
+#~ "letras, d??gitos y gui??n (\"-\")."
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "Generar un Informe de depuraci??n nuevo"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "El nombre que se utiliza para identificar el informe. Si se omite, se "
+#~ "elegir?? un nombre bas??ndose en la hora actual. El nombre puede contener: "
+#~ "letras, d??gitos y gui??n (\"-\")."
+
+#~ msgid "Add a Repository"
+#~ msgstr "A??adir un repositorio"
+
+#~ msgid "Identifier"
+#~ msgstr "Identificador"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "Identificador exclusivo de una sola palabra para el repositorio."
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "Nombre textual para el repositorio."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "Campo obligatorio"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr ""
+#~ "URL al repositorio. Los protocolos soportados son http, ftp y archivo."
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "El repositorio es un duplicado."
+
+#~ msgid "Distribution"
+#~ msgstr "Distribuci??n"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "Distribuci??n del repositorio DEB."
+
+#~ msgid "Components"
+#~ msgstr "Componentes"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "Lista de componentes en el repositorio DEB."
+
+#~ msgid "Edit Repository"
+#~ msgstr "Editar repositorio"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "URL de lista duplicada"
+
+#~ msgid "Yes"
+#~ msgstr "S??"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Capacity"
+#~ msgstr "Capacidad"
+
+#~ msgid "Allocated"
+#~ msgstr "Asignado"
+
+#~ msgid "Location"
+#~ msgstr "Ubicaci??n"
+
+#~ msgid "Device path"
+#~ msgstr "V??a de acceso del dispositivo"
+
+#~ msgid "active"
+#~ msgstr "activo"
+
+#~ msgid "inactive"
+#~ msgstr "inactivo"
+
+#~ msgid "Deactivate"
+#~ msgstr "Desactivar"
+
+#~ msgid "Activate"
+#~ msgstr "Activar"
+
+#~ msgid "Undefine"
+#~ msgstr "No definir"
+
+#~ msgid "Format"
+#~ msgstr "Formato:"
+
+#~ msgid "Allocation"
+#~ msgstr "Asignado:"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "Definir una agrupaci??n de almacenamiento nueva"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "Nombre de agrupaci??n de almacenamiento"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr ""
+#~ "El nombre que se utiliza para identificar las agrupaciones de "
+#~ "almacenamiento y no debe estar vac??o."
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "Tipo de agrupaci??n de almacenamiento"
+
+#~ msgid "Storage Path"
+#~ msgstr "V??a de acceso de almacenamiento"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr ""
+#~ "La v??a de acceso de la agrupaci??n de almacenamiento. Cada agrupaci??n de "
+#~ "almacenamiento debe tener una v??a de acceso exclusiva."
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr ""
+#~ "Kimchi intentar?? crear el directorio cuando no existe en el sistema."
+
+#~ msgid "NFS Server IP"
+#~ msgstr "IP de Servidor NFS"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "IP o nombre de host de servidor NFS. Puede especificarse o elegirse del "
+#~ "historial."
+
+#~ msgid "NFS Path"
+#~ msgstr "V??a de acceso NFS"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "La v??a de acceso exportada de NFS en el servidor NFS."
+
+#~ msgid "iSCSI Server"
+#~ msgstr "Servidor iSCSI"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Port"
+#~ msgstr "Puerto"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "IP o nombre de host de servidor iSCSI. No debe estar vac??o."
+
+#~ msgid "Target"
+#~ msgstr "Destino"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "El destino iSCSI en el servidor iSCSI"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "A??adir Autenticaci??n iSCSI"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "Autenticaci??n iSCSI"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "Adaptador SCSI"
+
+#~ msgid "Please, wait..."
+#~ msgstr "Por favor, espere..."
+
+#~ msgid "Add Template"
+#~ msgstr "A??adir plantilla"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "??D??nde est?? el soporte de origen para esta plantilla?"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "Imagen ISO local"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "Imagen ISO remota"
+
+#~ msgid "Search ISOs"
+#~ msgstr "Buscar ISOs"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "Las siguientes ISO est??n disponibles:"
+
+#~ msgid "OS: "
+#~ msgstr "SO: "
+
+#~ msgid "Version: "
+#~ msgstr "Versi??n: "
+
+#~ msgid "Size: "
+#~ msgstr "Tama??o: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "Buscar m??s ISO"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "Crear plantillas a partir de ISO seleccionadas"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "Deseo utilizar un archivo ISO espec??fico"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "Cargando ISO remotas predeterminadas ..."
+
+#~ msgid "Arch: "
+#~ msgstr "Arch: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "Deseo utilizar un URL personalizado"
+
+#~ msgid "Edit Template"
+#~ msgstr "Editar plantilla"
+
+#~ msgid "CDROM"
+#~ msgstr "CDROM"
+
+#~ msgid "Graphics"
+#~ msgstr "Gr??ficos"
+
+#~ msgid "CPU Number"
+#~ msgstr "N??mero de CPU"
+
+#~ msgid "No templates found."
+#~ msgstr "No se han encontrado plantillas."
diff --git a/po/fr_FR.po b/po/fr_FR.po
new file mode 100644
index 0000000..b8a2026
--- /dev/null
+++ b/po/fr_FR.po
@@ -0,0 +1,1969 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2014-08-27 21:30+0000\n"
+"Last-Translator: BobSynfig\n"
+"Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/"
+"fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_FR\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "La suppression n'est pas autoris??e pour %(resource)s"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s n'impl??mente pas de m??thode de mise ?? jour"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "La cr??ation n'est pas autoris??e pour %(resource)s"
+
+msgid "Unable to parse JSON request"
+msgstr "Impossible de parser la requ??te JSON"
+
+msgid "This API only supports JSON"
+msgstr "Cette API supporte uniquement le JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+"Les param??tres ne correspondent pas ?? ce qui est requis dans le sch??ma: %"
+"(err)s"
+
+msgid "You don't have permission to perform this operation."
+msgstr "Vous n'avez pas la permission d'effectuer cette op??ration."
+
+msgid "Datastore is not initiated in the model object."
+msgstr "Le magasin de donn??es n'est pas initi?? dans l'objet mod??le."
+
+#, python-format
+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 "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr ""
+"L'authentification a ??chou?? pour l'utilisateur '%(username)s'. [Code "
+"d'Erreur: %(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "Vous n'??tes pas autoris?? ?? acc??der ?? Kimchi"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "Sp??cifiez %(item)s pour vous logguer dans Kimchi"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "Impossible de trouver %(item)s dans le magasin de donn??es"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+"Timeout durant l'ex??cution de la commande '%(cmd)s' apr??s %(seconds)s "
+"secondes"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "URI %(uri)s invalide"
+
+msgid "ERROR CODE"
+msgstr "ERROR CODE"
+
+msgid "REASON"
+msgstr "REASON"
+
+msgid "STACK"
+msgstr "STACK"
+
+msgid "Go to Homepage"
+msgstr "Aller ?? la page d'accueil"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+"Le nom d'utilisateur ou le mot de passe que vous avez entr?? est incorrect. "
+"Veuillez essayer ?? nouveau."
+
+msgid "This field is required."
+msgstr "Ce champ est requis."
+
+msgid "Log in"
+msgstr "Se connecter"
+
+msgid "Logging in..."
+msgstr "En cours de connexion..."
+
+msgid "Host"
+msgstr "H??te"
+
+msgid "Guests"
+msgstr "Invit??s"
+
+msgid "Templates"
+msgstr "Mod??les"
+
+msgid "Storage"
+msgstr "Stockage"
+
+msgid "Network"
+msgstr "R??seau"
+
+msgid "Failed to get application configuration"
+msgstr "??chec lors de l'obtention de la configuration de l'application"
+
+msgid "This is not a valid Linux path"
+msgstr "Ce n'est pas un chemin Linux valide"
+
+msgid "This is not a valid URL."
+msgstr "Ce n'est pas une URL valide."
+
+msgid "No such data available."
+msgstr "De telles donn??es ne sont pas disponibles."
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"Ne peut contacter le syst??me h??te. V??rifiez que le syst??me h??te est allum?? "
+"et que vous avez une connectivit?? r??seau avec lui. R??ponse de requ??te HTTP %"
+"1."
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "Confirmation de Suppression"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Annuler"
+
+msgid "Confirm"
+msgstr "Confirmer"
+
+msgid "Create"
+msgstr "Cr??er"
+
+msgid "Warning"
+msgstr "Avertissement"
+
+msgid "Save"
+msgstr "Enregistrer"
+
+msgid "Creating..."
+msgstr "Cr??ation en cours..."
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "Chargement en cours..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "Essayer ?? nouveau"
+
+msgid "Detailed message:"
+msgstr "Message d??taill??:"
+
+msgid "No ISO found"
+msgstr "Aucune ISO d??tect??e"
+
+msgid "This is not a valid ISO file."
+msgstr "Ce n'est pas un fichier ISO valide."
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "Cela va prendre un long moment. Voulez-vous continuer ?"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr ""
+"Cela va supprimer de mani??re permanent le mod??le. Souhaites-vous continuer ?"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+"Impossible d'??teindre le syst??me du fait que certaines machines virtuelles "
+"sont lanc??es !"
+
+msgid "Max:"
+msgstr "Max:"
+
+msgid "Utilization"
+msgstr "Utilisation"
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid "Read Rate"
+msgstr "Taux en Lecture"
+
+msgid "Write Rate"
+msgstr "Taux en ??criture"
+
+msgid "Received"
+msgstr "Re??u"
+
+msgid "Sent"
+msgstr "Envoy??"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"??teindre ou red??marrer l'h??te causera la perte de tout travail non "
+"enregistr??. Continuer ?? ??teindre/red??marrer ?"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Le d??p??t sera retir?? de fa??on permanente et ne pourra ??tre r??tabli. Voulez-"
+"vous continuer ?"
+
+msgid "Repositories"
+msgstr "D??p??ts"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Base URL"
+msgstr "URL de base"
+
+msgid "Is Mirror"
+msgstr "Est un miroir"
+
+msgid "URL Args"
+msgstr "Arguments d'URL"
+
+msgid "Enabled"
+msgstr "Activ??"
+
+msgid "GPG Check"
+msgstr "V??rification GPG"
+
+msgid "GPG Key"
+msgstr "Cl?? GPG"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Edit"
+msgstr "??diter"
+
+msgid "Remove"
+msgstr "Retirer"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Disable"
+msgstr "D??sactiver"
+
+msgid "Software Updates"
+msgstr "Mises ?? jour Logiciel"
+
+msgid "Package Name"
+msgstr "Nom de paquet"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "Architecture"
+msgstr "Architecture"
+
+msgid "Repository"
+msgstr "D??p??t"
+
+msgid "Update All"
+msgstr "Tout mettre ?? jour"
+
+msgid "Updating..."
+msgstr "En cours de mise ?? jour..."
+
+msgid "Failed to retrieve packages update information."
+msgstr "??chec de r??cup??ration des informations de mise-??-jour des paquets."
+
+msgid "Failed to update package(s)."
+msgstr "??chec durant la mise ?? jour du/des paquet(s)"
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Le rapport de d??boggage sera enlev?? de fa??on permanente et ne pourra ??tre "
+"r??tabli. Voulez-vous continuer ?"
+
+msgid "Debug Reports"
+msgstr "Rapports de D??boggage"
+
+msgid "Generated Time"
+msgstr "Horodatage de g??n??ration"
+
+msgid "Generate"
+msgstr "G??n??rer"
+
+msgid "Generating..."
+msgstr "En cours de g??n??ration..."
+
+msgid "Rename"
+msgstr "Renommer"
+
+msgid "Download"
+msgstr "T??l??charger"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+"Le nom de rapport devrait contenir uniquement des lettres, nombres, "
+"soulignement ('_') et/ou tiret ('-')."
+
+msgid "Pending..."
+msgstr "En attente..."
+
+msgid "Report name is the same as the original one."
+msgstr "Le nom du rapport est le m??me que celui d'origine."
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"Cela va supprimer la machine virtuelle et tous ses disques virtuels. Cette "
+"op??ration est irr??versible. Voulez-vous continuer ?"
+
+msgid "Power off Confirmation"
+msgstr "Confirmation de mise hors tension"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+"Cette action pourrait produire des r??sultats ind??sirables, par exemple un "
+"cache disque non flush?? dans l'invit??. Voulez-vous continuer ?"
+
+msgid "Reset Confirmation"
+msgstr "Confirmation de R??initialisation"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+"Il y a un risque de perte de donn??es caus??es par une r??initialisation sans "
+"extinction de l'OS invit??. Voulez-vous continuer ?"
+
+msgid "Shut Down Confirmation"
+msgstr "Confirmation d'Extinction"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr ""
+"Noter que l'OS invit?? pourrait ignorer cette requ??te. Voulez-vous continuer ?"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr "Confirmation de suppression de Machine Virtuelle"
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ""
+"Ce CDROM sera d??tach?? de fa??on permanente et vous pourrez le r??-attacher. "
+"Continuer le d??tachement ?"
+
+msgid "Attach"
+msgstr "Attacher"
+
+msgid "Attaching..."
+msgstr "En cours d'attachement..."
+
+msgid "Replace"
+msgstr "Remplacer"
+
+msgid "Replacing..."
+msgstr "En cours de Remplacement..."
+
+msgid "Successfully attached!"
+msgstr "Attach?? avec succ??s !"
+
+msgid "Successfully replaced!"
+msgstr "Remplac?? avec succ??s !"
+
+msgid "Successfully detached!"
+msgstr "D??tach?? avec Succ??s !"
+
+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 ?"
+
+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."
+
+msgid "unavailable"
+msgstr "non disponible"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"Cette action va interrompre la connectivit?? r??seau pour tout machine "
+"virtuelle qui d??pend de ce r??seau."
+
+msgid "Create a network"
+msgstr "Cr??er un r??seau"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Ce r??seau n'est pas persistant. Au lieu de s'arr??ter, cette actionva le "
+"suppromer de mani??re permanente. Voulez-vous continuer ?"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr ""
+"Cela va effacer de mani??re permanente le pool de stockage. Voulez-vous "
+"continuer ?"
+
+msgid "This storage pool is empty."
+msgstr "Ce pool de stockage est vide."
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+"Cela va formater votre disque et vous allez perdre toutes les donn??es qui "
+"s'y trouvent, ??tes-vous s??r de continuer ?"
+
+msgid "SCSI Fibre Channel"
+msgstr "Canal Fibre SCSI"
+
+msgid "No SCSI adapters found."
+msgstr "Aucun adaptateur SCSI trouv??."
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "Le nom de pool de stockage ne peut ??tre vierge."
+
+msgid "The storage pool path can not be blank."
+msgstr "Le chemin de pool de stockage ne peut ??tre vierge."
+
+msgid "NFS server mount path can not be blank."
+msgstr "Le chemin de montage du serveur NFS ne peut ??tre vierge."
+
+msgid "Invalid NFS mount path."
+msgstr "Chemin de montage NFS invalide."
+
+msgid "No logical device selected."
+msgstr "Aucun p??riph??rique logique s??lectionn??."
+
+msgid "The iSCSI target can not be blank."
+msgstr "La cible iSCSI ne peut ??tre vierge."
+
+msgid "Server name can not be blank."
+msgstr "Le nom de serveur ne peut ??tre vierge."
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "En cours de recherche de partitions disponibles..."
+
+msgid "No available partitions found."
+msgstr "Aucune partition disponible trouv??e."
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Le pool de stockage n'est pas persistent. Au lieu de le d??sactiver, cette "
+"action va le supprimer de mani??re permanente. Voulez-vous continuer ?"
+
+msgid "Unable to retrieve partitions information."
+msgstr "Impossible de r??cup??rer les informations des partitions."
+
+msgid "In progress..."
+msgstr "En cours..."
+
+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."
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "Le pool de disque ou le volume ne peut ??tre vierge."
+
+msgid "Session timeout, please re-login."
+msgstr "Session expir??e, veuillez vous reconnecter."
+
+msgid "User Name"
+msgstr "Nom d'Utilisateur"
+
+msgid "Password"
+msgstr "Mot de Passe"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "Avertissement"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "Aucun invit?? trouv??."
+
+msgid "Help"
+msgstr "Aide"
+
+msgid "About"
+msgstr "A propos..."
+
+msgid "Log out"
+msgstr "Se d??connecter"
+
+msgid "Version:"
+msgstr "Version:"
+
+#~ msgid "Unknown parameter %(value)s"
+#~ msgstr "Param??tre inconnu %(value)s"
+
+#~ msgid "Unknown \"_cap\" specified"
+#~ msgstr "\"_cap\" sp??cifi??e inconnue"
+
+#~ msgid "\"_passthrough\" should be \"true\" or \"false\""
+#~ msgstr "\"_passthrough\" doit ??tre \"true\" ou \"false\""
+
+#~ msgid "\"_passthrough_affected_by\" should be a device name string"
+#~ msgstr "\"_passthrough_affected_by\" doit ??tre un nom de p??riph??rique"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr "Erreur durant l'acc??s aux p??riph??riques de bloc. D??tails: %(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr ""
+#~ "Erreur durant l'obtention de l'information sur le p??riph??rique de bloc %"
+#~ "(device)s."
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "Impossible de trouver le fichier de distro: %(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "Impossible de parser le fichier de distro: %(filename)s. Veuillez vous "
+#~ "assurer qu'il s'agit d'un fichier JSON."
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de se connecter ?? l'h??te cible iSCSI %(portal)s. D??tails: %"
+#~ "(err)s "
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "Impossible de se connecter ?? l'h??te iSCSI %(host)s cible %(target)s"
+
+#~ msgid "Unable to find ISO file %(filename)s"
+#~ msgstr "Impossible de trouver le fichier ISO %(filename)s"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "Le fichier ISO %(filename)s n'est pas bootable"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr ""
+#~ "Le fichier ISO %(filename)s n'a pas d'enregistrement de boot El Torito "
+#~ "valide"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "Entr??e de validation El Torito invalide dans l'ISO %(filename)s"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "Indicateur de boot El Torito invalide dans l'ISO %(filename)s"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr ""
+#~ "Type de volume inattendu pour le volume primaire dans l'ISO %(filename)s"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr ""
+#~ "Mauvais format durant la lecture du descripteur de volume dans l'ISO %"
+#~ "(filename)s"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "L'hyperviseur n'a pas la permission d'utiliser cet ISO %(filename)s. "
+#~ "Veuillez consid??rer de le d??placer sous /var/lib/libvirt,, ou de d??finir "
+#~ "la permission de recherche sur les listes de contrpole d'acc??s fichier "
+#~ "pour l'utilisateur '%(user)s' si possible, ou ajouter le '%(user)s' au "
+#~ "groupe de chemins d'ISO, ou (non recommand??)  'chmod -R o+x "
+#~ "'chemin_vers_iso'.D??tails: %(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."
+
+#~ msgid "No OS information found in given image."
+#~ msgstr "Aucune information d'OS trouv??e sur l'image donn??e."
+
+#~ msgid "Unable to read image file %(filename)s"
+#~ msgstr "Impossible de lire le fichier image %(filename)s"
+
+#~ 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."
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "La machine virtuelle %(name)s existe d??j??"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "La machine virtuelle %(name)s n'existe pas"
+
+#~ 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."
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr ""
+#~ "Impossible de r??cup??rer une capture d'??cran pour la machine virtuelle "
+#~ "stopp??e %(name)s"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "L'image ISO distante n'est pas support??e par le serveur."
+
+#~ msgid "Screenshot is not supported on virtual machine %(name)s"
+#~ msgstr "Copie d'??cran non support??e par la machine virtuelle %(name)s"
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "Impossible de cr??er la machine virtuelle %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de mettre ?? jour la machine virtuelle %(name)s. D??tails: %(err)"
+#~ "s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de r??cup??rer la machine virtuelle %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to connect to powered off virtual machine %(name)s."
+#~ msgstr "Impossible de se connecter ?? la machine virtuelle ??teinte %(name)s."
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr "L'adresse d'??coute du graphics doit ??tre IPv4 ou IPv6"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "Sp??cifier un mod??le ?? partir duquel cr??er une machine virtuelle"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de d??marrer la machine virtuelle %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de mettre hors tension la machine virtuelle %(name)s. D??tails: "
+#~ "%(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de supprimer la machine virtuelle %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de r??initrialiser la machine virtuelle %(name)s. D??tails: %"
+#~ "(err)s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "Le nom d'utilisateur doit ??tre une cha??ne de caract??res"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "Le nom de groupe doit ??tre une cha??ne de caract??res"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "Le(s) utilisateur(s) '%(users)s' n'existe(nt) pas"
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "Le(s) groupe(s) '%(groups)s' n'existe(nt) pas"
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible d'??teindre la machine virtuelle %(name)s. D??tails: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr ""
+#~ "Impossible d'acc??der aux metadata de la machine virtuelle %(name)s. "
+#~ "D??tails: %(err)s"
+
+#~ msgid "The guest console password must be a string."
+#~ msgstr ""
+#~ "Le mot de passe de console invit??e doit ??tre une cha??ne de caract??res."
+
+#~ 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"
+
+#~ msgid ""
+#~ "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
+#~ msgstr ""
+#~ "La machine virtuelle %(vmid)s ne peut pas contenir le p??riph??rique h??te "
+#~ "directement assign?? %(dev_name)s."
+
+#~ 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"
+
+#~ msgid "\"name\" should be a device name string"
+#~ msgstr "\"name\" doit ??tre un nom de p??riph??rique"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr ""
+#~ "L'interface %(iface)s n'existe pas dans la machine virtuelle %(name)s"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr ""
+#~ "Le r??seau %(network)s sp??cifi?? pour la machine virtuelle %(name)s "
+#~ "n'existe pas"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr ""
+#~ "Le type d'interface de machine virtuelle support?? est r??seau uniquement"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr ""
+#~ "Le nom de r??seau pour l'interface de la machine virtuelle doit ??tre une "
+#~ "cha??ne de caract??res"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "Mod??le de carte r??seau sp??cifi?? invalide pour l'interface de machine "
+#~ "virtuelle"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr ""
+#~ "Sp??cifier le type et le r??seau ?? ajouter ?? la nouvelle interface de la "
+#~ "machine virtuelle"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "Le mod??le %(name)s existe d??j??"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "Le r??seau '%(network)s' sp??cifi?? pour le mod??le %(template)s n'existe pas"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "Le pool de stockage sp??cifi?? %(pool)s pour le mod??le %(template)s "
+#~ "n'existe pas"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "Le pool de stockage sp??cifi?? %(pool)s pour le mod??le %(template)s n'est "
+#~ "pas actif"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "Param??tres  '%(param)s' sp??cifi?? invalide pour le CDROM"
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "Le r??seau %(network)s sp??cifi?? pour le mod??le %(template)s n'est pas actif"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "Le mod??le de nom doit ??tre une cha??ne de caract??res"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "Le mod??le d'icone doit ??tre un chemin vers l'image"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "Le mod??le de distribution doit ??tre une cha??ne de caract??res"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr ""
+#~ "Le mod??le de version de distribution doit ??tre une cha??ne de caract??res"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "Le nombre de CPU doit ??tre un nombre entier sup??rieur ?? 0"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr ""
+#~ "La quantit?? de m??moire (Mo) doit ??tre un nombre entier sup??rieur ?? 512"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "Le CDROM mod??le doit ??tre un fichier ISO local ou distant"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr "URI %(value)s du pool de stockage sp??cifi??e invalide pour le mod??le"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr ""
+#~ "Sp??cifiez une image ISO comme CDROM ou une image de base pour cr??er un "
+#~ "mod??le"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr ""
+#~ "Tous les r??seaux pour le mod??le doivent ??tre sp??cifi??s dans une liste"
+
+#~ msgid "The volume %(volume)s is not in storage pool %(pool)s"
+#~ msgstr "Le volume %(volume)s n'est pas dans le pool de stockage %(pool)s"
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "Impossible de cr??er le mod??le ?? cause de l'erreur: %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "Impossilbe de supprimer le mod??le ?? cause de l'erreur: %(err)s"
+
+#~ msgid "Disk size must be an integer greater than 1GB."
+#~ msgstr "La taille de disque doit ??tre un entier sup??rieur ?? 1Go."
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "L'image de base de mod??le doit petre un fichier image local valide"
+
+#~ msgid "Cannot identify base image %(path)s format"
+#~ msgstr "Ne peut identifier le format de l'image de base %(path)s"
+
+#~ 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."
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "Le pool de stockage %(name)s existe d??j??"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "Le pool de stockage %(name)s n'existe pas"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "Sp??cifier %(item)s afin de cr??er le pool de stockage %(name)s"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "Impossible de supprimer le pool de stockage actif %(name)s"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "Impossible de lister les pools de stockage. D??tails: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "Impossilble de cr??er le pool de stockage %(name)s. D??tails: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible d'obtenir le nombre de volumes de stockage dans le pool de "
+#~ "stockage%(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "Impossible d'activer le pool de stockage %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de d??sactiver le pool de stockage %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de supprimer le pool de stockage %(name)s. D??tails: %(err)s "
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "Impossible de cr??er le Pool NFS du fait que le chemin d'export %(path)s "
+#~ "pourrait se bloquer durant le montage"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "Impossible de cr??er le pool NFS du fait que le montage du chemin "
+#~ "d'export  %(path)s  a ??chou??"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "Type de pool de stockage non support??: %(type)s"
+
+#~ 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"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "Le chemin du pool de stockage doit ??tre une cha??ne de caract??res"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "L'h??te du pool de stockage doit ??tre une IP ou un nom d'h??te"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "Le param??tre de p??riph??rique de pool de stockage doit ??tre une list"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "La cible IQN d'un pool iSCSI doit ??tre une cha??ne de caract??res"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr ""
+#~ "Le port d'un serveur de stockage distant doit ??tre un nombre entier entre "
+#~ "1 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"
+
+#~ 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"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "Sp??cifier un nom et un type pour cr??er un pool de stockage"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s n'est pas un(e) disque/partition valide. N'a pu l'ajouter au "
+#~ "pool %(pool)s."
+
+#~ msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
+#~ msgstr "Impossible d'agrandir le pool logique %(pool)s. D??tails: %(err)s"
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr ""
+#~ "Les disques en param??tre peuvent seulement ??tre mis ?? jour pour un pool "
+#~ "de stockage logique."
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr ""
+#~ "Le nom d'adaptateur de l'h??te SCSI doit ??tre une chapine de caract??res"
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr "Le pool de stockage kimchi_isos est r??serv?? ?? un usage interne"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "Impossible d'activer le pool de stockage NFS%(name)s. Le serveur NFS %"
+#~ "(server)s n'est pas joignable."
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "Impossible de d??sactiver le pool de stockage NFS%(name)s. Le serveur NFS %"
+#~ "(server)s n'est pas joignable."
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "Impossible de d??sactiver le pool %(name)s du fait qu'il est associ?? ?? des "
+#~ "mod??les"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "Impossible de supprimer le pool %(name)s du fait qu'il est associ?? ?? des "
+#~ "mod??les"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "Un groupe de volume appel?? '%(name)s' existe d??j??. Veuillez choisir un "
+#~ "autre nom pour cr??er le pool logique."
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "Impossible de mettre ?? jour la base de donn??es avec les informations de "
+#~ "scan profond ?? cause de l'erreur: %(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "Le volume de stockage %(name)s existe d??j??"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr ""
+#~ "Le volume de stockage %(name)s n'existe pas dans le pool de stockage %"
+#~ "(pool)s"
+
+#~ 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"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr "Sp??cifier %(item)s afin de cr??er le volume de stockage %(volume)s"
+
+#~ 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 %"
+#~ "(pool)s n'est pas actif"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de cr??er le volume de stockage %(name)s dans le pool de "
+#~ "stockage %(pool)s. D??tails: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de lister les volumes de stockage dans le pool de stockage %"
+#~ "(pool)s. D??tails: %(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de wiper les volumes de stockage %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de supprimer le volume de stockage %(name)s. D??tails: %(err)s "
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de redimensionner le volume de stockage %(name)s. D??tails: %"
+#~ "(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr ""
+#~ "Le type de stockage %(type)s ne supporte pas ni la cr??ation ni la "
+#~ "suppression de volume"
+
+#~ msgid "Storage volume name must be a string"
+#~ 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 requires a volume name"
+#~ msgstr "Le volume de stockage requiert un nom de volume"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "Impossible de mettre ?? jour la base de donn??es avec les informations du "
+#~ "volume de stockage ?? cause de l'erreur: %(err)s"
+
+#~ msgid "Only one of parameter %(param)s can be specified"
+#~ msgstr "Seulement un seul des param??tre %(param)s peut ??tre sp??cifi??"
+
+#~ msgid "Create volume from %(param)s is not supported"
+#~ msgstr "La cr??ation de volume avec %(param)s n'est pas support??e"
+
+#~ 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://."
+
+#~ msgid "Unable to access file %(url)s. Please, check it."
+#~ msgstr "Impossible d'acc??der au fichier %(url)s. Veuillez le v??rifier."
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "L'interface %(name)s n'existe pas"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "Le r??seau %(name)s existe d??j??"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "Le r??seau %(name)s n'existe pas"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr ""
+#~ "Le sous-r??seau  %(subnet)s sp??cifi?? pour le r??seau %(network)s n'est pas "
+#~ "valide"
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr "Sp??cifier une interface r??seau pour cr??er le r??seau bridge %(name)s"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "Impossible de supprimer le r??seau actif %(name)s"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "L'interface %(iface)s sp??cifi??e pour le r??seau %(network)s est d??j?? "
+#~ "utilis??e"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr "L'interface doit ??tre un p??riph??rique NIC vide, bonding ou bridg??."
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "Impossible de cr??er le r??seau %(name)s. D??tails: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr ""
+#~ "Impossible de trouver une adresse IP libre pour le r??seau '%(name)s'"
+
+#~ msgid "The interface %(iface)s already exists."
+#~ msgstr "L'interface %(iface)s existe d??j??"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "Les types de r??seaux support??s sont isolated, NAT et bridge"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "Le sous-r??seau doit ??tre une chaine de caract??res avec une adresse IP et "
+#~ "un pr??fixe ou un masque de r??seau"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "L'interface de r??seau doit ??tre une cha??ne de caract??res"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "L'ID de VLAN du r??seau doit ??tre un nombre entier entre 1 et 4094"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "Sp??cifiez un nom et un type pour cr??er un r??seau"
+
+#~ msgid ""
+#~ "Unable to delete network %(name)s. There are some virtual machines %(vms)"
+#~ "s and/or templates linked to this network."
+#~ msgstr ""
+#~ "Impossible de supprimer le r??seau %(name)s. Il y a des machines "
+#~ "virtuelles %(vms)s et/ou des mod??les li??s ?? ce r??seau. "
+
+#~ msgid ""
+#~ "Unable to deactivate network %(name)s. There are some virtual machines %"
+#~ "(vms)s and/or templates linked to this network."
+#~ msgstr ""
+#~ "Impossible de d??sactiver r??seau %(name)s. Il y a des machines virtuelles%"
+#~ "(vms)s et/ou des mod??les li??s ?? ce r??seau. "
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr ""
+#~ "Le p??riph??rique bridge %(name)s ne peut ??tre le p??riph??rique tronc d'un "
+#~ "VLAN."
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "??chec durant l'activation de l'interface %(iface)s: %(err)s."
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "??chec durant l'activation de l'interface %(iface)s. Veuillez v??rifier le "
+#~ "statut du lien physique."
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "Le rapport de d??boggage %(name)s n'existe pas"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "L'outil de rapport de d??boggage n'a pas ??t?? trouv?? dans le syst??me"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr ""
+#~ "Impossible de cr??er le rapport de d??boggage %(name)s. D??tails: %(err)s."
+
+#~ msgid "Can not find any debug report with the given name %(name)s"
+#~ msgstr ""
+#~ "Impossible de trouver un rapport de d??boggage avec le nom fourni %(name)s"
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossible de g??n??rer le rapport de d??boggage %(name)s. D??tails: %(err)s"
+
+#~ msgid "You should give a name for the debug report file."
+#~ msgstr "Vous devriez donner un nom au fichier de rapport de d??boggage."
+
+#~ msgid ""
+#~ "Debug report name must be a string. Only letters, digits, underscore "
+#~ "('_') and hyphen ('-') are allowed."
+#~ msgstr ""
+#~ "Le nom du rapport de d??boggage doit ??tre une cha??ne de caract??res. "
+#~ "Seulement les lettres, chiffres, blanc soulign?? ('_') et tirets ('-') "
+#~ "sont accept??s."
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "Le rapport de d??boggage avec le nom sp??cifi?? \"%(name)s\" existe d??j??. "
+#~ "Veuillez en utiliser un autre."
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "Le server de stockage %(server)s n'??tait pas utilis?? par Kimchi"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "La distro '%(name)s' n'existe pas"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "La partition %(name)s n'existe pas sur cet h??te"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "Impossible d'??teindre la machine h??te car des machines virtuelles en sont "
+#~ "cours d'ex??cution"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "Impossible de red??marrer la machine h??te car des machines virtuelles en "
+#~ "sont cours d'ex??cution"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "P??riph??rique de noeud '%(name)s' non trouv??"
+
+#~ msgid "Conflicting flag filters specified."
+#~ msgstr "Filtres incompatibles sp??cifi??s."
+
+#~ msgid "No packages marked for update"
+#~ msgstr "Aucun paquet marqu?? pour mise ?? jour"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "Le paquet %(name)s n'est pas marqu?? pour mise ?? jour"
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr ""
+#~ "Erreur durant la r??cup??ration des paquets marqu??s pour la mise?? jour. "
+#~ "D??tails: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "Il n'y a pas de gestionnaire de paquets compatible avec ce syst??me."
+
+#~ msgid "Unable to choose a virtual machine name"
+#~ msgstr "Impossible de s??lectionner un nom de machine virtuelle"
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr ""
+#~ "Type de stockage invalide. Les Types support??s sont: 'cdrom', 'disk'"
+
+#~ msgid "Only CDROM path can be update."
+#~ msgstr "Seulement le chemin d'un CDROM peut ??tre modifi??."
+
+#~ 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"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr ""
+#~ "Erreur durant la cr??ation du nouveau p??riph??rique de stockage: %(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr "Erreur durant la mise ?? jour du p??riph??rique de stockage: %(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "Erreur durant le retrait du p??riph??rique de stockage: %(error)s"
+
+#~ msgid "Do not support IDE device hot plug"
+#~ msgstr "Ne pas supporter le branchement ?? chaud de p??riph??rique IDE"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Sp??cifier le type et le chemin ou le type et le pool/volume pour ajouter "
+#~ "un nouveau disque de machine virtuelle."
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr ""
+#~ "Sp??cifier un chemin pour mettre ?? jour le disque de machine virtuelle"
+
+#~ msgid "Controller type %(type)s limitation of %(limit)s devices reached"
+#~ msgstr ""
+#~ "La limitation de %(limit)s p??riph??riques a ??t?? atteinte pour le "
+#~ "contr??leur de type %(type)s "
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Seul un chemin ou pool/volume peut ??tre sp??cifi?? pour ajouter un nouveau "
+#~ "disque de machine virtuelle"
+
+#~ 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"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr ""
+#~ "L'ID du d??p??t YUM doit ??tre une cha??ne de caract??res ne comportant qu'un "
+#~ "seul mot"
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "L'URL du d??p??t doit ??tre une URL en http://, ftp:// ou file://."
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr ""
+#~ "La configuration du d??p??t est un dictionaire avec des valeurs sp??cifiques "
+#~ "en accord avec le type de d??p??t."
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr ""
+#~ "La distribution dans le nom de d??p??t DEB doit ??tre une cha??ne de "
+#~ "caract??res"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr ""
+#~ "Les composants dans le d??p??t DEB doivent ??tre list??s dans un tableau"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr ""
+#~ "Les composants dans le d??p??t DEB doivent ??tre une cha??ne de caract??res"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "Le nom du d??p??t YUM doit ??tre une cha??ne de caract??res"
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "La v??rification GPG doit ??tre une valeur bool??enne."
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr ""
+#~ "La cl?? GPG doit ??tre une URL pointant vers un fichier ASCII non arm??."
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "Ne peut mettre ?? jour le d??p??t %(repo_id)s."
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "Le d??p??t %(repo_id)s n'existe pas."
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr "L'outil de gestion de d??p??t n'a pas ??t?? reconnu pour votre syst??me."
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "Le d??p??t %(repo_id)s est d??j?? activ??."
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "Le d??p??t %(repo_id)s est d??j?? d??sactiv??."
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "Ne peut supprimer le d??p??t %(repo_id)s. "
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr "Ne peut ??crire le fichier de configuration du d??p??t %(repo_file)s"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr "Sp??cifier la distribution du d??p??t afin de cr??er un d??p??t DEB."
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "Ne peut activer le d??p??t %(repo_id)s."
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "Ne peut d??sactiver le d??p??t %(repo_id)s."
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "L'ID du d??p??t YUM existe d??j??"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "Le nom du d??p??t YUM doit ??tre une cha??ne de caract??res"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "Impossible de lister les d??p??ts. D??tails: '%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr ""
+#~ "Impossible de r??cup??rer les informations du d??p??t. D??tails: '%(err)s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "Impossible d'ajouter un d??p??t. D??tails: '%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "Impossible de supprimer un d??p??t. D??tails: '%(err)s'"
+
+#~ 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"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "Cr??er une nouvelle Machine Virtuelle"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "Nom de Machine Virtuelle"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "Le nm est utilis?? pour identifier une machine virtuelle. Si omis, un nom "
+#~ "sera choisi en se basant sur le mod??le utilis??."
+
+#~ msgid "Template"
+#~ msgstr "Mod??le"
+
+#~ msgid "Please create a template first."
+#~ msgstr "Veuillez d'abord cr??er un mod??le."
+
+#~ msgid "Create a Template"
+#~ msgstr "Cr??er un mod??le"
+
+#~ msgid "Please choose a template."
+#~ msgstr "Veuillez choisir un mod??le"
+
+#~ msgid "OS"
+#~ msgstr "OS"
+
+#~ msgid "OS Version"
+#~ msgstr "Version de l'OS"
+
+#~ msgid "CPUS"
+#~ msgstr "CPUS"
+
+#~ msgid "Memory"
+#~ msgstr "M??moire"
+
+#~ msgid "Edit Guest"
+#~ msgstr "??diter l'Invit??"
+
+#~ msgid "General"
+#~ msgstr "G??n??ral"
+
+#~ msgid "Interface"
+#~ msgstr "Interface"
+
+#~ msgid "Permission"
+#~ msgstr "Permission"
+
+#~ msgid "Host PCI Device"
+#~ msgstr "P??riph??rique PCI H??te"
+
+#~ msgid "CPUs"
+#~ msgstr "CPUs"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "M??moire (Mo)"
+
+#~ msgid "Icon"
+#~ msgstr "Icone"
+
+#~ msgid "Device"
+#~ msgstr "P??riph??rique"
+
+#~ msgid "Path"
+#~ msgstr "Chemin"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Available system users and groups"
+#~ msgstr "Utilisateurs et groupes syst??mes disponibles"
+
+#~ msgid "Selected system users and groups"
+#~ msgstr "Utilisateurs et groupes syst??mes s??lectionn??s"
+
+#~ msgid "All"
+#~ msgstr "Tous"
+
+#~ msgid "To Add"
+#~ msgstr "?? Ajouter"
+
+#~ msgid "Added"
+#~ msgstr "Ajouter"
+
+#~ msgid "filter"
+#~ msgstr "Filtre"
+
+#~ msgid "Product"
+#~ msgstr "Produit"
+
+#~ msgid "Vendor"
+#~ msgstr "Vendeur"
+
+#~ msgid "Detach"
+#~ msgstr "D??tacher"
+
+#~ msgid "Start"
+#~ msgstr "D??marrer"
+
+#~ msgid "Reset"
+#~ msgstr "R??initialiser"
+
+#~ msgid "Power Off"
+#~ msgstr "Mettre hors tension"
+
+#~ msgid "Actions"
+#~ msgstr "Actions"
+
+#~ msgid "Connect"
+#~ msgstr "Connecter"
+
+#~ msgid "Clone"
+#~ msgstr "Cloner"
+
+#~ msgid "Shut Down"
+#~ msgstr "??teindre"
+
+#~ msgid "Delete"
+#~ msgstr "Supprimer"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "E/S Disque"
+
+#~ msgid "Network I/O"
+#~ msgstr "E/S R??seau"
+
+#~ msgid "Livetile"
+#~ msgstr "Livetile"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "Ajouter un P??riph??rique de Stockage ?? la VM"
+
+#~ msgid "Device Type"
+#~ msgstr "Type de P??riph??rique"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr ""
+#~ "Le type de p??riph??rique. Actuellement, \"cdrom\" et \"disk\" sont "
+#~ "support??s."
+
+#~ msgid "Storage Pool"
+#~ msgstr "Pool de Stockage"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "Pool de Stockage dans lequel le volume est situ??"
+
+#~ msgid "Storage Volume"
+#~ msgstr "Volume de Stockage"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "Le volume de stockage ?? attacher"
+
+#~ msgid "File Path"
+#~ msgstr "Chemin de Fichier"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM."
+
+#~ msgid "Shut down"
+#~ msgstr "??teindre"
+
+#~ msgid "Restart"
+#~ msgstr "Red??marrer"
+
+#~ msgid "Basic Information"
+#~ msgstr "Informations de Base"
+
+#~ msgid "OS Distro"
+#~ msgstr "Distro de l'OS"
+
+#~ msgid "OS Code Name"
+#~ msgstr "Nom de code de l'OS"
+
+#~ msgid "Processor"
+#~ msgstr "Processeur"
+
+#~ msgid "System Statistics"
+#~ msgstr "Statistiques Syst??me"
+
+#~ msgid "Update Progress"
+#~ msgstr "Progr??s de la Mise ?? Jour"
+
+#, fuzzy
+#~ msgid "Filter"
+#~ msgstr "Filtre"
+
+#~ msgid "Network Name"
+#~ msgstr "Nom de R??seau"
+
+#~ msgid "State"
+#~ msgstr "??tat"
+
+#~ msgid "Network Type"
+#~ msgstr "Type de R??seau"
+
+#~ msgid "Address Space"
+#~ msgstr "Espace d'adressage"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "Le nom ne devrait pas contenir '/' et '\"'."
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "Isol??: pas de connexion ?? un r??seau externe"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: connexion physique au r??seau sortant uniquement"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr ""
+#~ "Bridg??: Les macines virtuelles sont connect??es directement au r??seau "
+#~ "physique"
+
+#~ msgid "(No interfaces found)"
+#~ msgstr "(Aucune interface trouv??e)"
+
+#~ msgid "Destination"
+#~ msgstr "Destination"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "Activer le VLAN"
+
+#~ msgid "VLAN ID"
+#~ msgstr "ID de VLAN"
+
+#~ msgid "Stop"
+#~ msgstr "Arr??ter"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "G??n??rer un Nouveau Rapport de D??boggage"
+
+#~ msgid "Report Name"
+#~ msgstr "Nom du Rapport"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "Le nom utilis?? pour identifier le rapport. Si omis, un nom sera choisi "
+#~ "bas?? sur l'heure courante. Le nom peut contenir des lettres, des nombres, "
+#~ "le soulignement (\"_\") et le tiret (\"-\")."
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "Renommer un Rapport de D??boggage"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "Le nom utilis?? pour identifer le rapport. Le nom peut contenir des "
+#~ "lettres, nombres et tirets (\"-\")."
+
+#~ msgid "Submit"
+#~ msgstr "Soumettre"
+
+#~ msgid "Add a Repository"
+#~ msgstr "Ajouter un D??p??t"
+
+#~ msgid "Identifier"
+#~ msgstr "Identificateur"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "Mot unique, identifiant unique pour le d??p??t."
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "Nom textuel pour le d??p??t."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "Champ requis"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr "URL du d??p??t. Les protocoles support??s sont http, ftp et ficheir."
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "Le d??p??t est un miroir"
+
+#~ msgid "Distribution"
+#~ msgstr "Distribution"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "Distribution du d??p??t DEB."
+
+#~ msgid "Components"
+#~ msgstr "Composants"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "Liste des composants dans le d??p??t DEB."
+
+#~ msgid "Edit Repository"
+#~ msgstr "Editer le D??p??t"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "URL de Liste de Miroir"
+
+#~ msgid "Yes"
+#~ msgstr "Oui"
+
+#~ msgid "No"
+#~ msgstr "Non"
+
+#~ msgid "Capacity"
+#~ msgstr "Capacit??"
+
+#~ msgid "Allocated"
+#~ msgstr "Allou??"
+
+#~ msgid "Location"
+#~ msgstr "Emplacement"
+
+#~ msgid "Device path"
+#~ msgstr "Chemin du P??riph??rique"
+
+#~ msgid "active"
+#~ msgstr "actif"
+
+#~ msgid "inactive"
+#~ msgstr "inactif"
+
+#~ msgid "Deactivate"
+#~ msgstr "D??sactiver"
+
+#~ msgid "Activate"
+#~ msgstr "Activer"
+
+#~ msgid "Add Volume"
+#~ msgstr "Ajouter un Volume"
+
+#~ msgid "Extend"
+#~ msgstr "??tendre"
+
+#~ msgid "Undefine"
+#~ msgstr "Supprimer"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Allocation"
+#~ msgstr "Allocation"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "D??finir un Nouveau Pool de Stockage"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "Nom de Pool de Stockage"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr ""
+#~ "Le nom utilis?? pour identifier les pools de stockage, et il ne doit pas "
+#~ "??tre vide."
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "Type de Pool de Stockage"
+
+#~ msgid "Storage Path"
+#~ msgstr "Chemin de Stockage"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr ""
+#~ "Le chemin du Pool de Stockage. Chaque Pool de Stockage doit avoir un "
+#~ "chemin unique."
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr ""
+#~ "Kimchi va essayer de cr??er un r??pertoire quand il n'existe pas d??j?? dans "
+#~ "votre syst??me."
+
+#~ msgid "NFS Server IP"
+#~ msgstr "IP du Serveur NFS"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "IP du Serveur NFS ou nom d'h??te. Il peut ??tre saisi ou entr?? ?? partir de "
+#~ "l'historique."
+
+#~ msgid "NFS Path"
+#~ msgstr "Chemin NFS"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "Le chemin NFS export?? sur le serveur NFS."
+
+#~ msgid "iSCSI Server"
+#~ msgstr "Serveur iSCSI"
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid "Port"
+#~ msgstr "Port"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "IP du Serveur iSCSI ou nom d'h??te. Il ne devrait pas ??tre vide."
+
+#~ msgid "Target"
+#~ msgstr "Cible"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "La cible iSCSI sur le serveur iSCSI"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "Ajouter l'Authentification iSCSI"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "Authentification iSCSI"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "Adaptateur SCSI"
+
+#~ msgid "Please, wait..."
+#~ msgstr "Veuillez patienter..."
+
+#~ msgid "Add a Volume to Storage Pool"
+#~ msgstr "iAjouter un Volume au Pool de Stockage"
+
+#~ msgid "Enter the remote URL here."
+#~ msgstr "Saisir une URL distante ici"
+
+#~ msgid "Upload a file"
+#~ msgstr "Charger un fichier"
+
+#~ msgid "Add Template"
+#~ msgstr "Ajouter un Mod??le"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "O?? se trouve le media source pour le mod??le ?"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "Image ISO Locale"
+
+#~ msgid "Local Image File"
+#~ msgstr "Fichier Image Local"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "Image ISO Distante"
+
+#~ msgid "Search ISOs"
+#~ msgstr "Rechercher des ISOs"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "Les ISOs suivants sont disponibles:"
+
+#~ msgid "OS: "
+#~ msgstr "OS: "
+
+#~ msgid "Version: "
+#~ msgstr "Version: "
+
+#~ msgid "Size: "
+#~ msgstr "Taille: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "Chercher plus d'ISOs"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "Cr??er des mod??les depuis l'ISO s??lectionn??"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "Je veux utiliser un fichier ISO sp??cifique"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "Chargement des ISOs distants par d??faut en cours..."
+
+#~ msgid "Arch: "
+#~ msgstr "Arch: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "Je veux utiliser une URL personnalis??e"
+
+#~ msgid "Edit Template"
+#~ msgstr "??diter un Mod??le"
+
+#~ msgid "CDROM"
+#~ msgstr "CDROM"
+
+#~ msgid "Image File"
+#~ msgstr "Fichier Image"
+
+#~ msgid "Graphics"
+#~ msgstr "Graphiques"
+
+#~ msgid "CPU Number"
+#~ msgstr "Nombre de CPU"
+
+#~ msgid "No templates found."
+#~ msgstr "Aucun mod??le trouv??."
diff --git a/po/it_IT.po b/po/it_IT.po
new file mode 100644
index 0000000..66c80f1
--- /dev/null
+++ b/po/it_IT.po
@@ -0,0 +1,1708 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "Eliminazione non consentita per %(resource)s"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s non implementa il metodo di aggiornamento"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "Creazione non consentita per %(resource)s"
+
+msgid "Unable to parse JSON request"
+msgstr "Impossibile analizzare la richiesta JSON"
+
+msgid "This API only supports JSON"
+msgstr "L'API supporta solo JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr "Archivio dati non inizializzato nell'oggetto modello."
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr "Impossibile avviare l'attivit?? a causa dell'errore: %(err)s"
+
+#, 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: %"
+"(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "Specificare %(item)s per accedere a Kimchi"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "Impossibile trovare %(item)s nell'archivio dati"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+"?? stato raggiunto il timeout durante l'esecuzione del comando '%(cmd)s' dopo "
+"%(seconds)s secondi"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "URI %(uri)s non valido"
+
+msgid "ERROR CODE"
+msgstr "CODICE DI ERRORE"
+
+msgid "REASON"
+msgstr "CAUSA"
+
+msgid "STACK"
+msgstr "STACK"
+
+msgid "Go to Homepage"
+msgstr "Vai alla home page"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+"Il nome utente o la password immessi non sono corretti. Ripetere "
+"l'operazione."
+
+msgid "This field is required."
+msgstr "Questo campo ?? obbligatorio."
+
+msgid "Log in"
+msgstr "Accedi"
+
+msgid "Logging in..."
+msgstr "Accesso in corso..."
+
+msgid "Host"
+msgstr "Host"
+
+msgid "Guests"
+msgstr "Guest"
+
+msgid "Templates"
+msgstr "Modelli"
+
+msgid "Storage"
+msgstr "Memoria"
+
+msgid "Network"
+msgstr "Rete"
+
+msgid "Failed to get application configuration"
+msgstr "Richiamo della configurazione dell'applicazione non riuscito"
+
+msgid "This is not a valid Linux path"
+msgstr "Non ?? un percorso Linux valido"
+
+msgid "This is not a valid URL."
+msgstr "Non ?? un URL valido."
+
+msgid "No such data available."
+msgstr "Dati indicati non disponibili."
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"Impossibile contattare il sistema host. Verificare che il sistema host sia "
+"attivo e che si disponga della connettivit?? di rete per tale sistema. "
+"Risposta alla richiesta HTTP %1. "
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "Conferma eliminazione"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Annulla"
+
+msgid "Confirm"
+msgstr "Conferma"
+
+msgid "Create"
+msgstr "Crea"
+
+msgid "Warning"
+msgstr "Avvertenza"
+
+msgid "Save"
+msgstr "Salva"
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "Caricamento in corso..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "Riprova"
+
+msgid "Detailed message:"
+msgstr "Messaggio dettagliato:"
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr "Non ?? un file ISO valido."
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "Richieder?? molto tempo. Continuare?"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "L'azione eliminer?? permanentemente il modello. Continuare?"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+"Impossibile arrestare il sistema poich?? sono in esecuzione alcune macchine "
+"virtuali."
+
+msgid "Max:"
+msgstr "Massimo:"
+
+msgid "Utilization"
+msgstr "Utilizzo"
+
+msgid "Available"
+msgstr "Disponibile"
+
+msgid "Read Rate"
+msgstr "Velocit?? di lettura"
+
+msgid "Write Rate"
+msgstr "Velocit?? di scrittura"
+
+msgid "Received"
+msgstr "Ricevuti"
+
+msgid "Sent"
+msgstr "Inviati"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"L'arresto o il riavvio dell'host provocher?? la perdita del lavoro non "
+"salvato. Continuare con l'arresto o il riavvio?"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Il repository verr?? rimosso permanentemente e non potr?? essere ripristinato. "
+"Si desidera continuare?"
+
+msgid "Repositories"
+msgstr "Repository"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Base URL"
+msgstr "URL di base"
+
+msgid "Is Mirror"
+msgstr "?? speculare"
+
+msgid "URL Args"
+msgstr "Argomenti URL"
+
+msgid "Enabled"
+msgstr "Abilitato"
+
+msgid "GPG Check"
+msgstr "Controllo GPG"
+
+msgid "GPG Key"
+msgstr "Chiave GPG"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Edit"
+msgstr "Modifica"
+
+msgid "Remove"
+msgstr "Rimuovi"
+
+msgid "Enable"
+msgstr "Abilita"
+
+msgid "Disable"
+msgstr "Disabilita"
+
+msgid "Software Updates"
+msgstr "Aggiornamenti del software"
+
+msgid "Package Name"
+msgstr "Nome pacchetto"
+
+msgid "Version"
+msgstr "Versione"
+
+msgid "Architecture"
+msgstr "Architettura"
+
+msgid "Repository"
+msgstr "Repository"
+
+msgid "Update All"
+msgstr "Aggiorna tutto"
+
+msgid "Updating..."
+msgstr "Aggiornamento in corso..."
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr "Aggiornamento dei pacchetti non riuscito."
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Il report del debug verr?? rimosso permanentemente e non potr?? essere "
+"ripristinato. Si desidera continuare?"
+
+msgid "Debug Reports"
+msgstr "Report di debug"
+
+msgid "Generated Time"
+msgstr "Ora di creazione"
+
+msgid "Generate"
+msgstr "Crea"
+
+msgid "Generating..."
+msgstr "Creazione in corso..."
+
+msgid "Rename"
+msgstr "Ridenomina"
+
+msgid "Download"
+msgstr "Scarica"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+"Il nome del report pu?? contenere solo lettere, cifre e/o trattini  ('-')."
+
+msgid "Pending..."
+msgstr "Caricamento in corso..."
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"L'operazione eliminer?? la macchina virtuale e i relativi dischi virtuali e "
+"non ?? reversibile. Continuare?"
+
+msgid "Power off Confirmation"
+msgstr "Conferma eliminazione"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr "Conferma eliminazione"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr "Conferma eliminazione"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "L'azione eliminer?? permanentemente il modello. Continuare?"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ""
+"Il CDROM verr?? scollegato permanentemente e non sar?? possibile ricollegarlo. "
+"Continuare con lo scollegamento?"
+
+msgid "Attach"
+msgstr "Allega"
+
+msgid "Attaching..."
+msgstr "Collegamento in corso..."
+
+msgid "Replace"
+msgstr "Sostituisci"
+
+msgid "Replacing..."
+msgstr "Sostituzione in corso..."
+
+msgid "Successfully attached!"
+msgstr "Collegamento riuscito."
+
+msgid "Successfully replaced!"
+msgstr "Sostituzione riuscita."
+
+msgid "Successfully detached!"
+msgstr "Scollegamento riuscito."
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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."
+
+msgid "unavailable"
+msgstr "non disponibile"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"L'azione interromper?? la connettivit?? di rete per qualsiasi macchina "
+"virtuale che dipende da questa rete."
+
+msgid "Create a network"
+msgstr "Crea una rete"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Il pool di memoria non ?? permanente. Invece di disattivarlo, l'azione lo "
+"eliminer?? permanentemente. Continuare?"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr "L'azione eliminer?? permanentemente il pool di memoria. Continuare?"
+
+msgid "This storage pool is empty."
+msgstr "Il pool di memoria ?? vuoto."
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+"Il disco verr?? formattato e tutti i dati su di esso andranno persi, sicuri "
+"di voler continuare? "
+
+msgid "SCSI Fibre Channel"
+msgstr "Canale a fibre ottiche SCSI"
+
+msgid "No SCSI adapters found."
+msgstr "Nessun adattatore SCSI trovato."
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "Il campo per il nome del pool di memoria non pu?? essere vuoto."
+
+msgid "The storage pool path can not be blank."
+msgstr "Il campo per il percorso del pool di memoria non pu?? essere vuoto."
+
+msgid "NFS server mount path can not be blank."
+msgstr ""
+"Il campo per il percorso di montaggio del server NFS non pu?? essere vuoto."
+
+msgid "Invalid NFS mount path."
+msgstr "Percorso di montaggio NFS non valido."
+
+msgid "No logical device selected."
+msgstr "Nessun dispositivo logico selezionato."
+
+msgid "The iSCSI target can not be blank."
+msgstr "Il campo per la destinazione iSCSI non pu?? essere vuoto."
+
+msgid "Server name can not be blank."
+msgstr "Il campo per il nome del server non pu?? essere vuoto."
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "Ricerca di partizioni disponibili in corso..."
+
+msgid "No available partitions found."
+msgstr "Nessuna partizione disponibile trovata."
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Il pool di memoria non ?? permanente. Invece di disattivarlo, l'azione lo "
+"eliminer?? permanentemente. Continuare?"
+
+msgid "Unable to retrieve partitions information."
+msgstr ""
+"Impossibile richiamare le informazioni sul repository. Dettagli: '%(err)s'"
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "Il campo per il nome del pool di memoria non pu?? essere vuoto."
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr "Nome utente"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "Avvertenza"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "Nessuna macchina guest trovata."
+
+msgid "Help"
+msgstr "Guida"
+
+msgid "About"
+msgstr "Info su"
+
+msgid "Log out"
+msgstr "Disconnetti"
+
+msgid "Version:"
+msgstr "Versione:"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr ""
+#~ "Errore durante il richiamo dei dispositivi del blocco. Dettagli: %(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr ""
+#~ "Errore durante il richiamo delle informazioni sul dispositivo del blocco "
+#~ "per %(device)s."
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "Impossibile trovare il file distro: %(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "Impossibile analizzare il file distro: %(filename)s. Verificare che sia "
+#~ "un file JSON."
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile accedere a %(portal)s di destinazione host iSCSI. Dettagli: %"
+#~ "(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr ""
+#~ "Impossibile accedere alla destinazione %(target)s host %(host)s iSCSI"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "Il file ISO %(filename)s non ?? avviabile"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr "Il file ISO %(filename)s non ha un record di avvio El Torito valido"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "Voce di convalida El Torito non valida in ISO %(filename)s"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "Indicatore di avvio El Torito non valido in ISO %(filename)s"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr ""
+#~ "Tipo di volume imprevisto per il volume primario in ISO %(filename)s"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr ""
+#~ "Formato non corretto durante la lettura del descrittore volume in ISO %"
+#~ "(filename)s"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "L'hypervisor non dispone dell'autorizzazione per utilizzare questo ISO %"
+#~ "(filename)s. Spostarlo in /var/lib/libvirt o impostare l'autorizzazione "
+#~ "di ricerca per gli elenchi di controllo accesso ai file per l'utente '%"
+#~ "(user)s',  se possibile, o aggiungere '%(user)s' al gruppo percorso ISO o "
+#~ "(non consigliato) 'chmod -R o+x 'path_to_iso'. Dettagli: %(err)s"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "Macchina virtuale %(name)s gi?? esistente"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "La macchina virtuale %(name)s non esiste"
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr ""
+#~ "Impossibile richiamare l'immagine per la macchina virtuale arrestata %"
+#~ "(name)s"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "L'immagine ISO remota non ?? supportata da questo server."
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile richiamare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr ""
+#~ "L'indirizzo dei grafici su cui rimanere in ascolto deve essere IPv4 o IPv6"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "Specificare un modello da cui creare una macchina virtuale"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile eliminare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile ridenominare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "Il nome della rete deve essere una stringa"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "Il nome della rete deve essere una stringa"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "L'utente '%(users)s' non esiste."
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "L'utente '%(groups)s' non esiste."
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr ""
+#~ "Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "L'interfaccia %(iface)s non esiste nella macchina virtuale %(name)s"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr ""
+#~ "La rete %(network)s specificata per la macchina virtuale %(name)s non "
+#~ "esiste"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr ""
+#~ "Il tipo supportato per le interfacce della macchina virtuale ?? solo rete"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr ""
+#~ "Il nome di rete per l'interfaccia della macchina virtuale deve essere una "
+#~ "stringa"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "Scheda modello di rete non valida per l'interfaccia della macchina "
+#~ "virtuale"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr ""
+#~ "Specificare il tipo e la rete per aggiungere una nuova interfaccia della "
+#~ "macchina virtuale"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "Modello %(name)s gi?? esistente"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "La rete '%(network)s' specificata per il modello %(template)s non esiste"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "Il pool di memoria %(pool)s specificato per il modello %(template)s non "
+#~ "esiste"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "Il pool di memoria %(pool)s specificato per il modello %(template)s non ?? "
+#~ "attivo"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "Parametro non valido %(param)s' specificato per CDROM."
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "La rete %(network)s specificata per il modello %(template)s non ?? attiva"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "Il nome del modello deve essere una stringa"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "L'icona del modello deve essere un percorso all'immagine"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "La distribuzione del modello deve essere una stringa"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "La versione della distribuzione del modello deve essere una stringa"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "Il numero di CPU deve essere un numero intero"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr ""
+#~ "La quantit?? di memoria (MB) deve essere un numero intero maggiore di  512"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "Il CDROM del modello deve essere un file ISO locale o remoto"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr ""
+#~ "URI pool di memoria non valido: %(value)s specificato per il modello"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr "Specificare un'immagine ISO come CDROM per creare un modello"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr ""
+#~ "Tutte le reti per il modello devono essere specificate in un elenco."
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "Impossibile creare il modello a causa dell'errore: %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "Impossibile eliminare il modello a causa dell'errore: %(err)s"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "Il CDROM del modello deve essere un file ISO locale o remoto"
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "Pool di memoria %(name)s gi?? esistente"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "Il pool di memoria %(name)s non esiste"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "Specificare %(item)s per poter creare il  pool di memoria %(name)s"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "Impossibile eliminare il pool di memoria attivo %(name)s"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "Impossibile elencare i pool di memoria. Dettagli: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "Impossibile creare il pool di memoria %(name)s. Dettagli: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile ottenere il numero di volumi di memoria nel pool di memoria %"
+#~ "(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "Impossibile attivare il pool di memoria %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile disattivare il pool di memoria %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile eliminare il pool di memoria %(name)s. Dettagli: %(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "Impossibile creare il pool NFS poich?? il percorso di esportazione %(path)"
+#~ "s potrebbe bloccarsi durante il montaggio"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "Impossibile creare il pool NFS poich?? il montaggio del percorso di "
+#~ "esportazione %(path)s ha avuto esito negativo"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "Tipo di pool di memoria non supportato: %(type)s"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "Il percorso del pool di memoria deve essere una stringa"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "L'host del pool di memoria deve essere un nome host o IP"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "Il parametro dispositivi pool di memoria deve essere un elenco"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "L'IQN di destinazione di un pool iSCSI deve essere una stringa"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr ""
+#~ "La porta di un server di memoria remoto deve essere un numero intero tra "
+#~ "1 e 65535"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "Specificare nome e tipo per creare un pool di memoria"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s non ?? un disco/partizione valido. Impossibile aggiungerlo al "
+#~ "pool %(pool)s."
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr ""
+#~ "Solo il parametro dischi pu?? essere aggiornato per il pool di memoria "
+#~ "logico."
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "Il nome adattatore host SCSI deve essere una stringa."
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr "Il pool di memoria kimchi_isos ?? riservato per uso interno"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "Impossibile attivare il pool di memoria NFS %(name)s. Il server NFS %"
+#~ "(server)s ?? irraggiungibile."
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "Impossibile disattivare il pool di memoria NFS %(name)s. Il server NFS %"
+#~ "(server)s ?? irraggiungibile."
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "Impossibile disattivare il pool %(name)s poich?? ?? associato ad alcuni "
+#~ "modelli"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "Impossibile eliminare il pool %(name)s poich?? ?? associato ad alcuni "
+#~ "modelli"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "Un gruppo di volumi denominato '%(name)s' esiste gi??. Scegliere un altro "
+#~ "nome per creare il pool logico."
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "Impossibile aggiornare il database con informazioni approfondite sulla "
+#~ "scansione a causa dell'errore: %(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "Volume di memoria %(name)s gi?? esistente"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr ""
+#~ "Il volume di memoria %(name)s non esiste nel pool di memoria %(pool)s"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr ""
+#~ "Specificare %(item)s per poter creare il volume di memoria %(volume)s"
+
+#~ 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 non ?? attivo"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile creare il volume di memoria %(name)s nel pool di memoria %"
+#~ "(pool)s. Dettagli: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile elencare i volumi di memoria nel pool di memoria %(pool)s. "
+#~ "Dettagli: %(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile ripulire i volumi di memoria %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile eliminare il volume di memoria %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "Impossibile ridimensionare il volume di memoria %(name)s. Dettagli: %(err)"
+#~ "s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr ""
+#~ "Il tipo di memoria %(type)s non supporta la creazione ed eliminazione del "
+#~ "volume"
+
+#~ msgid "Storage volume name must be a string"
+#~ 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 requires a volume name"
+#~ msgstr "Il volume di memoria richiede un nome volume"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "Impossibile aggiornare il database con informazioni sul volume di memoria "
+#~ "a causa dell'errore: %(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "L'interfaccia %(name)s non esiste"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "Rete %(name)s gi?? esistente"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "La rete %(name)s non esiste"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr ""
+#~ "La sottorete %(subnet)s specificata per la rete %(network)s non ?? valida ."
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr ""
+#~ "Specificare un'interfaccia di rete per creare la rete con bridge %(name)s"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "Impossibile eliminare la rete attiva %(name)s"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "L'interfaccia %(iface)s specificata per la rete %(network)s ?? gi?? in uso"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr ""
+#~ "L'interfaccia deve essere un dispositivo bridge o di collegamento NIC "
+#~ "bare-metal."
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'"
+
+#~ msgid "The interface %(iface)s already exists."
+#~ msgstr "L'interfaccia %(iface)s gi?? esistente."
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "I tipi di rete supportati sono isolata, NAT e   bridge"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "La sottorete della rete deve essere una stringa con indirizzo IP e "
+#~ "prefisso o maschera di rete"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "L'interfaccia di rete deve essere una stringa"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "L'ID VLAN di rete deve essere un numero intero tra 1 e 4094"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "Specificare nome e tipo per creare una rete"
+
+#~ msgid ""
+#~ "Unable to delete network %(name)s. There are some virtual machines %(vms)"
+#~ "s and/or templates linked to this network."
+#~ msgstr ""
+#~ "Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali %"
+#~ "(vms)s e/o modelli collegati a tale rete."
+
+#~ msgid ""
+#~ "Unable to deactivate network %(name)s. There are some virtual machines %"
+#~ "(vms)s and/or templates linked to this network."
+#~ msgstr ""
+#~ "Impossibile disattivare la rete %(name)s. Ci sono alcune macchine "
+#~ "virtualie %(vms)s e/o modelli collegati a tale rete."
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr ""
+#~ "Il dispositivo bridge %(name)s non pu?? essere il dispositivo trunk di una "
+#~ "VLAN."
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "Impossibile attivare l'interfaccia %(iface)s: %(err)s."
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "Impossibile attivare l'interfaccia %(iface)s. Controllare lo stato del "
+#~ "link fisico."
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "Il report di debug %(name)s non esiste"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "Strumento report di debug non trovato nel sistema"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr "Impossibile creare il report di debug %(name)s. Dettagli: %(err)s."
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr "Impossibile generare il report di debug %(name)s. Dettagli: %(err)s"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "Un gruppo di volumi denominato '%(name)s' esiste gi??. Scegliere un altro "
+#~ "nome per creare il pool logico."
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "Il server di memoria %(server)s non ?? stato utilizzato da Kimchi"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "Distro '%(name)s' non esistente"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "La partizione %(name)s non esiste nell'host"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "Impossibile arrestare la macchina host poich?? sono presenti macchine "
+#~ "virtuali in esecuzione"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "Impossibile riavviare la macchina host poich?? sono presenti macchine "
+#~ "virtuali in esecuzione"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "Dispositivo nodo '%(name)s' non trovato"
+
+#~ msgid "No packages marked for update"
+#~ msgstr "Nessun pacchetto contrassegnato per l'aggiornamento"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "Il pacchetto %(name)s non ?? contrassegnato per l'aggiornamento."
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr ""
+#~ "Errore durante il richiamo dei pacchetti contrassegnati per "
+#~ "l'aggiornamento. Dettagli: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "Non ?? presente un gestore pacchetti compatibile per questo sistema."
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "Tipo di memoria non valido. I tipi supportati sono: 'cdrom'"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr ""
+#~ "Errore durante la creazione del nuovo dispositivo di memoria: %(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr ""
+#~ "Errore durante l'aggiornamento del dispositivo di memoria: %(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "Errore durante la rimozione del dispositivo di memoria: %(error)s"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Specificare tipo e percorso per aggiungere un nuovo disco della macchina "
+#~ "virtuale"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr ""
+#~ "Specificare il percorso per aggiornare il disco della macchina virtuale"
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Specificare tipo e percorso per aggiungere un nuovo disco della macchina "
+#~ "virtuale"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr "L'ID repository YUM deve essere una stringa di una sola parola."
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "L'URL del repository deve essere http://, ftp:// o file:// URL."
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr ""
+#~ "La configurazione del repository ?? un dizionario con valori specifici in "
+#~ "base al tipo di repository."
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "La distribuzione al repository DEB deve essere una stringa"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr ""
+#~ "I componenti per il repository DEB devono essere elencati in un array"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "I componenti per il repository DEB devono essere una stringa"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "Il nome del repository YUM deve essere una stringa."
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "Il controllo GPG deve essere un valore booleano."
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr "La chiave GPG deve essere un URL che punta al file blindato ASCII."
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "Impossibile aggiornare il repository %(repo_id)s."
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "Il repository %(repo_id)s non esiste."
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr ""
+#~ "Lo strumento di gestione del repository non ?? stato riconosciuto per il "
+#~ "sistema."
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "Il repository %(repo_id)s ?? gi?? abilitato."
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "Il repository %(repo_id)s ?? gi?? disabilitato."
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "Impossibile rimuovere il repository %(repo_id)s."
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr ""
+#~ "Impossibile scrivere il file di configurazione del repository %(repo_file)"
+#~ "s"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr ""
+#~ "Specificare la distribuzione del repository per poter creare un "
+#~ "repository DEB."
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "Impossibile abilitare il repository %(repo_id)s."
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "Impossibile disabilitare il repository %(repo_id)s."
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "ID repository YUM gi?? esistente"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "Il nome del repository YUM deve essere una stringa"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "Impossibile elencare i repository. Dettagli: '%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr ""
+#~ "Impossibile richiamare le informazioni sul repository. Dettagli: '%(err)s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "Impossibile aggiungere il repository. Dettagli: '%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "Impossibile rimuovere il repository. Dettagli: '%(err)s'"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "Crea una nuova macchina virtuale"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "Nome macchina virtuale"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "Il nome utilizzato per identificare la macchina virtuale. Se il nome "
+#~ "viene omesso ne verr?? scelto uno in base al modello utilizzato."
+
+#~ msgid "Template"
+#~ msgstr "Modello"
+
+#~ msgid "Please create a template first."
+#~ msgstr "Creare prima un modello."
+
+#~ msgid "Create a Template"
+#~ msgstr "Crea un modello"
+
+#~ msgid "Please choose a template."
+#~ msgstr "Scegliere un modello."
+
+#~ msgid "OS"
+#~ msgstr "SO"
+
+#~ msgid "OS Version"
+#~ msgstr "Versione SO"
+
+#~ msgid "CPUS"
+#~ msgstr "CPUS"
+
+#~ msgid "Memory"
+#~ msgstr "Memoria"
+
+#~ msgid "Edit Guest"
+#~ msgstr "Modifica guest"
+
+#~ msgid "General"
+#~ msgstr "Generale"
+
+#~ msgid "Interface"
+#~ msgstr "Interfaccia"
+
+#~ msgid "Permission"
+#~ msgstr "Versione"
+
+#~ msgid "CPUs"
+#~ msgstr "CPU"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "Memoria"
+
+#~ msgid "Icon"
+#~ msgstr "Icona"
+
+#~ msgid "Device"
+#~ msgstr "Nome dispositivo"
+
+#~ msgid "Path"
+#~ msgstr "Percorso NFS"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "All"
+#~ msgstr "Tutti"
+
+#~ msgid "Vendor"
+#~ msgstr "Fornitore"
+
+#~ msgid "Detach"
+#~ msgstr "Scollega"
+
+#~ msgid "Start"
+#~ msgstr "Avvia"
+
+#~ msgid "Reset"
+#~ msgstr "Reimposta"
+
+#~ msgid "Actions"
+#~ msgstr "Azioni"
+
+#~ msgid "Connect"
+#~ msgstr "Connetti"
+
+#~ msgid "Shut Down"
+#~ msgstr "Arresta"
+
+#~ msgid "Delete"
+#~ msgstr "Elimina"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "I/O disco"
+
+#~ msgid "Network I/O"
+#~ msgstr "I/O di rete"
+
+#~ msgid "Livetile"
+#~ msgstr "Riquadro animato"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "Aggiungi un dispositivo di memoria alla VM"
+
+#~ msgid "Device Type"
+#~ msgstr "Tipo dispositivo"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "Il tipo di dispositivo. Attualmente, ?? supportato solo \"cdrom\"."
+
+#~ msgid "Storage Pool"
+#~ msgstr "Pool di memoria"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "Il percorso del pool di memoria deve essere una stringa"
+
+#~ msgid "Storage Volume"
+#~ msgstr "Nome pool di memoria"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "Il nome del volume di memoria deve essere una stringa"
+
+#~ msgid "File Path"
+#~ msgstr "Percorso file"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "Il percorso file ISO nel server per CDROM."
+
+#~ msgid "Shut down"
+#~ msgstr "Arresta"
+
+#~ msgid "Restart"
+#~ msgstr "Riavvia"
+
+#~ msgid "Basic Information"
+#~ msgstr "Informazioni di base"
+
+#~ msgid "OS Distro"
+#~ msgstr "Distro SO"
+
+#~ msgid "OS Code Name"
+#~ msgstr "Nome codice SO"
+
+#~ msgid "Processor"
+#~ msgstr "Processore"
+
+#~ msgid "System Statistics"
+#~ msgstr "Statistiche di sistema"
+
+#~ msgid "Update Progress"
+#~ msgstr "Avanzamento aggiornamento"
+
+#~ msgid "Network Name"
+#~ msgstr "Nome rete"
+
+#~ msgid "State"
+#~ msgstr "Stato"
+
+#~ msgid "Network Type"
+#~ msgstr "Tipo di Rete"
+
+#~ msgid "Address Space"
+#~ msgstr "Spazio indirizzo"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "Nome pool di memoria non valido. Non deve contenere '/'."
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "Isolata: nessuna connessione di rete fisica"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: solo connessione di rete fisica in uscita"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr ""
+#~ "Con bridge: le macchine virtuali sono connesse direttamente alla rete "
+#~ "fisica"
+
+#~ msgid "Destination"
+#~ msgstr "Destinazione:"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "Abilita VLAN:"
+
+#~ msgid "VLAN ID"
+#~ msgstr "ID VLAN:"
+
+#~ msgid "Stop"
+#~ msgstr "Arresta"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "Crea un nuovo report di debug"
+
+#~ msgid "Report Name"
+#~ msgstr "Nome report"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "Il nome utilizzato per identificare il report. Se il nome viene omesso, "
+#~ "ne viene scelto uno in base all'ora corrente. Il nome pu?? contenere "
+#~ "lettere, cifre e trattini (\"-\")."
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "Crea un nuovo report di debug"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "Il nome utilizzato per identificare il report. Se il nome viene omesso, "
+#~ "ne viene scelto uno in base all'ora corrente. Il nome pu?? contenere "
+#~ "lettere, cifre e trattini (\"-\")."
+
+#~ msgid "Add a Repository"
+#~ msgstr "Aggiungi un repository"
+
+#~ msgid "Identifier"
+#~ msgstr "Identificativo"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "Identificativo univoco di una sola parola per il  repository."
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "Nome in formato testo per il repository."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "Campo obbligatorio"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr "URL al repository. I protocolli supportati sono http, ftp e file."
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "Il repository ?? un elemento speculare."
+
+#~ msgid "Distribution"
+#~ msgstr "Distribuzione"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "Distribuzione del repository DEB."
+
+#~ msgid "Components"
+#~ msgstr "Componenti"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "Elenco di componenti nel repository DEB."
+
+#~ msgid "Edit Repository"
+#~ msgstr "Modifica repository"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "URL elenco elementi speculari"
+
+#~ msgid "Yes"
+#~ msgstr "S??"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Capacity"
+#~ msgstr "Capacit??"
+
+#~ msgid "Allocated"
+#~ msgstr "Assegnato"
+
+#~ msgid "Location"
+#~ msgstr "Ubicazione"
+
+#~ msgid "Device path"
+#~ msgstr "Percorso dispositivo"
+
+#~ msgid "active"
+#~ msgstr "attivo"
+
+#~ msgid "inactive"
+#~ msgstr "non attivo"
+
+#~ msgid "Deactivate"
+#~ msgstr "Disattiva"
+
+#~ msgid "Activate"
+#~ msgstr "Attiva"
+
+#~ msgid "Undefine"
+#~ msgstr "Rimuovi definizione"
+
+#~ msgid "Format"
+#~ msgstr "Formato:"
+
+#~ msgid "Allocation"
+#~ msgstr "Allocazione:"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "Definisci un nuovo pool di memoria"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "Nome pool di memoria"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr ""
+#~ "Il nome utilizzato per identificare i pool di memoria; il campo non deve "
+#~ "essere vuoto."
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "Tipo di pool di memoria"
+
+#~ msgid "Storage Path"
+#~ msgstr "Percorso di memoria"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr ""
+#~ "Il percorso del pool di memoria. Ogni pool di memoria deve avere un "
+#~ "percorso univoco."
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr ""
+#~ "Kimchi tenter?? di creare la directory nel caso non esista ancora sul "
+#~ "sistema."
+
+#~ msgid "NFS Server IP"
+#~ msgstr "IP server NFS"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "Il nome host o l'indirizzo IP del server NFS. ?? possibile immetterlo o "
+#~ "sceglierlo dalla cronologia."
+
+#~ msgid "NFS Path"
+#~ msgstr "Percorso NFS"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "Il percorso esportato NFS sul server NFS."
+
+#~ msgid "iSCSI Server"
+#~ msgstr "Server iSCSI"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Port"
+#~ msgstr "Porta"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr ""
+#~ "Il nome host o l'indirizzo IP del server iSCSI. Il campo non deve essere "
+#~ "vuoto."
+
+#~ msgid "Target"
+#~ msgstr "Destinazione"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "La destinazione iSCSI sul server iSCSI"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "Aggiungi autenticazione iSCSI"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "Autenticazione iSCSI"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "Adattatore SCSI"
+
+#~ msgid "Please, wait..."
+#~ msgstr "Attendere..."
+
+#~ msgid "Add Template"
+#~ msgstr "Aggiungi modello"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "Dov'?? il supporto di origine per questo modello?"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "Immagine ISO locale"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "Immagine ISO remota"
+
+#~ msgid "Search ISOs"
+#~ msgstr "Ricerca ISO"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "Sono disponibili i seguenti file ISO:"
+
+#~ msgid "OS: "
+#~ msgstr "SO: "
+
+#~ msgid "Version: "
+#~ msgstr "Versione: "
+
+#~ msgid "Size: "
+#~ msgstr "Dimensione: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "Ricerca pi?? ISO"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "Crea modelli da ISO selezionato"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "Utilizzare un file ISO specifico"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "Caricamento di ISO remoti predefiniti in corso..."
+
+#~ msgid "Arch: "
+#~ msgstr "Arch: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "Utilizzare un URL personalizzato"
+
+#~ msgid "Edit Template"
+#~ msgstr "Modifica modello"
+
+#~ msgid "CDROM"
+#~ msgstr "CDROM"
+
+#~ msgid "Graphics"
+#~ msgstr "Grafici"
+
+#~ msgid "CPU Number"
+#~ msgstr "Numero CPU"
+
+#~ msgid "No templates found."
+#~ msgstr "Nessun modello trovato."
diff --git a/po/ja_JP.po b/po/ja_JP.po
new file mode 100644
index 0000000..2d817ed
--- /dev/null
+++ b/po/ja_JP.po
@@ -0,0 +1,1681 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "%(resource)s ?????????????????????????????????"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s ????????????????????????????????????????????????"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "%(resource)s ?????????????????????????????????"
+
+msgid "Unable to parse JSON request"
+msgstr "JSON ??????????????????????????????"
+
+msgid "This API only supports JSON"
+msgstr "?????? API ??? JSON ???????????????????????????"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr "????????????????????????????????????????????????????????????: %(err)s"
+
+#, python-format
+msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr ""
+"???????????????%(username)s????????????????????????????????????[?????????????????????: %(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "Kimchi ????????????????????????????????????????????????"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "Kimchi ??????????????????????????????%(item)s ??????????????????"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "%(item)s ????????????????????????????????????????????????"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+"???????????????%(cmd)s????????????????????????????????????%(seconds)s ????????????????????????????????????"
+"??????????????????"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "????????? URI %(uri)s"
+
+msgid "ERROR CODE"
+msgstr "?????????????????????"
+
+msgid "REASON"
+msgstr "??????"
+
+msgid "STACK"
+msgstr "????????????"
+
+msgid "Go to Homepage"
+msgstr "????????????????????????????????????"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "This field is required."
+msgstr "???????????????????????????????????????"
+
+msgid "Log in"
+msgstr "????????????"
+
+msgid "Logging in..."
+msgstr "???????????????????????????..."
+
+msgid "Host"
+msgstr "?????????"
+
+msgid "Guests"
+msgstr "?????????"
+
+msgid "Templates"
+msgstr "??????????????????"
+
+msgid "Storage"
+msgstr "???????????????"
+
+msgid "Network"
+msgstr " ??????????????????"
+
+msgid "Failed to get application configuration"
+msgstr "???????????????????????????????????????????????????????????????"
+
+msgid "This is not a valid Linux path"
+msgstr "????????? Linux ???????????????????????????"
+
+msgid "This is not a valid URL."
+msgstr "????????? URL ????????????????????????"
+
+msgid "No such data available."
+msgstr "?????????????????????????????????????????????"
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"??????????????????????????????????????????????????????????????????HTTP ???????????? %1"
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "???????????????"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "??????"
+
+msgid "Confirm"
+msgstr "??????"
+
+msgid "Create"
+msgstr "??????"
+
+msgid "Warning"
+msgstr "??????"
+
+msgid "Save"
+msgstr "??????"
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "????????????????????????..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "?????????"
+
+msgid "Detailed message:"
+msgstr "?????????????????????:"
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr "????????? ISO ????????????????????????????????????"
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "?????????????????????????????????????????????????????????????????????????"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "??????????????????????????????????????????????????????????????????????"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????!"
+
+msgid "Max:"
+msgstr "??????:"
+
+msgid "Utilization"
+msgstr "?????????"
+
+msgid "Available"
+msgstr "????????????"
+
+msgid "Read Rate"
+msgstr "??????????????????"
+
+msgid "Write Rate"
+msgstr "??????????????????"
+
+msgid "Received"
+msgstr "????????????"
+
+msgid "Sent"
+msgstr "????????????"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"?????????????????????/???????????????????????????????"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Repositories"
+msgstr "??????????????????"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "??????"
+
+msgid "Base URL"
+msgstr "????????? URL"
+
+msgid "Is Mirror"
+msgstr "?????????"
+
+msgid "URL Args"
+msgstr "URL ??????"
+
+msgid "Enabled"
+msgstr "????????????"
+
+msgid "GPG Check"
+msgstr "GPG ????????????"
+
+msgid "GPG Key"
+msgstr "GPG ???"
+
+msgid "Add"
+msgstr "??????"
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Remove"
+msgstr "??????"
+
+msgid "Enable"
+msgstr "????????????"
+
+msgid "Disable"
+msgstr "????????????"
+
+msgid "Software Updates"
+msgstr "????????????????????????"
+
+msgid "Package Name"
+msgstr "??????????????????"
+
+msgid "Version"
+msgstr "???????????????"
+
+msgid "Architecture"
+msgstr "????????????????????????"
+
+msgid "Repository"
+msgstr "??????????????????"
+
+msgid "Update All"
+msgstr "???????????????"
+
+msgid "Updating..."
+msgstr "?????????????????????..."
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr "???????????????????????????????????????????????????"
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"???????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Debug Reports"
+msgstr "???????????????????????????"
+
+msgid "Generated Time"
+msgstr "????????????"
+
+msgid "Generate"
+msgstr "??????"
+
+msgid "Generating..."
+msgstr "?????????????????????..."
+
+msgid "Rename"
+msgstr "????????????"
+
+msgid "Download"
+msgstr "??????????????????"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr "????????????????????????????????????????????????????????????????????????????????? (-) ???????????????"
+
+msgid "Pending..."
+msgstr "????????????????????????..."
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"?????????????????????????"
+
+msgid "Power off Confirmation"
+msgstr "???????????????"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr "???????????????"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr "???????????????"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "??????????????????????????????????????????????????????????????????????"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ?????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Attach"
+msgstr "??????"
+
+msgid "Attaching..."
+msgstr "?????????????????????..."
+
+msgid "Replace"
+msgstr "??????"
+
+msgid "Replacing..."
+msgstr "?????????????????????..."
+
+msgid "Successfully attached!"
+msgstr "???????????????????????????!"
+
+msgid "Successfully replaced!"
+msgstr "???????????????????????????!"
+
+msgid "Successfully detached!"
+msgstr "??????????????????????????????!"
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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 ???????????????????????????????????????"
+
+msgid "unavailable"
+msgstr "????????????"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"??????????????????"
+
+msgid "Create a network"
+msgstr "???????????????????????????"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"??????????????????????????????????????????????????????????????????????????????????"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr "???????????????????????????????????????????????????????????????????????????????"
+
+msgid "This storage pool is empty."
+msgstr "????????????????????????????????????????????????"
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+"????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "SCSI Fibre Channel"
+msgstr "SCSI ??????????????????????????????"
+
+msgid "No SCSI adapters found."
+msgstr "SCSI ??????????????????????????????????????????"
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "?????????????????????????????????????????????????????????????????????????????????"
+
+msgid "The storage pool path can not be blank."
+msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "NFS server mount path can not be blank."
+msgstr "NFS ???????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Invalid NFS mount path."
+msgstr "NFS ???????????????????????????????????????"
+
+msgid "No logical device selected."
+msgstr "???????????????????????????????????????????????????"
+
+msgid "The iSCSI target can not be blank."
+msgstr "iSCSI ??????????????????????????????????????????????????????????????????"
+
+msgid "Server name can not be blank."
+msgstr "??????????????????????????????????????????????????????????????????"
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "?????????????????????????????????????????????????????????..."
+
+msgid "No available partitions found."
+msgstr "???????????????????????????????????????????????????????????????"
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"??????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Unable to retrieve partitions information."
+msgstr "?????????????????????????????????????????????????????????: ???%(err)s???"
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "?????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr "???????????????"
+
+msgid "Password"
+msgstr "???????????????"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "??????"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "????????????????????????????????????"
+
+msgid "Help"
+msgstr "?????????"
+
+msgid "About"
+msgstr "????????????"
+
+msgid "Log out"
+msgstr "???????????????"
+
+msgid "Version:"
+msgstr "???????????????: "
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr ""
+#~ "????????????????????????????????????????????????????????????????????????????????????????????????: %(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr ""
+#~ "%(device)s ?????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "??????"
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "???????????????????????????????????????????????? %(filename)s ????????????????????????"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????? %(filename)s ???????????????????????????JSON ??????"
+#~ "???????????????????????????????????????????????????"
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "iSCSI ??????????????????????????? %(portal)s ???????????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "iSCSI ????????? %(host)s ??????????????? %(target)s ??????????????????????????????"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "ISO ???????????? %(filename)s ??????????????????????????????????????????"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr ""
+#~ "ISO ???????????? %(filename)s ?????????????????? El Torito ????????????????????????????????????"
+#~ "??????"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "????????? El Torito ???????????????????????? ISO %(filename)s ???????????????"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr ""
+#~ "????????? El Torito ???????????????????????????????????? ISO %(filename)s ???????????????"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr ""
+#~ "1 ?????????????????????????????????????????????????????????????????? ISO %(filename)s ???????????????"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr ""
+#~ "????????????????????????????????????????????? ISO %(filename)s ???????????????????????????????????????"
+#~ "????????????????????????????????????"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "????????????????????????????????? ISO %(filename)s ??????????????????????????????????????????/var/"
+#~ "lib/libvirt ???????????????????????????????????????????????????????????????%(user)s??????????????????"
+#~ "??????????????????????????????????????????????????????????????????%(user)s??????ISO ?????????????????????"
+#~ "?????????????????????????????????chmod -R o+x path_to_iso???????????? (?????????????????????) ???"
+#~ "????????????????????????: %(err)s"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "??????????????? %(name)s ????????????????????????"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "??????????????? %(name)s ?????????????????????"
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr ""
+#~ "????????????????????????????????? %(name)s ?????????????????????????????????????????????????????????"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "???????????? ISO ??????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr ""
+#~ "listen ???????????????????????????????????????????????????IPv4 ????????? IPv6 ????????????????????????"
+#~ "??????"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "?????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ???????????????????????????????????????: %(err)s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "?????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "?????????????????????????????????????????????????????????????????????"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "???????????????%(users)s???????????????????????????"
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "???????????????%(groups)s???????????????????????????"
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr "??????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "???????????????????????? %(iface)s ?????????????????? %(name)s ????????????????????????"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr ""
+#~ "??????????????? %(name)s ????????????????????????????????????????????? %(network)s ???????????????"
+#~ "??????"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "??????"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "????????????"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "?????????"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "?????????????????? %(name)s ????????????????????????"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "?????????????????? %(template)s ????????????????????????????????????????????????%(network)s??????"
+#~ "??????????????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "?????????????????? %(template)s ?????????????????????????????????????????????????????? %(pool)s ???"
+#~ "??????????????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "?????????????????? %(template)s ?????????????????????????????????????????????????????? %(pool)s ???"
+#~ "????????????????????????????????????"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "CDROM ?????????????????????????????????????????????%(param)s?????????????????????"
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "?????????????????? %(template)s ????????????????????????????????????????????? %(network)s ??????"
+#~ "?????????????????????????????????"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "?????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr ""
+#~ "??????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "?????????"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "CPU ??????????????????????????????????????????"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "?????????????????? (MB ??????) ??????512 ???????????????????????????????????????????????????"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr ""
+#~ "?????????????????? CDROM ??????????????????????????????????????? ISO ????????????????????????????????????"
+#~ "??????"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr ""
+#~ "???????????????????????????????????? URI %(value)s ????????????????????????????????????????????????"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr ""
+#~ "CDROM ?????????????????????????????????????????????????????? ISO ???????????????????????????????????????"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr ""
+#~ "??????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "?????????????????????????????????????????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "?????????????????????????????????????????????????????????????????????: %(err)s"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr ""
+#~ "?????????????????? CDROM ??????????????????????????????????????? ISO ????????????????????????????????????"
+#~ "??????"
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "??????????????????????????? %(name)s ????????????????????????"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "??????????????????????????? %(name)s ?????????????????????"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr ""
+#~ "??????????????????????????? %(name)s ??????????????????????????????%(item)s ????????????????????????"
+#~ "???"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "????????????????????????????????????????????? %(name)s ????????????????????????"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "???????????????????????????????????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "??????????????????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "??????????????????????????? %(name)s ?????????????????????????????????????????????????????????????????????"
+#~ "??????:%(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "??????????????????????????? %(name)s ?????????????????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "??????????????????????????? %(name)s ????????????????????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr "??????????????????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "????????????????????????????????????????????? %(path)s ???????????????????????????????????????????????????"
+#~ "??????NFS ?????????????????????????????????"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "??????????????????????????? %(path)s ???????????????????????????????????????NFS ????????????????????????"
+#~ "?????????"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "?????????????????????????????????????????????????????????????????????: %(type)s"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "?????????????????????????????????????????????IP ???????????????????????????????????????????????????"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr ""
+#~ "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "iSCSI ??????????????????????????? IQN ????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????1 ?????? 65535 ???????????????????????????"
+#~ "??????????????????"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s ???????????????????????????/??????????????????????????????????????????????????? %(pool)s ???"
+#~ "?????????????????????????????????"
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "??????"
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "SCSI ?????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr "??????????????????????????? kimchi_isos ??????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "NFS ??????????????????????????? %(name)s ???????????????????????????????????????NFS ???????????? %"
+#~ "(server)s ???????????????????????????"
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "NFS ??????????????????????????? %(name)s ??????????????????????????????????????????NFS ???????????? %"
+#~ "(server)s ???????????????????????????"
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "????????? %(name)s ????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????????"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "????????? %(name)s ???????????????????????????????????????????????????????????????????????????????????????"
+#~ "?????????"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "?????????%(name)s??????????????????????????????????????????????????????????????????????????????????????????"
+#~ "??????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "?????????????????????????????????????????????????????????????????????????????????????????????????????????: %"
+#~ "(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "????????????????????????????????? %(name)s ????????????????????????"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr ""
+#~ "????????????????????????????????? %(name)s ????????????????????????????????? %(pool)s ???????????????"
+#~ "??????"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr ""
+#~ "????????????????????????????????? %(volume)s ??????????????????????????????%(item)s ???????????????"
+#~ "????????????"
+
+#~ msgid ""
+#~ "Unable to list storage volumes because storage pool %(pool)s is not active"
+#~ msgstr ""
+#~ "??????????????????????????? %(pool)s ?????????????????????????????????????????????????????????????????????"
+#~ "??????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "????????????????????????????????? %(name)s ?????????????????????????????? %(pool)s ??????????????????"
+#~ "???????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "??????????????????????????? %(pool)s ?????????????????????????????????????????????????????????????????????"
+#~ "???: %(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr "??????????????????????????? %(name)s ????????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "????????????????????????????????? %(name)s ??????????????????????????????????????????: %(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr ""
+#~ "??????????????????????????? %(type)s ?????????????????????????????????????????????????????????????????????"
+#~ "????????????"
+
+#~ msgid "Storage volume name must be a string"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Storage volume allocation must be an integer number"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Storage volume requires a volume name"
+#~ msgstr "????????????????????????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???: %(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "???????????????????????? %(name)s ?????????????????????"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "?????????????????? %(name)s ????????????????????????"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "?????????????????? %(name)s ?????????????????????"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr ""
+#~ "?????????????????? %(network)s ?????????????????????????????????????????? %(subnet)s ????????????"
+#~ "??????"
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr ""
+#~ "???????????????????????????????????? %(name)s ?????????????????????????????????????????????????????????"
+#~ "???????????????????????????????????????"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "???????????????????????????????????? %(name)s ????????????????????????"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "?????????????????? %(network)s ??????????????????????????????????????????????????? %(iface)s ??????"
+#~ "??????????????????????????????"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr ""
+#~ "????????????????????????????????? NIC????????????????????????????????????????????????????????????????????????"
+#~ "?????????"
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr "?????????????????????%(name)s??????????????? IP ???????????????????????????????????????"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr ""
+#~ "?????????????????????????????????????????????????????????????????????NAT??????????????????????????????"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "??????????????????????????????????????????IP ???????????????????????????????????????????????????????????????"
+#~ "?????????????????????????????????????????????????????????"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "?????????????????? VLAN ID ??????1 ?????? 4094 ?????????????????????????????????????????????"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr ""
+#~ "??????????????????????????? %(name)s ??????VLAN ??????????????????????????????????????????????????????"
+#~ "????????????"
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "???????????????????????? %(iface)s ?????????????????????????????????: %(err)s???"
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "???????????????????????? %(iface)s ?????????????????????????????????????????????????????????????????????"
+#~ "??????????????????"
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "??????????????????????????? %(name)s ????????????????????????"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "??????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr "??????????????????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr "??????????????????????????? %(name)s ?????????????????????????????????: %(err)s"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "?????????%(name)s??????????????????????????????????????????????????????????????????????????????????????????"
+#~ "??????????????????????????????????????????????????????"
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr ""
+#~ "?????????????????????????????? %(server)s ??????Kimchi ?????????????????????????????????????????????"
+#~ "???"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "????????????????????????????????????%(name)s????????????????????????"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "????????????????????? %(name)s ????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "???????????????????????????%(name)s???????????????????????????"
+
+#~ msgid "No packages marked for update"
+#~ msgstr "?????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "??????????????? %(name)s ???????????????????????????????????????????????????????????????"
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????cdrom????????????"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????: %"
+#~ "(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr ""
+#~ "??????????????????????????????????????????????????????????????????????????????????????????: %(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr ""
+#~ "??????????????????????????????????????????????????????????????????????????????????????????: %(error)s"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr ""
+#~ "YUM ?????????????????? ID ??????1 ???????????????????????????????????????????????????????????????"
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr ""
+#~ "?????????????????? URL ??? http://???ftp://???????????? file:// URL ???????????????????????????"
+#~ "??????"
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr ""
+#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "????????????????????????"
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr ""
+#~ "DEB ?????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr ""
+#~ "DEB ?????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "?????????"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr ""
+#~ "DEB ????????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "YUM ????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "GPG ????????????????????????????????????????????????????????????"
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr ""
+#~ "GPG ?????????ASCII ??????????????????????????????????????? URL ?????????????????????????????????"
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "?????????????????? %(repo_id)s ????????????????????????????????????"
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "?????????????????? %(repo_id)s ????????????????????????"
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr "???????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "?????????????????? %(repo_id)s ???????????????????????????????????????"
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "?????????????????? %(repo_id)s ???????????????????????????????????????"
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "?????????????????? %(repo_id)s ????????????????????????????????????"
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr ""
+#~ "???????????????????????????????????? %(repo_file)s ????????????????????????????????????????????????"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr ""
+#~ "DEB ?????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????????"
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "?????????????????? %(repo_id)s ???????????????????????????????????????"
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "?????????????????? %(repo_id)s ???????????????????????????????????????"
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "YUM ?????????????????? ID ????????????????????????"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "YUM ?????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "??????????????????????????????????????????????????????: ???%(err)s???"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr "?????????????????????????????????????????????????????????: ???%(err)s???"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "???????????????????????????????????????????????????: ???%(err)s???"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "???????????????????????????????????????????????????: ???%(err)s???"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "??????????????????"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????????????????????????????????"
+
+#~ msgid "Template"
+#~ msgstr "??????????????????"
+
+#~ msgid "Please create a template first."
+#~ msgstr "??????????????????????????????????????????????????????"
+
+#~ msgid "Create a Template"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Please choose a template."
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "OS"
+#~ msgstr "OS"
+
+#~ msgid "OS Version"
+#~ msgstr "OS ???????????????"
+
+#~ msgid "CPUS"
+#~ msgstr "CPU"
+
+#~ msgid "Memory"
+#~ msgstr "????????????"
+
+#~ msgid "Edit Guest"
+#~ msgstr "??????????????????"
+
+#~ msgid "General"
+#~ msgstr "??????"
+
+#~ msgid "Interface"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Permission"
+#~ msgstr "???????????????"
+
+#~ msgid "CPUs"
+#~ msgstr "CPU"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "????????????"
+
+#~ msgid "Icon"
+#~ msgstr "????????????"
+
+#~ msgid "Device"
+#~ msgstr "???????????????"
+
+#~ msgid "Path"
+#~ msgstr "NFS ??????"
+
+#~ msgid "Type"
+#~ msgstr "?????????"
+
+#~ msgid "All"
+#~ msgstr "?????????"
+
+#~ msgid "Vendor"
+#~ msgstr "????????????"
+
+#~ msgid "Detach"
+#~ msgstr "????????????"
+
+#~ msgid "Start"
+#~ msgstr "??????"
+
+#~ msgid "Reset"
+#~ msgstr "????????????"
+
+#~ msgid "Actions"
+#~ msgstr "???????????????"
+
+#~ msgid "Connect"
+#~ msgstr "??????"
+
+#~ msgid "Shut Down"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Delete"
+#~ msgstr "??????"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Network I/O"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Livetile"
+#~ msgstr "??????????????????"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "VM ??????????????????????????????????????????"
+
+#~ msgid "Device Type"
+#~ msgstr "????????????????????????"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "?????????????????????????????????????????????????????????????????? \"cdrom\" ???????????????"
+
+#~ msgid "Storage Pool"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Storage Volume"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "File Path"
+#~ msgstr "?????????????????????"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "????????????????????? CDROM ??? ISO ????????????????????????"
+
+#~ msgid "Shut down"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Restart"
+#~ msgstr "?????????"
+
+#~ msgid "Basic Information"
+#~ msgstr "????????????"
+
+#~ msgid "OS Distro"
+#~ msgstr "OS ?????????????????????????????????"
+
+#~ msgid "OS Code Name"
+#~ msgstr "OS ????????????"
+
+#~ msgid "Processor"
+#~ msgstr "??????????????????"
+
+#~ msgid "System Statistics"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Update Progress"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Network Name"
+#~ msgstr "?????????????????????"
+
+#~ msgid "State"
+#~ msgstr "??????"
+
+#~ msgid "Network Type"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Address Space"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "??????: ????????????????????????????????????"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: ?????????????????????????????????????????????????????????"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr "????????????: ??????????????????????????????????????????????????????????????????"
+
+#~ msgid "Destination"
+#~ msgstr "??????:"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "VLAN ????????????????????????:"
+
+#~ msgid "VLAN ID"
+#~ msgstr "VLAN ID:"
+
+#~ msgid "Stop"
+#~ msgstr "??????"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Report Name"
+#~ msgstr "???????????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????????????????????????????????????????????????????? (-) ????????????????????????"
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????????????????????????????????????????????????????? (-) ????????????????????????"
+
+#~ msgid "Add a Repository"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Identifier"
+#~ msgstr "ID"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "??????????????????????????? ID ??????????????????????????????"
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "?????????????????????"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr ""
+#~ "????????????????????? URL ??????????????????????????????????????????????????? http???ftp???????????? "
+#~ "file ?????????"
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Distribution"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "DEB ?????????????????????????????????????????????????????????"
+
+#~ msgid "Components"
+#~ msgstr "?????????????????????"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "DEB ????????????????????????????????????????????????????????????"
+
+#~ msgid "Edit Repository"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "????????????????????? URL"
+
+#~ msgid "Yes"
+#~ msgstr " ??????"
+
+#~ msgid "No"
+#~ msgstr " ?????????"
+
+#~ msgid "Capacity"
+#~ msgstr "??????"
+
+#~ msgid "Allocated"
+#~ msgstr "??????????????????"
+
+#~ msgid "Location"
+#~ msgstr "??????????????????"
+
+#~ msgid "Device path"
+#~ msgstr "?????????????????????"
+
+#~ msgid "active"
+#~ msgstr "???????????????"
+
+#~ msgid "inactive"
+#~ msgstr "??????????????????"
+
+#~ msgid "Deactivate"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Activate"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Undefine"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Format"
+#~ msgstr "??????????????????:"
+
+#~ msgid "Allocation"
+#~ msgstr "????????????:"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "?????????"
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Storage Path"
+#~ msgstr "????????????????????????"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "??????"
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????Kimchi ?????????????????????????????????"
+
+#~ msgid "NFS Server IP"
+#~ msgstr "NFS ???????????? IP"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "NFS ???????????? IP ???????????????????????????????????????????????????????????????????????????????????????"
+#~ "??????????????????"
+
+#~ msgid "NFS Path"
+#~ msgstr "NFS ??????"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "NFS ???????????? NFS ????????????????????????????????????????????????"
+
+#~ msgid "iSCSI Server"
+#~ msgstr "iSCSI ????????????"
+
+#~ msgid "Server"
+#~ msgstr "????????????"
+
+#~ msgid "Port"
+#~ msgstr "?????????"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "iSCSI ???????????? IP ???????????????????????????????????????????????????????????????"
+
+#~ msgid "Target"
+#~ msgstr "???????????????"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "iSCSI ?????????????????? iSCSI ???????????????"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "iSCSI ???????????????"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "iSCSI ??????"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "SCSI ???????????????"
+
+#~ msgid "Please, wait..."
+#~ msgstr "?????????????????????..."
+
+#~ msgid "Add Template"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "???????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "???????????? ISO ????????????"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "???????????? ISO ????????????"
+
+#~ msgid "Search ISOs"
+#~ msgstr "ISO ?????????"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "?????? ISO ?????????????????????:"
+
+#~ msgid "OS: "
+#~ msgstr "OS: "
+
+#~ msgid "Version: "
+#~ msgstr "???????????????: "
+
+#~ msgid "Size: "
+#~ msgstr "?????????: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "ISO ??????????????????"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "???????????? ISO ?????????????????????????????????"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "????????? ISO ???????????????????????????"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "?????????????????????????????? ISO ???????????????????????????..."
+
+#~ msgid "Arch: "
+#~ msgstr "????????????????????????: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "???????????? URL ???????????????"
+
+#~ msgid "Edit Template"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "CDROM"
+#~ msgstr "CDROM"
+
+#~ msgid "Graphics"
+#~ msgstr "?????????????????????"
+
+#~ msgid "CPU Number"
+#~ msgstr "CPU ???"
+
+#~ msgid "No templates found."
+#~ msgstr "?????????????????????????????????????????????"
diff --git a/po/ko_KR.po b/po/ko_KR.po
new file mode 100644
index 0000000..a63e6ae
--- /dev/null
+++ b/po/ko_KR.po
@@ -0,0 +1,1608 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "%(resource)s??? ????????? ???????????? ??????"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s????????? ???????????? ???????????? ???????????? ??????"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "%(resource)s??? ????????? ???????????? ??????"
+
+msgid "Unable to parse JSON request"
+msgstr "JSON ????????? ?????? ????????? ??? ????????????."
+
+msgid "This API only supports JSON"
+msgstr "??? API??? JSON??? ???????????????."
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr "????????? ???????????? ?????? ?????????????????? ???????????? ???????????????."
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr "?????? ????????? ????????? ????????? ??? ??????: %(err)s"
+
+#, python-format
+msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr "????????? '%(username)s'??? ????????? ??????????????????. [?????? ??????: %(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "Kimchi??? ???????????? ????????? ????????????."
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "Kimchi??? ?????????????????? %(item)s???(???) ??????????????????."
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "????????? ??????????????? %(item)s???(???) ?????? ??? ????????????."
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr "%(seconds)s??? ?????? '%(cmd)s' ?????? ?????? ??? ??????????????? ?????????????????????."
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "???????????? ?????? URI %(uri)s"
+
+msgid "ERROR CODE"
+msgstr "?????? ??????"
+
+msgid "REASON"
+msgstr "??????"
+
+msgid "STACK"
+msgstr "??????"
+
+msgid "Go to Homepage"
+msgstr "??? ???????????? ??????"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+"????????? ????????? ?????? ?????? ??????????????? ???????????? ????????????. ?????? ??????????????????."
+
+msgid "This field is required."
+msgstr "??? ????????? ???????????????."
+
+msgid "Log in"
+msgstr "?????????"
+
+msgid "Logging in..."
+msgstr "????????? ???..."
+
+msgid "Host"
+msgstr "?????????"
+
+msgid "Guests"
+msgstr "?????????"
+
+msgid "Templates"
+msgstr "????????????"
+
+msgid "Storage"
+msgstr "????????????"
+
+msgid "Network"
+msgstr "????????????"
+
+msgid "Failed to get application configuration"
+msgstr "?????????????????? ????????? ???????????? ???????????????."
+
+msgid "This is not a valid Linux path"
+msgstr "????????? Linux ????????? ????????????."
+
+msgid "This is not a valid URL."
+msgstr "????????? URL??? ????????????."
+
+msgid "No such data available."
+msgstr "?????? ???????????? ????????????."
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"????????? ???????????? ????????? ??? ????????????. ????????? ???????????? ??????????????? ?????? ?????? ??????"
+"?????? ????????? ????????? ??????????????????. HTTP ?????? ?????? %1. "
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "?????? ??????"
+
+msgid "OK"
+msgstr "??????"
+
+msgid "Cancel"
+msgstr "??????"
+
+msgid "Confirm"
+msgstr "??????"
+
+msgid "Create"
+msgstr "??????"
+
+msgid "Warning"
+msgstr "??????"
+
+msgid "Save"
+msgstr "??????"
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "?????? ???..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "?????????"
+
+msgid "Detailed message:"
+msgstr "?????? ?????????:"
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr "????????? ISO ????????? ????????????."
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "????????? ?????? ????????????. ?????????????????????????"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "??????????????? ??????????????? ???????????????. ?????????????????????????"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr "?????? ?????? ????????? ?????? ???????????? ???????????? ????????? ??? ????????????."
+
+msgid "Max:"
+msgstr "??????:"
+
+msgid "Utilization"
+msgstr "?????????"
+
+msgid "Available"
+msgstr "?????? ??????"
+
+msgid "Read Rate"
+msgstr "?????? ??????"
+
+msgid "Write Rate"
+msgstr "?????? ??????"
+
+msgid "Received"
+msgstr "??????"
+
+msgid "Sent"
+msgstr "??????"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"???????????? ??????????????? ?????? ???????????? ???????????? ?????? ????????? ???????????????. ????????? ???"
+"???/?????? ????????? ?????????????????????????"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr "???????????? ??????????????? ???????????? ????????? ??? ????????????. ?????????????????????????"
+
+msgid "Repositories"
+msgstr "?????????"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "??????"
+
+msgid "Base URL"
+msgstr "?????? URL"
+
+msgid "Is Mirror"
+msgstr "?????????"
+
+msgid "URL Args"
+msgstr "URL ??????"
+
+msgid "Enabled"
+msgstr "?????????"
+
+msgid "GPG Check"
+msgstr "GPG ??????"
+
+msgid "GPG Key"
+msgstr "GPG ???"
+
+msgid "Add"
+msgstr "??????"
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Remove"
+msgstr "??????"
+
+msgid "Enable"
+msgstr "??????"
+
+msgid "Disable"
+msgstr "?????? ??????"
+
+msgid "Software Updates"
+msgstr "??????????????? ????????????"
+
+msgid "Package Name"
+msgstr "????????? ??????"
+
+msgid "Version"
+msgstr "??????"
+
+msgid "Architecture"
+msgstr "????????????"
+
+msgid "Repository"
+msgstr "?????????"
+
+msgid "Update All"
+msgstr "?????? ????????????"
+
+msgid "Updating..."
+msgstr "???????????? ???..."
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr "???????????? ?????????????????? ???????????????."
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"????????? ???????????? ??????????????? ???????????? ????????? ??? ????????????. ?????????????????????????"
+
+msgid "Debug Reports"
+msgstr "????????? ?????????"
+
+msgid "Generated Time"
+msgstr "?????? ??????"
+
+msgid "Generate"
+msgstr "??????"
+
+msgid "Generating..."
+msgstr "?????? ???..."
+
+msgid "Rename"
+msgstr "?????? ?????????"
+
+msgid "Download"
+msgstr "????????????"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr "????????? ???????????? ??????, ?????? ???/?????? ?????????('-')??? ??????????????? ?????????."
+
+msgid "Pending..."
+msgstr "?????? ???..."
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"?????? ?????? ??? ?????? ?????? ???????????? ???????????????. ??? ????????? ?????? ????????? ??? ?????????"
+"???. ?????????????????????????"
+
+msgid "Power off Confirmation"
+msgstr "?????? ??????"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr "?????? ??????"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr "?????? ??????"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "??????????????? ??????????????? ???????????????. ?????????????????????????"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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??? ??????????????? ???????????? ?????? ????????? ??? ????????????. ????????? ?????????????????????"
+"????"
+
+msgid "Attach"
+msgstr "??????"
+
+msgid "Attaching..."
+msgstr "?????? ???..."
+
+msgid "Replace"
+msgstr "??????"
+
+msgid "Replacing..."
+msgstr "?????? ???..."
+
+msgid "Successfully attached!"
+msgstr "?????????????????????."
+
+msgid "Successfully replaced!"
+msgstr "?????????????????????."
+
+msgid "Successfully detached!"
+msgstr "?????????????????????."
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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 ???????????? ?????????."
+
+msgid "unavailable"
+msgstr "?????? ?????????"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"??? ????????? ??? ??????????????? ???????????? ?????? ????????? ???????????? ????????? ?????????????????????."
+
+msgid "Create a network"
+msgstr "???????????? ??????"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"??? ???????????? ?????? ??????????????? ????????????. ??? ????????? ?????? ?????????????????? ?????? ?????????"
+"?????? ???????????????. ?????????????????????????"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr "???????????? ?????? ??????????????? ???????????????. ?????????????????????????"
+
+msgid "This storage pool is empty."
+msgstr "??? ???????????? ?????? ?????? ????????????."
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr "???????????? ???????????? ???????????? ???????????????. ????????????????????????? "
+
+msgid "SCSI Fibre Channel"
+msgstr "SCSI ????????? ??????"
+
+msgid "No SCSI adapters found."
+msgstr "SCSI ???????????? ????????????."
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "???????????? ??? ????????? ????????? ??? ????????????."
+
+msgid "The storage pool path can not be blank."
+msgstr "???????????? ??? ????????? ????????? ??? ????????????."
+
+msgid "NFS server mount path can not be blank."
+msgstr "NFS ?????? ????????? ????????? ????????? ??? ????????????."
+
+msgid "Invalid NFS mount path."
+msgstr "???????????? ?????? NFS ????????? ???????????????."
+
+msgid "No logical device selected."
+msgstr "?????? ????????? ???????????? ???????????????."
+
+msgid "The iSCSI target can not be blank."
+msgstr "iSCSI ????????? ????????? ??? ????????????."
+
+msgid "Server name can not be blank."
+msgstr "?????? ????????? ????????? ??? ????????????."
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "?????? ????????? ???????????? ?????? ???..."
+
+msgid "No available partitions found."
+msgstr "?????? ????????? ???????????? ????????????."
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"??? ???????????? ?????? ??????????????? ????????????. ??? ????????? ?????? ?????????????????? ?????? ?????????"
+"?????? ???????????????. ?????????????????????????"
+
+msgid "Unable to retrieve partitions information."
+msgstr "????????? ????????? ????????? ??? ????????????. ????????????: '%(err)s'"
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "???????????? ??? ????????? ????????? ??? ????????????."
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr "????????? ??????"
+
+msgid "Password"
+msgstr "????????????"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "??????"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "???????????? ????????????."
+
+msgid "Help"
+msgstr "?????????"
+
+msgid "About"
+msgstr "??????"
+
+msgid "Log out"
+msgstr "????????????"
+
+msgid "Version:"
+msgstr "??????: "
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr "?????? ????????? ???????????? ?????? ????????? ??????????????????. ????????????: %(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr ""
+#~ "%(device)s??? ?????? ?????? ?????? ????????? ???????????? ?????? ????????? ??????????????????."
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "distro ????????? ?????? ??? ??????: %(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "distro ??????(%(filename)s)??? ?????? ????????? ??? ????????????. JSON ???????????? ?????????"
+#~ "?????????."
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "iSCSI ????????? ?????? %(portal)s??? ???????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "iSCSI host %(host)s ?????? %(target)s??? ???????????? ??? ????????????."
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "ISO ?????? %(filename)s???(???) ?????? ???????????? ????????????."
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr "ISO ?????? %(filename)s??? ????????? El Torito ?????? ???????????? ????????????."
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr ""
+#~ "ISO %(filename)s??? ???????????? ?????? El Torito ????????? ?????? ????????? ????????????."
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "ISO %(filename)s??? ???????????? ?????? El Torito ?????? ???????????? ????????????."
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr "ISO %(filename)s?????? ?????? ????????? ????????? ?????? ?????? ???????????????."
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr ""
+#~ "ISO %(filename)s?????? ?????? ?????????????????? ?????? ?????? ????????? ????????? ???????????????"
+#~ "??????."
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "????????????????????? ??? ISO %(filename)s???(???) ????????? ????????? ????????????. ?????? /"
+#~ "var/lib/libvirt ????????? ??????????????????, (????????? ??????) ?????? ????????? '%(user)s' "
+#~ "???????????? ?????? ????????? ?????? ????????? ???????????????, '%(user)s'???(???) ISO ?????? ???"
+#~ "?????? ???????????????, 'chmod -R o+x 'path_to_iso'(???????????? ??????)??? ???????????????"
+#~ "???. ????????????: %(err)s"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "?????? ?????? %(name)s???(???) ?????? ???????????????."
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????????."
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr "????????? ?????? ?????? %(name)s??? ?????? ??????????????? ????????? ??? ????????????."
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "?????? ISO ???????????? ??? ???????????? ???????????? ????????????."
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr "?????? ?????? ????????? ????????? IPv4 ?????? IPv6?????? ?????????."
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "?????? ????????? ???????????? ?????? ??????????????? ??????????????????."
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s??? ????????? ?????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "???????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Group name must be a string"
+#~ msgstr "???????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "'%(users)s' ???????????? ????????????."
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "'%(groups)s' ???????????? ????????????."
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr "?????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "?????? ?????? %(name)s??? %(iface)s ?????????????????? ????????????."
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr "?????? ?????? %(name)s??? ?????? ????????? %(network)s ??????????????? ????????????."
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr "???????????? ?????? ?????? ??????????????? ????????? ????????????????????????."
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr "?????? ?????? ?????????????????? ???????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "?????? ?????? ?????????????????? ?????? ???????????? ?????? ???????????? ?????? ????????? ???????????????"
+#~ "??????."
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr "??? ?????? ?????? ?????????????????? ????????? ?????? ??? ??????????????? ??????????????????."
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "???????????? %(name)s???(???) ?????? ???????????????."
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "???????????? %(template)s??? ?????? ????????? '%(network)s' ??????????????? ????????????."
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "???????????? %(template)s??? ?????? ????????? ???????????? ??? %(pool)s???(???) ????????????."
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "???????????? %(template)s??? ?????? ????????? ???????????? ??? %(pool)s???(???) ????????? ??????"
+#~ "??????."
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr ""
+#~ "CDROM??? ?????? ???????????? ?????? ???????????? '%(param)s'???(???) ?????????????????????."
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "???????????? %(template)s??? ?????? ????????? %(network)s ??????????????? ????????? ?????????"
+#~ "???."
+
+#~ msgid "Template name must be a string"
+#~ msgstr "???????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "???????????? ???????????? ???????????? ???????????? ?????????."
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "???????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "???????????? ?????? ????????? ?????????????????? ?????????."
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "CPU ?????? ???????????? ?????????."
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "????????? ??????(MB)??? 512?????? ??? ???????????? ?????????."
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "???????????? CDROM??? ?????? ?????? ?????? ISO ??????????????? ?????????."
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr ""
+#~ "??????????????? ?????? ???????????? ?????? ???????????? ??? URI %(value)s???(???) ??????????????????"
+#~ "???."
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr "??????????????? ??????????????? ISO ???????????? CDROM?????? ??????????????????."
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr "??????????????? ?????? ??????????????? ????????? ??????????????? ?????????."
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "?????? ????????? ??????????????? ????????? ??? ??????: %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "?????? ????????? ??????????????? ????????? ??? ??????: %(err)s"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "???????????? CDROM??? ?????? ?????? ?????? ISO ??????????????? ?????????."
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "???????????? ??? %(name)s???(???) ?????? ???????????????."
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "???????????? ??? %(name)s???(???) ????????????."
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "???????????? ??? %(name)s???(???) ??????????????? %(item)s???(???) ??????????????????."
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "?????? ???????????? ??? %(name)s???(???) ????????? ??? ????????????."
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "???????????? ?????? ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "???????????? ??? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "???????????? ??? %(name)s??? ?????? ???????????? ????????? ?????? ????????? ??? ????????????. ??????"
+#~ "??????: %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "???????????? ??? %(name)s???(???) ???????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???????????? ??? %(name)s???(???) ??????????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr "???????????? ??? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "???????????? ?????? %(path)s???(???) ????????? ?????? ????????? ??? ???????????? NFS ?????? ??????"
+#~ "??? ??? ????????????."
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "???????????? ?????? %(path)s ???????????? ?????????????????? NFS ?????? ????????? ??? ????????????."
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "???????????? ?????? ???????????? ??? ??????: %(type)s"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "???????????? ??? ????????? ?????????????????? ?????????."
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "???????????? ??? ???????????? IP ?????? ????????? ??????????????? ?????????."
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "???????????? ??? ????????? ??????????????? ?????????."
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "iSCSI ?????? ?????? IQN??? ?????????????????? ?????????."
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr "?????? ???????????? ????????? ????????? 1??? 65535 ????????? ???????????? ?????????."
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "???????????? ?????? ??????????????? ?????? ??? ????????? ??????????????????."
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s???(???) ????????? ?????????/???????????? ????????????. ?????? %(pool)s ?????? ????????? "
+#~ "??? ????????????."
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr "?????? ???????????? ?????? ???????????? ???????????? ??????????????? ??? ????????????."
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "SCSI ????????? ????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr "???????????? ??? kimchi_isos??? ?????? ????????? ?????????????????????."
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "NFS ???????????? ??? %(name)s???(???) ???????????? ??? ????????????. NFS ?????? %(server)s"
+#~ "??? ????????? ??? ????????????."
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "NFS ???????????? ??? %(name)s???(???) ??????????????? ??? ????????????. NFS ?????? %(server)s"
+#~ "??? ????????? ??? ????????????."
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "?????? ??????????????? ???????????? ???????????? %(name)s ?????? ??????????????? ??? ????????????."
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr "?????? ??????????????? ???????????? ???????????? %(name)s ?????? ????????? ??? ????????????."
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "????????? '%(name)s'??? ?????? ????????? ?????? ???????????????. ?????? ?????? ??????????????? ???"
+#~ "??? ????????? ??????????????????."
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "?????? ????????? ????????? ?????? ????????? ????????????????????? ??????????????? ??? ??????: %(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "???????????? ?????? %(name)s???(???) ?????? ???????????????."
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr "???????????? ?????? %(name)s???(???) ???????????? ??? %(pool)s??? ????????????."
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr ""
+#~ "???????????? ?????? %(volume)s???(???) ??????????????? %(item)s???(???) ??????????????????."
+
+#~ msgid ""
+#~ "Unable to list storage volumes because storage pool %(pool)s is not active"
+#~ msgstr ""
+#~ "???????????? ??? %(pool)s???(???) ????????? ???????????? ???????????? ????????? ????????? ??? ??????"
+#~ "??????."
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "???????????? ?????? %(name)s???(???) ???????????? ??? %(pool)s??? ????????? ??? ????????????. ???"
+#~ "?????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???????????? ??? %(pool)s??? ???????????? ????????? ????????? ??? ????????????. ????????????: %"
+#~ "(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr "???????????? ??? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr "???????????? ?????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???????????? ?????? %(name)s??? ????????? ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr "???????????? ?????? %(type)s???(???) ?????? ?????? ??? ????????? ???????????? ????????????."
+
+#~ msgid "Storage volume name must be a string"
+#~ msgstr "???????????? ?????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Storage volume allocation must be an integer number"
+#~ msgstr "???????????? ?????? ????????? ???????????? ?????????."
+
+#~ msgid "Storage volume requires a volume name"
+#~ msgstr "???????????? ????????? ?????? ????????? ???????????????."
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "?????? ????????? ???????????? ?????? ????????? ????????????????????? ??????????????? ??? ??????: %(err)"
+#~ "s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "??????????????? %(name)s???(???) ????????????."
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "???????????? %(name)s???(???) ?????? ???????????????."
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "???????????? %(name)s???(???) ????????????."
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr ""
+#~ "???????????? %(network)s??? ?????? ????????? ????????? %(subnet)s???(???) ???????????? ?????????"
+#~ "???."
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr ""
+#~ "???????????? ???????????? %(name)s???(???) ????????? ???????????? ?????????????????? ???????????????"
+#~ "???."
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "?????? ???????????? %(name)s???(???) ????????? ??? ????????????."
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "???????????? %(network)s??? ?????? ????????? ??????????????? %(iface)s???(???) ?????? ?????? ???"
+#~ "?????????."
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr "?????????????????? ?????? NIC, ?????? ?????? ????????? ???????????? ?????????."
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "???????????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr "???????????? '%(name)s'??? ?????? ?????? IP ????????? ?????? ??? ????????????."
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "???????????? ???????????? ????????? ??????, NAT ??? ??????????????????."
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "???????????? ???????????? IP ?????? ??? ????????? ?????? ??????????????? ?????? ?????????????????? ??????"
+#~ "???."
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "???????????? ?????????????????? ?????????????????? ?????????."
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "???????????? VLAN ID??? 1??? 4094 ????????? ???????????? ?????????."
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "??????????????? ??????????????? ?????? ??? ????????? ??????????????????."
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr "????????? ?????? %(name)s???(???) VLAN??? ????????? ????????? ??? ??? ????????????."
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "%(iface)s ?????????????????? ??????????????? ??????: %(err)s."
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "%(iface)s ?????????????????? ??????????????? ???????????????. ????????? ?????? ????????? ????????????"
+#~ "??????."
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "????????? ????????? %(name)s???(???) ????????????."
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "????????? ????????? ????????? ???????????? ????????????."
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr "????????? ????????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr "????????? ????????? %(name)s???(???) ????????? ??? ????????????. ????????????: %(err)s"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "????????? '%(name)s'??? ?????? ????????? ?????? ???????????????. ?????? ?????? ??????????????? ???"
+#~ "??? ????????? ??????????????????."
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "???????????? ?????? %(server)s???(???) Kimchi?????? ???????????? ???????????????."
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "Distro '%(name)s'???(???) ????????????."
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "????????? %(name)s???(???) ???????????? ????????????."
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr "?????? ????????? ?????? ?????? ????????? ????????? ????????? ??? ????????????."
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr "?????? ????????? ?????? ?????? ????????? ????????? ?????? ????????? ??? ????????????."
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "?????? ?????? '%(name)s'???(???) ????????????."
+
+#~ msgid "No packages marked for update"
+#~ msgstr "???????????? ????????? ???????????? ????????????."
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "????????? %(name)s???(???) ????????????????????? ???????????? ???????????????."
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr ""
+#~ "????????????????????? ????????? ???????????? ???????????? ?????? ????????? ??????????????????. ?????????"
+#~ "???: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "??? ???????????? ?????? ?????? ????????? ????????? ???????????? ????????????."
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "???????????? ?????? ???????????? ???????????????. ???????????? ??????: 'cdrom'"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr "??? ???????????? ????????? ???????????? ?????? ?????? ??????: %(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr "???????????? ????????? ?????????????????? ?????? ?????? ??????: %(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "???????????? ????????? ???????????? ?????? ?????? ??????: %(error)s"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr "??? ?????? ?????? ???????????? ????????? ?????? ??? ????????? ??????????????????."
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr "?????? ?????? ???????????? ??????????????? ????????? ??????????????????."
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr "??? ?????? ?????? ???????????? ????????? ?????? ??? ????????? ??????????????????."
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr "YUM ????????? ID??? ?????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "????????? URL??? http://, ftp:// ?????? file:// URL????????? ?????????."
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr "????????? ????????? ????????? ????????? ?????? ?????? ?????? ?????? ???????????????."
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "DEB ???????????? ?????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr "DEB ???????????? ?????? ??????????????? ????????? ??????????????? ?????????."
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "DEB ???????????? ?????? ??????????????? ?????????????????? ?????????."
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "YUM ????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "GPG ????????? ?????? ???????????? ?????????."
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr "GPG ?????? ASCII ?????? ????????? ???????????? URL????????? ?????????."
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "%(repo_id)s ???????????? ??????????????? ??? ????????????."
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "%(repo_id)s ???????????? ????????????."
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr "?????? ???????????? ?????? ????????? ?????? ????????? ???????????? ???????????????."
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "%(repo_id)s ???????????? ?????? ???????????? ???????????? ????????????."
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "%(repo_id)s ???????????? ?????? ?????? ???????????? ???????????? ????????????."
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "%(repo_id)s ???????????? ????????? ??? ????????????."
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr "????????? ?????? ?????? %(repo_file)s???(???) ????????? ??? ????????????."
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr "DEB ???????????? ??????????????? ????????? ????????? ??????????????????."
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "%(repo_id)s ???????????? ???????????? ????????? ??? ????????????."
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "%(repo_id)s ???????????? ?????? ???????????? ????????? ??? ????????????."
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "YUM ????????? ID??? ?????? ???????????????."
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "YUM ????????? ????????? ?????????????????? ?????????."
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "???????????? ????????? ??? ????????????. ????????????: '%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr "????????? ????????? ????????? ??? ????????????. ????????????: '%(err)s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "???????????? ????????? ??? ????????????. ????????????: '%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "???????????? ????????? ??? ????????????. ????????????: '%(err)s'"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "??? ?????? ?????? ??????"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "?????? ?????? ??????"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "?????? ????????? ???????????? ??? ???????????? ???????????????. ???????????? ????????? ????????? ?????????"
+#~ "?????? ???????????? ???????????????."
+
+#~ msgid "Template"
+#~ msgstr "????????????"
+
+#~ msgid "Please create a template first."
+#~ msgstr "??????????????? ?????? ??????????????????."
+
+#~ msgid "Create a Template"
+#~ msgstr "???????????? ??????"
+
+#~ msgid "Please choose a template."
+#~ msgstr "??????????????? ??????????????????."
+
+#~ msgid "OS"
+#~ msgstr "OS"
+
+#~ msgid "OS Version"
+#~ msgstr "OS ??????"
+
+#~ msgid "CPUS"
+#~ msgstr "CPUS"
+
+#~ msgid "Memory"
+#~ msgstr "?????????"
+
+#~ msgid "Edit Guest"
+#~ msgstr "????????? ??????"
+
+#~ msgid "General"
+#~ msgstr "??????"
+
+#~ msgid "Interface"
+#~ msgstr "???????????????"
+
+#~ msgid "Permission"
+#~ msgstr "??????"
+
+#~ msgid "CPUs"
+#~ msgstr "CPU"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "?????????"
+
+#~ msgid "Icon"
+#~ msgstr "?????????"
+
+#~ msgid "Device"
+#~ msgstr "?????? ??????"
+
+#~ msgid "Path"
+#~ msgstr "NFS ??????"
+
+#~ msgid "Type"
+#~ msgstr "??????"
+
+#~ msgid "All"
+#~ msgstr "??????"
+
+#~ msgid "Vendor"
+#~ msgstr "????????????"
+
+#~ msgid "Detach"
+#~ msgstr "??????"
+
+#~ msgid "Start"
+#~ msgstr "??????"
+
+#~ msgid "Reset"
+#~ msgstr "?????? ??????"
+
+#~ msgid "Actions"
+#~ msgstr "??????"
+
+#~ msgid "Connect"
+#~ msgstr "??????"
+
+#~ msgid "Shut Down"
+#~ msgstr "????????? ??????"
+
+#~ msgid "Delete"
+#~ msgstr "??????"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "????????? I/O"
+
+#~ msgid "Network I/O"
+#~ msgstr "???????????? I/O"
+
+#~ msgid "Livetile"
+#~ msgstr "???????????????"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "???????????? ????????? VM??? ??????"
+
+#~ msgid "Device Type"
+#~ msgstr "?????? ??????"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "?????? ???????????????. ?????? \"cdrom\"??? ???????????????."
+
+#~ msgid "Storage Pool"
+#~ msgstr "???????????? ???"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "???????????? ??? ????????? ?????????????????? ?????????."
+
+#~ msgid "Storage Volume"
+#~ msgstr "???????????? ??? ??????"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "???????????? ?????? ????????? ?????????????????? ?????????."
+
+#~ msgid "File Path"
+#~ msgstr "?????? ??????"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "CDROM??? ?????? ????????? ISO ?????? ???????????????."
+
+#~ msgid "Shut down"
+#~ msgstr "????????? ??????"
+
+#~ msgid "Restart"
+#~ msgstr "?????? ??????"
+
+#~ msgid "Basic Information"
+#~ msgstr "?????? ??????"
+
+#~ msgid "OS Distro"
+#~ msgstr "OS Distro"
+
+#~ msgid "OS Code Name"
+#~ msgstr "OS ?????? ??????"
+
+#~ msgid "Processor"
+#~ msgstr "????????????"
+
+#~ msgid "System Statistics"
+#~ msgstr "????????? ??????"
+
+#~ msgid "Update Progress"
+#~ msgstr "???????????? ????????????"
+
+#~ msgid "Network Name"
+#~ msgstr "???????????? ??????"
+
+#~ msgid "State"
+#~ msgstr "??????"
+
+#~ msgid "Network Type"
+#~ msgstr "???????????? ??????"
+
+#~ msgid "Address Space"
+#~ msgstr "?????? ??????"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "???????????? ?????? ???????????? ??? ???????????????. '/'??? ???????????? ????????? ?????????."
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "?????????: ????????? ???????????? ?????? ??????"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: ??????????????? ????????? ???????????? ?????????"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr "????????????: ?????? ????????? ????????? ??????????????? ?????? ?????????"
+
+#~ msgid "Destination"
+#~ msgstr "??????:"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "VLAN ??????:"
+
+#~ msgid "VLAN ID"
+#~ msgstr "VLAN ID:"
+
+#~ msgid "Stop"
+#~ msgstr "??????"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "??? ????????? ????????? ??????"
+
+#~ msgid "Report Name"
+#~ msgstr "????????? ??????"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "???????????? ???????????? ??? ???????????? ???????????????. ???????????? ????????? ?????? ????????? ??????"
+#~ "?????? ???????????????. ????????? ??????, ?????? ??? ?????????(\"-\")??? ????????? ??? ????????????."
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "??? ????????? ????????? ??????"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "???????????? ???????????? ??? ???????????? ???????????????. ???????????? ????????? ?????? ????????? ??????"
+#~ "?????? ???????????????. ????????? ??????, ?????? ??? ?????????(\"-\")??? ????????? ??? ????????????."
+
+#~ msgid "Add a Repository"
+#~ msgstr "????????? ??????"
+
+#~ msgid "Identifier"
+#~ msgstr "ID"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "???????????? ?????? ?????? ????????? ?????? ID?????????."
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "???????????? ?????? ????????? ???????????????."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "?????? ??????"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr ""
+#~ "???????????? ?????? URL?????????. ???????????? ??????????????? http, ftp ??? file?????????."
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "???????????? ???????????????."
+
+#~ msgid "Distribution"
+#~ msgstr "??????"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "DEB ???????????? ???????????????."
+
+#~ msgid "Components"
+#~ msgstr "????????????"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "DEB ???????????? ???????????? ???????????????."
+
+#~ msgid "Edit Repository"
+#~ msgstr "????????? ??????"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "?????? ?????? URL"
+
+#~ msgid "Yes"
+#~ msgstr "???"
+
+#~ msgid "No"
+#~ msgstr "?????????"
+
+#~ msgid "Capacity"
+#~ msgstr "??????"
+
+#~ msgid "Allocated"
+#~ msgstr "?????????"
+
+#~ msgid "Location"
+#~ msgstr "??????"
+
+#~ msgid "Device path"
+#~ msgstr "?????? ??????"
+
+#~ msgid "active"
+#~ msgstr "??????"
+
+#~ msgid "inactive"
+#~ msgstr "?????????"
+
+#~ msgid "Deactivate"
+#~ msgstr "????????????"
+
+#~ msgid "Activate"
+#~ msgstr "?????????"
+
+#~ msgid "Undefine"
+#~ msgstr "?????? ??????"
+
+#~ msgid "Format"
+#~ msgstr "??????:"
+
+#~ msgid "Allocation"
+#~ msgstr "??????:"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "??? ???????????? ??? ??????"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "???????????? ??? ??????"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr ""
+#~ "???????????? ?????? ???????????? ??? ???????????? ???????????? ?????? ?????? ????????? ?????????."
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "???????????? ??? ??????"
+
+#~ msgid "Storage Path"
+#~ msgstr "???????????? ??????"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr ""
+#~ "???????????? ?????? ???????????????. ??? ???????????? ?????? ?????? ????????? ????????? ?????????."
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr ""
+#~ "??????????????? ???????????? ?????? ???????????? ????????? Kimchi??? ???????????? ????????? ????????????"
+#~ "???."
+
+#~ msgid "NFS Server IP"
+#~ msgstr "NFS ?????? IP"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "NFS ?????? IP ?????? ????????? ???????????????. ????????? ??????????????? ?????????????????? ????????? "
+#~ "??? ????????????."
+
+#~ msgid "NFS Path"
+#~ msgstr "NFS ??????"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "NFS ???????????? NFS??? ????????? ???????????????."
+
+#~ msgid "iSCSI Server"
+#~ msgstr "iSCSI ??????"
+
+#~ msgid "Server"
+#~ msgstr "??????"
+
+#~ msgid "Port"
+#~ msgstr "??????"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "iSCSI ?????? IP ?????? ????????? ???????????????. ?????? ?????? ????????? ?????????."
+
+#~ msgid "Target"
+#~ msgstr "??????"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "iSCSI ????????? iSCSI ??????"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "iSCSI ?????? ??????"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "iSCSI ??????"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "SCSI ?????????"
+
+#~ msgid "Please, wait..."
+#~ msgstr "?????? ????????? ????????????."
+
+#~ msgid "Add Template"
+#~ msgstr "???????????? ??????"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "??? ??????????????? ?????? ????????? ????????? ?????????????"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "?????? ISO ?????????"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "?????? ISO ?????????"
+
+#~ msgid "Search ISOs"
+#~ msgstr "ISO ??????"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "?????? ISO??? ?????? ???????????????."
+
+#~ msgid "OS: "
+#~ msgstr "OS: "
+
+#~ msgid "Version: "
+#~ msgstr "??????: "
+
+#~ msgid "Size: "
+#~ msgstr "??????: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "?????? ISO ??????"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "????????? ISO????????? ???????????? ??????"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "?????? ISO ????????? ??????????????? ?????????."
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "?????? ?????? ISO ?????? ???..."
+
+#~ msgid "Arch: "
+#~ msgstr "Arch: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "????????? ?????? URL??? ??????????????? ?????????."
+
+#~ msgid "Edit Template"
+#~ msgstr "???????????? ??????"
+
+#~ msgid "CDROM"
+#~ msgstr "CDROM"
+
+#~ msgid "Graphics"
+#~ msgstr "?????????"
+
+#~ msgid "CPU Number"
+#~ msgstr "CPU ??????"
+
+#~ msgid "No templates found."
+#~ msgstr "??????????????? ????????????."
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 0000000..5aeed9e
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,2142 @@
+# i18n portable object for kimchi.
+# Copyright (C) IBM, Corp. 2013-2014
+# ShaoHe Feng <shaohef at linux.vnet.ibm.com>, 2013-04-18.
+#
+# 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
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2015-03-23 12:57+0000\n"
+"Last-Translator: Cr??stian Deives dos Santos Viana <cristiandeives at gmail."
+"com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"kimchi/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "M??todo de remo????o n??o ?? permitido em %(resource)s"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s n??o implementa m??todo de atualiza????o"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "M??todo de cria????o n??o ?? permitido em %(resource)s"
+
+msgid "Unable to parse JSON request"
+msgstr "N??o ?? poss??vel realizar a leitura da requisi????o do JSON"
+
+msgid "This API only supports JSON"
+msgstr "Essa API suporta apenas JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr "Par??metros n??o correspondem ?? especifica????o do esquema: %(err)s"
+
+msgid "You don't have permission to perform this operation."
+msgstr "Voc?? n??o tem permiss??o para executar esta opera????o."
+
+msgid "Datastore is not initiated in the model object."
+msgstr "Datastore n??o est?? inicializado no objeto modelo."
+
+#, python-format
+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 "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]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "Voc?? n??o est?? autorizado para acessar o Kimchi"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "Especifique %(item)s para autenticar no Kimchi"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr "Configura????es LDAP inv??lidas: %(item)s : %(value)s"
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "N??o foi poss??vel encontrar %(item)s no datastore"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr ""
+"Fim do limite de tempo ao rodar comando '%(cmd)s' ap??s %(seconds)s segundos"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr "Valor inv??lido '%(value)s'"
+
+#, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "Unidade inv??lida '%(unit)s'"
+
+msgid "ERROR CODE"
+msgstr "C??DIGO DE ERRO"
+
+msgid "REASON"
+msgstr "MOTIVO"
+
+msgid "STACK"
+msgstr "PILHA"
+
+msgid "Go to Homepage"
+msgstr "Ir para a P??gina Inicial"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr ""
+"O usu??rio ou senha inseridos est??o incorretos. Por favor, tente novamente."
+
+msgid "This field is required."
+msgstr "Esse campo ?? obrigat??rio."
+
+msgid "Log in"
+msgstr "Entrar"
+
+msgid "Logging in..."
+msgstr "Entrando..."
+
+msgid "Host"
+msgstr "Host"
+
+msgid "Guests"
+msgstr "Guests"
+
+msgid "Templates"
+msgstr "Modelos"
+
+msgid "Storage"
+msgstr "Storage"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Failed to get application configuration"
+msgstr "N??o foi poss??vel carregar as configura????es da aplica????o"
+
+msgid "This is not a valid Linux path"
+msgstr "Este n??o ?? um caminho v??lido no Linux"
+
+msgid "This is not a valid URL."
+msgstr "Essa n??o ?? uma URL v??lida."
+
+msgid "No such data available."
+msgstr "N??o h?? dados dispon??veis."
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"N??o foi poss??vel contactar o sistema host. Verique se o sistema do host est?? "
+"ligado e se voc?? possui conectividade de rede com ele. Resposta da "
+"requisi????o HTTP %1. "
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "Confirma????o de remo????o"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "Confirm"
+msgstr "Confirmar"
+
+msgid "Create"
+msgstr "Criar"
+
+msgid "Warning"
+msgstr "Aviso"
+
+msgid "Save"
+msgstr "Salvar"
+
+msgid "Creating..."
+msgstr "Criando..."
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "Carregando..."
+
+msgid "An error occurred while retrieving system information."
+msgstr "Ocorreu um erro ao recuperar informa????es do sistema."
+
+msgid "Retry"
+msgstr "Tentar novamente"
+
+msgid "Detailed message:"
+msgstr "Mensagem detalhada:"
+
+msgid "No ISO found"
+msgstr "Nenhuma ISO encontrada"
+
+msgid "This is not a valid ISO file."
+msgstr "Esse n??o ?? um arquivo ISO v??lido."
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "Isso vai levar um longo tempo. Deseja continuar?"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "O modelo vai ser permanentemente removido. Deseja continuar?"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+"N??o foi poss??vel desligar o sistema porque algumas m??quinas virtuais est??o "
+"ligadas!"
+
+msgid "Max:"
+msgstr "M??ximo:"
+
+msgid "Utilization"
+msgstr "Utiliza????o"
+
+msgid "Available"
+msgstr "Dispon??vel"
+
+msgid "Read Rate"
+msgstr "Taxa de leitura"
+
+msgid "Write Rate"
+msgstr "Taxa de escrita"
+
+msgid "Received"
+msgstr "Recebido"
+
+msgid "Sent"
+msgstr "Enviado"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"Desligar ou reiniciar o host causar?? perda de trabalho que n??o foi salvo. "
+"Continuar o processo de desligar/reiniciar?"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Reposit??rio ser?? removido permanentemente e n??o poder?? ser recuperado. "
+"Deseja continuar?"
+
+msgid "Repositories"
+msgstr "Reposit??rios"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Base URL"
+msgstr "URL Base"
+
+msgid "Is Mirror"
+msgstr "?? mirror"
+
+msgid "URL Args"
+msgstr "Argumentos da URL"
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid "GPG Check"
+msgstr "Verifica????o GPG"
+
+msgid "GPG Key"
+msgstr "Chave GPG"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Remove"
+msgstr "Remover"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Disable"
+msgstr "Desativar"
+
+msgid "Software Updates"
+msgstr "Atualiza????es de software"
+
+msgid "Package Name"
+msgstr "Nome do pacote"
+
+msgid "Version"
+msgstr "Vers??o"
+
+msgid "Architecture"
+msgstr "Arquitetura"
+
+msgid "Repository"
+msgstr "Reposit??rio"
+
+msgid "Update All"
+msgstr "Atualizar todos"
+
+msgid "Updating..."
+msgstr "Atualizando..."
+
+msgid "Failed to retrieve packages update information."
+msgstr "N??o foi poss??vel recuperar as informa????es de atualiza????o de pacoates."
+
+msgid "Failed to update package(s)."
+msgstr "Erro ao atualizar pacote(s)."
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"Relat??rio de debug ser?? permanentemente removido e n??o poder?? ser "
+"recuperado. Deseja continuar?"
+
+msgid "Debug Reports"
+msgstr "Relat??rios de Debug"
+
+msgid "Generated Time"
+msgstr "Tempo gerado"
+
+msgid "Generate"
+msgstr "Gerar"
+
+msgid "Generating..."
+msgstr "Gerando..."
+
+msgid "Rename"
+msgstr "Renomear"
+
+msgid "Download"
+msgstr "Baixar"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+"Nome do relat??rio deve apenas conter letras, n??meros, underscore ('_') e/ou "
+"h??fen ('-')."
+
+msgid "Pending..."
+msgstr "Pendente..."
+
+msgid "Report name is the same as the original one."
+msgstr "Nome do relat??rio ?? o mesmo que o original."
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"A m??quina virtual vai ser removida com todos seus discos. Essa opera????o ?? "
+"irrevers??vel. Deseja continuar?"
+
+msgid "Power off Confirmation"
+msgstr "Confirma????o de desligamento for??ado"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+"Essa a????o pode produzir resultados n??o desej??veis, como por exemplo cache de "
+"disco n??o-atualizado no guest. Deseja continuar?"
+
+msgid "Reset Confirmation"
+msgstr "Confirma????o de reinicializa????o"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+"Existe um risco de perda de dados causado pela reinicializa????o sem o "
+"desligamento do sistema operacional do guest. Deseja continuar?"
+
+msgid "Shut Down Confirmation"
+msgstr "Confirma????o de desligamento"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr ""
+"O sistema operacional do guest pode ignorar essa requisi????o. Deseja "
+"continuar?"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr "Confirma????o de Remo????o da M??quina Virtual"
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+msgstr ""
+"Essa m??quina virtual n??o ?? persistente. O desligamento ir?? remov??-la. Deseja "
+"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 ""
+"Quando o guest de destino tiver volumes SCSI ou iSCSI, eles ser??o clonados "
+"no storage pool padr??o. O mesmo vai acontecer quando o pool de destino n??o "
+"tiver espa??o suficiente para clonar os volumes. Voc?? deseja continuar?"
+
+msgid ""
+"This CDROM will be detached permanently and you can re-attach it. Continue "
+"to detach it?"
+msgstr ""
+"Esse CDROM ser?? desconectado permanentemente e voc?? pode reconect??-lo. "
+"Deseja continuar a remo????o? "
+
+msgid "Attach"
+msgstr "Adicionar"
+
+msgid "Attaching..."
+msgstr "Adicionando..."
+
+msgid "Replace"
+msgstr "Substituir"
+
+msgid "Replacing..."
+msgstr "Substituindo..."
+
+msgid "Successfully attached!"
+msgstr "Adicionado com sucesso!"
+
+msgid "Successfully replaced!"
+msgstr "Substitu??do com sucesso!"
+
+msgid "Successfully detached!"
+msgstr "Removido com sucesso!"
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"detach it?"
+msgstr ""
+"Esse disco ser?? desconectado permanentemente e voc?? pode reconect??-lo. "
+"Deseja continuar a remo????o? "
+
+msgid "interface:"
+msgstr "interface:"
+
+msgid "address:"
+msgstr "endere??o:"
+
+msgid "link_type:"
+msgstr "tipo do link:"
+
+msgid "block:"
+msgstr "bloco:"
+
+msgid "drive_type:"
+msgstr "tipo do drive:"
+
+msgid "model:"
+msgstr "modelo:"
+
+msgid "Affected devices:"
+msgstr "Dispositivos afetados:"
+
+msgid "The VLAN id must be between 1 and 4094."
+msgstr "ID da VLAN deve ser um n??mero entre 1 e 4094."
+
+msgid "unavailable"
+msgstr "indispon??vel"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"Esta a????o ir?? interromper a conectividade da rede para qualquer m??quina "
+"virtual que depende dessa rede."
+
+msgid "Create a network"
+msgstr "Criar uma rede"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"Essa rede n??o ?? persistente. Ao inv??s de parar, essa a????o ir?? remov??-la "
+"permantemente. Deseja continuar?"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr "O storage pool vai ser permanentemente removido. Deseja continuar?"
+
+msgid "This storage pool is empty."
+msgstr "Esse storage pool est?? vazio."
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+"Isso formatar?? seu disco e voc?? perder?? toda informa????o, voc?? tem certeza "
+"que quer continuar?"
+
+msgid "SCSI Fibre Channel"
+msgstr "SCSI Fibre Channel"
+
+msgid "No SCSI adapters found."
+msgstr "Nenhum adaptador SCSI encontrado."
+
+msgid "Loading iSCSI targets..."
+msgstr "Carregando iSCSI targets..."
+
+msgid "No iSCSI found. Please input one."
+msgstr "Nenhum iSCSI encontrado. Por favor, forne??a um."
+
+msgid "Failed to load iSCSI targets."
+msgstr "Erro ao carregar iSCSI targets."
+
+msgid "The storage pool name can not be blank."
+msgstr "O nome do storage pool n??o pode ser vazio."
+
+msgid "The storage pool path can not be blank."
+msgstr "O caminho do storage pool n??o pode ser vazio."
+
+msgid "NFS server mount path can not be blank."
+msgstr "Caminho de montagem do servidor de NFS n??o pode ser vazio."
+
+msgid "Invalid NFS mount path."
+msgstr "Caminho de montagem do NFS inv??lido."
+
+msgid "No logical device selected."
+msgstr "Nenhum dispositivo l??gico selecionado."
+
+msgid "The iSCSI target can not be blank."
+msgstr "O alvo iSCSI n??o pode ser vazio."
+
+msgid "Server name can not be blank."
+msgstr "Nome do servidor n??o pode ser vazio."
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr "Este n??o ?? um nome ou IP de servidor v??lido. Por favor, modifique-o."
+
+msgid "Looking for available partitions ..."
+msgstr "Procurando por parti????es dispon??veis ..."
+
+msgid "No available partitions found."
+msgstr "Nenhuma parti????o dispon??vel encontrada."
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"O storage pool n??o ?? persistente. Ao inv??s de desativar, essa a????o vai "
+"remov??-lo permanentemente. Deseja continuar?"
+
+msgid "Unable to retrieve partitions information."
+msgstr "N??o foi poss??vel recuperar as informa????es das parti????es."
+
+msgid "In progress..."
+msgstr "Em progresso..."
+
+msgid "Failed!"
+msgstr "Falhou!"
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+"Caminho do CDROM precisa ser um caminho local v??lido e n??o pode ser vazio."
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "Pool ou volume do disco n??o pode ser vazio."
+
+msgid "Session timeout, please re-login."
+msgstr "Fim do limite do tempo da sess??o, por favor se autentique novamente."
+
+msgid "User Name"
+msgstr "Usu??rio"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid "Peers"
+msgstr "Peers"
+
+msgid "Searching"
+msgstr "Procurando"
+
+msgid "No peers found."
+msgstr "Nenhum peer encontrado."
+
+msgid "Help"
+msgstr "Ajuda"
+
+msgid "About"
+msgstr "Sobre"
+
+msgid "Log out"
+msgstr "Sair"
+
+msgid "Version:"
+msgstr "Vers??o:"
+
+#~ msgid "Unknown parameter %(value)s"
+#~ msgstr "Par??metro desconhecido: %(value)s"
+
+#~ msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
+#~ msgstr ""
+#~ "Limite de tempo de %(seconds)s segundos expirado ao executar a tarefa '%"
+#~ "(task)s'."
+
+#~ msgid "User %(user_id)s not found with given LDAP settings."
+#~ msgstr "Usu??rio %(user_id)s n??o encontrado com as configura????es LDAP dadas."
+
+#~ msgid "Unknown \"_cap\" specified"
+#~ msgstr "\"_cap\" desconhecido especificado"
+
+#~ msgid "\"_passthrough\" should be \"true\" or \"false\""
+#~ msgstr "\"_passthrough\" deve ser \"true\" ou \"false\""
+
+#~ msgid "\"_passthrough_affected_by\" should be a device name string"
+#~ msgstr ""
+#~ "\"_passthrough_affected_by\" deve ser um texto do nome do dispositivo"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr "Erro ao consultar block devices. Detalhes %(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr "Erro ao consultar informa????es de block devices para %(device)s."
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "N??o foi poss??vel encontrar o arquivo da distribui????o: %(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "N??o foi poss??vel ler o arquivo da distribui????o: %(filename)s. Confirme se "
+#~ "?? um arquivo JSON."
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel logar na m??quina alvo do iSCSI %(portal)s. Detalhes: %"
+#~ "(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "N??o foi poss??vel logar na m??quina %(host)s alvo %(target)s do iSCSI"
+
+#~ msgid "Unable to find ISO file %(filename)s"
+#~ msgstr "N??o foi poss??vel encontrar a ISO %(filename)s"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "A ISO %(filename)s n??o ?? boot??vel"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr "A ISO %(filename)s n??o possui uma grava????o v??lida de boot El Torito"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "Valida????o El Torito inv??lida na ISO %(filename)s"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "Indicador de boot El Torito inv??lido na ISO %(filename)s"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr ""
+#~ "Tipo de volume n??o esperado para um volume prim??rio na ISO %(filename)s"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr ""
+#~ "Formato errado na leitura do descritor de volume na ISO %(filename)s"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "O servidor n??o tem permiss??o para acessar a ISO %(filename)s. Considere "
+#~ "mud??-la para o diret??rio /var/lib/libvirt, ou mude as permiss??es para que "
+#~ "o usu??rio '%(user)s' tenha acesso, ou, adicione o usu??rio '%(user)s' no "
+#~ "grupo do caminho da ISO, ou (n??o recomendado) 'chmod -R o+x "
+#~ "'caminho_para_iso'. Detalhes: %(err)s"
+
+#~ msgid "An error occurred when probing image OS information."
+#~ msgstr "Ocorreu um erro ao identificar o sistema operacional da imagem."
+
+#~ msgid "No OS information found in given image."
+#~ msgstr ""
+#~ "Nenhuma informa????o de sistema operacional encontrada na imagem fornecida."
+
+#~ msgid "Unable to read image file %(filename)s"
+#~ msgstr "N??o foi poss??vel ler o arquivo de imagem %(filename)s."
+
+#~ msgid ""
+#~ "Image file must be an existing file on system. %(filename)s is not a "
+#~ "valid input."
+#~ msgstr ""
+#~ "Arquivo de imagem deve ser um arquivo existente no sistema. %(filename)s "
+#~ "n??o ?? uma entrada v??lida."
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "M??quina virtual %(name)s j?? existe"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "M??quina virtual %(name)s n??o existe"
+
+#~ 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 ""
+#~ "N??o foi poss??vel renomear a m??quina virtual %(name)s. O nome %(new_name)s "
+#~ "j?? est?? em uso ou a m??quina virtual n??o est?? ligada."
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel tirar uma foto da tela para a m??quina virtual %(name)s "
+#~ "que est?? desligada"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "Imagem de ISO remota n??o ?? suportada por esse servidor."
+
+#~ msgid "Screenshot is not supported on virtual machine %(name)s"
+#~ msgstr "Foto da tela n??o ?? suportado na m??quina virtual %(name)s"
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel criar a m??quina virtual %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel atualizar a m??quina virtual %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel encontrar a m??quina virtual %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to connect to powered off virtual machine %(name)s."
+#~ msgstr "N??o foi poss??vel conectar ?? m??quina virtual desligada %(name)s."
+
+#~ msgid "Invalid template URI %(value)s specified for virtual machine"
+#~ msgstr "URI do Modelo inv??lida %(value)s especificada para m??quina virtual"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for virtual machine"
+#~ msgstr ""
+#~ "URI do Storage pool URI inv??lida %(value)s especificada para m??quina "
+#~ "virtual"
+
+#~ msgid "Supported virtual machine graphics are Spice or VNC"
+#~ msgstr "Gr??ficos suportados para a m??quina virtual s??o Spice ou VNC"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr "Endere??o para receber eventos gr??ficos deve ser IPv4 ou IPv6"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "Especifique um modelo para ser base da cria????o da m??quina virtual"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel iniciar a m??quina virtual %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel for??ar o desligamento da m??quina virtual %(name)s. "
+#~ "Detalhes: %(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel remover a m??quina virtual %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel reiniciar a m??quina virtual %(name)s. Detalhes: %(err)s"
+
+#~ msgid "User name list must be an array"
+#~ msgstr "Lista de nomes de usu??rio deve ser um array"
+
+#~ msgid "User name must be a string"
+#~ msgstr "Nome de usu??rio deve ser um texto"
+
+#~ msgid "Group name list must be an array"
+#~ msgstr "Lista de nomes de grupo deve ser um array"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "Nome de grupo deve ser um texto"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "Usu??rio(s) '%(users)s' n??o existe(m)"
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "Grupo(s) '%(groups)s' n??o existe(m)"
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel desligar a m??quina virtual %(name)s. Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr ""
+#~ "N??o foi poss??vel acessar os metadados da m??quina virtual %(name)s. "
+#~ "Detalhes: %(err)s"
+
+#~ msgid "The guest console password must be a string."
+#~ msgstr "A senha para o console do guest deve ser um texto."
+
+#~ 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."
+
+#~ msgid "Virtual machine '%(name)s' must be stopped before cloning it."
+#~ msgstr "A m??quina virtual '%(name)s' deve estar parada antes de clon??-la."
+
+#~ msgid "Insufficient disk space to clone virtual machine '%(name)s'"
+#~ msgstr ""
+#~ "Espa??o em disco insuficiente para clonar a m??quina virtual '%(name)s'"
+
+#~ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel clonar a VM '%(name)s'. Detalhes: %(err)s"
+
+#~ msgid "Invalid operation for non-persistent virtual machine %(name)s"
+#~ msgstr "Opera????o inv??lida para m??quina virtual n??o-persistente %(name)s"
+
+#~ msgid ""
+#~ "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
+#~ msgstr ""
+#~ "A VM %(vmid)s n??o cont??m o dispositivo de host atribu??do diretamente %"
+#~ "(dev_name)s."
+
+#~ msgid ""
+#~ "The host device %(dev_name)s is not allowed to directly assign to VM."
+#~ msgstr ""
+#~ "N??o ?? permitido atribuir diretamente o dispositivo de host %(dev_name)s."
+
+#~ msgid ""
+#~ "No IOMMU groups found. Host PCI pass through needs IOMMU group to "
+#~ "function correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, "
+#~ "then verify the Kernel is compiled with IOMMU support. For Intel CPU, add "
+#~ "intel_iommu=on to your Kernel parameter in /boot/grub2/grub.conf. For AMD "
+#~ "CPU, add iommu=pt iommu=1."
+#~ msgstr ""
+#~ "Nenhum grupo IOMMU encontrado. Passthrough de host PCI necessita do grupo "
+#~ "IOMMU para funcionar corretamente. Por favor, habilite o suporte ao Intel "
+#~ "VT-d ou AMD IOMMU. Para uma CPU Intel, adicione \"intel_iommu=on\" nos "
+#~ "seus par??metros de kernel em \"/boot/grub2/grub.conf\". Para uma CPU AMD, "
+#~ "adicione \"iommu=pt iommu=1\"."
+
+#~ msgid "\"name\" should be a device name string"
+#~ msgstr "\"nome\" deve ser um texto do nome do dispositivo."
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "Interface %(iface)s n??o existe na m??quina virtual %(name)s"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr ""
+#~ "Rede %(network)s especificada para a m??quina virtual %(name)s n??o existe"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr "Tipo de interface suportado das m??quinas virtuais ?? somente rede"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr "Nome da rede para a interface da m??quina virtual deve ser texto"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "Modelo de placa de rede inv??lido para a interface da m??quina virtual"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr ""
+#~ "Especifique o tipo e a rede para adicionar uma nova interface da m??quina "
+#~ "virtual"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "Modelo %(name)s j?? existe"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "Storage pool %(pool)s especificado para o modelo %(template)s n??o existe"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "Storage pool %(pool)s especificado para o modelo %(template)s n??o est?? "
+#~ "ativo"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "Par??metro inv??lido '%(param)s' especificado para CDROM"
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr ""
+#~ "Rede %(network)s especificada para modelo %(template)s n??o est?? ativa"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "Nome do modelo deve ser um texto"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "??cone do modelo deve ser um caminho para uma imagem"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "Distribui????o do modelo deve ser um texto"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "Vers??o da distribui????o do modelo deve ser um texto"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "O n??mero de CPUs deve ser um inteiro maior do que 0"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "Quantidade de mem??ria (MB) deve ser um inteiro maior que 512"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "Modelo do CDROM deve ser um arquivo ISO local ou remoto"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr "URI de storage pool inv??lido %(value)s especificado para modelo"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr ""
+#~ "Especifique uma imagem ISO como CD-ROM ou uma imagem base para criar um "
+#~ "modelo"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr "Todas redes para o modelo devem ser especificadas em uma lista"
+
+#~ msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
+#~ msgstr ""
+#~ "Especifique um volume para o template quando o storage pool for iSCSI or "
+#~ "SCSI"
+
+#~ msgid "The volume %(volume)s is not in storage pool %(pool)s"
+#~ msgstr "O volume %(volume)s n??o est?? no storage pool %(pool)s"
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "N??o foi poss??vel criar o modelo devido a um erro: %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "N??o foi poss??vel remover o modelo devido a um erro: %(err)s"
+
+#~ msgid "Disk size must be an integer greater than 1GB."
+#~ msgstr "O tamanho do disco deve ser um n??mero inteiro maior que 1GB."
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "Imagem base do modelo deve ser um arquivo de imagem local v??lido"
+
+#~ msgid "Cannot identify base image %(path)s format"
+#~ msgstr "N??o foi poss??vel identificar o formato da imagem base %(path)s"
+
+#~ msgid ""
+#~ "When specifying CPU topology, VCPUs must be a product of sockets, cores, "
+#~ "and threads."
+#~ msgstr ""
+#~ "Ao especificar a topologia de CPU, VCPUs deve ser um produto de sockets, "
+#~ "cores e threads."
+
+#~ msgid ""
+#~ "When specifying CPU topology, each element must be an integer greater "
+#~ "than zero."
+#~ msgstr ""
+#~ "Ao especificar a topologia de CPU, cada elemento deve ser um n??mero "
+#~ "inteiro maior do que zero."
+
+#~ msgid ""
+#~ "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
+#~ "qcow2, qed, raw, vmdk, vpc."
+#~ msgstr ""
+#~ "Formato de imagem de disco inv??lido. Formatos v??lidos: bochs, cloop, cow, "
+#~ "dmg, qcow, qcow2, qed, raw, vmdk, vpc."
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "Storage pool %(name)s j?? existe"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "Storage pool %(name)s n??o existe"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "Especifique %(item)s para criar o storage pool %(name)s"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "N??o foi poss??vel remover o storage pool ativo %(name)s"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel listar os storage pools. Detalhes: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel criar o storage pool %(name)s. Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel saber o n??mero de volumes no storage pool %(name)s. "
+#~ "Detalhes: %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi possivel ativar o storage pool %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi possivel desativar o storage pool %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi possivel remover o storage pool %(name)s. Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "N??o foi poss??vel criar Pool NFS uma vez que o caminho de exporta????o %"
+#~ "(path)s pode bloquear durante a montagem"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "N??o foi poss??vel criar NFS Pool uma vez que a montagem do caminho de "
+#~ "exporta????o %(path)s falhou"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "Tipo de storage pool n??o suportado: %(type)s"
+
+#~ msgid "Error while retrieving storage pool XML to %(pool)s"
+#~ msgstr "Erro durante a leitura do XML do storage pool %(pool)s"
+
+#~ msgid ""
+#~ "Supported storage pool types are dir, netfs, logical, iscsi, isci and "
+#~ "kimchi-iso"
+#~ msgstr ""
+#~ "Tipos de storage pool supportados s??o dir, netfs, logical, iscsi, scsi e "
+#~ "kimchi-iso"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "Caminho para storage pool deve ser um texto"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "Host do storage pool deve ser um IP ou um hostname"
+
+#~ msgid "Storage pool device must be the absolute path to the block device"
+#~ msgstr ""
+#~ "Dispositivo do storage pool deve ser o caminho absoluto para o block "
+#~ "device"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "Par??metro dos dispositivos do storage pool devem ser uma lista"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "Alvo IQN de um pool iSCSI deve ser um texto"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr ""
+#~ "Porta de um servidor remoto de storage deve ser um inteiro entre 1 e 65535"
+
+#~ msgid "iSCSI target username must be a string"
+#~ msgstr "Usu??rio do iSCSI target deve ser um texto"
+
+#~ msgid "iSCSI target password must be a string"
+#~ msgstr "Senha do iSCSI target deve ser um texto"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "Especifique o nome e o tipo para criar um storage pool"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s n??o ?? um disco/parti????o v??lido. N??o foi poss??vel adicion??-lo ao "
+#~ "pool %(pool)s."
+
+#~ msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel extender o pool l??gico %(pool)s. Detalhes: %(err)s"
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr ""
+#~ "O par??metro discos somente pode ser atualizado para storage pool l??gicos."
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "O nome do adaptador SCSI host deve ser um texto"
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr "O storage pool kimchi_isos ?? reservado para uso interno"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "N??o foi poss??vel ativar o storage pool NFS %(name)s. Servidor NFS %"
+#~ "(server)s est?? inacess??vel."
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "N??o foi poss??vel desativar o storage pool NFS %(name)s. Servidor NFS %"
+#~ "(server)s est?? inacess??vel."
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "N??o foi poss??vel desativar o pool %(name)s uma vez que ele est?? associado "
+#~ "com algum dos modelos"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "N??o foi poss??vel remover o pool %(name)s uma vez que ele est?? associado "
+#~ "com algum dos modelos"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "Um grupo de volume chamado '%(name)s' j?? existe. Por favor, escolha outro "
+#~ "nome para criar o pool l??gico."
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel atualizar a base de dados com informa????es de mais ISOs "
+#~ "devido a um erro: %(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "Volume de storage %(name)s j?? existe"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr "Volume de storage %(name)s n??o existe no storage pool %(pool)s"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(volume)s because storage pool %(pool)s "
+#~ "is not active"
+#~ msgstr ""
+#~ "N??o foi poss??vel criar o storaget volume %(volume)s pois o storage pool %"
+#~ "(pool)s n??o est?? ativo"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr "Especifique %(item)s para poder criar o volume %(volume)s"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel criar o volume %(name)s no storage pool %(pool)s. "
+#~ "Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel listar os volumes do storage pool %(pool)s. Detalhes: %"
+#~ "(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel limpar o volume %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel remover o volume %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel redimensionar o volume %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr "Storage do tipo %(type)s n??o suporta cria????o ou remo????o de volume"
+
+#~ msgid "Storage volume name must be a string"
+#~ 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. Valid formats: bochs, cloop, cow, "
+#~ "dmg, qcow, qcow2, qed, raw, vmdk, vpc."
+#~ msgstr ""
+#~ "Formato de volume de storage inv??lido. Formatos v??lidos: bochs, cloop, "
+#~ "cow, dmg, qcow, qcow2, qed, raw, vmdk, vpc."
+
+#~ msgid "Storage volume requires a volume name"
+#~ msgstr "Volume de storage requer um nome"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel atualizar a base de dados com informa????es de volume de "
+#~ "storage devido a um erro: %(err)s"
+
+#~ msgid "Only one of parameter %(param)s can be specified"
+#~ msgstr "Somente um par??metro %(param)s pode ser especificado"
+
+#~ msgid "Create volume from %(param)s is not supported"
+#~ msgstr "Criar um volume a partir de %(param)s n??o ?? suportado"
+
+#~ msgid "Storage volume capacity must be an integer number."
+#~ msgstr "A capacidade do storage volume deve ser um n??mero inteiro."
+
+#~ msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
+#~ msgstr ""
+#~ "URL para o storage volume deve ser http://, https://, ftp:// ou ftps://."
+
+#~ msgid "Unable to access file %(url)s. Please, check it."
+#~ msgstr "Erro ao acessar arquivo %(url)s. Por favor, verifique isso."
+
+#~ msgid ""
+#~ "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel clonar o volume de storage '%(name)s' no pool '%(pool)"
+#~ "s'. Detalhes: %(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "Interface %(name)s n??o existe"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "Rede %(name)s j?? existe"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "Rede %(name)s n??o existe"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr ""
+#~ "A subrede %(subnet)s especificada para a rede %(network)s n??o ?? v??lida."
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr ""
+#~ "Especifique uma interface de rede para criar a rede de bridge %(name)s"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "N??o foi poss??vel remover a rede ativa %(name)s"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "A interface %(iface)s especificada para a rede %(network)s j?? est?? em uso"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr ""
+#~ "Interface deve ser 'bare NIC', 'bonding' ou 'dispositivo de bridge'."
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel criar a rede %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr ""
+#~ "N??o foi poss??vel encontrar um endere??o IP livre para a rede '%(name)s'"
+
+#~ msgid "The interface %(iface)s already exists."
+#~ msgstr "A interface %(iface)s j?? existe"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "Tipos de rede suportados s??o isolada, NAT e bridge"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "Subrede deve ser um texto com endere??o IP e prefixo, ou m??scara de rede"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "Interface de rede deve ser um texto"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "ID da rede VLAN deve ser um inteiro entre 1 e 4094"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "Especifique o nome e o tipo para criar uma rede"
+
+#~ msgid ""
+#~ "Unable to delete network %(name)s. There are some virtual machines %(vms)"
+#~ "s and/or templates linked to this network."
+#~ msgstr ""
+#~ "N??o foi poss??vel desativar a rede %(name)s. H?? alguma m??quina virtual %"
+#~ "(vms)s e/ou modelo associados a esta rede."
+
+#~ msgid ""
+#~ "Unable to deactivate network %(name)s. There are some virtual machines %"
+#~ "(vms)s and/or templates linked to this network."
+#~ msgstr ""
+#~ "N??o foi poss??vel desativar a rede %(name)s. H?? alguma m??quina virtual %"
+#~ "(vms)s e/ou modelo associados a esta rede."
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr ""
+#~ "Dispositivo da bridge %(name)s n??o pode ser um dispositivo vinculado a "
+#~ "uma VLAN."
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "N??o foi poss??vel ativar a interface %(iface)s: %(err)s."
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "N??o foi poss??vel ativar a interface %(iface)s. Por favor, verifique o "
+#~ "status da conex??o f??sica."
+
+#~ msgid "Failed to start network %(name)s. Details: %(err)s"
+#~ msgstr "N??o foi poss??vel iniciar a rede %(name)s. Detalhes: %(err)s"
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "Relat??rio de debug %(name)s n??o existe"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "Ferramenta de relat??rio de debug n??o encontrada no sistema"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr ""
+#~ "N??o foi poss??vel criar o relat??rio de debug %(name)s. Detalhes: %(err)s."
+
+#~ msgid "Can not find any debug report with the given name %(name)s"
+#~ msgstr "N??o foi poss??vel encontrar nenhum relat??rio com o nome %(name)s"
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel gerar o relat??rio de debug %(name)s. Detalhes: %(err)s"
+
+#~ msgid "You should give a name for the debug report file."
+#~ msgstr "Voc?? deve dar um nome para o arquivo do relat??rio de debug."
+
+#~ msgid ""
+#~ "Debug report name must be a string. Only letters, digits, underscore "
+#~ "('_') and hyphen ('-') are allowed."
+#~ msgstr ""
+#~ "Nome do relat??rio deve ser um texto. Somente letras, digitos, underscore "
+#~ "('_') e h??fem ('-') s??o permitidos."
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "O relat??rio de debug com o nome especificado \"%(name)s\" j?? existe. Por "
+#~ "favor, use outro nome."
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "Servidor de storage %(server)s n??o foi usado pelo Kimchi"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "Distribui????o '%(name)s' n??o existe"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "Parti????o %(name)s n??o existe no host"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "N??o foi poss??vel desligar o host uma vez que h?? m??quinas virtuais ligadas"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "N??o foi poss??vel resetar o host uma vez que h?? m??quinas virtuais ligadas"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "Dispositivo de n?? '%(name)s' n??o encontrado"
+
+#~ msgid "Conflicting flag filters specified."
+#~ msgstr "Foram especificados filtros de flag com conflito."
+
+#~ msgid "No packages marked for update"
+#~ msgstr "Nenhum pacote marcado para atualiza????o"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "Pacote %(name)s n??o est?? marcado para atualiza????o."
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr "Erro ao buscar pacotes marcados para atualiza????o. Detalhes: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "N??o h?? gerenciador de pacotes compat??vel para este sistema."
+
+#~ msgid "Invalid URI %(uri)s"
+#~ msgstr "URI %(uri)s inv??lida"
+
+#~ msgid "Unable to choose a virtual machine name"
+#~ msgstr "N??o foi poss??vel escolher um nome para a m??quina virtual"
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "Tipo de storage inv??lido. Tipos suportados: 'cdrom', 'disco'"
+
+#~ msgid "The path '%(value)s' is not a valid local/remote path for the device"
+#~ msgstr ""
+#~ "O caminho '%(value)s' n??o ?? um caminho local/remoto v??lido para este "
+#~ "dispositivo"
+
+#~ msgid "Only CDROM path can be update."
+#~ msgstr "Apenas o caminho do CD-ROM pode ser atualizado."
+
+#~ msgid ""
+#~ "The storage device %(dev_name)s does not exist in the virtual machine %"
+#~ "(vm_name)s"
+#~ msgstr "O disco %(dev_name)s n??o existe na m??quina virtual %(vm_name)s"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr "Erro ao criar novo dispositivo de storage: %(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr "Erro ao atualizar dispositivo de storage: %(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "Erro ao remover dispositivo de storage: %(error)s"
+
+#~ msgid "Do not support IDE device hot plug"
+#~ msgstr "Dispositivo IDE hot plug n??o ?? suportado"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Especifique o tipo e o caminho, ou o tipo e o pool/volume, para adicionar "
+#~ "um novo disco da m??quina virtual"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr "Especifique o caminho para atualizar o disco da m??quina virtual"
+
+#~ msgid "Controller type %(type)s limitation of %(limit)s devices reached"
+#~ msgstr ""
+#~ "Limita????o do tipo do controlador %(type)s de %(limit)s dispositivos foi "
+#~ "alcan??ada"
+
+#~ msgid ""
+#~ "Cannot retrieve disk path information for given pool/volume: %(error)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel buscar informa????es do caminho do disco para o pool/"
+#~ "volume dado: %(error)s"
+
+#~ msgid "Volume already in use by other virtual machine."
+#~ msgstr "Volume j?? em uso por outra m??quina virtual."
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr ""
+#~ "Somente um caminho ou pool/volume pode ser especificado para adicionar um "
+#~ "novo disco da m??quina virtual."
+
+#~ msgid ""
+#~ "Volume chosen with format %(format)s does not fit in the storage type %"
+#~ "(type)s"
+#~ msgstr ""
+#~ "Volume escolhido com formato %(format)s n??o se enquadra no tipo de "
+#~ "storage %(type)s"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr "ID do reposit??rio YUM deve ser apenas uma palavra."
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "URL do reposit??rio deve ser uma URL http://, ftp:// ou file://."
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr ""
+#~ "Configura????o do reposit??rio ?? um dicion??rio com valores espec??ficos de "
+#~ "acordo com o tipo do reposit??rio."
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "Distribui????o para o reposit??rio DEB deve ser um texto"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr "Componentes para o reposit??rio DEB deve ser um array"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "Componentes para o reposit??rio DEB deve ser um texto"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "Nome do reposit??rio YUM deve ser um texto."
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "Verifica????o de GPG deve ser um valor booleano."
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr ""
+#~ "Chave GPG deve ser uma URL apontando para o arquivo no formato ASCII-"
+#~ "armor."
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "N??o foi poss??vel atualizar o reposit??rio %(repo_id)s."
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "Reposit??rio %(repo_id)s n??o existe."
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr ""
+#~ "Ferramenta de gerenciamento de reposit??rio n??o foi reconhecida no seu "
+#~ "sistema."
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "Reposit??rio %(repo_id)s j?? est?? habilitado."
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "Reposit??rio %(repo_id)s j?? est?? desabilitado."
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "N??o foi poss??vel remover o reposit??rio %(repo_id)s."
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel gravar o arquivo de configura????o do reposit??rio %"
+#~ "(repo_file)s"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr ""
+#~ "Especificar o reposit??rio de distribui????o para poder criar o reposit??rio "
+#~ "DEB."
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "N??o foi poss??vel habilitar o reposit??rio %(repo_id)s."
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "N??o foi poss??vel desabilitar o reposit??rio %(repo_id)s."
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "ID do reposit??rio YUM j?? existe"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "Nome do reposit??rio YUM deve ser um texto"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "N??o ?? poss??vel listar os reposit??rios. Detalhes: '%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr ""
+#~ "N??o foi poss??vel carregar as informa????es do reposit??rio. Detalhes: '%(err)"
+#~ "s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "N??o foi poss??vel adicionar o reposit??rio. Detalhes: '%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "N??o foi poss??vel remover o reposit??rio. Detalhes: '%(err)s'"
+
+#~ msgid ""
+#~ "Configuration items: '%(items)s' are not supported by repository manager"
+#~ msgstr ""
+#~ "Itens de configura????o '%(items)s' n??o s??o suportados pelo gerenciador de "
+#~ "reposit??rios."
+
+#~ msgid ""
+#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
+#~ msgstr ""
+#~ "A m??quina virtual '%(vm)s' deve estar parada antes de criar um snapshot "
+#~ "dela"
+
+#~ msgid ""
+#~ "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel criar o snapshot '%(name)s' na m??quina virtual '%(vm)s'. "
+#~ "Detalhes: %(err)s"
+
+#~ msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
+#~ msgstr "O snapshot '%(name)s' n??o existe na m??quina virtual '%(vm)s'."
+
+#~ msgid ""
+#~ "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel recuperar o snapshot '%(name)s' da m??quina virtual '%(vm)"
+#~ "s'. Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel listar os snapshots da m??quina virtual '%(vm)s'. "
+#~ "Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel remover o snapshot '%(name)s' da m??quina virtual '%(vm)"
+#~ "s'. Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
+#~ "%(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel recuperar o snapshot atual da m??quina virtual '%(vm)s'. "
+#~ "Detalhes: %(err)s."
+
+#~ msgid ""
+#~ "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "N??o foi poss??vel reverter a m??quina virtual '%(vm)s' para o snapshot '%"
+#~ "(name)s'. Detalhes: %(err)s"
+
+#~ msgid ""
+#~ "Unable to create snapshot of virtual machine '%(vm)s' because it contains "
+#~ "a disk with format '%(format)s'; only 'qcow2' is supported."
+#~ msgstr ""
+#~ "N??o foi poss??vel criar o snapshot para a m??quina virtual '%(vm)s' porque "
+#~ "ela cont??m discos no formato '%(format)s'; somente 'qcow2' ?? suportado."
+
+#~ msgid "The number of vCPUs is too large for this system."
+#~ msgstr "O n??mero de VCPUs ?? grande demais para esse sistema."
+
+#~ msgid "Invalid vCPU/topology combination."
+#~ msgstr "Combina????o inv??lida de VCPU/topologia."
+
+#~ msgid "This host (or current configuration) does not allow CPU topology."
+#~ msgstr "Este host (ou configura????o atual) n??o permite topologia de CPU."
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "Criar nova M??quina Virtual"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "Nome da M??quina Virtual"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "O nome usado para identificar a m??quina virtual. Se ele for omitido, a "
+#~ "escolha ser?? baseada no modelo selecionado."
+
+#~ msgid "Template"
+#~ msgstr "Modelo"
+
+#~ msgid "Please create a template first."
+#~ msgstr "Por favor, crie um modelo primeiro."
+
+#~ msgid "Create a Template"
+#~ msgstr "Criar um Modelo"
+
+#~ msgid "Please choose a template."
+#~ msgstr "Por favor, escolha um modelo."
+
+#~ msgid "OS"
+#~ msgstr "Sistema Operacional"
+
+#~ msgid "OS Version"
+#~ msgstr "Vers??o do Sistema Speracional"
+
+#~ msgid "CPUS"
+#~ msgstr "CPUS"
+
+#~ msgid "Memory"
+#~ msgstr "Mem??ria"
+
+#~ msgid "Edit Guest"
+#~ msgstr "Editar Guest"
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid "Interface"
+#~ msgstr "Interface"
+
+#~ msgid "Permission"
+#~ msgstr "Permiss??o"
+
+#~ msgid "Host PCI Device"
+#~ msgstr "Dispositivo de host PCI"
+
+#~ msgid "Snapshot"
+#~ msgstr "Snapshot"
+
+#~ msgid "CPUs"
+#~ msgstr "CPUs"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "Mem??ria (MB)"
+
+#~ msgid "Icon"
+#~ msgstr "??cone"
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid "Path"
+#~ msgstr "Caminho"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Available system users and groups"
+#~ 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 "Usu??rio"
+
+#~ msgid "All"
+#~ msgstr "Todos"
+
+#~ msgid "To Add"
+#~ msgstr "Para adicionar"
+
+#~ msgid "Added"
+#~ msgstr "Adicionado"
+
+#~ msgid "filter"
+#~ msgstr "filtro"
+
+#~ msgid "Product"
+#~ msgstr "Produto"
+
+#~ msgid "Vendor"
+#~ msgstr "Vendor"
+
+#~ msgid "Created"
+#~ msgstr "Criado"
+
+#~ msgid "Detach"
+#~ msgstr "Remover"
+
+#~ msgid "revert"
+#~ msgstr "Reverter"
+
+#~ msgid "Start"
+#~ msgstr "Iniciar"
+
+#~ msgid "Reset"
+#~ msgstr "Reiniciar"
+
+#~ msgid "Power Off"
+#~ msgstr "For??ar desligamento"
+
+#~ msgid "Actions"
+#~ msgstr "A????es"
+
+#~ msgid "Connect"
+#~ msgstr "Conectar"
+
+#~ msgid "Clone"
+#~ msgstr "Clonar"
+
+#~ msgid "Shut Down"
+#~ msgstr "Desligar"
+
+#~ msgid "Delete"
+#~ msgstr "Remover"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "Disco E/S"
+
+#~ msgid "Network I/O"
+#~ msgstr "Rede E/S"
+
+#~ msgid "Livetile"
+#~ msgstr "Tela ao vivo"
+
+#~ msgid "No guests found."
+#~ msgstr "Nenhum guest encontrado."
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "Adicionar um dispositivo de storage ?? VM"
+
+#~ msgid "Device Type"
+#~ msgstr "Tipo do Dispositivo"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr ""
+#~ "O tipo do dispositivo. Atualmente, \"cdrom\" e \"disco\" s??o suportados."
+
+#~ msgid "Storage Pool"
+#~ msgstr "Storage Pool"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "Storage pool no qual o volume est?? localizado"
+
+#~ msgid "Storage Volume"
+#~ msgstr "Volume de storage"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "Volume de storage a ser adicionado"
+
+#~ msgid "File Path"
+#~ msgstr "Caminho do Arquivo"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "O caminho do arquivo ISO para o CDROM no servidor."
+
+#~ msgid "Shut down"
+#~ msgstr "Desligar"
+
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
+
+#~ msgid "Basic Information"
+#~ msgstr "Informa????es b??sicas"
+
+#~ msgid "OS Distro"
+#~ msgstr "Distribui????o"
+
+#~ msgid "OS Code Name"
+#~ msgstr "Nome-c??digo do sistema operacional"
+
+#~ msgid "Processor"
+#~ msgstr "Processador"
+
+#~ msgid "CPU(s)"
+#~ msgstr "CPU(s)"
+
+#~ msgid "System Statistics"
+#~ msgstr "Estat??sticas do sistema"
+
+#~ msgid "Update Progress"
+#~ msgstr "Progresso da atualiza????o"
+
+#, fuzzy
+#~ msgid "Filter"
+#~ msgstr "filtro"
+
+#~ msgid "Network Name"
+#~ msgstr "Nome da rede"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Network Type"
+#~ msgstr "Tipo da rede"
+
+#~ msgid "Address Space"
+#~ msgstr "Espa??o de endere??o"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "O nome n??o deve conter '/' and '\"'."
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "Isolada: nenhuma conex??o externa"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: somente conex??o de rede f??sica de sa??da"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr ""
+#~ "Bridged: M??quinas virtuais est??o conectadas diretamente com a rede f??sica"
+
+#~ msgid "(No interfaces found)"
+#~ msgstr "(Nenhuma interface encontrada)"
+
+#~ msgid "Destination"
+#~ msgstr "Destino"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "Habilitar VLAN"
+
+#~ msgid "VLAN ID"
+#~ msgstr "ID da VLAN"
+
+#~ msgid "Stop"
+#~ msgstr "Parar"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "Gerar um novo Relat??rio de Debug"
+
+#~ msgid "Report Name"
+#~ msgstr "Nome do Relat??rio"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "O nome usado para identificar o relat??rio. Se omitido, um nome ser?? "
+#~ "escolhido baseado no hor??rio atual. O nome pode conter: letras, n??meros, "
+#~ "underscore ('_') e h??fen ('-')."
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "Renomear um Relat??rio de Debug"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "O nome usado para identificar o relat??rio. O nome pode conter: letras, "
+#~ "d??gitos e h??fen (\"-\")."
+
+#~ msgid "Submit"
+#~ msgstr "Enviar"
+
+#~ msgid "Add a Repository"
+#~ msgstr "Adicionar um Reposit??rio"
+
+#~ msgid "Identifier"
+#~ msgstr "Identificador"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "Uma ??nica palavra, identificador ??nico para o reposit??rio."
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "Nome textual para o reposit??rio."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "Campo Obrigat??rio"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr "URL para o reposit??rio. Protocolos suportados s??o http, ftp e file."
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "Reposit??rio ?? um mirror"
+
+#~ msgid "Distribution"
+#~ msgstr "Distribui????o"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "Distribui????o para o reposit??rio DEB."
+
+#~ msgid "Components"
+#~ msgstr "Componentes"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "Lista de componentes para o reposit??rio DEB."
+
+#~ msgid "Edit Repository"
+#~ msgstr "Editar Reposit??rio"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "URL para a lista de mirror"
+
+#~ msgid "Yes"
+#~ msgstr "Sim"
+
+#~ msgid "No"
+#~ msgstr "N??o"
+
+#~ msgid "Capacity"
+#~ msgstr "Capacidade"
+
+#~ msgid "Allocated"
+#~ msgstr "Alocado"
+
+#~ msgid "Location"
+#~ msgstr "Localiza????o"
+
+#~ msgid "Device path"
+#~ msgstr "Caminho do dispositivo"
+
+#~ msgid "active"
+#~ msgstr "ativo"
+
+#~ msgid "inactive"
+#~ msgstr "inativo"
+
+#~ msgid "Deactivate"
+#~ msgstr "Desativar"
+
+#~ msgid "Activate"
+#~ msgstr "Ativar"
+
+#~ msgid "Add Volume"
+#~ msgstr "Adicionar volume"
+
+#~ msgid "Extend"
+#~ msgstr "Aumentar"
+
+#~ msgid "Undefine"
+#~ msgstr "Indefinir"
+
+#~ msgid "Format"
+#~ msgstr "Formato"
+
+#~ msgid "Allocation"
+#~ msgstr "Aloca????o"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "Definir novo Storage Pool"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "Nome do Storage Pool"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr "O nome usado para identificar o storage pool e n??o deve ser vazio."
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "Tipo do Storage Pool"
+
+#~ msgid "Storage Path"
+#~ msgstr "Caminho do storage"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr ""
+#~ "O caminho do Storage Pool. Cada Storage Pool deve ter um caminho ??nico."
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr ""
+#~ "O Kimchi vai tentar criar o diret??rio se ainda n??o existir no seu sistema."
+
+#~ msgid "NFS Server IP"
+#~ msgstr "IP do servidor NFS"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "IP ou hostname do servidor NFS. Pode ser inserido ou escolhido do "
+#~ "hist??rico."
+
+#~ msgid "NFS Path"
+#~ msgstr "Caminho do NFS"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "O caminho exportado do servidor NFS."
+
+#~ msgid "iSCSI Server"
+#~ msgstr "Servidor iSCSI"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Port"
+#~ msgstr "Porta"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "IP ou hostname do servidor iSCSI. N??o deve ser vazio."
+
+#~ msgid "Target"
+#~ msgstr "Alvo"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "O alvo iSCSI no servidor iSCSI"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "Adicionar as credenciais do iSCSI"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "Credenciais do iSCSI"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "Adaptador SCSI"
+
+#~ msgid "Please, wait..."
+#~ msgstr "Por favor, aguarde..."
+
+#~ msgid "Add a Volume to Storage Pool"
+#~ msgstr "Adicionar um volume ao Storage Pool"
+
+#~ msgid "Fetch from remote URL"
+#~ msgstr "Fazer download de uma URL remota"
+
+#~ msgid "Enter the remote URL here."
+#~ msgstr "Digite a URL remota aqui."
+
+#~ msgid "Upload a file"
+#~ msgstr "Fazer upload de um arquivo"
+
+#~ msgid "Choose the file you want to upload."
+#~ msgstr "Escolha o arquivo que voc?? quer fazer upload."
+
+#~ msgid "Add Template"
+#~ msgstr "Adicionar Modelo"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "Onde est?? a m??dia de origem desse modelo? "
+
+#~ msgid "Local ISO Image"
+#~ msgstr "Imagem ISO Local"
+
+#~ msgid "Local Image File"
+#~ msgstr "Arquivo de Imagem Local"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "Imagem ISO Remota"
+
+#~ msgid "Search ISOs"
+#~ msgstr "Procurar ISOs"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "As seguintes ISOs est??o dispon??veis:"
+
+#~ msgid "OS: "
+#~ msgstr "Sistema Operacional: "
+
+#~ msgid "Version: "
+#~ msgstr "Vers??o: "
+
+#~ msgid "Size: "
+#~ msgstr "Tamanho: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "Procurar por mais ISOs"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "Criar Modelos a partir das ISOs selecionadas"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "Eu quero usar um arquivo ISO espec??fico"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "Carregando ISOs remotas ..."
+
+#~ msgid "Arch: "
+#~ msgstr "Arquitetura: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "Eu quero usar uma URL personalizada"
+
+#~ msgid "Edit Template"
+#~ msgstr "Editar Modelo"
+
+#~ msgid "CDROM"
+#~ msgstr "CD-ROM"
+
+#~ msgid "Image File"
+#~ msgstr "Arquivo de imagem"
+
+#~ msgid "Graphics"
+#~ msgstr "Gr??ficos"
+
+#~ msgid "Disk(GB)"
+#~ msgstr "Disco (GB)"
+
+#~ msgid "CPU Number"
+#~ msgstr "Quantidade de CPUs"
+
+#~ msgid "Manually set CPU topology"
+#~ msgstr "Configurar manualmente a topologia de CPU"
+
+#~ msgid "Cores"
+#~ msgstr "Cores"
+
+#~ msgid "Threads"
+#~ msgstr "Threads"
+
+#~ msgid "No templates found."
+#~ msgstr "Nenhum modelo encontrado."
diff --git a/po/ru_RU.po b/po/ru_RU.po
new file mode 100644
index 0000000..8e7262e
--- /dev/null
+++ b/po/ru_RU.po
@@ -0,0 +1,1614 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2014-08-28 17:32+0000\n"
+"Last-Translator: Aline Manera <aline.manera at gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/"
+"ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "???????????????? ?????????????????? ?????? %(resource)s"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s ???? ?????????????????? ?????????? ????????????????????"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "???????????????? ?????????????????? ?????? %(resource)s"
+
+msgid "Unable to parse JSON request"
+msgstr "???????????? ?????????????? ?????????????? JSON"
+
+msgid "This API only supports JSON"
+msgstr "?????? ?????????????? API ???????????????????????? ???????????? JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr "?????????????????? ???????????? ?? ?????????????? ???????????? ???? ????????????????????????????????."
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr "???? ?????????????? ?????????????????? ???????????? ????-???? ???????????? %(err)s"
+
+#, python-format
+msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr "???????? ?????????????????????????? ???????????????????????? %(username)s. [?????? ????????????: %(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "?????? ???????? ?????????????? ?? Kimchi"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "?????????????? %(item)s ?????? ?????????? ?? Kimchi"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "???? ???????????? %(item)s ?? ?????????????????? ????????????"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr "?????????? ????????-?????? ???????????????????? ?????????????? %(cmd)s (%(seconds)s ??)"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "???????????????????????? URI %(uri)s"
+
+msgid "ERROR CODE"
+msgstr "?????? ????????????"
+
+msgid "REASON"
+msgstr "??????????????"
+
+msgid "STACK"
+msgstr "????????"
+
+msgid "Go to Homepage"
+msgstr "?????????????? ???? ?????????????? ????????????????"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr "?????????????? ???????????????? ?????? ???????????????????????? ?????? ????????????. ?????????????? ?????? ??????."
+
+msgid "This field is required."
+msgstr "?????? ???????????????????????? ????????."
+
+msgid "Log in"
+msgstr "??????????"
+
+msgid "Logging in..."
+msgstr "????????..."
+
+msgid "Host"
+msgstr "????????"
+
+msgid "Guests"
+msgstr "???????????????? ??????????????"
+
+msgid "Templates"
+msgstr "??????????????"
+
+msgid "Storage"
+msgstr "??????????????????"
+
+msgid "Network"
+msgstr "????????"
+
+msgid "Failed to get application configuration"
+msgstr "???? ?????????????? ???????????????? ???????????????????????? ????????????????????"
+
+msgid "This is not a valid Linux path"
+msgstr "???????? ???????????????????????? ???????? ?? Linux"
+
+msgid "This is not a valid URL."
+msgstr "?????? ???????????????????????? URL."
+
+msgid "No such data available."
+msgstr "?????? ?????????? ????????????."
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"?????? ?????????? ?? ???????????????? ??????????. ??????????????????, ?????? ?????????????? ?????????? ???????????????? ?? ???????????????? "
+"?????? ??????????????????????. ?????????? ???? ???????????? HTTP: %1. "
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "?????????????????????????? ????????????????"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "????????????"
+
+msgid "Confirm"
+msgstr "??????????????????????"
+
+msgid "Create"
+msgstr "??????????????"
+
+msgid "Warning"
+msgstr "????????????????????????????"
+
+msgid "Save"
+msgstr "??????????????????"
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "??????????????????????..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "??????????????????"
+
+msgid "Detailed message:"
+msgstr "?????????????????? ??????????????????:"
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr "???????? ???????? ???? ???????????????? ???????????????????? ?????????????? ISO."
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "?????? ???????????? ?????????? ??????????????. ?????????????????????"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "???????????? ?????????? ???????????????????????? ????????????. ?????????????????????"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr ""
+"???????????????????? ?????????????????? ???????????? ??????????????, ?????????????????? ?? ?????? ???????????????? ?????????????????????? "
+"????????????!"
+
+msgid "Max:"
+msgstr "????????.:"
+
+msgid "Utilization"
+msgstr "??????????????????????????"
+
+msgid "Available"
+msgstr "????????????????"
+
+msgid "Read Rate"
+msgstr "???????????????? ????????????"
+
+msgid "Write Rate"
+msgstr "???????????????? ????????????"
+
+msgid "Received"
+msgstr "????????????????"
+
+msgid "Sent"
+msgstr "????????????????????"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr ""
+"???????????????????? ???????????? ?? ???????????????????? ?????????? ???????????????? ?? ???????????? ?????????????????????????? ????????????. "
+"???????????????????? ???????????????????? ????????????/?????????????????????"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr "?????????????????? ?????????? ?????????????? ?????? ?????????????????????? ????????????????????????????. ?????????????????????"
+
+msgid "Repositories"
+msgstr "??????????????????"
+
+msgid "ID"
+msgstr "????"
+
+msgid "Name"
+msgstr "??????"
+
+msgid "Base URL"
+msgstr "?????????????? URL"
+
+msgid "Is Mirror"
+msgstr "???????????????????? ??????????"
+
+msgid "URL Args"
+msgstr "?????????????????? URL"
+
+msgid "Enabled"
+msgstr "????????????????"
+
+msgid "GPG Check"
+msgstr "???????????????? GPG"
+
+msgid "GPG Key"
+msgstr "???????? GPG"
+
+msgid "Add"
+msgstr "????????????????"
+
+msgid "Edit"
+msgstr "??????????????????????????"
+
+msgid "Remove"
+msgstr "??????????????"
+
+msgid "Enable"
+msgstr "????????????????"
+
+msgid "Disable"
+msgstr "??????????????????"
+
+msgid "Software Updates"
+msgstr "???????????????????? ???????????????????????? ??????????????????????"
+
+msgid "Package Name"
+msgstr "?????? ????????????"
+
+msgid "Version"
+msgstr "????????????"
+
+msgid "Architecture"
+msgstr "??????????????????????"
+
+msgid "Repository"
+msgstr "??????????????????"
+
+msgid "Update All"
+msgstr "???????????????? ??????"
+
+msgid "Updating..."
+msgstr "????????????????????..."
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr "???? ?????????????? ???????????????? ????????????."
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr ""
+"???????????????????? ?????????? ?????????? ???????????? ?????? ?????????????????????? ????????????????????????????. ?????????????????????"
+
+msgid "Debug Reports"
+msgstr "???????????????????? ????????????"
+
+msgid "Generated Time"
+msgstr "?????????? ????????????????"
+
+msgid "Generate"
+msgstr "??????????????"
+
+msgid "Generating..."
+msgstr "????????????????..."
+
+msgid "Rename"
+msgstr "??????????????????????????"
+
+msgid "Download"
+msgstr "??????????????????"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr "?????? ???????????? ???????????? ?????????????????? ???????????? ??????????, ?????????? ?? ???????????? ('-')."
+
+msgid "Pending..."
+msgstr "??????????????????????..."
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr ""
+"?????????? ?????????????? ?????????????????????? ???????????? ???????????? ???? ???????????? ???????????????????????? ??????????????. ?????? "
+"?????????????????????? ????????????????. ?????????????????????"
+
+msgid "Power off Confirmation"
+msgstr "?????????????????????????? ????????????????"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr "?????????????????????????? ????????????????"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr "?????????????????????????? ????????????????"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "???????????? ?????????? ???????????????????????? ????????????. ?????????????????????"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ?????????? ????????????????. ?????? ?????????? ?????????? ?????????? ????????????????????. ???????????????????"
+
+msgid "Attach"
+msgstr "????????????????????"
+
+msgid "Attaching..."
+msgstr "??????????????????????..."
+
+msgid "Replace"
+msgstr "????????????????"
+
+msgid "Replacing..."
+msgstr "????????????..."
+
+msgid "Successfully attached!"
+msgstr "?????????????? ??????????????????!"
+
+msgid "Successfully replaced!"
+msgstr "?????????????? ??????????????!"
+
+msgid "Successfully detached!"
+msgstr "?????????????? ????????????????!"
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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."
+
+msgid "unavailable"
+msgstr "????????????????????"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr ""
+"?????? ???????????????? ?????????????? ?????????????? ???????????????????? ?? ???????? ?????????????????????? ??????????, ?????????????? "
+"?????????????? ???? ???????? ????????."
+
+msgid "Create a network"
+msgstr "?????????????? ????????"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"???????? ?????? ???????????? ???? ????????????????????. ???????????? ??????????????????????, ?????? ???????????????? ???????????????????????? "
+"?????? ????????????. ?????????????????????"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr "?????? ???????????? ?????????? ???????????????????????? ????????????. ?????????????????????"
+
+msgid "This storage pool is empty."
+msgstr "???????? ?????? ???????????? ????????????."
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr ""
+"???????? ?????????? ????????????????????????????, ?? ?????? ???????????? ???? ?????? ?????????? ????????????????. ???? "
+"?????????????????????????? ???????????? ????????????????????? "
+
+msgid "SCSI Fibre Channel"
+msgstr "SCSI Fibre Channel"
+
+msgid "No SCSI adapters found."
+msgstr "???? ?????????????? ???????????????? SCSI."
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "???? ?????????????? ?????? ???????? ????????????."
+
+msgid "The storage pool path can not be blank."
+msgstr "???? ???????????? ???????? ?? ???????? ????????????."
+
+msgid "NFS server mount path can not be blank."
+msgstr "???? ???????????? ???????? ???????????????????????? ?????????????? NFS."
+
+msgid "Invalid NFS mount path."
+msgstr "???????????????????????? ???????? ???????????????????????? NFS."
+
+msgid "No logical device selected."
+msgstr "???? ?????????????? ???????????????????? ????????????????????."
+
+msgid "The iSCSI target can not be blank."
+msgstr "???? ???????????? ?????????????? ???????????? iSCSI."
+
+msgid "Server name can not be blank."
+msgstr "???? ?????????????? ?????? ??????????????."
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "?????????? ?????????????????? ????????????????..."
+
+msgid "No available partitions found."
+msgstr "???? ?????????????? ?????????????????? ??????????????."
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"???????? ?????? ???????????? ???? ????????????????????. ???????????? ??????????????????????, ?????? ???????????????? ???????????????????????? "
+"?????? ????????????. ?????????????????????"
+
+msgid "Unable to retrieve partitions information."
+msgstr "???? ?????????????? ???????????????? ???????????????????? ?? ??????????????????. ????????????????: %(err)s"
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "???? ?????????????? ?????? ???????? ????????????."
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr "?????? ????????????????????????"
+
+msgid "Password"
+msgstr "????????????"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "????????????????????????????"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "???? ?????????????? ???????????????? ??????????????."
+
+msgid "Help"
+msgstr "????????????"
+
+msgid "About"
+msgstr "?? ??????????????????"
+
+msgid "Log out"
+msgstr "??????????"
+
+msgid "Version:"
+msgstr "????????????:"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr "???????????? ?????????????????? ?????????????? ??????????????????. ????????????????: %(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr "???????????? ?????????????????? ???????????????????? ?? ?????????????? ?????????????????????? ?????? %(device)s."
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "???? ???????????? ???????? ???????????????? ????: %(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr ""
+#~ "???????????? ?????????????? ?????????? ???????????????? ???? %(filename)s. ??????????????????, ?????? ?????? ???????? "
+#~ "JSON."
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????? ?? ?????????????? %(portal)s ?????????? iSCSI. ????????????????: %(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "???? ?????????????? ?????????? ?? ?????????????? %(target)s ?????????? iSCSI %(host)s"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "???????? ISO %(filename)s ???? ??????????????????????"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr ""
+#~ "???????? ISO %(filename)s ???? ???????????????? ???????????????????? ?????????????????????? ???????????? El Torito"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "???????????????????????? ???????????? ???????????????? El Torito ?? ???????????? ISO %(filename)s"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "???????????????????????? ?????????????????? ???????????????? El Torito ?? ???????????? ISO %(filename)s"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr "?????????????????????? ?????? ???????? ?????? ???????????????? ???????? ?? ???????????? ISO %(filename)s"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr "???????????????? ???????????? ?????????????????????? ???????? ?? ???????????? ISO %(filename)s"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "?? ?????????????????????? ?????? ???????? ?????????????? ?????? ?????????????????????????? ?????????? ???????????? ISO %"
+#~ "(filename)s. ?????????????????????? ?????? ?? ?????????????? /var/lib/libvirt, ???????????????? "
+#~ "???????????????????? ???? ?????????? ?? ???????????? ???????????????? ?????????????? ?????? ???????????????????????? %(user)s, "
+#~ "???????? ?????? ????????????????, ???????????????? %(user)s ?? ???????????? ???????? ?? ???????????? ISO ?????? (???? "
+#~ "??????????????????????????) ?????????????????? ?????????????? 'chmod -R o+x 'path_to_iso'. ????????????????: %"
+#~ "(err)s"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "?????????????????????? ???????????? %(name)s ?????? ????????????????????"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "?????????????????????? ???????????? %(name)s ???? ????????????????????"
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????? ???????????? ???????????? ?????? ?????????????????????????? ?????????????????????? ???????????? %"
+#~ "(name)s"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "?????????????????? ?????????? ISO ???? ???????????????????????????? ???????? ????????????????."
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ???????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr ""
+#~ "?????????? ???????????? ???????????????? ?????? ?????????????????????? ???????????????????? ???????????? ???????? IPv4 ?????? IPv6"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "?????????????? ???????????? ?????? ???????????????? ?????????????????????? ????????????"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????????????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "?????? ???????? ???????????? ???????? ??????????????"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "?????? ???????? ???????????? ???????? ??????????????"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "???????????????????????? %(users)s ???? ????????????????????."
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "???????????????????????? %(groups)s ???? ????????????????????."
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr "???? ?????????????? ?????????????????? ?????????????????????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "?????????????????? %(iface)s ???? ???????????????????? ?? ?????????????????????? ???????????? %(name)s"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr ""
+#~ "???????? %(network)s, ?????????????????? ?????? ?????????????????????? ???????????? %(name)s, ???? ????????????????????"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr ""
+#~ "???????????????????????????? ???????????? ???????? ?????? ?????????????????????? ?????????????????????? ???????????? - ????????"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr "?????? ???????? ?????? ???????????????????? ?????????????????????? ???????????? ???????????? ???????? ??????????????"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr ""
+#~ "?????????????? ???????????????????????? ?????????? ???????????? ???????? ?????? ???????????????????? ?????????????????????? ????????????"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr ""
+#~ "?????????????? ?????? ?? ???????? ?????? ???????????????????? ???????????? ???????????????????? ?????????????????????? ????????????"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "???????????? %(name)s ?????? ????????????????????"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr "???????? %(network)s, ?????????????????? ?????? ?????????????? %(template)s, ???? ????????????????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr ""
+#~ "?????? ???????????? %(pool)s, ?????????????????? ?????? ?????????????? %(template)s, ???? ????????????????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr "?????? ???????????? %(pool)s, ?????????????????? ?????? ?????????????? %(template)s, ???? ??????????????"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "???????????? ???????????????????????? ???????????????? %(param)s ?????? CDROM."
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr "???????? %(network)s, ?????????????????? ?????? ?????????????? %(template)s, ???? ??????????????"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "?????? ?????????????? ???????????? ???????? ??????????????"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "???????????? ?????????????? ???????????? ???????? ?????????? ?? ????????????"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "?????????????? ?????????????? ???????????? ???????? ??????????????"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "???????????? ???????????????? ?????????????? ???????????? ???????? ??????????????"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "?????????? ?????????????????????? ???????????? ???????? ?????????? ????????????"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "?????????? ???????????? (????) ???????????? ???????? ?????????? ???????????? ???????????? 512"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "CDROM ?????????????? ???????????? ???????? ?????????????????? ?????? ?????????????????? ???????????? ISO"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr "?????? ?????????????? ???????????? ???????????????????????? URI ???????? ???????????? %(value)s"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr "?????????????? ?????????? ISO ?? ???????????????? CDROM ?????? ???????????????? ??????????????"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr "?????? ???????? ?????? ?????????????? ???????????? ???????? ?????????????? ?? ????????????."
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????????? ????-???? ???????????? %(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????????? ????-???? ???????????? %(err)s"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "CDROM ?????????????? ???????????? ???????? ?????????????????? ?????? ?????????????????? ???????????? ISO"
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "?????? ???????????? %(name)s ?????? ????????????????????"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "?????? ???????????? %(name)s ???? ????????????????????"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "?????????????? %(item)s ?????? ???????????????? ???????? ???????????? %(name)s"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????????????? ?????? ???????????? %(name)s"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????????? ?????????? ????????????. ????????????????: %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ?????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????? ?????????? ?????????? ?? ???????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ???????????????????????? ?????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ???????????????????????????? ?????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ?????? ???????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????????? ?????? NFS: ???????????????????????????????? ???????? %(path)s ?????? ???????? "
+#~ "???????????????????????? ???? ?????????? ????????????????????????"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????????? ?????? NFS: ???? ?????????????? ???????????????????????? ???????????????????????????????? ???????? "
+#~ "%(path)s"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "???????????????????????????????? ?????? ???????? ????????????: %(type)s"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "???????? ?? ???????? ???????????? ???????????? ???????? ??????????????"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "???????? ???????? ???????????? ???????????? ???????? IP-?????????????? ?????? ???????????? ??????????"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "???????????????? ?????????????????? ???????? ???????????? ???????????? ???????? ??????????????"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "?????????????? IQN ???????? iSCSI ???????????? ???????? ??????????????"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr ""
+#~ "???????? ???????????????????? ?????????????? ???????????? ???????????? ???????? ?????????? ???????????? ???? 1 ???? 65535"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "?????????????? ?????? ?? ?????? ?????? ???????????????? ???????? ????????????"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr ""
+#~ "%(disk)s ???? ???????????????? ???????????????????? ????????????/????????????????. ???? ?????????????? ???????????????? ?????? "
+#~ "?? ?????? %(pool)s."
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr ""
+#~ "?????????? ???????????????????? ?????????? ?????????????????? ???????????? ?????? ?????????????????????? ???????? ????????????."
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "?????? ???????????????? ?????????? SCSI ???????????? ???????? ??????????????."
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr ""
+#~ "kimchi_isos ???????? ???????????? ???????????????????????????? ?????? ?????????????????????? ??????????????????????????"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????????????? ?????? ???????????? NFS %(name)s. ???????????? NFS %(server)s "
+#~ "????????????????????."
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????????????????? ?????? ???????????? NFS %(name)s. ???????????? NFS %(server)s "
+#~ "????????????????????."
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????????????????? ?????? %(name)s: ?????? ???????????? ?? ???????????????????? ??????????????????"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr "???? ?????????????? ?????????????? ?????? %(name)s: ?????? ???????????? ?? ???????????????????? ??????????????????"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "???????????? ?????????? ?? ???????????? %(name)s ?????? ????????????????????. ???????????????? ???????????? ?????? ?????? "
+#~ "???????????????? ?????????????????????? ????????."
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????? ???????? ???????????? ?? ?????????????????????? ?????????????????? ???????????????????????? ????-"
+#~ "???? ???????????? %(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "?????? %(name)s ?????? ????????????????????"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr "?????? %(name)s ???? ???????????????????? ?? ???????? ???????????? %(pool)s"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr "?????????????? %(item)s ?????? ???????????????? ???????? %(volume)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes because storage pool %(pool)s is not active"
+#~ msgstr "???? ?????????????? ?????????????? ???????????? ??????????: ?????? ???????????? %(pool)s ???? ??????????????"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????????? ?????? %(name)s ?? ???????? ???????????? %(pool)s. ????????????????: %(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????????? ???????????? ?????????? ?? ???????? ???????????? %(pool)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ?????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ???????????????? ???????????? ???????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr "?????? ???????????? %(type)s ???? ???????????????????????? ???????????????? ?? ???????????????? ??????????"
+
+#~ msgid "Storage volume name must be a string"
+#~ msgstr "?????? ???????? ???????????? ???????? ??????????????"
+
+#~ msgid "Storage volume allocation must be an integer number"
+#~ msgstr "?????????????????? ???????? ???????????? ???????? ?????????? ????????????"
+
+#~ msgid "Storage volume requires a volume name"
+#~ msgstr "???????? ?????????????????? ??????"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr ""
+#~ "???? ?????????????? ???????????????? ???????? ???????????? ?? ?????????????????????? ?? ?????????? ????-???? ???????????? %(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "?????????????????? %(name)s ???? ????????????????????"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "???????? %(name)s ?????? ????????????????????"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "???????? %(name)s ???? ????????????????????"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr "?????????????? %(subnet)s, ?????????????????? ?????? ???????? %(network)s, ??????????????????????."
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr ""
+#~ "?????????????? ?????????????? ?????????????????? ?????? ???????????????? ???????? %(name)s ?? ???????????????? ?????????? ????????"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????????????? ???????? %(name)s"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr ""
+#~ "?????????????????? %(iface)s, ?????????????????? ?????? ???????? %(network)s, ?????? ????????????????????????"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr ""
+#~ "?????????????????? ???????????? ???????? ?????????????? ????????????, ?????????????????????? ?????????? ?????? ?????????????????? "
+#~ "??????????????????????."
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr "???? ???????????? ?????????????????? IP-?????????? ?????? ???????? %(name)s"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "???????????????????????????? ???????? ??????????: isolated, NAT ?? bridge"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr ""
+#~ "?????????????? ???????? ???????????? ???????? ??????????????, ???????????????????? IP-??????????, ?????????????? ?????? ?????????? "
+#~ "????????"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "?????????????? ?????????????????? ???????????? ???????? ??????????????"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "?????????????? ???? VLAN ???????????? ???????? ?????????? ???????????? ???? 1 ???? 4094"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "?????????????? ?????? ?? ?????? ?????? ???????????????? ????????"
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr ""
+#~ "???????????????????? ?????????? %(name)s ???? ?????????? ???????? ?????????????????????????? ?????????????????????? VLAN."
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "???? ?????????????? ???????????????????????? ?????????????????? %(iface)s: %(err)s."
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr ""
+#~ "???? ???????????? ???????????????????????? ?????????????????? %(iface)s. ?????????????????? ?????????????????? "
+#~ "???????????????????? ?????????? ??????????. "
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "???????????????????? ?????????? %(name)s ???? ????????????????????"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "???????????????????? ?????????????????????? ???????????? ???? ???????????? ?? ??????????????"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr "???? ?????????????? ?????????????? ???????????????????? ?????????? %(name)s. ????????????????: %(err)s."
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr "???? ?????????????? ?????????????? ???????????????????? ?????????? %(name)s. ????????????????: %(err)s"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "???????????? ?????????? ?? ???????????? %(name)s ?????? ????????????????????. ???????????????? ???????????? ?????? ?????? "
+#~ "???????????????? ?????????????????????? ????????."
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "???????????? ???????????? %(server)s ???? ?????????????????????????? Kimchi"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "?????????????? ???? %(name)s ???? ????????????????????"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "???????????? %(name)s ???? ???????????????????? ???? ??????????"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????????????? ???????????? ?????????????? ??????????: ?????????????????????? ?????????????????????? ????????????"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr ""
+#~ "???? ?????????????? ?????????????????????????? ?????????????? ??????????: ?????????????????????? ?????????????????????? ????????????"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "???????????????????? %(name)s ???????? ???? ??????????????"
+
+#~ msgid "No packages marked for update"
+#~ msgstr "?????? ??????????????, ???????????????????? ?????? ????????????????????"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "?????????? %(name)s ???? ?????????????? ?????? ????????????????????."
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr ""
+#~ "???????????? ?????????????????? ??????????????, ???????????????????? ?????? ????????????????????. ????????????????: %(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "?????? ???????????????????????? ???????????????????????????? ?????????????? ?????? ???????? ??????????????."
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "???????????????????????? ?????? ????????????. ???????????????????????????? ????????: cdrom"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr "???????????? ???????????????? ???????????????????? ????????????????: %(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr "???????????? ???????????????????? ???????????????????? ????????????????: %(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "???????????? ???????????????? ???????????????????? ????????????????: %(error)s"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr "?????????????? ?????? ?? ???????? ?????? ???????????????????? ???????????? ?????????? ?????????????????????? ????????????"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr "?????????????? ???????? ?????? ???????????????????? ?????????? ?????????????????????? ????????????"
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr "?????????????? ?????? ?? ???????? ?????? ???????????????????? ???????????? ?????????? ?????????????????????? ????????????"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr ""
+#~ "???? ?????????????????? YUM ???????????? ???????? ??????????????, ?????????????????? ???????????? ???? ???????????? ??????????."
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "URL ?????????????????? ???????????? ???????? http://, ftp:// ?????? file:// ."
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr ""
+#~ "???????????????????????? ?????????????????? ???????????????????????? ?????????? ?????????????? ????????????????, ???????????????????????? "
+#~ "?????????? ??????????????????."
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "?????????????? ?????? ?????????????????? DEB ???????????? ???????? ??????????????"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr "???????????????????? ?????? ?????????????????? DEB ???????????? ???????? ?????????????????????? ?? ??????????????"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "???????????????????? ?????? ?????????????????? DEB ???????????? ???????? ??????????????"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "?????? ?????????????????? YUM ???????????? ???????? ??????????????."
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "???????????????? GPG ???????????? ???????? ?????????????????? ??????????????????."
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr ""
+#~ "???????? GPG ???????????? ???????? URL, ?????????????????????? ???? ???????????????????? ???????? ?? ???????????????????????? "
+#~ "ASCII."
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "???? ?????????????? ???????????????? ?????????????????? %(repo_id)s."
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "?????????????????? %(repo_id)s ???? ????????????????????."
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr "???? ?????????????????? ???????????????????? ???????????????????? ???????????????????? ?????? ??????????????."
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "?????????????????? %(repo_id)s ?????? ????????????????."
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "?????????????????? %(repo_id)s ?????? ??????????????????."
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "???? ?????????????? ?????????????? ?????????????????? %(repo_id)s."
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr "???? ?????????????? ???????????????? ?? ???????? ???????????????????????? ?????????????????? %(repo_file)s"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr "?????????????? ?????????????? ?????????????????? ?????? ???????????????? ?????????????????? DEB."
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "???? ?????????????? ???????????????? ?????????????????? %(repo_id)s."
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "???? ?????????????? ?????????????????? ?????????????????? %(repo_id)s."
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "???? ?????????????????? YUM ?????? ????????????????????"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "?????? ?????????????????? YUM ???????????? ???????? ??????????????"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "???? ?????????????? ?????????????? ???????????? ????????????????. ????????????????: %(err)s"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr "???? ?????????????? ???????????????? ???????????????????? ?? ??????????????????. ????????????????: %(err)s"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "???? ?????????????? ???????????????? ??????????????????. ????????????????: %(err)s"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "???? ?????????????? ?????????????? ??????????????????. ????????????????: %(err)s"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "?????????????? ?????????? ?????????????????????? ????????????"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "?????? ?????????????????????? ????????????"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr ""
+#~ "?????? ?????? ?????????????????????????? ?????????????????????? ????????????. ???????? ???? ??????????????, ?????? ?????????? "
+#~ "?????????????? ?? ?????????????????????? ???? ?????????????????????????? ??????????????."
+
+#~ msgid "Template"
+#~ msgstr "????????????"
+
+#~ msgid "Please create a template first."
+#~ msgstr "????????????????????, ???????????????? ???????????? ?? ???????????? ??????????????."
+
+#~ msgid "Create a Template"
+#~ msgstr "?????????????? ????????????"
+
+#~ msgid "Please choose a template."
+#~ msgstr "????????????????????, ???????????????? ????????????."
+
+#~ msgid "OS"
+#~ msgstr "????"
+
+#~ msgid "OS Version"
+#~ msgstr "???????????? ????"
+
+#~ msgid "CPUS"
+#~ msgstr "????????????????????"
+
+#~ msgid "Memory"
+#~ msgstr "????????????"
+
+#~ msgid "Edit Guest"
+#~ msgstr "???????????????? ???????????????? ??????????????"
+
+#~ msgid "General"
+#~ msgstr "??????????"
+
+#~ msgid "Interface"
+#~ msgstr "??????????????????"
+
+#~ msgid "Permission"
+#~ msgstr "????????????"
+
+#~ msgid "CPUs"
+#~ msgstr "????????????????????"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "???????????? (????)"
+
+#~ msgid "Icon"
+#~ msgstr "????????????"
+
+#~ msgid "Device"
+#~ msgstr "?????? ????????????????????"
+
+#~ msgid "Path"
+#~ msgstr "???????? NFS"
+
+#~ msgid "Type"
+#~ msgstr "??????"
+
+#~ msgid "All"
+#~ msgstr "??????"
+
+#~ msgid "Vendor"
+#~ msgstr "????????????"
+
+#~ msgid "Detach"
+#~ msgstr "??????????????????"
+
+#~ msgid "Start"
+#~ msgstr "??????????????????"
+
+#~ msgid "Reset"
+#~ msgstr "????????????????"
+
+#~ msgid "Power Off"
+#~ msgstr "??????????????????"
+
+#~ msgid "Actions"
+#~ msgstr "????????????????"
+
+#~ msgid "Connect"
+#~ msgstr "????????????????????"
+
+#~ msgid "Clone"
+#~ msgstr "??????????????????????"
+
+#~ msgid "Shut Down"
+#~ msgstr "?????????????????? ????????????"
+
+#~ msgid "Delete"
+#~ msgstr "??????????????"
+
+#~ msgid "CPU"
+#~ msgstr "??????????????????"
+
+#~ msgid "Disk I/O"
+#~ msgstr "???????????????? ????????-??????????"
+
+#~ msgid "Network I/O"
+#~ msgstr "?????????????? ????????-??????????"
+
+#~ msgid "Livetile"
+#~ msgstr "Livetile"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "???????????????? ???????????????????? ???????????????? ?? VM"
+
+#~ msgid "Device Type"
+#~ msgstr "?????? ????????????????????"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "?????? ????????????????????. ?? ???????????? ???????????? ???????????????????????????? ???????????? \"cdrom\"."
+
+#~ msgid "Storage Pool"
+#~ msgstr "?????? ????????????"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "???????? ?? ???????? ???????????? ???????????? ???????? ??????????????"
+
+#~ msgid "Storage Volume"
+#~ msgstr "?????? ???????? ????????????"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "?????? ???????? ???????????? ???????? ??????????????"
+
+#~ msgid "File Path"
+#~ msgstr "???????? ?? ??????????"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "???????? ?? ?????????? ISO ?????? CDROM ???? ??????????????."
+
+#~ msgid "Shut down"
+#~ msgstr "????????????????"
+
+#~ msgid "Restart"
+#~ msgstr "????????????????????"
+
+#~ msgid "Basic Information"
+#~ msgstr "?????????????? ????????????????????"
+
+#~ msgid "OS Distro"
+#~ msgstr "?????????????? ????"
+
+#~ msgid "OS Code Name"
+#~ msgstr "?????????????? ?????? ????"
+
+#~ msgid "Processor"
+#~ msgstr "??????????????????"
+
+#~ msgid "System Statistics"
+#~ msgstr "?????????????????? ????????????????????"
+
+#~ msgid "Update Progress"
+#~ msgstr "?????? ????????????????????"
+
+#~ msgid "Network Name"
+#~ msgstr "?????? ????????"
+
+#~ msgid "State"
+#~ msgstr "??????????????????"
+
+#~ msgid "Network Type"
+#~ msgstr "?????? ????????"
+
+#~ msgid "Address Space"
+#~ msgstr "???????????????? ????????????????????????"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "???????????????????????? ?????? ???????? ????????????. ?? ?????????? ???? ???????????? ???????? ???????????????? '/'."
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "?????????????????????????? (?????? ???????????????????? ?????????????? ????????????????????)"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT (???????????? ?????????????????? ???????????????????? ?????????????? ????????????????????)"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr "?????????? ???????? (???????????? ?????????????????????? ?????????????????????? ?????????? ?? ???????????????????? ????????)"
+
+#~ msgid "Destination"
+#~ msgstr "?????????????? ????????????????????????:"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "???????????????? VLAN:"
+
+#~ msgid "Stop"
+#~ msgstr "??????????????????"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "?????????????? ?????????? ???????????????????? ??????????"
+
+#~ msgid "Report Name"
+#~ msgstr "?????? ????????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "?????? ?????? ?????????????????????????? ????????????. ???????? ???? ??????????????, ?????? ?????????? ???????????????????????? ???? "
+#~ "???????????? ???????????????? ??????????????. ?????? ?????????? ??????????????????: ??????????, ?????????? ?? ???????????? (\"-"
+#~ "\")."
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "?????????????? ?????????? ???????????????????? ??????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "?????? ?????? ?????????????????????????? ????????????. ???????? ???? ??????????????, ?????? ?????????? ???????????????????????? ???? "
+#~ "???????????? ???????????????? ??????????????. ?????? ?????????? ??????????????????: ??????????, ?????????? ?? ???????????? (\"-"
+#~ "\")."
+
+#~ msgid "Submit"
+#~ msgstr "??????????????????????"
+
+#~ msgid "Add a Repository"
+#~ msgstr "???????????????? ??????????????????"
+
+#~ msgid "Identifier"
+#~ msgstr "??????????????????????????"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "?????????????????? ?????????? - ???????????????????? ?????????????????????????? ??????????????????."
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "?????????????????? ?????? ??????????????????."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "???????????????????????? ????????"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr "URL ??????????????????. ???????????????????????????? ??????????????????: http, ftp, file."
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "?????????????????? ???????????????? ???????????????????? ????????????."
+
+#~ msgid "Distribution"
+#~ msgstr "??????????????"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "?????????????? ?????????????????? DEB."
+
+#~ msgid "Components"
+#~ msgstr "????????????????????"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "???????????? ?????????????????????? ?? ?????????????????? DEB."
+
+#~ msgid "Edit Repository"
+#~ msgstr "???????????????? ??????????????????"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "URL ???????????? ???????????????????? ??????????"
+
+#~ msgid "Yes"
+#~ msgstr "????"
+
+#~ msgid "No"
+#~ msgstr "??????"
+
+#~ msgid "Capacity"
+#~ msgstr "??????????????"
+
+#~ msgid "Allocated"
+#~ msgstr "????????????????"
+
+#~ msgid "Location"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Device path"
+#~ msgstr "???????? ?? ????????????????????"
+
+#~ msgid "active"
+#~ msgstr "??????????????"
+
+#~ msgid "inactive"
+#~ msgstr "??????????????????"
+
+#~ msgid "Deactivate"
+#~ msgstr "??????????????????"
+
+#~ msgid "Activate"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Undefine"
+#~ msgstr "??????????????"
+
+#~ msgid "Format"
+#~ msgstr "????????????:"
+
+#~ msgid "Allocation"
+#~ msgstr "?????????????????? ????????????????:"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "?????????????? ?????? ????????????"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "?????? ???????? ????????????"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr "?????? ?????? ?????????????????????????? ?????????? ????????????. ???? ?????????? ???????? ????????????."
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "?????? ???????? ????????????"
+
+#~ msgid "Storage Path"
+#~ msgstr "???????? ?? ??????????"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr "???????? ?? ???????? ????????????. ???????????? ?????? ???????????? ???????????? ?????????? ???????????????????? ????????."
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr "Kimchi ???????????????????? ?????????????? ??????????????, ???????? ???? ???? ???????????????????? ?? ??????????????."
+
+#~ msgid "NFS Server IP"
+#~ msgstr "IP-?????????? ?????????????? NFS"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr ""
+#~ "IP-?????????? ?????? ?????? ?????????? ?????????????? NFS. ?????? ?????????? ???????????? ?????? ?????????????? ?? "
+#~ "????????????????????."
+
+#~ msgid "NFS Path"
+#~ msgstr "???????? NFS"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "???????????????????????????????? ???????? NFS ???? ?????????????? NFS."
+
+#~ msgid "iSCSI Server"
+#~ msgstr "???????????? iSCSI"
+
+#~ msgid "Server"
+#~ msgstr "????????????"
+
+#~ msgid "Port"
+#~ msgstr "????????"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "IP-?????????? ?????? ?????? ?????????? ?????????????? iSCSI. ???? ?????????? ???????? ????????????."
+
+#~ msgid "Target"
+#~ msgstr "?????????????? ????????????"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "?????????????? ???????????? iSCSI ???? ?????????????? iSCSI"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "???????????????? ?????????????????????????? iSCSI"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "?????????????????????????? iSCSI"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "?????????????? SCSI"
+
+#~ msgid "Please, wait..."
+#~ msgstr "??????????????????..."
+
+#~ msgid "Add Template"
+#~ msgstr "???????????????? ????????????"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "?????? ?????????????????? ???????????????? ???????????????? ?????? ?????????? ???????????????"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "?????????????????? ?????????? ISO"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "?????????????????? ?????????? ISO"
+
+#~ msgid "Search ISOs"
+#~ msgstr "?????????? ?????????????? ISO"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "?????????????????? ???????????? ISO:"
+
+#~ msgid "OS: "
+#~ msgstr "????: "
+
+#~ msgid "Version: "
+#~ msgstr "????????????: "
+
+#~ msgid "Size: "
+#~ msgstr "????????????: "
+
+#~ msgid "Search more ISOs"
+#~ msgstr "?????????? ???????????????????????????? ?????????????? ISO"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "?????????????? ?????????????? ???? ?????????????????? ?????????????? ISO"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "???????????????????????? ???????????????????? ???????? ISO"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "???????????????? ?????????????????? ISO ???? ??????????????????..."
+
+#~ msgid "Arch: "
+#~ msgstr "??????????????????????: "
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "???????????????????????? ???????????? URL"
+
+#~ msgid "Edit Template"
+#~ msgstr "???????????????? ????????????"
+
+#~ msgid "CDROM"
+#~ msgstr "CDROM"
+
+#~ msgid "Graphics"
+#~ msgstr "??????????????"
+
+#~ msgid "CPU Number"
+#~ msgstr "???????????????????? ??????????????????????"
+
+#~ msgid "No templates found."
+#~ msgstr "???? ?????????????? ??????????????."
diff --git a/po/wok.pot b/po/wok.pot
index 81fac83..f625573 100755
--- a/po/wok.pot
+++ b/po/wok.pot
@@ -8,20 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 09:39-0300\n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #, python-format
-msgid "Unknown parameter %(value)s"
-msgstr ""
-
-#, python-format
 msgid "Delete is not allowed for %(resource)s"
 msgstr ""
 
@@ -54,10 +49,6 @@ 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 ""
 
@@ -69,866 +60,17 @@ 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 ""
-
-msgid "\"_passthrough\" should be \"true\" or \"false\""
-msgstr ""
-
-msgid "\"_passthrough_affected_by\" should be a device name string"
-msgstr ""
-
-#, python-format
-msgid "Error while getting block devices. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Error while getting block device information for %(device)s."
-msgstr ""
-
-#, python-format
-msgid "Unable to find distro file: %(filename)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
-msgstr ""
-
-#, python-format
-msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to find ISO file %(filename)s"
-msgstr ""
-
-#, python-format
-msgid "The ISO file %(filename)s is not bootable"
-msgstr ""
-
-#, python-format
-msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
-msgstr ""
-
-#, python-format
-msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr ""
-
-#, python-format
-msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr ""
-
-#, python-format
-msgid "Unexpected volume type for primary volume in ISO %(filename)s"
-msgstr ""
-
-#, python-format
-msgid "Bad format while reading volume descriptor in ISO %(filename)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"The hypervisor doesn't have permission to use this ISO %(filename)s. "
-"Consider moving it under /var/lib/libvirt,  or set the search permission to "
-"file access control lists for '%(user)s' user if possible, or add the "
-"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
-"'path_to_iso'.Details: %(err)s"
-msgstr ""
-
-msgid "An error occurred when probing image OS information."
-msgstr ""
-
-msgid "No OS information found in given image."
-msgstr ""
-
-#, python-format
-msgid "Unable to read image file %(filename)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Image file must be an existing file on system. %(filename)s is not a valid "
-"input."
-msgstr ""
-
-#, python-format
-msgid "Virtual machine %(name)s already exists"
-msgstr ""
-
-#, python-format
-msgid "Virtual machine %(name)s does not exist"
-msgstr ""
-
-#, python-format
-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 ""
-
-#, python-format
-msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
-msgstr ""
-
-msgid "Remote ISO image is not supported by this server."
-msgstr ""
-
-#, python-format
-msgid "Screenshot is not supported on virtual machine %(name)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to connect to powered off virtual machine %(name)s."
-msgstr ""
-
-msgid "Virtual machine name must be a string without slashes (/)"
-msgstr ""
-
-#, python-format
-msgid "Invalid template URI %(value)s specified for virtual machine"
-msgstr ""
-
-#, python-format
-msgid "Invalid storage pool URI %(value)s specified for virtual machine"
-msgstr ""
-
-msgid "Supported virtual machine graphics are Spice or VNC"
-msgstr ""
-
-msgid "Graphics address to listen on must be IPv4 or IPv6"
-msgstr ""
-
-msgid "Specify a template to create a virtual machine from"
-msgstr ""
-
-#, python-format
-msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-msgid "User name list must be an array"
-msgstr ""
-
-msgid "User name must be a string"
-msgstr ""
-
-msgid "Group name list must be an array"
-msgstr ""
-
-msgid "Group name must be a string"
-msgstr ""
-
-#, python-format
-msgid "User(s) '%(users)s' do not exist"
-msgstr ""
-
-#, python-format
-msgid "Group(s) '%(groups)s' do not exist"
-msgstr ""
-
-#, python-format
-msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr ""
-
-msgid "The guest console password must be a string."
-msgstr ""
-
-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 "Invalid operation for non-persistent virtual machine %(name)s"
-msgstr ""
-
-#, python-format
-msgid "Cannot suspend VM '%(name)s' because it is not running."
-msgstr ""
-
-#, python-format
-msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Cannot resume VM '%(name)s' because it is not paused."
-msgstr ""
-
-#, python-format
-msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
-msgstr ""
-
-msgid "Memory assigned is higher then the maximum allowed in the host."
-msgstr ""
-
-#, python-format
-msgid ""
-"VM '%(name)s' does not support live memory update. Update the memory with "
-"the machine offline to enable this feature."
-msgstr ""
-
-msgid "Only increase memory is allowed in active VMs"
-msgstr ""
-
-msgid ""
-"For live memory update, new memory value must be equal old memory value plus "
-"multiples of 1024 Mib"
-msgstr ""
-
-msgid "There are not enough free slots of 1024 Mib in the guest."
-msgstr ""
-
-msgid ""
-"Host's libvirt version does not support memory devices. Libvirt must be >= "
-"1.2.14"
-msgstr ""
-
-#, python-format
-msgid "Error attaching memory device. Details: %(error)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 ""
-
-msgid ""
-"No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
-"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify "
-"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on "
-"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
-"iommu=1."
-msgstr ""
-
-msgid "\"name\" should be a device name string"
-msgstr ""
-
-#, python-format
-msgid ""
-"The device %(name)s is probably in use by the host. Unable to attach it to "
-"the guest."
-msgstr ""
-
-#, python-format
-msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Network %(network)s specified for virtual machine %(name)s does not exist"
-msgstr ""
-
-msgid "Supported virtual machine interfaces type is only network"
-msgstr ""
-
-msgid "Network name for virtual machine interface must be a string"
-msgstr ""
-
-msgid "Invalid network model card specified for virtual machine interface"
-msgstr ""
-
-msgid "Specify type and network to add a new virtual machine interface"
-msgstr ""
-
-msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
-msgstr ""
-
-#, python-format
-msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
-msgstr ""
-
-msgid "Invalid MAC Address"
-msgstr ""
-
-msgid "Cannot change MAC address of a running virtual machine"
-msgstr ""
-
-#, python-format
-msgid "Template %(name)s already exists"
-msgstr ""
-
-#, python-format
-msgid ""
-"Network '%(network)s' specified for template %(template)s does not exist"
-msgstr ""
-
-#, python-format
-msgid ""
-"Storage pool %(pool)s specified for template %(template)s does not exist"
-msgstr ""
-
-#, python-format
-msgid "Storage pool %(pool)s specified for template %(template)s is not active"
-msgstr ""
-
-#, python-format
-msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr ""
-
-#, python-format
-msgid "Network %(network)s specified for template %(template)s is not active"
-msgstr ""
-
-msgid "Template name must be a string"
-msgstr ""
-
-msgid "Template icon must be a path to the image"
-msgstr ""
-
-msgid "Template distribution must be a string"
-msgstr ""
-
-msgid "Template distribution version must be a string"
-msgstr ""
-
-msgid "The number of CPUs must be an integer greater than 0"
-msgstr ""
-
-msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr ""
-
-msgid "Template CDROM must be a local or remote ISO file"
-msgstr ""
-
-#, python-format
-msgid "Invalid storage pool URI %(value)s specified for template"
-msgstr ""
-
-msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr ""
-
-msgid "All networks for the template must be specified in a list."
-msgstr ""
-
-msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
-msgstr ""
-
-#, python-format
-msgid "The volume %(volume)s is not in storage pool %(pool)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to create template due error: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to delete template due error: %(err)s"
-msgstr ""
-
-msgid "Disk size must be an integer greater than 1GB."
-msgstr ""
-
-msgid "Template base image must be a valid local image file"
-msgstr ""
-
-#, python-format
-msgid "Cannot identify base image %(path)s format"
-msgstr ""
-
-msgid ""
-"When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
-"threads."
-msgstr ""
-
-msgid ""
-"When specifying CPU topology, each element must be an integer greater than "
-"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 ""
-
-#, python-format
-msgid "Storage pool %(name)s does not exist"
-msgstr ""
-
-#, python-format
-msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to delete active storage pool %(name)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to list storage pools. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to get number of storage volumes in storage pool %(name)s. Details: "
-"%(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to create NFS Pool as export path %(path)s may block during mount"
-msgstr ""
-
-#, python-format
-msgid "Unable to create NFS Pool as export path %(path)s mount failed"
-msgstr ""
-
-#, python-format
-msgid "Unsupported storage pool type: %(type)s"
-msgstr ""
-
-#, python-format
-msgid "Error while retrieving storage pool XML to %(pool)s"
-msgstr ""
-
-msgid "Storage pool name must be a string without slashes (/)"
-msgstr ""
-
-msgid ""
-"Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
-"iso"
-msgstr ""
-
-msgid "Storage pool path must be a string"
-msgstr ""
-
-msgid "Storage pool host must be a IP or hostname"
-msgstr ""
-
-msgid "Storage pool device must be the absolute path to the block device"
-msgstr ""
-
-msgid "Storage pool devices parameter must be a list"
-msgstr ""
-
-msgid "Target IQN of an iSCSI pool must be a string"
-msgstr ""
-
-msgid "Port of a remote storage server must be an integer between 1 and 65535"
-msgstr ""
-
-msgid "iSCSI target username must be a string"
-msgstr ""
-
-msgid "iSCSI target password must be a string"
-msgstr ""
-
-msgid "Specify name and type to create a storage pool"
-msgstr ""
-
-#, python-format
-msgid ""
-"%(disk)s is not a valid disk/partition. Could not add it to the pool "
-"%(pool)s."
-msgstr ""
-
-#, python-format
-msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
-msgstr ""
-
-msgid "The parameter disks only can be updated for logical storage pool."
-msgstr ""
-
-msgid "The SCSI host adapter name must be a string."
-msgstr ""
-
-msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
-"unreachable."
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
-"unreachable."
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to deactivate pool %(name)s as it is associated with some templates"
-msgstr ""
-
-#, python-format
-msgid "Unable to delete pool %(name)s as it is associated with some templates"
-msgstr ""
-
-#, python-format
-msgid ""
-"A volume group named '%(name)s' already exists. Please, choose another name "
-"to create the logical pool."
-msgstr ""
-
-#, python-format
-msgid "Unable to update database with deep scan information due error: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Storage volume %(name)s already exists"
-msgstr ""
-
-#, python-format
-msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to create storage volume %(volume)s because storage pool %(pool)s is "
-"not active"
-msgstr ""
-
-#, python-format
-msgid "Specify %(item)s in order to create storage volume %(volume)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to list storage volumes because storage pool %(pool)s is not active"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
-"%(err)s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Storage type %(type)s does not support volume create and delete"
-msgstr ""
-
-msgid "Storage volume name must be a string"
-msgstr ""
-
-msgid "Storage volume allocation must be an integer number"
-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 ""
-
-#, python-format
-msgid ""
-"Unable to update database with storage volume information due error: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Only one of parameter %(param)s can be specified"
-msgstr ""
-
-#, python-format
-msgid "Create volume from %(param)s is not supported"
-msgstr ""
-
-msgid "Storage volume capacity must be an integer number."
-msgstr ""
-
-msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
-msgstr ""
-
-#, python-format
-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 ""
-
-msgid "Specify chunk data and its size to upload a file."
-msgstr ""
-
-msgid "In order to upload a storage volume, specify the 'upload' parameter."
-msgstr ""
-
-msgid ""
-"Unable to upload chunk data as it does not match with requested chunk size."
-msgstr ""
-
-#, python-format
-msgid "The storage volume %(vol)s is not under an upload process."
-msgstr ""
-
-msgid "The upload chunk data will exceed the storage volume size."
-msgstr ""
-
-#, python-format
-msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
-msgstr ""
-
-#, python-format
-msgid "Interface %(name)s does not exist"
-msgstr ""
-
-#, python-format
-msgid "Network %(name)s already exists"
-msgstr ""
-
-#, python-format
-msgid "Network %(name)s does not exist"
-msgstr ""
-
-#, python-format
-msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
-msgstr ""
-
-#, python-format
-msgid "Specify a network interface to create bridged network %(name)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to delete active network %(name)s"
-msgstr ""
-
-#, python-format
-msgid "Interface %(iface)s specified for network %(network)s is already in use"
-msgstr ""
-
-msgid "Interface should be bare NIC, bonding or bridge device."
-msgstr ""
-
-#, python-format
-msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr ""
-
-#, python-format
-msgid "The interface %(iface)s already exists."
-msgstr ""
-
-msgid "Network name must be a string without slashes (/) or quotes (\")"
-msgstr ""
-
-msgid "Supported network types are isolated, NAT and bridge"
-msgstr ""
-
-msgid "Network subnet must be a string with IP address and prefix or netmask"
-msgstr ""
-
-msgid "Network interface must be a string"
-msgstr ""
-
-msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr ""
-
-msgid "Specify name and type to create a Network"
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
-"and/or templates linked to this network."
-msgstr ""
-
-#, python-format
-msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines "
-"%(vms)s and/or templates linked to this network."
-msgstr ""
-
-#, python-format
-msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
-msgstr ""
-
-#, python-format
-msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr ""
-
-#, python-format
-msgid ""
-"Failed to activate interface %(iface)s. Please check the physical link "
-"status."
-msgstr ""
-
-#, python-format
-msgid "Failed to start network %(name)s. Details: %(err)s"
-msgstr ""
-
-#, python-format
-msgid "Debug report %(name)s does not exist"
-msgstr ""
-
-msgid "Debug report tool not found in system"
-msgstr ""
-
-#, python-format
-msgid "Unable to create debug report %(name)s. Details: %(err)s."
-msgstr ""
-
-#, python-format
-msgid "Can not find any debug report with the given name %(name)s"
-msgstr ""
-
-#, python-format
-msgid "Unable to generate debug report %(name)s. Details: %(err)s"
-msgstr ""
-
-msgid "You should give a name for the debug report file."
-msgstr ""
-
-msgid ""
-"Debug report name must be a string. Only letters, digits, underscore ('_') "
-"and hyphen ('-') are allowed."
-msgstr ""
-
-#, python-format
-msgid ""
-"The debug report with specified name \"%(name)s\" already exists. Please use "
-"another one."
-msgstr ""
-
-#, python-format
-msgid "Storage server %(server)s was not used by Kimchi"
-msgstr ""
-
-#, python-format
-msgid "Distro '%(name)s' does not exist"
-msgstr ""
-
-#, python-format
-msgid "Partition %(name)s does not exist in the host"
-msgstr ""
-
-msgid "Unable to shutdown host machine as there are running virtual machines"
-msgstr ""
-
-msgid "Unable to reboot host machine as there are running virtual machines"
-msgstr ""
-
-#, python-format
-msgid "Node device '%(name)s' not found"
-msgstr ""
-
-msgid "Conflicting flag filters specified."
-msgstr ""
-
-msgid "No packages marked for update"
-msgstr ""
-
-#, python-format
-msgid "Package %(name)s is not marked to be updated."
-msgstr ""
-
-#, python-format
-msgid "Error while getting packages marked to be updated. Details: %(err)s"
-msgstr ""
-
-msgid "There is no compatible package manager for this system."
-msgstr ""
-
 #, python-format
 msgid "Unable to find %(item)s in datastore"
 msgstr ""
 
 #, python-format
-msgid "Invalid URI %(uri)s"
-msgstr ""
-
-#, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
 msgstr ""
 
-msgid "Unable to choose a virtual machine name"
-msgstr ""
-
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
@@ -937,233 +79,6 @@ msgstr ""
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
 
-msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr ""
-
-#, python-format
-msgid "The path '%(value)s' is not a valid local/remote path for the device"
-msgstr ""
-
-msgid "Only CDROM path can be update."
-msgstr ""
-
-#, python-format
-msgid ""
-"The storage device %(dev_name)s does not exist in the virtual machine "
-"%(vm_name)s"
-msgstr ""
-
-#, python-format
-msgid "Error while creating new storage device: %(error)s"
-msgstr ""
-
-#, python-format
-msgid "Error while updating storage device: %(error)s"
-msgstr ""
-
-#, python-format
-msgid "Error while removing storage device: %(error)s"
-msgstr ""
-
-msgid "Do not support IDE device hot plug"
-msgstr ""
-
-msgid ""
-"Specify type and path or type and pool/volume to add a new virtual machine "
-"disk"
-msgstr ""
-
-msgid "Specify path to update virtual machine disk"
-msgstr ""
-
-#, python-format
-msgid "Controller type %(type)s limitation of %(limit)s devices reached"
-msgstr ""
-
-#, python-format
-msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
-msgstr ""
-
-msgid "Volume already in use by other virtual machine."
-msgstr ""
-
-msgid ""
-"Only one of path or pool/volume can be specified to add a new virtual "
-"machine disk"
-msgstr ""
-
-#, python-format
-msgid ""
-"Volume chosen with format %(format)s does not fit in the storage type "
-"%(type)s"
-msgstr ""
-
-msgid "YUM Repository ID must be one word only string."
-msgstr ""
-
-msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr ""
-
-msgid ""
-"Repository configuration is a dictionary with specific values according to "
-"repository type."
-msgstr ""
-
-msgid "Distribution to DEB repository must be a string"
-msgstr ""
-
-msgid "Components to DEB repository must be listed in a array"
-msgstr ""
-
-msgid "Components to DEB repository must be a string"
-msgstr ""
-
-msgid "Mirror list to repository must be a string"
-msgstr ""
-
-msgid "YUM Repository name must be string."
-msgstr ""
-
-msgid "GPG check must be a boolean value."
-msgstr ""
-
-msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr ""
-
-#, python-format
-msgid "Could not update repository %(repo_id)s."
-msgstr ""
-
-#, python-format
-msgid "Repository %(repo_id)s does not exist."
-msgstr ""
-
-msgid ""
-"Specify repository base URL,  mirror list or metalink in order to create or "
-"update a YUM repository."
-msgstr ""
-
-msgid "Repository management tool was not recognized for your system."
-msgstr ""
-
-#, python-format
-msgid "Repository %(repo_id)s is already enabled."
-msgstr ""
-
-#, python-format
-msgid "Repository %(repo_id)s is already disabled."
-msgstr ""
-
-#, python-format
-msgid "Could not remove repository %(repo_id)s."
-msgstr ""
-
-#, python-format
-msgid "Could not write repository configuration file %(repo_file)s"
-msgstr ""
-
-msgid "Specify repository distribution in order to create a DEB repository."
-msgstr ""
-
-#, python-format
-msgid "Could not enable repository %(repo_id)s."
-msgstr ""
-
-#, python-format
-msgid "Could not disable repository %(repo_id)s."
-msgstr ""
-
-msgid "YUM Repository ID already exists"
-msgstr ""
-
-msgid "YUM Repository name must be a string"
-msgstr ""
-
-#, python-format
-msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr ""
-
-#, python-format
-msgid "Unable to retrieve repository information. Details: '%(err)s'"
-msgstr ""
-
-#, python-format
-msgid "Unable to add repository. Details: '%(err)s'"
-msgstr ""
-
-#, python-format
-msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr ""
-
-#, python-format
-msgid ""
-"Configuration items: '%(items)s' are not supported by repository manager"
-msgstr ""
-
-msgid "Repository metalink must be an http://, ftp:// or file:// URL."
-msgstr ""
-
-msgid "Cannot specify mirrorlist and metalink at the same time."
-msgstr ""
-
-#, python-format
-msgid ""
-"Virtual machine '%(vm)s' must be stopped before creating a snapshot of 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 of 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 ""
-
-#, 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 ""
-
-msgid "Invalid vCPU/topology combination."
-msgstr ""
-
-msgid "This host (or current configuration) does not allow CPU topology."
-msgstr ""
-
 msgid "ERROR CODE"
 msgstr ""
 
@@ -1176,203 +91,6 @@ msgstr ""
 msgid "Go to Homepage"
 msgstr ""
 
-msgid "Create a New Virtual Machine"
-msgstr ""
-
-msgid "Virtual Machine Name"
-msgstr ""
-
-msgid ""
-"The name used to identify the virtual machine. If omitted, a name will be "
-"chosen based on the template used."
-msgstr ""
-
-msgid "Template"
-msgstr ""
-
-msgid "Please create a template first."
-msgstr ""
-
-msgid "Create a Template"
-msgstr ""
-
-msgid "Please choose a template."
-msgstr ""
-
-msgid "OS"
-msgstr ""
-
-msgid "OS Version"
-msgstr ""
-
-msgid "CPUS"
-msgstr ""
-
-msgid "Memory"
-msgstr ""
-
-msgid "Create"
-msgstr ""
-
-msgid "Creating..."
-msgstr ""
-
-msgid "Edit Guest"
-msgstr ""
-
-msgid "General"
-msgstr ""
-
-msgid "Storage"
-msgstr ""
-
-msgid "Interface"
-msgstr ""
-
-msgid "Permission"
-msgstr ""
-
-msgid "Host PCI Device"
-msgstr ""
-
-msgid "Snapshot"
-msgstr ""
-
-msgid "Name"
-msgstr ""
-
-msgid "CPUs"
-msgstr ""
-
-msgid "Memory (MB)"
-msgstr ""
-
-msgid "Icon"
-msgstr ""
-
-msgid "Device"
-msgstr ""
-
-msgid "Path"
-msgstr ""
-
-msgid "Network"
-msgstr ""
-
-msgid "Type"
-msgstr ""
-
-msgid "MAC Address"
-msgstr ""
-
-msgid "Available system users and groups"
-msgstr ""
-
-msgid "Selected system users and groups"
-msgstr ""
-
-msgid "User"
-msgstr ""
-
-msgid "All"
-msgstr ""
-
-msgid "To Add"
-msgstr ""
-
-msgid "Added"
-msgstr ""
-
-msgid "filter"
-msgstr ""
-
-msgid "Product"
-msgstr ""
-
-msgid "Vendor"
-msgstr ""
-
-msgid "Created"
-msgstr ""
-
-msgid "Save"
-msgstr ""
-
-msgid "Replace"
-msgstr ""
-
-msgid "Detach"
-msgstr ""
-
-msgid "Cancel"
-msgstr ""
-
-msgid "revert"
-msgstr ""
-
-msgid "Add a Storage Device to VM"
-msgstr ""
-
-msgid "Device Type"
-msgstr ""
-
-msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr ""
-
-msgid "Storage Pool"
-msgstr ""
-
-msgid "Storage pool which volume located in"
-msgstr ""
-
-msgid "Storage Volume"
-msgstr ""
-
-msgid "Storage volume to be attached"
-msgstr ""
-
-msgid "File Path"
-msgstr ""
-
-msgid "The ISO file path in the server for CDROM."
-msgstr ""
-
-msgid "Attach"
-msgstr ""
-
-msgid "Start"
-msgstr ""
-
-msgid "Reset"
-msgstr ""
-
-msgid "Pause"
-msgstr ""
-
-msgid "Resume"
-msgstr ""
-
-msgid "Power Off"
-msgstr ""
-
-msgid "Actions"
-msgstr ""
-
-msgid "Connect"
-msgstr ""
-
-msgid "Clone"
-msgstr ""
-
-msgid "Edit"
-msgstr ""
-
-msgid "Shut Down"
-msgstr ""
-
-msgid "Delete"
-msgstr ""
-
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
 
@@ -1394,6 +112,12 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
+msgid "Storage"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
 msgid "Failed to get application configuration"
 msgstr ""
 
@@ -1423,12 +147,24 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+msgid "Cancel"
+msgstr ""
+
 msgid "Confirm"
 msgstr ""
 
+msgid "Create"
+msgstr ""
+
 msgid "Warning"
 msgstr ""
 
+msgid "Save"
+msgstr ""
+
+msgid "Creating..."
+msgstr ""
+
 msgid "Cloning..."
 msgstr ""
 
@@ -1496,6 +232,9 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+msgid "Name"
+msgstr ""
+
 msgid "Base URL"
 msgstr ""
 
@@ -1517,6 +256,9 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
+msgid "Edit"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
@@ -1632,9 +374,15 @@ msgid ""
 "to detach it?"
 msgstr ""
 
+msgid "Attach"
+msgstr ""
+
 msgid "Attaching..."
 msgstr ""
 
+msgid "Replace"
+msgstr ""
+
 msgid "Replacing..."
 msgstr ""
 
@@ -1774,27 +522,6 @@ msgstr ""
 msgid "Disk pool or volume cannot be blank."
 msgstr ""
 
-msgid "Peers"
-msgstr ""
-
-msgid "Searching"
-msgstr ""
-
-msgid "No peers found."
-msgstr ""
-
-msgid "Help"
-msgstr ""
-
-msgid "About"
-msgstr ""
-
-msgid "Log out"
-msgstr ""
-
-msgid "Version:"
-msgstr ""
-
 msgid "Session timeout, please re-login."
 msgstr ""
 
@@ -1804,359 +531,23 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-msgid "Generate a New Debug Report"
-msgstr ""
-
-msgid "Report Name"
-msgstr ""
-
-msgid ""
-"The name used to identify the report. If omitted, a name will be chosen "
-"based on current time. Name can contain: letters, digits, underscore (\"_\") "
-"and hyphen (\"-\")."
-msgstr ""
-
-msgid "Rename a Debug Report"
-msgstr ""
-
-msgid ""
-"The name used to identify the report. Name can contain: letters, digits and "
-"hyphen (\"-\")."
-msgstr ""
-
-msgid "Submit"
-msgstr ""
-
-msgid "Add a Repository"
-msgstr ""
-
-msgid "Identifier"
-msgstr ""
-
-msgid "Single word, unique identifier for the repository."
-msgstr ""
-
-msgid "Textual name for the repository."
-msgstr ""
-
-msgid "URL"
-msgstr ""
-
-msgid "Required Field"
-msgstr ""
-
-msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr ""
-
-msgid "Repository is a mirror"
-msgstr ""
-
-msgid "Distribution"
-msgstr ""
-
-msgid "Distribution of the DEB repository."
-msgstr ""
-
-msgid "Components"
-msgstr ""
-
-msgid "List of components in DEB repository."
-msgstr ""
-
-msgid "Edit Repository"
-msgstr ""
-
-msgid "Mirror List URL"
-msgstr ""
-
-msgid "Yes"
-msgstr ""
-
-msgid "No"
-msgstr ""
-
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
-msgid "Define a New Storage Pool"
-msgstr ""
-
-msgid "Storage Pool Name"
-msgstr ""
-
-msgid ""
-"The name used to identify the storage pools, and it should not be empty."
-msgstr ""
-
-msgid "Storage Pool Type"
-msgstr ""
-
-msgid "Storage Path"
-msgstr ""
-
-msgid ""
-"The path of the Storage Pool. Each Storage Pool must have a unique path."
-msgstr ""
-
-msgid ""
-"Kimchi will try to create the directory when it does not already exist in "
-"your system."
-msgstr ""
-
-msgid "NFS Server IP"
-msgstr ""
-
-msgid "NFS server IP or hostname. It can be input or chosen from history."
-msgstr ""
-
-msgid "NFS Path"
-msgstr ""
-
-msgid "The NFS exported path on NFS server."
-msgstr ""
-
-msgid "Device path"
-msgstr ""
-
-msgid "iSCSI Server"
-msgstr ""
-
-msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr ""
-
-msgid "Server"
-msgstr ""
-
-msgid "Port"
-msgstr ""
-
-msgid "Target"
-msgstr ""
-
-msgid "The iSCSI target on iSCSI server"
-msgstr ""
-
-msgid "Add iSCSI Authentication"
-msgstr ""
-
-msgid "iSCSI Authentication"
-msgstr ""
-
-msgid "SCSI Adapter"
-msgstr ""
-
-msgid "Please, wait..."
-msgstr ""
-
-msgid "Add Template"
-msgstr ""
-
-msgid "Where is the source media for this template? "
-msgstr ""
-
-msgid "Local ISO Image"
-msgstr ""
-
-msgid "Local Image File"
-msgstr ""
-
-msgid "Remote ISO Image"
-msgstr ""
-
-msgid "Search ISOs"
-msgstr ""
-
-msgid "The following ISOs are available:"
-msgstr ""
-
-msgid "OS: "
-msgstr ""
-
-msgid "Version: "
-msgstr ""
-
-msgid "Size: "
-msgstr ""
-
-msgid "Search more ISOs"
-msgstr ""
-
-msgid "Create Templates from Selected ISO"
-msgstr ""
-
-msgid "I want to use a specific ISO file"
-msgstr ""
-
-msgid "Loading default remote ISOs ..."
-msgstr ""
-
-msgid "Arch: "
-msgstr ""
-
-msgid "I want to use a custom URL"
-msgstr ""
-
-msgid "Edit Template"
-msgstr ""
-
-msgid "Processor"
-msgstr ""
-
-msgid "CDROM"
-msgstr ""
-
-msgid "Image File"
-msgstr ""
-
-msgid "Graphics"
-msgstr ""
-
-msgid "Disk(GB)"
-msgstr ""
-
-msgid "Disk Format"
-msgstr ""
-
-msgid "CPU Number"
-msgstr ""
-
-msgid "Manually set CPU topology"
-msgstr ""
-
-msgid "Cores"
-msgstr ""
-
-msgid "Threads"
-msgstr ""
-
-msgid "CPU"
-msgstr ""
-
-msgid "Disk I/O"
-msgstr ""
-
-msgid "Network I/O"
-msgstr ""
-
-msgid "Livetile"
-msgstr ""
-
-msgid "No guests found."
-msgstr ""
-
-msgid "Shut down"
-msgstr ""
-
-msgid "Restart"
-msgstr ""
-
-msgid "Basic Information"
-msgstr ""
-
-msgid "OS Distro"
-msgstr ""
-
-msgid "OS Code Name"
-msgstr ""
-
-msgid "CPU(s)"
-msgstr ""
-
-msgid "System Statistics"
-msgstr ""
-
-msgid "Update Progress"
-msgstr ""
-
-msgid "Network Name"
-msgstr ""
-
-msgid "State"
-msgstr ""
-
-msgid "Network Type"
-msgstr ""
-
-msgid "Address Space"
-msgstr ""
-
-msgid "Name should not contain '/' and '\"'."
-msgstr ""
-
-msgid "Isolated: no external network connection"
-msgstr ""
-
-msgid "NAT: outbound physical network connection only"
-msgstr ""
-
-msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr ""
-
-msgid "(No interfaces found)"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Enable VLAN"
-msgstr ""
-
-msgid "VLAN ID"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "%Used"
-msgstr ""
-
-msgid "Location"
-msgstr ""
-
-msgid "Capacity"
-msgstr ""
-
-msgid "Allocated"
-msgstr ""
-
-msgid "active"
-msgstr ""
-
-msgid "inactive"
-msgstr ""
-
-msgid "Deactivate"
-msgstr ""
-
-msgid "Activate"
+msgid "Peers"
 msgstr ""
 
-msgid "Add Volume"
+msgid "Searching"
 msgstr ""
 
-msgid "Extend"
+msgid "No peers found."
 msgstr ""
 
-msgid "Undefine"
+msgid "Help"
 msgstr ""
 
-msgid "Format"
+msgid "About"
 msgstr ""
 
-msgid "Allocation"
+msgid "Log out"
 msgstr ""
 
-msgid "No templates found."
+msgid "Version:"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..2e26be5
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,1926 @@
+# i18n portable object for kimchi.
+# Copyright (C) IBM, Corp. 2013-2014
+# ShaoHe Feng <shaohef at linux.vnet.ibm.com>, 2013-04-18.
+#
+# 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
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-06-27 10:48+0000\n"
+"Last-Translator: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
+"Language-Team: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Generated-By: pygettext.py 1.5\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "???????????????%(resource)s"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "???????????????%(resource)s"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "???????????????%(resource)s"
+
+msgid "Unable to parse JSON request"
+msgstr "????????????JSON??????"
+
+msgid "This API only supports JSON"
+msgstr "??????API?????????JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr "?????????????????????????????????%(err)s"
+
+msgid "You don't have permission to perform this operation."
+msgstr "????????????????????????????????????"
+
+msgid "Datastore is not initiated in the model object."
+msgstr "?????????model??????????????????????????????"
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr "????????????%(err)s??????????????????"
+
+#, python-format
+msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr "??????'%(username)s'??????????????????.[???????????????%(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "????????????????????????Kimchi"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "????????????Kimchi???%(item)s"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr "?????????LDAP?????????%(item)s : %(value)s"
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "???????????????????????????%(item)s"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr "??????'%(cmd)s'??????%(seconds)s???????????????"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "?????????URI %(uri)s"
+
+msgid "ERROR CODE"
+msgstr "?????????"
+
+msgid "REASON"
+msgstr "??????"
+
+msgid "STACK"
+msgstr "?????????"
+
+msgid "Go to Homepage"
+msgstr "????????????"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr "?????????????????????????????????????????????"
+
+msgid "This field is required."
+msgstr "??????????????????"
+
+msgid "Log in"
+msgstr "??????"
+
+msgid "Logging in..."
+msgstr "?????????..."
+
+msgid "Host"
+msgstr "??????"
+
+msgid "Guests"
+msgstr "?????????"
+
+msgid "Templates"
+msgstr "??????"
+
+msgid "Storage"
+msgstr "??????"
+
+msgid "Network"
+msgstr "??????"
+
+msgid "Failed to get application configuration"
+msgstr "????????????????????????"
+
+msgid "This is not a valid Linux path"
+msgstr "????????????????????????Linux??????"
+
+msgid "This is not a valid URL."
+msgstr "????????????????????????URL"
+
+msgid "No such data available."
+msgstr "?????????????????????"
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????HTTP???????????????%1"
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "????????????"
+
+msgid "OK"
+msgstr "??????"
+
+msgid "Cancel"
+msgstr "??????"
+
+msgid "Confirm"
+msgstr "??????"
+
+msgid "Create"
+msgstr "??????"
+
+msgid "Warning"
+msgstr "??????"
+
+msgid "Save"
+msgstr "??????"
+
+msgid "Creating..."
+msgstr "????????????..."
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "????????????..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "??????"
+
+msgid "Detailed message:"
+msgstr "???????????????"
+
+msgid "No ISO found"
+msgstr "????????????ISO??????"
+
+msgid "This is not a valid ISO file."
+msgstr "????????????????????????ISO??????"
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "???????????????????????????????????????"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "??????????????????????????????????????????"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr "?????????????????????????????????????????????"
+
+msgid "Max:"
+msgstr "?????????"
+
+msgid "Utilization"
+msgstr "?????????"
+
+msgid "Available"
+msgstr "????????????"
+
+msgid "Read Rate"
+msgstr "?????????"
+
+msgid "Write Rate"
+msgstr "?????????"
+
+msgid "Received"
+msgstr "??????"
+
+msgid "Sent"
+msgstr "??????"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr "???????????????????????????????????????????????????????????????????????????/?????????"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr "???????????????????????????????????????????????????????????????"
+
+msgid "Repositories"
+msgstr "????????????"
+
+msgid "ID"
+msgstr "?????????"
+
+msgid "Name"
+msgstr "??????"
+
+msgid "Base URL"
+msgstr "??????URL"
+
+msgid "Is Mirror"
+msgstr "???????????????"
+
+msgid "URL Args"
+msgstr "URL??????"
+
+msgid "Enabled"
+msgstr "?????????"
+
+msgid "GPG Check"
+msgstr "GPG??????"
+
+msgid "GPG Key"
+msgstr "GPG???"
+
+msgid "Add"
+msgstr "??????"
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Remove"
+msgstr "??????"
+
+msgid "Enable"
+msgstr "??????"
+
+msgid "Disable"
+msgstr "??????"
+
+msgid "Software Updates"
+msgstr "????????????"
+
+msgid "Package Name"
+msgstr "???????????????"
+
+msgid "Version"
+msgstr "??????"
+
+msgid "Architecture"
+msgstr "????????????"
+
+msgid "Repository"
+msgstr "????????????"
+
+msgid "Update All"
+msgstr "????????????"
+
+msgid "Updating..."
+msgstr "????????????..."
+
+msgid "Failed to retrieve packages update information."
+msgstr "????????????????????????????????????"
+
+msgid "Failed to update package(s)."
+msgstr "?????????????????????"
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr "?????????????????????????????????????????????????????????????????????"
+
+msgid "Debug Reports"
+msgstr "??????????????????"
+
+msgid "Generated Time"
+msgstr "????????????"
+
+msgid "Generate"
+msgstr "??????"
+
+msgid "Generating..."
+msgstr "????????????..."
+
+msgid "Rename"
+msgstr "?????????"
+
+msgid "Download"
+msgstr "??????"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr "??????????????????????????????????????????????????????('_')????????????('-')"
+
+msgid "Pending..."
+msgstr "????????????..."
+
+msgid "Report name is the same as the original one."
+msgstr "????????????????????????????????????"
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr "?????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Power off Confirmation"
+msgstr "??????????????????"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Reset Confirmation"
+msgstr "????????????"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Shut Down Confirmation"
+msgstr "????????????"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "?????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr "?????????????????????"
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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 ""
+"????????????????????????SCSI??????iSCSI?????????????????????????????????????????????????????????????????????"
+"??????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid ""
+"This CDROM will be detached permanently and you can re-attach it. Continue "
+"to detach it?"
+msgstr "CDROM???????????????????????????????????????????????????????????????"
+
+msgid "Attach"
+msgstr "??????"
+
+msgid "Attaching..."
+msgstr "????????????"
+
+msgid "Replace"
+msgstr "??????"
+
+msgid "Replacing..."
+msgstr "????????????..."
+
+msgid "Successfully attached!"
+msgstr "????????????"
+
+msgid "Successfully replaced!"
+msgstr "????????????"
+
+msgid "Successfully detached!"
+msgstr "????????????"
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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??????"
+
+msgid "unavailable"
+msgstr "????????????"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr "??????????????????????????????????????????????????????????????????"
+
+msgid "Create a network"
+msgstr "??????????????????"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"?????????"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr "?????????????????????????????????????????????"
+
+msgid "This storage pool is empty."
+msgstr "?????????????????????"
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr "????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "SCSI Fibre Channel"
+msgstr "SCSI????????????"
+
+msgid "No SCSI adapters found."
+msgstr "????????????SCSI?????????"
+
+msgid "Loading iSCSI targets..."
+msgstr "??????iSCSI??????..."
+
+msgid "No iSCSI found. Please input one."
+msgstr "????????????iSCSI,??????????????????"
+
+msgid "Failed to load iSCSI targets."
+msgstr "??????iSCSI???????????????"
+
+msgid "The storage pool name can not be blank."
+msgstr "?????????????????????????????????"
+
+msgid "The storage pool path can not be blank."
+msgstr "?????????????????????????????????"
+
+msgid "NFS server mount path can not be blank."
+msgstr "NFS????????????????????????????????????"
+
+msgid "Invalid NFS mount path."
+msgstr "?????????NFS???????????????"
+
+msgid "No logical device selected."
+msgstr "???????????????????????????"
+
+msgid "The iSCSI target can not be blank."
+msgstr "iSCSI?????????????????????"
+
+msgid "Server name can not be blank."
+msgstr "????????????????????????"
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr "??????????????????????????????????????????IP?????????????????????????????????"
+
+msgid "Looking for available partitions ..."
+msgstr "????????????????????? ..."
+
+msgid "No available partitions found."
+msgstr "?????????????????????"
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Unable to retrieve partitions information."
+msgstr "???????????????????????????"
+
+msgid "In progress..."
+msgstr "????????????..."
+
+msgid "Failed!"
+msgstr "?????????"
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr "CDROM?????????????????????????????????/??????????????????????????????"
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "???????????????????????????"
+
+msgid "Session timeout, please re-login."
+msgstr "?????????????????????????????????"
+
+msgid "User Name"
+msgstr "?????????"
+
+msgid "Password"
+msgstr "??????"
+
+msgid "Peers"
+msgstr "?????????"
+
+msgid "Searching"
+msgstr "????????????"
+
+msgid "No peers found."
+msgstr "????????????????????????"
+
+msgid "Help"
+msgstr "??????"
+
+msgid "About"
+msgstr "??????"
+
+msgid "Log out"
+msgstr "??????"
+
+msgid "Version:"
+msgstr "?????????"
+
+#~ msgid "Unknown parameter %(value)s"
+#~ msgstr "???????????? %(value)s"
+
+#~ msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
+#~ msgstr "??????'%(task)s??????%(seconds)s??????"
+
+#~ msgid "User %(user_id)s not found with given LDAP settings."
+#~ msgstr "???????????????LDAP???????????????%(user_id)s??????"
+
+#~ msgid "Unknown \"_cap\" specified"
+#~ msgstr "????????????\"_cap\""
+
+#~ msgid "\"_passthrough\" should be \"true\" or \"false\""
+#~ msgstr "\"_passthrough\"?????????\"true\"??????\"false\""
+
+#~ msgid "\"_passthrough_affected_by\" should be a device name string"
+#~ msgstr "\"_passthrough_affected_by\"?????????????????????????????????"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr "????????????????????????????????????%(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr "??????????????? %(device)s ??????????????????"
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "???????????????????????????%(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr "??????????????????????????????%(filename)s????????????????????????JSON??????????????????"
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr "???????????? %(portal)s ??????iSCSI???????????????????????????%(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "????????????iSCSI??????%(host)s????????????%(target)s???"
+
+#~ msgid "Unable to find ISO file %(filename)s"
+#~ msgstr "????????????ISO?????? %(filename)s"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "ISO??????%(filename)s???????????????"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr "ISO??????%(filename)s???????????????El Torito???????????????"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "???ISO??????%(filename)s??????????????????El Torito??????????????????"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "ISO??????%(filename)s???El Torito????????????????????????"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr "????????????ISO??????%(filename)s???????????????"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr "ISO??????%(filename)s???????????????????????????"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "hypervisor????????????ISO??????%(filename)s?????????????????????ISO??????/var/lib/libvirt"
+#~ "??????????????????'%(user)s'?????????????????????????????????'%(user)s'???????????????ISO?????????"
+#~ "??????????????????????????????????????????????????? 'chmod -R o+x '???????????????????????????%(err)"
+#~ "s"
+
+#~ msgid "An error occurred when probing image OS information."
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "No OS information found in given image."
+#~ msgstr "?????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to read image file %(filename)s"
+#~ msgstr "???????????????????????? %(filename)s"
+
+#~ msgid ""
+#~ "Image file must be an existing file on system. %(filename)s is not a "
+#~ "valid input."
+#~ msgstr "???????????????????????????????????????%(filename)s?????????????????????"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "?????????%(name)s????????????"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "?????????%(name)s?????????"
+
+#~ 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 ""
+#~ "????????????????????? %(name)s ?????????????????? %(new_name)s ????????????????????????????????????"
+#~ "??????"
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr "????????????????????????????????????%(name)s?????????"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "???????????????????????????ISO?????????"
+
+#~ msgid "Screenshot is not supported on virtual machine %(name)s"
+#~ msgstr "????????? %(name)s ???????????????"
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Unable to connect to powered off virtual machine %(name)s."
+#~ msgstr "?????????%(name)s???????????????????????????"
+
+#~ msgid "Invalid template URI %(value)s specified for virtual machine"
+#~ msgstr "????????????????????????URI %(value)s"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for virtual machine"
+#~ msgstr "???????????????????????????URI %(value)s"
+
+#~ msgid "Supported virtual machine graphics are Spice or VNC"
+#~ msgstr "??????????????????????????????Spice??????VNC"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr "??????????????????????????????????????????IPv4???IPv6?????????"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????? %(name)s. ?????????%(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????? %(name)s????????????%(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "User name list must be an array"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "User name must be a string"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Group name list must be an array"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "??????'%(users)s'?????????"
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "?????????'%(groups)s'?????????"
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr "????????????????????? %(name)s????????????????????????%(err)s"
+
+#~ msgid "The guest console password must be a string."
+#~ msgstr "???????????????????????????????????????????????????"
+
+#~ msgid "The life time for the guest console password must be a number."
+#~ msgstr "????????????????????????????????????????????????????????????"
+
+#~ msgid "Virtual machine '%(name)s' must be stopped before cloning it."
+#~ msgstr "?????????'%(name)s'?????????????????????????????????"
+
+#~ msgid "Insufficient disk space to clone virtual machine '%(name)s'"
+#~ msgstr "???????????????'%(name)s'?????????????????????????????????"
+
+#~ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
+#~ msgstr "???????????????????????????'%(name)s'??????????????????%(err)s"
+
+#~ msgid ""
+#~ "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
+#~ msgstr "?????????%(vmid)s?????????????????????????????????%(dev_name)s???"
+
+#~ msgid ""
+#~ "The host device %(dev_name)s is not allowed to directly assign to VM."
+#~ msgstr "????????????%(dev_name)s????????????????????????????????????"
+
+#~ msgid ""
+#~ "No IOMMU groups found. Host PCI pass through needs IOMMU group to "
+#~ "function correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, "
+#~ "then verify the Kernel is compiled with IOMMU support. For Intel CPU, add "
+#~ "intel_iommu=on to your Kernel parameter in /boot/grub2/grub.conf. For AMD "
+#~ "CPU, add iommu=pt iommu=1."
+#~ msgstr ""
+#~ "?????????IOMMU groups?????????PCI pass through??????IOMMU group???????????????????????????"
+#~ "???BIOS????????????Intel VT-d ?????? AMD IOMMU ???????????????????????????????????????IOMMU???"
+#~ "??????Intel CPU????????????/boot/grub2/grub.conf?????????????????????intel_iommu=on??????"
+#~ "???AMD CPU????????????iommu=pt iommu=1???"
+
+#~ msgid "\"name\" should be a device name string"
+#~ msgstr "\"name\"???????????????????????????????????????"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "????????? %(name)s ??????????????? %(iface)s"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr "????????????%(name)s???????????????%(network)s?????????"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr "?????????????????????????????????????????????"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr "?????????????????????????????????????????????"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "?????? %(name)s ????????????"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr "????????? %(template)s ??????????????? '%(network)s' ?????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr "????????? %(template)s ?????????????????? '%(pool)s' ?????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr "????????? %(template)s ?????????????????? '%(pool)s' ????????????"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "???CDROM??????????????? '%(param)s' ??????"
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr "????????? %(template)s ??????????????? '%(network)s' ????????????"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "???????????????????????????????????????????????????"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "???????????????????????????????????????????????????"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "CPU???????????????????????????0?????????"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "???????????????MB?????????????????????????????????512?????????"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "?????????CDROM????????????????????????????????????ISO??????"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr "????????????????????????????????????URI %(value)s"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr "????????????ISO???????????????????????????CDROM??????????????????"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
+#~ msgstr "?????????????????????iSCSI??????SCSI????????????????????????????????????"
+
+#~ msgid "The volume %(volume)s is not in storage pool %(pool)s"
+#~ msgstr "???%(volume)s???????????????%(pool)s???"
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "??????????????????????????????%(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "???????????????%(err)s?????????????????????"
+
+#~ msgid "Disk size must be an integer greater than 1GB."
+#~ msgstr "????????????????????????1GB???"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "????????????????????????????????????????????????????????????"
+
+#~ msgid "Cannot identify base image %(path)s format"
+#~ msgstr "????????????????????????%(path)s??????"
+
+#~ msgid ""
+#~ "When specifying CPU topology, VCPUs must be a product of sockets, cores, "
+#~ "and threads."
+#~ msgstr "CPU????????????VCPUs????????????sockets, cores ??????threads???"
+
+#~ msgid ""
+#~ "When specifying CPU topology, each element must be an integer greater "
+#~ "than zero."
+#~ msgstr "CPU?????????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
+#~ "qcow2, qed, raw, vmdk, vpc."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????bochs, cloop, cow, dmg, qcow, qcow2, "
+#~ "qed, raw, vmdk, vpc???"
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "?????????%(name)s????????????"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "?????????%(name)s?????????"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "???????????????%(name)s??????%(item)s"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "?????????????????????????????? %(name)s"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "???????????????????????? ????????? %(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????? %(name)s???????????? %(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s??????????????????????????? %(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s???????????? %(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s???????????? %(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s???????????? %(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr "????????????NFS??????????????????????????????%(path)s????????????????????????"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr "????????????NFS??????????????????????????????%(path)s??????"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "??????????????????????????????%(type)s"
+
+#~ msgid "Error while retrieving storage pool XML to %(pool)s"
+#~ msgstr "???????????????XML???%(pool)s???????????????"
+
+#~ msgid ""
+#~ "Supported storage pool types are dir, netfs, logical, iscsi, isci and "
+#~ "kimchi-iso"
+#~ msgstr "????????????????????????dir???netfs???logical???iscsi???isci??????kimchi-iso"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "??????????????????????????????IP???????????????"
+
+#~ msgid "Storage pool device must be the absolute path to the block device"
+#~ msgstr "??????????????????????????????????????????????????????"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "iSCSI??????????????????IQN??????????????????"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr "???????????????????????????????????????1???65535???????????????"
+
+#~ msgid "iSCSI target username must be a string"
+#~ msgstr "iSCSI???????????????????????????????????????"
+
+#~ msgid "iSCSI target password must be a string"
+#~ msgstr "iSCSI????????????????????????????????????"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr "%(disk)s ?????????????????????/????????????????????????????????????%(pool)s???"
+
+#~ msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(pool)s?????????????????????%(err)s"
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "SCSI???????????????????????????????????????"
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr "?????????kimchi_isos??????????????????"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr "????????????NFS?????????%(name)s???NFS?????????%(server)s???????????????"
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr "????????????NFS?????????%(name)s???NFS?????????%(server)s???????????????"
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr "?????????????????????%(name)s????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr "?????????????????????%(name)s????????????????????????????????????"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr "??????'%(name)s'??????????????????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr "??????????????????????????????????????????%(err)s???"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "?????????%(name)s????????????"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr "?????????%(pool)s??????????????????%(name)s"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(volume)s because storage pool %(pool)s "
+#~ "is not active"
+#~ msgstr "?????????????????????%(volume)s??????????????????%(pool)s ????????????"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr "???????????????%(volume)s????????????%(item)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes because storage pool %(pool)s is not active"
+#~ msgstr "???????????????????????????????????????%(pool)s????????????"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr "??????????????????%(pool)s??????????????????%(name)s????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr "??????????????????%(pool)s??????????????????????????????%(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????%(name)s?????????????????????%(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr "????????????%(type)s??????????????????????????????"
+
+#~ msgid "Storage volume name must be a string"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Storage volume allocation must be an integer number"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid ""
+#~ "Storage volume format not supported. Valid formats: bochs, cloop, cow, "
+#~ "dmg, qcow, qcow2, qed, raw, vmdk, vpc."
+#~ msgstr ""
+#~ "????????????????????????????????????????????????bochs, cloop, cow, dmg, qcow, qcow2, qed, "
+#~ "raw, vmdk, vpc???"
+
+#~ msgid "Storage volume requires a volume name"
+#~ msgstr "?????????????????????"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr "???????????????????????????????????????%(err)s"
+
+#~ msgid "Only one of parameter %(param)s can be specified"
+#~ msgstr "???????????????%(param)s????????????????????????"
+
+#~ msgid "Create volume from %(param)s is not supported"
+#~ msgstr "????????????%(param)s???????????????"
+
+#~ msgid "Storage volume capacity must be an integer number."
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
+#~ msgstr "?????????URL?????????http://???https://???ftp://???ftps://"
+
+#~ msgid "Unable to access file %(url)s. Please, check it."
+#~ msgstr "??????????????????%(url)s????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %"
+#~ "(err)s"
+#~ msgstr "??????????????????'%(pool)s'???????????????'%(name)s'?????????????????????%(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "??????%(name)s?????????"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "??????%(name)s????????????"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "??????%(name)s?????????"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr "?????????%(network)s???????????????%(subnet)s??????"
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr "??????????????????????????????????????????????????????%(name)s"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "???????????????????????????%(name)s"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr "?????????%(network)s???????????????%(iface)s????????????"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr "?????????????????????????????????????????????bonding?????????????????????"
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "??????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr "???????????????'%(name)s'????????????????????????IP???????????????"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "?????????????????????????????????NAT?????????"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr "???????????????????????????IP????????????????????????????????????????????????"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "??????VLAN????????????1???4094???????????????"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr "??????????????????%(name)s??????VLAN???trunk?????????"
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "???????????????????????? %(iface)s???%(err)s???"
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr "????????????%(iface)s?????????????????????????????????????????????"
+
+#~ msgid "Failed to start network %(name)s. Details: %(err)s"
+#~ msgstr "????????????%(name)s??????????????????%(err)s"
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "????????????%(name)s?????????"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr "????????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "Can not find any debug report with the given name %(name)s"
+#~ msgstr "????????????????????????%(name)s???????????????"
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????????%(name)s????????????%(err)s"
+
+#~ msgid "You should give a name for the debug report file."
+#~ msgstr "????????????????????????%(name)s????????????%(err)s"
+
+#~ msgid ""
+#~ "Debug report name must be a string. Only letters, digits, underscore "
+#~ "('_') and hyphen ('-') are allowed."
+#~ msgstr ""
+#~ "????????????????????????????????????????????????????????????????????????????????????('_')???????????????"
+#~ "('-')??????????????????"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr "?????????\"'%(name)s\"?????????????????????????????????????????????????????????"
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "???????????????%(server)s??????Kimchi??????"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "????????????'%(name)s'?????????"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "????????????????????????%(name)s"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "????????????????????????'%(name)s'"
+
+#~ msgid "Conflicting flag filters specified."
+#~ msgstr "flag filters?????????"
+
+#~ msgid "No packages marked for update"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "?????????%(name)s????????????????????????"
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr "?????????????????????????????????????????????????????????%(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Unable to choose a virtual machine name"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "??????????????????????????????????????????'cdrom'???'disk'"
+
+#~ msgid "The path '%(value)s' is not a valid local/remote path for the device"
+#~ msgstr "??????'%(value)s'???????????????????????????/????????????"
+
+#~ msgid "Only CDROM path can be update."
+#~ msgstr "?????????CDROM???????????????"
+
+#~ msgid ""
+#~ "The storage device %(dev_name)s does not exist in the virtual machine %"
+#~ "(vm_name)s"
+#~ msgstr "????????????%(dev_name)s????????????%(vm_name)s????????????"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr "????????????????????????????????????%(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr "??????????????????????????????%(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "??????????????????????????????%(error)s"
+
+#~ msgid "Do not support IDE device hot plug"
+#~ msgstr "?????????IDE??????????????????"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr "???????????????????????????????????????????????????????????????????????????/?????????"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Controller type %(type)s limitation of %(limit)s devices reached"
+#~ msgstr "??????????????????%(type)s?????????????????????%(limit)s"
+
+#~ msgid ""
+#~ "Cannot retrieve disk path information for given pool/volume: %(error)s"
+#~ msgstr "???????????????????????????/??????????????????????????????????????????%(error)s"
+
+#~ msgid "Volume already in use by other virtual machine."
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr "?????????????????????????????????????????????????????????/?????????????????????"
+
+#~ msgid ""
+#~ "Volume chosen with format %(format)s does not fit in the storage type %"
+#~ "(type)s"
+#~ msgstr "?????????%(format)s???????????????????????????%(type)s"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr "YUM????????????ID??????????????????????????????????????????"
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "????????????URL?????????http://??? ftp:// ??? file://"
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr "??????????????????????????????????????????????????????????????????"
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "DEB?????????????????????????????????????????????"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr "DEB??????????????????????????????????????????"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "DEB???????????????????????????????????????"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "YUM???????????????????????????????????????"
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "GPG??????????????????????????????"
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr "GPG????????????????????????ASCII???????????????.asc????????????URL"
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "????????????????????????%(repo_id)s"
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "????????????%(repo_id)s????????????"
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr "??????????????????????????????????????????"
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "????????????%(repo_id)s???????????????"
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "????????????%(repo_id)s???????????????"
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "????????????????????????%(repo_id)s"
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr "????????????????????????????????????%(repo_file)s"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr "?????????????????????????????????????????????DEB?????????"
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "????????????????????????%(repo_id)s"
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "????????????????????????%(repo_id)s"
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "YUM??????ID????????????"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "YUM????????????????????????????????????"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "????????????????????????????????????'%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr "?????????????????????????????????????????????'%(err)s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "????????????????????????????????????'%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "????????????????????????????????????'%(err)s'"
+
+#~ msgid ""
+#~ "Configuration items: '%(items)s' are not supported by repository manager"
+#~ msgstr "?????????????????????????????????: %(items)s"
+
+#~ msgid ""
+#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
+#~ msgstr "?????????'%(vm)s'?????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. "
+#~ "Details: %(err)s"
+#~ msgstr "??????????????????'%(vm)s'????????????'%(name)s'????????????%(err)s"
+
+#~ msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
+#~ msgstr "??????'%(name)s'??????????????????'%(vm)s'??????"
+
+#~ msgid ""
+#~ "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. "
+#~ "Details: %(err)s"
+#~ msgstr "??????????????????'%(vm)s'????????????'%(name)s'????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
+#~ msgstr "?????????????????????'%(vm)s'?????????????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. "
+#~ "Details: %(err)s"
+#~ msgstr "?????????????????????'%(vm)s'??????'%(name)s'????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
+#~ "%(err)s"
+#~ msgstr "?????????????????????'%(vm)s'????????????????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. "
+#~ "Details: %(err)s"
+#~ msgstr "?????????????????????'%(vm)s'?????????'%(name)s'????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to create snapshot of virtual machine '%(vm)s' because it contains "
+#~ "a disk with format '%(format)s'; only 'qcow2' is supported."
+#~ msgstr ""
+#~ "??????????????????'%(vm)s'???????????????????????????????????????'%(format)s'????????????????????????"
+#~ "???'qcow2'?????????"
+
+#~ msgid "The number of vCPUs is too large for this system."
+#~ msgstr "vCPUs????????????????????????????????????"
+
+#~ msgid "Invalid vCPU/topology combination."
+#~ msgstr "?????????vCPU/topology?????????"
+
+#~ msgid "This host (or current configuration) does not allow CPU topology."
+#~ msgstr "??????????????????????????????????????????CPU?????????"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "???????????????"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Template"
+#~ msgstr "??????"
+
+#~ msgid "Please create a template first."
+#~ msgstr "????????????????????????"
+
+#~ msgid "Create a Template"
+#~ msgstr "??????????????????"
+
+#~ msgid "Please choose a template."
+#~ msgstr "??????????????????"
+
+#~ msgid "OS"
+#~ msgstr "????????????"
+
+#~ msgid "OS Version"
+#~ msgstr "??????????????????"
+
+#~ msgid "CPUS"
+#~ msgstr "???????????????"
+
+#~ msgid "Memory"
+#~ msgstr "??????"
+
+#~ msgid "Edit Guest"
+#~ msgstr "???????????????"
+
+#~ msgid "General"
+#~ msgstr "??????"
+
+#~ msgid "Interface"
+#~ msgstr "????????????"
+
+#~ msgid "Permission"
+#~ msgstr "??????"
+
+#~ msgid "Host PCI Device"
+#~ msgstr "??????PCI??????"
+
+#~ msgid "Snapshot"
+#~ msgstr "??????"
+
+#~ msgid "CPUs"
+#~ msgstr "???????????????"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "??????(MB)"
+
+#~ msgid "Icon"
+#~ msgstr "??????"
+
+#~ msgid "Device"
+#~ msgstr "????????????"
+
+#~ msgid "Path"
+#~ msgstr "??????"
+
+#~ msgid "Type"
+#~ msgstr "??????"
+
+#~ msgid "Available system users and groups"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Selected system users and groups"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "User"
+#~ msgstr "??????"
+
+#~ msgid "All"
+#~ msgstr "??????"
+
+#~ msgid "To Add"
+#~ msgstr "?????????"
+
+#~ msgid "Added"
+#~ msgstr "?????????"
+
+#~ msgid "filter"
+#~ msgstr "?????????"
+
+#~ msgid "Product"
+#~ msgstr "??????"
+
+#~ msgid "Vendor"
+#~ msgstr "??????"
+
+#~ msgid "Created"
+#~ msgstr "?????????"
+
+#~ msgid "Detach"
+#~ msgstr "??????"
+
+#~ msgid "revert"
+#~ msgstr "??????"
+
+#~ msgid "Start"
+#~ msgstr "??????"
+
+#~ msgid "Reset"
+#~ msgstr "??????"
+
+#~ msgid "Power Off"
+#~ msgstr "????????????"
+
+#~ msgid "Actions"
+#~ msgstr "??????"
+
+#~ msgid "Connect"
+#~ msgstr "?????????"
+
+#~ msgid "Clone"
+#~ msgstr "????????????"
+
+#~ msgid "Shut Down"
+#~ msgstr "??????"
+
+#~ msgid "Delete"
+#~ msgstr "??????"
+
+#~ msgid "CPU"
+#~ msgstr "?????????"
+
+#~ msgid "Disk I/O"
+#~ msgstr "??????I/O"
+
+#~ msgid "Network I/O"
+#~ msgstr "??????I/O"
+
+#~ msgid "Livetile"
+#~ msgstr "??????"
+
+#~ msgid "No guests found."
+#~ msgstr "?????????????????????"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Device Type"
+#~ msgstr "????????????"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "??????????????????????????????????????????\"cdrom\"???\"disk\"??? "
+
+#~ msgid "Storage Pool"
+#~ msgstr "?????????"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Storage Volume"
+#~ msgstr "?????????"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "?????????????????????"
+
+#~ msgid "File Path"
+#~ msgstr "????????????"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "????????????CDROM????????????ISO????????????"
+
+#~ msgid "Shut down"
+#~ msgstr "??????"
+
+#~ msgid "Restart"
+#~ msgstr "??????"
+
+#~ msgid "Basic Information"
+#~ msgstr "????????????"
+
+#~ msgid "OS Distro"
+#~ msgstr "?????????????????????"
+
+#~ msgid "OS Code Name"
+#~ msgstr "??????????????????"
+
+#~ msgid "Processor"
+#~ msgstr "?????????"
+
+#~ msgid "CPU(s)"
+#~ msgstr "CPU(s)"
+
+#~ msgid "System Statistics"
+#~ msgstr "??????????????????"
+
+#~ msgid "Update Progress"
+#~ msgstr "????????????"
+
+#, fuzzy
+#~ msgid "Filter"
+#~ msgstr "?????????"
+
+#~ msgid "Network Name"
+#~ msgstr "????????????"
+
+#~ msgid "State"
+#~ msgstr "??????"
+
+#~ msgid "Network Type"
+#~ msgstr "????????????"
+
+#~ msgid "Address Space"
+#~ msgstr "????????????"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "????????????????????????/??????'\"'???"
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "??????: ????????????????????????"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT: ???????????????????????????????????????"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr "?????????????????????????????????????????????????????????"
+
+#~ msgid "(No interfaces found)"
+#~ msgstr "(????????????????????????)"
+
+#~ msgid "Destination"
+#~ msgstr "????????????"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "??????VLAN"
+
+#~ msgid "VLAN ID"
+#~ msgstr "VLAN???"
+
+#~ msgid "Stop"
+#~ msgstr "??????"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Report Name"
+#~ msgstr "???????????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "????????????????????????????????? ('_') ???????????????'-'???"
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "???????????????????????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr "????????????????????????????????????????????????????????????????????????????????????(\"-\")???"
+
+#~ msgid "Submit"
+#~ msgstr "??????"
+
+#~ msgid "Add a Repository"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Identifier"
+#~ msgstr "?????????"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "???????????????????????????"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "???????????????"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr "???????????????URL?????????????????????http???ftp??????file"
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Distribution"
+#~ msgstr "?????????"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "DEB??????????????????"
+
+#~ msgid "Components"
+#~ msgstr "??????"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "DEB????????????????????????"
+
+#~ msgid "Edit Repository"
+#~ msgstr "??????????????????"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "????????????URL"
+
+#~ msgid "Yes"
+#~ msgstr "???"
+
+#~ msgid "No"
+#~ msgstr "???"
+
+#~ msgid "Capacity"
+#~ msgstr "??????"
+
+#~ msgid "Allocated"
+#~ msgstr "?????????"
+
+#~ msgid "Location"
+#~ msgstr "??????"
+
+#~ msgid "Device path"
+#~ msgstr "????????????"
+
+#~ msgid "active"
+#~ msgstr "?????????"
+
+#~ msgid "inactive"
+#~ msgstr "?????????"
+
+#~ msgid "Deactivate"
+#~ msgstr "??????"
+
+#~ msgid "Activate"
+#~ msgstr "??????"
+
+#~ msgid "Add Volume"
+#~ msgstr "?????????"
+
+#~ msgid "Extend"
+#~ msgstr "??????"
+
+#~ msgid "Undefine"
+#~ msgstr "????????????"
+
+#~ msgid "Format"
+#~ msgstr "??????"
+
+#~ msgid "Allocation"
+#~ msgstr "??????"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "???????????????"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr "???????????????????????????????????????????????????????????????"
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "???????????????"
+
+#~ msgid "Storage Path"
+#~ msgstr "????????????"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr "??????????????????.???????????????????????????????????????"
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr "????????????????????????KIMCHI?????????????????????????????????????????????"
+
+#~ msgid "NFS Server IP"
+#~ msgstr "NFS?????????IP"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr "NFS?????????IP?????????????????????????????????????????????????????????????????????"
+
+#~ msgid "NFS Path"
+#~ msgstr "NFS ??????"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "NFS?????????????????????NFS??????"
+
+#~ msgid "iSCSI Server"
+#~ msgstr "iSCSI?????????"
+
+#~ msgid "Server"
+#~ msgstr "?????????"
+
+#~ msgid "Port"
+#~ msgstr "??????"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "iSCSI?????????IP?????????????????? ???????????????"
+
+#~ msgid "Target"
+#~ msgstr "??????"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "iSCSI??????"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "??????ISCSI??????"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "iSCSI??????"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "SCSI?????????"
+
+#~ msgid "Please, wait..."
+#~ msgstr "?????????..."
+
+#~ msgid "Add a Volume to Storage Pool"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Fetch from remote URL"
+#~ msgstr "?????????URL??????"
+
+#~ msgid "Enter the remote URL here."
+#~ msgstr "?????????????????????URL???"
+
+#~ msgid "Upload a file"
+#~ msgstr "??????????????????"
+
+#~ msgid "Choose the file you want to upload."
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Add Template"
+#~ msgstr "????????????"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "??????ISO??????"
+
+#~ msgid "Local Image File"
+#~ msgstr "??????????????????"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "??????ISO??????"
+
+#~ msgid "Search ISOs"
+#~ msgstr "??????ISO"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "??????ISO????????????"
+
+#~ msgid "OS: "
+#~ msgstr "??????????????? "
+
+#~ msgid "Version: "
+#~ msgstr "????????? "
+
+#~ msgid "Size: "
+#~ msgstr "?????????"
+
+#~ msgid "Search more ISOs"
+#~ msgstr "????????????ISO"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "????????????ISO???????????????"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "????????????ISO??????"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "?????????????????????ISOs ..."
+
+#~ msgid "Arch: "
+#~ msgstr "???????????????"
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "???????????????????????????URL"
+
+#~ msgid "Edit Template"
+#~ msgstr "????????????"
+
+#~ msgid "CDROM"
+#~ msgstr "??????"
+
+#~ msgid "Image File"
+#~ msgstr "????????????"
+
+#~ msgid "Graphics"
+#~ msgstr "??????"
+
+#~ msgid "Disk(GB)"
+#~ msgstr "??????(GB)"
+
+#~ msgid "CPU Number"
+#~ msgstr "CPU??????"
+
+#~ msgid "Manually set CPU topology"
+#~ msgstr "????????????CPU??????"
+
+#~ msgid "Cores"
+#~ msgstr "?????????"
+
+#~ msgid "Threads"
+#~ msgstr "??????"
+
+#~ msgid "No templates found."
+#~ msgstr "??????????????????"
diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100644
index 0000000..53ea2c7
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,1534 @@
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kimchi 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-01 16:40-0300\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr??stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Generated-By: pygettext.py 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, python-format
+msgid "Delete is not allowed for %(resource)s"
+msgstr "??????????????? %(resource)s ????????????"
+
+#, python-format
+msgid "%(resource)s does not implement update method"
+msgstr "%(resource)s ?????????????????????"
+
+#, python-format
+msgid "Create is not allowed for %(resource)s"
+msgstr "??????????????? %(resource)s ????????????"
+
+msgid "Unable to parse JSON request"
+msgstr "???????????? JSON ??????"
+
+msgid "This API only supports JSON"
+msgstr "??? API ????????? JSON"
+
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
+msgid "You don't have permission to perform this operation."
+msgstr ""
+
+msgid "Datastore is not initiated in the model object."
+msgstr "?????????????????????????????????????????????"
+
+#, python-format
+msgid "Unable to start task due error: %(err)s"
+msgstr "??????????????????????????????????????????%(err)s"
+
+#, python-format
+msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
+msgstr "????????? '%(username)s' ??????????????????[????????????%(code)s]"
+
+msgid "You are not authorized to access Kimchi"
+msgstr "???????????????????????? Kimchi"
+
+#, python-format
+msgid "Specify %(item)s to login into Kimchi"
+msgstr "?????? %(item)s ????????? Kimchi"
+
+#, python-format
+msgid "Invalid LDAP configuration: %(item)s : %(value)s"
+msgstr ""
+
+#, python-format
+msgid "Unable to find %(item)s in datastore"
+msgstr "?????????????????????????????? %(item)s"
+
+#, python-format
+msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
+msgstr "???????????? '%(cmd)s' %(seconds)s ???????????????"
+
+#, python-format
+msgid "Invalid data value '%(value)s'"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid data unit '%(unit)s'"
+msgstr "URI %(uri)s ??????"
+
+msgid "ERROR CODE"
+msgstr "?????????"
+
+msgid "REASON"
+msgstr "??????"
+
+msgid "STACK"
+msgstr "??????"
+
+msgid "Go to Homepage"
+msgstr "????????????"
+
+msgid "The username or password you entered is incorrect. Please try again."
+msgstr "????????????????????????????????????????????????????????????"
+
+msgid "This field is required."
+msgstr "????????????????????????"
+
+msgid "Log in"
+msgstr "??????"
+
+msgid "Logging in..."
+msgstr "????????????..."
+
+msgid "Host"
+msgstr "??????"
+
+msgid "Guests"
+msgstr "??????"
+
+msgid "Templates"
+msgstr "??????"
+
+msgid "Storage"
+msgstr "?????????"
+
+msgid "Network"
+msgstr "??????"
+
+msgid "Failed to get application configuration"
+msgstr "??????????????????????????????"
+
+msgid "This is not a valid Linux path"
+msgstr "??????????????? Linux ??????"
+
+msgid "This is not a valid URL."
+msgstr "??????????????? URL???"
+
+msgid "No such data available."
+msgstr "???????????????????????????"
+
+msgid ""
+"Can not contact the host system. Verify the host system is up and that you "
+"have network connectivity to it. HTTP request response %1. "
+msgstr ""
+"????????????????????????????????????????????????????????????????????????????????????????????????????????????HTTP "
+"??????????????? %1???"
+
+msgid "Unable to read file."
+msgstr ""
+
+msgid "Error while uploading file."
+msgstr ""
+
+msgid "Delete Confirmation"
+msgstr "????????????"
+
+msgid "OK"
+msgstr "??????"
+
+msgid "Cancel"
+msgstr "?????? "
+
+msgid "Confirm"
+msgstr "??????"
+
+msgid "Create"
+msgstr "??????"
+
+msgid "Warning"
+msgstr "??????"
+
+msgid "Save"
+msgstr "??????"
+
+msgid "Creating..."
+msgstr ""
+
+msgid "Cloning..."
+msgstr ""
+
+msgid "Loading..."
+msgstr "????????????..."
+
+msgid "An error occurred while retrieving system information."
+msgstr ""
+
+msgid "Retry"
+msgstr "??????"
+
+msgid "Detailed message:"
+msgstr "??????????????????"
+
+msgid "No ISO found"
+msgstr ""
+
+msgid "This is not a valid ISO file."
+msgstr "??????????????? ISO ?????????"
+
+msgid "This may take a long time. Do you want to continue?"
+msgstr "??????????????????????????????????????????"
+
+msgid "This will permanently delete the template. Would you like to continue?"
+msgstr "???????????????????????????????????????????????????"
+
+msgid "Unable to shut down system as there are some virtual machines running!"
+msgstr "??????????????????????????????????????????????????????????????????"
+
+msgid "Max:"
+msgstr "?????????"
+
+msgid "Utilization"
+msgstr "?????????"
+
+msgid "Available"
+msgstr "??????"
+
+msgid "Read Rate"
+msgstr "????????????"
+
+msgid "Write Rate"
+msgstr "????????????"
+
+msgid "Received"
+msgstr "?????????"
+
+msgid "Sent"
+msgstr "?????????"
+
+msgid ""
+"Shutting down or restarting host will cause unsaved work lost. Continue to "
+"shut down/restarting?"
+msgstr "??????????????????????????????????????????????????????????????????????????????/??????????????????"
+
+msgid ""
+"Repository will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr "??????????????????????????????????????????????????????????????????"
+
+msgid "Repositories"
+msgstr "?????????"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Name"
+msgstr "??????"
+
+msgid "Base URL"
+msgstr "?????? URL"
+
+msgid "Is Mirror"
+msgstr "?????????"
+
+msgid "URL Args"
+msgstr "URL ??????"
+
+msgid "Enabled"
+msgstr "?????????"
+
+msgid "GPG Check"
+msgstr "GPG ??????"
+
+msgid "GPG Key"
+msgstr "GPG ??????"
+
+msgid "Add"
+msgstr "??????"
+
+msgid "Edit"
+msgstr "??????"
+
+msgid "Remove"
+msgstr "??????"
+
+msgid "Enable"
+msgstr "??????"
+
+msgid "Disable"
+msgstr "??????"
+
+msgid "Software Updates"
+msgstr "????????????"
+
+msgid "Package Name"
+msgstr "????????????"
+
+msgid "Version"
+msgstr "??????"
+
+msgid "Architecture"
+msgstr "??????"
+
+msgid "Repository"
+msgstr "?????????"
+
+msgid "Update All"
+msgstr "????????????"
+
+msgid "Updating..."
+msgstr "????????????..."
+
+msgid "Failed to retrieve packages update information."
+msgstr ""
+
+msgid "Failed to update package(s)."
+msgstr "?????????????????????"
+
+msgid ""
+"Debug report will be removed permanently and can't be recovered. Do you want "
+"to continue?"
+msgstr "?????????????????????????????????????????????????????????????????????"
+
+msgid "Debug Reports"
+msgstr "????????????"
+
+msgid "Generated Time"
+msgstr "????????????"
+
+msgid "Generate"
+msgstr "??????"
+
+msgid "Generating..."
+msgstr "????????????..."
+
+msgid "Rename"
+msgstr "????????????"
+
+msgid "Download"
+msgstr "??????"
+
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr "?????????????????????????????????????????????/???????????? ('-')???"
+
+msgid "Pending..."
+msgstr "????????????..."
+
+msgid "Report name is the same as the original one."
+msgstr ""
+
+msgid ""
+"This will delete the virtual machine and its virtual disks. This operation "
+"cannot be undone. Would you like to continue?"
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Power off Confirmation"
+msgstr "????????????"
+
+msgid ""
+"This action may produce undesirable results, for example unflushed disk "
+"cache in the guest. Would you like to continue?"
+msgstr ""
+
+msgid "Reset Confirmation"
+msgstr "????????????"
+
+msgid ""
+"There is a risk of data loss caused by reset without the guest OS shutdown. "
+"Would you like to continue?"
+msgstr ""
+
+msgid "Shut Down Confirmation"
+msgstr "????????????"
+
+msgid "Note the guest OS may ignore this request. Would you like to continue?"
+msgstr "???????????????????????????????????????????????????"
+
+msgid "Virtual Machine delete Confirmation"
+msgstr ""
+
+msgid ""
+"This virtual machine is not persistent. Power Off will delete it. Continue?"
+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????????????????????????????????????????????????????????? CDROM ??????"
+
+msgid "Attach"
+msgstr "??????"
+
+msgid "Attaching..."
+msgstr "????????????..."
+
+msgid "Replace"
+msgstr "??????"
+
+msgid "Replacing..."
+msgstr "????????????..."
+
+msgid "Successfully attached!"
+msgstr "??????????????????"
+
+msgid "Successfully replaced!"
+msgstr "??????????????????"
+
+msgid "Successfully detached!"
+msgstr "??????????????????"
+
+msgid ""
+"This disk will be detached permanently and you can re-attach it. Continue to "
+"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 ?????????"
+
+msgid "unavailable"
+msgstr "????????????"
+
+msgid ""
+"This action will interrupt network connectivity for any virtual machine that "
+"depend on this network."
+msgstr "????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "Create a network"
+msgstr "????????????"
+
+msgid ""
+"This network is not persistent. Instead of stop, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"??????"
+
+msgid ""
+"The bridged VLAN tag may not work well with NetworkManager enabled. You "
+"should consider disabling it."
+msgstr ""
+
+msgid ""
+"This will permanently delete the storage pool. Would you like to continue?"
+msgstr "??????????????????????????????????????????????????????"
+
+msgid "This storage pool is empty."
+msgstr "????????????????????????"
+
+msgid ""
+"It will format your disk and you will loose any data in there, are you sure "
+"to continue? "
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????"
+
+msgid "SCSI Fibre Channel"
+msgstr "SCSI ????????????"
+
+msgid "No SCSI adapters found."
+msgstr "????????? SCSI ????????????"
+
+msgid "Loading iSCSI targets..."
+msgstr ""
+
+msgid "No iSCSI found. Please input one."
+msgstr ""
+
+msgid "Failed to load iSCSI targets."
+msgstr ""
+
+msgid "The storage pool name can not be blank."
+msgstr "??????????????????????????????"
+
+msgid "The storage pool path can not be blank."
+msgstr "??????????????????????????????"
+
+msgid "NFS server mount path can not be blank."
+msgstr "NFS ????????????????????????????????????"
+
+msgid "Invalid NFS mount path."
+msgstr "NFS ?????????????????????"
+
+msgid "No logical device selected."
+msgstr "????????????????????????"
+
+msgid "The iSCSI target can not be blank."
+msgstr "iSCSI ?????????????????????"
+
+msgid "Server name can not be blank."
+msgstr "??????????????????????????????"
+
+msgid "This is not a valid Server Name or IP. Please, modify it."
+msgstr ""
+
+msgid "Looking for available partitions ..."
+msgstr "?????????????????????????????? ..."
+
+msgid "No available partitions found."
+msgstr "??????????????????????????????"
+
+msgid ""
+"This storage pool is not persistent. Instead of deactivate, this action will "
+"permanently delete it. Would you like to continue?"
+msgstr ""
+"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"??????"
+
+msgid "Unable to retrieve partitions information."
+msgstr "?????????????????????????????????????????????'%(err)s'"
+
+msgid "In progress..."
+msgstr ""
+
+msgid "Failed!"
+msgstr ""
+
+msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
+msgstr ""
+
+msgid "Disk pool or volume cannot be blank."
+msgstr "??????????????????????????????"
+
+msgid "Session timeout, please re-login."
+msgstr ""
+
+msgid "User Name"
+msgstr "???????????????"
+
+msgid "Password"
+msgstr "??????"
+
+msgid "Peers"
+msgstr ""
+
+#, fuzzy
+msgid "Searching"
+msgstr "??????"
+
+#, fuzzy
+msgid "No peers found."
+msgstr "??????????????????"
+
+msgid "Help"
+msgstr "??????"
+
+msgid "About"
+msgstr "??????"
+
+msgid "Log out"
+msgstr "??????"
+
+msgid "Version:"
+msgstr "?????????"
+
+#~ msgid "Error while getting block devices. Details: %(err)s"
+#~ msgstr "???????????????????????????????????????????????????%(err)s"
+
+#~ msgid "Error while getting block device information for %(device)s."
+#~ msgstr "?????? %(device)s ???????????????????????????????????????"
+
+#~ msgid "Unable to find distro file: %(filename)s"
+#~ msgstr "????????? distro ?????????%(filename)s"
+
+#~ msgid ""
+#~ "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
+#~ msgstr "???????????? distro ?????????%(filename)s?????????????????? JSON ?????????"
+
+#~ msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
+#~ msgstr "???????????? iSCSI ???????????? %(portal)s??????????????????%(err)s"
+
+#~ msgid "Unable to login to iSCSI host %(host)s target %(target)s"
+#~ msgstr "???????????? iSCSI ?????? %(host)s ?????? %(target)s"
+
+#~ msgid "The ISO file %(filename)s is not bootable"
+#~ msgstr "ISO ?????? %(filename)s ????????????"
+
+#~ msgid ""
+#~ "The ISO file %(filename)s does not have a valid El Torito boot record"
+#~ msgstr "ISO ?????? %(filename)s ??????????????? El Torito ????????????"
+
+#~ msgid "Invalid El Torito validation entry in ISO %(filename)s"
+#~ msgstr "ISO %(filename)s ??????????????? El Torito ????????????"
+
+#~ msgid "Invalid El Torito boot indicator in ISO %(filename)s"
+#~ msgstr "ISO %(filename)s ??????????????? El Torito ???????????????"
+
+#~ msgid "Unexpected volume type for primary volume in ISO %(filename)s"
+#~ msgstr "ISO %(filename)s ?????????????????????????????????????????????"
+
+#~ msgid "Bad format while reading volume descriptor in ISO %(filename)s"
+#~ msgstr "?????? ISO %(filename)s ?????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "The hypervisor doesn't have permission to use this ISO %(filename)s. "
+#~ "Consider moving it under /var/lib/libvirt,  or set the search permission "
+#~ "to file access control lists for '%(user)s' user if possible, or add the "
+#~ "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
+#~ "'path_to_iso'.Details: %(err)s"
+#~ msgstr ""
+#~ "Hypervisor ??????????????? ISO %(filename)s ??????????????????????????????????????? /var/"
+#~ "lib/libvirt ??????????????????????????????'%(user)s' ?????????????????????????????????????????????"
+#~ "??????????????? '%(user)s' ????????? ISO ?????????????????????????????????????????????????????? "
+#~ "'chmod -R o+x 'path_to_iso'??????????????????%(err)s"
+
+#~ msgid "Virtual machine %(name)s already exists"
+#~ msgstr "???????????? %(name)s ?????????"
+
+#~ msgid "Virtual machine %(name)s does not exist"
+#~ msgstr "???????????? %(name)s ?????????"
+
+#~ msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
+#~ msgstr "????????????????????????????????? %(name)s ?????????"
+
+#~ msgid "Remote ISO image is not supported by this server."
+#~ msgstr "??????????????????????????? ISO ????????????"
+
+#~ msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Graphics address to listen on must be IPv4 or IPv6"
+#~ msgstr "???????????????????????????????????? IPv4 ??? IPv6"
+
+#~ msgid "Specify a template to create a virtual machine from"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "User name must be a string"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Group name must be a string"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "User(s) '%(users)s' do not exist"
+#~ msgstr "????????? '%(users)s' ????????????"
+
+#~ msgid "Group(s) '%(groups)s' do not exist"
+#~ msgstr "????????? '%(groups)s' ????????????"
+
+#~ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to get access metadata of virtual machine %(name)s. Details: %(err)"
+#~ "s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
+#~ msgstr "?????? %(iface)s ???????????????????????? %(name)s ???"
+
+#~ msgid ""
+#~ "Network %(network)s specified for virtual machine %(name)s does not exist"
+#~ msgstr "??????????????? %(name)s ??????????????? %(network)s ?????????"
+
+#~ msgid "Supported virtual machine interfaces type is only network"
+#~ msgstr "???????????????????????????????????????????????????"
+
+#~ msgid "Network name for virtual machine interface must be a string"
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "Invalid network model card specified for virtual machine interface"
+#~ msgstr "???????????????????????????????????????????????????"
+
+#~ msgid "Specify type and network to add a new virtual machine interface"
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "Template %(name)s already exists"
+#~ msgstr "?????? %(name)s ?????????"
+
+#~ msgid ""
+#~ "Network '%(network)s' specified for template %(template)s does not exist"
+#~ msgstr "????????? %(template)s ??????????????? '%(network)s' ?????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s does not exist"
+#~ msgstr "????????? %(template)s ?????????????????? '%(pool)s' ?????????"
+
+#~ msgid ""
+#~ "Storage pool %(pool)s specified for template %(template)s is not active"
+#~ msgstr "????????? %(template)s ?????????????????? '%(pool)s' ????????????????????????"
+
+#~ msgid "Invalid parameter '%(param)s' specified for CDROM."
+#~ msgstr "??? CDROM ??????????????? '%(param)s' ?????????"
+
+#~ msgid ""
+#~ "Network %(network)s specified for template %(template)s is not active"
+#~ msgstr "????????? %(template)s ??????????????? %(network)s ????????????????????????"
+
+#~ msgid "Template name must be a string"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Template icon must be a path to the image"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Template distribution must be a string"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Template distribution version must be a string"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "The number of CPUs must be an integer greater than 0"
+#~ msgstr "CPU ?????????????????????"
+
+#~ msgid "Amount of memory (MB) must be an integer greater than 512"
+#~ msgstr "??????????????? (MB) ??????????????? 512 ?????????"
+
+#~ msgid "Template CDROM must be a local or remote ISO file"
+#~ msgstr "?????? CDROM ???????????????????????? ISO ??????"
+
+#~ msgid "Invalid storage pool URI %(value)s specified for template"
+#~ msgstr "??????????????????????????? URI %(value)s ??????"
+
+#~ msgid "Specify an ISO image as CDROM or a base image to create a template"
+#~ msgstr "?????? ISO ??????????????? CDROM ???????????????"
+
+#~ msgid "All networks for the template must be specified in a list."
+#~ msgstr "???????????????????????????????????????????????????"
+
+#~ msgid "Unable to create template due error: %(err)s"
+#~ msgstr "??????????????????????????????????????????%(err)s"
+
+#~ msgid "Unable to delete template due error: %(err)s"
+#~ msgstr "??????????????????????????????????????????%(err)s"
+
+#~ msgid "Template base image must be a valid local image file"
+#~ msgstr "?????? CDROM ???????????????????????? ISO ??????"
+
+#~ msgid "Storage pool %(name)s already exists"
+#~ msgstr "????????? %(name)s ?????????"
+
+#~ msgid "Storage pool %(name)s does not exist"
+#~ msgstr "????????? %(name)s ?????????"
+
+#~ msgid "Specify %(item)s in order to create the storage pool %(name)s"
+#~ msgstr "?????? %(item)s ?????????????????? %(name)s"
+
+#~ msgid "Unable to delete active storage pool %(name)s"
+#~ msgstr "????????????????????????????????? %(name)s"
+
+#~ msgid "Unable to list storage pools. Details: %(err)s"
+#~ msgstr "???????????????????????????????????????%(err)s"
+
+#~ msgid "Unable to create storage pool %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to get number of storage volumes in storage pool %(name)s. "
+#~ "Details: %(err)s"
+#~ msgstr "????????????????????? %(name)s ??????????????????????????????????????????%(err)s"
+
+#~ msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
+#~ msgstr "??????????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
+#~ msgstr "????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to create NFS Pool as export path %(path)s may block during mount"
+#~ msgstr "???????????? NFS ???????????????????????????????????????????????? %(path)s ???????????????"
+
+#~ msgid "Unable to create NFS Pool as export path %(path)s mount failed"
+#~ msgstr "???????????? NFS ?????????????????????????????? %(path)s ????????????"
+
+#~ msgid "Unsupported storage pool type: %(type)s"
+#~ msgstr "?????????????????????????????????%(type)s"
+
+#~ msgid "Storage pool path must be a string"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Storage pool host must be a IP or hostname"
+#~ msgstr "???????????????????????? IP ???????????????"
+
+#~ msgid "Storage pool devices parameter must be a list"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Target IQN of an iSCSI pool must be a string"
+#~ msgstr "iSCSI ?????????????????? IQN ???????????????"
+
+#~ msgid ""
+#~ "Port of a remote storage server must be an integer between 1 and 65535"
+#~ msgstr "????????????????????????????????????????????? 1 ??? 65535 ???????????????"
+
+#~ msgid "Specify name and type to create a storage pool"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid ""
+#~ "%(disk)s is not a valid disk/partition. Could not add it to the pool %"
+#~ "(pool)s."
+#~ msgstr "%(disk)s ?????????????????????/??????????????????????????????????????????%(pool)s???"
+
+#~ msgid "The parameter disks only can be updated for logical storage pool."
+#~ msgstr "????????????????????????????????????????????????????????????"
+
+#~ msgid "The SCSI host adapter name must be a string."
+#~ msgstr "SCSI ???????????????????????????????????????"
+
+#~ msgid "The storage pool kimchi_isos is reserved for internal use"
+#~ msgstr "????????? kimchi_isos ?????????????????????"
+
+#~ msgid ""
+#~ "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr "???????????? NFS ????????? %(name)s???NFS ????????? %(server)s???????????????"
+
+#~ msgid ""
+#~ "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
+#~ "unreachable."
+#~ msgstr "?????????????????? NFS ????????? %(name)s???NFS ????????? %(server)s???????????????"
+
+#~ msgid ""
+#~ "Unable to deactivate pool %(name)s as it is associated with some templates"
+#~ msgstr "??????????????????????????? %(name)s????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to delete pool %(name)s as it is associated with some templates"
+#~ msgstr "????????????????????? %(name)s????????????????????????????????????"
+
+#~ msgid ""
+#~ "A volume group named '%(name)s' already exists. Please, choose another "
+#~ "name to create the logical pool."
+#~ msgstr ""
+#~ "?????? '%(name)s' ??????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to update database with deep scan information due error: %(err)s"
+#~ msgstr "????????????????????????????????????????????????????????????????????????%(err)s"
+
+#~ msgid "Storage volume %(name)s already exists"
+#~ msgstr "???????????? %(name)s ?????????"
+
+#~ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
+#~ msgstr "???????????? %(name)s ????????????????????? %(pool)s ???"
+
+#~ msgid "Specify %(item)s in order to create storage volume %(volume)s"
+#~ msgstr "?????? %(item)s ????????????????????? %(volume)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes because storage pool %(pool)s is not active"
+#~ msgstr "?????????????????????????????????????????? %(pool)s ????????????????????????"
+
+#~ msgid ""
+#~ "Unable to create storage volume %(name)s in storage pool %(pool)s. "
+#~ "Details: %(err)s"
+#~ msgstr "?????????????????? %(pool)s ????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid ""
+#~ "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
+#~ msgstr "????????????????????? %(pool)s ????????????????????????????????????%(err)s"
+
+#~ msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s ???????????????????????????%(err)s"
+
+#~ msgid "Storage type %(type)s does not support volume create and delete"
+#~ msgstr "??????????????? %(type)s ??????????????????????????????"
+
+#~ msgid "Storage volume name must be a string"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Storage volume allocation must be an integer number"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "Storage volume requires a volume name"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid ""
+#~ "Unable to update database with storage volume information due error: %"
+#~ "(err)s"
+#~ msgstr "????????????????????????????????????????????????????????????????????????%(err)s"
+
+#~ msgid "Interface %(name)s does not exist"
+#~ msgstr "?????? %(name)s ?????????"
+
+#~ msgid "Network %(name)s already exists"
+#~ msgstr "?????? %(name)s ?????????"
+
+#~ msgid "Network %(name)s does not exist"
+#~ msgstr "?????? %(name)s ?????????"
+
+#~ msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
+#~ msgstr "????????? %(network)s ?????????????????? %(subnet)s ?????????"
+
+#~ msgid "Specify a network interface to create bridged network %(name)s"
+#~ msgstr "?????????????????????????????????????????? %(name)s"
+
+#~ msgid "Unable to delete active network %(name)s"
+#~ msgstr "?????????????????????????????? %(name)s"
+
+#~ msgid ""
+#~ "Interface %(iface)s specified for network %(network)s is already in use"
+#~ msgstr "????????? %(network)s ??????????????? %(iface)s ???????????????"
+
+#~ msgid "Interface should be bare NIC, bonding or bridge device."
+#~ msgstr "????????????????????? NIC????????????????????????????????????"
+
+#~ msgid "Unable to create network %(name)s. Details: %(err)s"
+#~ msgstr "?????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid "Unable to find a free IP address for network '%(name)s'"
+#~ msgstr "??????????????? '%(name)s' ????????? IP ??????"
+
+#~ msgid "Supported network types are isolated, NAT and bridge"
+#~ msgstr "???????????????????????????????????????NAT ????????????"
+
+#~ msgid ""
+#~ "Network subnet must be a string with IP address and prefix or netmask"
+#~ msgstr "????????????????????????????????? IP ???????????????????????????????????????"
+
+#~ msgid "Network interface must be a string"
+#~ msgstr "???????????????????????????"
+
+#~ msgid "Network VLAN ID must be an integer between 1 and 4094"
+#~ msgstr "?????? VLAN ID ??????????????? 1 ??? 4094 ???????????????"
+
+#~ msgid "Specify name and type to create a Network"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
+#~ msgstr "??????????????? %(name)s ????????? VLAN ??????????????????"
+
+#~ msgid "Failed to activate interface %(iface)s: %(err)s."
+#~ msgstr "?????????????????? %(iface)s???%(err)s???"
+
+#~ msgid ""
+#~ "Failed to activate interface %(iface)s. Please check the physical link "
+#~ "status."
+#~ msgstr "?????????????????? %(iface)s?????????????????????????????????"
+
+#~ msgid "Debug report %(name)s does not exist"
+#~ msgstr "???????????? %(name)s ?????????"
+
+#~ msgid "Debug report tool not found in system"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Unable to create debug report %(name)s. Details: %(err)s."
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s???"
+
+#~ msgid "Unable to generate debug report %(name)s. Details: %(err)s"
+#~ msgstr "???????????????????????? %(name)s??????????????????%(err)s"
+
+#~ msgid ""
+#~ "The debug report with specified name \"%(name)s\" already exists. Please "
+#~ "use another one."
+#~ msgstr ""
+#~ "?????? '%(name)s' ??????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Storage server %(server)s was not used by Kimchi"
+#~ msgstr "Kimchi ??????????????????????????? %(server)s"
+
+#~ msgid "Distro '%(name)s' does not exist"
+#~ msgstr "Distro '%(name)s' ?????????"
+
+#~ msgid "Partition %(name)s does not exist in the host"
+#~ msgstr "????????? %(name)s ?????????????????????"
+
+#~ msgid ""
+#~ "Unable to shutdown host machine as there are running virtual machines"
+#~ msgstr "???????????????????????????????????????????????????????????????"
+
+#~ msgid "Unable to reboot host machine as there are running virtual machines"
+#~ msgstr "????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Node device '%(name)s' not found"
+#~ msgstr "????????????????????? '%(name)s'"
+
+#~ msgid "No packages marked for update"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "Package %(name)s is not marked to be updated."
+#~ msgstr "?????? %(name)s ??????????????????????????????"
+
+#~ msgid "Error while getting packages marked to be updated. Details: %(err)s"
+#~ msgstr "????????????????????????????????????????????????????????????????????????%(err)s"
+
+#~ msgid "There is no compatible package manager for this system."
+#~ msgstr "?????????????????????????????????????????????"
+
+#~ msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
+#~ msgstr "?????????????????????????????????????????????'cdrom'"
+
+#~ msgid "Error while creating new storage device: %(error)s"
+#~ msgstr "??????????????????????????????????????????%(error)s"
+
+#~ msgid "Error while updating storage device: %(error)s"
+#~ msgstr "????????????????????????????????????%(error)s"
+
+#~ msgid "Error while removing storage device: %(error)s"
+#~ msgstr "????????????????????????????????????%(error)s"
+
+#~ msgid ""
+#~ "Specify type and path or type and pool/volume to add a new virtual "
+#~ "machine disk"
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "Specify path to update virtual machine disk"
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid ""
+#~ "Only one of path or pool/volume can be specified to add a new virtual "
+#~ "machine disk"
+#~ msgstr "????????????????????????????????????????????????"
+
+#~ msgid "YUM Repository ID must be one word only string."
+#~ msgstr "YUM ????????? ID ???????????????????????????????????????"
+
+#~ msgid "Repository URL must be an http://, ftp:// or file:// URL."
+#~ msgstr "????????? URL ????????? http://???ftp:// ??? file:// URL???"
+
+#~ msgid ""
+#~ "Repository configuration is a dictionary with specific values according "
+#~ "to repository type."
+#~ msgstr "??????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Distribution to DEB repository must be a string"
+#~ msgstr "DEB ???????????????????????????????????????"
+
+#~ msgid "Components to DEB repository must be listed in a array"
+#~ msgstr "DEB ????????????????????????????????????????????????"
+
+#~ msgid "Components to DEB repository must be a string"
+#~ msgstr "DEB ?????????????????????????????????"
+
+#~ msgid "YUM Repository name must be string."
+#~ msgstr "YUM ?????????????????????????????????"
+
+#~ msgid "GPG check must be a boolean value."
+#~ msgstr "GPG ???????????????????????????"
+
+#~ msgid "GPG key must be a URL pointing to the ASCII-armored file."
+#~ msgstr "GPG ????????????????????? ASCII ??????????????? URL???"
+
+#~ msgid "Could not update repository %(repo_id)s."
+#~ msgstr "????????????????????? %(repo_id)s???"
+
+#~ msgid "Repository %(repo_id)s does not exist."
+#~ msgstr "????????? %(repo_id)s ????????????"
+
+#~ msgid "Repository management tool was not recognized for your system."
+#~ msgstr "?????????????????????????????????????????????"
+
+#~ msgid "Repository %(repo_id)s is already enabled."
+#~ msgstr "?????????????????? %(repo_id)s???"
+
+#~ msgid "Repository %(repo_id)s is already disabled."
+#~ msgstr "?????????????????? %(repo_id)s???"
+
+#~ msgid "Could not remove repository %(repo_id)s."
+#~ msgstr "????????????????????? %(repo_id)s???"
+
+#~ msgid "Could not write repository configuration file %(repo_file)s"
+#~ msgstr "?????????????????????????????? %(repo_file)s"
+
+#~ msgid "Specify repository distribution in order to create a DEB repository."
+#~ msgstr "???????????????????????????????????? DEB ????????????"
+
+#~ msgid "Could not enable repository %(repo_id)s."
+#~ msgstr "????????????????????? %(repo_id)s???"
+
+#~ msgid "Could not disable repository %(repo_id)s."
+#~ msgstr "????????????????????? %(repo_id)s???"
+
+#~ msgid "YUM Repository ID already exists"
+#~ msgstr "YUM ????????? ID ?????????"
+
+#~ msgid "YUM Repository name must be a string"
+#~ msgstr "YUM ??????????????????????????????"
+
+#~ msgid "Unable to list repositories. Details: '%(err)s'"
+#~ msgstr "???????????????????????????????????????'%(err)s'"
+
+#~ msgid "Unable to retrieve repository information. Details: '%(err)s'"
+#~ msgstr "?????????????????????????????????????????????'%(err)s'"
+
+#~ msgid "Unable to add repository. Details: '%(err)s'"
+#~ msgstr "???????????????????????????????????????'%(err)s'"
+
+#~ msgid "Unable to remove repository. Details: '%(err)s'"
+#~ msgstr "???????????????????????????????????????'%(err)s'"
+
+#~ msgid "Create a New Virtual Machine"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Virtual Machine Name"
+#~ msgstr "??????????????????"
+
+#~ msgid ""
+#~ "The name used to identify the virtual machine. If omitted, a name will be "
+#~ "chosen based on the template used."
+#~ msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "Template"
+#~ msgstr "??????"
+
+#~ msgid "Please create a template first."
+#~ msgstr "?????????????????????"
+
+#~ msgid "Create a Template"
+#~ msgstr "????????????"
+
+#~ msgid "Please choose a template."
+#~ msgstr "??????????????????"
+
+#~ msgid "OS"
+#~ msgstr "OS"
+
+#~ msgid "OS Version"
+#~ msgstr "OS ??????"
+
+#~ msgid "CPUS"
+#~ msgstr "CPUS"
+
+#~ msgid "Memory"
+#~ msgstr "?????????"
+
+#~ msgid "Edit Guest"
+#~ msgstr "????????????"
+
+#~ msgid "General"
+#~ msgstr "??????"
+
+#~ msgid "Interface"
+#~ msgstr "??????"
+
+#~ msgid "Permission"
+#~ msgstr "??????"
+
+#~ msgid "CPUs"
+#~ msgstr "CPU"
+
+#~ msgid "Memory (MB)"
+#~ msgstr "?????????"
+
+#~ msgid "Icon"
+#~ msgstr "??????"
+
+#~ msgid "Device"
+#~ msgstr "????????????"
+
+#~ msgid "Path"
+#~ msgstr "NFS ??????"
+
+#~ msgid "Type"
+#~ msgstr "??????"
+
+#~ msgid "All"
+#~ msgstr "??????"
+
+#~ msgid "Vendor"
+#~ msgstr "?????????"
+
+#~ msgid "Detach"
+#~ msgstr "??????"
+
+#~ msgid "Start"
+#~ msgstr "??????"
+
+#~ msgid "Reset"
+#~ msgstr "??????"
+
+#~ msgid "Actions"
+#~ msgstr "??????"
+
+#~ msgid "Connect"
+#~ msgstr "??????"
+
+#~ msgid "Shut Down"
+#~ msgstr "??????"
+
+#~ msgid "Delete"
+#~ msgstr "??????"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Disk I/O"
+#~ msgstr "?????? I/O"
+
+#~ msgid "Network I/O"
+#~ msgstr "?????? I/O"
+
+#~ msgid "Livetile"
+#~ msgstr "Livetile"
+
+#~ msgid "Add a Storage Device to VM"
+#~ msgstr "???????????????????????? VM"
+
+#~ msgid "Device Type"
+#~ msgstr "????????????"
+
+#~ msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
+#~ msgstr "?????????????????????????????? \"cdrom\"???"
+
+#~ msgid "Storage Pool"
+#~ msgstr "?????????"
+
+#~ msgid "Storage pool which volume located in"
+#~ msgstr "??????????????????????????????"
+
+#~ msgid "Storage Volume"
+#~ msgstr "???????????????"
+
+#~ msgid "Storage volume to be attached"
+#~ msgstr "?????????????????????????????????"
+
+#~ msgid "File Path"
+#~ msgstr "????????????"
+
+#~ msgid "The ISO file path in the server for CDROM."
+#~ msgstr "CDROM ??? ISO ??????????????????????????????"
+
+#~ msgid "Shut down"
+#~ msgstr "??????"
+
+#~ msgid "Restart"
+#~ msgstr "????????????"
+
+#~ msgid "Basic Information"
+#~ msgstr "????????????"
+
+#~ msgid "OS Distro"
+#~ msgstr "OS Distro"
+
+#~ msgid "OS Code Name"
+#~ msgstr "OS ???????????????"
+
+#~ msgid "Processor"
+#~ msgstr "?????????"
+
+#~ msgid "System Statistics"
+#~ msgstr "??????????????????"
+
+#~ msgid "Update Progress"
+#~ msgstr "????????????"
+
+#~ msgid "Network Name"
+#~ msgstr "????????????"
+
+#~ msgid "State"
+#~ msgstr "??????"
+
+#~ msgid "Network Type"
+#~ msgstr "????????????"
+
+#~ msgid "Address Space"
+#~ msgstr "????????????"
+
+#~ msgid "Name should not contain '/' and '\"'."
+#~ msgstr "?????????????????????????????????????????? '/'???"
+
+#~ msgid "Isolated: no external network connection"
+#~ msgstr "????????????????????????????????????"
+
+#~ msgid "NAT: outbound physical network connection only"
+#~ msgstr "NAT?????????????????????????????????"
+
+#~ msgid "Bridged: Virtual machines are connected to physical network directly"
+#~ msgstr "??????????????????????????????????????????????????????"
+
+#~ msgid "Destination"
+#~ msgstr "????????????"
+
+#~ msgid "Enable VLAN"
+#~ msgstr "?????? VLAN???"
+
+#~ msgid "VLAN ID"
+#~ msgstr "VLAN ID???"
+
+#~ msgid "Stop"
+#~ msgstr "??????"
+
+#~ msgid "Generate a New Debug Report"
+#~ msgstr "????????????????????????"
+
+#~ msgid "Report Name"
+#~ msgstr "????????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. If omitted, a name will be chosen "
+#~ "based on current time. Name can contain: letters, digits, underscore (\"_"
+#~ "\") and hyphen (\"-\")."
+#~ msgstr ""
+#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????? (\"-\")???"
+
+#~ msgid "Rename a Debug Report"
+#~ msgstr "????????????????????????"
+
+#~ msgid ""
+#~ "The name used to identify the report. Name can contain: letters, digits "
+#~ "and hyphen (\"-\")."
+#~ msgstr ""
+#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+#~ "???????????????????????? (\"-\")???"
+
+#~ msgid "Add a Repository"
+#~ msgstr "???????????????"
+
+#~ msgid "Identifier"
+#~ msgstr "ID"
+
+#~ msgid "Single word, unique identifier for the repository."
+#~ msgstr "??????????????????????????? ID???"
+
+#~ msgid "Textual name for the repository."
+#~ msgstr "???????????????????????????"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Required Field"
+#~ msgstr "????????????"
+
+#~ msgid "URL to the repository. Supported protocols are http, ftp, and file."
+#~ msgstr "???????????? URL????????????????????????????????? http???ftp ??? file???"
+
+#~ msgid "Repository is a mirror"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Distribution"
+#~ msgstr "????????????"
+
+#~ msgid "Distribution of the DEB repository."
+#~ msgstr "DEB ???????????????????????????"
+
+#~ msgid "Components"
+#~ msgstr "??????"
+
+#~ msgid "List of components in DEB repository."
+#~ msgstr "DEB ??????????????????????????????"
+
+#~ msgid "Edit Repository"
+#~ msgstr "???????????????"
+
+#~ msgid "Mirror List URL"
+#~ msgstr "???????????? URL"
+
+#~ msgid "Yes"
+#~ msgstr "???"
+
+#~ msgid "No"
+#~ msgstr "???"
+
+#~ msgid "Capacity"
+#~ msgstr "??????"
+
+#~ msgid "Allocated"
+#~ msgstr "?????????"
+
+#~ msgid "Location"
+#~ msgstr "??????"
+
+#~ msgid "Device path"
+#~ msgstr "????????????"
+
+#~ msgid "active"
+#~ msgstr "?????????"
+
+#~ msgid "inactive"
+#~ msgstr "????????????"
+
+#~ msgid "Deactivate"
+#~ msgstr "????????????"
+
+#~ msgid "Activate"
+#~ msgstr "??????"
+
+#~ msgid "Undefine"
+#~ msgstr "????????????"
+
+#~ msgid "Format"
+#~ msgstr "?????????"
+
+#~ msgid "Allocation"
+#~ msgstr "?????????"
+
+#~ msgid "Define a New Storage Pool"
+#~ msgstr "?????????????????????"
+
+#~ msgid "Storage Pool Name"
+#~ msgstr "???????????????"
+
+#~ msgid ""
+#~ "The name used to identify the storage pools, and it should not be empty."
+#~ msgstr "??????????????????????????????????????????????????????"
+
+#~ msgid "Storage Pool Type"
+#~ msgstr "???????????????"
+
+#~ msgid "Storage Path"
+#~ msgstr "???????????????"
+
+#~ msgid ""
+#~ "The path of the Storage Pool. Each Storage Pool must have a unique path."
+#~ msgstr "???????????????????????????????????????????????????????????????????????????"
+
+#~ msgid ""
+#~ "Kimchi will try to create the directory when it does not already exist in "
+#~ "your system."
+#~ msgstr "Kimchi ????????????????????????????????????????????????????????????????????????"
+
+#~ msgid "NFS Server IP"
+#~ msgstr "NFS ????????? IP"
+
+#~ msgid "NFS server IP or hostname. It can be input or chosen from history."
+#~ msgstr "NFS ????????? IP ?????????????????????????????????????????????????????????????????????"
+
+#~ msgid "NFS Path"
+#~ msgstr "NFS ??????"
+
+#~ msgid "The NFS exported path on NFS server."
+#~ msgstr "NFS ???????????? NFS ??????????????????"
+
+#~ msgid "iSCSI Server"
+#~ msgstr "iSCSI ?????????"
+
+#~ msgid "Server"
+#~ msgstr "?????????"
+
+#~ msgid "Port"
+#~ msgstr "???"
+
+#~ msgid "iSCSI server IP or hostname. It should not be empty."
+#~ msgstr "iSCSI ????????? IP ??????????????????????????????????????????"
+
+#~ msgid "Target"
+#~ msgstr "??????"
+
+#~ msgid "The iSCSI target on iSCSI server"
+#~ msgstr "iSCSI ??????????????? iSCSI ??????"
+
+#~ msgid "Add iSCSI Authentication"
+#~ msgstr "?????? iSCSI ??????"
+
+#~ msgid "iSCSI Authentication"
+#~ msgstr "iSCSI ??????"
+
+#~ msgid "SCSI Adapter"
+#~ msgstr "SCSI ?????????"
+
+#~ msgid "Please, wait..."
+#~ msgstr "?????????..."
+
+#~ msgid "Add Template"
+#~ msgstr "????????????"
+
+#~ msgid "Where is the source media for this template? "
+#~ msgstr "???????????????????????????????????????"
+
+#~ msgid "Local ISO Image"
+#~ msgstr "?????? ISO ?????????"
+
+#~ msgid "Remote ISO Image"
+#~ msgstr "?????? ISO ?????????"
+
+#~ msgid "Search ISOs"
+#~ msgstr "?????? ISO"
+
+#~ msgid "The following ISOs are available:"
+#~ msgstr "?????? ISO ?????????"
+
+#~ msgid "OS: "
+#~ msgstr "OS???"
+
+#~ msgid "Version: "
+#~ msgstr "?????????"
+
+#~ msgid "Size: "
+#~ msgstr "?????????"
+
+#~ msgid "Search more ISOs"
+#~ msgstr "???????????? ISO"
+
+#~ msgid "Create Templates from Selected ISO"
+#~ msgstr "????????? ISO ????????????"
+
+#~ msgid "I want to use a specific ISO file"
+#~ msgstr "????????????????????? ISO ??????"
+
+#~ msgid "Loading default remote ISOs ..."
+#~ msgstr "???????????????????????? ISO ..."
+
+#~ msgid "Arch: "
+#~ msgstr "?????????"
+
+#~ msgid "I want to use a custom URL"
+#~ msgstr "?????????????????? URL"
+
+#~ msgid "Edit Template"
+#~ msgstr "????????????"
+
+#~ msgid "CDROM"
+#~ msgstr "CDROM"
+
+#~ msgid "Graphics"
+#~ msgstr "?????????"
+
+#~ msgid "CPU Number"
+#~ msgstr "CPU ??????"
+
+#~ msgid "No templates found."
+#~ msgstr "??????????????????"
diff --git a/src/wok/i18n.py b/src/wok/i18n.py
index d2ffa34..649283b 100644
--- a/src/wok/i18n.py
+++ b/src/wok/i18n.py
@@ -23,7 +23,6 @@ _ = gettext.gettext
 
 
 messages = {
-    "KCHAPI0001E": _("Unknown parameter %(value)s"),
     "KCHAPI0002E": _("Delete is not allowed for %(resource)s"),
     "KCHAPI0003E": _("%(resource)s does not implement update method"),
     "KCHAPI0005E": _("Create is not allowed for %(resource)s"),
@@ -34,321 +33,15 @@ messages = {
 
     "KCHASYNC0001E": _("Datastore is not initiated in the model object."),
     "KCHASYNC0002E": _("Unable to start task due error: %(err)s"),
-    "KCHASYNC0003E": _("Timeout of %(seconds)s seconds expired while running task '%(task)s."),
 
     "KCHAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"),
     "KCHAUTH0002E": _("You are not authorized to access Kimchi"),
     "KCHAUTH0003E": _("Specify %(item)s to login into Kimchi"),
-    "KCHAUTH0004E": _("User %(user_id)s not found with given LDAP settings."),
     "KCHAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"),
 
-    "KCHDEVS0001E": _('Unknown "_cap" specified'),
-    "KCHDEVS0002E": _('"_passthrough" should be "true" or "false"'),
-    "KCHDEVS0003E": _('"_passthrough_affected_by" should be a device name string'),
-
-    "KCHDISKS0001E": _("Error while getting block devices. Details: %(err)s"),
-    "KCHDISKS0002E": _("Error while getting block device information for %(device)s."),
-
-    "KCHDL0001E": _("Unable to find distro file: %(filename)s"),
-    "KCHDL0002E": _("Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."),
-
-    "KCHISCSI0001E": _("Unable to login to iSCSI host target %(portal)s. Details: %(err)s"),
-    "KCHISCSI0002E": _("Unable to login to iSCSI host %(host)s target %(target)s"),
-
-    "KCHISO0001E": _("Unable to find ISO file %(filename)s"),
-    "KCHISO0002E": _("The ISO file %(filename)s is not bootable"),
-    "KCHISO0003E": _("The ISO file %(filename)s does not have a valid El Torito boot record"),
-    "KCHISO0004E": _("Invalid El Torito validation entry in ISO %(filename)s"),
-    "KCHISO0005E": _("Invalid El Torito boot indicator in ISO %(filename)s"),
-    "KCHISO0006E": _("Unexpected volume type for primary volume in ISO %(filename)s"),
-    "KCHISO0007E": _("Bad format while reading volume descriptor in ISO %(filename)s"),
-    "KCHISO0008E": _("The hypervisor doesn't have permission to use this ISO %(filename)s. "
-                     "Consider moving it under /var/lib/libvirt,  or set the search permission "
-                     "to file access control lists for '%(user)s' user if possible, or add the "
-                     "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'."
-                     "Details: %(err)s" ),
-
-    "KCHIMG0001E": _("An error occurred when probing image OS information."),
-    "KCHIMG0002E": _("No OS information found in given image."),
-    "KCHIMG0003E": _("Unable to read image file %(filename)s"),
-    "KCHIMG0004E": _("Image file must be an existing file on system. %(filename)s is not a valid input."),
-
-    "KCHVM0001E": _("Virtual machine %(name)s already exists"),
-    "KCHVM0002E": _("Virtual machine %(name)s does not exist"),
-    "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s is already in use or the virtual machine is not powered off."),
-    "KCHVM0004E": _("Unable to retrieve screenshot for stopped virtual machine %(name)s"),
-    "KCHVM0005E": _("Remote ISO image is not supported by this server."),
-    "KCHVM0006E": _("Screenshot is not supported on virtual machine %(name)s"),
-    "KCHVM0007E": _("Unable to create virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0008E": _("Unable to update virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0009E": _("Unable to retrieve virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0010E": _("Unable to connect to powered off virtual machine %(name)s."),
-    "KCHVM0011E": _("Virtual machine name must be a string without slashes (/)"),
-    "KCHVM0012E": _("Invalid template URI %(value)s specified for virtual machine"),
-    "KCHVM0013E": _("Invalid storage pool URI %(value)s specified for virtual machine"),
-    "KCHVM0014E": _("Supported virtual machine graphics are Spice or VNC"),
-    "KCHVM0015E": _("Graphics address to listen on must be IPv4 or IPv6"),
-    "KCHVM0016E": _("Specify a template to create a virtual machine from"),
-    "KCHVM0019E": _("Unable to start virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0020E": _("Unable to power off virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0021E": _("Unable to delete virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0022E": _("Unable to reset virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0023E": _("User name list must be an array"),
-    "KCHVM0024E": _("User name must be a string"),
-    "KCHVM0025E": _("Group name list must be an array"),
-    "KCHVM0026E": _("Group name must be a string"),
-    "KCHVM0027E": _("User(s) '%(users)s' do not exist"),
-    "KCHVM0028E": _("Group(s) '%(groups)s' do not exist"),
-    "KCHVM0029E": _("Unable to shutdown virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0030E": _("Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"),
-    "KCHVM0031E": _("The guest console password must be a string."),
-    "KCHVM0032E": _("The life time for the guest console password must be a number."),
-    "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."),
-    "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"),
-    "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"),
-    "KCHVM0036E": _("Invalid operation for non-persistent virtual machine %(name)s"),
-    "KCHVM0037E": _("Cannot suspend VM '%(name)s' because it is not running."),
-    "KCHVM0038E": _("Unable to suspend VM '%(name)s'. Details: %(err)s"),
-    "KCHVM0039E": _("Cannot resume VM '%(name)s' because it is not paused."),
-    "KCHVM0040E": _("Unable to resume VM '%(name)s'. Details: %(err)s"),
-    "KCHVM0041E": _("Memory assigned is higher then the maximum allowed in the host."),
-    "KCHVM0042E": _("VM '%(name)s' does not support live memory update. Update the memory with the machine offline to enable this feature."),
-    "KCHVM0043E": _("Only increase memory is allowed in active VMs"),
-    "KCHVM0044E": _("For live memory update, new memory value must be equal old memory value plus multiples of 1024 Mib"),
-    "KCHVM0045E": _("There are not enough free slots of 1024 Mib in the guest."),
-    "KCHVM0046E": _("Host's libvirt version does not support memory devices. Libvirt must be >= 1.2.14"),
-    "KCHVM0047E": _("Error attaching memory device. Details: %(error)s"),
-
-    "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."),
-    "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."),
-    "KCHVMHDEV0003E": _("No IOMMU groups found. Host PCI pass through needs IOMMU group to function correctly. "
-                        "Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify the Kernel is compiled with IOMMU support. "
-                        "For Intel CPU, add intel_iommu=on to your Kernel parameter in /boot/grub2/grub.conf. "
-                        "For AMD CPU, add iommu=pt iommu=1."),
-    "KCHVMHDEV0004E": _('"name" should be a device name string'),
-    "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'),
-
-    "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"),
-    "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"),
-    "KCHVMIF0004E": _("Supported virtual machine interfaces type is only network"),
-    "KCHVMIF0005E": _("Network name for virtual machine interface must be a string"),
-    "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"),
-    "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"),
-    "KCHVMIF0008E": _("MAC Address must respect this format FF:FF:FF:FF:FF:FF"),
-    "KCHVMIF0009E": _("MAC Address %(mac)s already exists in virtual machine %(name)s"),
-    "KCHVMIF0010E": _("Invalid MAC Address"),
-    "KCHVMIF0011E": _("Cannot change MAC address of a running virtual machine"),
-
-    "KCHTMPL0001E": _("Template %(name)s already exists"),
-    "KCHTMPL0003E": _("Network '%(network)s' specified for template %(template)s does not exist"),
-    "KCHTMPL0004E": _("Storage pool %(pool)s specified for template %(template)s does not exist"),
-    "KCHTMPL0005E": _("Storage pool %(pool)s specified for template %(template)s is not active"),
-    "KCHTMPL0006E": _("Invalid parameter '%(param)s' specified for CDROM."),
-    "KCHTMPL0007E": _("Network %(network)s specified for template %(template)s is not active"),
-    "KCHTMPL0008E": _("Template name must be a string"),
-    "KCHTMPL0009E": _("Template icon must be a path to the image"),
-    "KCHTMPL0010E": _("Template distribution must be a string"),
-    "KCHTMPL0011E": _("Template distribution version must be a string"),
-    "KCHTMPL0012E": _("The number of CPUs must be an integer greater than 0"),
-    "KCHTMPL0013E": _("Amount of memory (MB) must be an integer greater than 512"),
-    "KCHTMPL0014E": _("Template CDROM must be a local or remote ISO file"),
-    "KCHTMPL0015E": _("Invalid storage pool URI %(value)s specified for template"),
-    "KCHTMPL0016E": _("Specify an ISO image as CDROM or a base image to create a template"),
-    "KCHTMPL0017E": _("All networks for the template must be specified in a list."),
-    "KCHTMPL0018E": _("Specify a volume to a template when storage pool is iSCSI or SCSI"),
-    "KCHTMPL0019E": _("The volume %(volume)s is not in storage pool %(pool)s"),
-    "KCHTMPL0020E": _("Unable to create template due error: %(err)s"),
-    "KCHTMPL0021E": _("Unable to delete template due error: %(err)s"),
-    "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."),
-    "KCHTMPL0023E": _("Template base image must be a valid local image file"),
-    "KCHTMPL0024E": _("Cannot identify base image %(path)s format"),
-    "KCHTMPL0025E": _("When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads."),
-    "KCHTMPL0026E": _("When specifying CPU topology, each element must be an integer greater than zero."),
-    "KCHTMPL0027E": _("Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, qcow2, qed, raw, vmdk, vpc."),
-
-    "KCHPOOL0001E": _("Storage pool %(name)s already exists"),
-    "KCHPOOL0002E": _("Storage pool %(name)s does not exist"),
-    "KCHPOOL0004E": _("Specify %(item)s in order to create the storage pool %(name)s"),
-    "KCHPOOL0005E": _("Unable to delete active storage pool %(name)s"),
-    "KCHPOOL0006E": _("Unable to list storage pools. Details: %(err)s"),
-    "KCHPOOL0007E": _("Unable to create storage pool %(name)s. Details: %(err)s"),
-    "KCHPOOL0008E": _("Unable to get number of storage volumes in storage pool %(name)s. Details: %(err)s"),
-    "KCHPOOL0009E": _("Unable to activate storage pool %(name)s. Details: %(err)s"),
-    "KCHPOOL0010E": _("Unable to deactivate storage pool %(name)s. Details: %(err)s"),
-    "KCHPOOL0011E": _("Unable to delete storage pool %(name)s. Details: %(err)s"),
-    "KCHPOOL0012E": _("Unable to create NFS Pool as export path %(path)s may block during mount"),
-    "KCHPOOL0013E": _("Unable to create NFS Pool as export path %(path)s mount failed"),
-    "KCHPOOL0014E": _("Unsupported storage pool type: %(type)s"),
-    "KCHPOOL0015E": _("Error while retrieving storage pool XML to %(pool)s"),
-    "KCHPOOL0016E": _("Storage pool name must be a string without slashes (/)"),
-    "KCHPOOL0017E": _("Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-iso"),
-    "KCHPOOL0018E": _("Storage pool path must be a string"),
-    "KCHPOOL0019E": _("Storage pool host must be a IP or hostname"),
-    "KCHPOOL0020E": _("Storage pool device must be the absolute path to the block device"),
-    "KCHPOOL0021E": _("Storage pool devices parameter must be a list"),
-    "KCHPOOL0022E": _("Target IQN of an iSCSI pool must be a string"),
-    "KCHPOOL0023E": _("Port of a remote storage server must be an integer between 1 and 65535"),
-    "KCHPOOL0024E": _("iSCSI target username must be a string"),
-    "KCHPOOL0025E": _("iSCSI target password must be a string"),
-    "KCHPOOL0026E": _("Specify name and type to create a storage pool"),
-    "KCHPOOL0027E": _("%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)s."),
-    "KCHPOOL0028E": _("Unable to extend logical pool %(pool)s. Details: %(err)s"),
-    "KCHPOOL0029E": _("The parameter disks only can be updated for logical storage pool."),
-    "KCHPOOL0030E": _("The SCSI host adapter name must be a string."),
-    "KCHPOOL0031E": _("The storage pool kimchi_isos is reserved for internal use"),
-    "KCHPOOL0032E": _("Unable to activate NFS storage pool %(name)s. NFS server %(server)s is unreachable."),
-    "KCHPOOL0033E": _("Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is unreachable."),
-    "KCHPOOL0034E": _("Unable to deactivate pool %(name)s as it is associated with some templates"),
-    "KCHPOOL0035E": _("Unable to delete pool %(name)s as it is associated with some templates"),
-    "KCHPOOL0036E": _("A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool."),
-    "KCHPOOL0037E": _("Unable to update database with deep scan information due error: %(err)s"),
-
-    "KCHVOL0001E": _("Storage volume %(name)s already exists"),
-    "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"),
-    "KCHVOL0003E": _("Unable to create storage volume %(volume)s because storage pool %(pool)s is not active"),
-    "KCHVOL0004E": _("Specify %(item)s in order to create storage volume %(volume)s"),
-    "KCHVOL0006E": _("Unable to list storage volumes because storage pool %(pool)s is not active"),
-    "KCHVOL0007E": _("Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %(err)s"),
-    "KCHVOL0008E": _("Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"),
-    "KCHVOL0009E": _("Unable to wipe storage volumes %(name)s. Details: %(err)s"),
-    "KCHVOL0010E": _("Unable to delete storage volume %(name)s. Details: %(err)s"),
-    "KCHVOL0011E": _("Unable to resize storage volume %(name)s. Details: %(err)s"),
-    "KCHVOL0012E": _("Storage type %(type)s does not support volume create and delete"),
-    "KCHVOL0013E": _("Storage volume name must be a string"),
-    "KCHVOL0014E": _("Storage volume allocation must be an integer number"),
-    "KCHVOL0015E": _("Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, qcow, qcow2, qed, raw, vmdk, vpc."),
-    "KCHVOL0016E": _("Storage volume requires a volume name"),
-    "KCHVOL0017E": _("Unable to update database with storage volume information due error: %(err)s"),
-    "KCHVOL0018E": _("Only one of parameter %(param)s can be specified"),
-    "KCHVOL0019E": _("Create volume from %(param)s is not supported"),
-    "KCHVOL0020E": _("Storage volume capacity must be an integer number."),
-    "KCHVOL0021E": _("Storage volume URL must be http://, https://, ftp:// or ftps://."),
-    "KCHVOL0022E": _("Unable to access file %(url)s. Please, check it."),
-    "KCHVOL0023E": _("Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: %(err)s"),
-    "KCHVOL0024E": _("Specify chunk data and its size to upload a file."),
-    "KCHVOL0025E": _("In order to upload a storage volume, specify the 'upload' parameter."),
-    "KCHVOL0026E": _("Unable to upload chunk data as it does not match with requested chunk size."),
-    "KCHVOL0027E": _("The storage volume %(vol)s is not under an upload process."),
-    "KCHVOL0028E": _("The upload chunk data will exceed the storage volume size."),
-    "KCHVOL0029E": _("Unable to upload chunk data to storage volume. Details: %(err)s."),
-
-    "KCHIFACE0001E": _("Interface %(name)s does not exist"),
-
-    "KCHNET0001E": _("Network %(name)s already exists"),
-    "KCHNET0002E": _("Network %(name)s does not exist"),
-    "KCHNET0003E": _("Subnet %(subnet)s specified for network %(network)s  is not valid."),
-    "KCHNET0004E": _("Specify a network interface to create bridged network %(name)s"),
-    "KCHNET0005E": _("Unable to delete active network %(name)s"),
-    "KCHNET0006E": _("Interface %(iface)s specified for network %(network)s is already in use"),
-    "KCHNET0007E": _("Interface should be bare NIC, bonding or bridge device."),
-    "KCHNET0008E": _("Unable to create network %(name)s. Details: %(err)s"),
-    "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"),
-    "KCHNET0010E": _("The interface %(iface)s already exists."),
-    "KCHNET0011E": _("Network name must be a string without slashes (/) or quotes (\")"),
-    "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"),
-    "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"),
-    "KCHNET0014E": _("Network interface must be a string"),
-    "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"),
-    "KCHNET0016E": _("Specify name and type to create a Network"),
-    "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network."),
-    "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network."),
-    "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"),
-    "KCHDR0003E": _("Unable to create debug report %(name)s. Details: %(err)s."),
-    "KCHDR0004E": _("Can not find any debug report with the given name %(name)s"),
-    "KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"),
-    "KCHDR0006E": _("You should give a name for the debug report file."),
-    "KCHDR0007E": _("Debug report name must be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."),
-    "KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."),
-
-    "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"),
-
-    "KCHDISTRO0001E": _("Distro '%(name)s' does not exist"),
-
-    "KCHPART0001E": _("Partition %(name)s does not exist in the host"),
-
-    "KCHHOST0001E": _("Unable to shutdown host machine as there are running virtual machines"),
-    "KCHHOST0002E": _("Unable to reboot host machine as there are running virtual machines"),
-    "KCHHOST0003E": _("Node device '%(name)s' not found"),
-    "KCHHOST0004E": _("Conflicting flag filters specified."),
-
-    "KCHPKGUPD0001E": _("No packages marked for update"),
-    "KCHPKGUPD0002E": _("Package %(name)s is not marked to be updated."),
-    "KCHPKGUPD0003E": _("Error while getting packages marked to be updated. Details: %(err)s"),
-    "KCHPKGUPD0004E": _("There is no compatible package manager for this system."),
-
     "KCHOBJST0001E": _("Unable to find %(item)s in datastore"),
 
-    "KCHUTILS0001E": _("Invalid URI %(uri)s"),
     "KCHUTILS0002E": _("Timeout while running command '%(cmd)s' after %(seconds)s seconds"),
-    "KCHUTILS0003E": _("Unable to choose a virtual machine name"),
     "KCHUTILS0004E": _("Invalid data value '%(value)s'"),
     "KCHUTILS0005E": _("Invalid data unit '%(unit)s'"),
-
-    "KCHVMSTOR0002E": _("Invalid storage type. Types supported: 'cdrom', 'disk'"),
-    "KCHVMSTOR0003E": _("The path '%(value)s' is not a valid local/remote path for the device"),
-    "KCHVMSTOR0006E": _("Only CDROM path can be update."),
-    "KCHVMSTOR0007E": _("The storage device %(dev_name)s does not exist in the virtual machine %(vm_name)s"),
-    "KCHVMSTOR0008E": _("Error while creating new storage device: %(error)s"),
-    "KCHVMSTOR0009E": _("Error while updating storage device: %(error)s"),
-    "KCHVMSTOR0010E": _("Error while removing storage device: %(error)s"),
-    "KCHVMSTOR0011E": _("Do not support IDE device hot plug"),
-    "KCHVMSTOR0012E": _("Specify type and path or type and pool/volume to add a new virtual machine disk"),
-    "KCHVMSTOR0013E": _("Specify path to update virtual machine disk"),
-    "KCHVMSTOR0014E": _("Controller type %(type)s limitation of %(limit)s devices reached"),
-    "KCHVMSTOR0015E": _("Cannot retrieve disk path information for given pool/volume: %(error)s"),
-    "KCHVMSTOR0016E": _("Volume already in use by other virtual machine."),
-    "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"),
-    "KCHVMSTOR0018E": _("Volume chosen with format %(format)s does not fit in the storage type %(type)s"),
-
-    "KCHREPOS0001E": _("YUM Repository ID must be one word only string."),
-    "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."),
-    "KCHREPOS0003E": _("Repository configuration is a dictionary with specific values according to repository type."),
-    "KCHREPOS0004E": _("Distribution to DEB repository must be a string"),
-    "KCHREPOS0005E": _("Components to DEB repository must be listed in a array"),
-    "KCHREPOS0006E": _("Components to DEB repository must be a string"),
-    "KCHREPOS0007E": _("Mirror list to repository must be a string"),
-    "KCHREPOS0008E": _("YUM Repository name must be string."),
-    "KCHREPOS0009E": _("GPG check must be a boolean value."),
-    "KCHREPOS0010E": _("GPG key must be a URL pointing to the ASCII-armored file."),
-    "KCHREPOS0011E": _("Could not update repository %(repo_id)s."),
-    "KCHREPOS0012E": _("Repository %(repo_id)s does not exist."),
-    "KCHREPOS0013E": _("Specify repository base URL,  mirror list or metalink in order to create or update a YUM repository."),
-    "KCHREPOS0014E": _("Repository management tool was not recognized for your system."),
-    "KCHREPOS0015E": _("Repository %(repo_id)s is already enabled."),
-    "KCHREPOS0016E": _("Repository %(repo_id)s is already disabled."),
-    "KCHREPOS0017E": _("Could not remove repository %(repo_id)s."),
-    "KCHREPOS0018E": _("Could not write repository configuration file %(repo_file)s"),
-    "KCHREPOS0019E": _("Specify repository distribution in order to create a DEB repository."),
-    "KCHREPOS0020E": _("Could not enable repository %(repo_id)s."),
-    "KCHREPOS0021E": _("Could not disable repository %(repo_id)s."),
-    "KCHREPOS0022E": _("YUM Repository ID already exists"),
-    "KCHREPOS0023E": _("YUM Repository name must be a string"),
-    "KCHREPOS0024E": _("Unable to list repositories. Details: '%(err)s'"),
-    "KCHREPOS0025E": _("Unable to retrieve repository information. Details: '%(err)s'"),
-    "KCHREPOS0026E": _("Unable to add repository. Details: '%(err)s'"),
-    "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"),
-    "KCHREPOS0028E": _("Configuration items: '%(items)s' are not supported by repository manager"),
-    "KCHREPOS0029E": _("Repository metalink must be an http://, ftp:// or file:// URL."),
-    "KCHREPOS0030E": _("Cannot specify mirrorlist and metalink at the same time."),
-
-    "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 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 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."),
-    "KCHCPUINF0003E": _("This host (or current configuration) does not allow CPU topology."),
-
 }
-- 
1.7.1



From luciojhc at linux.vnet.ibm.com  Wed Jul  8 20:05:04 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Wed,  8 Jul 2015 17:05:04 -0300
Subject: [Kimchi-devel] [wok] Update copyright for all changed files
Message-ID: <1436385904-28409-1-git-send-email-luciojhc@linux.vnet.ibm.com>

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 Makefile.am                                        |    2 +-
 configure.ac                                       |    2 +-
 contrib/DEBIAN/postrm                              |    2 +-
 contrib/Makefile.am                                |    2 +-
 contrib/wokd-upstart.conf.debian                   |    2 +-
 contrib/wokd-upstart.conf.fedora                   |    2 +-
 contrib/wokd.sysvinit                              |    2 +-
 docs/Makefile.am                                   |    2 +-
 plugins/Makefile.am                                |    2 +-
 plugins/kimchi/Makefile.am                         |    2 +-
 plugins/kimchi/__init__.py                         |    2 +-
 plugins/kimchi/configure.ac                        |    2 +-
 plugins/kimchi/contrib/DEBIAN/Makefile.am          |    2 +-
 plugins/kimchi/contrib/Makefile.am                 |    2 +-
 plugins/kimchi/control/Makefile.am                 |    2 +-
 plugins/kimchi/control/__init__.py                 |    2 +-
 plugins/kimchi/control/config.py                   |    2 +-
 plugins/kimchi/control/cpuinfo.py                  |    2 +-
 plugins/kimchi/control/groups.py                   |    2 +-
 plugins/kimchi/control/interfaces.py               |    2 +-
 plugins/kimchi/control/peers.py                    |    2 +-
 plugins/kimchi/control/storageservers.py           |    2 +-
 plugins/kimchi/control/tasks.py                    |    2 +-
 plugins/kimchi/control/users.py                    |    2 +-
 plugins/kimchi/control/vm/Makefile.am              |    2 +-
 plugins/kimchi/control/vm/__init__.py              |    2 +-
 plugins/kimchi/control/vm/hostdevs.py              |    2 +-
 plugins/kimchi/control/vm/snapshots.py             |    2 +-
 plugins/kimchi/distros.d/Makefile.am               |    2 +-
 plugins/kimchi/docs/Makefile.am                    |    2 +-
 plugins/kimchi/imageinfo.py                        |    2 +-
 plugins/kimchi/iscsi.py                            |    2 +-
 plugins/kimchi/model/Makefile.am                   |    2 +-
 plugins/kimchi/model/__init__.py                   |    2 +-
 plugins/kimchi/model/groups.py                     |    2 +-
 plugins/kimchi/model/hostdev.py                    |    2 +-
 plugins/kimchi/model/interfaces.py                 |    2 +-
 plugins/kimchi/model/libvirtconnection.py          |    2 +-
 plugins/kimchi/model/libvirtstoragepool.py         |    2 +-
 plugins/kimchi/model/storageservers.py             |    2 +-
 plugins/kimchi/model/storagetargets.py             |    2 +-
 plugins/kimchi/model/tasks.py                      |    2 +-
 plugins/kimchi/model/users.py                      |    2 +-
 plugins/kimchi/scan.py                             |    2 +-
 plugins/kimchi/screenshot.py                       |    2 +-
 plugins/kimchi/tests/Makefile.am                   |    2 +-
 plugins/kimchi/tests/test_exception.py             |    2 +-
 plugins/kimchi/tests/test_networkxml.py            |    2 +-
 plugins/kimchi/tests/test_plugin.py                |    2 +-
 plugins/kimchi/tests/test_rollbackcontext.py       |    2 +-
 plugins/kimchi/ui/Makefile.am                      |    2 +-
 plugins/kimchi/ui/config/Makefile.am               |    2 +-
 plugins/kimchi/ui/css/Makefile.am                  |    2 +-
 .../ui/css/theme-default/guest-storage-add.css     |    2 +-
 plugins/kimchi/ui/css/theme-default/host.css       |    2 +-
 .../css/theme-default/storagepool-add-volume.css   |    2 +-
 plugins/kimchi/ui/css/theme-default/template.css   |    2 +-
 .../kimchi/ui/css/theme-default/template_list.css  |    2 +-
 plugins/kimchi/ui/images/Makefile.am               |    2 +-
 plugins/kimchi/ui/images/theme-default/Makefile.am |    2 +-
 plugins/kimchi/ui/js/Makefile.am                   |    2 +-
 plugins/kimchi/ui/js/src/kimchi.guest_add_main.js  |    2 +-
 .../kimchi/ui/js/src/kimchi.guest_media_main.js    |    2 +-
 plugins/kimchi/ui/js/src/kimchi.host.js            |    2 +-
 plugins/kimchi/ui/js/src/kimchi.main.js            |    2 +-
 plugins/kimchi/ui/js/src/kimchi.report_add_main.js |    2 +-
 .../kimchi/ui/js/src/kimchi.report_rename_main.js  |    2 +-
 .../kimchi/ui/js/src/kimchi.repository_add_main.js |    2 +-
 .../ui/js/src/kimchi.repository_edit_main.js       |    2 +-
 plugins/kimchi/ui/js/src/kimchi.template_main.js   |    2 +-
 plugins/kimchi/ui/pages/Makefile.am                |    2 +-
 .../kimchi/ui/pages/guest-storage-add.html.tmpl    |    2 +-
 plugins/kimchi/ui/pages/guests.html.tmpl           |    2 +-
 plugins/kimchi/ui/pages/help/Makefile.am           |    2 +-
 plugins/kimchi/ui/pages/help/de_DE/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/en_US/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/es_ES/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/fr_FR/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/it_IT/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/ja_JP/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/kimchi.css            |    2 +-
 plugins/kimchi/ui/pages/help/ko_KR/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/pt_BR/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/ru_RU/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/zh_CN/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/help/zh_TW/Makefile.am     |    2 +-
 plugins/kimchi/ui/pages/templates.html.tmpl        |    2 +-
 plugins/kimchi/ui/spice-html5/Makefile.am          |    2 +-
 plugins/kimchi/ui/spice-html5/css/Makefile.am      |    2 +-
 plugins/kimchi/ui/spice-html5/pages/Makefile.am    |    2 +-
 .../kimchi/ui/spice-html5/thirdparty/Makefile.am   |    2 +-
 plugins/kimchi/xmlutils/Makefile.am                |    2 +-
 plugins/kimchi/xmlutils/__init__.py                |    2 +-
 plugins/kimchi/xmlutils/disk.py                    |    2 +-
 plugins/kimchi/xmlutils/graphics.py                |    2 +-
 plugins/kimchi/xmlutils/network.py                 |    2 +-
 plugins/kimchi/xmlutils/qemucmdline.py             |    2 +-
 plugins/sample/__init__.py                         |    2 +-
 plugins/sample/model.py                            |    2 +-
 plugins/sample/ui/js/util.js                       |    2 +-
 plugins/sample/ui/pages/i18n.json.tmpl             |    2 +-
 src/Makefile.am                                    |    2 +-
 src/nginx/Makefile.am                              |    2 +-
 src/wok/Makefile.am                                |    2 +-
 src/wok/__init__.py                                |    2 +-
 src/wok/asynctask.py                               |    2 +-
 src/wok/basemodel.py                               |    2 +-
 src/wok/cachebust.py                               |    2 +-
 src/wok/control/Makefile.am                        |    2 +-
 src/wok/control/__init__.py                        |    2 +-
 src/wok/control/plugins.py                         |    2 +-
 src/wok/control/utils.py                           |    2 +-
 src/wok/exception.py                               |    2 +-
 src/wok/model/Makefile.am                          |    2 +-
 src/wok/model/__init__.py                          |    2 +-
 src/wok/model/plugins.py                           |    2 +-
 src/wok/network.py                                 |    2 +-
 src/wok/objectstore.py                             |    2 +-
 src/wok/rollbackcontext.py                         |    2 +-
 src/wok/server.py                                  |    2 +-
 src/wok/sslcert.py                                 |    2 +-
 src/wok/template.py                                |    2 +-
 src/wok/xmlutils/Makefile.am                       |    2 +-
 src/wok/xmlutils/__init__.py                       |    2 +-
 src/wok/xmlutils/utils.py                          |    2 +-
 ui/Makefile.am                                     |    2 +-
 ui/css/Makefile.am                                 |    2 +-
 ui/css/theme-default/circleGauge.css               |    2 +-
 ui/css/theme-default/grid.css                      |    2 +-
 ui/css/theme-default/jquery-ui.custom.css          |    2 +-
 ui/css/theme-default/line-chart.css                |    2 +-
 ui/css/theme-default/tile-check.css                |    2 +-
 ui/css/theme-default/toolbar.css                   |    2 +-
 ui/images/Makefile.am                              |    2 +-
 ui/images/theme-default/Makefile.am                |    2 +-
 ui/js/Makefile.am                                  |    2 +-
 ui/js/src/wok.form.js                              |    2 +-
 ui/js/src/wok.line-chart.js                        |    2 +-
 ui/js/src/wok.select.js                            |    2 +-
 ui/js/widgets/button-dropDown.js                   |    2 +-
 ui/js/widgets/circleGauge.js                       |    2 +-
 ui/js/widgets/combobox.js                          |    2 +-
 ui/js/widgets/filter-select.js                     |    2 +-
 ui/js/widgets/select-menu.js                       |    2 +-
 ui/libs/Makefile.am                                |    2 +-
 ui/libs/themes/base/Makefile.am                    |    2 +-
 ui/libs/themes/base/images/Makefile.am             |    2 +-
 ui/pages/Makefile.am                               |    2 +-
 ui/pages/error.html.tmpl                           |    2 +-
 ui/pages/websockify/Makefile.am                    |    2 +-
 150 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dfc7576..b15fd2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/configure.ac b/configure.ac
index 47c2e6c..9eba840 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013-2015
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/contrib/DEBIAN/postrm b/contrib/DEBIAN/postrm
index 256a234..3d6bb5d 100755
--- a/contrib/DEBIAN/postrm
+++ b/contrib/DEBIAN/postrm
@@ -2,7 +2,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index b537df5..1dce25d 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/contrib/wokd-upstart.conf.debian b/contrib/wokd-upstart.conf.debian
index 82e9156..9e8e77e 100644
--- a/contrib/wokd-upstart.conf.debian
+++ b/contrib/wokd-upstart.conf.debian
@@ -1,7 +1,7 @@
 #
 # wokd - Wok Web Server
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/contrib/wokd-upstart.conf.fedora b/contrib/wokd-upstart.conf.fedora
index f02ce34..32def4b 100644
--- a/contrib/wokd-upstart.conf.fedora
+++ b/contrib/wokd-upstart.conf.fedora
@@ -1,7 +1,7 @@
 #
 # wokd - Wok Web Server
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/contrib/wokd.sysvinit b/contrib/wokd.sysvinit
index 10680ee..53c0a34 100644
--- a/contrib/wokd.sysvinit
+++ b/contrib/wokd.sysvinit
@@ -2,7 +2,7 @@
 #
 # wokd		Wok Web Server
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Author: Aline Manera <alinefm at br.ibm.com>
 #
diff --git a/docs/Makefile.am b/docs/Makefile.am
index db23721..3de2730 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 21a6ece..d2f5d3a 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/Makefile.am b/plugins/kimchi/Makefile.am
index faef341..0425e00 100644
--- a/plugins/kimchi/Makefile.am
+++ b/plugins/kimchi/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/__init__.py b/plugins/kimchi/__init__.py
index 9330044..f89b3ff 100644
--- a/plugins/kimchi/__init__.py
+++ b/plugins/kimchi/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/configure.ac b/plugins/kimchi/configure.ac
index adab45b..b4cec37 100644
--- a/plugins/kimchi/configure.ac
+++ b/plugins/kimchi/configure.ac
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013-2015
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/contrib/DEBIAN/Makefile.am b/plugins/kimchi/contrib/DEBIAN/Makefile.am
index ca89552..870f67d 100644
--- a/plugins/kimchi/contrib/DEBIAN/Makefile.am
+++ b/plugins/kimchi/contrib/DEBIAN/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/contrib/Makefile.am b/plugins/kimchi/contrib/Makefile.am
index 5001191..e24d2a6 100644
--- a/plugins/kimchi/contrib/Makefile.am
+++ b/plugins/kimchi/contrib/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/Makefile.am b/plugins/kimchi/control/Makefile.am
index 33118ca..e8aaf39 100644
--- a/plugins/kimchi/control/Makefile.am
+++ b/plugins/kimchi/control/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/__init__.py b/plugins/kimchi/control/__init__.py
index 4ad9459..14bfb8e 100644
--- a/plugins/kimchi/control/__init__.py
+++ b/plugins/kimchi/control/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/config.py b/plugins/kimchi/control/config.py
index 15df68f..294722f 100644
--- a/plugins/kimchi/control/config.py
+++ b/plugins/kimchi/control/config.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/cpuinfo.py b/plugins/kimchi/control/cpuinfo.py
index 31f316c..e2df5a9 100644
--- a/plugins/kimchi/control/cpuinfo.py
+++ b/plugins/kimchi/control/cpuinfo.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/groups.py b/plugins/kimchi/control/groups.py
index 649ff09..05c1d76 100644
--- a/plugins/kimchi/control/groups.py
+++ b/plugins/kimchi/control/groups.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/interfaces.py b/plugins/kimchi/control/interfaces.py
index d698b7a..220e372 100644
--- a/plugins/kimchi/control/interfaces.py
+++ b/plugins/kimchi/control/interfaces.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/peers.py b/plugins/kimchi/control/peers.py
index 21e9f13..30172e4 100644
--- a/plugins/kimchi/control/peers.py
+++ b/plugins/kimchi/control/peers.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/storageservers.py b/plugins/kimchi/control/storageservers.py
index 654ab47..07851c0 100644
--- a/plugins/kimchi/control/storageservers.py
+++ b/plugins/kimchi/control/storageservers.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/tasks.py b/plugins/kimchi/control/tasks.py
index b25d892..356afec 100644
--- a/plugins/kimchi/control/tasks.py
+++ b/plugins/kimchi/control/tasks.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/users.py b/plugins/kimchi/control/users.py
index 756a2f7..8d79739 100644
--- a/plugins/kimchi/control/users.py
+++ b/plugins/kimchi/control/users.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/vm/Makefile.am b/plugins/kimchi/control/vm/Makefile.am
index b17c68a..01bc46e 100644
--- a/plugins/kimchi/control/vm/Makefile.am
+++ b/plugins/kimchi/control/vm/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/vm/__init__.py b/plugins/kimchi/control/vm/__init__.py
index a311045..a58a6da 100644
--- a/plugins/kimchi/control/vm/__init__.py
+++ b/plugins/kimchi/control/vm/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/vm/hostdevs.py b/plugins/kimchi/control/vm/hostdevs.py
index a43b9d8..1beb8fd 100644
--- a/plugins/kimchi/control/vm/hostdevs.py
+++ b/plugins/kimchi/control/vm/hostdevs.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/control/vm/snapshots.py b/plugins/kimchi/control/vm/snapshots.py
index dd17b85..9df90ed 100644
--- a/plugins/kimchi/control/vm/snapshots.py
+++ b/plugins/kimchi/control/vm/snapshots.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/distros.d/Makefile.am b/plugins/kimchi/distros.d/Makefile.am
index 684fe60..b54cf68 100644
--- a/plugins/kimchi/distros.d/Makefile.am
+++ b/plugins/kimchi/distros.d/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/docs/Makefile.am b/plugins/kimchi/docs/Makefile.am
index 679aa18..515374a 100644
--- a/plugins/kimchi/docs/Makefile.am
+++ b/plugins/kimchi/docs/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/imageinfo.py b/plugins/kimchi/imageinfo.py
index 8a22495..12d26d0 100644
--- a/plugins/kimchi/imageinfo.py
+++ b/plugins/kimchi/imageinfo.py
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/iscsi.py b/plugins/kimchi/iscsi.py
index 02886ac..5de9f51 100644
--- a/plugins/kimchi/iscsi.py
+++ b/plugins/kimchi/iscsi.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/Makefile.am b/plugins/kimchi/model/Makefile.am
index f4f4750..ad28f29 100644
--- a/plugins/kimchi/model/Makefile.am
+++ b/plugins/kimchi/model/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/__init__.py b/plugins/kimchi/model/__init__.py
index ca7ede4..771bf68 100644
--- a/plugins/kimchi/model/__init__.py
+++ b/plugins/kimchi/model/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/groups.py b/plugins/kimchi/model/groups.py
index fc63d68..9d96ba7 100644
--- a/plugins/kimchi/model/groups.py
+++ b/plugins/kimchi/model/groups.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/hostdev.py b/plugins/kimchi/model/hostdev.py
index c411d0b..8f9d70b 100644
--- a/plugins/kimchi/model/hostdev.py
+++ b/plugins/kimchi/model/hostdev.py
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/interfaces.py b/plugins/kimchi/model/interfaces.py
index 81b379a..768b8be 100644
--- a/plugins/kimchi/model/interfaces.py
+++ b/plugins/kimchi/model/interfaces.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/libvirtconnection.py b/plugins/kimchi/model/libvirtconnection.py
index ef4a4ce..1d08996 100644
--- a/plugins/kimchi/model/libvirtconnection.py
+++ b/plugins/kimchi/model/libvirtconnection.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/libvirtstoragepool.py b/plugins/kimchi/model/libvirtstoragepool.py
index b22856b..71e45a4 100644
--- a/plugins/kimchi/model/libvirtstoragepool.py
+++ b/plugins/kimchi/model/libvirtstoragepool.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/storageservers.py b/plugins/kimchi/model/storageservers.py
index accc5f5..02d1e8b 100644
--- a/plugins/kimchi/model/storageservers.py
+++ b/plugins/kimchi/model/storageservers.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/storagetargets.py b/plugins/kimchi/model/storagetargets.py
index 4090b45..3f100ce 100644
--- a/plugins/kimchi/model/storagetargets.py
+++ b/plugins/kimchi/model/storagetargets.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/tasks.py b/plugins/kimchi/model/tasks.py
index 678fdc2..f5d475e 100644
--- a/plugins/kimchi/model/tasks.py
+++ b/plugins/kimchi/model/tasks.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/model/users.py b/plugins/kimchi/model/users.py
index 2fa65dd..98c96a4 100644
--- a/plugins/kimchi/model/users.py
+++ b/plugins/kimchi/model/users.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/scan.py b/plugins/kimchi/scan.py
index b475c46..af322c9 100644
--- a/plugins/kimchi/scan.py
+++ b/plugins/kimchi/scan.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/screenshot.py b/plugins/kimchi/screenshot.py
index 7c2347c..d724bc7 100644
--- a/plugins/kimchi/screenshot.py
+++ b/plugins/kimchi/screenshot.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/tests/Makefile.am b/plugins/kimchi/tests/Makefile.am
index c1f6784..fd0476e 100644
--- a/plugins/kimchi/tests/Makefile.am
+++ b/plugins/kimchi/tests/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/tests/test_exception.py b/plugins/kimchi/tests/test_exception.py
index f1b81ba..7f9c8b1 100644
--- a/plugins/kimchi/tests/test_exception.py
+++ b/plugins/kimchi/tests/test_exception.py
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/tests/test_networkxml.py b/plugins/kimchi/tests/test_networkxml.py
index a64b6c2..ed1a058 100644
--- a/plugins/kimchi/tests/test_networkxml.py
+++ b/plugins/kimchi/tests/test_networkxml.py
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/tests/test_plugin.py b/plugins/kimchi/tests/test_plugin.py
index ebc4a39..cf8ef9a 100644
--- a/plugins/kimchi/tests/test_plugin.py
+++ b/plugins/kimchi/tests/test_plugin.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/tests/test_rollbackcontext.py b/plugins/kimchi/tests/test_rollbackcontext.py
index 6eac6d0..ea10fe0 100644
--- a/plugins/kimchi/tests/test_rollbackcontext.py
+++ b/plugins/kimchi/tests/test_rollbackcontext.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/Makefile.am b/plugins/kimchi/ui/Makefile.am
index 21fe703..aa13b7a 100644
--- a/plugins/kimchi/ui/Makefile.am
+++ b/plugins/kimchi/ui/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/config/Makefile.am b/plugins/kimchi/ui/config/Makefile.am
index e3b3d19..5f8f6a3 100644
--- a/plugins/kimchi/ui/config/Makefile.am
+++ b/plugins/kimchi/ui/config/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/css/Makefile.am b/plugins/kimchi/ui/css/Makefile.am
index 5071d29..c16af7e 100644
--- a/plugins/kimchi/ui/css/Makefile.am
+++ b/plugins/kimchi/ui/css/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/css/theme-default/guest-storage-add.css b/plugins/kimchi/ui/css/theme-default/guest-storage-add.css
index 9cc41e8..25b8a9c 100644
--- a/plugins/kimchi/ui/css/theme-default/guest-storage-add.css
+++ b/plugins/kimchi/ui/css/theme-default/guest-storage-add.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/css/theme-default/host.css b/plugins/kimchi/ui/css/theme-default/host.css
index a0cccb1..a7618d6 100644
--- a/plugins/kimchi/ui/css/theme-default/host.css
+++ b/plugins/kimchi/ui/css/theme-default/host.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css b/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css
index 6e8a551..6aa5e96 100644
--- a/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css
+++ b/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/css/theme-default/template.css b/plugins/kimchi/ui/css/theme-default/template.css
index 27fe404..fbab23f 100644
--- a/plugins/kimchi/ui/css/theme-default/template.css
+++ b/plugins/kimchi/ui/css/theme-default/template.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/css/theme-default/template_list.css b/plugins/kimchi/ui/css/theme-default/template_list.css
index 3161a33..4de4704 100644
--- a/plugins/kimchi/ui/css/theme-default/template_list.css
+++ b/plugins/kimchi/ui/css/theme-default/template_list.css
@@ -1,7 +1,7 @@
 /*
 * Project Kimchi
 *
-* Copyright IBM, Corp. 2013-2014
+* Copyright IBM, Corp. 2013-2015
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/images/Makefile.am b/plugins/kimchi/ui/images/Makefile.am
index 0562e6a..361c219 100644
--- a/plugins/kimchi/ui/images/Makefile.am
+++ b/plugins/kimchi/ui/images/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/images/theme-default/Makefile.am b/plugins/kimchi/ui/images/theme-default/Makefile.am
index 7e11d75..ba1398d 100644
--- a/plugins/kimchi/ui/images/theme-default/Makefile.am
+++ b/plugins/kimchi/ui/images/theme-default/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/Makefile.am b/plugins/kimchi/ui/js/Makefile.am
index c9d1218..4bc4861 100644
--- a/plugins/kimchi/ui/js/Makefile.am
+++ b/plugins/kimchi/ui/js/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
index 6be6f9a..d269eeb 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
index b920527..61b5918 100644
--- a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.host.js b/plugins/kimchi/ui/js/src/kimchi.host.js
index e2d2511..bcff58e 100644
--- a/plugins/kimchi/ui/js/src/kimchi.host.js
+++ b/plugins/kimchi/ui/js/src/kimchi.host.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.main.js b/plugins/kimchi/ui/js/src/kimchi.main.js
index 2fdeb85..79d46ea 100644
--- a/plugins/kimchi/ui/js/src/kimchi.main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.report_add_main.js b/plugins/kimchi/ui/js/src/kimchi.report_add_main.js
index 5f098d3..2c3ca57 100644
--- a/plugins/kimchi/ui/js/src/kimchi.report_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.report_add_main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js b/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
index 1bdb8d9..c3f039e 100644
--- a/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
index 656306b..70a71fe 100644
--- a/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
index 5bfc51e..e18ea91 100644
--- a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/js/src/kimchi.template_main.js b/plugins/kimchi/ui/js/src/kimchi.template_main.js
index b09fe12..948a4bf 100644
--- a/plugins/kimchi/ui/js/src/kimchi.template_main.js
+++ b/plugins/kimchi/ui/js/src/kimchi.template_main.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am
index 56288e3..3c50f31 100644
--- a/plugins/kimchi/ui/pages/Makefile.am
+++ b/plugins/kimchi/ui/pages/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl b/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
index a26e0f9..901178f 100644
--- a/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
+++ b/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl
@@ -1,7 +1,7 @@
 #*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/pages/guests.html.tmpl b/plugins/kimchi/ui/pages/guests.html.tmpl
index b8a1259..975a05a 100644
--- a/plugins/kimchi/ui/pages/guests.html.tmpl
+++ b/plugins/kimchi/ui/pages/guests.html.tmpl
@@ -1,7 +1,7 @@
 #*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/pages/help/Makefile.am b/plugins/kimchi/ui/pages/help/Makefile.am
index a4ee361..c356520 100644
--- a/plugins/kimchi/ui/pages/help/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
index 3d99aae..3952fa4 100644
--- a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/en_US/Makefile.am b/plugins/kimchi/ui/pages/help/en_US/Makefile.am
index d37f03a..c312ebb 100644
--- a/plugins/kimchi/ui/pages/help/en_US/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/en_US/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
index 29c596f..b31785f 100644
--- a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
index 11ce394..4c5d5df 100644
--- a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
index 62e2f29..5717cc8 100644
--- a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
index f9c2f33..e0632cd 100644
--- a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/kimchi.css b/plugins/kimchi/ui/pages/help/kimchi.css
index 32fae4a..1ac5942 100644
--- a/plugins/kimchi/ui/pages/help/kimchi.css
+++ b/plugins/kimchi/ui/pages/help/kimchi.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
index e441955..d2f920b 100644
--- a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
index 7fc2cb0..65a1061 100644
--- a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
index 85ca27a..f5a2e9e 100644
--- a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
index e785048..426c5b0 100644
--- a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
index 9c8ac26..b5ee387 100644
--- a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/ui/pages/templates.html.tmpl b/plugins/kimchi/ui/pages/templates.html.tmpl
index af1cf3f..337084c 100644
--- a/plugins/kimchi/ui/pages/templates.html.tmpl
+++ b/plugins/kimchi/ui/pages/templates.html.tmpl
@@ -1,7 +1,7 @@
 #*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/spice-html5/Makefile.am b/plugins/kimchi/ui/spice-html5/Makefile.am
index c43f1ef..fc46351 100644
--- a/plugins/kimchi/ui/spice-html5/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/spice-html5/css/Makefile.am b/plugins/kimchi/ui/spice-html5/css/Makefile.am
index ed51972..5005974 100644
--- a/plugins/kimchi/ui/spice-html5/css/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/css/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/spice-html5/pages/Makefile.am b/plugins/kimchi/ui/spice-html5/pages/Makefile.am
index 431ec6c..2c354a4 100644
--- a/plugins/kimchi/ui/spice-html5/pages/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/pages/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
index 474478d..79cd1f5 100644
--- a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/plugins/kimchi/xmlutils/Makefile.am b/plugins/kimchi/xmlutils/Makefile.am
index 207ad7f..5667443 100644
--- a/plugins/kimchi/xmlutils/Makefile.am
+++ b/plugins/kimchi/xmlutils/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/xmlutils/__init__.py b/plugins/kimchi/xmlutils/__init__.py
index ca7ede4..771bf68 100644
--- a/plugins/kimchi/xmlutils/__init__.py
+++ b/plugins/kimchi/xmlutils/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/xmlutils/disk.py b/plugins/kimchi/xmlutils/disk.py
index 126ce77..54e6763 100644
--- a/plugins/kimchi/xmlutils/disk.py
+++ b/plugins/kimchi/xmlutils/disk.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/xmlutils/graphics.py b/plugins/kimchi/xmlutils/graphics.py
index 2b4346a..8bf83a9 100644
--- a/plugins/kimchi/xmlutils/graphics.py
+++ b/plugins/kimchi/xmlutils/graphics.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/xmlutils/network.py b/plugins/kimchi/xmlutils/network.py
index c73aad9..c454224 100644
--- a/plugins/kimchi/xmlutils/network.py
+++ b/plugins/kimchi/xmlutils/network.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/kimchi/xmlutils/qemucmdline.py b/plugins/kimchi/xmlutils/qemucmdline.py
index 66238a7..bcafd75 100644
--- a/plugins/kimchi/xmlutils/qemucmdline.py
+++ b/plugins/kimchi/xmlutils/qemucmdline.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index a3a8f05..b8299b8 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/sample/model.py b/plugins/sample/model.py
index 4ada648..8a093a1 100644
--- a/plugins/sample/model.py
+++ b/plugins/sample/model.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/sample/ui/js/util.js b/plugins/sample/ui/js/util.js
index 7689a81..75240c0 100644
--- a/plugins/sample/ui/js/util.js
+++ b/plugins/sample/ui/js/util.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/sample/ui/pages/i18n.json.tmpl b/plugins/sample/ui/pages/i18n.json.tmpl
index 737bb39..24f7eca 100644
--- a/plugins/sample/ui/pages/i18n.json.tmpl
+++ b/plugins/sample/ui/pages/i18n.json.tmpl
@@ -1,7 +1,7 @@
 #*
  * Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/Makefile.am b/src/Makefile.am
index 2fed7d5..a730574 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013-2015
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/nginx/Makefile.am b/src/nginx/Makefile.am
index 0f36b44..b1098e1 100644
--- a/src/nginx/Makefile.am
+++ b/src/nginx/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2015
+# Copyright IBM, Corp. 2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am
index 6e00907..c7f8825 100644
--- a/src/wok/Makefile.am
+++ b/src/wok/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/__init__.py b/src/wok/__init__.py
index edf8e5d..ee98092 100644
--- a/src/wok/__init__.py
+++ b/src/wok/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py
index 1e0ec4b..0e19e16 100644
--- a/src/wok/asynctask.py
+++ b/src/wok/asynctask.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/basemodel.py b/src/wok/basemodel.py
index 096c66b..57059f1 100644
--- a/src/wok/basemodel.py
+++ b/src/wok/basemodel.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/cachebust.py b/src/wok/cachebust.py
index d04b2c6..50e68f1 100644
--- a/src/wok/cachebust.py
+++ b/src/wok/cachebust.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/control/Makefile.am b/src/wok/control/Makefile.am
index d6cb3f0..f68badf 100644
--- a/src/wok/control/Makefile.am
+++ b/src/wok/control/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/control/__init__.py b/src/wok/control/__init__.py
index 4ad9459..14bfb8e 100644
--- a/src/wok/control/__init__.py
+++ b/src/wok/control/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py
index 1cc1d5a..9488e2f 100644
--- a/src/wok/control/plugins.py
+++ b/src/wok/control/plugins.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/control/utils.py b/src/wok/control/utils.py
index 496320c..3988ba9 100644
--- a/src/wok/control/utils.py
+++ b/src/wok/control/utils.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/exception.py b/src/wok/exception.py
index 6f5e9d9..f36ff77 100644
--- a/src/wok/exception.py
+++ b/src/wok/exception.py
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/model/Makefile.am b/src/wok/model/Makefile.am
index 8f0f102..ee31167 100644
--- a/src/wok/model/Makefile.am
+++ b/src/wok/model/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/model/__init__.py b/src/wok/model/__init__.py
index ca7ede4..771bf68 100644
--- a/src/wok/model/__init__.py
+++ b/src/wok/model/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py
index e350f1e..f568d42 100644
--- a/src/wok/model/plugins.py
+++ b/src/wok/model/plugins.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/network.py b/src/wok/network.py
index 1433b8a..80b2cc1 100644
--- a/src/wok/network.py
+++ b/src/wok/network.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py
index 107b568..4c0b024 100644
--- a/src/wok/objectstore.py
+++ b/src/wok/objectstore.py
@@ -1,6 +1,6 @@
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/rollbackcontext.py b/src/wok/rollbackcontext.py
index 2f3e8bc..1d93181 100644
--- a/src/wok/rollbackcontext.py
+++ b/src/wok/rollbackcontext.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/server.py b/src/wok/server.py
index 5b48049..9d2c27b 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/sslcert.py b/src/wok/sslcert.py
index 6b64796..792a8a3 100644
--- a/src/wok/sslcert.py
+++ b/src/wok/sslcert.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 # Copyright (C) 2004-2005 OSAF. All Rights Reserved.
 #
 # Portions of this file were derived from the python-m2crypto unit tests:
diff --git a/src/wok/template.py b/src/wok/template.py
index c743f73..41e5c91 100644
--- a/src/wok/template.py
+++ b/src/wok/template.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2013-2014
+# Copyright IBM, Corp. 2013-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/xmlutils/Makefile.am b/src/wok/xmlutils/Makefile.am
index 69aa524..a355541 100644
--- a/src/wok/xmlutils/Makefile.am
+++ b/src/wok/xmlutils/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM Corp, 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/xmlutils/__init__.py b/src/wok/xmlutils/__init__.py
index ca7ede4..771bf68 100644
--- a/src/wok/xmlutils/__init__.py
+++ b/src/wok/xmlutils/__init__.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/wok/xmlutils/utils.py b/src/wok/xmlutils/utils.py
index be08a14..cb0dbcd 100644
--- a/src/wok/xmlutils/utils.py
+++ b/src/wok/xmlutils/utils.py
@@ -1,7 +1,7 @@
 #
 # Project Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 6be27ed..3c34391 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
index 29ddb26..bffff55 100644
--- a/ui/css/Makefile.am
+++ b/ui/css/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/css/theme-default/circleGauge.css b/ui/css/theme-default/circleGauge.css
index 48ef1d3..6966d80 100644
--- a/ui/css/theme-default/circleGauge.css
+++ b/ui/css/theme-default/circleGauge.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css
index dfc20ff..c607691 100644
--- a/ui/css/theme-default/grid.css
+++ b/ui/css/theme-default/grid.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/css/theme-default/jquery-ui.custom.css b/ui/css/theme-default/jquery-ui.custom.css
index 56f7e06..9353422 100644
--- a/ui/css/theme-default/jquery-ui.custom.css
+++ b/ui/css/theme-default/jquery-ui.custom.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css
index 15d9bb8..edf34f5 100644
--- a/ui/css/theme-default/line-chart.css
+++ b/ui/css/theme-default/line-chart.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/css/theme-default/tile-check.css b/ui/css/theme-default/tile-check.css
index 5e802ca..bbf5da0 100644
--- a/ui/css/theme-default/tile-check.css
+++ b/ui/css/theme-default/tile-check.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/css/theme-default/toolbar.css b/ui/css/theme-default/toolbar.css
index ea2a039..76372b8 100644
--- a/ui/css/theme-default/toolbar.css
+++ b/ui/css/theme-default/toolbar.css
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
index 297c0bd..5e944bb 100644
--- a/ui/images/Makefile.am
+++ b/ui/images/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/images/theme-default/Makefile.am b/ui/images/theme-default/Makefile.am
index 336729c..5b15aff 100644
--- a/ui/images/theme-default/Makefile.am
+++ b/ui/images/theme-default/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am
index 2549846..1529ee9 100644
--- a/ui/js/Makefile.am
+++ b/ui/js/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/js/src/wok.form.js b/ui/js/src/wok.form.js
index 0bb7c4b..fc434c6 100644
--- a/ui/js/src/wok.form.js
+++ b/ui/js/src/wok.form.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/js/src/wok.line-chart.js b/ui/js/src/wok.line-chart.js
index 8b40288..66b819a 100644
--- a/ui/js/src/wok.line-chart.js
+++ b/ui/js/src/wok.line-chart.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/js/src/wok.select.js b/ui/js/src/wok.select.js
index 60830a5..0b2a4ce 100644
--- a/ui/js/src/wok.select.js
+++ b/ui/js/src/wok.select.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/js/widgets/button-dropDown.js b/ui/js/widgets/button-dropDown.js
index ec6bd2a..0209c7b 100644
--- a/ui/js/widgets/button-dropDown.js
+++ b/ui/js/widgets/button-dropDown.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
diff --git a/ui/js/widgets/circleGauge.js b/ui/js/widgets/circleGauge.js
index 52ec027..bfbebf6 100644
--- a/ui/js/widgets/circleGauge.js
+++ b/ui/js/widgets/circleGauge.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/js/widgets/combobox.js b/ui/js/widgets/combobox.js
index 92244a2..8b79086 100644
--- a/ui/js/widgets/combobox.js
+++ b/ui/js/widgets/combobox.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js
index db6b4b0..fff566f 100644
--- a/ui/js/widgets/filter-select.js
+++ b/ui/js/widgets/filter-select.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js
index bd7a207..54b9a0b 100644
--- a/ui/js/widgets/select-menu.js
+++ b/ui/js/widgets/select-menu.js
@@ -1,7 +1,7 @@
 /*
  * Project Kimchi
  *
- * Copyright IBM, Corp. 2014
+ * Copyright IBM, Corp. 2014-2015
  *
  * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am
index 49ad3bb..5951fad 100644
--- a/ui/libs/Makefile.am
+++ b/ui/libs/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/libs/themes/base/Makefile.am b/ui/libs/themes/base/Makefile.am
index 1bbaa50..483306a 100644
--- a/ui/libs/themes/base/Makefile.am
+++ b/ui/libs/themes/base/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/libs/themes/base/images/Makefile.am b/ui/libs/themes/base/images/Makefile.am
index dd619c8..b117bd9 100644
--- a/ui/libs/themes/base/images/Makefile.am
+++ b/ui/libs/themes/base/images/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am
index 68f4c92..b979444 100644
--- a/ui/pages/Makefile.am
+++ b/ui/pages/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2013
+# Copyright IBM, Corp. 2013-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl
index eea1179..3b7fbbe 100644
--- a/ui/pages/error.html.tmpl
+++ b/ui/pages/error.html.tmpl
@@ -1,7 +1,7 @@
 #*
  * Kimchi
  *
- * Copyright IBM, Corp. 2013-2014
+ * Copyright IBM, Corp. 2013-2015
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ui/pages/websockify/Makefile.am b/ui/pages/websockify/Makefile.am
index 5321562..6add3e3 100644
--- a/ui/pages/websockify/Makefile.am
+++ b/ui/pages/websockify/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Kimchi
 #
-# Copyright IBM, Corp. 2014
+# Copyright IBM, Corp. 2014-2015
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
-- 
1.7.1



From ramonn at linux.vnet.ibm.com  Wed Jul  8 23:16:45 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Wed, 08 Jul 2015 20:16:45 -0300
Subject: [Kimchi-devel] [DOUBT] PCI devices companions on UI
Message-ID: <559DAF5D.5050904@linux.vnet.ibm.com>

Hi guys,

i was looking at the code that parses host pci devices and found a loop, 
that i don't understand what it does. Looking at it, i see a string 
being created but do not understood which variable will be used on the 
code. Has someone experience with this part of the code?

https://github.com/kimchi-project/kimchi/blob/master/ui/js/src/kimchi.guest_edit_main.js#L479-L505

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com



From dhbarboza82 at gmail.com  Thu Jul  9 14:21:27 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Thu, 09 Jul 2015 11:21:27 -0300
Subject: [Kimchi-devel] [PATCH 2/3] Check for usb xhci controller in
 Power platform
In-Reply-To: <1436377367-18815-3-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
	<1436377367-18815-3-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <559E8367.4040808@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/08/2015 02:42 PM, Jose Ricardo Ziviani wrote:
>   - Today it is not possible to hotplug a PCI in Power Systems without an
>     USB xhci controller existing in the VM. This commit checks if there
>     is such controller in the VM, displaying an error message if not.
>
> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
> ---
>   src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
>   1 file changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
> index ea75fce..186e542 100644
> --- a/src/kimchi/model/vmhostdevs.py
> +++ b/src/kimchi/model/vmhostdevs.py
> @@ -171,6 +171,26 @@ class VMHostDevsModel(object):
>               if rc != 0:
>                   kimchi_log.warning("Unable to turn on sebool virt_use_sysfs")
>   
> +    def _have_xhci_usb_controller(self, xmlstr):
> +        root = objectify.fromstring(xmlstr)
> +
> +        try:
> +            controllers = root.devices.controller
> +
> +        except AttributeError:
> +            return False
> +
> +        for controller in controllers:
> +
> +            if 'model' not in controller.attrib:
> +                continue
> +
> +            if controller.attrib['type'] == 'usb' and \
> +               controller.attrib['model'] == 'nec-xhci':
> +                return True
> +
> +        return False
> +
>       def _attach_pci_device(self, vmid, dev_info):
>           self._validate_pci_passthrough_env()
>   
> @@ -180,11 +200,17 @@ class VMHostDevsModel(object):
>           driver = ('vfio' if DOM_STATE_MAP[dom.info()[0]] == "shutoff" and
>                     self.caps.kernel_vfio else 'kvm')
>   
> -        # on powerkvm systems it must be vfio driver.
>           distro, _, _ = platform.linux_distribution()
>           if distro == 'IBM_PowerKVM':
> +            # on powerkvm systems, the driver must be vfio.
>               driver = 'vfio'
>   
> +            # powerkvm requires a xhci usb controller in order to support
> +            # pci hotplug.
> +            if DOM_STATE_MAP[dom.info()[0]] != "shutoff" and \
> +               not self._have_xhci_usb_controller(dom.XMLDesc(0)):
> +                raise InvalidOperation("KCHVMHDEV0006E", {'vmid': vmid})
> +
>           # Attach all PCI devices in the same IOMMU group
>           dev_model = DeviceModel(conn=self.conn)
>           devs_model = DevicesModel(conn=self.conn)



From dhbarboza82 at gmail.com  Thu Jul  9 14:21:39 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Thu, 09 Jul 2015 11:21:39 -0300
Subject: [Kimchi-devel] [PATCH 3/3] Define the USB xhci controller in
 the template for Power Systems
In-Reply-To: <1436377367-18815-4-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
	<1436377367-18815-4-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <559E8373.2050804@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/08/2015 02:42 PM, Jose Ricardo Ziviani wrote:
>   - When creating VMs using Kimchi in a Power System, the USB xhci
>     controller is defined by default to have PCI hotplug support.
>
> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
> ---
>   src/kimchi/vmtemplate.py | 17 +++++++++++++++++
>   1 file changed, 17 insertions(+)
>
> diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
> index 79e04ed..3e42971 100644
> --- a/src/kimchi/vmtemplate.py
> +++ b/src/kimchi/vmtemplate.py
> @@ -22,6 +22,7 @@ import stat
>   import time
>   import urlparse
>   import uuid
> +import platform
>   
>   from lxml import etree
>   from lxml.builder import E
> @@ -287,6 +288,19 @@ class VMTemplate(object):
>                              self.info.get('memory') << 10,
>                              cpu_topo)
>   
> +    def _get_usb_controller(self):
> +        # powerkvm systems must include xhci controller model
> +        distro, _, _ = platform.linux_distribution()
> +        if distro != "IBM_PowerKVM":
> +            return ''
> +
> +        return """
> +        <controller type='usb' index='0' model='nec-xhci'>
> +            <address type='pci' domain='0x0000'
> +            bus='0x00' slot='0x0f' function='0x0'/>
> +        </controller>
> +        """
> +
>       def to_vm_xml(self, vm_name, vm_uuid, **kwargs):
>           params = dict(self.info)
>           params['name'] = vm_name
> @@ -323,6 +337,8 @@ class VMTemplate(object):
>           elif params['slots'] == 0:
>               params['slots'] = 1
>   
> +        params['usb_controller'] = self._get_usb_controller()
> +
>           xml = """
>           <domain type='%(domain)s'>
>             %(qemu-stream-cmdline)s
> @@ -352,6 +368,7 @@ class VMTemplate(object):
>               %(networks)s
>               %(graphics)s
>               %(input_output)s
> +            %(usb_controller)s
>               <memballoon model='virtio' />
>             </devices>
>           </domain>



From dhbarboza82 at gmail.com  Thu Jul  9 14:33:53 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Thu, 09 Jul 2015 11:33:53 -0300
Subject: [Kimchi-devel] [PATCH 0/3] Add usb xhci controller for hotplug
 on Power
In-Reply-To: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436377367-18815-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <559E8651.6060005@gmail.com>

I've reviewed +1 in all the patches of this set, but before pushing it 
to master
I would like to ask you to add a new unit test to verify that this code 
behaves
as you expect it to.

You didn't break any existing unit test in pkvm and there is a good 
chance that
this code is being tested somehow in any of those, but I strongly 
encourage to
make an explicit unit test to the exact behavior you're adding/changing.

You can do something like this in test_model.py:

def _host_is_PKVM():
     distro, _, _ = platform.linux_distribution()
     return distro is 'IBM_PowerKVM'

@unittest.skipUnless(_host_is_PKVM())
def test_pci_hotplug_requires_xhci_usb_controller():
     # check the xhci or any other required host/device condition

     # if condition is True: hotplug a pci device should happen with
     # no errors. You can see how other tests do the hotplug and replicate
     # it here

     # elif condition is False: the code should thrown the InvalidOperation
     # exception with the code "KCHVMHDEV0006E"


Thanks,


Daniel


On 07/08/2015 02:42 PM, Jose Ricardo Ziviani wrote:
> Power system requires an USB XHCI controller in order to allow PCI
> hotplug. This patch adds such controller by default when creating a new
> VM and inform the users if a VM currently doesn't have the controller.
>
> Jose Ricardo Ziviani (3):
>    Add a new error code for pci hotplug
>    Check for usb xhci controller in Power platform
>    Define the USB xhci controller in the template for Power Systems
>
>   src/kimchi/i18n.py             |  1 +
>   src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
>   src/kimchi/vmtemplate.py       | 17 +++++++++++++++++
>   3 files changed, 45 insertions(+), 1 deletion(-)
>



From danielhb at linux.vnet.ibm.com  Thu Jul  9 14:53:36 2015
From: danielhb at linux.vnet.ibm.com (Daniel Henrique Barboza)
Date: Thu, 09 Jul 2015 11:53:36 -0300
Subject: [Kimchi-devel] [DOUBT] PCI devices companions on UI
In-Reply-To: <559DAF5D.5050904@linux.vnet.ibm.com>
References: <559DAF5D.5050904@linux.vnet.ibm.com>
Message-ID: <559E8AF0.3030803@linux.vnet.ibm.com>

In my opinion the code is using the string pciTitle, with initial value 
= i18n[....], to get
the link, address and link type to all device_types that are 'net' or 
'storage'.

The boolean haveCompanions is set to true if any of the devices are 
'net' or 'storage'. In the
last loop it checks if the boolean is true or false and, if true, it 
changes the infoData attrs
name, product and vendor to the string pciTitle it crreated in the 
previous loop.

Note that it haveCompanions is false it will not execute any of the 
three statements in the loop.
This is a javascript 'perk'*:

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Logical_Operators

I am no JS expert but this is a very unorthodox code IMO. Feel free to 
re-factor it to something
simpler (KEEPING THE SAME BEHAVIOR!!).


Daniel


* I've tested it in the Javascript console of Chrome to see how it works:

  > expr1 = false;
< false
 > expr1 && console.log('PRINT ME!!');
< false
 > expr1 = true;
< true
 > expr1 && console.log('PRINT ME!!');
< PRINT ME!!
< undefined

On 07/08/2015 08:16 PM, Ramon Medeiros wrote:
> Hi guys,
>
> i was looking at the code that parses host pci devices and found a 
> loop, that i don't understand what it does. Looking at it, i see a 
> string being created but do not understood which variable will be used 
> on the code. Has someone experience with this part of the code?
>
> https://github.com/kimchi-project/kimchi/blob/master/ui/js/src/kimchi.guest_edit_main.js#L479-L505 
>
>



From dhbarboza82 at gmail.com  Thu Jul  9 15:05:27 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Thu, 09 Jul 2015 12:05:27 -0300
Subject: [Kimchi-devel] [PATCH] Fix minus in manpage
In-Reply-To: <1436195456-18218-1-git-send-email-frediz@linux.vnet.ibm.com>
References: <1436195456-18218-1-git-send-email-frediz@linux.vnet.ibm.com>
Message-ID: <559E8DB7.6030102@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/06/2015 12:10 PM, Fr?d?ric Bonnard wrote:
> From: Frederic Bonnard <frediz at linux.vnet.ibm.com>
>
> Escape minus for options so they don't get interpreted as hyphens.
> ---
>   docs/kimchid.8.in | 34 +++++++++++++++++-----------------
>   1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/docs/kimchid.8.in b/docs/kimchid.8.in
> index 08e96e5..d715e87 100644
> --- a/docs/kimchid.8.in
> +++ b/docs/kimchid.8.in
> @@ -17,35 +17,35 @@ supports HTML5.
>   .SH OPTIONS
>   The following options are supported:
>   .TP
> -\fB-h\fP , \fB--help\fP
> +\fB\-h\fP , \fB\-\-help\fP
>   Show this help message and exit.
>   .TP
> -\fB--host\fP \fIhost\fP
> +\fB\-\-host\fP \fIhost\fP
>   Specify the hostname or IP to listen on.
>   .TP
> -\fB--port\fP \fIport\fP
> +\fB\-\-port\fP \fIport\fP
>   Specify the HTTP port (default \fI8000\fP).
>   .TP
> -\fB--ssl-port\fP \fIssl_port\fP
> +\fB\-\-ssl-port\fP \fIssl_port\fP
>   Specify the HTTPS port (default \fI8001\fP).
>   .TP
> -\fB--cherrypy_port\fP \fIcherrypy_port\fP
> +\fB\-\-cherrypy_port\fP \fIcherrypy_port\fP
>   Specify the Cherrypy server port (default \fI8010\fP).
>   .TP
> -\fB--log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP]
> +\fB\-\-log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP]
>   Specify the log level (default \fIdebug\fP).
>   .TP
> -\fB--access-log\fP \fIaccess_log\fP
> +\fB\-\-access-log\fP \fIaccess_log\fP
>   Specify the access log location where kimchi should create the access log file.
>   .TP
> -\fB--environment\fP [\fIdevelopment\fP | \fIproduction\fP]
> +\fB\-\-environment\fP [\fIdevelopment\fP | \fIproduction\fP]
>   Specify the running environment of kimchi server. Check cherrypy documentation for more details (default \fIproduction\fP).
>   .TP
> -\fB--federation\fP [\fIon\fP | \fIoff\fP]
> +\fB\-\-federation\fP [\fIon\fP | \fIoff\fP]
>   Register and discover Kimchi peers in the same network using OpenSLP. Check
>   below the \fBFEDERATION\fP section for more details (default \fIoff\fP).
>   .TP
> -\fB--test\fP
> +\fB\-\-test\fP
>   Run kimchi on a mock version that does not affect the system. For testing proposals.
>   .SH FEDERATION
>   Federation feature is a mechanism to discover Kimchi peers in the same network.
> @@ -63,23 +63,23 @@ To enable it, do the following:
>      ports in your firewall configuration
>   
>      For system using firewalld, do:
> -   sudo firewall-cmd --permanent --add-port=427/udp
> -   sudo firewall-cmd --permanent --add-port=427/tcp
> -   sudo firewall-cmd --reload
> +   sudo firewall-cmd \-\-permanent \-\-add-port=427/udp
> +   sudo firewall-cmd \-\-permanent \-\-add-port=427/tcp
> +   sudo firewall-cmd \-\-reload
>   
>      For openSUSE systems, do:
>      sudo /sbin/SuSEfirewall2 open EXT TCP 427
>      sudo /sbin/SuSEfirewall2 open EXT UDP 427
>   
>      For system using iptables, do:
> -   sudo iptables -A INPUT -p tcp --dport 427 -j ACCEPT
> -   sudo iptables -A INPUT -p udp --dport 427 -j ACCEPT
> +   sudo iptables \-A INPUT \-p tcp \-\-dport 427 \-j ACCEPT
> +   sudo iptables \-A INPUT \-p udp \-\-dport 427 \-j ACCEPT
>   
>   3. In addition to the OpenSLP ports, you also need to allow multicast in the
>      firewall configuration
>   
>      For system using firewalld, do:
> -   sudo firewall-cmd --direct --add-rule ipv4 filter INPUT 0 -s <subnet> -j ACCEPT
> +   sudo firewall-cmd \-\-direct \-\-add-rule ipv4 filter INPUT 0 \-s <subnet> \-j ACCEPT
>   
>      For openSUSE systems, do:
>      Add the subnet to the trusted networks listed on FW_TRUSTED_NETS in
> @@ -87,7 +87,7 @@ To enable it, do the following:
>      Make sure to restart /sbin/SuSEfirewall2 after modifying /etc/sysconfig/SuSEfirewall2
>   
>      For system using iptables, do:
> -   sudo iptables -A INPUT -s <subnet> -j ACCEPT
> +   sudo iptables \-A INPUT \-s <subnet> \-j ACCEPT
>   
>   4. Start slpd service and make sure it is up while running Kimchi
>      sudo service slpd start



From stephan.conrad at gmail.com  Thu Jul  9 19:49:41 2015
From: stephan.conrad at gmail.com (stephan.conrad at gmail.com)
Date: Thu,  9 Jul 2015 21:49:41 +0200
Subject: [Kimchi-devel] [PATCH] Patched kimchi for psutils 3.0.1
Message-ID: <1436471382-13828-1-git-send-email-stephan.conrad@gmail.com>

From: Stephan Conrad <stephan.conrad at gmail.com>

Hi,

I have change the patch, so that it should work with older psutils versions.

Regards Stephan

Stephan Conrad (1):
  Patched kimchi for psutils 3.0.1

 src/kimchi/model/host.py | 17 ++++++++++++++---
 src/kimchi/osinfo.py     |  6 ++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

-- 
2.2.1



From stephan.conrad at gmail.com  Thu Jul  9 19:49:42 2015
From: stephan.conrad at gmail.com (stephan.conrad at gmail.com)
Date: Thu,  9 Jul 2015 21:49:42 +0200
Subject: [Kimchi-devel] [PATCH] Patched kimchi for psutils 3.0.1
In-Reply-To: <1436471382-13828-1-git-send-email-stephan.conrad@gmail.com>
References: <1436471382-13828-1-git-send-email-stephan.conrad@gmail.com>
Message-ID: <1436471382-13828-2-git-send-email-stephan.conrad@gmail.com>

From: Stephan Conrad <stephan.conrad at gmail.com>

Signed-off-by: Stephan Conrad <stephan.conrad at gmail.com>
---
 src/kimchi/model/host.py | 17 ++++++++++++++---
 src/kimchi/osinfo.py     |  6 ++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py
index b2fa379..03aa974 100644
--- a/src/kimchi/model/host.py
+++ b/src/kimchi/model/host.py
@@ -102,13 +102,16 @@ class HostModel(object):
         return res
 
     def lookup(self, *name):
-        cpus = psutil.NUM_CPUS
+        cpus = 0
 
         # psutil is unstable on how to get the number of
         # cpus, different versions call it differently
         if hasattr(psutil, 'cpu_count'):
             cpus = psutil.cpu_count()
 
+        elif hasattr(psutil, 'NUM_CPUS'):
+            cpus = psutil.NUM_CPUS
+
         elif hasattr(psutil, '_psplatform'):
             for method_name in ['_get_num_cpus', 'get_num_cpus']:
 
@@ -118,7 +121,10 @@ class HostModel(object):
                     break
 
         self.host_info['cpus'] = cpus
-        self.host_info['memory'] = psutil.phymem_usage().total
+        if hasattr(psutil,'phymem_usage'):
+            self.host_info['memory'] = psutil.phymem_usage().total
+        elif hasattr(psutil, 'virtual_memory'):
+            self.host_info['memory'] = psutil.virtual_memory().total
         return self.host_info
 
     def swupdate(self, *name):
@@ -248,7 +254,12 @@ class HostStatsModel(object):
         prev_recv_bytes = net_recv_bytes[-1] if net_recv_bytes else 0
         prev_sent_bytes = net_sent_bytes[-1] if net_sent_bytes else 0
 
-        net_ios = psutil.network_io_counters(True)
+        net_ios = None
+        if hasattr(psutil, 'net_io_counters'):
+            net_ios = psutil.net_io_counters(True)
+        elif hasattr(psutil, 'network_io_counters'):
+            net_ios = psutil.network_io_counters(True)
+
         recv_bytes = 0
         sent_bytes = 0
         for key in set(netinfo.nics() +
diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
index 78eb828..df10910 100644
--- a/src/kimchi/osinfo.py
+++ b/src/kimchi/osinfo.py
@@ -186,8 +186,10 @@ def lookup(distro, version):
     arch = _get_arch()
 
     # Setting maxMemory of the VM, which will be equal total Host memory in Kib
-    params['max_memory'] = psutil.TOTAL_PHYMEM >> 10
-
+    if hasattr(psutil, 'virtual_memory'):
+        params['max_memory'] = psutil.virtual_memory().total >> 10
+    else:
+        params['max_memory'] = psutil.TOTAL_PHYMEM >> 10
     # set up arch to ppc64 instead of ppc64le due to libvirt compatibility
     if params["arch"] == "ppc64le":
         params["arch"] = "ppc64"
-- 
2.2.1



From joserz at linux.vnet.ibm.com  Fri Jul 10 18:32:51 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Fri, 10 Jul 2015 15:32:51 -0300
Subject: [Kimchi-devel] [PATCH v2 0/4] Add usb xhci controller for hotplug
	on Power
Message-ID: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>

v2:
 - Added a new test case;

Power system requires an USB XHCI controller in order to allow PCI
hotplug. This patch adds such controller by default when creating a new
VM and inform the users if a VM currently doesn't have the controller.

Jose Ricardo Ziviani (4):
  Add a new error code for pci hotplug
  Check for usb xhci controller in Power platform
  Define the USB xhci controller in the template for Power Systems
  Add a new test case for pci hotplug on Power

 src/kimchi/i18n.py             |  1 +
 src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++-
 src/kimchi/vmtemplate.py       | 17 +++++++++++++
 tests/test_model.py            | 54 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 1 deletion(-)

-- 
1.9.1



From joserz at linux.vnet.ibm.com  Fri Jul 10 18:32:55 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Fri, 10 Jul 2015 15:32:55 -0300
Subject: [Kimchi-devel] [PATCH v2 4/4] Add a new test case for pci hotplug
	on Power
In-Reply-To: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436553175-23138-5-git-send-email-joserz@linux.vnet.ibm.com>

 - From now on all templates are created with xhci usb controller, so a
   hotplug must be performed flawlessly. If anything wrong the test case
   will fail.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 tests/test_model.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/tests/test_model.py b/tests/test_model.py
index 3828342..e1ad848 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -1205,6 +1205,60 @@ class ModelTests(unittest.TestCase):
         # remove files creates
         inst.repository_delete(repo_id)
 
+    def _host_is_PKVM():
+        import platform
+        distro, _, _ = platform.linux_distribution()
+        return distro == 'IBM_PowerKVM'
+
+    @unittest.skipUnless(_host_is_PKVM(), 'Only required for PowerKVM host')
+    def test_pci_hotplug_requires_xhci_usb_controller(self):
+        config.set("authentication", "method", "pam")
+        inst = model.Model(None, objstore_loc=self.tmp_store)
+        tpl_params = {'name': 'test', 'memory': 1024, 'cdrom': UBUNTU_ISO}
+        inst.templates_create(tpl_params)
+
+        with RollbackContext() as rollback:
+            vm_params = {'name': 'kimchi-vm1', 'template': '/templates/test'}
+            task1 = inst.vms_create(vm_params)
+            inst.task_wait(task1['id'])
+            rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete,
+                                  'kimchi-vm1')
+            # Start vm
+            inst.vm_start('kimchi-vm1')
+            rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff,
+                                  'kimchi-vm1')
+
+            # get a list with all pci devices supporting live attachment
+            pci_devices = inst.devices_get_list(_passthrough='true')
+            self.assertGreater(len(pci_devices), 0)
+
+            # search for an usb device to live attaching to avoid causing
+            # any problem to host during the tests
+            for pci_device in pci_devices:
+
+                device = inst.device_lookup(pci_device)
+
+                if 'product' not in device and 'description' not in \
+                   device['product']:
+                    continue
+
+                description = device['product']['description']
+
+                if not isinstance(description, str):
+                    continue
+
+                if 'usb' not in description.lower():
+                    continue
+
+                # attach the first device found
+                inst.vmhostdevs_create('kimchi-vm1', {'name': pci_device})
+                rollback.prependDefer(utils.rollback_wrapper,
+                                      inst.vmhostdev_delete,
+                                      'kimchi-vm1',
+                                      pci_device)
+
+                break
+
 
 class BaseModelTests(unittest.TestCase):
     class FoosModel(object):
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Fri Jul 10 18:32:54 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Fri, 10 Jul 2015 15:32:54 -0300
Subject: [Kimchi-devel] [PATCH v2 3/4] Define the USB xhci controller in the
	template for Power Systems
In-Reply-To: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436553175-23138-4-git-send-email-joserz@linux.vnet.ibm.com>

 - When creating VMs using Kimchi in a Power System, the USB xhci
   controller is defined by default to have PCI hotplug support.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/vmtemplate.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 79e04ed..3e42971 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -22,6 +22,7 @@ import stat
 import time
 import urlparse
 import uuid
+import platform
 
 from lxml import etree
 from lxml.builder import E
@@ -287,6 +288,19 @@ class VMTemplate(object):
                            self.info.get('memory') << 10,
                            cpu_topo)
 
+    def _get_usb_controller(self):
+        # powerkvm systems must include xhci controller model
+        distro, _, _ = platform.linux_distribution()
+        if distro != "IBM_PowerKVM":
+            return ''
+
+        return """
+        <controller type='usb' index='0' model='nec-xhci'>
+            <address type='pci' domain='0x0000'
+            bus='0x00' slot='0x0f' function='0x0'/>
+        </controller>
+        """
+
     def to_vm_xml(self, vm_name, vm_uuid, **kwargs):
         params = dict(self.info)
         params['name'] = vm_name
@@ -323,6 +337,8 @@ class VMTemplate(object):
         elif params['slots'] == 0:
             params['slots'] = 1
 
+        params['usb_controller'] = self._get_usb_controller()
+
         xml = """
         <domain type='%(domain)s'>
           %(qemu-stream-cmdline)s
@@ -352,6 +368,7 @@ class VMTemplate(object):
             %(networks)s
             %(graphics)s
             %(input_output)s
+            %(usb_controller)s
             <memballoon model='virtio' />
           </devices>
         </domain>
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Fri Jul 10 18:32:53 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Fri, 10 Jul 2015 15:32:53 -0300
Subject: [Kimchi-devel] [PATCH v2 2/4] Check for usb xhci controller in
	Power platform
In-Reply-To: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436553175-23138-3-git-send-email-joserz@linux.vnet.ibm.com>

 - Today it is not possible to hotplug a PCI in Power Systems without an
   USB xhci controller existing in the VM. This commit checks if there
   is such controller in the VM, displaying an error message if not.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index ea75fce..186e542 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -171,6 +171,26 @@ class VMHostDevsModel(object):
             if rc != 0:
                 kimchi_log.warning("Unable to turn on sebool virt_use_sysfs")
 
+    def _have_xhci_usb_controller(self, xmlstr):
+        root = objectify.fromstring(xmlstr)
+
+        try:
+            controllers = root.devices.controller
+
+        except AttributeError:
+            return False
+
+        for controller in controllers:
+
+            if 'model' not in controller.attrib:
+                continue
+
+            if controller.attrib['type'] == 'usb' and \
+               controller.attrib['model'] == 'nec-xhci':
+                return True
+
+        return False
+
     def _attach_pci_device(self, vmid, dev_info):
         self._validate_pci_passthrough_env()
 
@@ -180,11 +200,17 @@ class VMHostDevsModel(object):
         driver = ('vfio' if DOM_STATE_MAP[dom.info()[0]] == "shutoff" and
                   self.caps.kernel_vfio else 'kvm')
 
-        # on powerkvm systems it must be vfio driver.
         distro, _, _ = platform.linux_distribution()
         if distro == 'IBM_PowerKVM':
+            # on powerkvm systems, the driver must be vfio.
             driver = 'vfio'
 
+            # powerkvm requires a xhci usb controller in order to support
+            # pci hotplug.
+            if DOM_STATE_MAP[dom.info()[0]] != "shutoff" and \
+               not self._have_xhci_usb_controller(dom.XMLDesc(0)):
+                raise InvalidOperation("KCHVMHDEV0006E", {'vmid': vmid})
+
         # Attach all PCI devices in the same IOMMU group
         dev_model = DeviceModel(conn=self.conn)
         devs_model = DevicesModel(conn=self.conn)
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Fri Jul 10 18:32:52 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Fri, 10 Jul 2015 15:32:52 -0300
Subject: [Kimchi-devel] [PATCH v2 1/4] Add a new error code for pci hotplug
In-Reply-To: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436553175-23138-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436553175-23138-2-git-send-email-joserz@linux.vnet.ibm.com>

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/i18n.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index d2ffa34..54750d9 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -127,6 +127,7 @@ messages = {
                         "For AMD CPU, add iommu=pt iommu=1."),
     "KCHVMHDEV0004E": _('"name" should be a device name string'),
     "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'),
+    "KCHVMHDEV0006E": _('VM %(vmid)s does not have an USB XHCI controller to accept PCI hotplug.'),
 
     "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"),
     "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"),
-- 
1.9.1



From ramonn at linux.vnet.ibm.com  Fri Jul 10 20:57:37 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Fri, 10 Jul 2015 17:57:37 -0300
Subject: [Kimchi-devel] [DOUBT] How to use setTimeout correctly
Message-ID: <55A031C1.1000504@linux.vnet.ibm.com>

Hi team,

i was trying to cache 2 objects, but they came from a HTTP request, and 
took some time to download it. I was unable to use the function 
setTimeout while calling this function:

     kimchi.getPCIDeviceCompanions(kimchi.hostPCIs[i].name, 
setTimeout(function(result) {
         kimchi.deviceCompanions[kimchi.hostPCIs[i].name] = result;
     },5000));
}


The function kimchi.getPCIDeviceCompanions usually takes 2s to finish.

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com



From luciojhc at linux.vnet.ibm.com  Fri Jul 10 21:12:43 2015
From: luciojhc at linux.vnet.ibm.com (Lucio Correia)
Date: Fri, 10 Jul 2015 18:12:43 -0300
Subject: [Kimchi-devel] [wok] Move network and netinfo modules to kimchi
	plugin
Message-ID: <1436562763-21674-1-git-send-email-luciojhc@linux.vnet.ibm.com>

The modules network and netinfo are specific to kimchi. This
patch moves them from wok to kimchi plugin and adapts the
respective imports.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
---
 plugins/kimchi/model/host.py           |    2 +-
 plugins/kimchi/model/interfaces.py     |    2 +-
 plugins/kimchi/model/networks.py       |    4 ++--
 {src/wok => plugins/kimchi}/netinfo.py |    0
 {src/wok => plugins/kimchi}/network.py |    0
 plugins/kimchi/tests/test_model.py     |    2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename {src/wok => plugins/kimchi}/netinfo.py (100%)
 rename {src/wok => plugins/kimchi}/network.py (100%)

diff --git a/plugins/kimchi/model/host.py b/plugins/kimchi/model/host.py
index 3ff034c..8c891a1 100644
--- a/plugins/kimchi/model/host.py
+++ b/plugins/kimchi/model/host.py
@@ -25,7 +25,6 @@ import time
 from cherrypy.process.plugins import BackgroundTask
 from collections import defaultdict
 
-from wok import netinfo
 from wok.basemodel import Singleton
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import NotFoundError, OperationFailed
@@ -34,6 +33,7 @@ from wok.xmlutils.utils import xpath_get_text
 
 import hostdev
 from .. import disks
+from .. import netinfo
 from ..repositories import Repositories
 from ..swupdate import SoftwareUpdate
 from config import CapabilitiesModel
diff --git a/plugins/kimchi/model/interfaces.py b/plugins/kimchi/model/interfaces.py
index 81b379a..149afe3 100644
--- a/plugins/kimchi/model/interfaces.py
+++ b/plugins/kimchi/model/interfaces.py
@@ -17,9 +17,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
-from wok import netinfo
 from wok.exception import NotFoundError
 
+from .. import netinfo
 from networks import NetworksModel
 
 
diff --git a/plugins/kimchi/model/networks.py b/plugins/kimchi/model/networks.py
index 57af9e7..621055e 100644
--- a/plugins/kimchi/model/networks.py
+++ b/plugins/kimchi/model/networks.py
@@ -23,8 +23,6 @@ import sys
 import time
 from xml.sax.saxutils import escape
 
-from wok import netinfo
-from wok import network as knetwork
 from wok.config import PluginPaths
 from wok.exception import InvalidOperation, InvalidParameter
 from wok.exception import MissingParameter, NotFoundError, OperationFailed
@@ -32,6 +30,8 @@ from wok.rollbackcontext import RollbackContext
 from wok.utils import run_command, wok_log
 from wok.xmlutils.utils import xpath_get_text
 
+from .. import netinfo
+from .. import network as knetwork
 from ..osinfo import defaults as tmpl_defaults
 from ..xmlutils.network import create_vlan_tagged_bridge_xml
 from ..xmlutils.network import to_network_xml
diff --git a/src/wok/netinfo.py b/plugins/kimchi/netinfo.py
similarity index 100%
rename from src/wok/netinfo.py
rename to plugins/kimchi/netinfo.py
diff --git a/src/wok/network.py b/plugins/kimchi/network.py
similarity index 100%
rename from src/wok/network.py
rename to plugins/kimchi/network.py
diff --git a/plugins/kimchi/tests/test_model.py b/plugins/kimchi/tests/test_model.py
index c70e4fb..027b3c2 100644
--- a/plugins/kimchi/tests/test_model.py
+++ b/plugins/kimchi/tests/test_model.py
@@ -28,7 +28,6 @@ import unittest
 import uuid
 
 import wok.objectstore
-from wok import netinfo
 from wok.basemodel import Singleton
 from wok.config import config
 from wok.exception import InvalidOperation
@@ -36,6 +35,7 @@ from wok.exception import InvalidParameter, NotFoundError, OperationFailed
 from wok.rollbackcontext import RollbackContext
 from wok.utils import add_task
 
+from wok.plugins.kimchi import netinfo
 from wok.plugins.kimchi.osinfo import get_template_default
 from wok.plugins.kimchi.model import model
 from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection
-- 
1.7.1



From joserz at linux.vnet.ibm.com  Mon Jul 13 14:47:30 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Mon, 13 Jul 2015 11:47:30 -0300
Subject: [Kimchi-devel] [PATCH v3 1/4] Add a new error code for pci hotplug
In-Reply-To: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436798853-25107-2-git-send-email-joserz@linux.vnet.ibm.com>

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/i18n.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index d2ffa34..54750d9 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -127,6 +127,7 @@ messages = {
                         "For AMD CPU, add iommu=pt iommu=1."),
     "KCHVMHDEV0004E": _('"name" should be a device name string'),
     "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'),
+    "KCHVMHDEV0006E": _('VM %(vmid)s does not have an USB XHCI controller to accept PCI hotplug.'),
 
     "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"),
     "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"),
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Mon Jul 13 14:47:31 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Mon, 13 Jul 2015 11:47:31 -0300
Subject: [Kimchi-devel] [PATCH v3 2/4] Check for usb xhci controller in
	Power platform
In-Reply-To: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436798853-25107-3-git-send-email-joserz@linux.vnet.ibm.com>

 - Today it is not possible to hotplug a PCI in Power Systems without an
   USB xhci controller existing in the VM. This commit checks if there
   is such controller in the VM, displaying an error message if not.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/model/vmhostdevs.py | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index ea75fce..12226ca 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -171,6 +171,28 @@ class VMHostDevsModel(object):
             if rc != 0:
                 kimchi_log.warning("Unable to turn on sebool virt_use_sysfs")
 
+    def have_xhci_usb_controller(self, vmid):
+        dom = VMModel.get_vm(vmid, self.conn)
+
+        root = objectify.fromstring(dom.XMLDesc(0))
+
+        try:
+            controllers = root.devices.controller
+
+        except AttributeError:
+            return False
+
+        for controller in controllers:
+
+            if 'model' not in controller.attrib:
+                continue
+
+            if controller.attrib['type'] == 'usb' and \
+               controller.attrib['model'] == 'nec-xhci':
+                return True
+
+        return False
+
     def _attach_pci_device(self, vmid, dev_info):
         self._validate_pci_passthrough_env()
 
@@ -180,11 +202,17 @@ class VMHostDevsModel(object):
         driver = ('vfio' if DOM_STATE_MAP[dom.info()[0]] == "shutoff" and
                   self.caps.kernel_vfio else 'kvm')
 
-        # on powerkvm systems it must be vfio driver.
         distro, _, _ = platform.linux_distribution()
         if distro == 'IBM_PowerKVM':
+            # on powerkvm systems, the driver must be vfio.
             driver = 'vfio'
 
+            # powerkvm requires a xhci usb controller in order to support
+            # pci hotplug.
+            if DOM_STATE_MAP[dom.info()[0]] != "shutoff" and \
+               not self.have_xhci_usb_controller(vmid):
+                raise InvalidOperation("KCHVMHDEV0006E", {'vmid': vmid})
+
         # Attach all PCI devices in the same IOMMU group
         dev_model = DeviceModel(conn=self.conn)
         devs_model = DevicesModel(conn=self.conn)
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Mon Jul 13 14:47:29 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Mon, 13 Jul 2015 11:47:29 -0300
Subject: [Kimchi-devel] [PATCH v3 0/4] Add usb xhci controller for
	hotplug	on Power
Message-ID: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>

v3:
 - Changed test case to check if new VMs has a xhci controller;
 - Made have_xhci_usb_controller public to test it.

v2:
 - Added a new test case.

Power system requires an USB XHCI controller in order to allow PCI
hotplug. This patch adds such controller by default when creating a new
VM and inform the users if a VM currently doesn't have the controller.

Jose Ricardo Ziviani (4):
  Add a new error code for pci hotplug
  Check for usb xhci controller in Power platform
  Define the USB xhci controller in the template for Power Systems
  Add a new test case for pci hotplug on Power

 src/kimchi/i18n.py             |  1 +
 src/kimchi/model/vmhostdevs.py | 30 +++++++++++++++++++++++++++++-
 src/kimchi/vmtemplate.py       | 17 +++++++++++++++++
 tests/test_model.py            | 27 +++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)

-- 
1.9.1



From joserz at linux.vnet.ibm.com  Mon Jul 13 14:47:32 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Mon, 13 Jul 2015 11:47:32 -0300
Subject: [Kimchi-devel] [PATCH v3 3/4] Define the USB xhci controller in the
	template for Power Systems
In-Reply-To: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436798853-25107-4-git-send-email-joserz@linux.vnet.ibm.com>

 - When creating VMs using Kimchi in a Power System, the USB xhci
   controller is defined by default to have PCI hotplug support.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/vmtemplate.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 79e04ed..3e42971 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -22,6 +22,7 @@ import stat
 import time
 import urlparse
 import uuid
+import platform
 
 from lxml import etree
 from lxml.builder import E
@@ -287,6 +288,19 @@ class VMTemplate(object):
                            self.info.get('memory') << 10,
                            cpu_topo)
 
+    def _get_usb_controller(self):
+        # powerkvm systems must include xhci controller model
+        distro, _, _ = platform.linux_distribution()
+        if distro != "IBM_PowerKVM":
+            return ''
+
+        return """
+        <controller type='usb' index='0' model='nec-xhci'>
+            <address type='pci' domain='0x0000'
+            bus='0x00' slot='0x0f' function='0x0'/>
+        </controller>
+        """
+
     def to_vm_xml(self, vm_name, vm_uuid, **kwargs):
         params = dict(self.info)
         params['name'] = vm_name
@@ -323,6 +337,8 @@ class VMTemplate(object):
         elif params['slots'] == 0:
             params['slots'] = 1
 
+        params['usb_controller'] = self._get_usb_controller()
+
         xml = """
         <domain type='%(domain)s'>
           %(qemu-stream-cmdline)s
@@ -352,6 +368,7 @@ class VMTemplate(object):
             %(networks)s
             %(graphics)s
             %(input_output)s
+            %(usb_controller)s
             <memballoon model='virtio' />
           </devices>
         </domain>
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Mon Jul 13 14:47:33 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Mon, 13 Jul 2015 11:47:33 -0300
Subject: [Kimchi-devel] [PATCH v3 4/4] Add a new test case for pci hotplug
	on Power
In-Reply-To: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1436798853-25107-5-git-send-email-joserz@linux.vnet.ibm.com>

 - From now on all templates are created with xhci usb controller, so a
   hotplug must be performed flawlessly. If anything wrong the test case
   will fail.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 tests/test_model.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/test_model.py b/tests/test_model.py
index 3828342..896e29b 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -1205,6 +1205,33 @@ class ModelTests(unittest.TestCase):
         # remove files creates
         inst.repository_delete(repo_id)
 
+    def _host_is_PKVM():
+        import platform
+        distro, _, _ = platform.linux_distribution()
+        return distro == 'IBM_PowerKVM'
+
+    @unittest.skipUnless(_host_is_PKVM(), 'Only required for PowerKVM host')
+    def test_pci_hotplug_requires_xhci_usb_controller(self):
+        config.set("authentication", "method", "pam")
+        inst = model.Model(None, objstore_loc=self.tmp_store)
+        tpl_params = {'name': 'test', 'memory': 1024, 'cdrom': UBUNTU_ISO}
+        inst.templates_create(tpl_params)
+
+        with RollbackContext() as rollback:
+            vm_params = {'name': 'kimchi-vm1', 'template': '/templates/test'}
+            task1 = inst.vms_create(vm_params)
+            inst.task_wait(task1['id'])
+            rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete,
+                                  'kimchi-vm1')
+            # Start vm
+            inst.vm_start('kimchi-vm1')
+            rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff,
+                                  'kimchi-vm1')
+
+            # check if create VM has USB XHCI controller
+            self.assertTrue(
+                inst.vmhostdevs_have_xhci_usb_controller('kimchi-vm1'))
+
 
 class BaseModelTests(unittest.TestCase):
     class FoosModel(object):
-- 
1.9.1



From dhbarboza82 at gmail.com  Mon Jul 13 18:15:42 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 13 Jul 2015 15:15:42 -0300
Subject: [Kimchi-devel] [PATCH v3 0/4] Add usb xhci controller for
 hotplug on Power
In-Reply-To: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <55A4004E.6010900@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/13/2015 11:47 AM, Jose Ricardo Ziviani wrote:
> v3:
>   - Changed test case to check if new VMs has a xhci controller;
>   - Made have_xhci_usb_controller public to test it.
>
> v2:
>   - Added a new test case.
>
> Power system requires an USB XHCI controller in order to allow PCI
> hotplug. This patch adds such controller by default when creating a new
> VM and inform the users if a VM currently doesn't have the controller.
>
> Jose Ricardo Ziviani (4):
>    Add a new error code for pci hotplug
>    Check for usb xhci controller in Power platform
>    Define the USB xhci controller in the template for Power Systems
>    Add a new test case for pci hotplug on Power
>
>   src/kimchi/i18n.py             |  1 +
>   src/kimchi/model/vmhostdevs.py | 30 +++++++++++++++++++++++++++++-
>   src/kimchi/vmtemplate.py       | 17 +++++++++++++++++
>   tests/test_model.py            | 27 +++++++++++++++++++++++++++
>   4 files changed, 74 insertions(+), 1 deletion(-)
>



From dhbarboza82 at gmail.com  Mon Jul 13 19:09:47 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 13 Jul 2015 16:09:47 -0300
Subject: [Kimchi-devel] [PATCH] Fix minus in manpage
In-Reply-To: <559E8DB7.6030102@gmail.com>
References: <1436195456-18218-1-git-send-email-frediz@linux.vnet.ibm.com>
	<559E8DB7.6030102@gmail.com>
Message-ID: <55A40CFB.8040102@gmail.com>

Patch applied to https://github.com/danielhb/kimchi master branch

Thanks!

On 07/09/2015 12:05 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> On 07/06/2015 12:10 PM, Fr?d?ric Bonnard wrote:
>> From: Frederic Bonnard <frediz at linux.vnet.ibm.com>
>>
>> Escape minus for options so they don't get interpreted as hyphens.
>> ---
>>   docs/kimchid.8.in | 34 +++++++++++++++++-----------------
>>   1 file changed, 17 insertions(+), 17 deletions(-)
>>
>> diff --git a/docs/kimchid.8.in b/docs/kimchid.8.in
>> index 08e96e5..d715e87 100644
>> --- a/docs/kimchid.8.in
>> +++ b/docs/kimchid.8.in
>> @@ -17,35 +17,35 @@ supports HTML5.
>>   .SH OPTIONS
>>   The following options are supported:
>>   .TP
>> -\fB-h\fP , \fB--help\fP
>> +\fB\-h\fP , \fB\-\-help\fP
>>   Show this help message and exit.
>>   .TP
>> -\fB--host\fP \fIhost\fP
>> +\fB\-\-host\fP \fIhost\fP
>>   Specify the hostname or IP to listen on.
>>   .TP
>> -\fB--port\fP \fIport\fP
>> +\fB\-\-port\fP \fIport\fP
>>   Specify the HTTP port (default \fI8000\fP).
>>   .TP
>> -\fB--ssl-port\fP \fIssl_port\fP
>> +\fB\-\-ssl-port\fP \fIssl_port\fP
>>   Specify the HTTPS port (default \fI8001\fP).
>>   .TP
>> -\fB--cherrypy_port\fP \fIcherrypy_port\fP
>> +\fB\-\-cherrypy_port\fP \fIcherrypy_port\fP
>>   Specify the Cherrypy server port (default \fI8010\fP).
>>   .TP
>> -\fB--log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | 
>> \fIerror\fP | \fIcritical\fP]
>> +\fB\-\-log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | 
>> \fIerror\fP | \fIcritical\fP]
>>   Specify the log level (default \fIdebug\fP).
>>   .TP
>> -\fB--access-log\fP \fIaccess_log\fP
>> +\fB\-\-access-log\fP \fIaccess_log\fP
>>   Specify the access log location where kimchi should create the 
>> access log file.
>>   .TP
>> -\fB--environment\fP [\fIdevelopment\fP | \fIproduction\fP]
>> +\fB\-\-environment\fP [\fIdevelopment\fP | \fIproduction\fP]
>>   Specify the running environment of kimchi server. Check cherrypy 
>> documentation for more details (default \fIproduction\fP).
>>   .TP
>> -\fB--federation\fP [\fIon\fP | \fIoff\fP]
>> +\fB\-\-federation\fP [\fIon\fP | \fIoff\fP]
>>   Register and discover Kimchi peers in the same network using 
>> OpenSLP. Check
>>   below the \fBFEDERATION\fP section for more details (default 
>> \fIoff\fP).
>>   .TP
>> -\fB--test\fP
>> +\fB\-\-test\fP
>>   Run kimchi on a mock version that does not affect the system. For 
>> testing proposals.
>>   .SH FEDERATION
>>   Federation feature is a mechanism to discover Kimchi peers in the 
>> same network.
>> @@ -63,23 +63,23 @@ To enable it, do the following:
>>      ports in your firewall configuration
>>        For system using firewalld, do:
>> -   sudo firewall-cmd --permanent --add-port=427/udp
>> -   sudo firewall-cmd --permanent --add-port=427/tcp
>> -   sudo firewall-cmd --reload
>> +   sudo firewall-cmd \-\-permanent \-\-add-port=427/udp
>> +   sudo firewall-cmd \-\-permanent \-\-add-port=427/tcp
>> +   sudo firewall-cmd \-\-reload
>>        For openSUSE systems, do:
>>      sudo /sbin/SuSEfirewall2 open EXT TCP 427
>>      sudo /sbin/SuSEfirewall2 open EXT UDP 427
>>        For system using iptables, do:
>> -   sudo iptables -A INPUT -p tcp --dport 427 -j ACCEPT
>> -   sudo iptables -A INPUT -p udp --dport 427 -j ACCEPT
>> +   sudo iptables \-A INPUT \-p tcp \-\-dport 427 \-j ACCEPT
>> +   sudo iptables \-A INPUT \-p udp \-\-dport 427 \-j ACCEPT
>>     3. In addition to the OpenSLP ports, you also need to allow 
>> multicast in the
>>      firewall configuration
>>        For system using firewalld, do:
>> -   sudo firewall-cmd --direct --add-rule ipv4 filter INPUT 0 -s 
>> <subnet> -j ACCEPT
>> +   sudo firewall-cmd \-\-direct \-\-add-rule ipv4 filter INPUT 0 \-s 
>> <subnet> \-j ACCEPT
>>        For openSUSE systems, do:
>>      Add the subnet to the trusted networks listed on FW_TRUSTED_NETS in
>> @@ -87,7 +87,7 @@ To enable it, do the following:
>>      Make sure to restart /sbin/SuSEfirewall2 after modifying 
>> /etc/sysconfig/SuSEfirewall2
>>        For system using iptables, do:
>> -   sudo iptables -A INPUT -s <subnet> -j ACCEPT
>> +   sudo iptables \-A INPUT \-s <subnet> \-j ACCEPT
>>     4. Start slpd service and make sure it is up while running Kimchi
>>      sudo service slpd start
>



From socorro at linux.vnet.ibm.com  Mon Jul 13 19:18:49 2015
From: socorro at linux.vnet.ibm.com (Socorro Stoppler)
Date: Mon, 13 Jul 2015 12:18:49 -0700
Subject: [Kimchi-devel] [PATCH] Fix numerous errors in UI when host is shut
	down
Message-ID: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>

From: Socorro Stoppler <socorrob at us.ibm.com>

Fix numerous errors in UI when host is shut down

Socorro Stoppler (1):
  Fix displaying numerous error msgs when host is shut down

 ui/js/src/kimchi.main.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

-- 
1.9.1



From socorro at linux.vnet.ibm.com  Mon Jul 13 19:18:50 2015
From: socorro at linux.vnet.ibm.com (Socorro Stoppler)
Date: Mon, 13 Jul 2015 12:18:50 -0700
Subject: [Kimchi-devel] [PATCH] Fix displaying numerous error msgs when host
	is shut down
In-Reply-To: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
Message-ID: <1436815130-11234-2-git-send-email-socorro@linux.vnet.ibm.com>

From: Socorro Stoppler <socorrob at us.ibm.com>

Fix displaying numerous error msgs when host is shut down

Signed-off-by: Socorro Stoppler <socorrob at us.ibm.com>
---
 ui/js/src/kimchi.main.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
index 0d4ad43..763834a 100644
--- a/ui/js/src/kimchi.main.js
+++ b/ui/js/src/kimchi.main.js
@@ -300,6 +300,7 @@ kimchi.main = function() {
     };
 
     var initUI = function() {
+        var errorMsg = "";
         $(document).bind('ajaxError', function(event, jqXHR, ajaxSettings, errorThrown) {
             if (!ajaxSettings['kimchi']) {
                 return;
@@ -314,8 +315,9 @@ kimchi.main = function() {
                 document.location.href= isSessionTimeout ? 'login.html?error=sessionTimeout' : 'login.html';
                 return;
             }
-            else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText) && !kimchi.isLoggingOut) {
-                kimchi.message.error(i18n['KCHAPI6007E'].replace("%1", jqXHR.state()));
+            else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText) && !kimchi.isLoggingOut && errorMsg == "") {
+               errorMsg = i18n['KCHAPI6007E'].replace("%1", jqXHR.state());
+               kimchi.message.error(errorMsg);
             }
             if(ajaxSettings['originalError']) {
                 ajaxSettings['originalError'](jqXHR, jqXHR.statusText, errorThrown);
@@ -325,6 +327,7 @@ kimchi.main = function() {
         kimchi.user.showUser(true);
         initListeners();
         updatePage();
+
     };
 
     // Load i18n translation strings first and then render the page.
-- 
1.9.1



From dhbarboza82 at gmail.com  Mon Jul 13 19:27:06 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 13 Jul 2015 16:27:06 -0300
Subject: [Kimchi-devel] [PATCH 0/4] Improve VM CPU update code
In-Reply-To: <1435598484-32080-1-git-send-email-cristiandeives@gmail.com>
References: <1435598484-32080-1-git-send-email-cristiandeives@gmail.com>
Message-ID: <55A4110A.2060107@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 06/29/2015 02:21 PM, Cr?stian Deives wrote:
> This patchset refactors part of the code related to updating VM CPUs.
>
> I am aware of two tests which are failing with this patchset. They'll be worked
> on before the final version.
>
> Cr?stian Deives (4):
>    Use locks to prevent concurrent updates to VMs
>    Update VCPU by using libvirt function
>    Set max VCPU count to the max supported value
>    Check if the VM update params are valid for the current state
>
>   src/kimchi/i18n.py      |  3 ++-
>   src/kimchi/mockmodel.py | 48 ++++++++++++++------------------------
>   src/kimchi/model/vms.py | 62 ++++++++++++++++++++++++++++++++++++++-----------
>   tests/test_rest.py      |  3 ++-
>   4 files changed, 71 insertions(+), 45 deletions(-)
>



From dhbarboza82 at gmail.com  Mon Jul 13 19:29:19 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 13 Jul 2015 16:29:19 -0300
Subject: [Kimchi-devel] [PATCH] Fix displaying numerous error msgs when
 host is shut down
In-Reply-To: <1436815130-11234-2-git-send-email-socorro@linux.vnet.ibm.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
	<1436815130-11234-2-git-send-email-socorro@linux.vnet.ibm.com>
Message-ID: <55A4118F.6010308@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

ps: I'll remove the extra blank line when pushing it

On 07/13/2015 04:18 PM, Socorro Stoppler wrote:
> From: Socorro Stoppler <socorrob at us.ibm.com>
>
> Fix displaying numerous error msgs when host is shut down
>
> Signed-off-by: Socorro Stoppler <socorrob at us.ibm.com>
> ---
>   ui/js/src/kimchi.main.js | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
> index 0d4ad43..763834a 100644
> --- a/ui/js/src/kimchi.main.js
> +++ b/ui/js/src/kimchi.main.js
> @@ -300,6 +300,7 @@ kimchi.main = function() {
>       };
>   
>       var initUI = function() {
> +        var errorMsg = "";
>           $(document).bind('ajaxError', function(event, jqXHR, ajaxSettings, errorThrown) {
>               if (!ajaxSettings['kimchi']) {
>                   return;
> @@ -314,8 +315,9 @@ kimchi.main = function() {
>                   document.location.href= isSessionTimeout ? 'login.html?error=sessionTimeout' : 'login.html';
>                   return;
>               }
> -            else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText) && !kimchi.isLoggingOut) {
> -                kimchi.message.error(i18n['KCHAPI6007E'].replace("%1", jqXHR.state()));
> +            else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText) && !kimchi.isLoggingOut && errorMsg == "") {
> +               errorMsg = i18n['KCHAPI6007E'].replace("%1", jqXHR.state());
> +               kimchi.message.error(errorMsg);
>               }
>               if(ajaxSettings['originalError']) {
>                   ajaxSettings['originalError'](jqXHR, jqXHR.statusText, errorThrown);
> @@ -325,6 +327,7 @@ kimchi.main = function() {
>           kimchi.user.showUser(true);
>           initListeners();
>           updatePage();
> +
>       };
>   
>       // Load i18n translation strings first and then render the page.



From dhbarboza82 at gmail.com  Mon Jul 13 19:49:06 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 13 Jul 2015 16:49:06 -0300
Subject: [Kimchi-devel] [PATCH v3 0/4] Add usb xhci controller for
 hotplug on Power
In-Reply-To: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1436798853-25107-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <55A41632.6020309@gmail.com>

Patch applied to  https://github.com/danielhb/kimchi master branch

Thanks!

On 07/13/2015 11:47 AM, Jose Ricardo Ziviani wrote:
> v3:
>   - Changed test case to check if new VMs has a xhci controller;
>   - Made have_xhci_usb_controller public to test it.
>
> v2:
>   - Added a new test case.
>
> Power system requires an USB XHCI controller in order to allow PCI
> hotplug. This patch adds such controller by default when creating a new
> VM and inform the users if a VM currently doesn't have the controller.
>
> Jose Ricardo Ziviani (4):
>    Add a new error code for pci hotplug
>    Check for usb xhci controller in Power platform
>    Define the USB xhci controller in the template for Power Systems
>    Add a new test case for pci hotplug on Power
>
>   src/kimchi/i18n.py             |  1 +
>   src/kimchi/model/vmhostdevs.py | 30 +++++++++++++++++++++++++++++-
>   src/kimchi/vmtemplate.py       | 17 +++++++++++++++++
>   tests/test_model.py            | 27 +++++++++++++++++++++++++++
>   4 files changed, 74 insertions(+), 1 deletion(-)
>



From dhbarboza82 at gmail.com  Mon Jul 13 19:54:32 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 13 Jul 2015 16:54:32 -0300
Subject: [Kimchi-devel] [PATCH] Fix displaying numerous error msgs when
 host is shut down
In-Reply-To: <55A4118F.6010308@gmail.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
	<1436815130-11234-2-git-send-email-socorro@linux.vnet.ibm.com>
	<55A4118F.6010308@gmail.com>
Message-ID: <55A41778.6050907@gmail.com>

Patch applied to https://github.com/danielhb/kimchi master branch

Thanks!

On 07/13/2015 04:29 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> ps: I'll remove the extra blank line when pushing it
>
> On 07/13/2015 04:18 PM, Socorro Stoppler wrote:
>> From: Socorro Stoppler <socorrob at us.ibm.com>
>>
>> Fix displaying numerous error msgs when host is shut down
>>
>> Signed-off-by: Socorro Stoppler <socorrob at us.ibm.com>
>> ---
>>   ui/js/src/kimchi.main.js | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js
>> index 0d4ad43..763834a 100644
>> --- a/ui/js/src/kimchi.main.js
>> +++ b/ui/js/src/kimchi.main.js
>> @@ -300,6 +300,7 @@ kimchi.main = function() {
>>       };
>>         var initUI = function() {
>> +        var errorMsg = "";
>>           $(document).bind('ajaxError', function(event, jqXHR, 
>> ajaxSettings, errorThrown) {
>>               if (!ajaxSettings['kimchi']) {
>>                   return;
>> @@ -314,8 +315,9 @@ kimchi.main = function() {
>>                   document.location.href= isSessionTimeout ? 
>> 'login.html?error=sessionTimeout' : 'login.html';
>>                   return;
>>               }
>> -            else if((jqXHR['status'] == 0) && 
>> ("error"==jqXHR.statusText) && !kimchi.isLoggingOut) {
>> - kimchi.message.error(i18n['KCHAPI6007E'].replace("%1", 
>> jqXHR.state()));
>> +            else if((jqXHR['status'] == 0) && 
>> ("error"==jqXHR.statusText) && !kimchi.isLoggingOut && errorMsg == "") {
>> +               errorMsg = i18n['KCHAPI6007E'].replace("%1", 
>> jqXHR.state());
>> +               kimchi.message.error(errorMsg);
>>               }
>>               if(ajaxSettings['originalError']) {
>>                   ajaxSettings['originalError'](jqXHR, 
>> jqXHR.statusText, errorThrown);
>> @@ -325,6 +327,7 @@ kimchi.main = function() {
>>           kimchi.user.showUser(true);
>>           initListeners();
>>           updatePage();
>> +
>>       };
>>         // Load i18n translation strings first and then render the page.
>



From cristiandeives at gmail.com  Tue Jul 14 12:06:10 2015
From: cristiandeives at gmail.com (=?UTF-8?Q?Cr=C3=ADstian_Viana?=)
Date: Tue, 14 Jul 2015 12:06:10 +0000
Subject: [Kimchi-devel] [PATCH] Fix numerous errors in UI when host is
 shut down
In-Reply-To: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
Message-ID: <CADqiwxwmdZ3tE_8r6Y4Cjb0Dp=0hNm90wNEuWtAxH83KH=yn1A@mail.gmail.com>

Does this patch fix issue #510?

On Mon, Jul 13, 2015 at 4:19 PM Socorro Stoppler <socorro at linux.vnet.ibm.com>
wrote:

> From: Socorro Stoppler <socorrob at us.ibm.com>
>
> Fix numerous errors in UI when host is shut down
>
> Socorro Stoppler (1):
>   Fix displaying numerous error msgs when host is shut down
>
>  ui/js/src/kimchi.main.js | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> --
> 1.9.1
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150714/5507d4c4/attachment.html>

From danielhb at linux.vnet.ibm.com  Tue Jul 14 12:08:56 2015
From: danielhb at linux.vnet.ibm.com (Daniel Henrique Barboza)
Date: Tue, 14 Jul 2015 09:08:56 -0300
Subject: [Kimchi-devel] [PATCH] Fix numerous errors in UI when host is
 shut down
In-Reply-To: <CADqiwxwmdZ3tE_8r6Y4Cjb0Dp=0hNm90wNEuWtAxH83KH=yn1A@mail.gmail.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
	<CADqiwxwmdZ3tE_8r6Y4Cjb0Dp=0hNm90wNEuWtAxH83KH=yn1A@mail.gmail.com>
Message-ID: <55A4FBD8.2030805@linux.vnet.ibm.com>



On 07/14/2015 09:06 AM, Cr?stian Viana wrote:
> Does this patch fix issue #510?

At first glance, yeah. Socorro, care to check 
https://github.com/kimchi-project/kimchi/issues/510 to
see if this github issue matches the same issue you fixed with this patch?

>
> On Mon, Jul 13, 2015 at 4:19 PM Socorro Stoppler 
> <socorro at linux.vnet.ibm.com <mailto:socorro at linux.vnet.ibm.com>> wrote:
>
>     From: Socorro Stoppler <socorrob at us.ibm.com
>     <mailto:socorrob at us.ibm.com>>
>
>     Fix numerous errors in UI when host is shut down
>
>     Socorro Stoppler (1):
>       Fix displaying numerous error msgs when host is shut down
>
>      ui/js/src/kimchi.main.js | 7 +++++--
>      1 file changed, 5 insertions(+), 2 deletions(-)
>
>     --
>     1.9.1
>
>     _______________________________________________
>     Kimchi-devel mailing list
>     Kimchi-devel at ovirt.org <mailto:Kimchi-devel at ovirt.org>
>     http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
>
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150714/6fbc5189/attachment.html>

From cristiandeives at gmail.com  Tue Jul 14 12:14:55 2015
From: cristiandeives at gmail.com (=?UTF-8?Q?Cr=C3=ADstian_Viana?=)
Date: Tue, 14 Jul 2015 12:14:55 +0000
Subject: [Kimchi-devel] [DOUBT] How to use setTimeout correctly
In-Reply-To: <55A031C1.1000504@linux.vnet.ibm.com>
References: <55A031C1.1000504@linux.vnet.ibm.com>
Message-ID: <CADqiwxzJqmDXzRfqP1=UFTHq81JguA2BytQkwsdz0O2LgBM0RQ@mail.gmail.com>

The function "kimchi.getPCIDeviceCompanions" (and most other Kimchi
JavaScript functions, actually) receives a callback function which receives
a result parameter. That function should be executed when the result is
ready. In your case, your parameter function doesn't match this requirement
(i.e. you're passing a function which receives a function which receives a
parameter). You need to pass parameters exactly as they're expected by the
main function.

Also, why are you using setTimeout at all?

On Fri, Jul 10, 2015 at 5:57 PM Ramon Medeiros <ramonn at linux.vnet.ibm.com>
wrote:

> Hi team,
>
> i was trying to cache 2 objects, but they came from a HTTP request, and
> took some time to download it. I was unable to use the function
> setTimeout while calling this function:
>
>      kimchi.getPCIDeviceCompanions(kimchi.hostPCIs[i].name,
> setTimeout(function(result) {
>          kimchi.deviceCompanions[kimchi.hostPCIs[i].name] = result;
>      },5000));
> }
>
>
> The function kimchi.getPCIDeviceCompanions usually takes 2s to finish.
>
> --
>
> Ramon Nunes Medeiros
> Kimchi Developer
> Linux Technology Center Brazil
> IBM Systems & Technology Group
> Phone : +55 19 2132 7878
> ramonn at br.ibm.com
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150714/8b9ee996/attachment.html>

From socorro at linux.vnet.ibm.com  Tue Jul 14 13:46:12 2015
From: socorro at linux.vnet.ibm.com (Socorro Stoppler)
Date: Tue, 14 Jul 2015 06:46:12 -0700
Subject: [Kimchi-devel] [PATCH] Fix numerous errors in UI when host is
 shut down
In-Reply-To: <CADqiwxwmdZ3tE_8r6Y4Cjb0Dp=0hNm90wNEuWtAxH83KH=yn1A@mail.gmail.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
	<CADqiwxwmdZ3tE_8r6Y4Cjb0Dp=0hNm90wNEuWtAxH83KH=yn1A@mail.gmail.com>
Message-ID: <55A512A4.10601@linux.vnet.ibm.com>

Per discussion w/Aline before, the error msg should only be shown once 
when the host is shut down instead of numerous times as stated in the issue.
That is what the patch addresses.  I see that the issue mentions logging 
off in this situation as well but that was not discussed w/Aline.  Will 
check w/Daniel
regarding this since Aline is not available.  Thanks.

On 07/14/2015 05:06 AM, Cr?stian Viana wrote:
> Does this patch fix issue #510?
>
> On Mon, Jul 13, 2015 at 4:19 PM Socorro Stoppler 
> <socorro at linux.vnet.ibm.com <mailto:socorro at linux.vnet.ibm.com>> wrote:
>
>     From: Socorro Stoppler <socorrob at us.ibm.com
>     <mailto:socorrob at us.ibm.com>>
>
>     Fix numerous errors in UI when host is shut down
>
>     Socorro Stoppler (1):
>       Fix displaying numerous error msgs when host is shut down
>
>      ui/js/src/kimchi.main.js | 7 +++++--
>      1 file changed, 5 insertions(+), 2 deletions(-)
>
>     --
>     1.9.1
>
>     _______________________________________________
>     Kimchi-devel mailing list
>     Kimchi-devel at ovirt.org <mailto:Kimchi-devel at ovirt.org>
>     http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150714/b5e45a09/attachment.html>

From dhbarboza82 at gmail.com  Tue Jul 14 15:00:02 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Tue, 14 Jul 2015 12:00:02 -0300
Subject: [Kimchi-devel] [PATCH 0/3] New backend API: get available devices
	from host
Message-ID: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

This patch set adds a new API to retrieve only the available devices
from the host. 'available' means only the devices that weren't
attached to any other VM.

The backend is generic and can work with all devices, but the API
provided here is made for 'PCI' devices only as we do not provide
official support for USB and SCSI passthrough yet.

Usage:

get all available devices:

$ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true"

get all available PCI devices:

$ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true&_cap=pci"

Daniel Henrique Barboza (3):
  Get available host passthrough devices: model changes
  Adding new API in the UI APIs and docs
  Mockmodel and test changes for the new API

 docs/API.md                    |   2 +
 src/kimchi/API.json            |   6 +++
 src/kimchi/i18n.py             |   1 +
 src/kimchi/mockmodel.py        |   3 +-
 src/kimchi/model/host.py       | 105 ++++++++++++++++++++++++++++++++++++++++-
 src/kimchi/model/vmhostdevs.py |  75 ++---------------------------
 tests/test_host.py             |  11 +++++
 ui/js/src/kimchi.api.js        |  14 ++++++
 8 files changed, 144 insertions(+), 73 deletions(-)

-- 
2.4.3



From dhbarboza82 at gmail.com  Tue Jul 14 15:00:03 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Tue, 14 Jul 2015 12:00:03 -0300
Subject: [Kimchi-devel] [PATCH 1/3] Get available host passthrough devices:
	model changes
In-Reply-To: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
References: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <1436886005-11693-2-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

- a new method was introduced in model/host.py that returns all
the unavailable devices that are being used by all the VMs in
the host. This method is used by the get_list() call when
the parameter _available_only is set to 'true'.

- to avoid problems with circular dependencies, the deduce_dev_name
method was moved from model/vmhostdevs to model/host.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 src/kimchi/model/host.py       | 105 ++++++++++++++++++++++++++++++++++++++++-
 src/kimchi/model/vmhostdevs.py |  75 ++---------------------------
 2 files changed, 108 insertions(+), 72 deletions(-)

diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py
index b2fa379..e51ede4 100644
--- a/src/kimchi/model/host.py
+++ b/src/kimchi/model/host.py
@@ -22,6 +22,7 @@ import os
 import time
 import platform
 from collections import defaultdict
+from lxml import objectify
 
 import psutil
 from cherrypy.process.plugins import BackgroundTask
@@ -34,7 +35,7 @@ from kimchi.exception import InvalidOperation, InvalidParameter
 from kimchi.exception import NotFoundError, OperationFailed
 from kimchi.model.config import CapabilitiesModel
 from kimchi.model.tasks import TaskModel
-from kimchi.model.vms import DOM_STATE_MAP
+from kimchi.model.vms import DOM_STATE_MAP, VMModel, VMsModel
 from kimchi.repositories import Repositories
 from kimchi.swupdate import SoftwareUpdate
 from kimchi.utils import add_task, kimchi_log
@@ -318,8 +319,29 @@ class DevicesModel(object):
         except AttributeError:
             self.cap_map['fc_host'] = None
 
+    def _get_unavailable_devices(self):
+        vm_list = VMsModel.get_vms(self.conn)
+        unavailable_devs = []
+        for vm in vm_list:
+            dom = VMModel.get_vm(vm, self.conn)
+            xmlstr = dom.XMLDesc(0)
+            root = objectify.fromstring(xmlstr)
+            try:
+                hostdev = root.devices.hostdev
+            except AttributeError:
+                continue
+
+            vm_devs = [DeviceModel.deduce_dev_name(e, self.conn)
+                       for e in hostdev]
+
+            for dev in vm_devs:
+                unavailable_devs.append(dev)
+
+        return unavailable_devs
+
     def get_list(self, _cap=None, _passthrough=None,
-                 _passthrough_affected_by=None):
+                 _passthrough_affected_by=None,
+                 _available_only=None):
         if _passthrough_affected_by is not None:
             # _passthrough_affected_by conflicts with _cap and _passthrough
             if (_cap, _passthrough) != (None, None):
@@ -336,8 +358,15 @@ class DevicesModel(object):
             conn = self.conn.get()
             passthrough_names = [
                 dev['name'] for dev in hostdev.get_passthrough_dev_infos(conn)]
+
             dev_names = list(set(dev_names) & set(passthrough_names))
 
+            if _available_only is not None and _available_only.lower() \
+                    == 'true':
+                unavailable_devs = self._get_unavailable_devices()
+                dev_names = [dev for dev in dev_names
+                             if dev not in unavailable_devs]
+
         dev_names.sort()
         return dev_names
 
@@ -390,6 +419,78 @@ class DeviceModel(object):
             raise NotFoundError('KCHHOST0003E', {'name': nodedev_name})
         return hostdev.get_dev_info(dev)
 
+    @staticmethod
+    def _toint(num_str):
+        if num_str.startswith('0x'):
+            return int(num_str, 16)
+        elif num_str.startswith('0'):
+            return int(num_str, 8)
+        else:
+            return int(num_str)
+
+    @staticmethod
+    def deduce_dev_name(e, conn):
+        if e.attrib['type'] == 'pci':
+            return DeviceModel._deduce_dev_name_pci(e)
+        elif e.attrib['type'] == 'scsi':
+            return DeviceModel._deduce_dev_name_scsi(e)
+        elif e.attrib['type'] == 'usb':
+            return DeviceModel._deduce_dev_name_usb(e, conn)
+        return None
+
+    @staticmethod
+    def _deduce_dev_name_pci(e):
+        attrib = {}
+        for field in ('domain', 'bus', 'slot', 'function'):
+            attrib[field] = DeviceModel._toint(e.source.address.attrib[field])
+        return 'pci_%(domain)04x_%(bus)02x_%(slot)02x_%(function)x' % attrib
+
+    @staticmethod
+    def _deduce_dev_name_scsi(e):
+        attrib = {}
+        for field in ('bus', 'target', 'unit'):
+            attrib[field] = DeviceModel._toint(e.source.address.attrib[field])
+        attrib['host'] = DeviceModel._toint(
+            e.source.adapter.attrib['name'][len('scsi_host'):])
+        return 'scsi_%(host)d_%(bus)d_%(target)d_%(unit)d' % attrib
+
+    @staticmethod
+    def _deduce_dev_name_usb(e, conn):
+        dev_names = DevicesModel(conn=conn).get_list(_cap='usb_device')
+        usb_infos = [DeviceModel(conn=conn).lookup(dev_name)
+                     for dev_name in dev_names]
+
+        unknown_dev = None
+
+        try:
+            evendor = DeviceModel._toint(e.source.vendor.attrib['id'])
+            eproduct = DeviceModel._toint(e.source.product.attrib['id'])
+        except AttributeError:
+            evendor = 0
+            eproduct = 0
+        else:
+            unknown_dev = 'usb_vendor_%s_product_%s' % (evendor, eproduct)
+
+        try:
+            ebus = DeviceModel._toint(e.source.address.attrib['bus'])
+            edevice = DeviceModel._toint(e.source.address.attrib['device'])
+        except AttributeError:
+            ebus = -1
+            edevice = -1
+        else:
+            unknown_dev = 'usb_bus_%s_device_%s' % (ebus, edevice)
+
+        for usb_info in usb_infos:
+            ivendor = DeviceModel._toint(usb_info['vendor']['id'])
+            iproduct = DeviceModel._toint(usb_info['product']['id'])
+            if evendor == ivendor and eproduct == iproduct:
+                return usb_info['name']
+            ibus = usb_info['bus']
+            idevice = usb_info['device']
+            if ebus == ibus and edevice == idevice:
+                return usb_info['name']
+        return unknown_dev
+
 
 class PackagesUpdateModel(object):
     def __init__(self, **kargs):
diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index 12226ca..d668223 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -49,69 +49,7 @@ class VMHostDevsModel(object):
         except AttributeError:
             return []
 
-        return [self._deduce_dev_name(e) for e in hostdev]
-
-    @staticmethod
-    def _toint(num_str):
-        if num_str.startswith('0x'):
-            return int(num_str, 16)
-        elif num_str.startswith('0'):
-            return int(num_str, 8)
-        else:
-            return int(num_str)
-
-    def _deduce_dev_name(self, e):
-        return getattr(self, '_deduce_dev_name_%s' % e.attrib['type'])(e)
-
-    def _deduce_dev_name_pci(self, e):
-        attrib = {}
-        for field in ('domain', 'bus', 'slot', 'function'):
-            attrib[field] = self._toint(e.source.address.attrib[field])
-        return 'pci_%(domain)04x_%(bus)02x_%(slot)02x_%(function)x' % attrib
-
-    def _deduce_dev_name_scsi(self, e):
-        attrib = {}
-        for field in ('bus', 'target', 'unit'):
-            attrib[field] = self._toint(e.source.address.attrib[field])
-        attrib['host'] = self._toint(
-            e.source.adapter.attrib['name'][len('scsi_host'):])
-        return 'scsi_%(host)d_%(bus)d_%(target)d_%(unit)d' % attrib
-
-    def _deduce_dev_name_usb(self, e):
-        dev_names = DevicesModel(conn=self.conn).get_list(_cap='usb_device')
-        usb_infos = [DeviceModel(conn=self.conn).lookup(dev_name)
-                     for dev_name in dev_names]
-
-        unknown_dev = None
-
-        try:
-            evendor = self._toint(e.source.vendor.attrib['id'])
-            eproduct = self._toint(e.source.product.attrib['id'])
-        except AttributeError:
-            evendor = 0
-            eproduct = 0
-        else:
-            unknown_dev = 'usb_vendor_%s_product_%s' % (evendor, eproduct)
-
-        try:
-            ebus = self._toint(e.source.address.attrib['bus'])
-            edevice = self._toint(e.source.address.attrib['device'])
-        except AttributeError:
-            ebus = -1
-            edevice = -1
-        else:
-            unknown_dev = 'usb_bus_%s_device_%s' % (ebus, edevice)
-
-        for usb_info in usb_infos:
-            ivendor = self._toint(usb_info['vendor']['id'])
-            iproduct = self._toint(usb_info['product']['id'])
-            if evendor == ivendor and eproduct == iproduct:
-                return usb_info['name']
-            ibus = usb_info['bus']
-            idevice = usb_info['device']
-            if ebus == ibus and edevice == idevice:
-                return usb_info['name']
-        return unknown_dev
+        return [DeviceModel.deduce_dev_name(e, self.conn) for e in hostdev]
 
     def _passthrough_device_validate(self, dev_name):
         eligible_dev_names = \
@@ -290,10 +228,8 @@ class VMHostDevModel(object):
             raise NotFoundError('KCHVMHDEV0001E',
                                 {'vmid': vmid, 'dev_name': dev_name})
 
-        devsmodel = VMHostDevsModel(conn=self.conn)
-
         for e in hostdev:
-            deduced_name = devsmodel._deduce_dev_name(e)
+            deduced_name = DeviceModel.deduce_dev_name(e, self.conn)
             if deduced_name == dev_name:
                 return {'name': dev_name, 'type': e.attrib['type']}
 
@@ -311,12 +247,11 @@ class VMHostDevModel(object):
             raise NotFoundError('KCHVMHDEV0001E',
                                 {'vmid': vmid, 'dev_name': dev_name})
 
-        devsmodel = VMHostDevsModel(conn=self.conn)
-        pci_devs = [(devsmodel._deduce_dev_name(e), e) for e in hostdev
-                    if e.attrib['type'] == 'pci']
+        pci_devs = [(DeviceModel.deduce_dev_name(e, self.conn), e)
+                    for e in hostdev if e.attrib['type'] == 'pci']
 
         for e in hostdev:
-            if devsmodel._deduce_dev_name(e) == dev_name:
+            if DeviceModel.deduce_dev_name(e, self.conn) == dev_name:
                 xmlstr = etree.tostring(e)
                 dom.detachDeviceFlags(
                     xmlstr, get_vm_config_flag(dom, mode='all'))
-- 
2.4.3



From dhbarboza82 at gmail.com  Tue Jul 14 15:00:04 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Tue, 14 Jul 2015 12:00:04 -0300
Subject: [Kimchi-devel] [PATCH 2/3] Adding new API in the UI APIs and docs
In-Reply-To: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
References: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <1436886005-11693-3-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

Documentating the new API 'getAvailableHostPCIDevices', which uses
the existing backend host/devices with a new option.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 docs/API.md             |  2 ++
 src/kimchi/API.json     |  6 ++++++
 src/kimchi/i18n.py      |  1 +
 ui/js/src/kimchi.api.js | 14 ++++++++++++++
 4 files changed, 23 insertions(+)

diff --git a/docs/API.md b/docs/API.md
index e022c9e..8b7e9ca 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -1013,6 +1013,8 @@ stats history
         * _passthrough_affected_by: Filter the affected devices in the same
                                     group of a certain directly assigned device.
                                     The value should be the name of a device.
+        * _available_only: Filter to list only the host devices that are not
+                           attached to a VM.
 
 ### Resource: Device
 
diff --git a/src/kimchi/API.json b/src/kimchi/API.json
index e8da7d9..c7ea660 100644
--- a/src/kimchi/API.json
+++ b/src/kimchi/API.json
@@ -814,6 +814,12 @@
                     "type": "string",
                     "pattern": "^[_A-Za-z0-9-]+$",
                     "error": "KCHDEVS0003E"
+                },
+               "_available_only": {
+                    "description": "List only devices that are not being used by any other VM",
+                    "type": "string",
+                    "pattern": "^true|false$",
+                    "error": "KCHDEVS0004E"
                 }
             },
             "additionalProperties": false,
diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index 54750d9..0a3ebfa 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -45,6 +45,7 @@ messages = {
     "KCHDEVS0001E": _('Unknown "_cap" specified'),
     "KCHDEVS0002E": _('"_passthrough" should be "true" or "false"'),
     "KCHDEVS0003E": _('"_passthrough_affected_by" should be a device name string'),
+    "KCHDEVS0004E": _('"_available" should be "true" or "false"'),
 
     "KCHDISKS0001E": _("Error while getting block devices. Details: %(err)s"),
     "KCHDISKS0002E": _("Error while getting block device information for %(device)s."),
diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js
index a7c3b2d..44f58d1 100644
--- a/ui/js/src/kimchi.api.js
+++ b/ui/js/src/kimchi.api.js
@@ -1179,6 +1179,20 @@ var kimchi = {
         });
     },
 
+    getAvailableHostPCIDevices : function(suc, err) {
+        kimchi.requestJSON({
+            url : 'host/devices?_passthrough=true&_cap=pci&_available_only=true',
+            type : 'GET',
+            contentType : 'application/json',
+            dataType : 'json',
+            resend : true,
+            success : suc,
+            error : err ? err : function(data) {
+                kimchi.message.error(data.responseJSON.reason);
+            }
+        });
+    },
+
     getPCIDeviceCompanions : function(pcidev, suc, err) {
         kimchi.requestJSON({
             url : 'host/devices?_passthrough_affected_by=' + pcidev,
-- 
2.4.3



From dhbarboza82 at gmail.com  Tue Jul 14 15:00:05 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Tue, 14 Jul 2015 12:00:05 -0300
Subject: [Kimchi-devel] [PATCH 3/3] Mockmodel and test changes for the new
	API
In-Reply-To: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
References: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <1436886005-11693-4-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

API added: getAvailableHostPCIDevices, option _available_only of
host/devices backend.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 src/kimchi/mockmodel.py |  3 ++-
 tests/test_host.py      | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py
index aaf1af2..34bcfc9 100644
--- a/src/kimchi/mockmodel.py
+++ b/src/kimchi/mockmodel.py
@@ -335,7 +335,8 @@ class MockModel(Model):
         return self._mock_partitions.partitions[name]
 
     def _mock_devices_get_list(self, _cap=None, _passthrough=None,
-                               _passthrough_affected_by=None):
+                               _passthrough_affected_by=None,
+                               _available_only=None):
         if _cap is None:
             return self._mock_devices.devices.keys()
 
diff --git a/tests/test_host.py b/tests/test_host.py
index 1273457..fe6124e 100644
--- a/tests/test_host.py
+++ b/tests/test_host.py
@@ -190,3 +190,14 @@ class HostTests(unittest.TestCase):
                                 dev)
             affected_devs = [dev['name'] for dev in json.loads(resp.read())]
             self.assertTrue(set(affected_devs) <= set(dev_names))
+
+    def test_get_available_passthrough_devices(self):
+        resp = self.request('/host/devices?_passthrough=true')
+        all_devs = [dev['name'] for dev in json.loads(resp.read())]
+
+        resp = self.request(
+            '/host/devices?_passthrough=true&_available_only=true'
+        )
+        available_devs = [dev['name'] for dev in json.loads(resp.read())]
+
+        self.assertLessEqual(len(available_devs), len(all_devs))
-- 
2.4.3



From socorro at linux.vnet.ibm.com  Tue Jul 14 15:36:05 2015
From: socorro at linux.vnet.ibm.com (Socorro Stoppler)
Date: Tue, 14 Jul 2015 08:36:05 -0700
Subject: [Kimchi-devel] [PATCH] Fix numerous errors in UI when host is
 shut down
In-Reply-To: <55A512A4.10601@linux.vnet.ibm.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
	<CADqiwxwmdZ3tE_8r6Y4Cjb0Dp=0hNm90wNEuWtAxH83KH=yn1A@mail.gmail.com>
	<55A512A4.10601@linux.vnet.ibm.com>
Message-ID: <55A52C65.3060707@linux.vnet.ibm.com>

Cristian,

I may have misunderstood your question?  As far as my discussion w/Aline 
from before, I would say this patch fixes issue #510.  It's just that it 
also mentions logging
off and that was never discussed as the fix, but since Aline is not 
available, we can't confirm that.  I'll leave it to you to decide if you 
think this patch is sufficient for
Issue #510.

Thanks!
-Socorro

On 07/14/2015 06:46 AM, Socorro Stoppler wrote:
> Per discussion w/Aline before, the error msg should only be shown once 
> when the host is shut down instead of numerous times as stated in the 
> issue.
> That is what the patch addresses.  I see that the issue mentions 
> logging off in this situation as well but that was not discussed 
> w/Aline.  Will check w/Daniel
> regarding this since Aline is not available.  Thanks.
>
> On 07/14/2015 05:06 AM, Cr?stian Viana wrote:
>> Does this patch fix issue #510?
>>
>> On Mon, Jul 13, 2015 at 4:19 PM Socorro Stoppler 
>> <socorro at linux.vnet.ibm.com <mailto:socorro at linux.vnet.ibm.com>> wrote:
>>
>>     From: Socorro Stoppler <socorrob at us.ibm.com
>>     <mailto:socorrob at us.ibm.com>>
>>
>>     Fix numerous errors in UI when host is shut down
>>
>>     Socorro Stoppler (1):
>>       Fix displaying numerous error msgs when host is shut down
>>
>>      ui/js/src/kimchi.main.js | 7 +++++--
>>      1 file changed, 5 insertions(+), 2 deletions(-)
>>
>>     --
>>     1.9.1
>>
>>     _______________________________________________
>>     Kimchi-devel mailing list
>>     Kimchi-devel at ovirt.org <mailto:Kimchi-devel at ovirt.org>
>>     http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>>
>
>
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150714/34686a75/attachment.html>

From dhbarboza82 at gmail.com  Tue Jul 14 17:51:49 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Tue, 14 Jul 2015 14:51:49 -0300
Subject: [Kimchi-devel] [PATCH] Patched kimchi for psutils 3.0.1
In-Reply-To: <1436471382-13828-2-git-send-email-stephan.conrad@gmail.com>
References: <1436471382-13828-1-git-send-email-stephan.conrad@gmail.com>
	<1436471382-13828-2-git-send-email-stephan.conrad@gmail.com>
Message-ID: <55A54C35.9010806@gmail.com>

Hi there,

Your patch failed the 'make check-local' we usually do when testing new 
contributions*. I
don't know if Aline talked about it in this ML, but we usually refuse 
patches that fails
this sanity check and encourage people to always run this command before 
submitting
patches to Kimchi. It was just a small pep8 fix though, so I've fixed 
and amended the patch.

Patch applied to the 'next' branch of https://github.com/danielhb/kimchi 
repo.


Thanks!


* this was the output of make check-local:

$ make check-local
PYTHONPATH=src contrib/check_i18n.py plugins/*/i18n.py src/kimchi/i18n.py
Checking for invalid i18n string...
Checking for invalid i18n string successfully
find . -path './.git' -prune -type f -o \
     -name '*.py' -o -name '*.py.in'  | xargs /usr/bin/pyflakes | \
     grep -w -v "\./src/kimchi/websocket\.py" | \
     while read LINE; do echo "$LINE"; false; done
/usr/bin/pep8 --version
1.6.2
/usr/bin/pep8 --filename '*.py,*.py.in' 
--exclude="*src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py" 
.
./src/kimchi/model/host.py:124:26: E231 missing whitespace after ','
Makefile:927: recipe for target 'check-local' failed
make: *** [check-local] Error 1


On 07/09/2015 04:49 PM, stephan.conrad at gmail.com wrote:
> From: Stephan Conrad <stephan.conrad at gmail.com>
>
> Signed-off-by: Stephan Conrad <stephan.conrad at gmail.com>
> ---
>   src/kimchi/model/host.py | 17 ++++++++++++++---
>   src/kimchi/osinfo.py     |  6 ++++--
>   2 files changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py
> index b2fa379..03aa974 100644
> --- a/src/kimchi/model/host.py
> +++ b/src/kimchi/model/host.py
> @@ -102,13 +102,16 @@ class HostModel(object):
>           return res
>   
>       def lookup(self, *name):
> -        cpus = psutil.NUM_CPUS
> +        cpus = 0
>   
>           # psutil is unstable on how to get the number of
>           # cpus, different versions call it differently
>           if hasattr(psutil, 'cpu_count'):
>               cpus = psutil.cpu_count()
>   
> +        elif hasattr(psutil, 'NUM_CPUS'):
> +            cpus = psutil.NUM_CPUS
> +
>           elif hasattr(psutil, '_psplatform'):
>               for method_name in ['_get_num_cpus', 'get_num_cpus']:
>   
> @@ -118,7 +121,10 @@ class HostModel(object):
>                       break
>   
>           self.host_info['cpus'] = cpus
> -        self.host_info['memory'] = psutil.phymem_usage().total
> +        if hasattr(psutil,'phymem_usage'):
> +            self.host_info['memory'] = psutil.phymem_usage().total
> +        elif hasattr(psutil, 'virtual_memory'):
> +            self.host_info['memory'] = psutil.virtual_memory().total
>           return self.host_info
>   
>       def swupdate(self, *name):
> @@ -248,7 +254,12 @@ class HostStatsModel(object):
>           prev_recv_bytes = net_recv_bytes[-1] if net_recv_bytes else 0
>           prev_sent_bytes = net_sent_bytes[-1] if net_sent_bytes else 0
>   
> -        net_ios = psutil.network_io_counters(True)
> +        net_ios = None
> +        if hasattr(psutil, 'net_io_counters'):
> +            net_ios = psutil.net_io_counters(True)
> +        elif hasattr(psutil, 'network_io_counters'):
> +            net_ios = psutil.network_io_counters(True)
> +
>           recv_bytes = 0
>           sent_bytes = 0
>           for key in set(netinfo.nics() +
> diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
> index 78eb828..df10910 100644
> --- a/src/kimchi/osinfo.py
> +++ b/src/kimchi/osinfo.py
> @@ -186,8 +186,10 @@ def lookup(distro, version):
>       arch = _get_arch()
>   
>       # Setting maxMemory of the VM, which will be equal total Host memory in Kib
> -    params['max_memory'] = psutil.TOTAL_PHYMEM >> 10
> -
> +    if hasattr(psutil, 'virtual_memory'):
> +        params['max_memory'] = psutil.virtual_memory().total >> 10
> +    else:
> +        params['max_memory'] = psutil.TOTAL_PHYMEM >> 10
>       # set up arch to ppc64 instead of ppc64le due to libvirt compatibility
>       if params["arch"] == "ppc64le":
>           params["arch"] = "ppc64"



From ramonn at linux.vnet.ibm.com  Tue Jul 14 17:57:30 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Tue, 14 Jul 2015 14:57:30 -0300
Subject: [Kimchi-devel] [DOUBT] How to use setTimeout correctly
In-Reply-To: <CADqiwxzJqmDXzRfqP1=UFTHq81JguA2BytQkwsdz0O2LgBM0RQ@mail.gmail.com>
References: <55A031C1.1000504@linux.vnet.ibm.com>
	<CADqiwxzJqmDXzRfqP1=UFTHq81JguA2BytQkwsdz0O2LgBM0RQ@mail.gmail.com>
Message-ID: <55A54D8A.6050904@linux.vnet.ibm.com>

Hi Cristian, nice to see you here :)

The function getPCIDeviceCompanions tooks almost two second for each 
interation. As this function being called each time that the Edit button 
is accessed, i want to cache the values on kimchi.main() to save time.

On systems that has too much pci devices, a popup from the browser asks 
for quit the page by unresponsible script.

On 07/14/2015 09:14 AM, Cr?stian Viana wrote:
> The function "kimchi.getPCIDeviceCompanions" (and most other Kimchi 
> JavaScript functions, actually) receives a callback function which 
> receives a result parameter. That function should be executed when the 
> result is ready. In your case, your parameter function doesn't match 
> this requirement (i.e. you're passing a function which receives a 
> function which receives a parameter). You need to pass parameters 
> exactly as they're expected by the main function.
>
> Also, why are you using setTimeout at all?
>
> On Fri, Jul 10, 2015 at 5:57 PM Ramon Medeiros 
> <ramonn at linux.vnet.ibm.com <mailto:ramonn at linux.vnet.ibm.com>> wrote:
>
>     Hi team,
>
>     i was trying to cache 2 objects, but they came from a HTTP
>     request, and
>     took some time to download it. I was unable to use the function
>     setTimeout while calling this function:
>
>          kimchi.getPCIDeviceCompanions(kimchi.hostPCIs[i].name,
>     setTimeout(function(result) {
>              kimchi.deviceCompanions[kimchi.hostPCIs[i].name] = result;
>          },5000));
>     }
>
>
>     The function kimchi.getPCIDeviceCompanions usually takes 2s to finish.
>
>     --
>
>     Ramon Nunes Medeiros
>     Kimchi Developer
>     Linux Technology Center Brazil
>     IBM Systems & Technology Group
>     Phone : +55 19 2132 7878
>     ramonn at br.ibm.com <mailto:ramonn at br.ibm.com>
>
>     _______________________________________________
>     Kimchi-devel mailing list
>     Kimchi-devel at ovirt.org <mailto:Kimchi-devel at ovirt.org>
>     http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150714/d0415880/attachment.html>

From dhbarboza82 at gmail.com  Tue Jul 14 17:58:32 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Tue, 14 Jul 2015 14:58:32 -0300
Subject: [Kimchi-devel] CentOS Init Script
In-Reply-To: <30b85ec14768e6c7d0c3da30dc9435e3.squirrel@mail.soledevelopment.com>
References: <30b85ec14768e6c7d0c3da30dc9435e3.squirrel@mail.soledevelopment.com>
Message-ID: <55A54DC8.3080706@gmail.com>

Hello,

This a script to start/stop/resume the kimchid daemon in CentOS 6, 
right? Have you had the
chance to test it in Cent OS 7?


Thanks,


Daniel

ps: sorry for the delay in answering

On 07/02/2015 12:03 PM, Michael Sole wrote:
> I created a very simple CentOS 6 compatible init script. Its a little
> hacky but it does work. I know I am supposed to make a patch but perhaps
> someone can evaluate and decide if you want to include it:
>
> #!/bin/sh
> #
> # Name: Kimchi init script for CentOS 6
> # Author: Michael Sole
> # Email: michael.sole(at)soledevelopment.com
> #
> # Description: Very simple init script to start, stop and restart the
> Kimchi control panel
> #
> # Usage: /etc/init.d/kimchid start|stop|restart
>
> ### BEGIN INIT INFO
> # Provides: kimchid
> # Required-Start: $local_fs $syslog
> # Required-Stop: $local_fs $syslog
> # Default-Start:  2345
> # Default-Stop: 90
> # Short-Description: run kimchi daemon
> # Description: Very simple init script to start, stop and restart the
> Kimchi control panel
> ### END INIT INFO
>
> # Source function library.
> . /etc/rc.d/init.d/functions
>
> exec="/usr/bin/kimchid"
> prog="kimchid"
>
> lockfile=/var/lock/subsys/$prog
>
> start() {
>      if [ -f "$lockfile" ]
>      then
>          echo "Lock file found, is the daemon already running?"
>          exit 5
>      fi
>      echo -n $"Starting $prog: "
>      nohup $exec  > /dev/null 2>&1 &
>      echo "OK"
>      touch $lockfile
>      return 0
> }
>
> stop() {
>      echo -n $"Stopping $prog: "
>      rm -f $lockfile
>      ps aux | grep -ie $prog | awk '{print $2}' | xargs kill -9 > /dev/null
> 2>&1
>      return 0
> }
>
> restart() {
>      stop
>      start
> }
>
> case "$1" in
>      start)
>          $1
>          ;;
>      stop)
>          $1
>          ;;
>      restart)
>          $1
>          ;;
>      *)
>          echo $"Usage: $0 {start|stop|restart}"
>          exit 2
> esac
> exit $?
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel



From cristiandeives at gmail.com  Wed Jul 15 02:44:08 2015
From: cristiandeives at gmail.com (=?UTF-8?Q?Cr=C3=ADstian_Viana?=)
Date: Wed, 15 Jul 2015 02:44:08 +0000
Subject: [Kimchi-devel] [DOUBT] How to use setTimeout correctly
In-Reply-To: <55A54D8A.6050904@linux.vnet.ibm.com>
References: <55A031C1.1000504@linux.vnet.ibm.com>
	<CADqiwxzJqmDXzRfqP1=UFTHq81JguA2BytQkwsdz0O2LgBM0RQ@mail.gmail.com>
	<55A54D8A.6050904@linux.vnet.ibm.com>
Message-ID: <CADqiwxzqCvOkX_RhqhhtvPkRdcRSK9DGHoSfXPWXuM65obQdnQ@mail.gmail.com>

But I still don't understand how the function setTimeout can help you with
that. Adding a timeout probably won't solve your problem, it won't cache
anything, it will just delay the page unresponsiveness.

On Tue, Jul 14, 2015 at 2:57 PM Ramon Medeiros <ramonn at linux.vnet.ibm.com>
wrote:

>  Hi Cristian, nice to see you here :)
>
> The function getPCIDeviceCompanions tooks almost two second for each
> interation. As this function being called each time that the Edit button is
> accessed, i want to cache the values on kimchi.main() to save time.
>
> On systems that has too much pci devices, a popup from the browser asks
> for quit the page by unresponsible script.
>
>
> On 07/14/2015 09:14 AM, Cr?stian Viana wrote:
>
> The function "kimchi.getPCIDeviceCompanions" (and most other Kimchi
> JavaScript functions, actually) receives a callback function which receives
> a result parameter. That function should be executed when the result is
> ready. In your case, your parameter function doesn't match this requirement
> (i.e. you're passing a function which receives a function which receives a
> parameter). You need to pass parameters exactly as they're expected by the
> main function.
>
>  Also, why are you using setTimeout at all?
>
>  On Fri, Jul 10, 2015 at 5:57 PM Ramon Medeiros <ramonn at linux.vnet.ibm.com>
> wrote:
>
>> Hi team,
>>
>> i was trying to cache 2 objects, but they came from a HTTP request, and
>> took some time to download it. I was unable to use the function
>> setTimeout while calling this function:
>>
>>      kimchi.getPCIDeviceCompanions(kimchi.hostPCIs[i].name,
>> setTimeout(function(result) {
>>          kimchi.deviceCompanions[kimchi.hostPCIs[i].name] = result;
>>      },5000));
>> }
>>
>>
>> The function kimchi.getPCIDeviceCompanions usually takes 2s to finish.
>>
>> --
>>
>> Ramon Nunes Medeiros
>> Kimchi Developer
>> Linux Technology Center Brazil
>> IBM Systems & Technology Group
>> Phone : +55 19 2132 7878
>> ramonn at br.ibm.com
>>
>> _______________________________________________
>> Kimchi-devel mailing list
>> Kimchi-devel at ovirt.org
>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>>
>
> --
>
> Ramon Nunes Medeiros
> Kimchi Developer
> Linux Technology Center Brazil
> IBM Systems & Technology Group
> Phone : +55 19 2132 7878ramonn at br.ibm.com
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150715/ab4d3d7d/attachment.html>

From cristiandeives at gmail.com  Wed Jul 15 02:46:22 2015
From: cristiandeives at gmail.com (=?UTF-8?Q?Cr=C3=ADstian_Viana?=)
Date: Wed, 15 Jul 2015 02:46:22 +0000
Subject: [Kimchi-devel] [PATCH] Fix numerous errors in UI when host is
 shut down
In-Reply-To: <55A52C65.3060707@linux.vnet.ibm.com>
References: <1436815130-11234-1-git-send-email-socorro@linux.vnet.ibm.com>
	<CADqiwxwmdZ3tE_8r6Y4Cjb0Dp=0hNm90wNEuWtAxH83KH=yn1A@mail.gmail.com>
	<55A512A4.10601@linux.vnet.ibm.com>
	<55A52C65.3060707@linux.vnet.ibm.com>
Message-ID: <CADqiwxwxD_d1M6ZhOoVuM9iG+sNFj=JPFmRZF5UZJAL0XwEvOg@mail.gmail.com>

I haven't tested your patch, but if the error message is displayed only
once when restarting/shutting off the host, I consider the issue fixed.
Logging off was just one suggestion of what could happen instead of
displaying a lot of error messages; displaying it only once is already a
good solution.

On Tue, Jul 14, 2015 at 12:36 PM Socorro Stoppler <
socorro at linux.vnet.ibm.com> wrote:

>  Cristian,
>
> I may have misunderstood your question?  As far as my discussion w/Aline
> from before, I would say this patch fixes issue #510.  It's just that it
> also mentions logging
> off and that was never discussed as the fix, but since Aline is not
> available, we can't confirm that.  I'll leave it to you to decide if you
> think this patch is sufficient for
> Issue #510.
>
> Thanks!
>
> -Socorro
>
>
> On 07/14/2015 06:46 AM, Socorro Stoppler wrote:
>
> Per discussion w/Aline before, the error msg should only be shown once
> when the host is shut down instead of numerous times as stated in the issue.
> That is what the patch addresses.  I see that the issue mentions logging
> off in this situation as well but that was not discussed w/Aline.  Will
> check w/Daniel
> regarding this since Aline is not available.  Thanks.
>
> On 07/14/2015 05:06 AM, Cr?stian Viana wrote:
>
> Does this patch fix issue #510?
>
>  On Mon, Jul 13, 2015 at 4:19 PM Socorro Stoppler <
> socorro at linux.vnet.ibm.com> wrote:
>
>> From: Socorro Stoppler <socorrob at us.ibm.com>
>>
>> Fix numerous errors in UI when host is shut down
>>
>> Socorro Stoppler (1):
>>   Fix displaying numerous error msgs when host is shut down
>>
>>  ui/js/src/kimchi.main.js | 7 +++++--
>>  1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> --
>> 1.9.1
>>
>> _______________________________________________
>> Kimchi-devel mailing list
>> Kimchi-devel at ovirt.org
>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>>
>
>
>
> _______________________________________________
> Kimchi-devel mailing listKimchi-devel at ovirt.orghttp://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150715/38308927/attachment.html>

From ramonn at linux.vnet.ibm.com  Wed Jul 15 12:10:45 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Wed, 15 Jul 2015 09:10:45 -0300
Subject: [Kimchi-devel] Q
In-Reply-To: <CADqiwxzqCvOkX_RhqhhtvPkRdcRSK9DGHoSfXPWXuM65obQdnQ@mail.gmail.com>
References: <55A031C1.1000504@linux.vnet.ibm.com>
	<CADqiwxzJqmDXzRfqP1=UFTHq81JguA2BytQkwsdz0O2LgBM0RQ@mail.gmail.com>
	<55A54D8A.6050904@linux.vnet.ibm.com>
	<CADqiwxzqCvOkX_RhqhhtvPkRdcRSK9DGHoSfXPWXuM65obQdnQ@mail.gmail.com>
Message-ID: <55A64DC5.8050600@linux.vnet.ibm.com>

Hi Cristian,

I was trying to do this:

1) Cache all deviceCompanions in a object, that the key will be the hostPCI

2) Query this information when the user enter in guest edit, instead of 
download everytime the user enter on this page


So, why i am asking about setTimeout?

I tried to do the operations above and hit an error: The guest_edit page 
was unable to get the deviceCompanions because they were not downloaded, 
so, i would like to put an timeout (or other function) to make the 
function waits for this download, and then, continue to load kimchi.

On 07/14/2015 11:44 PM, Cr?stian Viana wrote:
> But I still don't understand how the function setTimeout can help you 
> with that. Adding a timeout probably won't solve your problem, it 
> won't cache anything, it will just delay the page unresponsiveness.
>
> On Tue, Jul 14, 2015 at 2:57 PM Ramon Medeiros 
> <ramonn at linux.vnet.ibm.com <mailto:ramonn at linux.vnet.ibm.com>> wrote:
>
>     Hi Cristian, nice to see you here :)
>
>     The function getPCIDeviceCompanions tooks almost two second for
>     each interation. As this function being called each time that the
>     Edit button is accessed, i want to cache the values on
>     kimchi.main() to save time.
>
>     On systems that has too much pci devices, a popup from the browser
>     asks for quit the page by unresponsible script.
>
>
>     On 07/14/2015 09:14 AM, Cr?stian Viana wrote:
>>     The function "kimchi.getPCIDeviceCompanions" (and most other
>>     Kimchi JavaScript functions, actually) receives a callback
>>     function which receives a result parameter. That function should
>>     be executed when the result is ready. In your case, your
>>     parameter function doesn't match this requirement (i.e. you're
>>     passing a function which receives a function which receives a
>>     parameter). You need to pass parameters exactly as they're
>>     expected by the main function.
>>
>>     Also, why are you using setTimeout at all?
>>
>>     On Fri, Jul 10, 2015 at 5:57 PM Ramon Medeiros
>>     <ramonn at linux.vnet.ibm.com <mailto:ramonn at linux.vnet.ibm.com>> wrote:
>>
>>         Hi team,
>>
>>         i was trying to cache 2 objects, but they came from a HTTP
>>         request, and
>>         took some time to download it. I was unable to use the function
>>         setTimeout while calling this function:
>>
>>          kimchi.getPCIDeviceCompanions(kimchi.hostPCIs[i].name,
>>         setTimeout(function(result) {
>>          kimchi.deviceCompanions[kimchi.hostPCIs[i].name] = result;
>>              },5000));
>>         }
>>
>>
>>         The function kimchi.getPCIDeviceCompanions usually takes 2s
>>         to finish.
>>
>>         --
>>
>>         Ramon Nunes Medeiros
>>         Kimchi Developer
>>         Linux Technology Center Brazil
>>         IBM Systems & Technology Group
>>         Phone : +55 19 2132 7878
>>         ramonn at br.ibm.com <mailto:ramonn at br.ibm.com>
>>
>>         _______________________________________________
>>         Kimchi-devel mailing list
>>         Kimchi-devel at ovirt.org <mailto:Kimchi-devel at ovirt.org>
>>         http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>>
>
>     -- 
>
>     Ramon Nunes Medeiros
>     Kimchi Developer
>     Linux Technology Center Brazil
>     IBM Systems & Technology Group
>     Phone : +55 19 2132 7878
>     ramonn at br.ibm.com  <mailto:ramonn at br.ibm.com>  
>

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150715/481189ed/attachment.html>

From socorro at linux.vnet.ibm.com  Wed Jul 15 13:59:08 2015
From: socorro at linux.vnet.ibm.com (Socorro Stoppler)
Date: Wed, 15 Jul 2015 06:59:08 -0700
Subject: [Kimchi-devel] [PATCH 0/3] New backend API: get available
 devices from host
In-Reply-To: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
References: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <55A6672C.6020509@linux.vnet.ibm.com>


Tested-by: Socorro Stoppler <socorro at linux.vnet.ibm.com>


On 07/14/2015 08:00 AM, dhbarboza82 at gmail.com wrote:
> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>
> This patch set adds a new API to retrieve only the available devices
> from the host. 'available' means only the devices that weren't
> attached to any other VM.
>
> The backend is generic and can work with all devices, but the API
> provided here is made for 'PCI' devices only as we do not provide
> official support for USB and SCSI passthrough yet.
>
> Usage:
>
> get all available devices:
>
> $ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true"
>
> get all available PCI devices:
>
> $ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true&_cap=pci"
>
> Daniel Henrique Barboza (3):
>    Get available host passthrough devices: model changes
>    Adding new API in the UI APIs and docs
>    Mockmodel and test changes for the new API
>
>   docs/API.md                    |   2 +
>   src/kimchi/API.json            |   6 +++
>   src/kimchi/i18n.py             |   1 +
>   src/kimchi/mockmodel.py        |   3 +-
>   src/kimchi/model/host.py       | 105 ++++++++++++++++++++++++++++++++++++++++-
>   src/kimchi/model/vmhostdevs.py |  75 ++---------------------------
>   tests/test_host.py             |  11 +++++
>   ui/js/src/kimchi.api.js        |  14 ++++++
>   8 files changed, 144 insertions(+), 73 deletions(-)
>



From joserz at linux.vnet.ibm.com  Wed Jul 15 14:08:36 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Wed, 15 Jul 2015 11:08:36 -0300
Subject: [Kimchi-devel] [PATCH 0/3] New backend API: get available
 devices from host
In-Reply-To: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
References: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <55A66964.9060207@linux.vnet.ibm.com>

Reviewed-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>

On 14-07-2015 12:00, dhbarboza82 at gmail.com wrote:
> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>
> This patch set adds a new API to retrieve only the available devices
> from the host. 'available' means only the devices that weren't
> attached to any other VM.
>
> The backend is generic and can work with all devices, but the API
> provided here is made for 'PCI' devices only as we do not provide
> official support for USB and SCSI passthrough yet.
>
> Usage:
>
> get all available devices:
>
> $ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true"
>
> get all available PCI devices:
>
> $ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true&_cap=pci"
>
> Daniel Henrique Barboza (3):
>    Get available host passthrough devices: model changes
>    Adding new API in the UI APIs and docs
>    Mockmodel and test changes for the new API
>
>   docs/API.md                    |   2 +
>   src/kimchi/API.json            |   6 +++
>   src/kimchi/i18n.py             |   1 +
>   src/kimchi/mockmodel.py        |   3 +-
>   src/kimchi/model/host.py       | 105 ++++++++++++++++++++++++++++++++++++++++-
>   src/kimchi/model/vmhostdevs.py |  75 ++---------------------------
>   tests/test_host.py             |  11 +++++
>   ui/js/src/kimchi.api.js        |  14 ++++++
>   8 files changed, 144 insertions(+), 73 deletions(-)
>

-- 
Jose Ricardo Ziviani
-----------------------------
Software Engineer
Linux Technology Center - IBM



From dhbarboza82 at gmail.com  Wed Jul 15 18:56:37 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 15 Jul 2015 15:56:37 -0300
Subject: [Kimchi-devel] [PATCH 0/3] New backend API: get available
 devices from host
In-Reply-To: <55A66964.9060207@linux.vnet.ibm.com>
References: <1436886005-11693-1-git-send-email-dhbarboza82@gmail.com>
	<55A66964.9060207@linux.vnet.ibm.com>
Message-ID: <55A6ACE5.6040708@gmail.com>

Patch set applied to master branch of https://github.com/danielhb/kimchi

Thanks for the reviews/tests!



ps: this patch set fixes github bug #690

On 07/15/2015 11:08 AM, Jose Ricardo Ziviani wrote:
> Reviewed-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
>
> On 14-07-2015 12:00, dhbarboza82 at gmail.com wrote:
>> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>>
>> This patch set adds a new API to retrieve only the available devices
>> from the host. 'available' means only the devices that weren't
>> attached to any other VM.
>>
>> The backend is generic and can work with all devices, but the API
>> provided here is made for 'PCI' devices only as we do not provide
>> official support for USB and SCSI passthrough yet.
>>
>> Usage:
>>
>> get all available devices:
>>
>> $ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: 
>> application/json" -X GET 
>> "http://localhost:8010/host/devices?_passthrough=true&_available_only=true"
>>
>> get all available PCI devices:
>>
>> $ curl -u danielhb  -H "Content-Type: application/json" -H "Accept: 
>> application/json" -X GET 
>> "http://localhost:8010/host/devices?_passthrough=true&_available_only=true&_cap=pci"
>>
>> Daniel Henrique Barboza (3):
>>    Get available host passthrough devices: model changes
>>    Adding new API in the UI APIs and docs
>>    Mockmodel and test changes for the new API
>>
>>   docs/API.md                    |   2 +
>>   src/kimchi/API.json            |   6 +++
>>   src/kimchi/i18n.py             |   1 +
>>   src/kimchi/mockmodel.py        |   3 +-
>>   src/kimchi/model/host.py       | 105 
>> ++++++++++++++++++++++++++++++++++++++++-
>>   src/kimchi/model/vmhostdevs.py |  75 ++---------------------------
>>   tests/test_host.py             |  11 +++++
>>   ui/js/src/kimchi.api.js        |  14 ++++++
>>   8 files changed, 144 insertions(+), 73 deletions(-)
>>
>



From dhbarboza82 at gmail.com  Wed Jul 15 21:35:39 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Wed, 15 Jul 2015 18:35:39 -0300
Subject: [Kimchi-devel] [PATCH 0/2] Template disk format fixes
Message-ID: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

Kimchi does not obey the value set by the template, always
creating a disk of format 'qcow2' even if the user set another
format.

This patchset fixes this issue by:

- always set the disk format with the value the user set, unless there
is a storagepool restrition

- getting the default disk format type in template.conf. This value 
is optional and will be used in the case the user does not provide
any other value.

- if there is no user choice and no default set in template.conf, the
default disk format will be 'qcow2'.


See the code and unit tests for more info.

Daniel Henrique Barboza (2):
  Getting default disk format from template.conf
  New unit tests to check disk creation behavior

 src/kimchi/vmtemplate.py |  19 +++++++--
 tests/test_model.py      | 106 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 120 insertions(+), 5 deletions(-)

-- 
2.4.3



From dhbarboza82 at gmail.com  Wed Jul 15 21:35:40 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Wed, 15 Jul 2015 18:35:40 -0300
Subject: [Kimchi-devel] [PATCH 1/2] Getting default disk format from
	template.conf
In-Reply-To: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>
References: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <1436996141-23447-2-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

If the user change disk format in template.conf, templates are going to
be created correctly and vm xml as well. But, when the disk is created,
the format is always qcow2.

This patch considers the settings in the template.conf to define
the default volume format when creating the disks. User defined settings
will override any default (unless the storage type is logical,
iscsi or scsi. In those cases the format will always be 'raw').

If the user does not provide any format and template.conf does not
declare any default as well, the default value to be used as volume
type will be 'qcow2' (considering the storage type restriction
mentioned above).

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 src/kimchi/vmtemplate.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 3e42971..1ad9131 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -24,11 +24,13 @@ import urlparse
 import uuid
 import platform
 
+from configobj import ConfigObj
 from lxml import etree
 from lxml.builder import E
 
 from kimchi import imageinfo
 from kimchi import osinfo
+from kimchi.config import paths
 from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter
 from kimchi.exception import ImageFormatError, OperationFailed
 from kimchi.isoinfo import IsoImage
@@ -158,6 +160,13 @@ class VMTemplate(object):
         dev, xml = get_disk_xml(params)
         return xml
 
+    def _get_default_disk0_format(self):
+        config_file = os.path.join(paths.conf_dir, 'template.conf')
+        config = ConfigObj(config_file)
+
+        default_vol_format = config['storage']['disk.0'].get('format', 'qcow2')
+        return default_vol_format
+
     def _get_disks_xml(self, vm_uuid):
         # Current implementation just allows to create disk in one single
         # storage pool, so we cannot mix the types (scsi volumes vs img file)
@@ -165,7 +174,9 @@ class VMTemplate(object):
         storage_path = self._get_storage_path()
 
         base_disk_params = {'type': 'disk', 'disk': 'file',
-                            'bus': self.info['disk_bus'], 'format': 'qcow2'}
+                            'bus': self.info['disk_bus'],
+                            'format': self._get_default_disk0_format()}
+
         logical_disk_params = {'format': 'raw'}
         iscsi_disk_params = {'disk': 'block', 'format': 'raw'}
 
@@ -193,8 +204,8 @@ class VMTemplate(object):
         return unicode(disks_xml, 'utf-8')
 
     def to_volume_list(self, vm_uuid):
+        default_vol_format = self._get_default_disk0_format()
         storage_path = self._get_storage_path()
-        fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2'
         ret = []
         for i, d in enumerate(self.info['disks']):
             index = d.get('index', i)
@@ -202,11 +213,11 @@ class VMTemplate(object):
 
             info = {'name': volume,
                     'capacity': d['size'],
-                    'format': fmt,
+                    'format': d.get('format', default_vol_format),
                     'path': '%s/%s' % (storage_path, volume)}
 
             if 'logical' == self._get_storage_type() or \
-               fmt not in ['qcow2', 'raw']:
+               info['format'] not in ['qcow2', 'raw']:
                 info['allocation'] = info['capacity']
             else:
                 info['allocation'] = 0
-- 
2.4.3



From dhbarboza82 at gmail.com  Wed Jul 15 21:35:41 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Wed, 15 Jul 2015 18:35:41 -0300
Subject: [Kimchi-devel] [PATCH 2/2] New unit tests to check disk creation
	behavior
In-Reply-To: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>
References: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <1436996141-23447-3-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

Three new unit tests were added:

- check that the vm template creates always the disk format
set by the user, doesn't matter the default value from
template.conf

- check that the vm template creates a disk with format set by
the default valuein the disk.0 entry of template.conf, if
the user didn't provide any other.

- check that the vm template creates a disk with format 'qcow2'
if the user didn't provide any other and there is no default
value in template.conf

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 tests/test_model.py | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 105 insertions(+), 1 deletion(-)

diff --git a/tests/test_model.py b/tests/test_model.py
index 896e29b..ef8bb25 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -33,14 +33,16 @@ import kimchi.objectstore
 import utils
 from kimchi import netinfo
 from kimchi.basemodel import Singleton
-from kimchi.config import config
+from kimchi.config import config, paths
 from kimchi.exception import InvalidOperation
 from kimchi.exception import InvalidParameter, NotFoundError, OperationFailed
 from kimchi.osinfo import get_template_default
 from kimchi.model import model
 from kimchi.model.libvirtconnection import LibvirtConnection
+from kimchi.model.vms import VMModel
 from kimchi.rollbackcontext import RollbackContext
 from kimchi.utils import add_task
+from kimchi.xmlutils.utils import xpath_get_text
 
 
 invalid_repository_urls = ['www.fedora.org',       # missing protocol
@@ -600,6 +602,108 @@ class ModelTests(unittest.TestCase):
             self.assertTrue(os.access(disk_path, os.F_OK))
         self.assertFalse(os.access(disk_path, os.F_OK))
 
+    def _create_template_conf_with_disk_format(self, vol_format):
+        if vol_format is None:
+            conf_file_data = "[main]\n\n[storage]\n\n[[disk.0]]\n" \
+                             "#format = \n\n[graphics]\n\n[processor]\n"
+        else:
+            conf_file_data = "[main]\n\n[storage]\n\n[[disk.0]]\n" \
+                             "format = %s\n\n[graphics]\n\n[processor]\n"\
+                             % vol_format
+
+        config_file = os.path.join(paths.conf_dir, 'template.conf')
+        config_bkp_file = \
+            os.path.join(paths.conf_dir, 'template.conf-unit_test_bkp')
+
+        os.rename(config_file, config_bkp_file)
+
+        with open(config_file, 'w') as f:
+            f.write(conf_file_data)
+
+    def _restore_template_conf_file(self):
+        config_file = os.path.join(paths.conf_dir, 'template.conf')
+        config_bkp_file = \
+            os.path.join(paths.conf_dir, 'template.conf-unit_test_bkp')
+        os.rename(config_bkp_file, config_file)
+
+    def _get_disk_format_from_vm(self, vm, conn):
+        dom = VMModel.get_vm(vm, conn)
+        xml = dom.XMLDesc(0)
+        xpath = "/domain/devices/disk[@device='disk']/driver/@type"
+        return xpath_get_text(xml, xpath)[0]
+
+    @unittest.skipUnless(utils.running_as_root(), 'Must be run as root')
+    def test_template_get_default_vol_format_from_conf(self):
+        inst = model.Model(objstore_loc=self.tmp_store)
+
+        with RollbackContext() as rollback:
+            self._create_template_conf_with_disk_format('vmdk')
+            rollback.prependDefer(self._restore_template_conf_file)
+
+            params = {'name': 'test', 'disks': [{'size': 1}],
+                      'cdrom': UBUNTU_ISO}
+            inst.templates_create(params)
+            rollback.prependDefer(inst.template_delete, 'test')
+
+            params = {'name': 'test-vm-1', 'template': '/templates/test'}
+            task = inst.vms_create(params)
+            inst.task_wait(task['id'])
+            rollback.prependDefer(inst.vm_delete, 'test-vm-1')
+
+            created_disk_format = self._get_disk_format_from_vm(
+                'test-vm-1', inst.conn
+            )
+            self.assertEqual(created_disk_format, 'vmdk')
+
+    @unittest.skipUnless(utils.running_as_root(), 'Must be run as root')
+    def test_template_creates_user_defined_vol_format_instead_default(self):
+        inst = model.Model(objstore_loc=self.tmp_store)
+
+        default_vol = 'vmdk'
+        user_vol = 'raw'
+        with RollbackContext() as rollback:
+            self._create_template_conf_with_disk_format(default_vol)
+            rollback.prependDefer(self._restore_template_conf_file)
+
+            params = {'name': 'test',
+                      'disks': [{'size': 1, 'format': user_vol}],
+                      'cdrom': UBUNTU_ISO}
+            inst.templates_create(params)
+            rollback.prependDefer(inst.template_delete, 'test')
+
+            params = {'name': 'test-vm-1', 'template': '/templates/test'}
+            task = inst.vms_create(params)
+            inst.task_wait(task['id'])
+            rollback.prependDefer(inst.vm_delete, 'test-vm-1')
+
+            created_disk_format = self._get_disk_format_from_vm(
+                'test-vm-1', inst.conn
+            )
+            self.assertEqual(created_disk_format, user_vol)
+
+    @unittest.skipUnless(utils.running_as_root(), 'Must be run as root')
+    def test_template_uses_qcow2_format_if_no_user_or_default_defined(self):
+        inst = model.Model(objstore_loc=self.tmp_store)
+
+        with RollbackContext() as rollback:
+            self._create_template_conf_with_disk_format(None)
+            rollback.prependDefer(self._restore_template_conf_file)
+
+            params = {'name': 'test',
+                      'disks': [{'size': 1}], 'cdrom': UBUNTU_ISO}
+            inst.templates_create(params)
+            rollback.prependDefer(inst.template_delete, 'test')
+
+            params = {'name': 'test-vm-1', 'template': '/templates/test'}
+            task = inst.vms_create(params)
+            inst.task_wait(task['id'])
+            rollback.prependDefer(inst.vm_delete, 'test-vm-1')
+
+            created_disk_format = self._get_disk_format_from_vm(
+                'test-vm-1', inst.conn
+            )
+            self.assertEqual(created_disk_format, 'qcow2')
+
     def test_vm_memory_hotplug(self):
         config.set("authentication", "method", "pam")
         inst = model.Model(None, objstore_loc=self.tmp_store)
-- 
2.4.3



From joserz at linux.vnet.ibm.com  Thu Jul 16 12:04:53 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Thu, 16 Jul 2015 09:04:53 -0300
Subject: [Kimchi-devel] [PATCH 0/2] Template disk format fixes
In-Reply-To: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>
References: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <55A79DE5.8070702@linux.vnet.ibm.com>

Reviewed-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>


On 15-07-2015 18:35, dhbarboza82 at gmail.com wrote:
> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>
> Kimchi does not obey the value set by the template, always
> creating a disk of format 'qcow2' even if the user set another
> format.
>
> This patchset fixes this issue by:
>
> - always set the disk format with the value the user set, unless there
> is a storagepool restrition
>
> - getting the default disk format type in template.conf. This value
> is optional and will be used in the case the user does not provide
> any other value.
>
> - if there is no user choice and no default set in template.conf, the
> default disk format will be 'qcow2'.
>
>
> See the code and unit tests for more info.
>
> Daniel Henrique Barboza (2):
>    Getting default disk format from template.conf
>    New unit tests to check disk creation behavior
>
>   src/kimchi/vmtemplate.py |  19 +++++++--
>   tests/test_model.py      | 106 ++++++++++++++++++++++++++++++++++++++++++++++-
>   2 files changed, 120 insertions(+), 5 deletions(-)
>

-- 
Jose Ricardo Ziviani
-----------------------------
Software Engineer
Linux Technology Center - IBM



From dhbarboza82 at gmail.com  Thu Jul 16 12:09:46 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Thu, 16 Jul 2015 09:09:46 -0300
Subject: [Kimchi-devel] [PATCH 0/2] Template disk format fixes
In-Reply-To: <55A79DE5.8070702@linux.vnet.ibm.com>
References: <1436996141-23447-1-git-send-email-dhbarboza82@gmail.com>
	<55A79DE5.8070702@linux.vnet.ibm.com>
Message-ID: <55A79F0A.4040403@gmail.com>

Patch set applied to master branch of https://github.com/danielhb/kimchi

Thanks for the review!

On 07/16/2015 09:04 AM, Jose Ricardo Ziviani wrote:
> Reviewed-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
>
>
> On 15-07-2015 18:35, dhbarboza82 at gmail.com wrote:
>> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>>
>> Kimchi does not obey the value set by the template, always
>> creating a disk of format 'qcow2' even if the user set another
>> format.
>>
>> This patchset fixes this issue by:
>>
>> - always set the disk format with the value the user set, unless there
>> is a storagepool restrition
>>
>> - getting the default disk format type in template.conf. This value
>> is optional and will be used in the case the user does not provide
>> any other value.
>>
>> - if there is no user choice and no default set in template.conf, the
>> default disk format will be 'qcow2'.
>>
>>
>> See the code and unit tests for more info.
>>
>> Daniel Henrique Barboza (2):
>>    Getting default disk format from template.conf
>>    New unit tests to check disk creation behavior
>>
>>   src/kimchi/vmtemplate.py |  19 +++++++--
>>   tests/test_model.py      | 106 
>> ++++++++++++++++++++++++++++++++++++++++++++++-
>>   2 files changed, 120 insertions(+), 5 deletions(-)
>>
>



From samuel.guimaraes at eldorado.org.br  Thu Jul 16 16:09:02 2015
From: samuel.guimaraes at eldorado.org.br (Samuel Henrique De Oliveira Guimaraes)
Date: Thu, 16 Jul 2015 16:09:02 +0000
Subject: [Kimchi-devel] New-UI Helvetica Font
Message-ID: <c0a567e3ad544a5c958e0bbeb899c594@serv030.corp.eldorado.org.br>

Hi team,

I noticed that the new-ui design pattern for typography specifies Helvetica Neue family in four different styles. This font family is shipped with the latest versions of Mac OS X and iOS but it is not available for free on Windows and Linux distributions.
I believe this might conflict with Kimchi license. Even if we buy or rent a webfont license we can't distribute the TTF, EOT, WOFF and SVG files in our repositories. I think that we can't even use a webfont license in this case (pointing to a remote location or service like Adobe Typekit or MyFonts) because most font-licensing services are charging based on pre-paid pageviews.
Usually for web apps, mobile web apps and cloud based services we have to buy a server license to store the webfont files within our servers, but since Kimchi is an open-source project that anyone can check out and run, every kimchi instance would have to buy their own font license.

We can set Helvetica as the default font-family in the CSS and if the user doesn't have this font installed the browser will load the next available font (Arial or any other Sans-Serif) but since each font has different sizes, some elements may not fit in the screen exactly like they were seen in the mockups. Also, the UI specs recommends Helvetica Neue in 5 different styles (Light, Roman, Regular, Medium and Bold), most system fonts only have 3. We don't have something like "Arial Light" for instance.

My suggestion is that we replace Helvetica Neue for Open Sans because it covers all the style specifications and it is licensed under Apache 2.0. Any thoughts?

Thanks,
Samuel Guimar?es

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150716/970b5b29/attachment.html>

From joserz at linux.vnet.ibm.com  Thu Jul 16 16:42:58 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Thu, 16 Jul 2015 13:42:58 -0300
Subject: [Kimchi-devel] [PATCH] Detach group of PCI Devices from host before
	attaching to guest
Message-ID: <1437064978-27569-1-git-send-email-joserz@linux.vnet.ibm.com>

 - A PCI device can have more than one function. In this case each
   function must be detached from host before attaching to the vm.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/model/vmhostdevs.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index ea75fce..76033f0 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -196,6 +196,22 @@ class VMHostDevsModel(object):
         pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names]
         pci_infos.append(dev_info)
 
+        # all devices in the group that is going to be attached to the vm
+        # must be detached from the host first
+        with RollbackContext() as rollback:
+            for pci_info in pci_infos:
+                try:
+                    dev = self.conn.get().nodeDeviceLookupByName(
+                        pci_info['name'])
+                    dev.dettach()
+                except Exception:
+                    raise OperationFailed('KCHVMHDEV0005E',
+                                          {'name': pci_info['name']})
+                else:
+                    rollback.prependDefer(dev.reAttach)
+
+            rollback.commitAll()
+
         device_flags = get_vm_config_flag(dom, mode='all')
 
         with RollbackContext() as rollback:
-- 
1.9.1



From danielhb at linux.vnet.ibm.com  Thu Jul 16 18:55:17 2015
From: danielhb at linux.vnet.ibm.com (Daniel Henrique Barboza)
Date: Thu, 16 Jul 2015 15:55:17 -0300
Subject: [Kimchi-devel] [PATCH] Detach group of PCI Devices from host
 before attaching to guest
In-Reply-To: <1437064978-27569-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1437064978-27569-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <55A7FE15.6030207@linux.vnet.ibm.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/16/2015 01:42 PM, Jose Ricardo Ziviani wrote:
>   - A PCI device can have more than one function. In this case each
>     function must be detached from host before attaching to the vm.
>
> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
> ---
>   src/kimchi/model/vmhostdevs.py | 16 ++++++++++++++++
>   1 file changed, 16 insertions(+)
>
> diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
> index ea75fce..76033f0 100644
> --- a/src/kimchi/model/vmhostdevs.py
> +++ b/src/kimchi/model/vmhostdevs.py
> @@ -196,6 +196,22 @@ class VMHostDevsModel(object):
>           pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names]
>           pci_infos.append(dev_info)
>
> +        # all devices in the group that is going to be attached to the vm
> +        # must be detached from the host first
> +        with RollbackContext() as rollback:
> +            for pci_info in pci_infos:
> +                try:
> +                    dev = self.conn.get().nodeDeviceLookupByName(
> +                        pci_info['name'])
> +                    dev.dettach()
> +                except Exception:
> +                    raise OperationFailed('KCHVMHDEV0005E',
> +                                          {'name': pci_info['name']})
> +                else:
> +                    rollback.prependDefer(dev.reAttach)
> +
> +            rollback.commitAll()
> +
>           device_flags = get_vm_config_flag(dom, mode='all')
>
>           with RollbackContext() as rollback:



From dhbarboza82 at gmail.com  Fri Jul 17 12:40:14 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Fri, 17 Jul 2015 09:40:14 -0300
Subject: [Kimchi-devel] [PATCH] Detach group of PCI Devices from host
 before attaching to guest
In-Reply-To: <55A7FE15.6030207@linux.vnet.ibm.com>
References: <1437064978-27569-1-git-send-email-joserz@linux.vnet.ibm.com>
	<55A7FE15.6030207@linux.vnet.ibm.com>
Message-ID: <55A8F7AE.6000509@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks!

On 07/16/2015 03:55 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> On 07/16/2015 01:42 PM, Jose Ricardo Ziviani wrote:
>>   - A PCI device can have more than one function. In this case each
>>     function must be detached from host before attaching to the vm.
>>
>> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
>> ---
>>   src/kimchi/model/vmhostdevs.py | 16 ++++++++++++++++
>>   1 file changed, 16 insertions(+)
>>
>> diff --git a/src/kimchi/model/vmhostdevs.py 
>> b/src/kimchi/model/vmhostdevs.py
>> index ea75fce..76033f0 100644
>> --- a/src/kimchi/model/vmhostdevs.py
>> +++ b/src/kimchi/model/vmhostdevs.py
>> @@ -196,6 +196,22 @@ class VMHostDevsModel(object):
>>           pci_infos = [dev_model.lookup(dev_name) for dev_name in 
>> group_names]
>>           pci_infos.append(dev_info)
>>
>> +        # all devices in the group that is going to be attached to 
>> the vm
>> +        # must be detached from the host first
>> +        with RollbackContext() as rollback:
>> +            for pci_info in pci_infos:
>> +                try:
>> +                    dev = self.conn.get().nodeDeviceLookupByName(
>> +                        pci_info['name'])
>> +                    dev.dettach()
>> +                except Exception:
>> +                    raise OperationFailed('KCHVMHDEV0005E',
>> +                                          {'name': pci_info['name']})
>> +                else:
>> +                    rollback.prependDefer(dev.reAttach)
>> +
>> +            rollback.commitAll()
>> +
>>           device_flags = get_vm_config_flag(dom, mode='all')
>>
>>           with RollbackContext() as rollback:
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel



From chandra.shekhar at in.ibm.com  Fri Jul 17 12:47:19 2015
From: chandra.shekhar at in.ibm.com (Chandra Sr Potula)
Date: Fri, 17 Jul 2015 18:17:19 +0530
Subject: [Kimchi-devel] [Proposal] Introducing the version in REST API URI
 for kimchi/ginger plugins
Message-ID: <OF5F31939B.F65133B3-ON65257E85.0044037D-65257E85.0046405F@in.ibm.com>



Hi Kimchi/Ginger Devel-Team,

Thank you for creating WOK branch to separate the kimchi plugin from the
base frame work. It is a great idea.

Along with the separation of kimchi plugin looks like there is a
transformation of REST API URIs as well. So thinking in those lines will it
be good idea even to introduce version to the REST API URIs ?

Let me take one REST API URI to convey clear on what I am talking about.

To retrieve the host repository information, current URI is:
"/plugins/kimchi/host/repositories".

Recommendation:
New host repository URI can look like : "
/plugins/kimchi/v<version>/host/repositories" , so that it is easy to
maintain REST API future enhancements at the same time do not brake some
body who is using the existing URI.

Note* Adding version in the  URI above is just an example and we could
place the version in the URI best possible way.



Thanks and Regards,
Chandra Shekhar Reddy Potula
Staff System Software Engineer
IBM Systems & Technology Group, Systems Software Development
System z Firmware Development
                                                                                    
                                                                                    
                                                                                    
 Phone: 91-080-4066-0786 | Mobile: 91-973-1122-221                              IBM 
 E-mail: chandra.shekhar at in.ibm.com                                                 
                                                          ORR, Manyatha MD3 1F B247 
                                                        Bengaluru, Karnataka 560045 
                                                                              India 
                                                                                    



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150717/4d116f11/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 36543408.gif
Type: image/gif
Size: 360 bytes
Desc: not available
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150717/4d116f11/attachment.gif>

From dhbarboza82 at gmail.com  Fri Jul 17 15:19:28 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Fri, 17 Jul 2015 12:19:28 -0300
Subject: [Kimchi-devel] **Please force pull or re-clone branches of
	https://github.com/danielhb/kimchi**
Message-ID: <55A91D00.6010509@gmail.com>

Hello,

A patchset sent to this ML was wrongly pushed to the temporary repo, 
branches
'master' and 'next'.

The patchset "[PATCH v2 0/4] Add usb xhci controller for hotplug on 
Power" doesn't make
sense to community Kimchi code. This is a temporary workaround to make 
the hotplug work
in ibm_powerkvm distro running in Power. It does not apply for any other 
case.

I've removed the patches from the master and next branch, but now your 
trees won't
update gracefully, requiring a force pull or cloning the branches again.


Sorry for the inconvenience,


Daniel


From ramonn at linux.vnet.ibm.com  Fri Jul 17 16:01:08 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Fri, 17 Jul 2015 13:01:08 -0300
Subject: [Kimchi-devel] [PATCH] Update Fedora 20 ISO path to
	mirrors.kernel.org
Message-ID: <1437148868-16609-1-git-send-email-ramonn@linux.vnet.ibm.com>

The last path was removed in the server.

Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
---
 src/distros.d/fedora.json | 2 +-
 tests/test_rest.py        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/distros.d/fedora.json b/src/distros.d/fedora.json
index bce72d6..164415d 100644
--- a/src/distros.d/fedora.json
+++ b/src/distros.d/fedora.json
@@ -4,7 +4,7 @@
         "os_distro": "fedora",
         "os_arch": "x86_64",
         "os_version": "20",
-        "path": "http://fedora.mirrors.tds.net/pub/fedora/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso"
+        "path": "http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/Fedora-Live-KDE-x86_64-21-5.iso"
     },
     {
         "name": "Fedora 18 (PPC64)",
diff --git a/tests/test_rest.py b/tests/test_rest.py
index c2d142f..a969942 100644
--- a/tests/test_rest.py
+++ b/tests/test_rest.py
@@ -645,8 +645,8 @@ class RestTests(unittest.TestCase):
             os.remove('/tmp/existent.iso')
 
             # Change path of storage cdrom
-            cdrom = u'http://fedora.mirrors.tds.net/pub/fedora/releases/20/'\
-                    'Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso'
+            cdrom = u'http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/'\
+                    'Fedora-Live-KDE-x86_64-21-5.iso'
             req = json.dumps({'path': cdrom})
             resp = self.request('/vms/test-vm/storages/' + cd_dev, req, 'PUT')
             self.assertEquals(200, resp.status)
-- 
2.1.0



From ramonn at linux.vnet.ibm.com  Fri Jul 17 16:01:50 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Fri, 17 Jul 2015 13:01:50 -0300
Subject: [Kimchi-devel] [PATCH] Remove unecessary call to node_dev.parent()
Message-ID: <1437148910-16933-1-git-send-email-ramonn@linux.vnet.ibm.com>

On hostdev.py, device parent was being search 2 times. First, a xml was
parsed, where the parent device can be found. When device parent not
present, calling the function .parent() (which is not necessary) will raise
an error on libvirt. To avoid this, the call for .parent() was removed,
and parent device is set as None if not present.

Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
---
 src/kimchi/model/hostdev.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/kimchi/model/hostdev.py b/src/kimchi/model/hostdev.py
index 2a4a311..e898d77 100644
--- a/src/kimchi/model/hostdev.py
+++ b/src/kimchi/model/hostdev.py
@@ -169,14 +169,15 @@ def get_dev_info(node_dev):
     scsi_target is not documented in libvirt official website. Try to
     parse scsi_target according to the libvirt commit db19834a0a.
     '''
-
     xmlstr = node_dev.XMLDesc(0)
     info = dictize(xmlstr)['device']
     dev_type = info['capability'].pop('type')
     info['device_type'] = dev_type
     cap_dict = info.pop('capability')
     info.update(cap_dict)
-    info['parent'] = node_dev.parent()
+
+    # parent device not found: set as None
+    info["parent"] = info.get("parent")
 
     if dev_type in ('scsi', 'scsi_generic', 'scsi_target', 'system', 'usb'):
         return info
-- 
2.1.0



From dhbarboza82 at gmail.com  Fri Jul 17 20:13:52 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Fri, 17 Jul 2015 17:13:52 -0300
Subject: [Kimchi-devel] [PATCH] Remove unecessary call to
	node_dev.parent()
In-Reply-To: <1437148910-16933-1-git-send-email-ramonn@linux.vnet.ibm.com>
References: <1437148910-16933-1-git-send-email-ramonn@linux.vnet.ibm.com>
Message-ID: <55A96200.4000106@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/17/2015 01:01 PM, Ramon Medeiros wrote:
> On hostdev.py, device parent was being search 2 times. First, a xml was
> parsed, where the parent device can be found. When device parent not
> present, calling the function .parent() (which is not necessary) will raise
> an error on libvirt. To avoid this, the call for .parent() was removed,
> and parent device is set as None if not present.
>
> Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
> ---
>   src/kimchi/model/hostdev.py | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/kimchi/model/hostdev.py b/src/kimchi/model/hostdev.py
> index 2a4a311..e898d77 100644
> --- a/src/kimchi/model/hostdev.py
> +++ b/src/kimchi/model/hostdev.py
> @@ -169,14 +169,15 @@ def get_dev_info(node_dev):
>       scsi_target is not documented in libvirt official website. Try to
>       parse scsi_target according to the libvirt commit db19834a0a.
>       '''
> -
>       xmlstr = node_dev.XMLDesc(0)
>       info = dictize(xmlstr)['device']
>       dev_type = info['capability'].pop('type')
>       info['device_type'] = dev_type
>       cap_dict = info.pop('capability')
>       info.update(cap_dict)
> -    info['parent'] = node_dev.parent()
> +
> +    # parent device not found: set as None
> +    info["parent"] = info.get("parent")
>   
>       if dev_type in ('scsi', 'scsi_generic', 'scsi_target', 'system', 'usb'):
>           return info



From dhbarboza82 at gmail.com  Fri Jul 17 20:27:48 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Fri, 17 Jul 2015 17:27:48 -0300
Subject: [Kimchi-devel] [PATCH] Update Fedora 20 ISO path to
	mirrors.kernel.org
In-Reply-To: <1437148868-16609-1-git-send-email-ramonn@linux.vnet.ibm.com>
References: <1437148868-16609-1-git-send-email-ramonn@linux.vnet.ibm.com>
Message-ID: <55A96544.2010703@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
Tested-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/17/2015 01:01 PM, Ramon Medeiros wrote:
> The last path was removed in the server.
>
> Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
> ---
>   src/distros.d/fedora.json | 2 +-
>   tests/test_rest.py        | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/distros.d/fedora.json b/src/distros.d/fedora.json
> index bce72d6..164415d 100644
> --- a/src/distros.d/fedora.json
> +++ b/src/distros.d/fedora.json
> @@ -4,7 +4,7 @@
>           "os_distro": "fedora",
>           "os_arch": "x86_64",
>           "os_version": "20",
> -        "path": "http://fedora.mirrors.tds.net/pub/fedora/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso"
> +        "path": "http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/Fedora-Live-KDE-x86_64-21-5.iso"
>       },
>       {
>           "name": "Fedora 18 (PPC64)",
> diff --git a/tests/test_rest.py b/tests/test_rest.py
> index c2d142f..a969942 100644
> --- a/tests/test_rest.py
> +++ b/tests/test_rest.py
> @@ -645,8 +645,8 @@ class RestTests(unittest.TestCase):
>               os.remove('/tmp/existent.iso')
>   
>               # Change path of storage cdrom
> -            cdrom = u'http://fedora.mirrors.tds.net/pub/fedora/releases/20/'\
> -                    'Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso'
> +            cdrom = u'http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/'\
> +                    'Fedora-Live-KDE-x86_64-21-5.iso'
>               req = json.dumps({'path': cdrom})
>               resp = self.request('/vms/test-vm/storages/' + cd_dev, req, 'PUT')
>               self.assertEquals(200, resp.status)



From dhbarboza82 at gmail.com  Mon Jul 20 12:43:35 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Mon, 20 Jul 2015 09:43:35 -0300
Subject: [Kimchi-devel] [PATCH] Template disk format test fixes
Message-ID: <1437396215-11474-1-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

Unit tests must consider the scenario where the user set
a default disk format other than 'qcow2'.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 src/kimchi/vmtemplate.py | 7 ++++---
 tests/test_model.py      | 5 ++++-
 tests/test_template.py   | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 28c6448..2646573 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -159,7 +159,8 @@ class VMTemplate(object):
         dev, xml = get_disk_xml(params)
         return xml
 
-    def _get_default_disk0_format(self):
+    @staticmethod
+    def get_default_disk0_format():
         config_file = os.path.join(paths.conf_dir, 'template.conf')
         config = ConfigObj(config_file)
 
@@ -174,7 +175,7 @@ class VMTemplate(object):
 
         base_disk_params = {'type': 'disk', 'disk': 'file',
                             'bus': self.info['disk_bus'],
-                            'format': self._get_default_disk0_format()}
+                            'format': self.get_default_disk0_format()}
         logical_disk_params = {'format': 'raw'}
         iscsi_disk_params = {'disk': 'block', 'format': 'raw'}
 
@@ -202,7 +203,7 @@ class VMTemplate(object):
         return unicode(disks_xml, 'utf-8')
 
     def to_volume_list(self, vm_uuid):
-        default_vol_format = self._get_default_disk0_format()
+        default_vol_format = self.get_default_disk0_format()
         storage_path = self._get_storage_path()
         ret = []
         for i, d in enumerate(self.info['disks']):
diff --git a/tests/test_model.py b/tests/test_model.py
index bc71c50..717b9bc 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -738,8 +738,11 @@ class ModelTests(unittest.TestCase):
         inst = model.Model(None,
                            objstore_loc=self.tmp_store)
 
+        # template disk format must be qcow2 because vmsnapshot
+        # only supports this format
         orig_params = {'name': 'test', 'memory': 1024, 'cpus': 1,
-                       'cdrom': UBUNTU_ISO}
+                       'cdrom': UBUNTU_ISO,
+                       'disks': [{'size': 1, 'format': 'qcow2'}]}
         inst.templates_create(orig_params)
 
         with RollbackContext() as rollback:
diff --git a/tests/test_template.py b/tests/test_template.py
index acdb7c6..83561c1 100644
--- a/tests/test_template.py
+++ b/tests/test_template.py
@@ -24,6 +24,7 @@ import unittest
 
 from functools import partial
 
+from kimchi.vmtemplate import VMTemplate
 from kimchi.config import READONLY_POOL_TYPE
 from kimchi.mockmodel import MockModel
 from utils import get_free_port, patch_auth, request, run_server
@@ -87,7 +88,8 @@ class TemplateTests(unittest.TestCase):
         self.assertEquals(sorted(tmpl.keys()), sorted(keys))
 
         # Verify if default disk format was configured
-        self.assertEquals(tmpl['disks'][0]['format'], 'qcow2')
+        default_disk_format = VMTemplate.get_default_disk0_format()
+        self.assertEquals(tmpl['disks'][0]['format'], default_disk_format)
 
         # Clone a template
         resp = self.request('/templates/test/clone', '{}', 'POST')
-- 
2.4.3



From dhbarboza82 at gmail.com  Mon Jul 20 12:58:26 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 20 Jul 2015 09:58:26 -0300
Subject: [Kimchi-devel] [PATCH] Update Fedora 20 ISO path to
	mirrors.kernel.org
In-Reply-To: <55A96544.2010703@gmail.com>
References: <1437148868-16609-1-git-send-email-ramonn@linux.vnet.ibm.com>
	<55A96544.2010703@gmail.com>
Message-ID: <55ACF072.4010009@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks!

On 07/17/2015 05:27 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
> Tested-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> On 07/17/2015 01:01 PM, Ramon Medeiros wrote:
>> The last path was removed in the server.
>>
>> Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
>> ---
>>   src/distros.d/fedora.json | 2 +-
>>   tests/test_rest.py        | 4 ++--
>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/distros.d/fedora.json b/src/distros.d/fedora.json
>> index bce72d6..164415d 100644
>> --- a/src/distros.d/fedora.json
>> +++ b/src/distros.d/fedora.json
>> @@ -4,7 +4,7 @@
>>           "os_distro": "fedora",
>>           "os_arch": "x86_64",
>>           "os_version": "20",
>> -        "path": 
>> "http://fedora.mirrors.tds.net/pub/fedora/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso"
>> +        "path": 
>> "http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/Fedora-Live-KDE-x86_64-21-5.iso"
>>       },
>>       {
>>           "name": "Fedora 18 (PPC64)",
>> diff --git a/tests/test_rest.py b/tests/test_rest.py
>> index c2d142f..a969942 100644
>> --- a/tests/test_rest.py
>> +++ b/tests/test_rest.py
>> @@ -645,8 +645,8 @@ class RestTests(unittest.TestCase):
>>               os.remove('/tmp/existent.iso')
>>                 # Change path of storage cdrom
>> -            cdrom = 
>> u'http://fedora.mirrors.tds.net/pub/fedora/releases/20/'\
>> - 'Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso'
>> +            cdrom = 
>> u'http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/'\
>> +                    'Fedora-Live-KDE-x86_64-21-5.iso'
>>               req = json.dumps({'path': cdrom})
>>               resp = self.request('/vms/test-vm/storages/' + cd_dev, 
>> req, 'PUT')
>>               self.assertEquals(200, resp.status)
>



From dhbarboza82 at gmail.com  Mon Jul 20 13:16:39 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Mon, 20 Jul 2015 10:16:39 -0300
Subject: [Kimchi-devel] [PATCH] Remove unecessary call to
	node_dev.parent()
In-Reply-To: <55A96200.4000106@gmail.com>
References: <1437148910-16933-1-git-send-email-ramonn@linux.vnet.ibm.com>
	<55A96200.4000106@gmail.com>
Message-ID: <55ACF4B7.2@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks!

On 07/17/2015 05:13 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> On 07/17/2015 01:01 PM, Ramon Medeiros wrote:
>> On hostdev.py, device parent was being search 2 times. First, a xml was
>> parsed, where the parent device can be found. When device parent not
>> present, calling the function .parent() (which is not necessary) will 
>> raise
>> an error on libvirt. To avoid this, the call for .parent() was removed,
>> and parent device is set as None if not present.
>>
>> Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
>> ---
>>   src/kimchi/model/hostdev.py | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/kimchi/model/hostdev.py b/src/kimchi/model/hostdev.py
>> index 2a4a311..e898d77 100644
>> --- a/src/kimchi/model/hostdev.py
>> +++ b/src/kimchi/model/hostdev.py
>> @@ -169,14 +169,15 @@ def get_dev_info(node_dev):
>>       scsi_target is not documented in libvirt official website. Try to
>>       parse scsi_target according to the libvirt commit db19834a0a.
>>       '''
>> -
>>       xmlstr = node_dev.XMLDesc(0)
>>       info = dictize(xmlstr)['device']
>>       dev_type = info['capability'].pop('type')
>>       info['device_type'] = dev_type
>>       cap_dict = info.pop('capability')
>>       info.update(cap_dict)
>> -    info['parent'] = node_dev.parent()
>> +
>> +    # parent device not found: set as None
>> +    info["parent"] = info.get("parent")
>>         if dev_type in ('scsi', 'scsi_generic', 'scsi_target', 
>> 'system', 'usb'):
>>           return info
>



From chandra.shekhar at in.ibm.com  Tue Jul 21 10:40:05 2015
From: chandra.shekhar at in.ibm.com (Chandra Sr Potula)
Date: Tue, 21 Jul 2015 16:10:05 +0530
Subject: [Kimchi-devel] [Clarification] WOK branch UI development
Message-ID: <OF0FB79248.4584D839-ON65257E89.00310977-65257E89.003A9A54@in.ibm.com>



Hi Kimchi Devel-team,

There was good amount of discussion on using of bootstrap or foundation 5
for the new-ui development for WOK branch in the IRC (on 2015-07-08).

Question I have on this topic:
1. Are we experimenting with bootstrap and decide in the near future on
technology for new-ui development or bootstrap is the way to go for UI ?
2. Also are we applying the design thinking as well when it comes to new-ui
development for kimchi?
3. Do we have time line to accomplish this transformation ?

We have seen few UI issues in the WOK branch after separation of kimchi
plugin from base frame work (Issues #704-709). I see all of them labeled as
'wok' now. So for short time is it worth while to fix these issues ? If so,
is there a way assign these to my team members or some body help us in
fixing these issues ?

Thanks in advance,

Regards
Chandra

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150721/606e47ee/attachment.html>

From samuel.guimaraes at eldorado.org.br  Tue Jul 21 16:22:38 2015
From: samuel.guimaraes at eldorado.org.br (Samuel Henrique De Oliveira Guimaraes)
Date: Tue, 21 Jul 2015 16:22:38 +0000
Subject: [Kimchi-devel] [Clarification] WOK branch UI development
In-Reply-To: <OF0FB79248.4584D839-ON65257E89.00310977-65257E89.003A9A54@in.ibm.com>
References: <OF0FB79248.4584D839-ON65257E89.00310977-65257E89.003A9A54@in.ibm.com>
Message-ID: <9d5c72f0632f4ba1aed879f2c18fb9d2@serv030.corp.eldorado.org.br>

Hi,

I'm handling the new-ui development following the latest submission to the UI proposals (https://github.com/kimchi-project/kimchi/wiki/UI-Design-Proposals). Last time we discussed this in the IRC channel, I believe we had set that Bootstrap is the CSS library that we'll use for wok branch and future releases.
In this chat I said that Foundation5 had some issues with IE9. I did some research later and found that only the "off-canvas" component is affected but so far we don't use this component in the new-ui spec.
Both libraries are good but Bootstrap default styles are very similar to the new-ui spec components, it would be easier and faster to customize it compared to Foundation5 or even creating all the styles and components one by one. The same goes for people developing new plugins, they could start using Bootstrap components and then they would have all the Wok styles.

Regarding the design thinking process, I'm not sure if I'm following your question correctly but there are some things in the new-ui spec that I believe we should discuss. For instance the double caret and drop-downs in the filters (page 29). Was it tested (usability)? What is the story behind it and the requirements?

About the release date, it would be after 1.5.1. For now I'm creating a static version to edit Bootstrap styles and widgets to match the new-ui spec. Once it is finished  I'm going to add the new assets and edit the pages in wok branch.

I've seen these issues but I wasn't able to reproduce none of them, except one that refers to Wok logo (that is to be created). For the new-ui I've cropped Kimchi text from the colored symbol, since the ui-spec suggests to use native browser text instead of an image. That way we can change the text to Wok or any other name until we come up with a new logo.

Regards,
Samuel Guimaraes

From: kimchi-devel-bounces at ovirt.org [mailto:kimchi-devel-bounces at ovirt.org] On Behalf Of Chandra Sr Potula
Sent: ter?a-feira, 21 de julho de 2015 07:40
To: kimchi-devel at ovirt.org
Subject: [Kimchi-devel] [Clarification] WOK branch UI development


Hi Kimchi Devel-team,

There was good amount of discussion on using of bootstrap or foundation 5 for the new-ui development for WOK branch in the IRC (on 2015-07-08).

Question I have on this topic:
1. Are we experimenting with bootstrap and decide in the near future on technology for new-ui development or bootstrap is the way to go for UI ?
2. Also are we applying the design thinking as well when it comes to new-ui development for kimchi?
3. Do we have time line to accomplish this transformation ?

We have seen few UI issues in the WOK branch after separation of kimchi plugin from base frame work (Issues #704-709). I see all of them labeled as 'wok' now. So for short time is it worth while to fix these issues ? If so, is there a way assign these to my team members or some body help us in fixing these issues ?

Thanks in advance,

Regards
Chandra

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20150721/de5e51f1/attachment.html>

From dhbarboza82 at gmail.com  Tue Jul 21 17:56:04 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Tue, 21 Jul 2015 14:56:04 -0300
Subject: [Kimchi-devel] [PATCH] Template disk format test fixes
In-Reply-To: <1437396215-11474-1-git-send-email-dhbarboza82@gmail.com>
References: <1437396215-11474-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <55AE87B4.4020809@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

On 07/20/2015 09:43 AM, dhbarboza82 at gmail.com wrote:
> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>
> Unit tests must consider the scenario where the user set
> a default disk format other than 'qcow2'.
>
> Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
> ---
>   src/kimchi/vmtemplate.py | 7 ++++---
>   tests/test_model.py      | 5 ++++-
>   tests/test_template.py   | 4 +++-
>   3 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
> index 28c6448..2646573 100644
> --- a/src/kimchi/vmtemplate.py
> +++ b/src/kimchi/vmtemplate.py
> @@ -159,7 +159,8 @@ class VMTemplate(object):
>           dev, xml = get_disk_xml(params)
>           return xml
>   
> -    def _get_default_disk0_format(self):
> +    @staticmethod
> +    def get_default_disk0_format():
>           config_file = os.path.join(paths.conf_dir, 'template.conf')
>           config = ConfigObj(config_file)
>   
> @@ -174,7 +175,7 @@ class VMTemplate(object):
>   
>           base_disk_params = {'type': 'disk', 'disk': 'file',
>                               'bus': self.info['disk_bus'],
> -                            'format': self._get_default_disk0_format()}
> +                            'format': self.get_default_disk0_format()}
>           logical_disk_params = {'format': 'raw'}
>           iscsi_disk_params = {'disk': 'block', 'format': 'raw'}
>   
> @@ -202,7 +203,7 @@ class VMTemplate(object):
>           return unicode(disks_xml, 'utf-8')
>   
>       def to_volume_list(self, vm_uuid):
> -        default_vol_format = self._get_default_disk0_format()
> +        default_vol_format = self.get_default_disk0_format()
>           storage_path = self._get_storage_path()
>           ret = []
>           for i, d in enumerate(self.info['disks']):
> diff --git a/tests/test_model.py b/tests/test_model.py
> index bc71c50..717b9bc 100644
> --- a/tests/test_model.py
> +++ b/tests/test_model.py
> @@ -738,8 +738,11 @@ class ModelTests(unittest.TestCase):
>           inst = model.Model(None,
>                              objstore_loc=self.tmp_store)
>   
> +        # template disk format must be qcow2 because vmsnapshot
> +        # only supports this format
>           orig_params = {'name': 'test', 'memory': 1024, 'cpus': 1,
> -                       'cdrom': UBUNTU_ISO}
> +                       'cdrom': UBUNTU_ISO,
> +                       'disks': [{'size': 1, 'format': 'qcow2'}]}
>           inst.templates_create(orig_params)
>   
>           with RollbackContext() as rollback:
> diff --git a/tests/test_template.py b/tests/test_template.py
> index acdb7c6..83561c1 100644
> --- a/tests/test_template.py
> +++ b/tests/test_template.py
> @@ -24,6 +24,7 @@ import unittest
>   
>   from functools import partial
>   
> +from kimchi.vmtemplate import VMTemplate
>   from kimchi.config import READONLY_POOL_TYPE
>   from kimchi.mockmodel import MockModel
>   from utils import get_free_port, patch_auth, request, run_server
> @@ -87,7 +88,8 @@ class TemplateTests(unittest.TestCase):
>           self.assertEquals(sorted(tmpl.keys()), sorted(keys))
>   
>           # Verify if default disk format was configured
> -        self.assertEquals(tmpl['disks'][0]['format'], 'qcow2')
> +        default_disk_format = VMTemplate.get_default_disk0_format()
> +        self.assertEquals(tmpl['disks'][0]['format'], default_disk_format)
>   
>           # Clone a template
>           resp = self.request('/templates/test/clone', '{}', 'POST')



From joserz at linux.vnet.ibm.com  Thu Jul 23 13:56:11 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Thu, 23 Jul 2015 10:56:11 -0300
Subject: [Kimchi-devel] [PATCH 2/2] Change getsebool to run silently.
In-Reply-To: <1437659771-5106-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1437659771-5106-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1437659771-5106-3-git-send-email-joserz@linux.vnet.ibm.com>

 - getsebool virt_use_sysfs exists in RHEL6 and older distributions
   only. Newer distros don't have it but run_command alerts there is an
   error in Kimchi. This is not an error but a expected behavior. For
   this reason, this command now will only log for debugging purposes.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/model/vmhostdevs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index 3e711cb..9a7d03b 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -102,7 +102,8 @@ class VMHostDevsModel(object):
 
         # Enable virt_use_sysfs on RHEL6 and older distributions
         # In recent Fedora, there is no virt_use_sysfs.
-        out, err, rc = run_command(['getsebool', 'virt_use_sysfs'])
+        out, err, rc = run_command(['getsebool', 'virt_use_sysfs'],
+                                   silent=True)
         if rc == 0 and out.rstrip('\n') != "virt_use_sysfs --> on":
             out, err, rc = run_command(['setsebool', '-P',
                                         'virt_use_sysfs=on'])
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Thu Jul 23 13:56:10 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Thu, 23 Jul 2015 10:56:10 -0300
Subject: [Kimchi-devel] [PATCH 1/2] Add option 'silent' in run_command
In-Reply-To: <1437659771-5106-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1437659771-5106-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <1437659771-5106-2-git-send-email-joserz@linux.vnet.ibm.com>

 - With this new option the caller can choose if run_command errors will
   be logged as error or debug. There are cases where a command error is
   expected and don't need to alert users.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/utils.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py
index ff3a5da..baf2d62 100644
--- a/src/kimchi/utils.py
+++ b/src/kimchi/utils.py
@@ -165,11 +165,13 @@ def check_url_path(path):
     return True
 
 
-def run_command(cmd, timeout=None):
+def run_command(cmd, timeout=None, silent=False):
     """
     cmd is a sequence of command arguments.
     timeout is a float number in seconds.
     timeout default value is None, means command run without timeout.
+    silent is bool, it will log errors using debug handler not error.
+    silent default value is False.
     """
     # subprocess.kill() can leave descendants running
     # and halting the execution. Using psutil to
@@ -206,8 +208,14 @@ def run_command(cmd, timeout=None):
             kimchi_log.debug("out:\n%s", out)
 
         if proc.returncode != 0:
-            kimchi_log.error("rc: %s error: %s returned from cmd: %s",
-                             proc.returncode, error, ' '.join(cmd))
+            msg = "rc: %s error: %s returned from cmd: %s" %\
+                  (proc.returncode, error, ' '.join(cmd))
+
+            if silent:
+                kimchi_log.debug(msg)
+
+            else:
+                kimchi_log.error(msg)
         elif error:
             kimchi_log.debug("error: %s returned from cmd: %s",
                              error, ' '.join(cmd))
-- 
1.9.1



From joserz at linux.vnet.ibm.com  Thu Jul 23 13:56:09 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Thu, 23 Jul 2015 10:56:09 -0300
Subject: [Kimchi-devel] [PATCH 0/2] Add option to run_command to log error
	in debug mode
Message-ID: <1437659771-5106-1-git-send-email-joserz@linux.vnet.ibm.com>

 - Sometimes the run_command caller doesn't want to have a failure
   logged as error, since such failure can be expected. This patch adds
   an option in run_command to log errors in debug mode to avoid give
   false positives to users.

Jose Ricardo Ziviani (2):
  Add option 'silent' in run_command
  Change getsebool to run silently.

 src/kimchi/model/vmhostdevs.py |  3 ++-
 src/kimchi/utils.py            | 14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

-- 
1.9.1



From ramonn at linux.vnet.ibm.com  Thu Jul 23 13:57:27 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Thu, 23 Jul 2015 10:57:27 -0300
Subject: [Kimchi-devel] [PATCH 2/2] Change getsebool to run silently.
In-Reply-To: <1437659771-5106-3-git-send-email-joserz@linux.vnet.ibm.com>
References: <1437659771-5106-1-git-send-email-joserz@linux.vnet.ibm.com>
	<1437659771-5106-3-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <55B0F2C7.5000702@linux.vnet.ibm.com>

Reviewed-By: Ramon Medeiros <ramonn at br.ibm.com>

On 07/23/2015 10:56 AM, Jose Ricardo Ziviani wrote:
>   - getsebool virt_use_sysfs exists in RHEL6 and older distributions
>     only. Newer distros don't have it but run_command alerts there is an
>     error in Kimchi. This is not an error but a expected behavior. For
>     this reason, this command now will only log for debugging purposes.
>
> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
> ---
>   src/kimchi/model/vmhostdevs.py | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
> index 3e711cb..9a7d03b 100644
> --- a/src/kimchi/model/vmhostdevs.py
> +++ b/src/kimchi/model/vmhostdevs.py
> @@ -102,7 +102,8 @@ class VMHostDevsModel(object):
>
>           # Enable virt_use_sysfs on RHEL6 and older distributions
>           # In recent Fedora, there is no virt_use_sysfs.
> -        out, err, rc = run_command(['getsebool', 'virt_use_sysfs'])
> +        out, err, rc = run_command(['getsebool', 'virt_use_sysfs'],
> +                                   silent=True)
>           if rc == 0 and out.rstrip('\n') != "virt_use_sysfs --> on":
>               out, err, rc = run_command(['setsebool', '-P',
>                                           'virt_use_sysfs=on'])

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com



From dhbarboza82 at gmail.com  Fri Jul 24 19:22:55 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Fri, 24 Jul 2015 16:22:55 -0300
Subject: [Kimchi-devel] [PATCH 2/2] Change getsebool to run silently.
In-Reply-To: <55B0F2C7.5000702@linux.vnet.ibm.com>
References: <1437659771-5106-1-git-send-email-joserz@linux.vnet.ibm.com>	<1437659771-5106-3-git-send-email-joserz@linux.vnet.ibm.com>
	<55B0F2C7.5000702@linux.vnet.ibm.com>
Message-ID: <55B2908F.7000703@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks!


On 07/23/2015 10:57 AM, Ramon Medeiros wrote:
> Reviewed-By: Ramon Medeiros <ramonn at br.ibm.com>
>
> On 07/23/2015 10:56 AM, Jose Ricardo Ziviani wrote:
>>   - getsebool virt_use_sysfs exists in RHEL6 and older distributions
>>     only. Newer distros don't have it but run_command alerts there is an
>>     error in Kimchi. This is not an error but a expected behavior. For
>>     this reason, this command now will only log for debugging purposes.
>>
>> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
>> ---
>>   src/kimchi/model/vmhostdevs.py | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/kimchi/model/vmhostdevs.py 
>> b/src/kimchi/model/vmhostdevs.py
>> index 3e711cb..9a7d03b 100644
>> --- a/src/kimchi/model/vmhostdevs.py
>> +++ b/src/kimchi/model/vmhostdevs.py
>> @@ -102,7 +102,8 @@ class VMHostDevsModel(object):
>>
>>           # Enable virt_use_sysfs on RHEL6 and older distributions
>>           # In recent Fedora, there is no virt_use_sysfs.
>> -        out, err, rc = run_command(['getsebool', 'virt_use_sysfs'])
>> +        out, err, rc = run_command(['getsebool', 'virt_use_sysfs'],
>> +                                   silent=True)
>>           if rc == 0 and out.rstrip('\n') != "virt_use_sysfs --> on":
>>               out, err, rc = run_command(['setsebool', '-P',
>>                                           'virt_use_sysfs=on'])
>



From dhbarboza82 at gmail.com  Tue Jul 28 22:33:57 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Tue, 28 Jul 2015 19:33:57 -0300
Subject: [Kimchi-devel] [PATCH] vmHostDevModel: returning 'product' and
	'vendor' in lookup
Message-ID: <1438122837-30351-1-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

The 'getVMCPIDevices' API was missing these infos that are
present in other API calls such as getAllAvailableDevices.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 src/kimchi/model/vmhostdevs.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index 9a7d03b..a9f6d77 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -217,10 +217,15 @@ class VMHostDevModel(object):
             raise NotFoundError('KCHVMHDEV0001E',
                                 {'vmid': vmid, 'dev_name': dev_name})
 
+        dev_model = DeviceModel(conn=self.conn)
         for e in hostdev:
             deduced_name = DeviceModel.deduce_dev_name(e, self.conn)
             if deduced_name == dev_name:
-                return {'name': dev_name, 'type': e.attrib['type']}
+                dev_info = dev_model.lookup(dev_name)
+                return {'name': dev_name,
+                        'type': e.attrib['type'],
+                        'product': dev_info.get('product', None),
+                        'vendor': dev_info.get('vendor', None)}
 
         raise NotFoundError('KCHVMHDEV0001E',
                             {'vmid': vmid, 'dev_name': dev_name})
-- 
2.4.3



From joserz at linux.vnet.ibm.com  Tue Jul 28 22:37:40 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Tue, 28 Jul 2015 19:37:40 -0300
Subject: [Kimchi-devel] [PATCH] vmHostDevModel: returning 'product' and
 'vendor' in lookup
In-Reply-To: <1438122837-30351-1-git-send-email-dhbarboza82@gmail.com>
References: <1438122837-30351-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <55B80434.4070909@linux.vnet.ibm.com>

Reviewed-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>

On 28-07-2015 19:33, dhbarboza82 at gmail.com wrote:
> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>
> The 'getVMCPIDevices' API was missing these infos that are
> present in other API calls such as getAllAvailableDevices.
>
> Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
> ---
>   src/kimchi/model/vmhostdevs.py | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
> index 9a7d03b..a9f6d77 100644
> --- a/src/kimchi/model/vmhostdevs.py
> +++ b/src/kimchi/model/vmhostdevs.py
> @@ -217,10 +217,15 @@ class VMHostDevModel(object):
>               raise NotFoundError('KCHVMHDEV0001E',
>                                   {'vmid': vmid, 'dev_name': dev_name})
>
> +        dev_model = DeviceModel(conn=self.conn)
>           for e in hostdev:
>               deduced_name = DeviceModel.deduce_dev_name(e, self.conn)
>               if deduced_name == dev_name:
> -                return {'name': dev_name, 'type': e.attrib['type']}
> +                dev_info = dev_model.lookup(dev_name)
> +                return {'name': dev_name,
> +                        'type': e.attrib['type'],
> +                        'product': dev_info.get('product', None),
> +                        'vendor': dev_info.get('vendor', None)}
>
>           raise NotFoundError('KCHVMHDEV0001E',
>                               {'vmid': vmid, 'dev_name': dev_name})
>

-- 
Jose Ricardo Ziviani
-----------------------------
Software Engineer
Linux Technology Center - IBM



From dhbarboza82 at gmail.com  Wed Jul 29 13:47:11 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 29 Jul 2015 10:47:11 -0300
Subject: [Kimchi-devel] [PATCH] vmHostDevModel: returning 'product' and
 'vendor' in lookup
In-Reply-To: <55B80434.4070909@linux.vnet.ibm.com>
References: <1438122837-30351-1-git-send-email-dhbarboza82@gmail.com>
	<55B80434.4070909@linux.vnet.ibm.com>
Message-ID: <55B8D95F.9040606@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks for the review!

On 07/28/2015 07:37 PM, Jose Ricardo Ziviani wrote:
> Reviewed-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
>
> On 28-07-2015 19:33, dhbarboza82 at gmail.com wrote:
>> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>>
>> The 'getVMCPIDevices' API was missing these infos that are
>> present in other API calls such as getAllAvailableDevices.
>>
>> Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>> ---
>>   src/kimchi/model/vmhostdevs.py | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/kimchi/model/vmhostdevs.py 
>> b/src/kimchi/model/vmhostdevs.py
>> index 9a7d03b..a9f6d77 100644
>> --- a/src/kimchi/model/vmhostdevs.py
>> +++ b/src/kimchi/model/vmhostdevs.py
>> @@ -217,10 +217,15 @@ class VMHostDevModel(object):
>>               raise NotFoundError('KCHVMHDEV0001E',
>>                                   {'vmid': vmid, 'dev_name': dev_name})
>>
>> +        dev_model = DeviceModel(conn=self.conn)
>>           for e in hostdev:
>>               deduced_name = DeviceModel.deduce_dev_name(e, self.conn)
>>               if deduced_name == dev_name:
>> -                return {'name': dev_name, 'type': e.attrib['type']}
>> +                dev_info = dev_model.lookup(dev_name)
>> +                return {'name': dev_name,
>> +                        'type': e.attrib['type'],
>> +                        'product': dev_info.get('product', None),
>> +                        'vendor': dev_info.get('vendor', None)}
>>
>>           raise NotFoundError('KCHVMHDEV0001E',
>>                               {'vmid': vmid, 'dev_name': dev_name})
>>
>



From ramonn at linux.vnet.ibm.com  Wed Jul 29 15:13:01 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Wed, 29 Jul 2015 12:13:01 -0300
Subject: [Kimchi-devel] [PATCH] Improve code performance on UI
Message-ID: <1438182781-22474-1-git-send-email-ramonn@linux.vnet.ibm.com>

Instead of sorting user each interaction, wait UI to create all nodes
and then, sort items.

Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
---
 ui/js/src/kimchi.guest_edit_main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js
index 7671e43..f71ba3b 100644
--- a/ui/js/src/kimchi.guest_edit_main.js
+++ b/ui/js/src/kimchi.guest_edit_main.js
@@ -375,23 +375,23 @@ kimchi.guest_edit_main = function() {
             for(var i=0; i<availUsers.length; i++){
                 initNode(availUsers[i], true);
                 $("#permission-avail-users").append(userNodes[availUsers[i]]);
-                sortNodes($("#permission-avail-users"), true);
             }
+            sortNodes($("#permission-avail-users"), true);
             for(var i=0; i<selUsers.length; i++){
                 initNode(selUsers[i], true);
                 $("#permission-sel-users").append(userNodes[selUsers[i]]);
-                sortNodes($("#permission-sel-users"), true);
             }
+            sortNodes($("#permission-sel-users"), true);
             for(var i=0; i<availGroups.length; i++){
                 initNode(availGroups[i], false);
                 $("#permission-avail-groups").append(groupNodes[availGroups[i]]);
-                sortNodes($("#permission-avail-groups"), false);
             }
+            sortNodes($("#permission-avail-groups"), false);
             for(var i=0; i<selGroups.length; i++){
                 initNode(selGroups[i], false);
                 $("#permission-sel-groups").append(groupNodes[selGroups[i]]);
-                sortNodes($("#permission-sel-groups"), false);
             }
+            sortNodes($("#permission-sel-groups"), false);
         };
         var filterNodes = function(key, container){
             container.children().each(function(){
-- 
2.1.0



From dhbarboza82 at gmail.com  Wed Jul 29 16:02:50 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 29 Jul 2015 13:02:50 -0300
Subject: [Kimchi-devel] [PATCH] Improve code performance on UI
In-Reply-To: <1438182781-22474-1-git-send-email-ramonn@linux.vnet.ibm.com>
References: <1438182781-22474-1-git-send-email-ramonn@linux.vnet.ibm.com>
Message-ID: <55B8F92A.2060901@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/29/2015 12:13 PM, Ramon Medeiros wrote:
> Instead of sorting user each interaction, wait UI to create all nodes
> and then, sort items.
>
> Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
> ---
>   ui/js/src/kimchi.guest_edit_main.js | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js
> index 7671e43..f71ba3b 100644
> --- a/ui/js/src/kimchi.guest_edit_main.js
> +++ b/ui/js/src/kimchi.guest_edit_main.js
> @@ -375,23 +375,23 @@ kimchi.guest_edit_main = function() {
>               for(var i=0; i<availUsers.length; i++){
>                   initNode(availUsers[i], true);
>                   $("#permission-avail-users").append(userNodes[availUsers[i]]);
> -                sortNodes($("#permission-avail-users"), true);
>               }
> +            sortNodes($("#permission-avail-users"), true);
>               for(var i=0; i<selUsers.length; i++){
>                   initNode(selUsers[i], true);
>                   $("#permission-sel-users").append(userNodes[selUsers[i]]);
> -                sortNodes($("#permission-sel-users"), true);
>               }
> +            sortNodes($("#permission-sel-users"), true);
>               for(var i=0; i<availGroups.length; i++){
>                   initNode(availGroups[i], false);
>                   $("#permission-avail-groups").append(groupNodes[availGroups[i]]);
> -                sortNodes($("#permission-avail-groups"), false);
>               }
> +            sortNodes($("#permission-avail-groups"), false);
>               for(var i=0; i<selGroups.length; i++){
>                   initNode(selGroups[i], false);
>                   $("#permission-sel-groups").append(groupNodes[selGroups[i]]);
> -                sortNodes($("#permission-sel-groups"), false);
>               }
> +            sortNodes($("#permission-sel-groups"), false);
>           };
>           var filterNodes = function(key, container){
>               container.children().each(function(){



From joserz at linux.vnet.ibm.com  Wed Jul 29 16:04:37 2015
From: joserz at linux.vnet.ibm.com (Jose Ricardo Ziviani)
Date: Wed, 29 Jul 2015 13:04:37 -0300
Subject: [Kimchi-devel] [PATCH] Force qcow2 when creating a VM based on
	backing image
Message-ID: <1438185877-17385-1-git-send-email-joserz@linux.vnet.ibm.com>

 - When using a backing image as template the target must be a qcow2
   image.

Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
---
 src/kimchi/vmtemplate.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 2646573..a165a5d 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -232,12 +232,18 @@ class VMTemplate(object):
             v_tree = E.volume(E.name(info['name']))
             v_tree.append(E.allocation(str(info['allocation']), unit='G'))
             v_tree.append(E.capacity(str(info['capacity']), unit='G'))
-            target = E.target(
-                E.format(type=info['format']), E.path(info['path']))
+
+            target_fmt = info['format']
             if 'base' in d:
+                # target must be qcow2 in order to use a backing file
+                target_fmt = 'qcow2'
+
                 v_tree.append(E.backingStore(
                     E.path(info['base']['path']),
                     E.format(type=info['base']['format'])))
+
+            target = E.target(
+                E.format(type=target_fmt), E.path(info['path']))
             v_tree.append(target)
             info['xml'] = etree.tostring(v_tree)
             ret.append(info)
-- 
1.9.1



From socorro at linux.vnet.ibm.com  Wed Jul 29 16:16:26 2015
From: socorro at linux.vnet.ibm.com (Socorro Stoppler)
Date: Wed, 29 Jul 2015 09:16:26 -0700
Subject: [Kimchi-devel] [PATCH] PCI Node filtering
Message-ID: <1438186586-24502-1-git-send-email-socorro@linux.vnet.ibm.com>

Allow to only be able to add PCI device that is not attached to a VM
All filter now shows only those PCI devices that are available to be added
and ones that are already attached to a VM.

Signed-off-by: Socorro Stoppler <socorro at linux.vnet.ibm.com>
---
 ui/js/src/kimchi.guest_edit_main.js | 166 +++++++++++++++++++-----------------
 1 file changed, 88 insertions(+), 78 deletions(-)

diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js
index 7671e43..a07f938 100644
--- a/ui/js/src/kimchi.guest_edit_main.js
+++ b/ui/js/src/kimchi.guest_edit_main.js
@@ -429,81 +429,7 @@ kimchi.guest_edit_main = function() {
             filterNodes("", $("#permission-avail-groups"));
         });
     }
-    var setupPCIDevice = function(){
-        kimchi.getHostPCIDevices(function(hostPCIs){
-            kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){
-                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());
-                            });
-                        } 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";
-                            }
-                        }
-                        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){
+    var filterPCINodes = function(group, text){
             text = text.toLowerCase();
             $(".body", "#form-guest-edit-pci").children().each(function(){
                 var textFilter = $(".name", this).text().toLowerCase().indexOf(text)!=-1;
@@ -522,15 +448,99 @@ kimchi.guest_edit_main = function() {
                 }
                 $(this).css("display", display);
             });
-        };
+        }
+    var setupPCIDevice = function(){
+        kimchi.getAvailableHostPCIDevices(function(hostPCIs){
+            kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){
+                setupNode(hostPCIs, "ui-icon-plus");
+                setupNode(vmPCIs, "ui-icon-minus");
+            });
+        });
         $("select", "#form-guest-edit-pci").change(function(){
-            filterNodes($(this).val(), $("input", "#form-guest-edit-pci").val());
+            filterPCINodes($(this).val(), $("input", "#form-guest-edit-pci").val());
         });
         $("input", "#form-guest-edit-pci").on("keyup", function() {
-            filterNodes($("select", "#form-guest-edit-pci").val(), $(this).val());
+            filterPCINodes($("select", "#form-guest-edit-pci").val(), $(this).val());
         });
     };
 
+    var setupNode = function(arrPCIDevices, iconClass) {
+        var pciEnabled = kimchi.capabilities.kernel_vfio;
+        var pciDeviceName, pciDeviceProduct, pciDeviceProductDesc, pciDeviceVendor, pciDeviceVendorDesc;        
+        for(var i=0; i<arrPCIDevices.length; i++){
+            pciDeviceName = arrPCIDevices[i].name;
+            pciDeviceProduct = arrPCIDevices[i].product;
+            pciDeviceVendor = arrPCIDevices[i].vendor;
+            if(pciDeviceProduct!=null) {
+                pciDeviceProductDesc = pciDeviceProduct.description;
+            }
+            if(pciDeviceVendor!=null) {
+                pciDeviceVendorDesc = pciDeviceVendor.description;
+            }
+            var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{
+                  name: pciDeviceName,
+                  product: pciDeviceProductDesc,
+                  vendor: pciDeviceVendorDesc
+            }));
+            $(".body", "#form-guest-edit-pci").append(itemNode);
+            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.getAvailableHostPCIDevices(function(arrPCIDevices1){
+                            kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){
+                                for(var k=0; k<arrPCIDevices1.length; k++) {
+                                    $("button", "#" + arrPCIDevices1[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"});
+                                }
+                            });
+                        });
+                        filterPCINodes($("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"});
+                            }
+                        });
+                        filterPCINodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val());
+                    });
+                }
+            });
+            kimchi.getPCIDeviceCompanions(pciDeviceName, 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);
+                }
+            });
+        }
+    };
+
     var setupSnapshot = function() {
         var currentSnapshot;
         var setCurrentSnapshot = function(aSnapshot){
-- 
1.8.3.1



From danielhb at linux.vnet.ibm.com  Wed Jul 29 17:07:50 2015
From: danielhb at linux.vnet.ibm.com (Daniel Henrique Barboza)
Date: Wed, 29 Jul 2015 14:07:50 -0300
Subject: [Kimchi-devel] [PATCH] PCI Node filtering
In-Reply-To: <1438186586-24502-1-git-send-email-socorro@linux.vnet.ibm.com>
References: <1438186586-24502-1-git-send-email-socorro@linux.vnet.ibm.com>
Message-ID: <55B90866.6070202@linux.vnet.ibm.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/29/2015 01:16 PM, Socorro Stoppler wrote:
> Allow to only be able to add PCI device that is not attached to a VM
> All filter now shows only those PCI devices that are available to be added
> and ones that are already attached to a VM.
>
> Signed-off-by: Socorro Stoppler <socorro at linux.vnet.ibm.com>
> ---
>   ui/js/src/kimchi.guest_edit_main.js | 166 +++++++++++++++++++-----------------
>   1 file changed, 88 insertions(+), 78 deletions(-)
>
> diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js
> index 7671e43..a07f938 100644
> --- a/ui/js/src/kimchi.guest_edit_main.js
> +++ b/ui/js/src/kimchi.guest_edit_main.js
> @@ -429,81 +429,7 @@ kimchi.guest_edit_main = function() {
>               filterNodes("", $("#permission-avail-groups"));
>           });
>       }
> -    var setupPCIDevice = function(){
> -        kimchi.getHostPCIDevices(function(hostPCIs){
> -            kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){
> -                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());
> -                            });
> -                        } 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";
> -                            }
> -                        }
> -                        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){
> +    var filterPCINodes = function(group, text){
>               text = text.toLowerCase();
>               $(".body", "#form-guest-edit-pci").children().each(function(){
>                   var textFilter = $(".name", this).text().toLowerCase().indexOf(text)!=-1;
> @@ -522,15 +448,99 @@ kimchi.guest_edit_main = function() {
>                   }
>                   $(this).css("display", display);
>               });
> -        };
> +        }
> +    var setupPCIDevice = function(){
> +        kimchi.getAvailableHostPCIDevices(function(hostPCIs){
> +            kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){
> +                setupNode(hostPCIs, "ui-icon-plus");
> +                setupNode(vmPCIs, "ui-icon-minus");
> +            });
> +        });
>           $("select", "#form-guest-edit-pci").change(function(){
> -            filterNodes($(this).val(), $("input", "#form-guest-edit-pci").val());
> +            filterPCINodes($(this).val(), $("input", "#form-guest-edit-pci").val());
>           });
>           $("input", "#form-guest-edit-pci").on("keyup", function() {
> -            filterNodes($("select", "#form-guest-edit-pci").val(), $(this).val());
> +            filterPCINodes($("select", "#form-guest-edit-pci").val(), $(this).val());
>           });
>       };
>
> +    var setupNode = function(arrPCIDevices, iconClass) {
> +        var pciEnabled = kimchi.capabilities.kernel_vfio;
> +        var pciDeviceName, pciDeviceProduct, pciDeviceProductDesc, pciDeviceVendor, pciDeviceVendorDesc;
> +        for(var i=0; i<arrPCIDevices.length; i++){
> +            pciDeviceName = arrPCIDevices[i].name;
> +            pciDeviceProduct = arrPCIDevices[i].product;
> +            pciDeviceVendor = arrPCIDevices[i].vendor;
> +            if(pciDeviceProduct!=null) {
> +                pciDeviceProductDesc = pciDeviceProduct.description;
> +            }
> +            if(pciDeviceVendor!=null) {
> +                pciDeviceVendorDesc = pciDeviceVendor.description;
> +            }
> +            var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{
> +                  name: pciDeviceName,
> +                  product: pciDeviceProductDesc,
> +                  vendor: pciDeviceVendorDesc
> +            }));
> +            $(".body", "#form-guest-edit-pci").append(itemNode);
> +            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.getAvailableHostPCIDevices(function(arrPCIDevices1){
> +                            kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){
> +                                for(var k=0; k<arrPCIDevices1.length; k++) {
> +                                    $("button", "#" + arrPCIDevices1[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"});
> +                                }
> +                            });
> +                        });
> +                        filterPCINodes($("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"});
> +                            }
> +                        });
> +                        filterPCINodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val());
> +                    });
> +                }
> +            });
> +            kimchi.getPCIDeviceCompanions(pciDeviceName, 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);
> +                }
> +            });
> +        }
> +    };
> +
>       var setupSnapshot = function() {
>           var currentSnapshot;
>           var setCurrentSnapshot = function(aSnapshot){



From dhbarboza82 at gmail.com  Wed Jul 29 17:36:10 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 29 Jul 2015 14:36:10 -0300
Subject: [Kimchi-devel] [PATCH] Force qcow2 when creating a VM based on
 backing image
In-Reply-To: <1438185877-17385-1-git-send-email-joserz@linux.vnet.ibm.com>
References: <1438185877-17385-1-git-send-email-joserz@linux.vnet.ibm.com>
Message-ID: <55B90F0A.7090608@gmail.com>

Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>

On 07/29/2015 01:04 PM, Jose Ricardo Ziviani wrote:
>   - When using a backing image as template the target must be a qcow2
>     image.
>
> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
> ---
>   src/kimchi/vmtemplate.py | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
> index 2646573..a165a5d 100644
> --- a/src/kimchi/vmtemplate.py
> +++ b/src/kimchi/vmtemplate.py
> @@ -232,12 +232,18 @@ class VMTemplate(object):
>               v_tree = E.volume(E.name(info['name']))
>               v_tree.append(E.allocation(str(info['allocation']), unit='G'))
>               v_tree.append(E.capacity(str(info['capacity']), unit='G'))
> -            target = E.target(
> -                E.format(type=info['format']), E.path(info['path']))
> +
> +            target_fmt = info['format']
>               if 'base' in d:
> +                # target must be qcow2 in order to use a backing file
> +                target_fmt = 'qcow2'
> +
>                   v_tree.append(E.backingStore(
>                       E.path(info['base']['path']),
>                       E.format(type=info['base']['format'])))
> +
> +            target = E.target(
> +                E.format(type=target_fmt), E.path(info['path']))
>               v_tree.append(target)
>               info['xml'] = etree.tostring(v_tree)
>               ret.append(info)



From dhbarboza82 at gmail.com  Thu Jul 30 00:46:47 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 29 Jul 2015 21:46:47 -0300
Subject: [Kimchi-devel] [PATCH] PCI Node filtering
In-Reply-To: <55B90866.6070202@linux.vnet.ibm.com>
References: <1438186586-24502-1-git-send-email-socorro@linux.vnet.ibm.com>
	<55B90866.6070202@linux.vnet.ibm.com>
Message-ID: <55B973F7.5050107@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks!

On 07/29/2015 02:07 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> On 07/29/2015 01:16 PM, Socorro Stoppler wrote:
>> Allow to only be able to add PCI device that is not attached to a VM
>> All filter now shows only those PCI devices that are available to be 
>> added
>> and ones that are already attached to a VM.
>>
>> Signed-off-by: Socorro Stoppler <socorro at linux.vnet.ibm.com>
>> ---
>>   ui/js/src/kimchi.guest_edit_main.js | 166 
>> +++++++++++++++++++-----------------
>>   1 file changed, 88 insertions(+), 78 deletions(-)
>>
>> diff --git a/ui/js/src/kimchi.guest_edit_main.js 
>> b/ui/js/src/kimchi.guest_edit_main.js
>> index 7671e43..a07f938 100644
>> --- a/ui/js/src/kimchi.guest_edit_main.js
>> +++ b/ui/js/src/kimchi.guest_edit_main.js
>> @@ -429,81 +429,7 @@ kimchi.guest_edit_main = function() {
>>               filterNodes("", $("#permission-avail-groups"));
>>           });
>>       }
>> -    var setupPCIDevice = function(){
>> -        kimchi.getHostPCIDevices(function(hostPCIs){
>> -            kimchi.getVMPCIDevices(kimchi.selectedGuest, 
>> function(vmPCIs){
>> -                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());
>> -                            });
>> -                        } 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";
>> -                            }
>> -                        }
>> -                        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){
>> +    var filterPCINodes = function(group, text){
>>               text = text.toLowerCase();
>>               $(".body", 
>> "#form-guest-edit-pci").children().each(function(){
>>                   var textFilter = $(".name", 
>> this).text().toLowerCase().indexOf(text)!=-1;
>> @@ -522,15 +448,99 @@ kimchi.guest_edit_main = function() {
>>                   }
>>                   $(this).css("display", display);
>>               });
>> -        };
>> +        }
>> +    var setupPCIDevice = function(){
>> +        kimchi.getAvailableHostPCIDevices(function(hostPCIs){
>> +            kimchi.getVMPCIDevices(kimchi.selectedGuest, 
>> function(vmPCIs){
>> +                setupNode(hostPCIs, "ui-icon-plus");
>> +                setupNode(vmPCIs, "ui-icon-minus");
>> +            });
>> +        });
>>           $("select", "#form-guest-edit-pci").change(function(){
>> -            filterNodes($(this).val(), $("input", 
>> "#form-guest-edit-pci").val());
>> +            filterPCINodes($(this).val(), $("input", 
>> "#form-guest-edit-pci").val());
>>           });
>>           $("input", "#form-guest-edit-pci").on("keyup", function() {
>> -            filterNodes($("select", "#form-guest-edit-pci").val(), 
>> $(this).val());
>> +            filterPCINodes($("select", 
>> "#form-guest-edit-pci").val(), $(this).val());
>>           });
>>       };
>>
>> +    var setupNode = function(arrPCIDevices, iconClass) {
>> +        var pciEnabled = kimchi.capabilities.kernel_vfio;
>> +        var pciDeviceName, pciDeviceProduct, pciDeviceProductDesc, 
>> pciDeviceVendor, pciDeviceVendorDesc;
>> +        for(var i=0; i<arrPCIDevices.length; i++){
>> +            pciDeviceName = arrPCIDevices[i].name;
>> +            pciDeviceProduct = arrPCIDevices[i].product;
>> +            pciDeviceVendor = arrPCIDevices[i].vendor;
>> +            if(pciDeviceProduct!=null) {
>> +                pciDeviceProductDesc = pciDeviceProduct.description;
>> +            }
>> +            if(pciDeviceVendor!=null) {
>> +                pciDeviceVendorDesc = pciDeviceVendor.description;
>> +            }
>> +            var itemNode = 
>> $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{
>> +                  name: pciDeviceName,
>> +                  product: pciDeviceProductDesc,
>> +                  vendor: pciDeviceVendorDesc
>> +            }));
>> +            $(".body", "#form-guest-edit-pci").append(itemNode);
>> +            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.getAvailableHostPCIDevices(function(arrPCIDevices1){
>> + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){
>> +                                for(var k=0; 
>> k<arrPCIDevices1.length; k++) {
>> +                                    $("button", "#" + 
>> arrPCIDevices1[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"});
>> +                                }
>> +                            });
>> +                        });
>> +                        filterPCINodes($("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"});
>> +                            }
>> +                        });
>> +                        filterPCINodes($("select", 
>> "#form-guest-edit-pci").val(), $("input", 
>> "#form-guest-edit-pci").val());
>> +                    });
>> +                }
>> +            });
>> +            kimchi.getPCIDeviceCompanions(pciDeviceName, 
>> 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);
>> +                }
>> +            });
>> +        }
>> +    };
>> +
>>       var setupSnapshot = function() {
>>           var currentSnapshot;
>>           var setCurrentSnapshot = function(aSnapshot){
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel



From dhbarboza82 at gmail.com  Thu Jul 30 00:47:06 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 29 Jul 2015 21:47:06 -0300
Subject: [Kimchi-devel] [PATCH] Force qcow2 when creating a VM based on
 backing image
In-Reply-To: <55B90F0A.7090608@gmail.com>
References: <1438185877-17385-1-git-send-email-joserz@linux.vnet.ibm.com>
	<55B90F0A.7090608@gmail.com>
Message-ID: <55B9740A.2040506@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks!

On 07/29/2015 02:36 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> On 07/29/2015 01:04 PM, Jose Ricardo Ziviani wrote:
>>   - When using a backing image as template the target must be a qcow2
>>     image.
>>
>> Signed-off-by: Jose Ricardo Ziviani <joserz at linux.vnet.ibm.com>
>> ---
>>   src/kimchi/vmtemplate.py | 10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
>> index 2646573..a165a5d 100644
>> --- a/src/kimchi/vmtemplate.py
>> +++ b/src/kimchi/vmtemplate.py
>> @@ -232,12 +232,18 @@ class VMTemplate(object):
>>               v_tree = E.volume(E.name(info['name']))
>> v_tree.append(E.allocation(str(info['allocation']), unit='G'))
>>               v_tree.append(E.capacity(str(info['capacity']), unit='G'))
>> -            target = E.target(
>> -                E.format(type=info['format']), E.path(info['path']))
>> +
>> +            target_fmt = info['format']
>>               if 'base' in d:
>> +                # target must be qcow2 in order to use a backing file
>> +                target_fmt = 'qcow2'
>> +
>>                   v_tree.append(E.backingStore(
>>                       E.path(info['base']['path']),
>>                       E.format(type=info['base']['format'])))
>> +
>> +            target = E.target(
>> +                E.format(type=target_fmt), E.path(info['path']))
>>               v_tree.append(target)
>>               info['xml'] = etree.tostring(v_tree)
>>               ret.append(info)
>



From dhbarboza82 at gmail.com  Thu Jul 30 00:47:19 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 29 Jul 2015 21:47:19 -0300
Subject: [Kimchi-devel] [PATCH] Improve code performance on UI
In-Reply-To: <55B8F92A.2060901@gmail.com>
References: <1438182781-22474-1-git-send-email-ramonn@linux.vnet.ibm.com>
	<55B8F92A.2060901@gmail.com>
Message-ID: <55B97417.5080801@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

Thanks!

On 07/29/2015 01:02 PM, Daniel Henrique Barboza wrote:
> Reviewed-by: Daniel Barboza <dhbarboza82 at gmail.com>
>
> On 07/29/2015 12:13 PM, Ramon Medeiros wrote:
>> Instead of sorting user each interaction, wait UI to create all nodes
>> and then, sort items.
>>
>> Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
>> ---
>>   ui/js/src/kimchi.guest_edit_main.js | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/ui/js/src/kimchi.guest_edit_main.js 
>> b/ui/js/src/kimchi.guest_edit_main.js
>> index 7671e43..f71ba3b 100644
>> --- a/ui/js/src/kimchi.guest_edit_main.js
>> +++ b/ui/js/src/kimchi.guest_edit_main.js
>> @@ -375,23 +375,23 @@ kimchi.guest_edit_main = function() {
>>               for(var i=0; i<availUsers.length; i++){
>>                   initNode(availUsers[i], true);
>> $("#permission-avail-users").append(userNodes[availUsers[i]]);
>> -                sortNodes($("#permission-avail-users"), true);
>>               }
>> +            sortNodes($("#permission-avail-users"), true);
>>               for(var i=0; i<selUsers.length; i++){
>>                   initNode(selUsers[i], true);
>> $("#permission-sel-users").append(userNodes[selUsers[i]]);
>> -                sortNodes($("#permission-sel-users"), true);
>>               }
>> +            sortNodes($("#permission-sel-users"), true);
>>               for(var i=0; i<availGroups.length; i++){
>>                   initNode(availGroups[i], false);
>> $("#permission-avail-groups").append(groupNodes[availGroups[i]]);
>> -                sortNodes($("#permission-avail-groups"), false);
>>               }
>> +            sortNodes($("#permission-avail-groups"), false);
>>               for(var i=0; i<selGroups.length; i++){
>>                   initNode(selGroups[i], false);
>> $("#permission-sel-groups").append(groupNodes[selGroups[i]]);
>> -                sortNodes($("#permission-sel-groups"), false);
>>               }
>> +            sortNodes($("#permission-sel-groups"), false);
>>           };
>>           var filterNodes = function(key, container){
>>               container.children().each(function(){
>



From ramonn at linux.vnet.ibm.com  Thu Jul 30 17:36:39 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Thu, 30 Jul 2015 14:36:39 -0300
Subject: [Kimchi-devel] Problems using Kimchi inside a VNC session
Message-ID: <55BA60A7.1000401@linux.vnet.ibm.com>

Hi,

did anyone hit an issue using kimchi inside a VNC session?

I tried to use Kimchi inside it, and i can't type on the novnc console.

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com



From danielhb at linux.vnet.ibm.com  Thu Jul 30 17:46:19 2015
From: danielhb at linux.vnet.ibm.com (Daniel Henrique Barboza)
Date: Thu, 30 Jul 2015 14:46:19 -0300
Subject: [Kimchi-devel] Problems using Kimchi inside a VNC session
In-Reply-To: <55BA60A7.1000401@linux.vnet.ibm.com>
References: <55BA60A7.1000401@linux.vnet.ibm.com>
Message-ID: <55BA62EB.2070701@linux.vnet.ibm.com>



On 07/30/2015 02:36 PM, Ramon Medeiros wrote:
> Hi,
>
> did anyone hit an issue using kimchi inside a VNC session?
>
> I tried to use Kimchi inside it, and i can't type on the novnc console.
>
hmmmmm never experienced this - probably never tried - but it should work.

To properly test it we need to see if noVNC alone works in those conditions.



From ramonn at linux.vnet.ibm.com  Thu Jul 30 17:48:29 2015
From: ramonn at linux.vnet.ibm.com (Ramon Medeiros)
Date: Thu, 30 Jul 2015 14:48:29 -0300
Subject: [Kimchi-devel] Problems using Kimchi inside a VNC session
In-Reply-To: <55BA62EB.2070701@linux.vnet.ibm.com>
References: <55BA60A7.1000401@linux.vnet.ibm.com>
	<55BA62EB.2070701@linux.vnet.ibm.com>
Message-ID: <55BA636D.4090208@linux.vnet.ibm.com>



On 07/30/2015 02:46 PM, Daniel Henrique Barboza wrote:
>
>
> On 07/30/2015 02:36 PM, Ramon Medeiros wrote:
>> Hi,
>>
>> did anyone hit an issue using kimchi inside a VNC session?
>>
>> I tried to use Kimchi inside it, and i can't type on the novnc console.
>>
> hmmmmm never experienced this - probably never tried - but it should 
> work.
>
> To properly test it we need to see if noVNC alone works in those 
> conditions.
I tested in my machine, Fedora 21 accessing my ubuntu vm using VNC and 
it was ok. But, i got an error using other machine installing a suse. 
So, i'm not sure if the problem is the novnc.
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com



From dhbarboza82 at gmail.com  Fri Jul 31 18:00:14 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Fri, 31 Jul 2015 15:00:14 -0300
Subject: [Kimchi-devel] [PATCH] Setting default memory of PPC to 2048
Message-ID: <1438365614-652-1-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

At this moment Kimchi for Power systems does not support guests
created with less that 2Gb of RAM. This patch set the default
Power template to reflect it.

Any user defined setting in template.conf will overwrite this
default. This is intended. The user must have the final
word in the customization of his/her VM templates.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 src/kimchi/osinfo.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
index 78eb828..6506f2d 100644
--- a/src/kimchi/osinfo.py
+++ b/src/kimchi/osinfo.py
@@ -44,28 +44,28 @@ template_specs = {'x86': {'old': dict(disk_bus='ide',
                                         cdrom_bus='scsi',
                                         kbd_type="kbd",
                                         kbd_bus='usb', mouse_bus='usb',
-                                        tablet_bus='usb', memory=1280),
+                                        tablet_bus='usb', memory=2048),
                             'modern': dict(disk_bus='virtio',
                                            nic_model='virtio',
                                            cdrom_bus='scsi',
                                            kbd_bus='usb',
                                            kbd_type="kbd",
                                            mouse_bus='usb', tablet_bus='usb',
-                                           memory=1280)},
+                                           memory=2048)},
                   'ppc64le': {'old': dict(disk_bus='virtio',
                                           nic_model='virtio',
                                           cdrom_bus='scsi',
                                           kbd_bus='usb',
                                           kbd_type="keyboard",
                                           mouse_bus='usb', tablet_bus='usb',
-                                          memory=1280),
+                                          memory=2048),
                               'modern': dict(disk_bus='virtio',
                                              nic_model='virtio',
                                              cdrom_bus='scsi',
                                              kbd_bus='usb',
                                              kbd_type="keyboard",
                                              mouse_bus='usb', tablet_bus='usb',
-                                             memory=1280)}}
+                                             memory=2048)}}
 
 
 custom_specs = {'fedora': {'22': dict(video_model='qxl')}}
@@ -89,6 +89,16 @@ icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/'
                           % paths.ui_dir, 'icon-*.png')]
 
 
+def _get_arch():
+    for arch, sub_archs in SUPPORTED_ARCHS.iteritems():
+        if os.uname()[4] in sub_archs:
+            return arch
+
+
+def _get_default_template_mem(host_arch):
+    return template_specs[host_arch]['modern'].get('memory', 1024)
+
+
 def _get_tmpl_defaults():
     """
     ConfigObj returns a dict like below when no changes were made in the
@@ -107,7 +117,7 @@ def _get_tmpl_defaults():
     # Create dict with default values
     tmpl_defaults = defaultdict(dict)
     tmpl_defaults['main']['networks'] = ['default']
-    tmpl_defaults['main']['memory'] = 1024
+    tmpl_defaults['main']['memory'] = _get_default_template_mem(_get_arch())
     tmpl_defaults['storage']['pool'] = 'default'
     tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2'}
     tmpl_defaults['processor']['cpus'] = 1
@@ -157,12 +167,6 @@ def _get_tmpl_defaults():
 defaults = _get_tmpl_defaults()
 
 
-def _get_arch():
-    for arch, sub_archs in SUPPORTED_ARCHS.iteritems():
-        if os.uname()[4] in sub_archs:
-            return arch
-
-
 def get_template_default(template_type, field):
     host_arch = _get_arch()
     # Assuming 'power' = 'ppc64le' because lookup() does the same,
-- 
2.4.3



From dhbarboza82 at gmail.com  Tue Jul 21 18:04:19 2015
From: dhbarboza82 at gmail.com (dhbarboza82 at gmail.com)
Date: Tue, 21 Jul 2015 15:04:19 -0300
Subject: [Kimchi-devel] [PATCH] Translation updates
Message-ID: <1437501859-16862-1-git-send-email-dhbarboza82@gmail.com>

From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>

This patch includes updated translation strings for several languages
that Kimchi supports.

Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
---
 po/de_DE.po                        | 1485 +++++++++++++++++++----------
 po/es_ES.po                        | 1474 ++++++++++++++++++----------
 po/fr_FR.po                        | 1671 ++++++++++++++++++++------------
 po/it_IT.po                        | 1467 +++++++++++++++++++---------
 po/ko_KR.po                        | 1507 ++++++++++++++++++++---------
 po/ru_RU.po                        | 1503 ++++++++++++++++++++---------
 po/zh_CN.po                        | 1843 ++++++++++++++++++++++++------------
 po/zh_TW.po                        | 1541 +++++++++++++++++++++---------
 ui/pages/help/de_DE/guests.dita    |  106 +--
 ui/pages/help/de_DE/host.dita      |   16 +-
 ui/pages/help/de_DE/network.dita   |    6 +-
 ui/pages/help/de_DE/storage.dita   |   41 +-
 ui/pages/help/de_DE/templates.dita |   77 +-
 ui/pages/help/es_ES/guests.dita    |  105 +-
 ui/pages/help/es_ES/host.dita      |   16 +-
 ui/pages/help/es_ES/network.dita   |    6 +-
 ui/pages/help/es_ES/storage.dita   |   39 +-
 ui/pages/help/es_ES/templates.dita |   79 +-
 ui/pages/help/fr_FR/guests.dita    |  110 +--
 ui/pages/help/fr_FR/host.dita      |   19 +-
 ui/pages/help/fr_FR/network.dita   |    7 +-
 ui/pages/help/fr_FR/storage.dita   |   43 +-
 ui/pages/help/fr_FR/templates.dita |   89 +-
 ui/pages/help/it_IT/guests.dita    |  107 +--
 ui/pages/help/it_IT/host.dita      |   16 +-
 ui/pages/help/it_IT/network.dita   |    6 +-
 ui/pages/help/it_IT/storage.dita   |   45 +-
 ui/pages/help/it_IT/templates.dita |   83 +-
 ui/pages/help/ko_KR/guests.dita    |  119 +--
 ui/pages/help/ko_KR/host.dita      |   20 +-
 ui/pages/help/ko_KR/network.dita   |    6 +-
 ui/pages/help/ko_KR/storage.dita   |   43 +-
 ui/pages/help/ko_KR/templates.dita |   81 +-
 ui/pages/help/ru_RU/guests.dita    |  113 ++-
 ui/pages/help/ru_RU/host.dita      |   16 +-
 ui/pages/help/ru_RU/network.dita   |    6 +-
 ui/pages/help/ru_RU/storage.dita   |   43 +-
 ui/pages/help/ru_RU/templates.dita |   80 +-
 ui/pages/help/zh_CN/guests.dita    |  106 +--
 ui/pages/help/zh_CN/host.dita      |   16 +-
 ui/pages/help/zh_CN/network.dita   |    6 +-
 ui/pages/help/zh_CN/storage.dita   |   39 +-
 ui/pages/help/zh_CN/templates.dita |   82 +-
 ui/pages/help/zh_TW/guests.dita    |  117 +--
 ui/pages/help/zh_TW/host.dita      |   17 +-
 ui/pages/help/zh_TW/network.dita   |    7 +-
 ui/pages/help/zh_TW/storage.dita   |   42 +-
 ui/pages/help/zh_TW/templates.dita |   82 +-
 48 files changed, 9535 insertions(+), 5013 deletions(-)

diff --git a/po/de_DE.po b/po/de_DE.po
index bfd82d0..1347df6 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,5 +1,6 @@
 # English translations for kimchi package.
 # Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
@@ -9,44 +10,53 @@ msgstr ""
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: de_DE\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
 msgstr ""
+"Unbekannter Parameter %(value)s"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "L?schen ist nicht zul?ssig f?r %(resource)s"
+msgstr ""
+"L?schen ist nicht zul?ssig f?r %(resource)s"
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s implementiert keine Aktualisierungsmethode"
+msgstr ""
+"%(resource)s implementiert keine Aktualisierungsmethode"
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "Erstellen ist nicht zul?ssig f?r %(resource)s"
+msgstr ""
+"Erstellen ist nicht zul?ssig f?r %(resource)s"
 
 msgid "Unable to parse JSON request"
-msgstr "JSON-Anfrage konnte nicht analysiert werden"
+msgstr ""
+"JSON-Anfrage konnte nicht analysiert werden"
 
 msgid "This API only supports JSON"
-msgstr "Diese API unterst?tzt nur JSON"
+msgstr ""
+"Diese API unterst?tzt nur JSON"
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
 msgstr ""
+"Parameter entsprechen nicht der Anforderung im Schema: %(err)s"
 
 msgid "You don't have permission to perform this operation."
 msgstr ""
+"Sie verf?gen nicht ?ber die Berechtigung zur Ausf?hrung dieser Operation."
 
 msgid "Datastore is not initiated in the model object."
-msgstr "Datenspeicher wird nicht im Modellobjekt initialisiert."
+msgstr ""
+"Datenspeicher wird nicht im Modellobjekt initialisiert."
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
@@ -56,83 +66,99 @@ msgstr ""
 #, python-format
 msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
 msgstr ""
+"Zeitlimit von %(seconds)s Sekunden ist w?hrend der Ausf?hrung von Task '%(task)s' abgelaufen."
 
 #, python-format
 msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
 msgstr ""
-"Authentifizierung f?r Benutzer '%(username)s' fehlgeschlagen. [Fehlercode: "
-"%(code)s]"
+"Authentifizierung f?r Benutzer '%(username)s' fehlgeschlagen. [Fehlercode: %(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen"
+msgstr ""
+"Sie sind nicht berechtigt, auf Kimchi zuzugreifen"
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "Geben Sie %(item)s an, um sich bei Kimchi anzumelden"
+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 ""
+"Benutzer %(user_id)s mit den angegebenen LDAP-Einstellungen wurde nicht gefunden."
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
 msgstr ""
+"Ung?ltige LDAP-Konfiguration: %(item)s : %(value)s"
 
 msgid "Unknown \"_cap\" specified"
 msgstr ""
+"Unbekanntes Element \"_cap\" angegeben"
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
 msgstr ""
+"F?r \"_passthrough\" muss \"true\" oder \"false\" angegeben werden"
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
 msgstr ""
+"F?r \"_passthrough_affected_by\" muss eine Einheitennamenszeichenfolge angegeben werden"
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
-msgstr "Fehler beim Abrufen von Blockeinheiten. Details: %(err)s"
+msgstr ""
+"Fehler beim Abrufen von Blockeinheiten. Details: %(err)s"
 
 #, python-format
 msgid "Error while getting block device information for %(device)s."
-msgstr "Fehler beim Abrufen von Blockeinheitinformationen f?r %(device)s."
+msgstr ""
+"Fehler beim Abrufen von Blockeinheiteninformationen f?r %(device)s."
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "Distro-Datei konnte nicht gefunden werden: %(filename)s"
+msgstr ""
+"Distro-Datei konnte nicht gefunden werden: %(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
 msgstr ""
-"Distro-Datei konnte nicht analysiert werden: %(filename)s. Stellen Sie "
-"sicher, dass es sich um eine JSON-Datei handelt."
+"Distro-Datei konnte nicht analysiert werden: %(filename)s. Stellen Sie sicher, dass es sich um eine JSON-Datei handelt."
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
-msgstr "Fehler beim Anmelden bei iSCSI-Hostziel %(portal)s. Details: %(err)s"
+msgstr ""
+"Fehler beim Anmelden bei iSCSI-Hostziel %(portal)s. Details: %(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr "Anmeldung bei iSCSI-Host %(host)s Ziel %(target)s nicht m?glich"
+msgstr ""
+"Anmeldung bei iSCSI-Host %(host)s Ziel %(target)s nicht m?glich"
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
 msgstr ""
+"ISO-Datei %(filename)s konnte nicht gefunden werden"
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "Die ISO-Datei %(filename)s ist nicht bootf?hig"
+msgstr ""
+"Die ISO-Datei %(filename)s ist nicht bootf?hig"
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
-msgstr "Die ISO-Datei %(filename)s hat keinen g?ltigen El Torito-Bootsatz"
+msgstr ""
+"Die ISO-Datei %(filename)s hat keinen g?ltigen El Torito-Bootsatz"
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr "Ung?ltiger El Torito-Pr?feintrag in ISO-Datei %(filename)s"
+msgstr ""
+"Ung?ltiger El Torito-Pr?feintrag in ISO-Datei %(filename)s"
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "Ung?ltiger El Torito-Boot-Indikator in ISO-Datei %(filename)s"
+msgstr ""
+"Ung?ltiger El Torito-Boot-Indikator in ISO-Datei %(filename)s"
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
@@ -142,8 +168,7 @@ msgstr ""
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Ung?ltiges Format beim Lesen des Datentr?gerdeskriptors in ISO-Datei "
-"%(filename)s"
+"Ung?ltiges Format beim Lesen des Datentr?gerdeskriptors in ISO-Datei %(filename)s"
 
 #, python-format
 msgid ""
@@ -153,54 +178,64 @@ msgid ""
 "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"Der Hypervisor hat nicht die Berechtigung, die ISO-Datei %(filename)s zu "
-"verwenden. Verschieben Sie sie entweder nach /var/lib/libvirt oder setzen "
-"Sie, sofern m?glich, die Suchberechtigung auf Dateizugriffssteuerungslisten "
-"f?r den Benutzer '%(user)s' oder f?gen Sie '%(user)s' der ISO-Pfadgruppe "
-"hinzu oder (nicht empfohlen) 'chmod -R o+x 'path_to_iso'. Details: %(err)s"
+"Der Hypervisor hat nicht die Berechtigung, die ISO-Datei %(filename)s zu verwenden."
+"Verschieben Sie sie entweder nach /var/lib/libvirt oder setzen Sie, sofern m?glich, die Suchberechtigung "
+"auf Dateizugriffssteuerungslisten f?r den Benutzer '%(user)s' oder f?gen Sie "
+"'%(user)s' der ISO-Pfadgruppe hinzu oder (nicht empfohlen) 'chmod -R o+x "
+"'path_to_iso'. Details: %(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
+"Beim Pr?fen der OS-Informationen des Image ist ein Fehler aufgetreten."
 
 msgid "No OS information found in given image."
 msgstr ""
+"Im angegebenen Image wurden keine OS-Informationen gefunden."
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
 msgstr ""
+"Die Imagedatei %(filename)s konnte nicht gelesen werden"
 
 #, python-format
 msgid ""
 "Image file must be an existing file on system. %(filename)s is not a valid "
 "input."
 msgstr ""
+"Bei der Imagedatei muss es sich um eine auf dem System vorhandene Datei handeln. %(filename)s ist keine g?ltige "
+"Eingabe."
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "Virtuelle Maschine %(name)s ist bereits vorhanden"
+msgstr ""
+"Virtuelle Maschine %(name)s ist bereits vorhanden"
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "Virtuelle Maschine %(name)s ist nicht vorhanden"
+msgstr ""
+"Virtuelle Maschine %(name)s ist nicht vorhanden"
 
 #, python-format
 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 ""
+"Virtuelle Maschine %(name)s konnte nicht umbenannt werden. Der Name %(new_name)s ist bereits belegt "
+"oder die virtuelle Maschine wurde nicht ausgeschaltet."
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
 msgstr ""
-"Screenshot f?r gestoppte virtuelle Maschine %(name)s konnte nicht abgerufen "
-"werden"
+"Screenshot f?r gestoppte virtuelle Maschine %(name)s konnte nicht abgerufen werden"
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "Fernes ISO-Image wird von diesem Server nicht unterst?tzt."
+msgstr ""
+"Fernes ISO-Image wird von diesem Server nicht unterst?tzt."
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
 msgstr ""
+"Screenshot wird auf virtueller Maschine %(name)s nicht unterst?tzt"
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
@@ -210,7 +245,7 @@ msgstr ""
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Virtuelle Maschine %(name)s konnte nicht erstellt werden. Details: %(err)s"
+"Virtuelle Maschine %(name)s konnte nicht aktualisiert werden. Details: %(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
@@ -220,28 +255,33 @@ msgstr ""
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
 msgstr ""
-"Verbindung zur abgeschalteten Maschine %(name)s konnte nicht hergestellt "
-"werden."
+"Verbindung zu ausgeschalteter virtueller Maschine %(name)s konnte nicht hergestellt werden."
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"Name der virtuellen Maschine muss eine Zeichenfolge ohne Schr?gstriche (/) sein"
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
 msgstr ""
+"Ung?ltiger Vorlagen-URI %(value)s f?r virtuelle Maschine angegeben"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
 msgstr ""
+"Ung?ltiger Speicherpool-URI %(value)s f?r virtuelle Maschine angegeben"
 
 msgid "Supported virtual machine graphics are Spice or VNC"
 msgstr ""
+"Unterst?tzte Grafiken f?r virtuelle Maschine sind Spice oder VNC"
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
-msgstr "Zu ?berwachende Grafikadresse muss IPv4 oder IPv6 sein"
+msgstr ""
+"Zu ?berwachende Grafikadresse muss IPv4 oder IPv6 sein"
 
 msgid "Specify a template to create a virtual machine from"
-msgstr "Vorlage angeben, aus der eine virtuelle Maschine erstellt werden soll"
+msgstr ""
+"Vorlage angeben, aus der eine virtuelle Maschine erstellt werden soll"
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
@@ -251,7 +291,7 @@ msgstr ""
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Virtuelle Maschine %(name)s konnte nicht gestoppt werden. Details: %(err)s"
+"Virtuelle Maschine %(name)s konnte nicht ausgeschaltet werden. Details: %(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
@@ -261,114 +301,142 @@ msgstr ""
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Virtuelle Maschine %(name)s konnte nicht umbenannt werden. Details: %(err)s"
+"Virtuelle Maschine %(name)s konnte nicht zur?ckgesetzt werden. Details: %(err)s"
 
 msgid "User name list must be an array"
 msgstr ""
+"Benutzernamensliste muss ein Array sein"
 
 msgid "User name must be a string"
-msgstr "Netzname muss eine Zeichenfolge sein"
+msgstr ""
+"Benutzername muss eine Zeichenfolge sein"
 
 msgid "Group name list must be an array"
 msgstr ""
+"Gruppennamensliste muss ein Array sein"
 
 msgid "Group name must be a string"
-msgstr "Netzname muss eine Zeichenfolge sein"
+msgstr ""
+"Gruppenname muss eine Zeichenfolge sein"
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "Benutzer '%(users)s' ist nicht vorhanden."
+msgstr ""
+"Benutzer '%(users)s' nicht vorhanden"
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "Benutzer '%(groups)s' ist nicht vorhanden."
+msgstr ""
+"Gruppe(n) '%(groups)s' nicht vorhanden"
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Virtuelle Maschine %(name)s konnte nicht gestoppt werden. Details: %(err)s"
+"Virtuelle Maschine %(name)s konnte nicht heruntergefahren werden. Details: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Virtuelle Maschine %(name)s konnte nicht gestartet werden. Details: %(err)s"
+"Zugriff auf die Metadaten der virtuellen Maschine %(name)s nicht m?glich. Details: %(err)s"
 
 msgid "The guest console password must be a string."
 msgstr ""
+"Das Konsolenkennwort des Gastes muss eine Zeichenfolge sein."
 
 msgid "The life time for the guest console password must be a number."
 msgstr ""
+"Die Lebensdauer f?r das Konsolenkennwort des Gastes muss eine Zahl sein."
 
 #, python-format
 msgid "Virtual machine '%(name)s' must be stopped before cloning it."
 msgstr ""
+"Die virtuelle Maschine '%(name)s' muss vor dem Klonen gestoppt werden."
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
 msgstr ""
+"Nicht gen?gend Plattenspeicherplatz zum Klonen der virtuellen Maschine '%(name)s' vorhanden"
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Virtuelle Maschine '%(name)s' konnte nicht geklont werden. Details: %(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"Ung?ltige Operation f?r nicht permanente virtuelle Maschine %(name)s"
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"Die virtuelle Maschine '%(name)s' kann nicht ausgesetzt werden, weil sie momentan nicht aktiv ist."
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Virtuelle Maschine '%(name)s' konnte nicht ausgesetzt werden. Details: %(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"Die virtuelle Maschine '%(name)s' kann nicht fortgesetzt werden, weil sie nicht angehalten wurde."
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Virtuelle Maschine '%(name)s' konnte nicht fortgesetzt werden. Details: %(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"Der zugewiesene Speicher ?berschreitet den auf dem Host zul?ssigen Maximalwert."
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"Die Live-Speicheraktualisierung wird von der virtuellen Maschine '%(name)s' nicht unterst?tzt. Aktualisieren Sie den Speicher mit "
+"der Maschine im Offlinemodus, um diese Funktion zu aktivieren."
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"Die Speichervergr??erung ist nur in aktiven virtuellen Maschinen zul?ssig"
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"F?r die Live-Speicheraktualisierung muss der neue Speicherwert gleich dem alten Speicherwert plus "
+"ein Vielfaches von 1024 Mebibyte sein"
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"Auf dem Gast sind nicht gen?gend freie Slots mit 1024 Mebibyte vorhanden."
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"Die libvirt-Version des Hosts unterst?tzt keine Speichereinheiten. F?r libvirt muss >= "
+"1.2.14 angegeben sein"
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"Fehler beim Anschlie?en der Speichereinheit. Details: %(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
+"VM %(vmid)s enth?lt die direkt zugewiesene Hosteinheit %(dev_name)s nicht."
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
 msgstr ""
+"Die Hosteinheit %(dev_name)s darf nicht direkt einer VM zugewiesen werden."
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -377,15 +445,23 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
+"Keine IOMMU-Gruppen gefunden. F?r den Host-PCI-Durchgriff muss die IOMMU-Gruppe "
+"ordnungsgem?? funktionieren. Aktivieren Sie Intel VT-d oder AMD IOMMU in Ihrem BIOS "
+"und pr?fen Sie dann, ob der Kernel mit IOMMU-Unterst?tzung kompiliert wurde. F?gen Sie "
+"Ihrem Kernelparameter f?r die Intel-CPU intel_iommu=on in /boot/grub2/grub.conf hinzu. "
+"F?r AMD-CPU m?ssen Sie iommu=pt iommu=1 hinzuf?gen."
 
 msgid "\"name\" should be a device name string"
 msgstr ""
+"F?r \"name\" muss eine Einheitennamenszeichenfolge angegeben werden"
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"Die Einheit %(name)s wird vermutlich vom Host benutzt. Es kann keine Verbindung der Einheit zum "
+"Gast hergestellt werden."
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
@@ -396,110 +472,122 @@ msgstr ""
 msgid ""
 "Network %(network)s specified for virtual machine %(name)s does not exist"
 msgstr ""
-"Das f?r die virtuelle Maschine %(name)s angegebene Netz %(network)s ist "
-"nicht vorhanden"
+"Das Netz %(network)s, das f?r die virtuelle Maschine %(name)s angegeben wurde, ist nicht vorhanden"
 
 msgid "Supported virtual machine interfaces type is only network"
-msgstr "Unterst?tzter Schnittstellentyp einer virtuellen Maschine ist nur Netz"
+msgstr ""
+"Unterst?tzter Schnittstellentyp einer virtuellen Maschine ist nur Netz"
 
 msgid "Network name for virtual machine interface must be a string"
 msgstr ""
-"Netzname f?r Schnittstelle einer virtuellen Maschine muss eine Zeichenfolge "
-"sein"
+"Netzname f?r Schnittstelle einer virtuellen Maschine muss eine Zeichenfolge sein"
 
 msgid "Invalid network model card specified for virtual machine interface"
 msgstr ""
-"Ung?ltige Netzmodellkarte f?r Schnittstelle einer virtuellen Maschine "
-"angegeben"
+"Ung?ltige Netzmodellkarte f?r Schnittstelle einer virtuellen Maschine angegeben"
 
 msgid "Specify type and network to add a new virtual machine interface"
 msgstr ""
-"Geben Sie Typ und Netz an, um eine neue Schnittstelle f?r eine virtuelle "
-"Maschine hinzuzuf?gen"
+"Geben Sie Typ und Netz an, um eine neue Schnittstelle f?r eine virtuelle Maschine hinzuzuf?gen"
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"MAC-Adresse muss folgendes Format verwenden: FF:FF:FF:FF:FF:FF"
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"MAC-Adresse %(mac)s ist in virtueller Maschine %(name)s bereits vorhanden"
 
 msgid "Invalid MAC Address"
 msgstr ""
+"Ung?ltige MAC-Adresse"
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"MAC-Adresse einer aktiven virtuellen Maschine kann nicht ge?ndert werden"
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "Vorlage %(name)s ist bereits vorhanden"
+msgstr ""
+"Vorlage %(name)s ist bereits vorhanden"
 
 #, python-format
 msgid ""
 "Network '%(network)s' specified for template %(template)s does not exist"
 msgstr ""
-"Das f?r Vorlage %(template)s angegebene Netz '%(network)s' ist nicht "
-"vorhanden"
+"Netz '%(network)s', das f?r Vorlage %(template)s angegeben wurde, ist nicht vorhanden"
 
 #, python-format
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
 msgstr ""
-"Der f?r Vorlage %(template)s angegebene Speicherpool '%(pool)s' ist nicht "
-"vorhanden"
+"Speicherpool %(pool)s, der f?r Vorlage %(template)s angegeben wurde, ist nicht vorhanden"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
 msgstr ""
-"Der f?r Vorlage %(template)s angegebene Speicherpool '%(pool)s' ist nicht "
-"aktiv"
+"Speicherpool %(pool)s, der f?r Vorlage %(template)s angegeben wurde, ist nicht aktiv"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "Ung?ltiger Parameter '%(param)s' f?r CD-ROM angegeben."
+msgstr ""
+"Ung?ltiger Parameter '%(param)s' f?r CD-ROM angegeben."
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
 msgstr ""
-"Das f?r Vorlage %(template)s angegebene Netz %(network)s ist nicht aktiv"
+"Netz %(network)s, das f?r Vorlage %(template)s angegeben wurde, ist nicht aktiv"
 
 msgid "Template name must be a string"
-msgstr "Vorlagenname muss eine Zeichenfolge sein"
+msgstr ""
+"Vorlagenname muss eine Zeichenfolge sein"
 
 msgid "Template icon must be a path to the image"
-msgstr "Vorlagensymbol muss ein Pfad zum Image sein"
+msgstr ""
+"Vorlagensymbol muss ein Pfad zum Image sein"
 
 msgid "Template distribution must be a string"
-msgstr "Vorlagenverteilung muss eine Zeichenfolge sein"
+msgstr ""
+"Vorlagenverteilung muss eine Zeichenfolge sein"
 
 msgid "Template distribution version must be a string"
-msgstr "Vorlagenverteilungsversion muss eine Zeichenfolge sein"
+msgstr ""
+"Vorlagenverteilungsversion muss eine Zeichenfolge sein"
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "Die Anzahl der CPUs muss eine Ganzzahl sein"
+msgstr ""
+"Die Anzahl der CPUs muss eine Ganzzahl gr??er als 0 sein"
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr "Speicherkapazit?t (MB) muss eine Ganzzahl gr??er als 512 sein"
+msgstr ""
+"Speicherkapazit?t (MB) muss eine Ganzzahl gr??er als 512 sein"
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
+msgstr ""
+"Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
-msgstr "Ung?ltiger Speicherpool-URI %(value)s f?r Vorlage angegeben"
+msgstr ""
+"Ung?ltiger Speicherpool-URI %(value)s f?r Vorlage angegeben"
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr "Geben Sie ein ISO-Image als CD-ROM an, um eine Vorlage zu erstellen"
+msgstr ""
+"Geben Sie ein ISO-Image als CD-ROM oder ein Basisimage an, um eine Vorlage zu erstellen"
 
 msgid "All networks for the template must be specified in a list."
-msgstr "Alle Netze f?r die Vorlage m?ssen in einer Liste angegeben werden."
+msgstr ""
+"Alle Netze f?r die Vorlage m?ssen in einer Liste angegeben werden."
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
 msgstr ""
+"Geben Sie einen Datentr?ger f?r eine Vorlage an, wenn der Speicherpool iSCSI oder SCSI ist"
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
 msgstr ""
+"Der Datentr?ger %(volume)s ist nicht im Speicherpool %(pool)s vorhanden"
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
@@ -513,64 +601,80 @@ msgstr ""
 
 msgid "Disk size must be an integer greater than 1GB."
 msgstr ""
+"Plattengr??e muss eine Ganzzahl gr??er als 1 GB sein."
 
 msgid "Template base image must be a valid local image file"
-msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
+msgstr ""
+"Basisimage der Vorlage muss eine g?ltige lokale Imagedatei sein"
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
 msgstr ""
+"Format f?r %(path)s des Basisimage kann nicht ermittelt werden"
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
 msgstr ""
+"Bei der Angabe der CPU-Topologie m?ssen VCPUs ein Produkt der Sockets, Kerne und "
+"Threads sein."
 
 msgid ""
 "When specifying CPU topology, each element must be an integer greater than "
 "zero."
 msgstr ""
+"Bei Angabe der CPU-Topologie muss jedes Element eine Ganzzahl gr??er als "
+"null sein."
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"Ung?ltiges Plattenimageformat. G?ltige Formate: bochs, cloop, cow, dmg, qcow, "
+"qcow2, qed, raw, vmdk, vpc."
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "Speicherpool %(name)s ist bereits vorhanden"
+msgstr ""
+"Speicherpool %(name)s ist bereits vorhanden"
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "Speicherpool %(name)s ist nicht vorhanden"
+msgstr ""
+"Speicherpool %(name)s ist nicht vorhanden"
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr "Geben Sie %(item)s an, um den Speicherpool %(name)s zu erstellen"
+msgstr ""
+"Geben Sie %(item)s an, um den Speicherpool %(name)s zu erstellen"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "Aktiver Speicherpool %(name)s konnte nicht gel?scht werden"
+msgstr ""
+"Aktiver Speicherpool %(name)s konnte nicht gel?scht werden"
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "Speicherpools konnten nicht aufgelistet werden. Details: %(err)s"
+msgstr ""
+"Speicherpools konnten nicht aufgelistet werden. Details: %(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr "Speicherpool %(name)s konnte nicht erstellt werden. Details: %(err)s"
+msgstr ""
+"Speicherpool %(name)s konnte nicht erstellt werden. Details: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
 msgstr ""
-"Anzahl der Speicherdatentr?ger im Speicherpool %(name)s konnte nicht "
-"abgerufen werden. Details: %(err)s"
+"Anzahl der Speicherdatentr?ger im Speicherpool %(name)s konnte nicht abgerufen werden. Details: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr "Speicherpool %(name)s konnte nicht aktiviert werden. Details: %(err)s"
+msgstr ""
+"Speicherpool %(name)s konnte nicht aktiviert werden. Details: %(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
@@ -579,135 +683,146 @@ msgstr ""
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
-msgstr "Speicherpool %(name)s konnte nicht gel?scht werden. Details: %(err)s"
+msgstr ""
+"Speicherpool %(name)s konnte nicht gel?scht werden. Details: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
 msgstr ""
-"NFS-Pool konnte nicht erstellt werden, weil Exportpfad %(path)s beim Mounten "
-"blockieren kann"
+"NFS-Pool konnte nicht erstellt werden, weil Exportpfad %(path)s beim Mounten blockieren kann"
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"NFS-Pool konnte nicht erstellt werden, weil das Mounten des Exportpfads"
-"%(path)s fehlgeschlagen ist"
+"NFS-Pool konnte nicht erstellt werden, weil das Mounten des Exportpfads %(path)s fehlgeschlagen ist"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "Nicht unterst?tzter Speicherpooltyp: %(type)s"
+msgstr ""
+"Nicht unterst?tzter Speicherpooltyp: %(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
 msgstr ""
+"Fehler beim Abrufen der XML f?r Speicherpool in %(pool)s"
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"Name des Speicherpools muss eine Zeichenfolge ohne Schr?gstriche (/) sein"
 
 msgid ""
 "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
 "iso"
 msgstr ""
+"Unterst?tzte Speicherpooltypen sind dir, netfs, logical, iscsi, isci und kimchi-"
+"iso"
 
 msgid "Storage pool path must be a string"
-msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
+msgstr ""
+"Speicherpoolpfad muss eine Zeichenfolge sein"
 
 msgid "Storage pool host must be a IP or hostname"
-msgstr "Speicherpoolhost muss eine IP oder ein Hostname sein"
+msgstr ""
+"Speicherpoolhost muss eine IP oder ein Hostname sein"
 
 msgid "Storage pool device must be the absolute path to the block device"
 msgstr ""
+"Speicherpooleinheit muss den absoluten Pfad zur Blockeinheit angeben"
 
 msgid "Storage pool devices parameter must be a list"
-msgstr "Einheitenparameter des Speicherpools muss eine Liste sein"
+msgstr ""
+"Einheitenparameter des Speicherpools muss eine Liste sein"
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "Ziel-IQN eines iSCSI-Pools muss eine Zeichenfolge sein"
+msgstr ""
+"Ziel-IQN eines iSCSI-Pools muss eine Zeichenfolge sein"
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
 msgstr ""
-"Port eines fernen Speicherservers muss eine Ganzzahl zwischen 1 und 65535 "
-"sein"
+"Port eines fernen Speicherservers muss eine Ganzzahl zwischen 1 und 65535 sein"
 
 msgid "iSCSI target username must be a string"
 msgstr ""
+"Benutzername des iSCSI-Ziels muss eine Zeichenfolge sein"
 
 msgid "iSCSI target password must be a string"
 msgstr ""
+"Kennwort des iSCSI-Ziels muss eine Zeichenfolge sein"
 
 msgid "Specify name and type to create a storage pool"
-msgstr "Geben Sie Name und Typ an, um einen Speicherpool zu erstellen"
+msgstr ""
+"Geben Sie Name und Typ an, um einen Speicherpool zu erstellen"
 
 #, python-format
 msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
 msgstr ""
-"%(disk)s ist keine g?ltige Platte/Partition. Sie konnte nicht hinzugef?gt "
-"werden zum Pool %(pool)s."
+"%(disk)s ist keine g?ltige Platte/Partition. Sie konnte nicht hinzugef?gt werden zum Pool "
+"%(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
 msgstr ""
+"Logischer Pool %(pool)s konnte nicht erweitert werden. Details: %(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
 msgstr ""
-"Die Parameterplatten k?nnen nur f?r den logischen Speicherpool aktualisiert "
-"werden."
+"Die Parameterplatten k?nnen nur f?r den logischen Speicherpool aktualisiert werden."
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "Der Name des SCSI-Hostadapters muss eine Zeichenfolge sein."
+msgstr ""
+"Der Name des SCSI-Hostadapters muss eine Zeichenfolge sein."
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr "Der Speicherpool kimchi_isos ist f?r die interne Verwendung reserviert"
+msgstr ""
+"Der Speicherpool kimchi_isos ist f?r die interne Verwendung reserviert"
 
 #, python-format
 msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Der NFS-Speicherpool %(name)s konnte nicht aktiviert werden. NFS-Server "
-"%(server)s ist nicht erreichbar."
+"NFS-Speicherpool %(name)s konnte nicht aktiviert werden. NFS-Server %(server)s ist "
+"nicht erreichbar."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Der NFS-Speicherpool %(name)s konnte nicht inaktiviert werden. NFS-Server "
-"%(server)s ist nicht erreichbar."
+"NFS-Speicherpool %(name)s konnte nicht inaktiviert werden. NFS-Server %(server)s ist "
+"nicht erreichbar."
 
 #, python-format
 msgid ""
 "Unable to deactivate pool %(name)s as it is associated with some templates"
 msgstr ""
-"Pool %(name)s konnte nicht inaktiviert werden, weil er einigen Vorlagen "
-"zugeordnet ist"
+"Pool %(name)s konnte nicht inaktiviert werden, weil er einigen Vorlagen zugeordnet ist"
 
 #, python-format
 msgid "Unable to delete pool %(name)s as it is associated with some templates"
 msgstr ""
-"Pool %(name)s konnte nicht gel?scht werden, weil er einigen Vorlagen "
-"zugeordnet ist"
+"Pool %(name)s konnte nicht gel?scht werden, weil er einigen Vorlagen zugeordnet ist"
 
 #, python-format
 msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
 msgstr ""
-"Eine Datentr?gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. "
-"W?hlen Sie einen anderen Namen aus, um den logischen Pool zu erstellen."
+"Eine Datentr?gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. W?hlen Sie einen anderen Namen aus, "
+"um den logischen Pool zu erstellen."
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
 msgstr ""
-"Datenbank mit Tiefenscaninformationen kann aufgrund des folgenden Fehlers "
-"nicht aktualisiert werden: %(err)s"
+"Datenbank mit Tiefenscaninformationen kann aufgrund des folgenden Fehlers nicht aktualisiert werden: %(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "Speicherdatentr?ger %(name)s ist bereits vorhanden"
+msgstr ""
+"Speicherdatentr?ger %(name)s ist bereits vorhanden"
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
@@ -719,32 +834,33 @@ msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
 msgstr ""
+"Speicherdatentr?ger %(volume)s konnte nicht erstellt werden, weil Speicherpool %(pool)s "
+"nicht aktiv ist"
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
-msgstr "Geben Sie %(item)s an, um Speicherdatentr?ger %(volume)s zu erstellen"
+msgstr ""
+"Geben Sie %(item)s an, um den Speicherdatentr?ger %(volume)s zu erstellen"
 
 #, 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 "
-"%(pool)s nicht aktiv ist"
+"Speicherdatentr?ger konnten nicht aufgelistet werden, weil Speicherpool %(pool)s nicht aktiv ist"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
 msgstr ""
-"Speicherdatentr?ger %(name)s konnte nicht in Speicherpool %(pool)s erstellt "
-"werden. Details: %(err)s"
+"Speicherdatentr?ger %(name)s konnte im Speicherpool %(pool)s nicht erstellt werden. Details: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"Speicherdatentr?ger konnten nicht in Speicherpool %(pool)s aufgelistet "
-"werden. Details: %(err)s"
+"Speicherdatentr?ger im Speicherpool %(pool)s konnten nicht aufgelistet werden. Details: %(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
@@ -759,419 +875,493 @@ msgstr ""
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
 msgstr ""
-"Gr??e des Speicherdatentr?gers %(name)s konnte nicht ge?ndert werden. "
-"Details: %(err)s"
+"Gr??e des Speicherdatentr?gers %(name)s konnte nicht ge?ndert werden. Details: %(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
 msgstr ""
-"Speichertyp %(type)s unterst?tzt nicht das Erstellen und L?schen von "
-"Datentr?gern"
+"Speichertyp %(type)s unterst?tzt nicht das Erstellen und L?schen von Datentr?gern"
 
 msgid "Storage volume name must be a string"
-msgstr "Name des Speicherdatentr?gers muss eine Zeichenfolge sein"
+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"
+msgstr ""
+"Zuordnung des Speicherdatentr?gers muss eine Ganzzahl sein"
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"Format des Speicherdatentr?gers wird nicht unterst?tzt. G?ltige Formate: bochs, cloop, cow, dmg, "
+"qcow, qcow2, qed, raw, vmdk, vpc."
 
 msgid "Storage volume requires a volume name"
-msgstr "Speicherdatentr?ger erfordert einen Datentr?gernamen"
+msgstr ""
+"Speicherdatentr?ger erfordert einen Datentr?gernamen"
 
 #, python-format
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
 msgstr ""
-"Datenbank mit Datentr?gerinformationen kann aufgrund des folgenden Fehlers "
-"nicht aktualisiert werden: %(err)s"
+"Datenbank mit Datentr?gerinformationen kann aufgrund des folgenden Fehlers nicht aktualisiert werden: %(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
 msgstr ""
+"Der Parameter %(param)s kann nur einmal angegeben werden"
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
 msgstr ""
+"Erstellung des Datentr?gers aus %(param)s wird nicht unterst?tzt"
 
 msgid "Storage volume capacity must be an integer number."
 msgstr ""
+"Kapazit?t des Speicherdatentr?gers muss eine Ganzzahl sein."
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
 msgstr ""
+"Speicherdatentr?ger-URL muss eine http://-, https://-, ftp://- oder ftps://-URL sein."
 
 #, python-format
 msgid "Unable to access file %(url)s. Please, check it."
 msgstr ""
+"Zugriff auf Datei %(url)s konnte nicht ausgef?hrt werden. ?berpr?fen Sie die Datei."
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
 msgstr ""
+"Speicherdatentr?ger '%(name)s' im Pool '%(pool)s' konnte nicht geklont werden. Details: "
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"Geben Sie Chunkdaten und deren Gr??e an, um eine Datei hochzuladen."
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"Um einen Speicherdatentr?ger hochzuladen, m?ssen Sie den Parameter 'upload' angeben."
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"Chunkdaten konnten nicht hochgeladen werden, da sie nicht mit der angeforderten Chunkgr??e ?bereinstimmen."
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"Der Speicherdatentr?ger %(vol)s befindet sich nicht in einem Uploadprozess."
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"Die Chunkdaten f?r den Upload ?berschreiten die Gr??e des Speicherdatentr?gers."
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"Chunkdaten konnten nicht auf Speicherdatentr?ger hochgeladen werden. Details: %(err)s."
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "Schnittstelle %(name)s ist nicht vorhanden"
+msgstr ""
+"Schnittstelle %(name)s ist nicht vorhanden"
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "Netz %(name)s ist bereits vorhanden"
+msgstr ""
+"Netz %(name)s ist bereits vorhanden"
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "Netz %(name)s ist nicht vorhanden"
+msgstr ""
+"Netz %(name)s ist nicht vorhanden"
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
 msgstr ""
-"Das f?r das Netz %(network)s angegebene Teilnetz %(subnet)s ist nicht g?ltig."
+"Das Teilnetz %(subnet)s, das f?r das Netz %(network)s angegeben wurde, ist nicht g?ltig."
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
 msgstr ""
-"Geben Sie eine Netzschnittstelle an, um ?berbr?cktes Netz %(name)s zu "
-"erstellen"
+"Geben Sie eine Netzschnittstelle an, um das ?berbr?ckte Netz %(name)s zu erstellen"
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "Aktives Netz %(name)s konnte nicht gel?scht werden"
+msgstr ""
+"Aktives Netz %(name)s konnte nicht gel?scht werden"
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
 msgstr ""
-"Die f?r das Netz %(network)s angegebene Schnittstelle %(iface)s wird bereits "
-"verwendet"
+"Die Schnittstelle %(iface)s, die f?r das Netz %(network)s angegeben wurde, ist bereits belegt"
 
 msgid "Interface should be bare NIC, bonding or bridge device."
-msgstr "Schnittstelle sollte blo?es NIC, Bonding oder Br?ckeneinheit sein."
+msgstr ""
+"Schnittstelle sollte blo?es NIC, Bonding oder Br?ckeneinheit sein."
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s"
+msgstr ""
+"Netz %(name)s konnte nicht erstellt werden. Details: %(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "Es konnte keine freie IP-Adresse f?r Netz '%(name)s' gefunden werden"
+msgstr ""
+"Es konnte keine freie IP-Adresse f?r Netz '%(name)s' gefunden werden"
 
 #, python-format
 msgid "The interface %(iface)s already exists."
 msgstr ""
+"Schnittstelle %(iface)s ist bereits vorhanden."
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"Netzname muss eine Zeichenfolge ohne Schr?gstriche (/) oder Anf?hrungszeichen (\") sein"
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "Unterst?tzte Netztypen sind Isoliert, NAT und Br?cke"
+msgstr ""
+"Unterst?tzte Netztypen sind Isoliert, NAT und Br?cke"
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
 msgstr ""
-"Teilnetz des Netzes muss eine Zeichenfolge mit IP-Adresse und Pr?fix oder "
-"Netzmaske sein"
+"Teilnetz des Netzes muss eine Zeichenfolge mit IP-Adresse und Pr?fix oder Netzmaske sein"
 
 msgid "Network interface must be a string"
-msgstr "Netzschnittstelle muss eine Zeichenfolge sein"
+msgstr ""
+"Netzschnittstelle muss eine Zeichenfolge sein"
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "Netz-VLAN-ID muss eine Ganzzahl zwischen 1 und 4094 sein"
+msgstr ""
+"Netz-VLAN-ID muss eine Ganzzahl zwischen 1 und 4094 sein"
 
 msgid "Specify name and type to create a Network"
-msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen"
+msgstr ""
+"Geben Sie Name und Typ an, um ein Netz zu erstellen"
 
 #, python-format
 msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
-"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
-"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verkn?pft."
+"Netz %(name)s konnte nicht gel?scht werden. Mit diesem Netz sind einige virtuelle Maschinen %(vms)s "
+"und/oder Vorlagen verlinkt."
 
 #, python-format
 msgid ""
 "Unable to deactivate network %(name)s. There are some virtual machines "
 "%(vms)s and/or templates linked to this network."
 msgstr ""
-"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
-"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verkn?pft."
+"Netz %(name)s konnte nicht inaktiviert werden. Mit diesem Netz sind einige virtuelle Maschinen "
+"%(vms)s und/oder Vorlagen verlinkt."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
-msgstr "Br?ckeneinheit %(name)s kann nicht die Trunkeinheit eines VLAN sein."
+msgstr ""
+"Br?ckeneinheit %(name)s kann nicht die Trunkeinheit eines VLAN sein."
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "Schnittstelle %(iface)s konnte nicht aktiviert werden: %(err)s."
+msgstr ""
+"Schnittstelle %(iface)s konnte nicht aktiviert werden: %(err)s."
 
 #, python-format
 msgid ""
 "Failed to activate interface %(iface)s. Please check the physical link "
 "status."
 msgstr ""
-"Schnittstelle %(iface)s konnte nicht aktiviert werden. Bitte ?berpr?fen Sie "
-"den Status der physischen Verbindung."
+"Schnittstelle %(iface)s konnte nicht aktiviert werden. ?berpr?fen Sie den Status der "
+"physischen Verbindung."
 
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
 msgstr ""
+"Netz %(name)s konnte nicht gestartet werden. Details: %(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "Debugbericht %(name)s ist nicht vorhanden"
+msgstr ""
+"Debugbericht %(name)s ist nicht vorhanden"
 
 msgid "Debug report tool not found in system"
-msgstr "Debugberichtstool nicht im System gefunden"
+msgstr ""
+"Debugberichtstool nicht im System gefunden"
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
-msgstr "Debugbericht %(name)s konnte nicht erstellt werden. Details: %(err)s."
+msgstr ""
+"Debugbericht %(name)s konnte nicht erstellt werden. Details: %(err)s."
 
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
 msgstr ""
+"Ein Debugbericht mit dem angegebenen Namen %(name)s konnte nicht gefunden werden"
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
-msgstr "Debugbericht %(name)s konnte nicht generiert werden. Details: %(err)s"
+msgstr ""
+"Debugbericht %(name)s konnte nicht generiert werden. Details: %(err)s"
 
 msgid "You should give a name for the debug report file."
 msgstr ""
+"Sie m?ssen einen Namen f?r die Debugberichtsdatei angeben."
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
+"Der Name des Debugberichts muss eine Zeichenfolge sein. Nur Buchstaben, Ziffern, Unterstreichungszeichen ('_') "
+"und Bindestriche ('-') sind zul?ssig."
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
 msgstr ""
-"Eine Datentr?gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. "
-"W?hlen Sie einen anderen Namen aus, um den logischen Pool zu erstellen."
+"Der Debugbericht mit dem Namen \"%(name)s\" ist bereits vorhanden. Verwenden Sie "
+"einen anderen Namen."
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "Speicherserver %(server)s wurde nicht von Kimchi verwendet"
+msgstr ""
+"Speicherserver %(server)s wurde nicht von Kimchi verwendet"
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "Distro '%(name)s' ist nicht vorhanden"
+msgstr ""
+"Distro '%(name)s' ist nicht vorhanden"
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "Partition %(name)s ist nicht im Host vorhanden"
+msgstr ""
+"Partition %(name)s ist im Host nicht vorhanden"
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
 msgstr ""
-"Hostmaschine konnte nicht heruntergefahren werden, weil virtuelle Maschinen "
-"ausgef?hrt werden"
+"Hostmaschine konnte nicht heruntergefahren werden, weil virtuelle Maschinen ausgef?hrt werden"
 
 msgid "Unable to reboot host machine as there are running virtual machines"
 msgstr ""
-"Hostmaschine konnte nicht neu gestartet werden, weil virtuelle Maschinen "
-"ausgef?hrt werden"
+"Hostmaschine konnte nicht neu gestartet werden, weil virtuelle Maschinen ausgef?hrt werden"
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "Knoteneinheit '%(name)s' nicht gefunden"
+msgstr ""
+"Knoteneinheit '%(name)s' nicht gefunden"
 
 msgid "Conflicting flag filters specified."
 msgstr ""
+"In Konflikt stehende Flagfilter angegeben."
 
 msgid "No packages marked for update"
-msgstr "Keine Pakete f?r Aktualisierung markiert"
+msgstr ""
+"Keine Pakete f?r Aktualisierung markiert"
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "Paket %(name)s ist nicht f?r Aktualisierung markiert."
+msgstr ""
+"Paket %(name)s ist nicht f?r Aktualisierung markiert."
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
 msgstr ""
-"Fehler beim Abrufen von Paketen, die f?r die Aktualsierung markiert sind. "
-"Details: %(err)s"
+"Fehler beim Abrufen von Paketen, die f?r die Aktualisierung markiert sind. Details: %(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "Es gibt keinen kompatiblen Paketmanager f?r dieses System."
+msgstr ""
+"Es gibt keinen kompatiblen Paketmanager f?r dieses System."
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "%(item)s konnten nicht im Datenspeicher gefunden werden"
+msgstr ""
+"%(item)s konnten nicht im Datenspeicher gefunden werden"
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "Ung?ltiger URI %(uri)s"
+msgstr ""
+"Ung?ltiger URI %(uri)s"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
 msgstr ""
-"Zeitlimit?berschreitung beim Ausf?hren des Befehls '%(cmd)s' nach "
-"%(seconds)s Sekunden"
+"Zeitlimit?berschreitung bei Ausf?hrung des Befehls '%(cmd)s' nach %(seconds)s Sekunden"
 
 msgid "Unable to choose a virtual machine name"
 msgstr ""
+"Name der virtuellen Maschine konnte nicht ausgew?hlt werden"
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"Ung?ltiger Datenwert '%(value)s'"
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"Ung?ltige Dateneinheit '%(unit)s'"
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "Ung?ltiger Speichertyp. Unterst?tzte Typen: 'cdrom'"
+msgstr ""
+"Ung?ltiger Speichertyp. Unterst?tzte Typen: 'cdrom', 'disk'"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
 msgstr ""
+"Der Pfad '%(value)s' ist kein g?ltiger lokaler/ferner Pfad f?r die Einheit"
 
 msgid "Only CDROM path can be update."
 msgstr ""
+"Nur der CD-ROM-Pfad kann aktualisiert werden."
 
 #, python-format
 msgid ""
 "The storage device %(dev_name)s does not exist in the virtual machine "
 "%(vm_name)s"
 msgstr ""
+"Die Speichereinheit %(dev_name)s ist in der virtuellen Maschine "
+"%(vm_name)s nicht vorhanden"
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
-msgstr "Fehler beim Erstellen einer neuen Speichereinheit: %(error)s"
+msgstr ""
+"Fehler beim Erstellen einer neuen Speichereinheit: %(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
-msgstr "Fehler beim Aktualisieren einer Speichereinheit: %(error)s"
+msgstr ""
+"Fehler beim Aktualisieren einer Speichereinheit: %(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
-msgstr "Fehler beim Entfernen einer Speichereinheit: %(error)s"
+msgstr ""
+"Fehler beim Entfernen einer Speichereinheit: %(error)s"
 
 msgid "Do not support IDE device hot plug"
 msgstr ""
+"Hot Plug f?r IDE-Einheit nicht unterst?tzen"
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
 msgstr ""
-"Geben Sie Typ und Pfad an, um einen neuen Datentr?ger f?r eine virtuelle "
-"Maschine hinzuzf?gen"
+"Geben Sie Typ und Pfad oder Typ und Pool/Datentr?ger an, um eine neue "
+"Platte f?r eine virtuelle Maschine hinzuzuf?gen"
 
 msgid "Specify path to update virtual machine disk"
 msgstr ""
-"Geben Sie einen Pfad an, um die Platte der virtuellen Maschine zu "
-"aktualisieren"
+"Geben Sie einen Pfad an, um die Platte der virtuellen Maschine zu aktualisieren"
 
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
 msgstr ""
+"Begrenzung von %(limit)s Einheiten bei Controllertyp %(type)s erreicht"
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
 msgstr ""
+"Plattenpfadinformationen f?r angegebenen Pool/Datentr?ger k?nnen nicht abgerufen werden: %(error)s"
 
 msgid "Volume already in use by other virtual machine."
 msgstr ""
+"Datentr?ger wird bereits von einer anderen virtuellen Maschine verwendet."
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
 msgstr ""
-"Geben Sie Typ und Pfad an, um einen neuen Datentr?ger f?r eine virtuelle "
-"Maschine hinzuzf?gen"
+"Es kann nur ein Pfad oder ein Pool/Datentr?ger angegeben werden, um eine neue "
+"Platte f?r die virtuelle Maschine hinzuzuf?gen"
 
 #, python-format
 msgid ""
 "Volume chosen with format %(format)s does not fit in the storage type "
 "%(type)s"
 msgstr ""
+"Ausgew?hlter Datentr?ger mit Format %(format)s passt nicht in Speichertyp "
+"%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
 msgstr ""
 "YUM-Repository-ID darf nur ein aus einer Zeichenfolge bestehendes Wort sein."
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "Repository-URL muss ein http://-, ftp://- oder file://-URL sein."
+msgstr ""
+"Repository-URL muss eine http://-, ftp://- oder file://-URL sein."
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
 "repository type."
 msgstr ""
-"Repository-Konfiguration ist ein W?rterbuch mit bestimmten Werten "
-"hinsichtlich Repository-Typ."
+"Repository-Konfiguration ist ein W?rterbuch mit bestimmten Werten hinsichtlich "
+"Repository-Typ."
 
 msgid "Distribution to DEB repository must be a string"
-msgstr "Verteilung an DEB-Repository muss eine Zeichenfolge sein"
+msgstr ""
+"Verteilung an DEB-Repository muss eine Zeichenfolge sein"
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "Komponenten f?r DEB-Repository m?ssen in einem Array aufgelistet sein"
+msgstr ""
+"Komponenten f?r DEB-Repository m?ssen in einem Array aufgelistet sein"
 
 msgid "Components to DEB repository must be a string"
-msgstr "Komponenten f?r DEB-Repository m?ssen eine Zeichenfolge sein"
+msgstr ""
+"Komponenten f?r DEB-Repository m?ssen eine Zeichenfolge sein"
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"Spiegelliste f?r Repository muss eine Zeichenfolge sein"
 
 msgid "YUM Repository name must be string."
-msgstr "Name des YUM-Repositorys muss eine Zeichenfolge sein."
+msgstr ""
+"Name des YUM-Repositorys muss eine Zeichenfolge sein."
 
 msgid "GPG check must be a boolean value."
-msgstr "GPG-Pr?fung muss ein boolescher Wert sein."
+msgstr ""
+"GPG-Pr?fung muss ein boolescher Wert sein."
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr "GPG-Schl?ssel muss ein URL sein, der auf die ASCII-Armor-Datei zeigt."
+msgstr ""
+"GPG-Schl?ssel muss eine URL sein, die auf die ASCII-Armor-Datei verweist."
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "Repository %(repo_id)s konnte nicht aktualisiert werden."
+msgstr ""
+"Repository %(repo_id)s konnte nicht aktualisiert werden."
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "Repository %(repo_id)s ist nicht vorhanden."
+msgstr ""
+"Repository %(repo_id)s ist nicht vorhanden."
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"Geben Sie die Basis-URL, die Spiegelliste oder den Metalink des Repositorys an, um ein "
+"YUM-Repository zu erstellen oder zu aktualisieren."
 
 msgid "Repository management tool was not recognized for your system."
-msgstr "Repository-Verwaltungstool wurde f?r Ihr System nicht erkannt."
+msgstr ""
+"Repository-Verwaltungstool wurde f?r Ihr System nicht erkannt."
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "Repository %(repo_id)s ist bereits aktiviert."
+msgstr ""
+"Repository %(repo_id)s ist bereits aktiviert."
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "Repository %(repo_id)s ist bereits inaktiviert."
+msgstr ""
+"Repository %(repo_id)s ist bereits inaktiviert."
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "Repository %(repo_id)s konnte nicht entfernt werden."
+msgstr ""
+"Repository %(repo_id)s konnte nicht entfernt werden."
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
@@ -1184,21 +1374,26 @@ msgstr ""
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "Repository %(repo_id)s konnte nicht aktiviert werden."
+msgstr ""
+"Repository %(repo_id)s konnte nicht aktiviert werden."
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "Repository %(repo_id)s konnte nicht inaktiviert werden."
+msgstr ""
+"Repository %(repo_id)s konnte nicht inaktiviert werden."
 
 msgid "YUM Repository ID already exists"
-msgstr "YUM-Repository-ID ist bereits vorhanden"
+msgstr ""
+"YUM-Repository-ID ist bereits vorhanden"
 
 msgid "YUM Repository name must be a string"
-msgstr "YUM-Repository-Name muss eine Zeichenfolge sein"
+msgstr ""
+"YUM-Repository-Name muss eine Zeichenfolge sein"
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "Repositorys konnten nicht aufgelistet werden. Details: '%(err)s'"
+msgstr ""
+"Repositorys konnten nicht aufgelistet werden. Details: '%(err)s'"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
@@ -1207,638 +1402,819 @@ msgstr ""
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "Repository konnte nicht hinzugef?gt werden. Details: '%(err)s'"
+msgstr ""
+"Repository konnte nicht hinzugef?gt werden. Details: '%(err)s'"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "Repository konnte nicht entfernt werden. Details: '%(err)s'"
+msgstr ""
+"Repository konnte nicht entfernt werden. Details: '%(err)s'"
 
 #, python-format
 msgid ""
 "Configuration items: '%(items)s' are not supported by repository manager"
 msgstr ""
+"Konfigurationselemente: '%(items)s' werden vom Repository-Manager nicht unterst?tzt"
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"Repository-Metalink muss eine http://-, ftp://- oder file://-URL sein."
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"Spiegelliste und Metalink k?nnen nicht gleichzeitig angegeben werden."
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
 msgstr ""
+"Die virtuelle Maschine '%(vm)s' muss vor dem Erstellen eines Snapshots gestoppt werden."
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Snapshot '%(name)s' kann auf virtueller Maschine '%(vm)s' nicht erstellt werden. Details: "
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
 msgstr ""
+"Snapshot '%(name)s' ist auf virtueller Maschine '%(vm)s' nicht vorhanden."
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Snapshot '%(name)s' kann auf virtueller Maschine '%(vm)s' nicht abgerufen werden. Details: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
+"Snapshots k?nnen auf virtueller Maschine '%(vm)s' nicht aufgelistet werden. Details: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Snapshot '%(name)s' kann auf virtueller Maschine '%(vm)s' nicht gel?scht werden. Details: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Aktueller Snapshot der virtuellen Maschine '%(vm)s' kann nicht abgerufen werden. Details: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
 msgstr ""
+"Virtuelle Maschine '%(vm)s' kann nicht auf Snapshot '%(name)s' zur?ckgesetzt werden. Details: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
+"Snapshot der virtuellen Maschine '%(vm)s' kann nicht erstellt werden, weil er eine "
+"Platte im Format '%(format)s' enth?lt. Nur 'qcow2' wird unterst?tzt."
 
 msgid "The number of vCPUs is too large for this system."
 msgstr ""
+"Die Anzahl der vCPUs ist f?r dieses System zu gro?."
 
 msgid "Invalid vCPU/topology combination."
 msgstr ""
+"Ung?ltige Kombination aus vCPU und Topologie."
 
 msgid "This host (or current configuration) does not allow CPU topology."
 msgstr ""
+"Dieser Host (oder die aktuelle Konfiguration) erlaubt keine CPU-Topologie."
 
 msgid "ERROR CODE"
-msgstr "FEHLERCODE"
+msgstr ""
+"FEHLERCODE"
 
 msgid "REASON"
-msgstr "GRUND"
+msgstr ""
+"GRUND"
 
 msgid "STACK"
-msgstr "STACK"
+msgstr ""
+"STACK"
 
 msgid "Go to Homepage"
-msgstr "Gehe zu Homepage"
+msgstr ""
+"Gehe zu Homepage"
 
 msgid "Create a New Virtual Machine"
-msgstr "Neue virtuelle Maschine erstellen"
+msgstr ""
+"Neue virtuelle Maschine erstellen"
 
 msgid "Virtual Machine Name"
-msgstr "Name der virtuellen Maschine"
+msgstr ""
+"Name der virtuellen Maschine"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
 msgstr ""
-"Der f?r die Kennzeichnung der virtuellen Maschine verwendete Name. Falls er "
-"ausgelassen wird, wird ein Name anhand der verwendeten Vorlage ausgew?hlt."
+"Der f?r die Kennzeichnung der virtuellen Maschine verwendete Name. Falls er ausgelassen wird, wird ein Name "
+"anhand der verwendeten Vorlage ausgew?hlt."
 
 msgid "Template"
-msgstr "Vorlage"
+msgstr ""
+"Vorlage"
 
 msgid "Please create a template first."
-msgstr "Erstellen Sie zun?chst eine Vorlage."
+msgstr ""
+"Erstellen Sie zun?chst eine Vorlage."
 
 msgid "Create a Template"
-msgstr "Vorlage erstellen"
+msgstr ""
+"Vorlage erstellen"
 
 msgid "Please choose a template."
-msgstr "W?hlen Sie eine Vorlage aus."
+msgstr ""
+"W?hlen Sie eine Vorlage aus."
 
 msgid "OS"
-msgstr "BS"
+msgstr ""
+"BS"
 
 msgid "OS Version"
-msgstr "BS-Version"
+msgstr ""
+"BS-Version"
 
 msgid "CPUS"
-msgstr "CPUS"
+msgstr ""
+"CPUS"
 
 msgid "Memory"
-msgstr "Speicher"
+msgstr ""
+"Speicher"
 
 msgid "Create"
-msgstr "Erstellen"
+msgstr ""
+"Erstellen"
 
 msgid "Creating..."
 msgstr ""
+"Wird erstellt..."
 
 msgid "Edit Guest"
-msgstr "Gast bearbeiten"
+msgstr ""
+"Gast bearbeiten"
 
 msgid "General"
-msgstr "Allgemein"
+msgstr ""
+"Allgemein"
 
 msgid "Storage"
-msgstr "Speicher"
+msgstr ""
+"Speicher"
 
 msgid "Interface"
-msgstr "Schnittstelle"
+msgstr ""
+"Schnittstelle"
 
 msgid "Permission"
-msgstr "Version"
+msgstr ""
+"Berechtigung"
 
 msgid "Host PCI Device"
 msgstr ""
+"PCI-Einheit f?r Host"
 
 msgid "Snapshot"
 msgstr ""
+"Snapshot"
 
 msgid "Name"
-msgstr "Name"
+msgstr ""
+"Name"
 
 msgid "CPUs"
-msgstr "CPUs"
+msgstr ""
+"CPUs"
 
 msgid "Memory (MB)"
-msgstr "Speicher"
+msgstr ""
+"Speicher (MB)"
 
 msgid "Icon"
-msgstr "Symbol"
+msgstr ""
+"Symbol"
 
 msgid "Device"
-msgstr "Einheitenname"
+msgstr ""
+"Einheit"
 
 msgid "Path"
-msgstr "NFS-Pfad"
+msgstr ""
+"Pfad"
 
 msgid "Network"
-msgstr "Netz"
+msgstr ""
+"Netz"
 
 msgid "Type"
-msgstr "Typ"
+msgstr ""
+"Typ"
 
 msgid "MAC Address"
 msgstr ""
+"MAC-Adresse"
 
 msgid "Available system users and groups"
 msgstr ""
+"Verf?gbare Systembenutzer und -gruppen"
 
 msgid "Selected system users and groups"
 msgstr ""
+"Ausgew?hlte Systembenutzer und -gruppen"
 
 msgid "User"
 msgstr ""
+"Benutzer"
 
 msgid "All"
-msgstr "Alle"
+msgstr ""
+"Alle"
 
 msgid "To Add"
 msgstr ""
+"Hinzuzuf?gen"
 
 msgid "Added"
 msgstr ""
+"Hinzugef?gt"
 
 msgid "filter"
 msgstr ""
+"Filter"
 
 msgid "Product"
 msgstr ""
+"Produkt"
 
 msgid "Vendor"
-msgstr "Anbieter"
+msgstr ""
+"Anbieter"
 
 msgid "Created"
 msgstr ""
+"Erstellt"
 
 msgid "Save"
-msgstr "Speichern"
+msgstr ""
+"Speichern"
 
 msgid "Replace"
-msgstr "Ersetzen"
+msgstr ""
+"Ersetzen"
 
 msgid "Detach"
-msgstr "Abh?ngen"
+msgstr ""
+"Abh?ngen"
 
 msgid "Cancel"
-msgstr "Abbrechen"
+msgstr ""
+"Abbrechen"
 
 msgid "revert"
 msgstr ""
+"zur?cksetzen"
 
 msgid "Add a Storage Device to VM"
-msgstr "Speichereinheit zur virtuellen Maschine hinzuf?gen"
+msgstr ""
+"Speichereinheit zur virtuellen Maschine hinzuf?gen"
 
 msgid "Device Type"
-msgstr "Einheitentyp"
+msgstr ""
+"Einheitentyp"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterst?tzt."
+msgstr ""
+"Der Einheitentyp. Derzeit werden nur \"cdrom\" und \"disk\" unterst?tzt."
 
 msgid "Storage Pool"
-msgstr "Speicherpool"
+msgstr ""
+"Speicherpool"
 
 msgid "Storage pool which volume located in"
-msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
+msgstr ""
+"Speicherpool, in dem sich der Datentr?ger befindet"
 
 msgid "Storage Volume"
-msgstr "Speicherpoolname"
+msgstr ""
+"Speicherdatentr?ger"
 
 msgid "Storage volume to be attached"
-msgstr "Name des Speicherdatentr?gers muss eine Zeichenfolge sein"
+msgstr ""
+"Anzuh?ngender Speicherdatentr?ger"
 
 msgid "File Path"
-msgstr "Dateipfad"
+msgstr ""
+"Dateipfad"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "Der ISO-Dateipfad auf dem Server f?r die CD-ROM."
+msgstr ""
+"Der ISO-Dateipfad auf dem Server f?r die CD-ROM."
 
 msgid "Attach"
-msgstr "Anh?ngen"
+msgstr ""
+"Anh?ngen"
 
 msgid "Start"
-msgstr "Starten"
+msgstr ""
+"Starten"
 
 msgid "Reset"
-msgstr "Zur?cksetzen"
+msgstr ""
+"Zur?cksetzen"
 
 msgid "Pause"
 msgstr ""
+"Anhalten"
 
 msgid "Resume"
 msgstr ""
+"Fortsetzen"
 
 msgid "Power Off"
 msgstr ""
+"Ausschalten"
 
 msgid "Actions"
-msgstr "Aktionen"
+msgstr ""
+"Aktionen"
 
 msgid "Connect"
-msgstr "Verbinden"
+msgstr ""
+"Verbinden"
 
 msgid "Clone"
 msgstr ""
+"Klonen"
 
 msgid "Edit"
-msgstr "Bearbeiten"
+msgstr ""
+"Bearbeiten"
 
 msgid "Shut Down"
-msgstr "Herunterfahren"
+msgstr ""
+"Herunterfahren"
 
 msgid "Delete"
-msgstr "L?schen"
+msgstr ""
+"L?schen"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
-"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist "
-"falsch. Versuchen Sie es bitte erneut."
+"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist falsch. Versuchen Sie es bitte erneut."
 
 msgid "This field is required."
-msgstr "Dieses Feld ist erforderlich."
+msgstr ""
+"Dieses Feld ist erforderlich."
 
 msgid "Log in"
-msgstr "Anmelden"
+msgstr ""
+"Anmelden"
 
 msgid "Logging in..."
-msgstr "Wird angemeldet..."
+msgstr ""
+"Wird angemeldet..."
 
 msgid "Host"
-msgstr "Host"
+msgstr ""
+"Host"
 
 msgid "Guests"
-msgstr "G?ste"
+msgstr ""
+"G?ste"
 
 msgid "Templates"
-msgstr "Vorlagen"
+msgstr ""
+"Vorlagen"
 
 msgid "Failed to get application configuration"
-msgstr "Anwendungskonfiguration konnte nicht abgerufen werden"
+msgstr ""
+"Anwendungskonfiguration konnte nicht abgerufen werden"
 
 msgid "This is not a valid Linux path"
-msgstr "Dies ist kein g?ltiger Linux-Pfad"
+msgstr ""
+"Dies ist kein g?ltiger Linux-Pfad"
 
 msgid "This is not a valid URL."
-msgstr "Dies ist kein g?ltiger URL."
+msgstr ""
+"Dies ist keine g?ltige URL."
 
 msgid "No such data available."
-msgstr "Keine solchen Daten verf?gbar."
+msgstr ""
+"Keine solchen Daten verf?gbar."
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"Hostsystem kann nicht kontaktiert werden. Pr?fen Sie, ob das Hostsystem "
-"aktiv ist und obNetzkonnektivit?t besteht. HTTP-Anforderungsantwort %1. "
+"Hostsystem kann nicht kontaktiert werden. Pr?fen Sie, ob das Hostsystem aktiv ist und ob"
+"Netzkonnektivit?t besteht. HTTP-Anforderungsantwort %1."
 
 msgid "Unable to read file."
 msgstr ""
+"Datei konnte nicht gelesen werden."
 
 msgid "Error while uploading file."
 msgstr ""
+"Fehler beim Hochladen der Datei."
 
 msgid "Delete Confirmation"
-msgstr "L?schbest?tigung"
+msgstr ""
+"L?schbest?tigung"
 
 msgid "OK"
-msgstr "OK"
+msgstr ""
+"OK"
 
 msgid "Confirm"
-msgstr "Best?tigen"
+msgstr ""
+"Best?tigen"
 
 msgid "Warning"
-msgstr "Warnung"
+msgstr ""
+"Warnung"
 
 msgid "Cloning..."
 msgstr ""
+"Wird geklont..."
 
 msgid "Loading..."
-msgstr "Wird geladen..."
+msgstr ""
+"Wird geladen..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"Beim Abrufen der Systeminformationen ist ein Fehler aufgetreten."
 
 msgid "Retry"
-msgstr "Wiederholen"
+msgstr ""
+"Wiederholen"
 
 msgid "Detailed message:"
-msgstr "Detaillierte Meldung:"
+msgstr ""
+"Detaillierte Meldung:"
 
 msgid "No ISO found"
 msgstr ""
+"Keine ISO-Datei gefunden"
 
 msgid "This is not a valid ISO file."
-msgstr "Dies ist keine g?ltige ISO-Datei."
+msgstr ""
+"Dies ist keine g?ltige ISO-Datei."
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "Dies wird einige Zeit dauern. M?chten Sie fortfahren?"
+msgstr ""
+"Dieser Vorgang kann lange dauern. M?chten Sie fortfahren?"
 
 msgid "This will permanently delete the template. Would you like to continue?"
-msgstr "Hiermit wird die Vorlage dauerhaft gel?scht. M?chten Sie fortfahren?"
+msgstr ""
+"Hiermit wird die Vorlage dauerhaft gel?scht. M?chten Sie fortfahren?"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
 msgstr ""
-"System konnte nicht heruntergefahren werden, weil einige virtuellen "
-"Maschinen ausgef?hrt werden!"
+"System konnte nicht heruntergefahren werden, weil einige virtuellen Maschinen ausgef?hrt werden!"
 
 msgid "Max:"
-msgstr "Max:"
+msgstr ""
+"Max:"
 
 msgid "Utilization"
-msgstr "Auslastung"
+msgstr ""
+"Auslastung"
 
 msgid "Available"
-msgstr "Verf?gbar"
+msgstr ""
+"Verf?gbar"
 
 msgid "Read Rate"
-msgstr "Leserate"
+msgstr ""
+"Leserate"
 
 msgid "Write Rate"
-msgstr "Schreibrate"
+msgstr ""
+"Schreibrate"
 
 msgid "Received"
-msgstr "Empfangen"
+msgstr ""
+"Empfangen"
 
 msgid "Sent"
-msgstr "Gesendet"
+msgstr ""
+"Gesendet"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
 msgstr ""
-"Durch das Herunterfahren oder Neustarten des Hosts k?nnen ungesicherte "
-"Arbeiten verloren gehen. M?chten Sie mit dem Herunterfahren/Neustarten "
+"Durch das Herunterfahren oder Neustarten des Hosts k?nnen ungesicherte Arbeiten verloren gehen. M?chten Sie mit dem Herunterfahren/Neustarten "
 "fortfahren?"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"Repository wird dauerhaft entfernt und kann nicht wiederhergestellt werden. "
-"M?chten Sie fortfahren?"
+"Repository wird dauerhaft entfernt und kann nicht wiederhergestellt werden. M?chten Sie "
+"fortfahren?"
 
 msgid "Repositories"
-msgstr "Repositorys"
+msgstr ""
+"Repositorys"
 
 msgid "ID"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Base URL"
-msgstr "Basis-URL"
+msgstr ""
+"Basis-URL"
 
 msgid "Is Mirror"
-msgstr "Ist Spiegel"
+msgstr ""
+"Ist Spiegel"
 
 msgid "URL Args"
-msgstr "URL-Args"
+msgstr ""
+"URL-Args"
 
 msgid "Enabled"
-msgstr "Aktiviert"
+msgstr ""
+"Aktiviert"
 
 msgid "GPG Check"
-msgstr "GPG-Pr?fung"
+msgstr ""
+"GPG-Pr?fung"
 
 msgid "GPG Key"
-msgstr "GPG-Schl?ssel"
+msgstr ""
+"GPG-Schl?ssel"
 
 msgid "Add"
-msgstr "Hinzuf?gen"
+msgstr ""
+"Hinzuf?gen"
 
 msgid "Remove"
-msgstr "Entfernen"
+msgstr ""
+"Entfernen"
 
 msgid "Enable"
-msgstr "Aktivieren"
+msgstr ""
+"Aktivieren"
 
 msgid "Disable"
-msgstr "Inaktivieren"
+msgstr ""
+"Inaktivieren"
 
 msgid "Software Updates"
-msgstr "Software-Updates"
+msgstr ""
+"Software-Updates"
 
 msgid "Package Name"
-msgstr "Paketname"
+msgstr ""
+"Paketname"
 
 msgid "Version"
-msgstr "Version"
+msgstr ""
+"Version"
 
 msgid "Architecture"
-msgstr "Architektur"
+msgstr ""
+"Architektur"
 
 msgid "Repository"
-msgstr "Repository"
+msgstr ""
+"Repository"
 
 msgid "Update All"
-msgstr "Alle aktualisieren"
+msgstr ""
+"Alle aktualisieren"
 
 msgid "Updating..."
-msgstr "Wird aktualisiert..."
+msgstr ""
+"Wird aktualisiert..."
 
 msgid "Failed to retrieve packages update information."
 msgstr ""
+"Updateinformationen f?r Pakete konnten nicht abgerufen werden."
 
 msgid "Failed to update package(s)."
-msgstr "Pakete konnten nicht aktualisiert werden."
+msgstr ""
+"Pakete konnten nicht aktualisiert werden."
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"Debugbericht wird dauerhaft entfernt und kann nicht wiederhergestellt "
-"werden. M?chten Sie fortfahren?"
+"Debugbericht wird dauerhaft entfernt und kann nicht wiederhergestellt werden. M?chten Sie "
+"fortfahren?"
 
 msgid "Debug Reports"
-msgstr "Debugberichte"
+msgstr ""
+"Debugberichte"
 
 msgid "Generated Time"
-msgstr "Generierte Zeit"
+msgstr ""
+"Generierte Zeit"
 
 msgid "Generate"
-msgstr "Generieren"
+msgstr ""
+"Generieren"
 
 msgid "Generating..."
-msgstr "Wird generiert..."
+msgstr ""
+"Wird generiert..."
 
 msgid "Rename"
-msgstr "Umbenennen"
+msgstr ""
+"Umbenennen"
 
 msgid "Download"
-msgstr "Herunterladen"
+msgstr ""
+"Herunterladen"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
 msgstr ""
-"Berichtsname darf nur Buchstaben, Zahlen und/oder Bindestriche ('-') "
-"enthalten."
+"Der Berichtsname darf nur Buchstaben, Ziffern, Unterstreichungszeichen ('_') und/oder "
+"Bindestriche ('-') enthalten."
 
 msgid "Pending..."
-msgstr "Wird geladen..."
+msgstr ""
+"Anstehend..."
 
 msgid "Report name is the same as the original one."
 msgstr ""
+"Der Berichtsname stimmt mit dem urspr?nglichen Namen ?berein."
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
 msgstr ""
-"Hiermit werden die virtuelle Maschine und deren virtuellen Platten gel?scht. "
-"Diese Operation kann nicht r?ckg?ngig gemacht werden. M?chten Sie fortfahren?"
+"Hiermit werden die virtuelle Maschine und deren virtuellen Platten gel?scht. Diese Operation "
+"kann nicht r?ckg?ngig gemacht werden. M?chten Sie fortfahren?"
 
 msgid "Power off Confirmation"
-msgstr "L?schbest?tigung"
+msgstr ""
+"Ausschalten best?tigen"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
 msgstr ""
+"Diese Aktion kann zu nicht gew?nschten Ergebnissen f?hren, beispielsweise zu "
+"einem nicht geleerten Plattencache beim Gast. M?chten Sie fortfahren?"
 
 msgid "Reset Confirmation"
-msgstr "L?schbest?tigung"
+msgstr ""
+"Zur?cksetzung best?tigen"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
 msgstr ""
+"Bei einer Zur?cksetzung ohne Herunterfahren des Gastbetriebssystems besteht "
+"das Risiko eines Datenverlusts. M?chten Sie fortfahren?"
 
 msgid "Shut Down Confirmation"
-msgstr "L?schbest?tigung"
+msgstr ""
+"Herunterfahren best?tigen"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
-msgstr "Hiermit wird die Vorlage dauerhaft gel?scht. M?chten Sie fortfahren?"
+msgstr ""
+"Hinweis: Diese Anforderung wird vom Gastbetriebssystem m?glicherweise ignoriert. M?chten Sie fortfahren?"
 
 msgid "Virtual Machine delete Confirmation"
 msgstr ""
+"L?schbest?tigung f?r virtuelle Maschine"
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
 msgstr ""
+"Diese virtuelle Maschine ist nicht permanent. Wenn Sie das System ausschalten, wird sie gel?scht. M?chten Sie fortfahren?"
 
 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 ""
+"Wenn der Zielgast ?ber SCSI- oder iSCSI-Datentr?ger verf?gt, dann werden sie im Standardspeicherpool "
+"geklont. Derselbe Vorgang wird ausgef?hrt, wenn der Zielpool nicht ?ber gen?gend "
+"Speicherplatz zum Klonen der Datentr?ger verf?gt. M?chten Sie fortfahren?"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
 msgstr ""
-"Diese CD-ROM wird dauerhaft abgeh?ngt und Sie k?nnen sie neu anh?ngen. "
-"M?chten Sie mit dem Abh?ngen fortfahren?"
+"Diese CD-ROM wird dauerhaft abgeh?ngt und Sie k?nnen sie neu anh?ngen. M?chten Sie "
+"mit dem Abh?ngen fortfahren?"
 
 msgid "Attaching..."
-msgstr "Wird angeh?ngt..."
+msgstr ""
+"Wird angeh?ngt..."
 
 msgid "Replacing..."
-msgstr "Wird ersetzt..."
+msgstr ""
+"Wird ersetzt..."
 
 msgid "Successfully attached!"
-msgstr "Erfolgreich angeh?ngt!"
+msgstr ""
+"Erfolgreich angeh?ngt!"
 
 msgid "Successfully replaced!"
-msgstr "Erfolgreich ersetzt!"
+msgstr ""
+"Erfolgreich ersetzt!"
 
 msgid "Successfully detached!"
-msgstr "Erfolgreich abgeh?ngt!"
+msgstr ""
+"Erfolgreich abgeh?ngt!"
 
 msgid ""
 "This disk will be detached permanently and you can re-attach it. Continue to "
 "detach it?"
 msgstr ""
+"Diese Platte wird dauerhaft abgeh?ngt und Sie k?nnen sie neu anh?ngen. M?chten Sie "
+"mit dem Abh?ngen fortfahren?"
 
 msgid "interface:"
 msgstr ""
+"Schnittstelle:"
 
 msgid "address:"
 msgstr ""
+"Adresse:"
 
 msgid "link_type:"
 msgstr ""
+"Linktyp:"
 
 msgid "block:"
 msgstr ""
+"Block:"
 
 msgid "drive_type:"
 msgstr ""
+"Laufwerkstyp:"
 
 msgid "model:"
 msgstr ""
+"Modell:"
 
 msgid "Affected devices:"
 msgstr ""
+"Betroffene Einheiten:"
 
 msgid "The VLAN id must be between 1 and 4094."
-msgstr "Die VLAN-ID muss zwischen 1 und 4094 liegen."
+msgstr ""
+"Die VLAN-ID muss zwischen 1 und 4094 liegen."
 
 msgid "unavailable"
-msgstr "nicht verf?gbar"
+msgstr ""
+"nicht verf?gbar"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
 "depend on this network."
 msgstr ""
-"Diese Aktion unterbricht die Netzkonnektivit?t f?r jede virtuelle Maschine, "
-"die von diesem Netz abh?ngt."
+"Diese Aktion unterbricht die Netzkonnektivit?t f?r jede virtuelle Maschine, die "
+"von diesem Netz abh?ngt."
 
 msgid "Create a network"
-msgstr "Netz erstellen"
+msgstr ""
+"Netz erstellen"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht "
-"inaktiviert, sondern permanent gel?scht. M?chten Sie fortfahren?"
+"Dieses Netz ist nicht permanent. Durch diese Aktion wird es nicht gestoppt, sondern "
+"permanent gel?scht. M?chten Sie fortfahren?"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"Der ?berbr?ckte VLAN-Tag arbeitet m?glicherweise nicht korrekt, wenn der Netzmanager aktiviert ist. Sie "
+"sollten ihn eventuell inaktivieren."
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
@@ -1846,423 +2222,539 @@ msgstr ""
 "Hiermit wird der Speicherpool dauerhaft gel?scht. M?chten Sie fortfahren?"
 
 msgid "This storage pool is empty."
-msgstr "Dieser Speicherpool ist leer."
+msgstr ""
+"Dieser Speicherpool ist leer."
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
 "to continue? "
 msgstr ""
-"Hiermit wird Ihre Platte formatiert und Sie verlieren s?mtliche Daten "
-"darauf. Sind Sie sicher, dass Sie fortfahren m?chten? "
+"Hiermit wird Ihre Platte formatiert und Sie verlieren s?mtliche Daten darauf. Sind Sie sicher, dass "
+"Sie fortfahren m?chten? "
 
 msgid "SCSI Fibre Channel"
-msgstr "SCSI-Fibre Channel"
+msgstr ""
+"SCSI-Fibre Channel"
 
 msgid "No SCSI adapters found."
-msgstr "Keine SCSI-Adapter gefunden."
+msgstr ""
+"Keine SCSI-Adapter gefunden."
 
 msgid "Loading iSCSI targets..."
 msgstr ""
+"iSCSI-Ziele werden geladen..."
 
 msgid "No iSCSI found. Please input one."
 msgstr ""
+"iSCSI wurde nicht gefunden. Nehmen Sie die iSCSI-Eingabe vor."
 
 msgid "Failed to load iSCSI targets."
 msgstr ""
+"iSCSI-Ziele konnten nicht geladen werden."
 
 msgid "The storage pool name can not be blank."
-msgstr "Der Speicherpoolname darf nicht leer sein."
+msgstr ""
+"Der Speicherpoolname darf nicht leer sein."
 
 msgid "The storage pool path can not be blank."
-msgstr "Der Speicherpoolpfad darf nicht leer sein."
+msgstr ""
+"Der Speicherpoolpfad darf nicht leer sein."
 
 msgid "NFS server mount path can not be blank."
-msgstr "Der Mountpfad des NFS-Servers darf nicht leer sein."
+msgstr ""
+"Der Mountpfad des NFS-Servers darf nicht leer sein."
 
 msgid "Invalid NFS mount path."
-msgstr "Ung?ltiger NFS-Mountpfad."
+msgstr ""
+"Ung?ltiger NFS-Mountpfad."
 
 msgid "No logical device selected."
-msgstr "Keine logische Einheit ausgew?hlt."
+msgstr ""
+"Keine logische Einheit ausgew?hlt."
 
 msgid "The iSCSI target can not be blank."
-msgstr "Das iSCSI-Ziel darf nicht leer sein."
+msgstr ""
+"Das iSCSI-Ziel darf nicht leer sein."
 
 msgid "Server name can not be blank."
-msgstr "Servername darf nicht leer sein."
+msgstr ""
+"Servername darf nicht leer sein."
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
 msgstr ""
+"Dies ist kein g?ltiger Servername oder keine g?ltige IP. ?ndern Sie den Servernamen oder die IP."
 
 msgid "Looking for available partitions ..."
-msgstr "Es wird nach verf?gbaren Partitionen gesucht..."
+msgstr ""
+"Es wird nach verf?gbaren Partitionen gesucht..."
 
 msgid "No available partitions found."
-msgstr "Keine g?ltigen Partitionen gefunden."
+msgstr ""
+"Keine g?ltigen Partitionen gefunden."
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht "
-"inaktiviert, sondern permanent gel?scht. M?chten Sie fortfahren?"
+"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht inaktiviert, sondern "
+"permanent gel?scht. M?chten Sie fortfahren?"
 
 msgid "Unable to retrieve partitions information."
 msgstr ""
-"Repository-Informationen konnten nicht abgerufen werden. Details: '%(err)s'"
+"Partitionsinformationen konnten nicht abgerufen werden."
 
 msgid "In progress..."
 msgstr ""
+"In Bearbeitung..."
 
 msgid "Failed!"
 msgstr ""
+"Fehlgeschlagen!"
 
 msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
 msgstr ""
+"Der CD-ROM-Pfad muss ein g?ltiger lokaler/ferner Pfad sein. Er darf nicht leer sein."
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "Der Speicherpoolname darf nicht leer sein."
+msgstr ""
+"Der Plattenpool oder Datentr?ger darf nicht leer sein."
 
 msgid "Peers"
 msgstr ""
+"Peers"
 
 msgid "Searching"
 msgstr ""
+"Suche wird durchgef?hrt"
 
 msgid "No peers found."
 msgstr ""
+"Keine Peers gefunden."
 
 msgid "Help"
-msgstr "Hilfe"
+msgstr ""
+"Hilfe"
 
 msgid "About"
-msgstr "Informationen"
+msgstr ""
+"Informationen"
 
 msgid "Log out"
-msgstr "Abmelden"
+msgstr ""
+"Abmelden"
 
 msgid "Version:"
-msgstr "Version:"
+msgstr ""
+"Version:"
 
 msgid "Session timeout, please re-login."
 msgstr ""
+"Sitzungszeitlimit?berschreitung, melden Sie sich erneut an."
 
 msgid "User Name"
-msgstr "Benutzername"
+msgstr ""
+"Benutzername"
 
 msgid "Password"
-msgstr "Kennwort"
+msgstr ""
+"Kennwort"
 
 msgid "Generate a New Debug Report"
-msgstr "Neuen Debugbericht erstellen"
+msgstr ""
+"Neuen Debugbericht erstellen"
 
 msgid "Report Name"
-msgstr "Berichtsname"
+msgstr ""
+"Berichtsname"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"Der Name, mit dem der Bericht gekennzeichnet wird. Falls er ausgelassen "
-"wird, wird ein Name basierend auf der aktuellen Zeit ausgew?hlt. Der Name "
-"darf Buchstaben, Zahlen und Bindestriche (\"-\") enthalten."
+"Der Name, mit dem der Bericht angegeben wird. Falls keine Angabe erfolgt, wird ein Name "
+"auf Basis der aktuellen Uhrzeit ausgew?hlt. Der Name kann Buchstaben, Ziffern, Unterstreichungszeichen (\"_\") "
+"und Bindestriche (\"-\") enthalten."
 
 msgid "Rename a Debug Report"
-msgstr "Neuen Debugbericht erstellen"
+msgstr ""
+"Debugbericht umbenennen"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
 msgstr ""
-"Der Name, mit dem der Bericht gekennzeichnet wird. Falls er ausgelassen "
-"wird, wird ein Name basierend auf der aktuellen Zeit ausgew?hlt. Der Name "
-"darf Buchstaben, Zahlen und Bindestriche (\"-\") enthalten."
+"Der Name, mit dem der Bericht angegeben wird. Der Name kann Buchstaben, Ziffern und "
+"Bindestriche (\"-\") enthalten."
 
 msgid "Submit"
 msgstr ""
+"?bergeben"
 
 msgid "Add a Repository"
-msgstr "Repository hinzuf?gen"
+msgstr ""
+"Repository hinzuf?gen"
 
 msgid "Identifier"
-msgstr "Kennung"
+msgstr ""
+"Kennung"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "Einzelnes Wort, eindeutige Kennung f?r das Repository."
+msgstr ""
+"Einzelnes Wort, eindeutige Kennung f?r das Repository."
 
 msgid "Textual name for the repository."
-msgstr "Textname f?r das Repository."
+msgstr ""
+"Textname f?r das Repository."
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "Erforderliches Feld"
+msgstr ""
+"Erforderliches Feld"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "URL zum Repository. Unterst?tzte Protokolle sind http, ftp und file."
+msgstr ""
+"URL zum Repository. Unterst?tzte Protokolle sind http, ftp und file."
 
 msgid "Repository is a mirror"
-msgstr "Repository ist ein Spiegel."
+msgstr ""
+"Repository ist ein Spiegel"
 
 msgid "Distribution"
-msgstr "Verteilung"
+msgstr ""
+"Verteilung"
 
 msgid "Distribution of the DEB repository."
-msgstr "Verteilung des DEB-Repositorys."
+msgstr ""
+"Verteilung des DEB-Repositorys."
 
 msgid "Components"
-msgstr "Komponenten"
+msgstr ""
+"Komponenten"
 
 msgid "List of components in DEB repository."
-msgstr "Liste der Komponenten im DEB-Repository."
+msgstr ""
+"Liste der Komponenten im DEB-Repository."
 
 msgid "Edit Repository"
-msgstr "Repository bearbeiten"
+msgstr ""
+"Repository bearbeiten"
 
 msgid "Mirror List URL"
-msgstr "Spiegellisten-URL"
+msgstr ""
+"Spiegellisten-URL"
 
 msgid "Yes"
-msgstr "Ja"
+msgstr ""
+"Ja"
 
 msgid "No"
-msgstr "Nein"
+msgstr ""
+"Nein"
 
 msgid "Add a Volume to Storage Pool"
 msgstr ""
+"Datentr?ger zu Speicherpool hinzuf?gen"
 
 msgid "Fetch from remote URL"
 msgstr ""
+"?ber Remote URL abrufen"
 
 msgid "Enter the remote URL here."
 msgstr ""
+"Remote URL hier eingeben."
 
 msgid "Upload a file"
 msgstr ""
+"Datei hochladen"
 
 msgid "Choose the file you want to upload."
 msgstr ""
+"W?hlen Sie die hochzuladende Datei aus."
 
 msgid "Define a New Storage Pool"
-msgstr "Neuen Speicherpool definieren"
+msgstr ""
+"Neuen Speicherpool definieren"
 
 msgid "Storage Pool Name"
-msgstr "Speicherpoolname"
+msgstr ""
+"Speicherpoolname"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
 msgstr ""
-"Der Name, mit dem die Speicherpools gekennzeichnet werden. Er darf nicht "
-"leer sein."
+"Der Name, mit dem die Speicherpools gekennzeichnet werden. Er darf nicht leer sein."
 
 msgid "Storage Pool Type"
-msgstr "Speicherpooltyp"
+msgstr ""
+"Speicherpooltyp"
 
 msgid "Storage Path"
-msgstr "Speicherpfad"
+msgstr ""
+"Speicherpfad"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
 msgstr ""
-"Der Pfad des Speicherpools. Jeder Speicherpool muss einen eindeutigen Pfad "
-"haben."
+"Der Pfad des Speicherpools. Jeder Speicherpool muss einen eindeutigen Pfad haben."
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
 msgstr ""
-"Kimchi versucht, das Verzeichnis zu erstellen, wenn es noch nicht in Ihrem "
-"System vorhanden ist."
+"Kimchi versucht, das Verzeichnis zu erstellen, wenn es noch nicht in Ihrem System "
+"vorhanden ist."
 
 msgid "NFS Server IP"
-msgstr "NFS-Server-IP"
+msgstr ""
+"NFS-Server-IP"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
 msgstr ""
-"IP oder Hostname des NFS-Servers. Diese(r) kann eingegeben oder aus dem "
-"Verlauf ausgew?hlt werden."
+"IP oder Hostname des NFS-Servers. Diese(r) kann eingegeben oder aus dem Verlauf ausgew?hlt werden."
 
 msgid "NFS Path"
-msgstr "NFS-Pfad"
+msgstr ""
+"NFS-Pfad"
 
 msgid "The NFS exported path on NFS server."
-msgstr "Der NFS-Exportpfad auf dem NFS-Server."
+msgstr ""
+"Der NFS-Exportpfad auf dem NFS-Server."
 
 msgid "Device path"
-msgstr "Einheitenpfad"
+msgstr ""
+"Einheitenpfad"
 
 msgid "iSCSI Server"
-msgstr "iSCSI-Server"
+msgstr ""
+"iSCSI-Server"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP oder Hostname des iSCSI-Servers. Diese(r) darf nicht leer sein."
+msgstr ""
+"IP oder Hostname des iSCSI-Servers. Diese(r) darf nicht leer sein."
 
 msgid "Server"
-msgstr "Server"
+msgstr ""
+"Server"
 
 msgid "Port"
-msgstr "Port"
+msgstr ""
+"Port"
 
 msgid "Target"
-msgstr "Ziel"
+msgstr ""
+"Ziel"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "Das iSCSI-Ziel auf dem iSCSI-Server"
+msgstr ""
+"Das iSCSI-Ziel auf dem iSCSI-Server"
 
 msgid "Add iSCSI Authentication"
-msgstr "iSCSI-Authentifizierung hinzuf?gen"
+msgstr ""
+"iSCSI-Authentifizierung hinzuf?gen"
 
 msgid "iSCSI Authentication"
-msgstr "iSCSI-Authentifizierung"
+msgstr ""
+"iSCSI-Authentifizierung"
 
 msgid "SCSI Adapter"
-msgstr "SCSI-Adapter"
+msgstr ""
+"SCSI-Adapter"
 
 msgid "Please, wait..."
-msgstr "Bitte warten..."
+msgstr ""
+"Bitte warten..."
 
 msgid "Add Template"
-msgstr "Vorlage hinzuf?gen"
+msgstr ""
+"Vorlage hinzuf?gen"
 
 msgid "Where is the source media for this template? "
-msgstr "Wo ist der Quellendatentr?ger f?r diese Vorlage?"
+msgstr ""
+"Wo ist der Quellendatentr?ger f?r diese Vorlage?"
 
 msgid "Local ISO Image"
-msgstr "Lokales ISO-Image"
+msgstr ""
+"Lokales ISO-Image"
 
 msgid "Local Image File"
 msgstr ""
+"Lokale Imagedatei"
 
 msgid "Remote ISO Image"
-msgstr "Fernes ISO-Image"
+msgstr ""
+"Fernes ISO-Image"
 
 msgid "Search ISOs"
-msgstr "ISOs suchen"
+msgstr ""
+"ISOs suchen"
 
 msgid "The following ISOs are available:"
-msgstr "Die folgenden ISOs sind verf?gbar:"
+msgstr ""
+"Die folgenden ISOs sind verf?gbar:"
 
 msgid "OS: "
-msgstr "BS: "
+msgstr ""
+"BS: "
 
 msgid "Version: "
-msgstr "Version: "
+msgstr ""
+"Version: "
 
 msgid "Size: "
-msgstr "Gr??e: "
+msgstr ""
+"Gr??e: "
 
 msgid "Search more ISOs"
-msgstr "Weitere ISOs suchen"
+msgstr ""
+"Weitere ISOs suchen"
 
 msgid "Create Templates from Selected ISO"
-msgstr "Vorlagen aus ausgew?hltem ISO erstellen"
+msgstr ""
+"Vorlagen aus ausgew?hltem ISO erstellen"
 
 msgid "I want to use a specific ISO file"
-msgstr "Ich m?chte eine bestimmte ISO-Datei verwenden"
+msgstr ""
+"Ich m?chte eine bestimmte ISO-Datei verwenden"
 
 msgid "Loading default remote ISOs ..."
-msgstr "Standardm??ige ferne ISOs werden geladen ..."
+msgstr ""
+"Standardm??ige ferne ISOs werden geladen..."
 
 msgid "Arch: "
-msgstr "Arch: "
+msgstr ""
+"Arch: "
 
 msgid "I want to use a custom URL"
-msgstr "Ich m?chte einen benutzerdefinierten URL verwenden"
+msgstr ""
+"Ich m?chte eine benutzerdefinierte URL verwenden"
 
 msgid "Edit Template"
-msgstr "Vorlage bearbeiten"
+msgstr ""
+"Vorlage bearbeiten"
 
 msgid "Processor"
-msgstr "Prozessor"
+msgstr ""
+"Prozessor"
 
 msgid "CDROM"
-msgstr "CD-ROM"
+msgstr ""
+"CD-ROM"
 
 msgid "Image File"
 msgstr ""
+"Imagedatei"
 
 msgid "Graphics"
-msgstr "Grafik"
+msgstr ""
+"Grafik"
 
 msgid "Disk(GB)"
 msgstr ""
+"Festplatte (GB)"
 
 msgid "Disk Format"
 msgstr ""
+"Plattenformat"
 
 msgid "CPU Number"
-msgstr "CPU-Anzahl"
+msgstr ""
+"CPU-Anzahl"
 
 msgid "Manually set CPU topology"
 msgstr ""
+"CPU-Topologie manuell festlegen"
 
 msgid "Cores"
 msgstr ""
+"Kerne"
 
 msgid "Threads"
 msgstr ""
+"Threads"
 
 msgid "CPU"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Disk I/O"
-msgstr "Platten-E/A"
+msgstr ""
+"Platten-E/A"
 
 msgid "Network I/O"
-msgstr "Netz-E/A"
+msgstr ""
+"Netz-E/A"
 
 msgid "Livetile"
-msgstr "Live Tile"
+msgstr ""
+"Live Tile"
 
 msgid "No guests found."
-msgstr "Keine G?ste gefunden."
+msgstr ""
+"Keine G?ste gefunden."
 
 msgid "Shut down"
-msgstr "Herunterfahren"
+msgstr ""
+"Herunterfahren"
 
 msgid "Restart"
-msgstr "Erneut starten"
+msgstr ""
+"Erneut starten"
 
 msgid "Basic Information"
-msgstr "Basisinformationen"
+msgstr ""
+"Basisinformationen"
 
 msgid "OS Distro"
-msgstr "BS-Distro"
+msgstr ""
+"BS-Distro"
 
 msgid "OS Code Name"
-msgstr "BS-Codename"
+msgstr ""
+"BS-Codename"
 
 msgid "CPU(s)"
 msgstr ""
+"CPU(s)"
 
 msgid "System Statistics"
-msgstr "Systemstatistik"
+msgstr ""
+"Systemstatistik"
 
 msgid "Update Progress"
-msgstr "Aktualisierungsfortschritt"
+msgstr ""
+"Aktualisierungsfortschritt"
 
 msgid "Network Name"
-msgstr "Netzname"
+msgstr ""
+"Netzname"
 
 msgid "State"
-msgstr "Status"
+msgstr ""
+"Status"
 
 msgid "Network Type"
-msgstr "Netztyp"
+msgstr ""
+"Netztyp"
 
 msgid "Address Space"
-msgstr "Adressraum"
+msgstr ""
+"Adressraum"
 
 msgid "Name should not contain '/' and '\"'."
-msgstr "Ung?ltiger Speicherpoolname. Er darf nicht '/' enthalten."
+msgstr ""
+"Der Name darf weder '/' noch '\"' enthalten."
 
 msgid "Isolated: no external network connection"
-msgstr "Isolatiert: keine physisische Netzverbindung"
+msgstr ""
+"Isoliert: keine externe Netzverbindung"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT: nur ausgehende physische Netzverbindung"
+msgstr ""
+"NAT: nur ausgehende physische Netzverbindung"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
@@ -2270,57 +2762,80 @@ msgstr ""
 
 msgid "(No interfaces found)"
 msgstr ""
+"(Keine Schnittstellen gefunden)"
 
 msgid "Destination"
-msgstr "Ziel:"
+msgstr ""
+"Zieladresse"
 
 msgid "Enable VLAN"
-msgstr "Virtuelles LAN (VLAN) aktivieren:"
+msgstr ""
+"VLAN aktivieren"
 
 msgid "VLAN ID"
-msgstr "VLAN-ID:"
+msgstr ""
+"VLAN-ID"
 
 msgid "Stop"
-msgstr "Stoppen"
+msgstr ""
+"Stoppen"
 
 msgid "%Used"
 msgstr ""
+"% belegt"
 
 msgid "Location"
-msgstr "Position"
+msgstr ""
+"Position"
 
 msgid "Capacity"
-msgstr "Kapazit?t"
+msgstr ""
+"Kapazit?t"
 
 msgid "Allocated"
-msgstr "Zugeordnet"
+msgstr ""
+"Zugeordnet"
 
 msgid "active"
-msgstr "aktiv"
+msgstr ""
+"aktiv"
 
 msgid "inactive"
-msgstr "inaktiv"
+msgstr ""
+"inaktiv"
 
 msgid "Deactivate"
-msgstr "Inaktivieren"
+msgstr ""
+"Inaktivieren"
 
 msgid "Activate"
-msgstr "Aktivieren"
+msgstr ""
+"Aktivieren"
 
 msgid "Add Volume"
 msgstr ""
+"Datentr?ger hinzuf?gen"
 
 msgid "Extend"
 msgstr ""
+"Erweitern"
 
 msgid "Undefine"
-msgstr "Definition aufheben"
+msgstr ""
+"Definition aufheben"
 
 msgid "Format"
-msgstr "Format:"
+msgstr ""
+"Format"
 
 msgid "Allocation"
-msgstr "Zuordnung:"
+msgstr ""
+"Zuordnung"
 
 msgid "No templates found."
-msgstr "Keine Vorlagen gefunden."
+msgstr ""
+"Keine Vorlagen gefunden."
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/po/es_ES.po b/po/es_ES.po
index 5389718..f97760d 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,5 +1,6 @@
 # English translations for kimchi package.
 # Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
@@ -9,138 +10,155 @@ msgstr ""
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: es_ES\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
 msgstr ""
+"Par?metro %(value)s desconocido"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "Suprimir no est? permitido para %(resource)s"
+msgstr ""
+"No se permite la supresi?n para %(resource)s"
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s no implementa m?todo de actualizaci?n"
+msgstr ""
+"%(resource)s no implementa el m?todo de actualizaci?n"
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "Crear no est? permitido para %(resource)s"
+msgstr ""
+"No se permite la creaci?n para %(resource)s"
 
 msgid "Unable to parse JSON request"
-msgstr "No se puede analizar la solicitud JSON"
+msgstr ""
+"No se puede analizar la solicitud JSON"
 
 msgid "This API only supports JSON"
-msgstr "Esta API s?lo da soporte a JSON"
+msgstr ""
+"Esta API s?lo da soporte a JSON"
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
 msgstr ""
+"Los par?metros no coinciden con el requisito en el esquema: %(err)s"
 
 msgid "You don't have permission to perform this operation."
 msgstr ""
+"No dispone de permiso para llevar a cabo esta operaci?n."
 
 msgid "Datastore is not initiated in the model object."
-msgstr "El almac?n de datos no se ha iniciado en el objeto de modelo."
+msgstr ""
+"El almac?n de datos no se ha iniciado en el objeto de modelo."
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
-msgstr "No se puede iniciar la tarea debido a un 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 ""
+"El tiempo de espera de %(seconds)s segundos se ha agotado al ejecutar la tarea '%(task)s."
 
 #, 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 "
-"error: %(code)s]"
+"Error en la autenticaci?n para el usuario '%(username)s'. [C?digo de error: %(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "No tiene autorizaci?n para acceder a Kimchi"
+msgstr ""
+"No tiene autorizaci?n para acceder a Kimchi"
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "Especifique %(item)s para iniciar la sesi?n en Kimchi"
+msgstr ""
+"Especifique %(item)s para iniciar sesi?n en Kimchi"
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
 msgstr ""
+"No se ha encontrado el usuario %(user_id)s con los valores LDAP indicados."
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
 msgstr ""
+"Configuraci?n LDAP no v?lida: %(item)s : %(value)s"
 
 msgid "Unknown \"_cap\" specified"
 msgstr ""
+"Se ha especificado un valor \"_cap\" desconocido"
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
 msgstr ""
+"\"_passthrough\" deber?a ser \"true\" o \"false\""
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
 msgstr ""
+"\"_passthrough_affected_by\" deber?a ser una cadena de nombre de dispositivo"
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
 msgstr ""
-"Se ha producido un error al obtener dispositivos de bloque. Detalles: %(err)s"
+"Error al obtener dispositivos de bloque. Detalles: %(err)s"
 
 #, python-format
 msgid "Error while getting block device information for %(device)s."
 msgstr ""
-"Se ha producido un error al obtener informaci?n de dispositivo de bloque "
-"para %(device)s."
+"Error al obtener informaci?n de dispositivos de bloque para %(device)s."
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "No se puede encontrar el archivo distro: %(filename)s"
+msgstr ""
+"No se ha podido encontrar el archivo distro: %(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
 msgstr ""
-"No se puede analizar el archivo distro: %(filename)s. Aseg?rese de que es un "
-"archivo JSON."
+"No se ha podido analizar el archivo distro: %(filename)s. Aseg?rese de que se trate de un archivo JSON. "
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
 msgstr ""
-"No se puede iniciar la sesi?n en %(portal)s del destino de host iSCSI. "
-"Detalles: %(err)s"
+"No se puede iniciar sesi?n en el %(portal)s de destino de host iSCSI. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
 msgstr ""
-"No se puede iniciar la sesi?n en el destino %(target)s del %(host)s host de "
-"iSCSI"
+"No se puede iniciar sesi?n en el host iSCSI %(host)s de destino %(target)s"
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
 msgstr ""
+"No se puede encontrar el archivo ISO %(filename)s"
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "El archivo ISO %(filename)s no es arrancable"
+msgstr ""
+"El archivo ISO %(filename)s no se puede arrancar"
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
 msgstr ""
-"El archivo ISO %(filename)s no tiene un registro de arranque de El Torito "
-"v?lido"
+"El archivo ISO %(filename)s no tiene un registro de arranque El Torito v?lido"
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr "Entrada de validaci?n de El Torito no v?lida en ISO %(filename)s"
+msgstr ""
+"La entrada de validaci?n de El Torito no es v?lida en ISO %(filename)s"
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "Indicador de arranque de El Torito no v?lido en ISO %(filename)s"
+msgstr ""
+"El indicador de arranque de El Torito no es v?lido en ISO %(filename)s"
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
@@ -150,8 +168,7 @@ msgstr ""
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Formato incorrecto mientras se le?a el descriptor de volumen en ISO "
-"%(filename)s"
+"Formato err?neo al leer el descriptor de vol?menes en ISO %(filename)s"
 
 #, python-format
 msgid ""
@@ -163,87 +180,104 @@ msgid ""
 msgstr ""
 "El hipervisor no tiene permiso para utilizar este ISO %(filename)s. "
 "Considere moverlo a /var/lib/libvirt, o establezca el permiso de b?squeda en "
-"listas de control de accesos de archivo para el usuario '%(user)s' si es "
-"posible, o a?ada el '%(user)s' al grupo de v?as de acceso ISO, o (no "
-"recomendado) 'chmod -R o+x 'path_to_iso'.Detalles: %(err)s"
+"las listas de control de acceso de archivos para el usuario '%(user)s', si es posible, o a?ada el "
+"'%(user)s' al grupo de v?as de acceso ISO o (no recomendado) 'chmod -R o+x "
+"'path_to_iso'. Detalles: %(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
+"Se ha producido un error al analizar la informaci?n de sistema operativo de las im?genes. "
 
 msgid "No OS information found in given image."
 msgstr ""
+"No se ha encontrado informaci?n de sistema operativo en una imagen especificada. "
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
 msgstr ""
+"No se puede leer el archivo de im?genes %(filename)s"
 
 #, python-format
 msgid ""
 "Image file must be an existing file on system. %(filename)s is not a valid "
 "input."
 msgstr ""
+"El archivo de im?genes debe ser un archivo existente en el sistema. %(filename)s no es una entrada"
+"v?lida. "
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "La m?quina virtual %(name)s ya existe"
+msgstr ""
+"Ya existe la m?quina virtual %(name)s"
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "La m?quina virtual %(name)s no existe"
+msgstr ""
+"No existe la m?quina virtual %(name)s"
 
 #, python-format
 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 ""
+"No se puede renombrar la m?quina virtual %(name)s. El nombre %(new_name)s ya "
+"se est? utilizando o la m?quina virtual no se ha apagado. "
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
 msgstr ""
-"No se puede recuperar la captura de pantalla para la m?quina virtual "
-"detenida %(name)s"
+"No se puede recuperar la captura de pantalla para la m?quina virtual detenida %(name)s"
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "La imagen ISO remota no est? soportada por este servidor."
+msgstr ""
+"La imagen ISO remota no est? soportada por este servidor."
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
 msgstr ""
+"No se acepta la captura de pantalla en la m?quina virtual %(name)s"
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede crear la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede crear la m?quina virtual %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede crear la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede actualizar la m?quina virtual %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede recuperar la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede recuperar la m?quina virtual %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
 msgstr ""
+"No se puede conectar a la m?quina virtual %(name)s apagada. "
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"El nombre de la m?quina virtual debe ser una serie sin barras inclinadas (/)"
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
 msgstr ""
+"Se ha especificado un URI de plantilla %(value)s no v?lido para la m?quina virtual"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
 msgstr ""
+"Se ha especificado un URI de agrupaci?n de almacenamiento %(value)s no v?lido para la m?quina virtual"
 
 msgid "Supported virtual machine graphics are Spice or VNC"
 msgstr ""
+"Los gr?ficos de la m?quina virtual soportados son Spice o VNC"
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
 msgstr ""
-"La direcci?n de gr?ficos en que hay que estar a la escucha debe ser IPv4 o "
-"IPv6"
+"La direcci?n de gr?ficos en que hay que estar a la escucha debe ser IPv4 o IPv6"
 
 msgid "Specify a template to create a virtual machine from"
 msgstr ""
@@ -251,124 +285,158 @@ msgstr ""
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede iniciar la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede iniciar la m?quina virtual %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede detener la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede apagar la m?quina virtual %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede suprimir la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede suprimir la m?quina virtual %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede redenominar la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede restablecer la m?quina virtual %(name)s. Detalles: %(err)s"
 
 msgid "User name list must be an array"
 msgstr ""
+"La lista de nombres de usuarios debe ser una matriz"
 
 msgid "User name must be a string"
-msgstr "El nombre de red debe ser una serie"
+msgstr ""
+"El nombre de usuario debe ser una serie"
 
 msgid "Group name list must be an array"
 msgstr ""
+"La lista de nombres de grupos debe ser una matriz"
 
 msgid "Group name must be a string"
-msgstr "El nombre de red debe ser una serie"
+msgstr ""
+"El nombre de grupo debe ser una serie"
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "El usuario '%(users)s' no existe."
+msgstr ""
+"No existe el usuario (o usuarios) '%(users)s'"
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "El usuario '%(groups)s' no existe."
+msgstr ""
+"No existe el grupo (o grupos) '%(groups)s'"
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede detener la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede apagar la m?quina virtual %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "No se puede iniciar la m?quina virtual %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede obtener acceso a los metadatos de la m?quina virtual %(name)s. Detalles: %(err)s"
 
 msgid "The guest console password must be a string."
 msgstr ""
+"La contrase?a de la consola del invitado debe ser una serie. "
 
 msgid "The life time for the guest console password must be a number."
 msgstr ""
+"El tiempo de vida para la contrase?a de la consola del invitado debe ser un n?mero. "
 
 #, python-format
 msgid "Virtual machine '%(name)s' must be stopped before cloning it."
 msgstr ""
+"La m?quina virtual '%(name)s' se debe detener antes de clonarla."
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
 msgstr ""
+"No hay espacio de disco suficiente para clonar la m?quina virtual '%(name)s'"
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"No se puede clonar la m?quina virtual '%(name)s'. Detalles: %(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"Operaci?n no v?lida para la m?quina virtual no persistente %(name)s"
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"No se puede suspender la m?quina virtual '%(name)s' porque no se est? ejecutando."
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"No se puede suspender la m?quina virtual '%(name)s'. Detalles: %(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"No se puede reanudar la m?quina virtual '%(name)s' porque no se ha puesto en pausa. "
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"No se puede reanudar la m?quina virtual '%(name)s'. Detalles: %(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"La memoria asignada es superior al m?ximo asignado en el host."
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"La m?quina virtual '%(name)s' no admite la actualizaci?n de memoria activa. Actualice la memoria con "
+"la m?quina fuera de l?nea para habilitar esta caracter?stica. "
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"Solamente se permite aumentar la memoria en las m?quinas virtuales activas"
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"Para la actualizaci?n de memoria en directo, el valor de memoria nuevo debe ser igual al valor anterior de la memoria m?s "
+"m?ltiplos de 1024 Mib"
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"No hay suficientes ranuras libres de 1024 Mib en el invitado. "
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"La versi?n libvirt del host no admite dispositivos de memoria. Libvirt debe ser >= "
+"1.2.14"
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"Error al conectar el dispositivo de memoria. Detalles: %(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
+"La m?quina virtual %(vmid)s no contiene el dispositivo de host asignado directamente %(dev_name)s."
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
 msgstr ""
+"El dispositivo de host %(dev_name)s no se permite para asignarlo directamente a la m?quina virtual. "
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -377,19 +445,28 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
+"No se han encontrado grupos IOMMU. El paso a trav?s de PCI de host necesita el grupo IOMMU para funcionar "
+"correctamente. Habilite Intel VT-d o AMD IOMMU en el BIOS y, a continuaci?n, verifique "
+"que el Kernel se ha compilado con soporte IOMMU. Para Intel CPU, a?ada intel_iommu=on "
+"al par?metro de Kernel en /boot/grub2/grub.conf. Para AMD CPU, a?ada iommu=pt "
+"iommu=1."
 
 msgid "\"name\" should be a device name string"
 msgstr ""
+"\"name\" debe ser una serie de nombre de dispositivo"
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"El dispositivo %(name)s lo est? utilizando probablemente el host. No se puede conectar al "
+"invitado. "
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr "La interfaz %(iface)s no existe en la m?quina virtual %(name)s"
+msgstr ""
+"La interfaz %(iface)s no existe en la m?quina virtual %(name)s"
 
 #, python-format
 msgid ""
@@ -398,7 +475,8 @@ msgstr ""
 "La red %(network)s especificada para la m?quina virtual %(name)s no existe"
 
 msgid "Supported virtual machine interfaces type is only network"
-msgstr "El tipo de interfaces de m?quina virtual soportado es de red solamente"
+msgstr ""
+"El tipo de interfaces de m?quina virtual soportado es de red solamente"
 
 msgid "Network name for virtual machine interface must be a string"
 msgstr ""
@@ -406,30 +484,33 @@ msgstr ""
 
 msgid "Invalid network model card specified for virtual machine interface"
 msgstr ""
-"Especificada tarjeta de modelo de red no v?lida para la interfaz de m?quina "
-"virtual"
+"Especificada tarjeta de modelo de red no v?lida para la interfaz de m?quina virtual"
 
 msgid "Specify type and network to add a new virtual machine interface"
 msgstr ""
-"Especifique el tipo y la red para a?adir una interfaz de m?quina virtual "
-"nueva"
+"Especifique el tipo y la red para a?adir una interfaz de m?quina virtual nueva"
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"La direcci?n MAC debe respetar este formato FF:FF:FF:FF:FF:FF"
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"La direcci?n MAC %(mac)s ya existe en la m?quina virtual %(name)s"
 
 msgid "Invalid MAC Address"
 msgstr ""
+"Direcci?n MAC no v?lida"
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"No se puede cambiar la direcci?n MAC de una m?quina virtual en ejecuci?n"
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "La plantilla %(name)s ya existe"
+msgstr ""
+"La plantilla %(name)s ya existe"
 
 #, python-format
 msgid ""
@@ -441,118 +522,141 @@ msgstr ""
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
 msgstr ""
-"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla "
-"%(template)s no existe"
+"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla %(template)s no existe"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
 msgstr ""
-"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla "
-"%(template)s no est? activa"
+"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla %(template)s no est? activa"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "Par?metro no v?lido '%(param)s' especificado para CDROM."
+msgstr ""
+"Par?metro no v?lido '%(param)s' especificado para CDROM."
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
 msgstr ""
-"La red %(network)s especificada para la plantilla %(template)s no est? activa"
+"La red %(network)s que se ha especificado para la plantilla %(template)s no est? activa"
 
 msgid "Template name must be a string"
-msgstr "El nombre de plantilla debe ser una serie"
+msgstr ""
+"El nombre de plantilla debe ser una serie"
 
 msgid "Template icon must be a path to the image"
-msgstr "El icono de plantilla debe ser una v?a de acceso a la imagen"
+msgstr ""
+"El icono de plantilla debe ser una v?a de acceso a la imagen"
 
 msgid "Template distribution must be a string"
-msgstr "La distribuci?n de plantilla debe ser una serie"
+msgstr ""
+"La distribuci?n de plantilla debe ser una serie"
 
 msgid "Template distribution version must be a string"
-msgstr "La versi?n de distribuci?n de plantilla debe ser una serie"
+msgstr ""
+"La versi?n de distribuci?n de plantilla debe ser una serie"
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "El n?mero de CPUs debe ser un entero"
+msgstr ""
+"El n?mero de CPU debe ser un entero mayor que 0"
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr "La cantidad de memoria (MB) debe ser un entero mayor que 512"
+msgstr ""
+"La cantidad de memoria (MB) debe ser un entero mayor que 512"
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto"
+msgstr ""
+"El CDROM de plantilla debe ser un archivo ISO local o remoto"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
 msgstr ""
-"URI de agrupaci?n de almacenamiento no v?lido %(value)s especificado para la "
-"plantilla"
+"Se ha especificado un URI de agrupaci?n de almacenamiento %(value)s no v?lido para la plantilla"
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr "Especifique una imagen de ISO como CDROM para crear una plantilla"
+msgstr ""
+"Especifique una imagen ISO como CDROM o una imagen base para crear una plantilla"
 
 msgid "All networks for the template must be specified in a list."
-msgstr "Todas las redes para la plantilla deben especificarse en una lista."
+msgstr ""
+"Todas las redes para la plantilla deben especificarse en una lista."
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
 msgstr ""
+"Especifique un volumen para una plantilla cuando la agrupaci?n de almacenamiento sea iSCSI o SCSI"
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
 msgstr ""
+"El volumen %(volume)s no se halla en la agrupaci?n de almacenamiento %(pool)s"
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
-msgstr "No se puede crear la plantilla debido a un error: %(err)s"
+msgstr ""
+"No se ha podido crear la plantilla debido al error: %(err)s"
 
 #, python-format
 msgid "Unable to delete template due error: %(err)s"
-msgstr "No se puede suprimir la plantilla debido a un error: %(err)s"
+msgstr ""
+"No se ha podido suprimir la plantilla debido a un error: %(err)s"
 
 msgid "Disk size must be an integer greater than 1GB."
 msgstr ""
+"El tama?o del disco debe ser un entero mayor que 1 GB."
 
 msgid "Template base image must be a valid local image file"
-msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto"
+msgstr ""
+"La imagen base de la plantilla debe ser un archivo de imagen base local v?lido"
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
 msgstr ""
+"No se puede identificar el formato de la imagen base %(path)s"
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
 msgstr ""
+"Cuando se especifique la topolog?a de CPU, las VCPU deben ser un producto de sockets, n?cleos y "
+"hebras. "
 
 msgid ""
 "When specifying CPU topology, each element must be an integer greater than "
 "zero."
 msgstr ""
+"Cuando se especifica la topolog?a de CPU, cada elemento debe ser un entero mayor que "
+"cero."
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"formato de imagen de disco no v?lido. Formatos v?lidos: bochs, cloop, cow, dmg, qcow, "
+"qcow2, qed, raw, vmdk, vpc."
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "La agrupaci?n de almacenamiento %(name)s ya existe"
+msgstr ""
+"Ya existe la agrupaci?n de almacenamiento %(name)s"
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "La agrupaci?n de almacenamiento %(name)s no existe"
+msgstr ""
+"No existe la agrupaci?n de almacenamiento %(name)s"
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
 msgstr ""
-"Especifique %(item)s para poder crear la agrupaci?n de almacenamiento "
-"%(name)s"
+"Especifique %(item)s para crear la agrupaci?n de almacenamiento %(name)s"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "No se puede suprimir la agrupaci?n de almacenamiento activa %(name)s"
+msgstr ""
+"No se puede suprimir la agrupaci?n de almacenamiento activo %(name)s"
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "No se pueden listar agrupaciones de almacenamiento. Detalles: %(err)s"
+msgstr ""
+"No se pueden listar las agrupaciones de almacenamiento. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
@@ -564,58 +668,59 @@ msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
 msgstr ""
-"No se puede obtener el n?mero de vol?menes de almacenamiento en la "
-"agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
+"No se puede obtener el n?mero de vol?menes de almacenamiento en la agrupaci?n de almacenamiento %(name)s. Detalles: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede activar la agrupaci?n de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede activar la agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede desactivar la agrupaci?n de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede desactivar la agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede suprimir la agrupaci?n de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede suprimir la agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
 msgstr ""
-"No se puede crear la agrupaci?n de NFS ya que la v?a de acceso de "
-"exportaci?n %(path)s podr?a bloquearse durante el montaje"
+"No se puede crear la agrupaci?n de NFS ya que la v?a de acceso de exportaci?n %(path)s podr?a bloquearse durante el montaje"
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"No se puede crear la agrupaci?n de NFS ya que el montaje de la v?a de acceso "
-"de exportaci?n %(path)s ha fallado"
+"No se puede crear la agrupaci?n de NFS ya que ha fallado el montaje de la v?a de acceso de exportaci?n %(path)s"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "Tipo de agrupaci?n de almacenamiento no soportado: %(type)s"
+msgstr ""
+"Tipo de agrupaci?n de almacenamiento no admitido: %(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
 msgstr ""
+"Error al recuperar el XML de la agrupaci?n de almacenamiento en %(pool)s"
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"El nombre de la agrupaci?n de almacenamiento debe ser una serie sin barras inclinadas (/)"
 
 msgid ""
 "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
 "iso"
 msgstr ""
+"Los tipos de agrupaci?n de almacenamiento admitidos son dir, netfs, logical, iscsi, isci y kimchi-"
+"iso"
 
 msgid "Storage pool path must be a string"
-msgstr "La v?a de acceso de la agrupaci?n de almacenamiento debe ser una serie"
+msgstr ""
+"La v?a de acceso de la agrupaci?n de almacenamiento debe ser una serie"
 
 msgid "Storage pool host must be a IP or hostname"
 msgstr ""
@@ -623,25 +728,27 @@ msgstr ""
 
 msgid "Storage pool device must be the absolute path to the block device"
 msgstr ""
+"El dispositivo de la agrupaci?n de almacenamiento debe ser la v?a de acceso absoluta al dispositivo de bloque"
 
 msgid "Storage pool devices parameter must be a list"
 msgstr ""
-"El par?metro de los dispositivos de agrupaci?n de almacenamiento debe ser "
-"una lista"
+"El par?metro de los dispositivos de agrupaci?n de almacenamiento debe ser una lista"
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "El IQN destino de una agrupaci?n de iSCSI debe ser una serie"
+msgstr ""
+"El IQN destino de una agrupaci?n de iSCSI debe ser una serie"
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
 msgstr ""
-"El puerto de un servidor de almacenamiento remoto debe ser un entero entre 1 "
-"y 65535"
+"El puerto de un servidor de almacenamiento remoto debe ser un entero entre 1 y 65535"
 
 msgid "iSCSI target username must be a string"
 msgstr ""
+"El nombre de usuario de destino de iSCSI debe ser una serie"
 
 msgid "iSCSI target password must be a string"
 msgstr ""
+"La contrase?a de destino de iSCSI debe ser una serie"
 
 msgid "Specify name and type to create a storage pool"
 msgstr ""
@@ -652,20 +759,21 @@ msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
 msgstr ""
-"%(disk)s no es un disco/partici?n. No se ha podido a?adir a la agrupaci?n "
+"%(disk)s no es un disco/partici?n v?lido. No se ha podido a?adir a la agrupaci?n "
 "%(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
 msgstr ""
+"No se puede ampliar la agrupaci?n l?gica %(pool)s. Detalles: %(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
 msgstr ""
-"Los discos de par?metro s?lo pueden actualizarse para la agrupaci?n de "
-"almacenamiento l?gico."
+"Los discos de par?metro s?lo pueden actualizarse para la agrupaci?n de almacenamiento l?gico."
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "El nombre del adaptador de host SCSI debe ser una serie."
+msgstr ""
+"El nombre del adaptador de host SCSI debe ser una serie."
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
 msgstr ""
@@ -676,92 +784,88 @@ msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"No se puede activar la agrupaci?n de almacenamiento NFS %(name)s. El "
-"servidor NFS %(server)s est? fuera de alcance."
+"No se puede activar la agrupaci?n de almacenamiento NFS %(name)s. El servidor NFS %(server)s "
+"est? fuera de alcance."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"No se puede desactivar la agrupaci?n de almacenamiento NFS %(name)s. El "
-"servidor NFS %(server)s est? fuera de alcance."
+"No se puede desactivar la agrupaci?n de almacenamiento NFS %(name)s. El servidor NFS %(server)s "
+"est? fuera de alcance."
 
 #, python-format
 msgid ""
 "Unable to deactivate pool %(name)s as it is associated with some templates"
 msgstr ""
-"No se puede desactivar la agrupaci?n %(name)s ya que est? asociada con "
-"algunas plantillas"
+"No se puede desactivar la agrupaci?n %(name)s ya que est? asociada con algunas plantillas"
 
 #, python-format
 msgid "Unable to delete pool %(name)s as it is associated with some templates"
 msgstr ""
-"No se puede suprimir la agrupaci?n %(name)s ya que est? asociada con algunas "
-"plantillas"
+"No se puede suprimir la agrupaci?n %(name)s ya que est? asociada con algunas plantillas"
 
 #, python-format
 msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
 msgstr ""
-"Un grupo de vol?menes denominado '%(name)s' ya existe. Elija otro nombre "
+"Ya existe un grupo de vol?menes denominado '%(name)s'. Elija otro nombre "
 "para crear la agrupaci?n l?gica."
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
 msgstr ""
-"No se puede actualizar la base de datos con la informaci?n de exploraci?n "
-"profunda debido a un error: %(err)s"
+"No se puede actualizar la base de datos con la informaci?n de exploraci?n profunda debido a un error: %(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "El volumen de almacenamiento %(name)s ya existe"
+msgstr ""
+"Ya existe el volumen de almacenamiento %(name)s"
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
 msgstr ""
-"El volumen de almacenamiento %(name)s no existe en la agrupaci?n de "
-"almacenamiento %(pool)s"
+"No existe el volumen de almacenamiento %(name)s en la agrupaci?n de almacenamiento %(pool)s"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
 msgstr ""
+"No se puede crear el volumen de almacenamiento %(volume)s porque la agrupaci?n de almacenamiento %(pool)s "
+"no est? activa"
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
 msgstr ""
-"Especifique %(item)s para poder crear el volumen de almacenamiento %(volume)s"
+"Especifique %(item)s para crear el volumen de almacenamiento %(volume)s"
 
 #, 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 "
-"almacenamiento %(pool)s no est? activa"
+"No se pueden listar los vol?menes de almacenamiento porque la agrupaci?n de almacenamiento %(pool)s no est? activa"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
 msgstr ""
-"No se puede crear el volumen de almacenamiento %(name)s en la agrupaci?n de "
-"almacenamiento %(pool)s. Detalles: %(err)s"
+"No se puede crear el volumen de almacenamiento %(name)s en la agrupaci?n de almacenamiento %(pool)s. Detalles: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"No se pueden listar vol?menes de almacenamiento en la agrupaci?n de "
-"almacenamiento %(pool)s. Detalles: %(err)s"
+"No se pueden listar los vol?menes de almacenamiento en la agrupaci?n de almacenamiento %(pool)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
 msgstr ""
-"No se pueden borrar los vol?menes de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se pueden limpiar los vol?menes de almacenamiento %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
@@ -771,91 +875,110 @@ msgstr ""
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
 msgstr ""
-"No se puede redimensionar el volumen de almacenamiento %(name)s. Detalles: "
-"%(err)s"
+"No se puede redimensionar el volumen de almacenamiento %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
 msgstr ""
-"El tipo de almacenamiento %(type)s no da soporte a crear y suprimir vol?menes"
+"El tipo de almacenamiento %(type)s no admite la creaci?n y supresi?n del volumen"
 
 msgid "Storage volume name must be a string"
-msgstr "El nombre de volumen de almacenamiento debe ser una serie"
+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"
+msgstr ""
+"La asignaci?n de volumen de almacenamiento debe ser un n?mero entero"
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"Formato de volumen de almacenamiento no admitido. Formatos v?lidos: bochs, cloop, cow, dmg, "
+"qcow, qcow2, qed, raw, vmdk, vpc."
 
 msgid "Storage volume requires a volume name"
-msgstr "El volumen de almacenamiento requiere un nombre de volumen"
+msgstr ""
+"El volumen de almacenamiento requiere un nombre de volumen"
 
 #, python-format
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
 msgstr ""
-"No se puede actualizar la base de datos con la informaci?n de volumen de "
-"almacenamiento debido a un error: %(err)s"
+"No se puede actualizar la base de datos con la informaci?n del volumen de almacenamiento debido a un error: %(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
 msgstr ""
+"S?lo se puede especificar uno de los par?metros %(param)s"
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
 msgstr ""
+"No se admite la creaci?n del volumen de %(param)s"
 
 msgid "Storage volume capacity must be an integer number."
 msgstr ""
+"La capacidad del volumen de almacenamiento debe ser un n?mero entero. "
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
 msgstr ""
+"El URL del volumen de almacenamiento debe ser http://, https://, ftp:// o ftps://."
 
 #, python-format
 msgid "Unable to access file %(url)s. Please, check it."
 msgstr ""
+"No se puede acceder al archivo %(url)s. Por favor, compru?belo. "
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
 msgstr ""
+"No se puede clonar el volumen de almacenamiento '%(name)s' en la agrupaci?n '%(pool)s'. Detalles: "
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"Especifique datos de fragmento y su tama?o para cargar un archivo. "
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"Para cargar un volumen de almacenamiento, especifique el par?metro 'upload'. "
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"No se pueden cargar datos de fragmento porque no coinciden con el tama?o de fragmento solicitado. "
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"El volumen de almacenamiento %(vol)s no est? bajo un proceso de carga. "
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"Los datos de fragmento de carga superar?n el tama?o del volumen de almacenamiento. "
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"No se pueden cargar datos de fragmento al volumen de almacenamiento. Detalles: %(err)s."
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "La interfaz %(name)s no existe"
+msgstr ""
+"No existe la interfaz %(name)s"
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "La red %(name)s ya existe"
+msgstr ""
+"Ya existe la red %(name)s"
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "La red %(name)s no existe"
+msgstr ""
+"No existe la red %(name)s"
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
@@ -864,51 +987,61 @@ msgstr ""
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
-msgstr "Especifique una interfaz de red para crear una red puenteada %(name)s"
+msgstr ""
+"Especifique una interfaz de red para crear una red puenteada %(name)s"
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "No se puede suprimir la red activa %(name)s"
+msgstr ""
+"No se puede suprimir la red activa %(name)s"
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
 msgstr ""
-"La interfaz %(iface)s especificada para la red %(network)s ya est? en uso"
+"La interfaz %(iface)s especificada para la red %(network)s ya se est? utilizando"
 
 msgid "Interface should be bare NIC, bonding or bridge device."
-msgstr "La interfaz debe ser dispositivo de puente, enlazado o NIC simple."
+msgstr ""
+"La interfaz debe ser dispositivo de puente, enlazado o NIC simple."
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "No se puede crear la red %(name)s. Detalles: %(err)s"
+msgstr ""
+"No se puede crear la red %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "No se puede encontrar una direcci?n IP libre para la red '%(name)s'"
+msgstr ""
+"No se puede encontrar una direcci?n IP libre para la red '%(name)s'"
 
 #, python-format
 msgid "The interface %(iface)s already exists."
-msgstr "La interfaz %(iface)s ya existe"
+msgstr ""
+"La interfaz %(iface)s ya existe."
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"El nombre de red debe ser una serie sin barras inclinadas (/) ni comillas (\")"
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "Los tipos de red soportados son aislada, NAT y puente"
+msgstr ""
+"Los tipos de red soportados son aislada, NAT y puente"
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
 msgstr ""
-"La subred de red debe ser una serie con direcci?n IP y prefijo o m?scara de "
-"red"
+"La subred de red debe ser una serie con direcci?n IP y prefijo o m?scara de red"
 
 msgid "Network interface must be a string"
-msgstr "La interfaz de red debe ser una serie"
+msgstr ""
+"La interfaz de red debe ser una serie"
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "El ID de VLAN de red debe ser un entero entre 1 y 4094"
+msgstr ""
+"El ID de VLAN de red debe ser un entero entre 1 y 4094"
 
 msgid "Specify name and type to create a Network"
-msgstr "Especifique el nombre y el tipo para crear una red"
+msgstr ""
+"Especifique el nombre y el tipo para crear una red"
 
 #, python-format
 msgid ""
@@ -929,31 +1062,34 @@ msgstr ""
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
 msgstr ""
-"El dispositivo de puente %(name)s no puede ser el dispositivo de conexi?n "
-"troncal de una VLAN."
+"El dispositivo en puente %(name)s no puede ser el dispositivo de conexi?n troncal de una VLAN."
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "No se puede activar la interfaz %(iface)s: %(err)s."
+msgstr ""
+"No se ha podido activar la interfaz %(iface)s: %(err)s."
 
 #, python-format
 msgid ""
 "Failed to activate interface %(iface)s. Please check the physical link "
 "status."
 msgstr ""
-"No se puede activar la interfaz %(iface)s. Compruebe el estado del enlace "
-"f?sico."
+"No se ha podido activar la interfaz %(iface)s. Compruebe el estado del enlace "
+"f?sico. "
 
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
 msgstr ""
+"No se ha podido iniciar la red %(name)s. Detalles: %(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "El informe de depuraci?n %(name)s no existe"
+msgstr ""
+"El informe de depuraci?n %(name)s no existe"
 
 msgid "Debug report tool not found in system"
-msgstr "Herramienta de informes de depuraci?n no encontrada en el sistema"
+msgstr ""
+"Herramienta de informes de depuraci?n no encontrada en el sistema"
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
@@ -963,6 +1099,7 @@ msgstr ""
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
 msgstr ""
+"No se puede encontrar ning?n informe de depuraci?n con el nombre indicado %(name)s"
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
@@ -971,133 +1108,148 @@ msgstr ""
 
 msgid "You should give a name for the debug report file."
 msgstr ""
+"Deber?a dar un nombre al archivo de informe de depuraci?n."
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
+"El nombre del informe de depuraci?n debe ser una serie. Solamente se permiten letras, d?gitos, car?cter de subrayado ('_') "
+"y gui?n ('-'). "
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
 msgstr ""
-"Un grupo de vol?menes denominado '%(name)s' ya existe. Elija otro nombre "
-"para crear la agrupaci?n l?gica."
+"El informe de depuraci?n con el nombre especificado \"%(name)s\" ya existe. Utilice "
+"otro."
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "Kimchi no utilizaba el servidor de almacenamiento %(server)s"
+msgstr ""
+"El servidor de almacenamiento %(server)s no lo ha utilizado Kimchi"
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "Distro '%(name)s' no existe"
+msgstr ""
+"No existe Distro '%(name)s'"
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "La partici?n %(name)s no existe en el host"
+msgstr ""
+"La partici?n %(name)s no existe en el host"
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
 msgstr ""
-"No se puede concluir la m?quina host ya que hay m?quinas virtuales en "
-"ejecuci?n"
+"No se puede concluir la m?quina host ya que hay m?quinas virtuales en ejecuci?n"
 
 msgid "Unable to reboot host machine as there are running virtual machines"
 msgstr ""
-"No se puede rearrancar la m?quina host ya que hay m?quinas virtuales en "
-"ejecuci?n"
+"No se puede rearrancar la m?quina host ya que hay m?quinas virtuales en ejecuci?n"
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "No se ha encontrado el dispositivo de nodo '%(name)s'"
+msgstr ""
+"No se encuentra el dispositivo de nodos '%(name)s'"
 
 msgid "Conflicting flag filters specified."
 msgstr ""
+"Se han especificado filtros de distintivos en conflicto."
 
 msgid "No packages marked for update"
-msgstr "No hay paquetes marcados para su actualizaci?n"
+msgstr ""
+"No hay paquetes marcados para su actualizaci?n"
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "El paquete %(name)s no est? marcado para su actualizaci?n."
+msgstr ""
+"El paquete %(name)s no se ha marcado para actualizarlo."
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
 msgstr ""
-"Se ha producido un error al obtener paquetes marcados para su actualizaci?n. "
-"Detalles: %(err)s"
+"Error al obtener paquetes marcados para su actualizaci?n. Detalles: %(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "No hay ning?n gestor de paquetes compatible para este sistema."
+msgstr ""
+"No hay ning?n gestor de paquetes compatible para este sistema."
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "No se puede encontrar %(item)s en el almac?n de datos"
+msgstr ""
+"No se puede encontrar %(item)s en el almac?n de datos"
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "URI %(uri)s no v?lido"
+msgstr ""
+"URI %(uri)s no v?lido"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
 msgstr ""
-"Tiempo de espera excedido al ejecutar el mandato '%(cmd)s' despu?s de "
-"%(seconds)s segundos"
+"Tiempo de espera excedido al ejecutar el mandato '%(cmd)s' despu?s de %(seconds)s segundos"
 
 msgid "Unable to choose a virtual machine name"
 msgstr ""
+"No se puede elegir un nombre de m?quina virtual"
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"Valor de datos '%(value)s' no v?lido"
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"Unidad de datos '%(unit)s' no v?lida"
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "Tipo de almacenamiento no v?lido. Tipos soportados: 'cdrom'"
+msgstr ""
+"Tipo de almacenamiento no v?lido. Tipos soportados: 'cdrom', 'disk'"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
 msgstr ""
+"La v?a de acceso '%(value)s' no es una v?a de acceso local/remota v?lida para el dispositivo"
 
 msgid "Only CDROM path can be update."
 msgstr ""
+"Solamente se puede actualizar la v?a de acceso de CDROM. "
 
 #, python-format
 msgid ""
 "The storage device %(dev_name)s does not exist in the virtual machine "
 "%(vm_name)s"
 msgstr ""
+"El dispositivo de almacenamiento %(dev_name)s no existe en la m?quina virtual. "
+"%(vm_name)s"
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
 msgstr ""
-"Se ha producido un error al crear el nuevo dispositivo de almacenamiento: "
-"%(error)s"
+"Error al crear el dispositivo de almacenamiento nuevo: %(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
 msgstr ""
-"Se ha producido un error al actualizar el dispositivo de almacenamiento: "
-"%(error)s"
+"Error al actualizar el dispositivo de almacenamiento: %(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
 msgstr ""
-"Se ha producido un error al eliminar el dispositivo de almacenamiento: "
-"%(error)s"
+"Error al eliminar el dispositivo de almacenamiento: %(error)s"
 
 msgid "Do not support IDE device hot plug"
 msgstr ""
+"No se admite la conexi?n en caliente del IDE"
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
 msgstr ""
-"Especifique el tipo y la v?a de acceso para a?adir un disco de m?quina "
-"virtual nuevo"
+"Especifique el tipo y la v?a de acceso y la agrupaci?n/volumen para a?adir "
+"un nuevo disco de m?quina virtual"
 
 msgid "Specify path to update virtual machine disk"
 msgstr ""
@@ -1106,73 +1258,91 @@ msgstr ""
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
 msgstr ""
+"Se ha alcanzado el l?mite de tipo de controlador %(type)s de %(limit)s dispositivos"
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
 msgstr ""
+"No se puede recuperar la informaci?n de v?a de acceso de disco para la agrupaci?n o el volumen que se ha especificado: %(error)s"
 
 msgid "Volume already in use by other virtual machine."
 msgstr ""
+"El volumen ya lo est? utilizando otra m?quina virtual. "
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
 msgstr ""
-"Especifique el tipo y la v?a de acceso para a?adir un disco de m?quina "
-"virtual nuevo"
+"Solo se puede especificar uno de v?a de acceso o agrupaci?n/volumen "
+"para a?adir un nuevo disco de m?quina virtual"
 
 #, python-format
 msgid ""
 "Volume chosen with format %(format)s does not fit in the storage type "
 "%(type)s"
 msgstr ""
+"El volumen elegido con el formato %(format)s no se ajusta al tipo de almacenamiento"
+"%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
-msgstr "El ID de repositorio YUM debe ser una serie de una sola palabra."
+msgstr ""
+"El ID de repositorio YUM debe ser una serie de una sola palabra."
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "El URL de repositorio debe ser http://, ftp:// o archivo:// URL."
+msgstr ""
+"El URL de repositorio debe ser http://, ftp:// o archivo:// URL."
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
 "repository type."
 msgstr ""
-"La configuraci?n de repositorio es un diccionario con valores espec?ficos "
-"seg?n el tipo de repositorio."
+"La configuraci?n de repositorio es un diccionario con valores espec?ficos seg?n "
+"el tipo de repositorio."
 
 msgid "Distribution to DEB repository must be a string"
-msgstr "El repositorio de Distribuci?n a DEB debe ser una serie"
+msgstr ""
+"El repositorio de Distribuci?n a DEB debe ser una serie"
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "El repositorio de Componentes a DEB debe estar listado en una matriz"
+msgstr ""
+"El repositorio de Componentes a DEB debe estar listado en una matriz"
 
 msgid "Components to DEB repository must be a string"
-msgstr "El repositorio de Componentes a DEB debe ser una serie"
+msgstr ""
+"El repositorio de Componentes a DEB debe ser una serie"
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"La lista de duplicados en el repositorios debe ser una serie"
 
 msgid "YUM Repository name must be string."
-msgstr "El nombre del repositorio YUM debe ser una serie."
+msgstr ""
+"El nombre del repositorio YUM debe ser una serie."
 
 msgid "GPG check must be a boolean value."
-msgstr "La comprobaci?n de GPG debe ser un valor booleano."
+msgstr ""
+"La comprobaci?n de GPG debe ser un valor booleano."
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr "La clave GPG debe ser un URL que apunta al archivo blindado por ASCII."
+msgstr ""
+"La clave GPG debe ser un URL que apunta al archivo blindado por ASCII."
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "No se ha podido actualizar el repositorio %(repo_id)s."
+msgstr ""
+"No se puede actualizar el repositorio %(repo_id)s."
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "El repositorio %(repo_id)s no existe."
+msgstr ""
+"El repositorio %(repo_id)s no existe. "
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"Especifique el URL base de repositorio, la lista de duplicados o el metaenlace para crear o "
+"actualizar un repositorio YUM. "
 
 msgid "Repository management tool was not recognized for your system."
 msgstr ""
@@ -1180,21 +1350,23 @@ msgstr ""
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "El repositorio %(repo_id)s ya est? habilitado."
+msgstr ""
+"El repositorio %(repo_id)s ya est? habilitado."
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "El repositorio %(repo_id)s ya est? inhabilitado."
+msgstr ""
+"El repositorio %(repo_id)s ya est? inhabilitado. "
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "No se ha podido eliminar el repositorio %(repo_id)s."
+msgstr ""
+"No se ha podido eliminar el repositorio %(repo_id)s."
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
 msgstr ""
-"No se ha podido grabar el archivo de configuraci?n del repositorio "
-"%(repo_file)s"
+"No se ha podido escribir en el archivo de configuraci?n del repositorio %(repo_file)s"
 
 msgid "Specify repository distribution in order to create a DEB repository."
 msgstr ""
@@ -1202,668 +1374,856 @@ msgstr ""
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "No se ha podido habilitar el repositorio %(repo_id)s."
+msgstr ""
+"No se ha podido habilitar el repositorio %(repo_id)s."
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "No se ha podido inhabilitar el repositorio %(repo_id)s."
+msgstr ""
+"No se ha podido inhabilitar el repositorio %(repo_id)s."
 
 msgid "YUM Repository ID already exists"
-msgstr "El ID de repositorio de YUM ya existe"
+msgstr ""
+"El ID de repositorio de YUM ya existe"
 
 msgid "YUM Repository name must be a string"
-msgstr "El nombre del repositorio de YUM debe ser una serie"
+msgstr ""
+"El nombre del repositorio de YUM debe ser una serie"
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "No se pueden listar repositorios. Detalles: '%(err)s'"
+msgstr ""
+"No se pueden listar los repositorios. Detalles: '%(err)s'"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
-msgstr "No se puede recuperar informaci?n del repositorio. Detalles: '%(err)s'"
+msgstr ""
+"No se puede recuperar informaci?n de repositorios. Detalles: '%(err)s'"
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "No se puede a?adir el repositorio. Detalles: '%(err)s'"
+msgstr ""
+"No se puede a?adir el repositorio. Detalles: '%(err)s'"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "No se puede eliminar el repositorio. Detalles: '%(err)s'"
+msgstr ""
+"No se puede eliminar el repositorio. Detalles: '%(err)s'"
 
 #, python-format
 msgid ""
 "Configuration items: '%(items)s' are not supported by repository manager"
 msgstr ""
+"Elementos de configuraci?n: el gestor de repositorios no admite '%(items)s'"
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"El metaenlace de repositorio debe ser http://, ftp:// o el archivo:// URL."
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"No se puede especificar la lista de duplicados y el metaenlace a la vez. "
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
 msgstr ""
+"Se ha de detener la m?quina virtual '%(vm)s' antes de crear una instant?nea de la misma. "
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"No se puede crear la instant?nea '%(name)s' en la m?quina virtual '%(vm)s'. Detalles: "
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
 msgstr ""
+"La instant?nea '%(name)s' no existe en la m?quina virtual '%(vm)s'."
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"No se puede recuperar la instant?nea '%(name)s' en la m?quina virtual '%(vm)s'. Detalles: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
+"No se pueden listar las instant?neas en la m?quina virtual '%(vm)s'. Detalles: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"No se puede suprimir la instant?nea '%(name)s' en la m?quina virtual '%(vm)s'. Detalles: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"No se puede recuperar la instant?nea actual de la m?quina virtual '%(vm)s'. Detalles: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
 msgstr ""
+"No se puede revertir la m?quina virtual '%(vm)s' en la instant?nea '%(name)s'. Detalles: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
+"No se puede crear la instant?nea de la m?quina virtual '%(vm)s' porque contiene un "
+"disco con el formato '%(format)s'; s?lo se admite 'qcow2'. "
 
 msgid "The number of vCPUs is too large for this system."
 msgstr ""
+"El n?mero de vCPUs es demasiado grande para este sistema. "
 
 msgid "Invalid vCPU/topology combination."
 msgstr ""
+"Combinaci?n de vCPU/topolog?a no v?lida."
 
 msgid "This host (or current configuration) does not allow CPU topology."
 msgstr ""
+"Este host (o la configuraci?n actual) no permite la topolog?a de CPU. "
 
 msgid "ERROR CODE"
-msgstr "C?DIGO DE ERROR"
+msgstr ""
+"C?DIGO DE ERROR"
 
 msgid "REASON"
-msgstr "RAZ?N"
+msgstr ""
+"RAZ?N"
 
 msgid "STACK"
-msgstr "PILA"
+msgstr ""
+"PILA"
 
 msgid "Go to Homepage"
-msgstr "Ir a la p?gina inicial"
+msgstr ""
+"Ir a la p?gina inicial"
 
 msgid "Create a New Virtual Machine"
-msgstr "Crear una nueva m?quina virtual"
+msgstr ""
+"Crear una nueva m?quina virtual"
 
 msgid "Virtual Machine Name"
-msgstr "Nombre de m?quina virtual"
+msgstr ""
+"Nombre de m?quina virtual"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
 msgstr ""
-"El nombre que se utiliza para identificar la m?quina virtual. Si se omite, "
-"se elegir? un nombre bas?ndose en la plantilla utilizada."
+"El nombre que se utiliza para identificar la m?quina virtual. Si se omite, se "
+"elegir? un nombre bas?ndose en la plantilla utilizada."
 
 msgid "Template"
-msgstr "Plantilla"
+msgstr ""
+"Plantilla"
 
 msgid "Please create a template first."
-msgstr "Cree una plantilla primero."
+msgstr ""
+"Cree una plantilla primero."
 
 msgid "Create a Template"
-msgstr "Crear una plantilla"
+msgstr ""
+"Crear una plantilla"
 
 msgid "Please choose a template."
-msgstr "Elija una plantilla."
+msgstr ""
+"Elija una plantilla."
 
 msgid "OS"
-msgstr "SO"
+msgstr ""
+"SO"
 
 msgid "OS Version"
-msgstr "Versi?n del SO"
+msgstr ""
+"Versi?n del SO"
 
 msgid "CPUS"
-msgstr "CPUS"
+msgstr ""
+"CPUS"
 
 msgid "Memory"
-msgstr "Memoria"
+msgstr ""
+"Memoria"
 
 msgid "Create"
-msgstr "Crear"
+msgstr ""
+"Crear"
 
 msgid "Creating..."
 msgstr ""
+"Creando..."
 
 msgid "Edit Guest"
-msgstr "Editar invitado"
+msgstr ""
+"Editar invitado"
 
 msgid "General"
-msgstr "General"
+msgstr ""
+"General"
 
 msgid "Storage"
-msgstr "Almacenamiento"
+msgstr ""
+"Almacenamiento"
 
 msgid "Interface"
-msgstr "Interfaz"
+msgstr ""
+"Interfaz"
 
 msgid "Permission"
-msgstr "Versi?n"
+msgstr ""
+"Permiso"
 
 msgid "Host PCI Device"
 msgstr ""
+"Dispositivo PCI de host"
 
 msgid "Snapshot"
 msgstr ""
+"Instant?nea"
 
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
+"Nombre"
 
 msgid "CPUs"
-msgstr "CPUs"
+msgstr ""
+"CPUs"
 
 msgid "Memory (MB)"
-msgstr "Memoria"
+msgstr ""
+"Memoria (MB)"
 
 msgid "Icon"
-msgstr "Icono"
+msgstr ""
+"Icono"
 
 msgid "Device"
-msgstr "Nombre de dispositivo"
+msgstr ""
+"Dispositivo"
 
 msgid "Path"
-msgstr "V?a de acceso NFS"
+msgstr ""
+"V?a de acceso"
 
 msgid "Network"
-msgstr "Red"
+msgstr ""
+"Red"
 
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
+"Tipo"
 
 msgid "MAC Address"
 msgstr ""
+"Direcci?n MAC"
 
 msgid "Available system users and groups"
 msgstr ""
+"Usuarios y grupos del sistema disponibles"
 
 msgid "Selected system users and groups"
 msgstr ""
+"Usuarios y grupos del sistema seleccionados"
 
 msgid "User"
 msgstr ""
+"Usuario"
 
 msgid "All"
-msgstr "Todo"
+msgstr ""
+"Todo"
 
 msgid "To Add"
 msgstr ""
+"A a?adir"
 
 msgid "Added"
 msgstr ""
+"A?adido"
 
 msgid "filter"
 msgstr ""
+"filtrar"
 
 msgid "Product"
 msgstr ""
+"Producto"
 
 msgid "Vendor"
-msgstr "Proveedor"
+msgstr ""
+"Proveedor"
 
 msgid "Created"
 msgstr ""
+"Creado"
 
 msgid "Save"
-msgstr "Guardar"
+msgstr ""
+"Guardar"
 
 msgid "Replace"
-msgstr "Sustituir"
+msgstr ""
+"Sustituir"
 
 msgid "Detach"
-msgstr "Desconectar"
+msgstr ""
+"Desconectar"
 
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
+"Cancelar"
 
 msgid "revert"
 msgstr ""
+"revertir"
 
 msgid "Add a Storage Device to VM"
-msgstr "A?adir un dispositivo de almacenamiento a VM"
+msgstr ""
+"A?adir un dispositivo de almacenamiento a VM"
 
 msgid "Device Type"
-msgstr "Tipo de dispositivo"
+msgstr ""
+"Tipo de dispositivo"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr "El tipo de dispositivo. Actualmente s?lo est? soportado \"cdrom\"."
+msgstr ""
+"El tipo de dispositivo. Actualmente se da soporte a  \"cdrom\" y \"disk\"."
 
 msgid "Storage Pool"
-msgstr "Agrupaci?n de almacenamiento"
+msgstr ""
+"Agrupaci?n de almacenamiento"
 
 msgid "Storage pool which volume located in"
-msgstr "La v?a de acceso de la agrupaci?n de almacenamiento debe ser una serie"
+msgstr ""
+"Agrupaci?n de almacenamiento con volumen ubicado en"
 
 msgid "Storage Volume"
-msgstr "Nombre de agrupaci?n de almacenamiento"
+msgstr ""
+"Volumen de almacenamiento"
 
 msgid "Storage volume to be attached"
-msgstr "El nombre de volumen de almacenamiento debe ser una serie"
+msgstr ""
+"Volumen de almacenamiento que se va a adjuntar"
 
 msgid "File Path"
-msgstr "V?a de acceso de archivo"
+msgstr ""
+"V?a de acceso de archivo"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "La v?a de acceso del archivo ISO en el servidor para el CDROM."
+msgstr ""
+"La v?a de acceso del archivo ISO en el servidor para el CDROM."
 
 msgid "Attach"
-msgstr "Conectar"
+msgstr ""
+"Conectar"
 
 msgid "Start"
-msgstr "Iniciar"
+msgstr ""
+"Iniciar"
 
 msgid "Reset"
-msgstr "Restablecer"
+msgstr ""
+"Restablecer"
 
 msgid "Pause"
 msgstr ""
+"Poner en pausa"
 
 msgid "Resume"
 msgstr ""
+"Reanudar"
 
 msgid "Power Off"
 msgstr ""
+"Apagar"
 
 msgid "Actions"
-msgstr "Acciones"
+msgstr ""
+"Acciones"
 
 msgid "Connect"
-msgstr "Conectar"
+msgstr ""
+"Conectar"
 
 msgid "Clone"
 msgstr ""
+"Clonar"
 
 msgid "Edit"
-msgstr "Editar"
+msgstr ""
+"Editar"
 
 msgid "Shut Down"
-msgstr "Concluir"
+msgstr ""
+"Concluir"
 
 msgid "Delete"
-msgstr "Suprimir"
+msgstr ""
+"Suprimir"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
-"El nombre de usuario o contrase?a que ha especificado es incorrecto. Por "
-"favor, vuelva a intentarlo."
+"El nombre de usuario o contrase?a que ha especificado es incorrecto. Por favor, vuelva a intentarlo."
 
 msgid "This field is required."
-msgstr "Este campo es obligatorio."
+msgstr ""
+"Este campo es obligatorio."
 
 msgid "Log in"
-msgstr "Iniciar sesi?n"
+msgstr ""
+"Iniciar sesi?n"
 
 msgid "Logging in..."
-msgstr "Iniciando sesi?n..."
+msgstr ""
+"Iniciando sesi?n..."
 
 msgid "Host"
-msgstr "Host"
+msgstr ""
+"Host"
 
 msgid "Guests"
-msgstr "Invitados"
+msgstr ""
+"Invitados"
 
 msgid "Templates"
-msgstr "Plantillas"
+msgstr ""
+"Plantillas"
 
 msgid "Failed to get application configuration"
-msgstr "No se ha podido obtener la configuraci?n de la aplicaci?n"
+msgstr ""
+"No se ha podido obtener la configuraci?n de la aplicaci?n"
 
 msgid "This is not a valid Linux path"
-msgstr "No es una v?a de acceso de Linux v?lida"
+msgstr ""
+"No es una v?a de acceso de Linux v?lida"
 
 msgid "This is not a valid URL."
-msgstr "No es un URL v?lido."
+msgstr ""
+"No es un URL v?lido."
 
 msgid "No such data available."
-msgstr "No hay datos de ese tipo disponibles."
+msgstr ""
+"No hay datos de ese tipo disponibles."
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"No se puede contactar con el sistema host, Verifique que el sistema host "
-"est? activo y que tiene conectividad de red con ?l. Respuesta de solicitud "
-"HTTP %1. "
+"No se puede contactar con el sistema host. Verifique que el sistema host est? activo y que "
+"tiene conectividad de red con ?l. Respuesta de solicitud HTTP %1. "
 
 msgid "Unable to read file."
 msgstr ""
+"No se puede leer el archivo. "
 
 msgid "Error while uploading file."
 msgstr ""
+"Error al actualizar el archivo. "
 
 msgid "Delete Confirmation"
-msgstr "Confirmaci?n de supresi?n"
+msgstr ""
+"Confirmaci?n de supresi?n"
 
 msgid "OK"
-msgstr "Aceptar"
+msgstr ""
+"Aceptar"
 
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
+"Confirmar"
 
 msgid "Warning"
-msgstr "Aviso"
+msgstr ""
+"Aviso"
 
 msgid "Cloning..."
 msgstr ""
+"Clonaci?n..."
 
 msgid "Loading..."
-msgstr "Cargando..."
+msgstr ""
+"Cargando..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"Se ha producido un error al recuperar la informaci?n del sistema."
 
 msgid "Retry"
-msgstr "Reintentar"
+msgstr ""
+"Reintentar"
 
 msgid "Detailed message:"
-msgstr "Mensaje detallado:"
+msgstr ""
+"Mensaje detallado:"
 
 msgid "No ISO found"
 msgstr ""
+"No se ha encontrado ning?n ISO"
 
 msgid "This is not a valid ISO file."
-msgstr "No es un archivo ISO v?lido."
+msgstr ""
+"No es un archivo ISO v?lido."
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "Tardar? mucho tiempo. ?Desea continuar?"
+msgstr ""
+"Esta operaci?n puede necesitar mucho tiempo. ?Desea continuar?"
 
 msgid "This will permanently delete the template. Would you like to continue?"
-msgstr "Esto suprimir? permanentemente la plantilla. ?Desea continuar?"
+msgstr ""
+"As? se suprimir? la plantilla de forma permanente. ?Desea continuar?"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
 msgstr ""
-"No se puede concluir el sistema ya que hay algunas m?quinas virtuales en "
-"ejecuci?n."
+"No se puede concluir el sistema ya que hay algunas m?quinas virtuales en ejecuci?n."
 
 msgid "Max:"
-msgstr "M?x.:"
+msgstr ""
+"M?x.:"
 
 msgid "Utilization"
-msgstr "Utilizaci?n"
+msgstr ""
+"Utilizaci?n"
 
 msgid "Available"
-msgstr "Disponible"
+msgstr ""
+"Disponible"
 
 msgid "Read Rate"
-msgstr "Velocidad de lectura"
+msgstr ""
+"Velocidad de lectura"
 
 msgid "Write Rate"
-msgstr "Velocidad de escritura"
+msgstr ""
+"Velocidad de escritura"
 
 msgid "Received"
-msgstr "Recibido"
+msgstr ""
+"Recibido"
 
 msgid "Sent"
-msgstr "Enviado"
+msgstr ""
+"Enviado"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
 msgstr ""
-"Concluir o reiniciar el host har? que se pierda el trabajo no guardado. "
-"?Desea continuar para concluir/reiniciar?"
+"Concluir o reiniciar el host har? que se pierda el trabajo no guardado. ?Desea continuar "
+"para concluir/reiniciar?"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"El repositorio se eliminar? de forma permanente y no se puede recuperar. "
-"?Desea continuar?"
+"El repositorio se eliminar? de forma permanente y no se puede recuperar. ?Desea "
+"continuar?"
 
 msgid "Repositories"
-msgstr "Repositorios"
+msgstr ""
+"Repositorios"
 
 msgid "ID"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Base URL"
-msgstr "URL base"
+msgstr ""
+"URL base"
 
 msgid "Is Mirror"
-msgstr "Es duplicado"
+msgstr ""
+"Es duplicado"
 
 msgid "URL Args"
-msgstr "Args de URL"
+msgstr ""
+"Args de URL"
 
 msgid "Enabled"
-msgstr "Habilitado"
+msgstr ""
+"Habilitado"
 
 msgid "GPG Check"
-msgstr "Comprobaci?n GPG"
+msgstr ""
+"Comprobaci?n GPG"
 
 msgid "GPG Key"
-msgstr "Clave GPG"
+msgstr ""
+"Clave GPG"
 
 msgid "Add"
-msgstr "A?adir"
+msgstr ""
+"A?adir"
 
 msgid "Remove"
-msgstr "Eliminar"
+msgstr ""
+"Eliminar"
 
 msgid "Enable"
-msgstr "Habilitar"
+msgstr ""
+"Habilitar"
 
 msgid "Disable"
-msgstr "Inhabilitar"
+msgstr ""
+"Inhabilitar"
 
 msgid "Software Updates"
-msgstr "Actualizaciones de software"
+msgstr ""
+"Actualizaciones de software"
 
 msgid "Package Name"
-msgstr "Nombre de paquete"
+msgstr ""
+"Nombre de paquete"
 
 msgid "Version"
-msgstr "Versi?n"
+msgstr ""
+"Versi?n"
 
 msgid "Architecture"
-msgstr "Arquitectura"
+msgstr ""
+"Arquitectura"
 
 msgid "Repository"
-msgstr "Repositorio"
+msgstr ""
+"Repositorio"
 
 msgid "Update All"
-msgstr "Actualizar todo"
+msgstr ""
+"Actualizar todo"
 
 msgid "Updating..."
-msgstr "Actualizando..."
+msgstr ""
+"Actualizando..."
 
 msgid "Failed to retrieve packages update information."
 msgstr ""
+"No se ha podido recuperar la informaci?n de actualizaci?n de paquetes. "
 
 msgid "Failed to update package(s)."
-msgstr "No se han podido actualizar paquetes."
+msgstr ""
+"No se han podido actualizar paquetes."
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"El informe de depuraci?n se eliminar? permanentemente y no se puede "
-"recuperar. ?Desea continuar?"
+"El informe de depuraci?n se eliminar? permanentemente y no se puede recuperar. ?Desea "
+"continuar?"
 
 msgid "Debug Reports"
-msgstr "Informes de depuraci?n"
+msgstr ""
+"Informes de depuraci?n"
 
 msgid "Generated Time"
-msgstr "Tiempo generado"
+msgstr ""
+"Tiempo generado"
 
 msgid "Generate"
-msgstr "Generar"
+msgstr ""
+"Generar"
 
 msgid "Generating..."
-msgstr "Generando..."
+msgstr ""
+"Generando..."
 
 msgid "Rename"
-msgstr "Redenominar"
+msgstr ""
+"Redenominar"
 
 msgid "Download"
-msgstr "Descargar"
+msgstr ""
+"Descargar"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
 msgstr ""
-"El nombre de informe debe contener s?lo letras, d?gitos y/o gui?n ('-')."
+"El nombre de informe debe contener solamente letras, d?gitos, el car?cter de subrayado ('_') y/o "
+"de gui?n ('-')."
 
 msgid "Pending..."
-msgstr "Cargando..."
+msgstr ""
+"Pendiente..."
 
 msgid "Report name is the same as the original one."
 msgstr ""
+"El nombre de informe es el mismo que el original. "
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
 msgstr ""
-"Esto suprimir? la m?quina virtual y sus discos virtuales. Esta operaci?n no "
-"puede deshacerse. ?Desea continuar?"
+"Esto suprimir? la m?quina virtual y sus discos virtuales. Esta operaci?n "
+"no se puede deshacer. ?Desea continuar?"
 
 msgid "Power off Confirmation"
-msgstr "Confirmaci?n de supresi?n"
+msgstr ""
+"Confirmaci?n de apagado"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
 msgstr ""
+"Esta acci?n puede producir resultados no deseables, por ejemplo almacenamiento de memoria cach? en disco "
+"sin vaciar en el invitado. ?Desea continuar?"
 
 msgid "Reset Confirmation"
-msgstr "Confirmaci?n de supresi?n"
+msgstr ""
+"Confirmaci?n de restablecimiento"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
 msgstr ""
+"Existe un riesgo de p?rdida de datos causado por el restablecimiento sin la conclusi?n del sistema operativo invitado. "
+"?Desea continuar?"
 
 msgid "Shut Down Confirmation"
-msgstr "Confirmaci?n de supresi?n"
+msgstr ""
+"Confirmaci?n de conclusi?n"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
-msgstr "Esto suprimir? permanentemente la plantilla. ?Desea continuar?"
+msgstr ""
+"Tenga en cuenta que el sistema operativo del invitado puede ignorar esta solicitud. ?Desea continuar?"
 
 msgid "Virtual Machine delete Confirmation"
 msgstr ""
+"Confirmaci?n de supresi?n de la m?quina virtual "
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
 msgstr ""
+"Esta m?quina virtual no es persistente. Con la acci?n Apagar se suprimir?. ?Desea 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 ""
+"Cuando el invitado de destino tiene vol?menes SCSI o iSCSI, se clonar?n en "
+"la agrupaci?n de almacenamiento predeterminada. Ocurrir? lo mismo cuando la agrupaci?n de destino no "
+"tenga espacio suficiente para clonar los vol?menes. ?Desea continuar?"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
 msgstr ""
-"Este CDROM se desconectar? de forma permanente pero puede volver a "
-"conectarlo. ?Desea continuar para desconectarlo?"
+"Este CDROM se desconectar? de forma permanente pero puede volver a conectarlo. ?Desea "
+"continuar para desconectarlo?"
 
 msgid "Attaching..."
-msgstr "Conectando..."
+msgstr ""
+"Conectando..."
 
 msgid "Replacing..."
-msgstr "Sustituyendo..."
+msgstr ""
+"Sustituyendo..."
 
 msgid "Successfully attached!"
-msgstr "?Conectado correctamente!"
+msgstr ""
+"?Conectado correctamente!"
 
 msgid "Successfully replaced!"
-msgstr "?Sustituido correctamente!"
+msgstr ""
+"?Sustituido correctamente!"
 
 msgid "Successfully detached!"
-msgstr "?Desconectado correctamente!"
+msgstr ""
+"?Desconectado correctamente!"
 
 msgid ""
 "This disk will be detached permanently and you can re-attach it. Continue to "
 "detach it?"
 msgstr ""
+"Este disco se desconectar? de forma permanente y podr? volver a conectarlo. ?Desea continuar"
+"desconect?ndolo?"
 
 msgid "interface:"
 msgstr ""
+"interfaz: "
 
 msgid "address:"
 msgstr ""
+"direcci?n:"
 
 msgid "link_type:"
 msgstr ""
+"link_type:"
 
 msgid "block:"
 msgstr ""
+"bloque:"
 
 msgid "drive_type:"
 msgstr ""
+"drive_type:"
 
 msgid "model:"
 msgstr ""
+"modelo:"
 
 msgid "Affected devices:"
 msgstr ""
+"Dispositivos afectados:"
 
 msgid "The VLAN id must be between 1 and 4094."
-msgstr "El ID de VLAN debe estar entre 1 y 4094."
+msgstr ""
+"El ID de VLAN debe estar entre 1 y 4094."
 
 msgid "unavailable"
-msgstr "no disponible"
+msgstr ""
+"no disponible"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
 "depend on this network."
 msgstr ""
-"Esta acci?n interrumpir? la conectividad de red para cualquier m?quina "
-"virtual que dependa de esta red."
+"Esta acci?n interrumpir? la conectividad de red para cualquier m?quina virtual que "
+"dependa de esta red."
 
 msgid "Create a network"
-msgstr "Crear una red"
+msgstr ""
+"Crear una red"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"Esta agrupaci?n de almacenamiento no es persistente. En lugar de desactivar, "
-"esta acci?n la suprimir? permanentemente. ?Desea continuar?"
+"Esta red no es persistente. En lugar de detenerla, esta acci?n "
+"la suprimir? de forma permanente. ?Desea continuar?"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"Es posible que el c?digo VLAN ponteado no funcione bien si NetworkManager est? habilitado. Deber?a "
+"considerar la posibilidad de inhabilitarlo. "
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
 msgstr ""
-"Esto suprimir? permanentemente la agrupaci?n de almacenamiento. ?Desea "
-"continuar?"
+"As? se suprimir? la agrupaci?n de almacenamiento de forma permanente. ?Desea continuar?"
 
 msgid "This storage pool is empty."
-msgstr "Esta agrupaci?n de almacenamiento est? vac?a."
+msgstr ""
+"Esta agrupaci?n de almacenamiento est? vac?a."
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
@@ -1873,471 +2233,609 @@ msgstr ""
 "de que desea continuar? "
 
 msgid "SCSI Fibre Channel"
-msgstr "Canal de fibra de SCSI"
+msgstr ""
+"Canal de fibra de SCSI"
 
 msgid "No SCSI adapters found."
-msgstr "No se han encontrado adaptadores SCSI."
+msgstr ""
+"No se han encontrado adaptadores SCSI."
 
 msgid "Loading iSCSI targets..."
 msgstr ""
+"Se est?n cargando los destinos iSCSI..."
 
 msgid "No iSCSI found. Please input one."
 msgstr ""
+"No se ha encontrado el iSCSI. Indique uno. "
 
 msgid "Failed to load iSCSI targets."
 msgstr ""
+"No se han podido cargar los destinos iSCSI. "
 
 msgid "The storage pool name can not be blank."
-msgstr "El nombre de la agrupaci?n de almacenamiento no puede estar en blanco."
+msgstr ""
+"El nombre de la agrupaci?n de almacenamiento no puede estar en blanco."
 
 msgid "The storage pool path can not be blank."
 msgstr ""
 "La v?a de acceso de la agrupaci?n de almacenamiento no puede estar en blanco."
 
 msgid "NFS server mount path can not be blank."
-msgstr "La v?a de acceso de montaje del servidor NFS no puede estar en blanco."
+msgstr ""
+"La v?a de acceso de montaje del servidor NFS no puede estar en blanco."
 
 msgid "Invalid NFS mount path."
-msgstr "V?a de acceso de montaje de NFS no v?lida."
+msgstr ""
+"V?a de acceso de montaje de NFS no v?lida."
 
 msgid "No logical device selected."
-msgstr "No se ha seleccionado ning?n dispositivo l?gico."
+msgstr ""
+"No se ha seleccionado ning?n dispositivo l?gico."
 
 msgid "The iSCSI target can not be blank."
-msgstr "El destino iSCSI no puede estar en blanco."
+msgstr ""
+"El destino iSCSI no puede estar en blanco."
 
 msgid "Server name can not be blank."
-msgstr "El nombre de servidor no puede estar en blanco."
+msgstr ""
+"El nombre de servidor no puede estar en blanco."
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
 msgstr ""
+"No es un nombre de servidor v?lido o IP v?lida. Modifique el valor. "
 
 msgid "Looking for available partitions ..."
-msgstr "Buscando particiones disponibles..."
+msgstr ""
+"Buscando particiones disponibles..."
 
 msgid "No available partitions found."
-msgstr "No se han encontrado particiones disponibles."
+msgstr ""
+"No se han encontrado particiones disponibles."
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"Esta agrupaci?n de almacenamiento no es persistente. En lugar de desactivar, "
-"esta acci?n la suprimir? permanentemente. ?Desea continuar?"
+"Esta agrupaci?n de almacenamiento no es persistente. En lugar de desactivar, esta acci?n "
+"la suprimir? de forma permanente. ?Desea continuar?"
 
 msgid "Unable to retrieve partitions information."
-msgstr "No se puede recuperar informaci?n del repositorio. Detalles: '%(err)s'"
+msgstr ""
+"No se puede recuperar la informaci?n de particiones. "
 
 msgid "In progress..."
 msgstr ""
+"En curso..."
 
 msgid "Failed!"
 msgstr ""
+"Error"
 
 msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
 msgstr ""
+"La v?a de acceso de CDROM ha de ser una v?a de acceso local/remota v?lida y no puede dejarse en blanco. "
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "El nombre de la agrupaci?n de almacenamiento no puede estar en blanco."
+msgstr ""
+"El volumen o la agrupaci?n de discos no puede estar en blanco."
 
 msgid "Peers"
 msgstr ""
+"Hom?logos"
 
 msgid "Searching"
 msgstr ""
+"Buscando"
 
 msgid "No peers found."
 msgstr ""
+"No se han encontrado hom?logos."
 
 msgid "Help"
-msgstr "Ayuda"
+msgstr ""
+"Ayuda"
 
 msgid "About"
-msgstr "Acerca de"
+msgstr ""
+"Acerca de"
 
 msgid "Log out"
-msgstr "Finalizar sesi?n"
+msgstr ""
+"Finalizar sesi?n"
 
 msgid "Version:"
-msgstr "Versi?n:"
+msgstr ""
+"Versi?n:"
 
 msgid "Session timeout, please re-login."
 msgstr ""
+"Se ha excedido el tiempo de espera de sesi?n; vuelva a iniciar la sesi?n."
 
 msgid "User Name"
-msgstr "Nombre de usuario"
+msgstr ""
+"Nombre de usuario"
 
 msgid "Password"
-msgstr "Contrase?a"
+msgstr ""
+"Contrase?a"
 
 msgid "Generate a New Debug Report"
-msgstr "Generar un Informe de depuraci?n nuevo"
+msgstr ""
+"Generar un Informe de depuraci?n nuevo"
 
 msgid "Report Name"
-msgstr "Nombre de informe"
+msgstr ""
+"Nombre de informe"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"El nombre que se utiliza para identificar el informe. Si se omite, se "
-"elegir? un nombre bas?ndose en la hora actual. El nombre puede contener: "
-"letras, d?gitos y gui?n (\"-\")."
+"El nombre que se utiliza para identificar el informe. Si se omite, se elegir? un nombre "
+"en base a la hora actual. El nombre puede contener: letras, d?gitos, car?cter de subrayado (\"_\") "
+"y de gui?n (\"-\")."
 
 msgid "Rename a Debug Report"
-msgstr "Generar un Informe de depuraci?n nuevo"
+msgstr ""
+"Renombre un informe de depuraci?n"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
 msgstr ""
-"El nombre que se utiliza para identificar el informe. Si se omite, se "
-"elegir? un nombre bas?ndose en la hora actual. El nombre puede contener: "
-"letras, d?gitos y gui?n (\"-\")."
+"El nombre utilizado para identificar el informe. El nombre puede contener: letras, d?gitos y "
+"el car?cter de gui?n (\"-\")."
 
 msgid "Submit"
 msgstr ""
+"Enviar"
 
 msgid "Add a Repository"
-msgstr "A?adir un repositorio"
+msgstr ""
+"A?adir un repositorio"
 
 msgid "Identifier"
-msgstr "Identificador"
+msgstr ""
+"Identificador"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "Identificador exclusivo de una sola palabra para el repositorio."
+msgstr ""
+"Identificador exclusivo de una sola palabra para el repositorio."
 
 msgid "Textual name for the repository."
-msgstr "Nombre textual para el repositorio."
+msgstr ""
+"Nombre textual para el repositorio."
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "Campo obligatorio"
+msgstr ""
+"Campo obligatorio"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "URL al repositorio. Los protocolos soportados son http, ftp y archivo."
+msgstr ""
+"URL al repositorio. Los protocolos soportados son http, ftp y archivo."
 
 msgid "Repository is a mirror"
-msgstr "El repositorio es un duplicado."
+msgstr ""
+"El repositorio es un duplicado"
 
 msgid "Distribution"
-msgstr "Distribuci?n"
+msgstr ""
+"Distribuci?n"
 
 msgid "Distribution of the DEB repository."
-msgstr "Distribuci?n del repositorio DEB."
+msgstr ""
+"Distribuci?n del repositorio DEB."
 
 msgid "Components"
-msgstr "Componentes"
+msgstr ""
+"Componentes"
 
 msgid "List of components in DEB repository."
-msgstr "Lista de componentes en el repositorio DEB."
+msgstr ""
+"Lista de componentes en el repositorio DEB."
 
 msgid "Edit Repository"
-msgstr "Editar repositorio"
+msgstr ""
+"Editar repositorio"
 
 msgid "Mirror List URL"
-msgstr "URL de lista duplicada"
+msgstr ""
+"URL de lista duplicada"
 
 msgid "Yes"
-msgstr "S?"
+msgstr ""
+"S?"
 
 msgid "No"
-msgstr "No"
+msgstr ""
+"No"
 
 msgid "Add a Volume to Storage Pool"
 msgstr ""
+"A?adir un volumen a la agrupaci?n de almacenamiento"
 
 msgid "Fetch from remote URL"
 msgstr ""
+"Captar de URL remoto"
 
 msgid "Enter the remote URL here."
 msgstr ""
+"Escriba el URL remoto aqu?. "
 
 msgid "Upload a file"
 msgstr ""
+"Cargar un archivo"
 
 msgid "Choose the file you want to upload."
 msgstr ""
+"Elija el archivo que desee cargar. "
 
 msgid "Define a New Storage Pool"
-msgstr "Definir una agrupaci?n de almacenamiento nueva"
+msgstr ""
+"Definir una agrupaci?n de almacenamiento nueva"
 
 msgid "Storage Pool Name"
-msgstr "Nombre de agrupaci?n de almacenamiento"
+msgstr ""
+"Nombre de agrupaci?n de almacenamiento"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
 msgstr ""
-"El nombre que se utiliza para identificar las agrupaciones de almacenamiento "
-"y no debe estar vac?o."
+"El nombre que se utiliza para identificar las agrupaciones de almacenamiento y no debe estar vac?o."
 
 msgid "Storage Pool Type"
-msgstr "Tipo de agrupaci?n de almacenamiento"
+msgstr ""
+"Tipo de agrupaci?n de almacenamiento"
 
 msgid "Storage Path"
-msgstr "V?a de acceso de almacenamiento"
+msgstr ""
+"V?a de acceso de almacenamiento"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
 msgstr ""
-"La v?a de acceso de la agrupaci?n de almacenamiento. Cada agrupaci?n de "
-"almacenamiento debe tener una v?a de acceso exclusiva."
+"La v?a de acceso de la agrupaci?n de almacenamiento. Cada agrupaci?n de almacenamiento debe tener una v?a de acceso exclusiva."
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
-msgstr "Kimchi intentar? crear el directorio cuando no existe en el sistema."
+msgstr ""
+"Kimchi intentar? crear el directorio cuando no existe en "
+"el sistema."
 
 msgid "NFS Server IP"
-msgstr "IP de Servidor NFS"
+msgstr ""
+"IP de Servidor NFS"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
 msgstr ""
-"IP o nombre de host de servidor NFS. Puede especificarse o elegirse del "
-"historial."
+"IP o nombre de host de servidor NFS. Puede especificarse o elegirse del historial."
 
 msgid "NFS Path"
-msgstr "V?a de acceso NFS"
+msgstr ""
+"V?a de acceso NFS"
 
 msgid "The NFS exported path on NFS server."
-msgstr "La v?a de acceso exportada de NFS en el servidor NFS."
+msgstr ""
+"La v?a de acceso exportada de NFS en el servidor NFS."
 
 msgid "Device path"
-msgstr "V?a de acceso del dispositivo"
+msgstr ""
+"V?a de acceso del dispositivo"
 
 msgid "iSCSI Server"
-msgstr "Servidor iSCSI"
+msgstr ""
+"Servidor iSCSI"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP o nombre de host de servidor iSCSI. No debe estar vac?o."
+msgstr ""
+"IP o nombre de host de servidor iSCSI. No debe estar vac?o."
 
 msgid "Server"
-msgstr "Servidor"
+msgstr ""
+"Servidor"
 
 msgid "Port"
-msgstr "Puerto"
+msgstr ""
+"Puerto"
 
 msgid "Target"
-msgstr "Destino"
+msgstr ""
+"Destino"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "El destino iSCSI en el servidor iSCSI"
+msgstr ""
+"El destino iSCSI en el servidor iSCSI"
 
 msgid "Add iSCSI Authentication"
-msgstr "A?adir Autenticaci?n iSCSI"
+msgstr ""
+"A?adir Autenticaci?n iSCSI"
 
 msgid "iSCSI Authentication"
-msgstr "Autenticaci?n iSCSI"
+msgstr ""
+"Autenticaci?n iSCSI"
 
 msgid "SCSI Adapter"
-msgstr "Adaptador SCSI"
+msgstr ""
+"Adaptador SCSI"
 
 msgid "Please, wait..."
-msgstr "Por favor, espere..."
+msgstr ""
+"Por favor, espere..."
 
 msgid "Add Template"
-msgstr "A?adir plantilla"
+msgstr ""
+"A?adir plantilla"
 
 msgid "Where is the source media for this template? "
-msgstr "?D?nde est? el soporte de origen para esta plantilla?"
+msgstr ""
+"?D?nde est? el soporte de origen para esta plantilla?"
 
 msgid "Local ISO Image"
-msgstr "Imagen ISO local"
+msgstr ""
+"Imagen ISO local"
 
 msgid "Local Image File"
 msgstr ""
+"Archivo de imagen local"
 
 msgid "Remote ISO Image"
-msgstr "Imagen ISO remota"
+msgstr ""
+"Imagen ISO remota"
 
 msgid "Search ISOs"
-msgstr "Buscar ISOs"
+msgstr ""
+"Buscar ISOs"
 
 msgid "The following ISOs are available:"
-msgstr "Las siguientes ISO est?n disponibles:"
+msgstr ""
+"Las siguientes ISO est?n disponibles:"
 
 msgid "OS: "
-msgstr "SO: "
+msgstr ""
+"SO: "
 
 msgid "Version: "
-msgstr "Versi?n: "
+msgstr ""
+"Versi?n: "
 
 msgid "Size: "
-msgstr "Tama?o: "
+msgstr ""
+"Tama?o: "
 
 msgid "Search more ISOs"
-msgstr "Buscar m?s ISO"
+msgstr ""
+"Buscar m?s ISO"
 
 msgid "Create Templates from Selected ISO"
-msgstr "Crear plantillas a partir de ISO seleccionadas"
+msgstr ""
+"Crear plantillas a partir de ISO seleccionadas"
 
 msgid "I want to use a specific ISO file"
-msgstr "Deseo utilizar un archivo ISO espec?fico"
+msgstr ""
+"Deseo utilizar un archivo ISO espec?fico"
 
 msgid "Loading default remote ISOs ..."
-msgstr "Cargando ISO remotas predeterminadas ..."
+msgstr ""
+"Cargando ISO remotas predeterminadas ..."
 
 msgid "Arch: "
-msgstr "Arch: "
+msgstr ""
+"Arch: "
 
 msgid "I want to use a custom URL"
-msgstr "Deseo utilizar un URL personalizado"
+msgstr ""
+"Deseo utilizar un URL personalizado"
 
 msgid "Edit Template"
-msgstr "Editar plantilla"
+msgstr ""
+"Editar plantilla"
 
 msgid "Processor"
-msgstr "Procesador"
+msgstr ""
+"Procesador"
 
 msgid "CDROM"
-msgstr "CDROM"
+msgstr ""
+"CDROM"
 
 msgid "Image File"
 msgstr ""
+"Archivo de imagen"
 
 msgid "Graphics"
-msgstr "Gr?ficos"
+msgstr ""
+"Gr?ficos"
 
 msgid "Disk(GB)"
 msgstr ""
+"Disco (GB)"
 
 msgid "Disk Format"
 msgstr ""
+"Formato de disco"
 
 msgid "CPU Number"
-msgstr "N?mero de CPU"
+msgstr ""
+"N?mero de CPU"
 
 msgid "Manually set CPU topology"
 msgstr ""
+"Establezca manualmente la topolog?a de CPU"
 
 msgid "Cores"
 msgstr ""
+"N?cleos"
 
 msgid "Threads"
 msgstr ""
+"Hebras"
 
 msgid "CPU"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Disk I/O"
-msgstr "E/S de disco"
+msgstr ""
+"E/S de disco"
 
 msgid "Network I/O"
-msgstr "E/S de red"
+msgstr ""
+"E/S de red"
 
 msgid "Livetile"
-msgstr "Livetile"
+msgstr ""
+"Livetile"
 
 msgid "No guests found."
-msgstr "No se ha encontrado invitados."
+msgstr ""
+"No se ha encontrado invitados."
 
 msgid "Shut down"
-msgstr "Concluir"
+msgstr ""
+"Concluir"
 
 msgid "Restart"
-msgstr "Reiniciar"
+msgstr ""
+"Reiniciar"
 
 msgid "Basic Information"
-msgstr "Informaci?n b?sica"
+msgstr ""
+"Informaci?n b?sica"
 
 msgid "OS Distro"
-msgstr "Distro de SO"
+msgstr ""
+"Distro de SO"
 
 msgid "OS Code Name"
-msgstr "Nombre de c?digo de SO"
+msgstr ""
+"Nombre de c?digo de SO"
 
 msgid "CPU(s)"
 msgstr ""
+"CPU(s)"
 
 msgid "System Statistics"
-msgstr "Estad?sticas del sistema"
+msgstr ""
+"Estad?sticas del sistema"
 
 msgid "Update Progress"
-msgstr "Actualizar progreso"
+msgstr ""
+"Actualizar progreso"
 
 msgid "Network Name"
-msgstr "Nombre de red"
+msgstr ""
+"Nombre de red"
 
 msgid "State"
-msgstr "Estado"
+msgstr ""
+"Estado"
 
 msgid "Network Type"
-msgstr "Tipo de red"
+msgstr ""
+"Tipo de red"
 
 msgid "Address Space"
-msgstr "Espacio de direcciones"
+msgstr ""
+"Espacio de direcciones"
 
 msgid "Name should not contain '/' and '\"'."
 msgstr ""
-"Nombre de agrupaci?n de almacenamiento no v?lido. No debe contener '/'."
+"El nombre no debe contener '/' y '\"'."
 
 msgid "Isolated: no external network connection"
-msgstr "Aislado: no hay conexi?n de red f?sica"
+msgstr ""
+"Aislado: no hay conexi?n de red externa"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT: conexi?n de red f?sica saliente solamente"
+msgstr ""
+"NAT: conexi?n de red f?sica saliente solamente"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
-"Puenteado: Las m?quinas virtuales est?n conectadas a la red f?sica "
-"directamente"
+"Puenteado: Las m?quinas virtuales est?n conectadas a la red f?sica directamente"
 
 msgid "(No interfaces found)"
 msgstr ""
+"(No se han encontrado interfaces) "
 
 msgid "Destination"
-msgstr "Destino:"
+msgstr ""
+"Destino"
 
 msgid "Enable VLAN"
-msgstr "Habilitar VLAN:"
+msgstr ""
+"Habilitar VLAN"
 
 msgid "VLAN ID"
-msgstr "ID de VLAN:"
+msgstr ""
+"ID de VLAN"
 
 msgid "Stop"
-msgstr "Detener"
+msgstr ""
+"Detener"
 
 msgid "%Used"
 msgstr ""
+"% Utilizado"
 
 msgid "Location"
-msgstr "Ubicaci?n"
+msgstr ""
+"Ubicaci?n"
 
 msgid "Capacity"
-msgstr "Capacidad"
+msgstr ""
+"Capacidad"
 
 msgid "Allocated"
-msgstr "Asignado"
+msgstr ""
+"Asignado"
 
 msgid "active"
-msgstr "activo"
+msgstr ""
+"activo"
 
 msgid "inactive"
-msgstr "inactivo"
+msgstr ""
+"inactivo"
 
 msgid "Deactivate"
-msgstr "Desactivar"
+msgstr ""
+"Desactivar"
 
 msgid "Activate"
-msgstr "Activar"
+msgstr ""
+"Activar"
 
 msgid "Add Volume"
 msgstr ""
+"A?adir volumen"
 
 msgid "Extend"
 msgstr ""
+"Ampliar"
 
 msgid "Undefine"
-msgstr "No definir"
+msgstr ""
+"No definir"
 
 msgid "Format"
-msgstr "Formato:"
+msgstr ""
+"Formato"
 
 msgid "Allocation"
-msgstr "Asignado:"
+msgstr ""
+"Asignaci?n"
 
 msgid "No templates found."
-msgstr "No se han encontrado plantillas."
+msgstr ""
+"No se han encontrado plantillas."
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 5bfc492..7418acc 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,155 +1,174 @@
 # English translations for kimchi package.
 # Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-24 09:39-0300\n"
-"PO-Revision-Date: 2014-08-27 21:30+0000\n"
-"Last-Translator: BobSynfig\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/"
-"fr/)\n"
-"Language: fr_FR\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n>1;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
-msgstr "Param?tre inconnu %(value)s"
+msgstr ""
+"Param?tre inconnu %(value)s"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "La suppression n'est pas autoris?e pour %(resource)s"
+msgstr ""
+"La suppression n'est pas autoris?e pour %(resource)s"
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s n'impl?mente pas de m?thode de mise ? jour"
+msgstr ""
+"%(resource)s n'impl?mente pas la m?thode de mise ? jour"
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "La cr?ation n'est pas autoris?e pour %(resource)s"
+msgstr ""
+"La cr?ation n'est pas autoris?e pour %(resource)s"
 
 msgid "Unable to parse JSON request"
-msgstr "Impossible de parser la requ?te JSON"
+msgstr ""
+"Impossible d'analyser la demande JSON"
 
 msgid "This API only supports JSON"
-msgstr "Cette API supporte uniquement le JSON"
+msgstr ""
+"L'API prend uniquement en charge la notation JSON"
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
 msgstr ""
-"Les param?tres ne correspondent pas ? ce qui est requis dans le sch?ma: "
-"%(err)s"
+"Les param?tres ne correspondent pas aux exigences du sch?ma : %(err)s"
 
 msgid "You don't have permission to perform this operation."
-msgstr "Vous n'avez pas la permission d'effectuer cette op?ration."
+msgstr ""
+"Vous ne disposez pas des droits pour effectuer cette op?ration."
 
 msgid "Datastore is not initiated in the model object."
-msgstr "Le magasin de donn?es n'est pas initi? dans l'objet mod?le."
+msgstr ""
+"Le magasin de donn?es n'est pas initi? dans l'objet de mod?le."
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
-msgstr "Impossible de d?marrer la t?che ? cause de l'erreur: %(err)s"
+msgstr ""
+"Impossible de d?marrer la t?che en raison de l'erreur : %(err)s"
 
 #, python-format
 msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
 msgstr ""
+"Expiration du d?lai d'attente de %(seconds)s lors de l'ex?cution de la t?che '%(task)s."
 
 #, python-format
 msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
 msgstr ""
-"L'authentification a ?chou? pour l'utilisateur '%(username)s'. [Code "
-"d'Erreur: %(code)s]"
+"Echec d'authentification pour l'utilisateur '%(username)s'. [Code d'erreur : %(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "Vous n'?tes pas autoris? ? acc?der ? Kimchi"
+msgstr ""
+"Vous n'?tes pas autoris? ? acc?der ? Kimchi"
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "Sp?cifiez %(item)s pour vous logguer dans Kimchi"
+msgstr ""
+"Indiquez %(item)s pour la connexion ? Kimchi"
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
 msgstr ""
+"L'utilisateur %(user_id)s est introuvable avec les param?tres LDAP donn?s."
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
 msgstr ""
+"Configuration LDAP non valide : %(item)s : %(value)s"
 
 msgid "Unknown \"_cap\" specified"
-msgstr "\"_cap\" sp?cifi?e inconnue"
+msgstr ""
+"\"_cap\" inconnu sp?cifi?"
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
-msgstr "\"_passthrough\" doit ?tre \"true\" ou \"false\""
+msgstr ""
+"\"_passthrough\" doit avoir la valeur \"true\" ou \"false\""
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
-msgstr "\"_passthrough_affected_by\" doit ?tre un nom de p?riph?rique"
+msgstr ""
+"\"_passthrough_affected_by\" doit ?tre une cha?ne de nom d'unit?"
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
-msgstr "Erreur durant l'acc?s aux p?riph?riques de bloc. D?tails: %(err)s"
+msgstr ""
+"Erreur lors de l'obtention d'unit?s par bloc. D?tails : %(err)s"
 
 #, python-format
 msgid "Error while getting block device information for %(device)s."
 msgstr ""
-"Erreur durant l'obtention de l'information sur le p?riph?rique de bloc "
-"%(device)s."
+"Erreur lors de l'obtention des informations d'unit? par bloc pour %(device)s."
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "Impossible de trouver le fichier de distro: %(filename)s"
+msgstr ""
+"Fichier de distribution introuvable : %(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
 msgstr ""
-"Impossible de parser le fichier de distro: %(filename)s. Veuillez vous "
-"assurer qu'il s'agit d'un fichier JSON."
+"Impossible d'analyser le fichier de distribution : %(filename)s. V?rifiez qu'il s'agit d'un fichier JSON."
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
 msgstr ""
-"Impossible de se connecter ? l'h?te cible iSCSI %(portal)s. D?tails: %(err)s "
+"Impossible de se connecter ? la cible h?te iSCSI %(portal)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr "Impossible de se connecter ? l'h?te iSCSI %(host)s cible %(target)s"
+msgstr ""
+"Impossible de se connecter ? la cible h?te %(host)s iSCSI %(target)s"
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
-msgstr "Impossible de trouver le fichier ISO %(filename)s"
+msgstr ""
+"Fichier ISO introuvable : %(filename)s"
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "Le fichier ISO %(filename)s n'est pas bootable"
+msgstr ""
+"Le fichier ISO %(filename)s n'est pas amor?able"
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
 msgstr ""
-"Le fichier ISO %(filename)s n'a pas d'enregistrement de boot El Torito valide"
+"Le fichier ISO %(filename)s ne poss?de pas d'enregistrement d'amor?age El Torito valide"
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr "Entr?e de validation El Torito invalide dans l'ISO %(filename)s"
+msgstr ""
+"Entr?e de validation El Torito non valide dans le fichier ISO %(filename)s"
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "Indicateur de boot El Torito invalide dans l'ISO %(filename)s"
+msgstr ""
+"Indicateur d'amor?age El Torito non valide dans le fichier ISO %(filename)s"
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
 msgstr ""
-"Type de volume inattendu pour le volume primaire dans l'ISO %(filename)s"
+"Type de volume inattendu pour le volume principal dans le fichier ISO %(filename)s"
 
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Mauvais format durant la lecture du descripteur de volume dans l'ISO "
-"%(filename)s"
+"Format incorrect lors de la lecture du descripteur de volume dans le fichier ISO %(filename)s"
 
 #, python-format
 msgid ""
@@ -159,230 +178,265 @@ msgid ""
 "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"L'hyperviseur n'a pas la permission d'utiliser cet ISO %(filename)s. "
-"Veuillez consid?rer de le d?placer sous /var/lib/libvirt,, ou de d?finir la "
-"permission de recherche sur les listes de contrpole d'acc?s fichier pour "
-"l'utilisateur '%(user)s' si possible, ou ajouter le '%(user)s' au groupe de "
-"chemins d'ISO, ou (non recommand?)  'chmod -R o+x 'chemin_vers_iso'.D?tails: "
-"%(err)s"
+"L'hyperviseur ne dispose pas des droits pour utiliser ce fichier ISO %(filename)s. "
+"placez-le dans /var/lib/libvirt, ou d?finissez le droit de recherche sur "
+"les listes de contr?le d'acc?s d'acc?s aux fichiers pour l'utilisateur '%(user)s', si possible, ou ajoutez "
+"'%(user)s' au groupe de chemins d'acc?s ISO ou (non recommand?) 'chmod -R o+x "
+"'path_to_iso'.D?tails : %(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."
+"Une erreur s'est produite lors de l'application d'une sonde aux informations de syst?me d'exploitation d'image."
 
 msgid "No OS information found in given image."
-msgstr "Aucune information d'OS trouv?e sur l'image donn?e."
+msgstr ""
+"Aucune information relative au syst?me d'exploitation n'a ?t? trouv?e dans l'image donn?e."
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
-msgstr "Impossible de lire le fichier image %(filename)s"
+msgstr ""
+"Impossible de lire le fichier image %(filename)s"
 
 #, python-format
 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 entr?e "
+"valide."
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "La machine virtuelle %(name)s existe d?j?"
+msgstr ""
+"La machine virtuelle %(name)s existe d?j?"
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "La machine virtuelle %(name)s n'existe pas"
+msgstr ""
+"La machine virtuelle nomm?e %(name)s n'existe pas"
 
 #, python-format
 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?j? "
+"utilis? ou la machine virtuelle n'est pas hors tension."
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
 msgstr ""
-"Impossible de r?cup?rer une capture d'?cran pour la machine virtuelle "
-"stopp?e %(name)s"
+"Impossible d'extraire la capture d'?cran pour la machine virtuelle arr?t?e %(name)s"
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "L'image ISO distante n'est pas support?e par le serveur."
+msgstr ""
+"L'image ISO distante n'est pas prise en charge par ce serveur."
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
-msgstr "Copie d'?cran non support?e par la machine virtuelle %(name)s"
+msgstr ""
+"La capture d'?cran n'est pas prise en charge sur la machine virtuelle %(name)s"
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossible de cr?er la machine virtuelle %(name)s. D?tails: %(err)s"
+msgstr ""
+"Impossible de cr?er la machine virtuelle %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de mettre ? jour la machine virtuelle %(name)s. D?tails: %(err)s"
+"Impossible de mettre ? jour la machine virtuelle %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de r?cup?rer la machine virtuelle %(name)s. D?tails: %(err)s"
+"Impossible de r?cup?rer la machine virtuelle %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
-msgstr "Impossible de se connecter ? la machine virtuelle ?teinte %(name)s."
+msgstr ""
+"Impossible de se connecter ? la machine virtuelle hors tension %(name)s."
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"Le nom de la machine virtuelle doit ?tre une cha?ne sans barre oblique (/)"
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
 msgstr ""
+"URI du mod?le non valide %(value)s indiqu? pour la machine virtuelle"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
 msgstr ""
+"URI du pool de stockage non valide %(value)s indiqu? pour la machine virtuelle"
 
 msgid "Supported virtual machine graphics are Spice or VNC"
 msgstr ""
+"Graphiques de machine virtuelle pris en charge : Spice ou VNC"
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
-msgstr "L'adresse d'?coute du graphics doit ?tre IPv4 ou IPv6"
+msgstr ""
+"L'adresse des graphiques pour l'?coute doit ?tre IPv4 ou IPv6"
 
 msgid "Specify a template to create a virtual machine from"
-msgstr "Sp?cifier un mod?le ? partir duquel cr?er une machine virtuelle"
+msgstr ""
+"Indiquez un mod?le pour cr?er une machine virtuelle depuis"
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossible de d?marrer la machine virtuelle %(name)s. D?tails: %(err)s"
+msgstr ""
+"Impossible de d?marrer la machine virtuelle %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de mettre hors tension la machine virtuelle %(name)s. D?tails: "
-"%(err)s"
+"Impossible de mettre hors tension la machine virtuelle %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de supprimer la machine virtuelle %(name)s. D?tails: %(err)s"
+"Impossible de supprimer la machine virtuelle %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de r?initrialiser la machine virtuelle %(name)s. D?tails: %(err)s"
+"Impossible de r?initialiser la machine virtuelle %(name)s. D?tails : %(err)s"
 
 msgid "User name list must be an array"
 msgstr ""
+"La liste de noms d'utilisateur doit ?tre un tableau"
 
 msgid "User name must be a string"
-msgstr "Le nom d'utilisateur doit ?tre une cha?ne de caract?res"
+msgstr ""
+"Le nom d'utilisateur doit ?tre une cha?ne"
 
 msgid "Group name list must be an array"
 msgstr ""
+"La liste de noms de groupe doit ?tre un tableau"
 
 msgid "Group name must be a string"
-msgstr "Le nom de groupe doit ?tre une cha?ne de caract?res"
+msgstr ""
+"Le nom de groupe doit ?tre une cha?ne"
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "Le(s) utilisateur(s) '%(users)s' n'existe(nt) pas"
+msgstr ""
+"Le ou les utilisateurs '%(users)s' n'existent pas"
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "Le(s) groupe(s) '%(groups)s' n'existe(nt) pas"
+msgstr ""
+"Le ou les groupes '%(groups)s' n'existent pas"
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossible d'?teindre la machine virtuelle %(name)s. D?tails: %(err)s"
+msgstr ""
+"Impossible d'arr?ter la machine virtuelle %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible d'acc?der aux metadata de la machine virtuelle %(name)s. D?tails: "
-"%(err)s"
+"Impossible d'obtenir l'acc?s aux m?tadonn?es de la machine virtuelle %(name)s. D?tails : %(err)s"
 
 msgid "The guest console password must be a string."
-msgstr "Le mot de passe de console invit?e doit ?tre une cha?ne de caract?res."
+msgstr ""
+"Le mot de passe de la console invit? doit ?tre une cha?ne."
 
 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"
+msgstr ""
+"La dur?e de vie du mot de passe de console invit? doit ?tre une valeur num?rique."
 
 #, python-format
 msgid "Virtual machine '%(name)s' must be stopped before cloning it."
 msgstr ""
+"La machine virtuelle '%(name)s' doit ?tre arr?t?e avant d'?tre clon?e."
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
 msgstr ""
+"Espace disque insuffisant pour cloner la machine virtuelle '%(name)s'"
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Impossible de cloner la machine virtuelle '%(name)s'. D?tails : %(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"Op?ration non valide pour la machine virtuelle non permanente %(name)s"
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"Impossible d'interrompre la machine virtuelle '%(name)s' car elle n'est pas en cours d'ex?cution."
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Impossible d'interrompre la machine virtuelle '%(name)s'. D?tails : %(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"Impossible de reprendre la machine virtuelle '%(name)s' car elle n'est pas interrompue."
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Impossible de reprendre la machine virtuelle '%(name)s'. D?tails : %(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"La m?moire affect?e est sup?rieure ? la quantit? maximale autoris?e sur l'h?te."
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"La machine virtuelle '%(name)s' ne prend pas en charge la mise ? jour dynamique de la m?moire. Mettez ? jour la m?moire avec "
+"la machine hors ligne pour activer cette fonction."
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"Seule une augmentation de la m?moire est autoris?e sur les machines virtuelles actives"
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"Pour la mise ? jour dynamique de la m?moire, la nouvelle valeur de m?moire doit ?tre ?gale ? l'ancienne valeur plus "
+"des multiples de 1024 Mib"
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"Il n'existe pas assez d'emplacements disponibles de 1024 Mib sur l'invit?."
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"La version libvirt de l'h?te ne prend pas en charge les unit?s de m?moire. Libvirt doit ?tre >= "
+"1.2.14"
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"Erreur d'attachement de l'unit? de m?moire. D?tails : %(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
-"La machine virtuelle %(vmid)s ne peut pas contenir le p?riph?rique h?te "
-"directement assign? %(dev_name)s."
+"La machine virtuelle VM %(vmid)s ne contient pas l'unit? h?te affect?e directement %(dev_name)s."
 
 #, 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"
+"L'unit? h?te %(dev_name)s n'est pas autoris?e ? ?tre affect?e directement ? la machine virtuelle."
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -391,342 +445,384 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
+"Aucun groupe IOMMU trouv?. Le passe-syst?me PCI h?te a besoin d'un groupe IOMMU pour "
+"fonctionner correctement. Activez Intel VT-d ou AMD IOMMU dans votre BIOS, puis v?rifiez "
+"que le noyau est compil? avec le support IOMMU. Pour l'UC Intel, ajoutez intel_iommu=on "
+"pour le param?tre de noyau dans /boot/grub2/grub.conf. Pour l'UC AMD, ajoutez iommu=pt "
+"iommu=1."
 
 msgid "\"name\" should be a device name string"
-msgstr "\"name\" doit ?tre un nom de p?riph?rique"
+msgstr ""
+"\"name\" doit ?tre une cha?ne de nom d'unit?"
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"L'unit? %(name)s est probablement utilis?e par l'h?te. Impossible de l'attacher ? "
+"l'h?te."
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr "L'interface %(iface)s n'existe pas dans la machine virtuelle %(name)s"
+msgstr ""
+"L'interface %(iface)s n'existe pas sur la machine virtuelle %(name)s"
 
 #, python-format
 msgid ""
 "Network %(network)s specified for virtual machine %(name)s does not exist"
 msgstr ""
-"Le r?seau %(network)s sp?cifi? pour la machine virtuelle %(name)s n'existe "
-"pas"
+"Le r?seau %(network)s indiqu? pour la machine virtuelle %(name)s n'existe pas"
 
 msgid "Supported virtual machine interfaces type is only network"
 msgstr ""
-"Le type d'interface de machine virtuelle support? est r?seau uniquement"
+"Type d'interface de machine virtuelle pris en charge : r?seau uniquement"
 
 msgid "Network name for virtual machine interface must be a string"
 msgstr ""
-"Le nom de r?seau pour l'interface de la machine virtuelle doit ?tre une "
-"cha?ne de caract?res"
+"Le nom de r?seau pour l'interface de la machine virtuelle doit ?tre une cha?ne"
 
 msgid "Invalid network model card specified for virtual machine interface"
 msgstr ""
-"Mod?le de carte r?seau sp?cifi? invalide pour l'interface de machine "
-"virtuelle"
+"La carte de mod?le r?seau sp?cifi?e pour l'interface de la machine virtuelle n'est pas valide"
 
 msgid "Specify type and network to add a new virtual machine interface"
 msgstr ""
-"Sp?cifier le type et le r?seau ? ajouter ? la nouvelle interface de la "
-"machine virtuelle"
+"Sp?cifiez un type et un r?seau ? ajouter ? une nouvelle interface de machine virtuelle"
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"L'adresse MAC doit ?tre conforme au format FF:FF:FF:FF:FF:FF"
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"L'adresse MAC %(mac)s existe d?j? sur la machine virtuelle %(name)s"
 
 msgid "Invalid MAC Address"
 msgstr ""
+"Adresse MAC non valide"
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"Impossible de modifier l'adresse MAC d'une machine virtuelle en cours d'ex?cution"
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "Le mod?le %(name)s existe d?j?"
+msgstr ""
+"Le mod?le %(name)s existe d?j?"
 
 #, python-format
 msgid ""
 "Network '%(network)s' specified for template %(template)s does not exist"
 msgstr ""
-"Le r?seau '%(network)s' sp?cifi? pour le mod?le %(template)s n'existe pas"
+"Le r?seau '%(network)s' indiqu? pour le mod?le %(template)s n'existe pas"
 
 #, python-format
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
 msgstr ""
-"Le pool de stockage sp?cifi? %(pool)s pour le mod?le %(template)s n'existe "
-"pas"
+"Le pool de stockage '%(pool)s' indiqu? pour le mod?le %(template)s n'existe pas"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
 msgstr ""
-"Le pool de stockage sp?cifi? %(pool)s pour le mod?le %(template)s n'est pas "
-"actif"
+"Le pool de stockage '%(pool)s' indiqu? pour le mod?le %(template)s n'est pas actif"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "Param?tres  '%(param)s' sp?cifi? invalide pour le CDROM"
+msgstr ""
+"Param?tre non valide '%(param)s' sp?cifi? pour le CD-ROM."
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
 msgstr ""
-"Le r?seau %(network)s sp?cifi? pour le mod?le %(template)s n'est pas actif"
+"Le r?seau '%(network)s' indiqu? pour le mod?le %(template)s n'est pas actif"
 
 msgid "Template name must be a string"
-msgstr "Le mod?le de nom doit ?tre une cha?ne de caract?res"
+msgstr ""
+"Le nom du mod?le doit ?tre une cha?ne"
 
 msgid "Template icon must be a path to the image"
-msgstr "Le mod?le d'icone doit ?tre un chemin vers l'image"
+msgstr ""
+"L'ic?ne de mod?le doit ?tre un chemin d'acc?s ? l'image"
 
 msgid "Template distribution must be a string"
-msgstr "Le mod?le de distribution doit ?tre une cha?ne de caract?res"
+msgstr ""
+"La distribution du mod?le doit ?tre une cha?ne"
 
 msgid "Template distribution version must be a string"
 msgstr ""
-"Le mod?le de version de distribution doit ?tre une cha?ne de caract?res"
+"La version de distribution du mod?le doit ?tre une cha?ne"
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "Le nombre de CPU doit ?tre un nombre entier sup?rieur ? 0"
+msgstr ""
+"Le nombre d'UC doit ?tre un entier sup?rieur ? 0"
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr "La quantit? de m?moire (Mo) doit ?tre un nombre entier sup?rieur ? 512"
+msgstr ""
+"La quantit? de m?moire (Mo) doit ?tre un entier sup?rieur ? 512"
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "Le CDROM mod?le doit ?tre un fichier ISO local ou distant"
+msgstr ""
+"Le CD-ROM mod?le doit ?tre un fichier ISO local ou distant"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
-msgstr "URI %(value)s du pool de stockage sp?cifi?e invalide pour le mod?le"
+msgstr ""
+"URI du pool de stockage non valide %(value)s indiqu? pour le mod?le"
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
 msgstr ""
-"Sp?cifiez une image ISO comme CDROM ou une image de base pour cr?er un mod?le"
+"Indiquez une image ISO comme CD-ROM ou image de base pour cr?er un mod?le"
 
 msgid "All networks for the template must be specified in a list."
-msgstr "Tous les r?seaux pour le mod?le doivent ?tre sp?cifi?s dans une liste"
+msgstr ""
+"Tous les r?seaux du mod?le doivent ?tre sp?cifi?s dans une liste."
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
 msgstr ""
+"Sp?cifiez un volume sur un mod?le lorsque le pool de stockage est iSCSI ou SCSI"
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
-msgstr "Le volume %(volume)s n'est pas dans le pool de stockage %(pool)s"
+msgstr ""
+"Le volume %(volume)s n'est pas dans le pool de stockage %(pool)s"
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
-msgstr "Impossible de cr?er le mod?le ? cause de l'erreur: %(err)s"
+msgstr ""
+"Impossible de cr?er le mod?le en raison de l'erreur suivante : %(err)s"
 
 #, python-format
 msgid "Unable to delete template due error: %(err)s"
-msgstr "Impossilbe de supprimer le mod?le ? cause de l'erreur: %(err)s"
+msgstr ""
+"Impossible de supprimer le mod?le en raison de l'erreur suivante : %(err)s"
 
 msgid "Disk size must be an integer greater than 1GB."
-msgstr "La taille de disque doit ?tre un entier sup?rieur ? 1Go."
+msgstr ""
+"La taille du disque doit ?tre un entier sup?rieur ? 1 Go."
 
 msgid "Template base image must be a valid local image file"
-msgstr "L'image de base de mod?le doit petre un fichier image local valide"
+msgstr ""
+"L'image de base du mod?le doit ?tre un fichier image local valide"
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
-msgstr "Ne peut identifier le format de l'image de base %(path)s"
+msgstr ""
+"Impossible d'identifier le format %(path)s de l'image de base"
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
 msgstr ""
+"Lors de la sp?cification de la topologie d'UC, les UC virtuelles doivent ?tre un produit des sockets, coeurs et "
+"unit?s d'ex?cution."
 
 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."
+"Lors de la sp?cification de la topologie d'UC, chaque ?l?ment doit ?tre un entier sup?rieur ? "
+"z?ro."
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"Format d'image de disque non valide. Formats valides : bochs, cloop, cow, dmg, qcow, "
+"qcow2, qed, raw, vmdk, vpc."
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "Le pool de stockage %(name)s existe d?j?"
+msgstr ""
+"Le pool de stockage %(name)s existe d?j?"
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "Le pool de stockage %(name)s n'existe pas"
+msgstr ""
+"Le pool de stockage %(name)s n'existe pas"
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr "Sp?cifier %(item)s afin de cr?er le pool de stockage %(name)s"
+msgstr ""
+"Sp?cifiez %(item)s pour cr?er le pool de stockage %(name)s"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "Impossible de supprimer le pool de stockage actif %(name)s"
+msgstr ""
+"Impossible de supprimer le pool de stockage actif %(name)s"
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "Impossible de lister les pools de stockage. D?tails: %(err)s"
+msgstr ""
+"Impossible de r?pertorier les pools de stockage. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr "Impossilble de cr?er le pool de stockage %(name)s. D?tails: %(err)s"
+msgstr ""
+"Impossible de cr?er le pool de stockage %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
 msgstr ""
-"Impossible d'obtenir le nombre de volumes de stockage dans le pool de "
-"stockage%(name)s. D?tails: %(err)s"
+"Impossible d'obtenir le nombre de volumes de stockage dans le pool de stockage %(name)s. D?tails : "
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr "Impossible d'activer le pool de stockage %(name)s. D?tails: %(err)s"
+msgstr ""
+"Impossible d'activer le pool de stockage %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de d?sactiver le pool de stockage %(name)s. D?tails: %(err)s"
+"Impossible de d?sactiver le pool de stockage %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de supprimer le pool de stockage %(name)s. D?tails: %(err)s "
+"Impossible de supprimer le pool de stockage %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
 msgstr ""
-"Impossible de cr?er le Pool NFS du fait que le chemin d'export %(path)s "
-"pourrait se bloquer durant le montage"
+"Impossible de cr?er le pool NFS car le chemin d'exportation %(path)s risque de bloquer lors du montage"
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"Impossible de cr?er le pool NFS du fait que le montage du chemin d'export  "
-"%(path)s  a ?chou?"
+"Impossible de cr?er le pool NFS car le montage du chemin d'exportation %(path)s a ?chou?"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "Type de pool de stockage non support?: %(type)s"
+msgstr ""
+"Type de pool de stockage non pris en charge : %(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
 msgstr ""
+"Erreur d'extraction du fichier XML du pool de stockage dans %(pool)s"
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"Le nom du pool de stockage doit ?tre une cha?ne sans barre oblique (/)"
 
 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"
+"Types de pool de stockage pris en charge : 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"
+msgstr ""
+"Le chemin du pool de stockage doit ?tre une cha?ne"
 
 msgid "Storage pool host must be a IP or hostname"
-msgstr "L'h?te du pool de stockage doit ?tre une IP ou un nom d'h?te"
+msgstr ""
+"L'h?te du pool de stockage doit ?tre une adresse IP ou un nom d'h?te"
 
 msgid "Storage pool device must be the absolute path to the block device"
 msgstr ""
+"L'unit? du pool de stockage doit correspondre au chemin d'acc?s absolu ? l'unit? par bloc"
 
 msgid "Storage pool devices parameter must be a list"
-msgstr "Le param?tre de p?riph?rique de pool de stockage doit ?tre une list"
+msgstr ""
+"Le param?tre des unit?s du pool de stockage doivent constituer une liste"
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "La cible IQN d'un pool iSCSI doit ?tre une cha?ne de caract?res"
+msgstr ""
+"Le nom qualifi? iSCSI (IQN) cible d'un pool iSCSI doit ?tre une cha?ne"
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
 msgstr ""
-"Le port d'un serveur de stockage distant doit ?tre un nombre entier entre 1 "
-"et 65535"
+"Le port d'un serveur de stockage distant doit ?tre un entier compris entre 1 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"
+"Le nom d'utilisateur cible iSCSI doit ?tre une cha?ne"
 
 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"
+msgstr ""
+"Le mot de passe cible iSCSI doit ?tre une cha?ne"
 
 msgid "Specify name and type to create a storage pool"
-msgstr "Sp?cifier un nom et un type pour cr?er un pool de stockage"
+msgstr ""
+"Indiquez le nom et le type pour cr?er un pool de stockage"
 
 #, python-format
 msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
 msgstr ""
-"%(disk)s n'est pas un(e) disque/partition valide. N'a pu l'ajouter au pool "
+"%(disk)s n'est pas un disque/une partition valide. Impossible de l'ajouter au pool "
 "%(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
-msgstr "Impossible d'agrandir le pool logique %(pool)s. D?tails: %(err)s"
+msgstr ""
+"Impossible d'?tendre le pool logique %(pool)s. D?tails : %(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
 msgstr ""
-"Les disques en param?tre peuvent seulement ?tre mis ? jour pour un pool de "
-"stockage logique."
+"Les disques de param?tre peuvent ?tre mis ? jour uniquement pour le pool de stockage logique."
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "Le nom d'adaptateur de l'h?te SCSI doit ?tre une chapine de caract?res"
+msgstr ""
+"Le nom de l'adaptateur h?te SCSI doit ?tre une cha?ne."
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr "Le pool de stockage kimchi_isos est r?serv? ? un usage interne"
+msgstr ""
+"Le pool de stockage kimchi_isos est r?serv? ? un usage interne"
 
 #, python-format
 msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossible d'activer le pool de stockage NFS%(name)s. Le serveur NFS "
-"%(server)s n'est pas joignable."
+"Impossible d'activer le pool de stockage NFS %(name)s. Le serveur NFS %(server)s est "
+"inaccessible."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossible de d?sactiver le pool de stockage NFS%(name)s. Le serveur NFS "
-"%(server)s n'est pas joignable."
+"Impossible de d?sactiver le pool de stockage NFS %(name)s. Le serveur NFS %(server)s est "
+"inaccessible."
 
 #, python-format
 msgid ""
 "Unable to deactivate pool %(name)s as it is associated with some templates"
 msgstr ""
-"Impossible de d?sactiver le pool %(name)s du fait qu'il est associ? ? des "
-"mod?les"
+"Impossible de d?sactiver le pool %(name)s car il est associ? ? plusieurs mod?les"
 
 #, python-format
 msgid "Unable to delete pool %(name)s as it is associated with some templates"
 msgstr ""
-"Impossible de supprimer le pool %(name)s du fait qu'il est associ? ? des "
-"mod?les"
+"Impossible de supprimer le pool %(name)s car il est associ? ? plusieurs mod?les"
 
 #, python-format
 msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
 msgstr ""
-"Un groupe de volume appel? '%(name)s' existe d?j?. Veuillez choisir un autre "
-"nom pour cr?er le pool logique."
+"Un groupe de volumes nomm? '%(name)s' existe d?j?. Choisissez un autre nom "
+"pour cr?er le pool logique."
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
 msgstr ""
-"Impossible de mettre ? jour la base de donn?es avec les informations de scan "
-"profond ? cause de l'erreur: %(err)s"
+"Impossible de mettre ? jour la base de donn?es avec des informations d'analyse approfondie en raison de l'erreur suivante : %(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "Le volume de stockage %(name)s existe d?j?"
+msgstr ""
+"Le volume de stockage %(name)s existe d?j?"
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
@@ -738,86 +834,92 @@ 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"
-msgstr "Sp?cifier %(item)s afin de cr?er le volume de stockage %(volume)s"
+msgstr ""
+"Sp?cifiez %(item)s afin de cr?er le volume de stockage %(volume)s"
 
 #, 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 "
-"%(pool)s n'est pas actif"
+"Impossible de r?pertorier les volumes de stockage car le pool de stockage %(pool)s n'est pas actif"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
 msgstr ""
-"Impossible de cr?er le volume de stockage %(name)s dans le pool de stockage "
-"%(pool)s. D?tails: %(err)s"
+"Impossible de cr?er le volume de stockage %(name)s dans le pool de stockage %(pool)s. D?tails : "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"Impossible de lister les volumes de stockage dans le pool de stockage "
-"%(pool)s. D?tails: %(err)s"
+"Impossible de r?pertorier les volumes de stockage dans le pool de stockage %(pool)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
-msgstr "Impossible de wiper les volumes de stockage %(name)s. D?tails: %(err)s"
+msgstr ""
+"Impossible d'effacer les volumes de stockage %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de supprimer le volume de stockage %(name)s. D?tails: %(err)s "
+"Impossible de supprimer le volume de stockage %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de redimensionner le volume de stockage %(name)s. D?tails: %(err)s"
+"Impossible de redimensionner le volume de stockage %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
 msgstr ""
-"Le type de stockage %(type)s ne supporte pas ni la cr?ation ni la "
-"suppression de volume"
+"Le type de stockage %(type)s ne prend pas en charge la cr?ation et la suppression de volume"
 
 msgid "Storage volume name must be a string"
-msgstr "Le nom de volume de stockage doit ?tre une cha?ne de caract?res"
+msgstr ""
+"Le nom du volume de stockage doit ?tre une cha?ne"
 
 msgid "Storage volume allocation must be an integer number"
-msgstr "L'allocation de volume de stockage doit ?tre une nombre entier"
+msgstr ""
+"L'allocation de volume de stockage doit ?tre un nombre entier"
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"Format du volume de stockage non pris en charge. Formats valides : bochs, cloop, cow, dmg, "
+"qcow, qcow2, qed, raw, vmdk, vpc."
 
 msgid "Storage volume requires a volume name"
-msgstr "Le volume de stockage requiert un nom de volume"
+msgstr ""
+"Le volume de stockage requiert un nom de volume"
 
 #, python-format
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
 msgstr ""
-"Impossible de mettre ? jour la base de donn?es avec les informations du "
-"volume de stockage ? cause de l'erreur: %(err)s"
+"Impossible de mettre ? jour la base de donn?es avec des informations de volume de stockage en raison de l'erreur suivante : %(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
-msgstr "Seulement un seul des param?tre %(param)s peut ?tre sp?cifi?"
+msgstr ""
+"Un seul param?tre %(param)s peut ?tre sp?cifi?"
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
-msgstr "La cr?ation de volume avec %(param)s n'est pas support?e"
+msgstr ""
+"La cr?ation d'un volume ? partir de %(param)s n'est pas prise en charge"
 
 msgid "Storage volume capacity must be an integer number."
-msgstr "La capacit? du volume de stockage doit ?tre un nombre entier."
+msgstr ""
+"La capacit? du volume de stockage doit correspondre ? un nombre entier."
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
 msgstr ""
@@ -825,1542 +927,1915 @@ msgstr ""
 
 #, 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."
+msgstr ""
+"Impossible d'acc?der au fichier %(url)s. V?rifiez ce dernier."
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossible de cloner le volume de stockage '%(name)s' dans le pool '%(pool)s'. D?tails : "
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"Sp?cifiez les donn?es de bloc et leur taille pour t?l?charger un fichier."
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"Pour t?l?charger un volume de stockage, sp?cifiez le param?tre 'upload'."
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"Impossible de t?l?charger les donn?es de bloc car elles ne correspondent pas ? la taille de bloc."
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"Le volume de stockage %(vol)s n'est pas soumis ? un processus de t?l?chargement."
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"Le t?l?chargement des donn?es de bloc d?passe la taille du volume de stockage."
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"Impossible de t?l?charger les donn?es de bloc dans le volume de stockage. D?tails : %(err)s."
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "L'interface %(name)s n'existe pas"
+msgstr ""
+"L'interface %(name)s n'existe pas"
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "Le r?seau %(name)s existe d?j?"
+msgstr ""
+"Le r?seau %(name)s existe d?j?"
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "Le r?seau %(name)s n'existe pas"
+msgstr ""
+"Le r?seau %(name)s n'existe pas"
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
 msgstr ""
-"Le sous-r?seau  %(subnet)s sp?cifi? pour le r?seau %(network)s n'est pas "
-"valide"
+"Le sous-r?seau %(subnet)s indiqu? pour le r?seau %(network)s n'est pas valide."
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
-msgstr "Sp?cifier une interface r?seau pour cr?er le r?seau bridge %(name)s"
+msgstr ""
+"Indiquez une interface r?seau pour cr?er le r?seau rout? %(name)s"
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "Impossible de supprimer le r?seau actif %(name)s"
+msgstr ""
+"Impossible de supprimer le r?seau actif %(name)s"
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
 msgstr ""
-"L'interface %(iface)s sp?cifi?e pour le r?seau %(network)s est d?j? utilis?e"
+"L'interface %(iface)s indiqu?e pour le r?seau %(network)s est d?j? utilis?e"
 
 msgid "Interface should be bare NIC, bonding or bridge device."
-msgstr "L'interface doit ?tre un p?riph?rique NIC vide, bonding ou bridg?."
+msgstr ""
+"L'interface doit ?tre un contr?leur NIC nu, une unit? de pontage ou de liaison."
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "Impossible de cr?er le r?seau %(name)s. D?tails: %(err)s"
+msgstr ""
+"Impossible de cr?er le r?seau %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "Impossible de trouver une adresse IP libre pour le r?seau '%(name)s'"
+msgstr ""
+"Impossible de trouver une adresse IP disponible pour le r?seau '%(name)s'"
 
 #, python-format
 msgid "The interface %(iface)s already exists."
-msgstr "L'interface %(iface)s existe d?j?"
+msgstr ""
+"L'interface %(iface)s existe d?j?."
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"Le nom du r?seau doit ?tre une cha?ne sans barre oblique (/) ni guillemet (\")"
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "Les types de r?seaux support?s sont isolated, NAT et bridge"
+msgstr ""
+"Les types de r?seau pris en charge sont isol?, NAT et rout?"
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
 msgstr ""
-"Le sous-r?seau doit ?tre une chaine de caract?res avec une adresse IP et un "
-"pr?fixe ou un masque de r?seau"
+"Le sous-r?seau du r?seau doit ?tre une cha?ne avec adresse IP et pr?fixe ou masque de r?seau"
 
 msgid "Network interface must be a string"
-msgstr "L'interface de r?seau doit ?tre une cha?ne de caract?res"
+msgstr ""
+"L'interface r?seau doit ?tre une cha?ne"
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "L'ID de VLAN du r?seau doit ?tre un nombre entier entre 1 et 4094"
+msgstr ""
+"L'ID r?seau local virtuel du r?seau doit ?tre un entier compris entre 1 et 4094"
 
 msgid "Specify name and type to create a Network"
-msgstr "Sp?cifiez un nom et un type pour cr?er un r?seau"
+msgstr ""
+"Indiquez le nom et le type pour cr?er un r?seau"
 
 #, python-format
 msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
-"Impossible de supprimer le r?seau %(name)s. Il y a des machines virtuelles "
-"%(vms)s et/ou des mod?les li?s ? ce r?seau. "
+"Impossible de supprimer le r?seau %(name)s. Il existe plusieurs machines virtuelles %(vms)s "
+"et/ou mod?les li?s ? ce r?seau."
 
 #, python-format
 msgid ""
 "Unable to deactivate network %(name)s. There are some virtual machines "
 "%(vms)s and/or templates linked to this network."
 msgstr ""
-"Impossible de d?sactiver r?seau %(name)s. Il y a des machines virtuelles"
-"%(vms)s et/ou des mod?les li?s ? ce r?seau. "
+"Impossible de d?sactiver le r?seau %(name)s. Il existe plusieurs machines virtuelles "
+"%(vms)s et/ou mod?les li?s ? ce r?seau."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
 msgstr ""
-"Le p?riph?rique bridge %(name)s ne peut ?tre le p?riph?rique tronc d'un VLAN."
+"L'unit? de pontage %(name)s ne peut pas ?tre l'unit? de liaison d'un r?seau local virtuel."
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "?chec durant l'activation de l'interface %(iface)s: %(err)s."
+msgstr ""
+"Echec de l'activation de l'interface %(iface)s: %(err)s."
 
 #, python-format
 msgid ""
 "Failed to activate interface %(iface)s. Please check the physical link "
 "status."
 msgstr ""
-"?chec durant l'activation de l'interface %(iface)s. Veuillez v?rifier le "
-"statut du lien physique."
+"Echec de l'activation de l'interface %(iface)s. V?rifiez l'?tat de "
+"la liaison physique."
 
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
 msgstr ""
+"Echec du d?marrage du r?seau %(name)s. D?tails : %(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "Le rapport de d?boggage %(name)s n'existe pas"
+msgstr ""
+"Le rapport de d?bogage %(name)s n'existe pas"
 
 msgid "Debug report tool not found in system"
-msgstr "L'outil de rapport de d?boggage n'a pas ?t? trouv? dans le syst?me"
+msgstr ""
+"Outil de g?n?ration de rapports de d?bogage introuvable sur le syst?me"
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
 msgstr ""
-"Impossible de cr?er le rapport de d?boggage %(name)s. D?tails: %(err)s."
+"Impossible de cr?er le rapport de d?bogage %(name)s. D?tails : %(err)s."
 
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
 msgstr ""
-"Impossible de trouver un rapport de d?boggage avec le nom fourni %(name)s"
+"Aucun rapport de d?bogage nomm? %(name)s n'a ?t? trouv?"
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
 msgstr ""
-"Impossible de g?n?rer le rapport de d?boggage %(name)s. D?tails: %(err)s"
+"Impossible de g?n?rer le rapport de d?bogage %(name)s. D?tails : %(err)s"
 
 msgid "You should give a name for the debug report file."
-msgstr "Vous devriez donner un nom au fichier de rapport de d?boggage."
+msgstr ""
+"Vous devez indiquer un nom pour le fichier du rapport de d?bogage."
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
-"Le nom du rapport de d?boggage doit ?tre une cha?ne de caract?res. Seulement "
-"les lettres, chiffres, blanc soulign? ('_') et tirets ('-') sont accept?s."
+"Le nom du rapport de d?bogage doit ?tre une cha?ne. Seuls des lettres, chiffres, trait de soulignement ('_') "
+"et tiret ('-') sont autoris?s."
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
 msgstr ""
-"Le rapport de d?boggage avec le nom sp?cifi? \"%(name)s\" existe d?j?. "
-"Veuillez en utiliser un autre."
+"Le rapport de d?bogage nomm? \"%(name)s\" existe d?j?. Veuillez utiliser "
+"un autre nom."
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "Le server de stockage %(server)s n'?tait pas utilis? par Kimchi"
+msgstr ""
+"Le serveur de stockage %(server)s n'a pas ?t? utilis? par Kimchi"
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "La distro '%(name)s' n'existe pas"
+msgstr ""
+"La distribution '%(name)s' n'existe pas"
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "La partition %(name)s n'existe pas sur cet h?te"
+msgstr ""
+"La partition %(name)s n'existe pas sur l'h?te"
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
 msgstr ""
-"Impossible d'?teindre la machine h?te car des machines virtuelles en sont "
-"cours d'ex?cution"
+"Impossible d'arr?ter la machine h?te car des machines virtuelles sont en cours d'ex?cution"
 
 msgid "Unable to reboot host machine as there are running virtual machines"
 msgstr ""
-"Impossible de red?marrer la machine h?te car des machines virtuelles en sont "
-"cours d'ex?cution"
+"Impossible de r?amorcer la machine h?te car des machines virtuelles sont en cours d'ex?cution"
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "P?riph?rique de noeud '%(name)s' non trouv?"
+msgstr ""
+"Unit? de noeud '%(name)s' introuvable"
 
 msgid "Conflicting flag filters specified."
-msgstr "Filtres incompatibles sp?cifi?s."
+msgstr ""
+"Filtres d'indicateur en conflit sp?cifi?s."
 
 msgid "No packages marked for update"
-msgstr "Aucun paquet marqu? pour mise ? jour"
+msgstr ""
+"Aucun module marqu? pour mise ? jour"
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "Le paquet %(name)s n'est pas marqu? pour mise ? jour"
+msgstr ""
+"Le module %(name)s n'est pas marqu? pour mise ? jour."
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
 msgstr ""
-"Erreur durant la r?cup?ration des paquets marqu?s pour la mise? jour. "
-"D?tails: %(err)s"
+"Erreur lors de l'obtention des modules marqu?s pour mise ? jour. D?tails : %(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "Il n'y a pas de gestionnaire de paquets compatible avec ce syst?me."
+msgstr ""
+"Aucun gestionnaire de modules compatible pour ce syst?me."
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "Impossible de trouver %(item)s dans le magasin de donn?es"
+msgstr ""
+"%(item)s introuvable dans le magasin de donn?es"
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "URI %(uri)s invalide"
+msgstr ""
+"URI %(uri)s non valide"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
 msgstr ""
-"Timeout durant l'ex?cution de la commande '%(cmd)s' apr?s %(seconds)s "
-"secondes"
+"D?passement de d?lai lors de l'ex?cution de la commande '%(cmd)s' apr?s %(seconds)s secondes"
 
 msgid "Unable to choose a virtual machine name"
-msgstr "Impossible de s?lectionner un nom de machine virtuelle"
+msgstr ""
+"Impossible de s?lectionner un nom de machine virtuelle"
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"Valeur de donn?es '%(value)s' non valide"
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"Unit? de donn?es '%(unit)s' non valide"
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "Type de stockage invalide. Les Types support?s sont: 'cdrom', 'disk'"
+msgstr ""
+"Type de stockage non valide. Types pris en charge : 'cdrom', 'disk'"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
 msgstr ""
+"Le chemin '%(value)s' n'est pas un chemin local/distant valide pour l'unit?"
 
 msgid "Only CDROM path can be update."
-msgstr "Seulement le chemin d'un CDROM peut ?tre modifi?."
+msgstr ""
+"Seul le chemin du CD-ROM peut ?tre mis ? jour."
 
 #, python-format
 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"
+"L'unit? de stockage %(dev_name)s n'existe pas sur la machine virtuelle "
+"%(vm_name)s"
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
 msgstr ""
-"Erreur durant la cr?ation du nouveau p?riph?rique de stockage: %(error)s"
+"Erreur lors de la cr?ation de l'unit? de stockage : %(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
-msgstr "Erreur durant la mise ? jour du p?riph?rique de stockage: %(error)s"
+msgstr ""
+"Erreur lors de la mise ? jour de l'unit? de stockage : %(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
-msgstr "Erreur durant le retrait du p?riph?rique de stockage: %(error)s"
+msgstr ""
+"Erreur lors du retrait de l'unit? de stockage : %(error)s"
 
 msgid "Do not support IDE device hot plug"
-msgstr "Ne pas supporter le branchement ? chaud de p?riph?rique IDE"
+msgstr ""
+"Pas de prise en charge du remplacement ? chaud d'unit? IDE"
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
 msgstr ""
-"Sp?cifier le type et le chemin ou le type et le pool/volume pour ajouter un "
-"nouveau disque de machine virtuelle."
+"Sp?cifiez un type et un chemin pour ajouter un nouveau disque "
+"de machine virtuelle"
 
 msgid "Specify path to update virtual machine disk"
-msgstr "Sp?cifier un chemin pour mettre ? jour le disque de machine virtuelle"
+msgstr ""
+"Indiquez le chemin pour mettre ? jour le disque de machine virtuelle"
 
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
 msgstr ""
-"La limitation de %(limit)s p?riph?riques a ?t? atteinte pour le contr?leur "
-"de type %(type)s "
+"Le type de contr?leur %(type)s a atteint sa limite de %(limit)s unit?s"
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
 msgstr ""
+"Impossible d'extraire les informations de chemin d'acc?s au disque pour le pool/volume donn? : %(error)s"
 
 msgid "Volume already in use by other virtual machine."
 msgstr ""
+"Le volume est d?j? utilis? par une autre machine virtuelle."
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
 msgstr ""
-"Seul un chemin ou pool/volume peut ?tre sp?cifi? pour ajouter un nouveau "
-"disque de machine virtuelle"
+"Soit le chemin, soit le pool/volume peut ?tre sp?cifi? pour ajouter un nouveau disque "
+"de machine virtuelle"
 
 #, python-format
 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 choisi avec le format %(format)s n'est pas adapt? au type de stockage "
+"%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
 msgstr ""
-"L'ID du d?p?t YUM doit ?tre une cha?ne de caract?res ne comportant qu'un "
-"seul mot"
+"L'ID r?f?rentiel YUM doit ?tre une cha?ne d'un seul mot."
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "L'URL du d?p?t doit ?tre une URL en http://, ftp:// ou file://."
+msgstr ""
+"L'URL du r?f?rentiel doit ?tre de type http://, ftp:// ou file://."
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
 "repository type."
 msgstr ""
-"La configuration du d?p?t est un dictionaire avec des valeurs sp?cifiques en "
-"accord avec le type de d?p?t."
+"La configuration de r?f?rentiel est un dictionnaire avec des valeurs sp?cifiques en fonction "
+"du type de r?f?rentiel."
 
 msgid "Distribution to DEB repository must be a string"
 msgstr ""
-"La distribution dans le nom de d?p?t DEB doit ?tre une cha?ne de caract?res"
+"La distribution sur le r?f?rentiel DEB doit ?tre une cha?ne"
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "Les composants dans le d?p?t DEB doivent ?tre list?s dans un tableau"
+msgstr ""
+"Les composants du r?f?rentiel DEB doivent ?tre r?pertori?s dans un tableau"
 
 msgid "Components to DEB repository must be a string"
-msgstr "Les composants dans le d?p?t DEB doivent ?tre une cha?ne de caract?res"
+msgstr ""
+"Les composants du r?f?rentiel DEB doivent ?tre une cha?ne"
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"La liste miroir du r?f?rentiel doit ?tre une cha?ne"
 
 msgid "YUM Repository name must be string."
-msgstr "Le nom du d?p?t YUM doit ?tre une cha?ne de caract?res"
+msgstr ""
+"Le nom de r?f?rentiel YUM doit ?tre une cha?ne."
 
 msgid "GPG check must be a boolean value."
-msgstr "La v?rification GPG doit ?tre une valeur bool?enne."
+msgstr ""
+"Le contr?le GPG doit ?tre une valeur bool?enne."
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr "La cl? GPG doit ?tre une URL pointant vers un fichier ASCII non arm?."
+msgstr ""
+"La cl? GPG doit ?tre une URL pointant sur le fichier ASCII."
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "Ne peut mettre ? jour le d?p?t %(repo_id)s."
+msgstr ""
+"Impossible de mettre ? jour le r?f?rentiel %(repo_id)s."
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "Le d?p?t %(repo_id)s n'existe pas."
+msgstr ""
+"Le r?f?rentiel %(repo_id)s n'existe pas."
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"Indiquez l'URL de base du r?f?rentiel, la liste miroir ou le lien afin de cr?er ou "
+"mettre ? jour un r?f?rentiel YUM."
 
 msgid "Repository management tool was not recognized for your system."
-msgstr "L'outil de gestion de d?p?t n'a pas ?t? reconnu pour votre syst?me."
+msgstr ""
+"L'outil de gestion de r?f?rentiel n'a pas ?t? reconnu pour votre syst?me."
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "Le d?p?t %(repo_id)s est d?j? activ?."
+msgstr ""
+"Le r?f?rentiel %(repo_id)s est d?j? activ?."
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "Le d?p?t %(repo_id)s est d?j? d?sactiv?."
+msgstr ""
+"Le r?f?rentiel %(repo_id)s est d?j? d?sactiv?."
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "Ne peut supprimer le d?p?t %(repo_id)s. "
+msgstr ""
+"Impossible de supprimer le r?f?rentiel %(repo_id)s."
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
-msgstr "Ne peut ?crire le fichier de configuration du d?p?t %(repo_file)s"
+msgstr ""
+"Impossible d'?crire dans le fichier de configuration du r?f?rentiel %(repo_file)s"
 
 msgid "Specify repository distribution in order to create a DEB repository."
-msgstr "Sp?cifier la distribution du d?p?t afin de cr?er un d?p?t DEB."
+msgstr ""
+"Indiquez une distribution de r?f?rentiel pour cr?er un r?f?rentiel DEB."
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "Ne peut activer le d?p?t %(repo_id)s."
+msgstr ""
+"Impossible d'activer le r?f?rentiel %(repo_id)s."
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "Ne peut d?sactiver le d?p?t %(repo_id)s."
+msgstr ""
+"Impossible de d?sactiver le r?f?rentiel %(repo_id)s."
 
 msgid "YUM Repository ID already exists"
-msgstr "L'ID du d?p?t YUM existe d?j?"
+msgstr ""
+"L'ID r?f?rentiel YUM existe d?j?"
 
 msgid "YUM Repository name must be a string"
-msgstr "Le nom du d?p?t YUM doit ?tre une cha?ne de caract?res"
+msgstr ""
+"Le nom de r?f?rentiel YUM doit ?tre une cha?ne."
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "Impossible de lister les d?p?ts. D?tails: '%(err)s'"
+msgstr ""
+"Impossible de r?pertorier les r?f?rentiels. D?tails : '%(err)s'"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
-msgstr "Impossible de r?cup?rer les informations du d?p?t. D?tails: '%(err)s'"
+msgstr ""
+"Impossible d'extraire les informations relatives au r?f?rentiel. D?tails : '%(err)s'"
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "Impossible d'ajouter un d?p?t. D?tails: '%(err)s'"
+msgstr ""
+"Impossible d'ajouter le r?f?rentiel. D?tails : '%(err)s'"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "Impossible de supprimer un d?p?t. D?tails: '%(err)s'"
+msgstr ""
+"Impossible de supprimer le r?f?rentiel. 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"
+"Les ?l?ments de configuration '%(items)s' ne sont pas pris en charge par le gestionnaire de r?f?rentiel"
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"Le lien du r?f?rentiel doit ?tre une URL http://, ftp:// ou file://."
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"Impossible de sp?cifier ? la fois la liste miroir et le lien."
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
 msgstr ""
+"La machine virtuelle '%(vm)s' doit ?tre arr?t?e avant la cr?ation d'une image instantan?e de celle-ci."
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossible de cr?er l'image instantan?e '%(name)s' sur la machine virtuelle '%(vm)s'. D?tails : "
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
 msgstr ""
+"L'image instantan?e '%(name)s' n'existe pas sur la machine virtuelle '%(vm)s'."
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossible d'extraire l'image instantan?e '%(name)s' sur la machine virtuelle '%(vm)s'. D?tails : "
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
+"Impossible de r?pertorier les images instantan?es sur la machine virtuelle '%(vm)s'. D?tails : %(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossible de supprimer l'image instantan?e '%(name)s' sur la machine virtuelle '%(vm)s'. D?tails : "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossible d'extraire l'image instantan?e en cours de la machine virtuelle '%(vm)s'. D?tails : "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossible de r?tablir la machine virtuelle '%(vm)s' ? l'image instantan?e '%(name)s'. D?tails : "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
+"Impossible de cr?er l'image instantan?e de la machine virtuelle '%(vm)s' car elle contient un "
+"disque au format '%(format)s' ; seul 'qcow2' est pris en charge."
 
 msgid "The number of vCPUs is too large for this system."
 msgstr ""
+"Le nombre d'UC virtuelles est trop ?lev? pour ce syst?me."
 
 msgid "Invalid vCPU/topology combination."
 msgstr ""
+"Combinaison d'UC virtuelle/topologie non valide."
 
 msgid "This host (or current configuration) does not allow CPU topology."
 msgstr ""
+"Cet h?te (ou configuration actuelle) n'autorise pas la topologie d'UC."
 
 msgid "ERROR CODE"
-msgstr "ERROR CODE"
+msgstr ""
+"CODE D'ERREUR"
 
 msgid "REASON"
-msgstr "REASON"
+msgstr ""
+"MOTIF"
 
 msgid "STACK"
-msgstr "STACK"
+msgstr ""
+"PILE"
 
 msgid "Go to Homepage"
-msgstr "Aller ? la page d'accueil"
+msgstr ""
+"Acc?der ? la page d'accueil"
 
 msgid "Create a New Virtual Machine"
-msgstr "Cr?er une nouvelle Machine Virtuelle"
+msgstr ""
+"Cr?er une machine virtuelle"
 
 msgid "Virtual Machine Name"
-msgstr "Nom de Machine Virtuelle"
+msgstr ""
+"Nom de la machine virtuelle"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
 msgstr ""
-"Le nm est utilis? pour identifier une machine virtuelle. Si omis, un nom "
-"sera choisi en se basant sur le mod?le utilis?."
+"Nom utilis? pour identifier la machine virtuelle. S'il est omis, un nom sera "
+"choisi en fonction du mod?le utilis?."
 
 msgid "Template"
-msgstr "Mod?le"
+msgstr ""
+"Mod?le"
 
 msgid "Please create a template first."
-msgstr "Veuillez d'abord cr?er un mod?le."
+msgstr ""
+"Commencez par cr?er un mod?le."
 
 msgid "Create a Template"
-msgstr "Cr?er un mod?le"
+msgstr ""
+"Cr?er un mod?le"
 
 msgid "Please choose a template."
-msgstr "Veuillez choisir un mod?le"
+msgstr ""
+"S?lectionnez un mod?le."
 
 msgid "OS"
-msgstr "OS"
+msgstr ""
+"SE"
 
 msgid "OS Version"
-msgstr "Version de l'OS"
+msgstr ""
+"Version SE"
 
 msgid "CPUS"
-msgstr "CPUS"
+msgstr ""
+"Unit?s centrales"
 
 msgid "Memory"
-msgstr "M?moire"
+msgstr ""
+"M?moire"
 
 msgid "Create"
-msgstr "Cr?er"
+msgstr ""
+"Cr?er"
 
 msgid "Creating..."
-msgstr "Cr?ation en cours..."
+msgstr ""
+"Cr?ation..."
 
 msgid "Edit Guest"
-msgstr "?diter l'Invit?"
+msgstr ""
+"Editer l'invit?"
 
 msgid "General"
-msgstr "G?n?ral"
+msgstr ""
+"G?n?ral"
 
 msgid "Storage"
-msgstr "Stockage"
+msgstr ""
+"Stockage"
 
 msgid "Interface"
-msgstr "Interface"
+msgstr ""
+"Interface"
 
 msgid "Permission"
-msgstr "Permission"
+msgstr ""
+"Droits"
 
 msgid "Host PCI Device"
-msgstr "P?riph?rique PCI H?te"
+msgstr ""
+"Unit? PCI h?te"
 
 msgid "Snapshot"
 msgstr ""
+"Image instantan?e"
 
 msgid "Name"
-msgstr "Nom"
+msgstr ""
+"Nom"
 
 msgid "CPUs"
-msgstr "CPUs"
+msgstr ""
+"UC"
 
 msgid "Memory (MB)"
-msgstr "M?moire (Mo)"
+msgstr ""
+"M?moire (Mo)"
 
 msgid "Icon"
-msgstr "Icone"
+msgstr ""
+"Ic?ne"
 
 msgid "Device"
-msgstr "P?riph?rique"
+msgstr ""
+"Unit?"
 
 msgid "Path"
-msgstr "Chemin"
+msgstr ""
+"Chemin"
 
 msgid "Network"
-msgstr "R?seau"
+msgstr ""
+"R?seau"
 
 msgid "Type"
-msgstr "Type"
+msgstr ""
+"Type"
 
 msgid "MAC Address"
 msgstr ""
+"Adresse MAC"
 
 msgid "Available system users and groups"
-msgstr "Utilisateurs et groupes syst?mes disponibles"
+msgstr ""
+"Groupes et utilisateurs syst?me disponibles"
 
 msgid "Selected system users and groups"
-msgstr "Utilisateurs et groupes syst?mes s?lectionn?s"
+msgstr ""
+"Groupes et utilisateurs syst?me s?lectionn?s"
 
 msgid "User"
 msgstr ""
+"Utilisateur"
 
 msgid "All"
-msgstr "Tous"
+msgstr ""
+"Tout"
 
 msgid "To Add"
-msgstr "? Ajouter"
+msgstr ""
+"A ajouter"
 
 msgid "Added"
-msgstr "Ajouter"
+msgstr ""
+"Ajout?"
 
 msgid "filter"
-msgstr "Filtre"
+msgstr ""
+"filtre"
 
 msgid "Product"
-msgstr "Produit"
+msgstr ""
+"Produit"
 
 msgid "Vendor"
-msgstr "Vendeur"
+msgstr ""
+"Fournisseur"
 
 msgid "Created"
 msgstr ""
+"Cr??"
 
 msgid "Save"
-msgstr "Enregistrer"
+msgstr ""
+"Sauvegarder"
 
 msgid "Replace"
-msgstr "Remplacer"
+msgstr ""
+"Remplacer"
 
 msgid "Detach"
-msgstr "D?tacher"
+msgstr ""
+"D?tacher"
 
 msgid "Cancel"
-msgstr "Annuler"
+msgstr ""
+"Annuler"
 
 msgid "revert"
 msgstr ""
+"r?tablir"
 
 msgid "Add a Storage Device to VM"
-msgstr "Ajouter un P?riph?rique de Stockage ? la VM"
+msgstr ""
+"Ajouter une unit? de stockage ? la machine virtuelle"
 
 msgid "Device Type"
-msgstr "Type de P?riph?rique"
+msgstr ""
+"Type d'unit?"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
 msgstr ""
-"Le type de p?riph?rique. Actuellement, \"cdrom\" et \"disk\" sont support?s."
+"Type d'unit?. Actuellement, \"cdrom\" et \"disk\" seulement sont pris en charge."
 
 msgid "Storage Pool"
-msgstr "Pool de Stockage"
+msgstr ""
+"Pool de stockage"
 
 msgid "Storage pool which volume located in"
-msgstr "Pool de Stockage dans lequel le volume est situ?"
+msgstr ""
+"Pool de stockage dans lequel le volume est situ?"
 
 msgid "Storage Volume"
-msgstr "Volume de Stockage"
+msgstr ""
+"Volume de stockage"
 
 msgid "Storage volume to be attached"
-msgstr "Le volume de stockage ? attacher"
+msgstr ""
+"Volume de stockage ? attacher"
 
 msgid "File Path"
-msgstr "Chemin de Fichier"
+msgstr ""
+"Chemin d'acc?s au fichier"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "Le chemin de fichier ISO sur le serveur comme CDROM."
+msgstr ""
+"Chemin d'acc?s au fichier ISO sur le serveur pour le CD-ROM."
 
 msgid "Attach"
-msgstr "Attacher"
+msgstr ""
+"Attacher"
 
 msgid "Start"
-msgstr "D?marrer"
+msgstr ""
+"D?marrer"
 
 msgid "Reset"
-msgstr "R?initialiser"
+msgstr ""
+"R?initialiser"
 
 msgid "Pause"
 msgstr ""
+"Pause"
 
 msgid "Resume"
 msgstr ""
+"Reprendre"
 
 msgid "Power Off"
-msgstr "Mettre hors tension"
+msgstr ""
+"Mettre hors tension"
 
 msgid "Actions"
-msgstr "Actions"
+msgstr ""
+"Actions"
 
 msgid "Connect"
-msgstr "Connecter"
+msgstr ""
+"Se connecter"
 
 msgid "Clone"
-msgstr "Cloner"
+msgstr ""
+"Cloner"
 
 msgid "Edit"
-msgstr "?diter"
+msgstr ""
+"Editer"
 
 msgid "Shut Down"
-msgstr "?teindre"
+msgstr ""
+"Arr?ter"
 
 msgid "Delete"
-msgstr "Supprimer"
+msgstr ""
+"Supprimer"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
-"Le nom d'utilisateur ou le mot de passe que vous avez entr? est incorrect. "
-"Veuillez essayer ? nouveau."
+"Le nom d'utilisateur ou le mot de passe entr? est incorrect. Veuillez recommencer."
 
 msgid "This field is required."
-msgstr "Ce champ est requis."
+msgstr ""
+"Cette zone est obligatoire."
 
 msgid "Log in"
-msgstr "Se connecter"
+msgstr ""
+"Connexion"
 
 msgid "Logging in..."
-msgstr "En cours de connexion..."
+msgstr ""
+"Connexion en cours..."
 
 msgid "Host"
-msgstr "H?te"
+msgstr ""
+"H?te"
 
 msgid "Guests"
-msgstr "Invit?s"
+msgstr ""
+"Invit?s"
 
 msgid "Templates"
-msgstr "Mod?les"
+msgstr ""
+"Mod?les"
 
 msgid "Failed to get application configuration"
-msgstr "?chec lors de l'obtention de la configuration de l'application"
+msgstr ""
+"Echec d'obtention de la configuration d'application"
 
 msgid "This is not a valid Linux path"
-msgstr "Ce n'est pas un chemin Linux valide"
+msgstr ""
+"Ce chemin Linux n'est pas valide"
 
 msgid "This is not a valid URL."
-msgstr "Ce n'est pas une URL valide."
+msgstr ""
+"Cette URL n'est pas valide."
 
 msgid "No such data available."
-msgstr "De telles donn?es ne sont pas disponibles."
+msgstr ""
+"Aucune donn?e de ce type disponible."
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"Ne peut contacter le syst?me h?te. V?rifiez que le syst?me h?te est allum? "
-"et que vous avez une connectivit? r?seau avec lui. R?ponse de requ?te HTTP "
-"%1."
+"Impossible de contacter le syst?me h?te. V?rifiez que celui-ci est d?marr? et "
+"que vous disposez d'une connectivit? au syst?me h?te. R?ponse ? la demande HTTP %1. "
 
 msgid "Unable to read file."
 msgstr ""
+"Impossible de lire le fichier."
 
 msgid "Error while uploading file."
 msgstr ""
+"Erreur lors du t?l?chargement du fichier."
 
 msgid "Delete Confirmation"
-msgstr "Confirmation de Suppression"
+msgstr ""
+"Confirmation de suppression"
 
 msgid "OK"
-msgstr "OK"
+msgstr ""
+"OK"
 
 msgid "Confirm"
-msgstr "Confirmer"
+msgstr ""
+"Confirmer"
 
 msgid "Warning"
-msgstr "Avertissement"
+msgstr ""
+"Avertissement"
 
 msgid "Cloning..."
 msgstr ""
+"Clonage en cours..."
 
 msgid "Loading..."
-msgstr "Chargement en cours..."
+msgstr ""
+"Chargement en cours..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"Une erreur s'est produite lors de l'extraction des informations syst?me."
 
 msgid "Retry"
-msgstr "Essayer ? nouveau"
+msgstr ""
+"Nouvelle tentative"
 
 msgid "Detailed message:"
-msgstr "Message d?taill?:"
+msgstr ""
+"Message d?taill? :"
 
 msgid "No ISO found"
-msgstr "Aucune ISO d?tect?e"
+msgstr ""
+"ISO introuvable"
 
 msgid "This is not a valid ISO file."
-msgstr "Ce n'est pas un fichier ISO valide."
+msgstr ""
+"Ceci n'est pas un fichier ISO valide."
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "Cela va prendre un long moment. Voulez-vous continuer ?"
+msgstr ""
+"Cette op?ration peut ?tre assez longue. Voulez-vous continuer ?"
 
 msgid "This will permanently delete the template. Would you like to continue?"
 msgstr ""
-"Cela va supprimer de mani?re permanent le mod?le. Souhaites-vous continuer ?"
+"Le mod?le va ?tre supprim? d?finitivement. Voulez-vous continuer ?"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
 msgstr ""
-"Impossible d'?teindre le syst?me du fait que certaines machines virtuelles "
-"sont lanc?es !"
+"Impossible d'arr?ter le syst?me car certaines machines virtuelles sont en cours d'ex?cution !"
 
 msgid "Max:"
-msgstr "Max:"
+msgstr ""
+"Maximum :"
 
 msgid "Utilization"
-msgstr "Utilisation"
+msgstr ""
+"Utilisation"
 
 msgid "Available"
-msgstr "Disponible"
+msgstr ""
+"Disponible"
 
 msgid "Read Rate"
-msgstr "Taux en Lecture"
+msgstr ""
+"Vitesse de lecture"
 
 msgid "Write Rate"
-msgstr "Taux en ?criture"
+msgstr ""
+"Vitesse d'?criture"
 
 msgid "Received"
-msgstr "Re?u"
+msgstr ""
+"Re?u"
 
 msgid "Sent"
-msgstr "Envoy?"
+msgstr ""
+"Envoy?"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
 msgstr ""
-"?teindre ou red?marrer l'h?te causera la perte de tout travail non "
-"enregistr?. Continuer ? ?teindre/red?marrer ?"
+"L'arr?t ou le red?marrage de l'h?te va entra?ner la perte du travail non sauvegard?. Poursuivre "
+"l'arr?t/le red?marrage ?"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"Le d?p?t sera retir? de fa?on permanente et ne pourra ?tre r?tabli. Voulez-"
-"vous continuer ?"
+"Le r?f?rentiel va ?tre retir? d?finitivement et ne pourra pas ?tre r?cup?r?. Voulez-vous "
+"continuer ?"
 
 msgid "Repositories"
-msgstr "D?p?ts"
+msgstr ""
+"R?f?rentiels"
 
 msgid "ID"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Base URL"
-msgstr "URL de base"
+msgstr ""
+"URL de base"
 
 msgid "Is Mirror"
-msgstr "Est un miroir"
+msgstr ""
+"Est un miroir"
 
 msgid "URL Args"
-msgstr "Arguments d'URL"
+msgstr ""
+"Arguments d'URL"
 
 msgid "Enabled"
-msgstr "Activ?"
+msgstr ""
+"Activ?"
 
 msgid "GPG Check"
-msgstr "V?rification GPG"
+msgstr ""
+"Contr?le GPG"
 
 msgid "GPG Key"
-msgstr "Cl? GPG"
+msgstr ""
+"Cl? GPG"
 
 msgid "Add"
-msgstr "Ajouter"
+msgstr ""
+"Ajouter"
 
 msgid "Remove"
-msgstr "Retirer"
+msgstr ""
+"Retirer"
 
 msgid "Enable"
-msgstr "Activer"
+msgstr ""
+"Activer"
 
 msgid "Disable"
-msgstr "D?sactiver"
+msgstr ""
+"D?sactiver"
 
 msgid "Software Updates"
-msgstr "Mises ? jour Logiciel"
+msgstr ""
+"Mises ? jour logicielles"
 
 msgid "Package Name"
-msgstr "Nom de paquet"
+msgstr ""
+"Nom du module"
 
 msgid "Version"
-msgstr "Version"
+msgstr ""
+"Version"
 
 msgid "Architecture"
-msgstr "Architecture"
+msgstr ""
+"Architecture"
 
 msgid "Repository"
-msgstr "D?p?t"
+msgstr ""
+"R?f?rentiel"
 
 msgid "Update All"
-msgstr "Tout mettre ? jour"
+msgstr ""
+"Tout mettre ? jour"
 
 msgid "Updating..."
-msgstr "En cours de mise ? jour..."
+msgstr ""
+"Mise ? jour en cours..."
 
 msgid "Failed to retrieve packages update information."
-msgstr "?chec de r?cup?ration des informations de mise-?-jour des paquets."
+msgstr ""
+"Echec de l'extraction des informations de mise ? jour des modules."
 
 msgid "Failed to update package(s)."
-msgstr "?chec durant la mise ? jour du/des paquet(s)"
+msgstr ""
+"Echec de mise ? jour du ou des modules."
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"Le rapport de d?boggage sera enlev? de fa?on permanente et ne pourra ?tre "
-"r?tabli. Voulez-vous continuer ?"
+"Le rapport de d?bogage va ?tre retir? d?finitivement et ne pourra pas ?tre r?cup?r?. Voulez-vous "
+"continuer ?"
 
 msgid "Debug Reports"
-msgstr "Rapports de D?boggage"
+msgstr ""
+"Rapports de d?bogage"
 
 msgid "Generated Time"
-msgstr "Horodatage de g?n?ration"
+msgstr ""
+"Heure g?n?ration"
 
 msgid "Generate"
-msgstr "G?n?rer"
+msgstr ""
+"G?n?rer"
 
 msgid "Generating..."
-msgstr "En cours de g?n?ration..."
+msgstr ""
+"G?n?ration en cours..."
 
 msgid "Rename"
-msgstr "Renommer"
+msgstr ""
+"Renommer"
 
 msgid "Download"
-msgstr "T?l?charger"
+msgstr ""
+"T?l?charger"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
 msgstr ""
-"Le nom de rapport devrait contenir uniquement des lettres, nombres, "
-"soulignement ('_') et/ou tiret ('-')."
+"Le nom du rapport doit comporter uniquement des lettres, chiffres, trait de soulignement ('_') et/ou "
+"tiret ('-')."
 
 msgid "Pending..."
-msgstr "En attente..."
+msgstr ""
+"En attente..."
 
 msgid "Report name is the same as the original one."
-msgstr "Le nom du rapport est le m?me que celui d'origine."
+msgstr ""
+"Le nom du rapport est identique au nom d'origine."
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
 msgstr ""
-"Cela va supprimer la machine virtuelle et tous ses disques virtuels. Cette "
-"op?ration est irr?versible. Voulez-vous continuer ?"
+"Cette op?ration va supprimer la machine virtuelle et ses disques virtuels. L'op?ration "
+"ne peut pas ?tre annul?e. Voulez-vous continuer ?"
 
 msgid "Power off Confirmation"
-msgstr "Confirmation de mise hors tension"
+msgstr ""
+"Confirmation de mise hors tension"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
 msgstr ""
-"Cette action pourrait produire des r?sultats ind?sirables, par exemple un "
-"cache disque non flush? dans l'invit?. Voulez-vous continuer ?"
+"Cette action peut produire des r?sultats ind?sirables, par exemple, "
+"un cache de disque non vid? sur le syst?me invit?. Voulez-vous continuer ?"
 
 msgid "Reset Confirmation"
-msgstr "Confirmation de R?initialisation"
+msgstr ""
+"Confirmation de r?initialisation"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
 msgstr ""
-"Il y a un risque de perte de donn?es caus?es par une r?initialisation sans "
-"extinction de l'OS invit?. Voulez-vous continuer ?"
+"Risque de perte de donn?es suite ? une r?initialisation sans arr?t du syst?me d'exploitation invit?. "
+"Voulez-vous continuer ?"
 
 msgid "Shut Down Confirmation"
-msgstr "Confirmation d'Extinction"
+msgstr ""
+"Confirmation d'arr?t"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
 msgstr ""
-"Noter que l'OS invit? pourrait ignorer cette requ?te. Voulez-vous continuer ?"
+"Notez que le syst?me d'exploitation invit? peut ignorer cette demande. Voulez-vous continuer ?"
 
 msgid "Virtual Machine delete Confirmation"
-msgstr "Confirmation de suppression de Machine Virtuelle"
+msgstr ""
+"Confirmation de la suppression de la machine virtuelle"
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
 msgstr ""
+"Cette machine virtuelle n'est pas permanente. Elle sera supprim?e lors de la mise hors tension. Continuer ?"
 
 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 ""
+"Lorsque l'invit? cible comporte des volumes SCSI ou iSCSI, ces derniers sont clon?s dans le "
+"pool de stockage par d?faut. Cela se produit ?galement lorsque le pool cible ne comporte "
+"pas suffisamment d'espace pour cloner les volumes. Voulez-vous continuer ?"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
 msgstr ""
-"Ce CDROM sera d?tach? de fa?on permanente et vous pourrez le r?-attacher. "
-"Continuer le d?tachement ?"
+"Ce CD-ROM va ?tre d?tach? d?finitivement et ne pourra pas ?tre attach? ? nouveau. Continuer "
+"le d?tachement ?"
 
 msgid "Attaching..."
-msgstr "En cours d'attachement..."
+msgstr ""
+"Attachement en cours..."
 
 msgid "Replacing..."
-msgstr "En cours de Remplacement..."
+msgstr ""
+"Remplacement en cours..."
 
 msgid "Successfully attached!"
-msgstr "Attach? avec succ?s !"
+msgstr ""
+"L'attachement a abouti."
 
 msgid "Successfully replaced!"
-msgstr "Remplac? avec succ?s !"
+msgstr ""
+"Le remplacement a abouti."
 
 msgid "Successfully detached!"
-msgstr "D?tach? avec Succ?s !"
+msgstr ""
+"Le d?tachement a abouti."
 
 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 va ?tre d?tach? d?finitivement et ne pourra pas ?tre attach? ? nouveau. Continuer "
+"le d?tachement ?"
 
 msgid "interface:"
 msgstr ""
+"interface :"
 
 msgid "address:"
 msgstr ""
+"adresse :"
 
 msgid "link_type:"
 msgstr ""
+"type_lien :"
 
 msgid "block:"
 msgstr ""
+"bloc :"
 
 msgid "drive_type:"
 msgstr ""
+"type_lecteur :"
 
 msgid "model:"
 msgstr ""
+"mod?le :"
 
 msgid "Affected devices:"
 msgstr ""
+"Unit?s concern?es :"
 
 msgid "The VLAN id must be between 1 and 4094."
-msgstr "L'id du VLAN doit ?tre entre 1 et 4094."
+msgstr ""
+"L'ID r?seau local virtuel doit ?tre compris entre 1 et 4094."
 
 msgid "unavailable"
-msgstr "non disponible"
+msgstr ""
+"non disponible"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
 "depend on this network."
 msgstr ""
-"Cette action va interrompre la connectivit? r?seau pour tout machine "
-"virtuelle qui d?pend de ce r?seau."
+"Cette action va interrompre la connectivit? r?seau pour toute machine virtuelle "
+"d?pendant de ce r?seau."
 
 msgid "Create a network"
-msgstr "Cr?er un r?seau"
+msgstr ""
+"Cr?er un r?seau"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"Ce r?seau n'est pas persistant. Au lieu de s'arr?ter, cette actionva le "
-"suppromer de mani?re permanente. Voulez-vous continuer ?"
+"Il ne s'agit pas d'un r?seau permanent. Au lieu de l'arr?ter, cette action va "
+"le supprimer de mani?re permanente. Voulez-vous continuer ?"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"Il se peut que l'?tiquette R?seau local virtuel local rout? ne fonctionne pas correctement lorsque NetworkManager est activ?. Vous "
+"devez envisager de d?sactiver ce dernier."
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
 msgstr ""
-"Cela va effacer de mani?re permanente le pool de stockage. Voulez-vous "
-"continuer ?"
+"Le pool de stockage va ?tre supprim? d?finitivement. Voulez-vous continuer ?"
 
 msgid "This storage pool is empty."
-msgstr "Ce pool de stockage est vide."
+msgstr ""
+"Ce pool de stockage est vide."
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
 "to continue? "
 msgstr ""
-"Cela va formater votre disque et vous allez perdre toutes les donn?es qui "
-"s'y trouvent, ?tes-vous s?r de continuer ?"
+"Le disque va ?tre format? et vous perdrez toutes les donn?es qu'il contient. Voulez-vous vraiment "
+"continuer ? "
 
 msgid "SCSI Fibre Channel"
-msgstr "Canal Fibre SCSI"
+msgstr ""
+"Fibre Channel SCSI"
 
 msgid "No SCSI adapters found."
-msgstr "Aucun adaptateur SCSI trouv?."
+msgstr ""
+"Aucun adaptateur SCSI trouv?."
 
 msgid "Loading iSCSI targets..."
 msgstr ""
+"Chargement des cibles iSCSI..."
 
 msgid "No iSCSI found. Please input one."
 msgstr ""
+"iSCSI introuvable. Sp?cifiez-le."
 
 msgid "Failed to load iSCSI targets."
 msgstr ""
+"Echec du chargement des cibles iSCSI."
 
 msgid "The storage pool name can not be blank."
-msgstr "Le nom de pool de stockage ne peut ?tre vierge."
+msgstr ""
+"Le nom du pool de stockage ne peut pas ?tre vide."
 
 msgid "The storage pool path can not be blank."
-msgstr "Le chemin de pool de stockage ne peut ?tre vierge."
+msgstr ""
+"Le chemin du pool de stockage ne peut pas ?tre vide."
 
 msgid "NFS server mount path can not be blank."
-msgstr "Le chemin de montage du serveur NFS ne peut ?tre vierge."
+msgstr ""
+"Le chemin de montage du serveur NFS ne peut pas ?tre vide."
 
 msgid "Invalid NFS mount path."
-msgstr "Chemin de montage NFS invalide."
+msgstr ""
+"Chemin de montage NFS non valide."
 
 msgid "No logical device selected."
-msgstr "Aucun p?riph?rique logique s?lectionn?."
+msgstr ""
+"Aucune unit? logique s?lectionn?e."
 
 msgid "The iSCSI target can not be blank."
-msgstr "La cible iSCSI ne peut ?tre vierge."
+msgstr ""
+"La cible iSCSI ne peut pas ?tre vide."
 
 msgid "Server name can not be blank."
-msgstr "Le nom de serveur ne peut ?tre vierge."
+msgstr ""
+"Le nom du serveur ne peut pas ?tre vide."
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
 msgstr ""
+"Il ne s'agit pas d'un nom de serveur ou d'une adresse IP valide. Modifiez cet ?l?ment."
 
 msgid "Looking for available partitions ..."
-msgstr "En cours de recherche de partitions disponibles..."
+msgstr ""
+"Recherche des partitions disponibles..."
 
 msgid "No available partitions found."
-msgstr "Aucune partition disponible trouv?e."
+msgstr ""
+"Aucune partition disponible trouv?e."
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"Le pool de stockage n'est pas persistent. Au lieu de le d?sactiver, cette "
-"action va le supprimer de mani?re permanente. Voulez-vous continuer ?"
+"Il ne s'agit pas d'un pool de stockage permanent. Au lieu de le d?sactiver, cette action va "
+"le supprimer de mani?re permanente. Voulez-vous continuer ?"
 
 msgid "Unable to retrieve partitions information."
-msgstr "Impossible de r?cup?rer les informations des partitions."
+msgstr ""
+"Impossible d'extraire les informations relatives aux partitions. "
 
 msgid "In progress..."
-msgstr "En cours..."
+msgstr ""
+"En cours..."
 
 msgid "Failed!"
-msgstr "?chec!"
+msgstr ""
+"Echec !"
 
 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."
+"Le chemin de CD-ROM doit ?tre un chemin local/distant et ne peut pas ?tre ? blanc."
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "Le pool de disque ou le volume ne peut ?tre vierge."
+msgstr ""
+"Le pool de stockage sur disque ou le volume ne peut pas ?tre ? blanc."
 
 msgid "Peers"
 msgstr ""
+"Homologues"
 
 msgid "Searching"
 msgstr ""
+"Recherche"
 
 msgid "No peers found."
 msgstr ""
+"Homologue introuvable."
 
 msgid "Help"
-msgstr "Aide"
+msgstr ""
+"Aide"
 
 msgid "About"
-msgstr "A propos..."
+msgstr ""
+"A propos de"
 
 msgid "Log out"
-msgstr "Se d?connecter"
+msgstr ""
+"D?connexion"
 
 msgid "Version:"
-msgstr "Version:"
+msgstr ""
+"Version :"
 
 msgid "Session timeout, please re-login."
-msgstr "Session expir?e, veuillez vous reconnecter."
+msgstr ""
+"D?lai d'attente de session d?pass?, veuillez vous reconnecter."
 
 msgid "User Name"
-msgstr "Nom d'Utilisateur"
+msgstr ""
+"Nom d'utilisateur"
 
 msgid "Password"
-msgstr "Mot de Passe"
+msgstr ""
+"Mot de passe"
 
 msgid "Generate a New Debug Report"
-msgstr "G?n?rer un Nouveau Rapport de D?boggage"
+msgstr ""
+"G?n?rer un nouveau rapport de d?bogage"
 
 msgid "Report Name"
-msgstr "Nom du Rapport"
+msgstr ""
+"Nom du rapport"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"Le nom utilis? pour identifier le rapport. Si omis, un nom sera choisi bas? "
-"sur l'heure courante. Le nom peut contenir des lettres, des nombres, le "
-"soulignement (\"_\") et le tiret (\"-\")."
+"Nom utilis? pour identifier le rapport. S'il est omis, un nom sera choisi "
+"en fonction de l'heure en cours. Le nom peut contenir : des lettres, chiffres, trait de soulignement (\"_\") "
+"et tiret (\"-\")."
 
 msgid "Rename a Debug Report"
-msgstr "Renommer un Rapport de D?boggage"
+msgstr ""
+"Renommer un rapport de d?bogage"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
 msgstr ""
-"Le nom utilis? pour identifer le rapport. Le nom peut contenir des lettres, "
-"nombres et tirets (\"-\")."
+"Nom utilis? pour identifier le rapport. Il peut contenir : des lettres, chiffres et "
+"tiret (\"-\")."
 
 msgid "Submit"
-msgstr "Soumettre"
+msgstr ""
+"Soumettre"
 
 msgid "Add a Repository"
-msgstr "Ajouter un D?p?t"
+msgstr ""
+"Ajouter un r?f?rentiel"
 
 msgid "Identifier"
-msgstr "Identificateur"
+msgstr ""
+"Identificateur"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "Mot unique, identifiant unique pour le d?p?t."
+msgstr ""
+"Mot unique, identificateur unique pour le r?f?rentiel."
 
 msgid "Textual name for the repository."
-msgstr "Nom textuel pour le d?p?t."
+msgstr ""
+"Nom textuel pour le r?f?rentiel."
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "Champ requis"
+msgstr ""
+"Zone obligatoire"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "URL du d?p?t. Les protocoles support?s sont http, ftp et ficheir."
+msgstr ""
+"Adresse URL pour le r?f?rentiel. Les protocoles pris en charge sont http, ftp, et file."
 
 msgid "Repository is a mirror"
-msgstr "Le d?p?t est un miroir"
+msgstr ""
+"Le r?f?rentiel est un miroir"
 
 msgid "Distribution"
-msgstr "Distribution"
+msgstr ""
+"Distribution"
 
 msgid "Distribution of the DEB repository."
-msgstr "Distribution du d?p?t DEB."
+msgstr ""
+"Distribution du r?f?rentiel DEB."
 
 msgid "Components"
-msgstr "Composants"
+msgstr ""
+"Composants"
 
 msgid "List of components in DEB repository."
-msgstr "Liste des composants dans le d?p?t DEB."
+msgstr ""
+"Liste des composants dans le r?f?rentiel DEB."
 
 msgid "Edit Repository"
-msgstr "Editer le D?p?t"
+msgstr ""
+"Editer le r?f?rentiel"
 
 msgid "Mirror List URL"
-msgstr "URL de Liste de Miroir"
+msgstr ""
+"URL liste miroir"
 
 msgid "Yes"
-msgstr "Oui"
+msgstr ""
+"Oui"
 
 msgid "No"
-msgstr "Non"
+msgstr ""
+"Non"
 
 msgid "Add a Volume to Storage Pool"
-msgstr "iAjouter un Volume au Pool de Stockage"
+msgstr ""
+"Ajouter un volume au pool de stockage"
 
 msgid "Fetch from remote URL"
 msgstr ""
+"Extraire de l'URL distante"
 
 msgid "Enter the remote URL here."
-msgstr "Saisir une URL distante ici"
+msgstr ""
+"Indiquez ici l'URL distante."
 
 msgid "Upload a file"
-msgstr "Charger un fichier"
+msgstr ""
+"T?l?charger un fichier"
 
 msgid "Choose the file you want to upload."
 msgstr ""
+"S?lectionnez le fichier ? t?l?charger."
 
 msgid "Define a New Storage Pool"
-msgstr "D?finir un Nouveau Pool de Stockage"
+msgstr ""
+"D?finir un nouveau pool de stockage"
 
 msgid "Storage Pool Name"
-msgstr "Nom de Pool de Stockage"
+msgstr ""
+"Nom du pool de stockage"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
 msgstr ""
-"Le nom utilis? pour identifier les pools de stockage, et il ne doit pas ?tre "
-"vide."
+"Nom utilis? pour identifier les pools de stockage. Ne doit pas ?tre vide."
 
 msgid "Storage Pool Type"
-msgstr "Type de Pool de Stockage"
+msgstr ""
+"Type de pool de stockage"
 
 msgid "Storage Path"
-msgstr "Chemin de Stockage"
+msgstr ""
+"Chemin de stockage"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
 msgstr ""
-"Le chemin du Pool de Stockage. Chaque Pool de Stockage doit avoir un chemin "
-"unique."
+"Chemin du pool de stockage. Chaque pool de stockage doit avoir un chemin unique."
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
 msgstr ""
-"Kimchi va essayer de cr?er un r?pertoire quand il n'existe pas d?j? dans "
-"votre syst?me."
+"Kimchi va tenter de cr?er le r?pertoire s'il n'en existe pas d?j? un "
+"sur votre syst?me."
 
 msgid "NFS Server IP"
-msgstr "IP du Serveur NFS"
+msgstr ""
+"IP du serveur NFS"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
 msgstr ""
-"IP du Serveur NFS ou nom d'h?te. Il peut ?tre saisi ou entr? ? partir de "
-"l'historique."
+"IP ou nom d'h?te du serveur NFS. Peut ?tre entr? ou s?lectionn? depuis l'historique."
 
 msgid "NFS Path"
-msgstr "Chemin NFS"
+msgstr ""
+"Chemin NFS"
 
 msgid "The NFS exported path on NFS server."
-msgstr "Le chemin NFS export? sur le serveur NFS."
+msgstr ""
+"Chemin NFS export? ou serveur NFS."
 
 msgid "Device path"
-msgstr "Chemin du P?riph?rique"
+msgstr ""
+"Chemin d'unit?"
 
 msgid "iSCSI Server"
-msgstr "Serveur iSCSI"
+msgstr ""
+"Serveur iSCSI"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP du Serveur iSCSI ou nom d'h?te. Il ne devrait pas ?tre vide."
+msgstr ""
+"IP ou nom d'h?te du serveur iSCSI. Ne doit pas ?tre vide."
 
 msgid "Server"
-msgstr "Serveur"
+msgstr ""
+"Serveur"
 
 msgid "Port"
-msgstr "Port"
+msgstr ""
+"Port"
 
 msgid "Target"
-msgstr "Cible"
+msgstr ""
+"Cible"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "La cible iSCSI sur le serveur iSCSI"
+msgstr ""
+"Cible iSCSI sur le serveur iSCSI"
 
 msgid "Add iSCSI Authentication"
-msgstr "Ajouter l'Authentification iSCSI"
+msgstr ""
+"Ajouter l'authentification iSCSI"
 
 msgid "iSCSI Authentication"
-msgstr "Authentification iSCSI"
+msgstr ""
+"Authentification iSCSI"
 
 msgid "SCSI Adapter"
-msgstr "Adaptateur SCSI"
+msgstr ""
+"Adaptateur SCSI"
 
 msgid "Please, wait..."
-msgstr "Veuillez patienter..."
+msgstr ""
+"Veuillez patienter..."
 
 msgid "Add Template"
-msgstr "Ajouter un Mod?le"
+msgstr ""
+"Ajouter un mod?le"
 
 msgid "Where is the source media for this template? "
-msgstr "O? se trouve le media source pour le mod?le ?"
+msgstr ""
+"O? se trouve le support source pour ce mod?le ? "
 
 msgid "Local ISO Image"
-msgstr "Image ISO Locale"
+msgstr ""
+"Image ISO locale"
 
 msgid "Local Image File"
-msgstr "Fichier Image Local"
+msgstr ""
+"Fichier image local"
 
 msgid "Remote ISO Image"
-msgstr "Image ISO Distante"
+msgstr ""
+"Image ISO distante"
 
 msgid "Search ISOs"
-msgstr "Rechercher des ISOs"
+msgstr ""
+"Recherche d'ISO"
 
 msgid "The following ISOs are available:"
-msgstr "Les ISOs suivants sont disponibles:"
+msgstr ""
+"Les images ISO suivantes sont disponibles :"
 
 msgid "OS: "
-msgstr "OS: "
+msgstr ""
+"SE : "
 
 msgid "Version: "
-msgstr "Version: "
+msgstr ""
+"Version : "
 
 msgid "Size: "
-msgstr "Taille: "
+msgstr ""
+"Taille : "
 
 msgid "Search more ISOs"
-msgstr "Chercher plus d'ISOs"
+msgstr ""
+"Rechercher d'autres images ISO"
 
 msgid "Create Templates from Selected ISO"
-msgstr "Cr?er des mod?les depuis l'ISO s?lectionn?"
+msgstr ""
+"Cr?er des mod?les ? partir de l'image ISO s?lectionn?e"
 
 msgid "I want to use a specific ISO file"
-msgstr "Je veux utiliser un fichier ISO sp?cifique"
+msgstr ""
+"Je souhaite utiliser un fichier ISO sp?cifique"
 
 msgid "Loading default remote ISOs ..."
-msgstr "Chargement des ISOs distants par d?faut en cours..."
+msgstr ""
+"Chargement d'ISO distants par d?faut..."
 
 msgid "Arch: "
-msgstr "Arch: "
+msgstr ""
+"Arch : "
 
 msgid "I want to use a custom URL"
-msgstr "Je veux utiliser une URL personnalis?e"
+msgstr ""
+"Je souhaite utiliser une URL personnalis?e"
 
 msgid "Edit Template"
-msgstr "?diter un Mod?le"
+msgstr ""
+"Editer le mod?le"
 
 msgid "Processor"
-msgstr "Processeur"
+msgstr ""
+"Processeur"
 
 msgid "CDROM"
-msgstr "CDROM"
+msgstr ""
+"CD-ROM"
 
 msgid "Image File"
-msgstr "Fichier Image"
+msgstr ""
+"Fichier image"
 
 msgid "Graphics"
-msgstr "Graphiques"
+msgstr ""
+"Graphiques"
 
 msgid "Disk(GB)"
 msgstr ""
+"Disque (Go)"
 
 msgid "Disk Format"
 msgstr ""
+"Format de disque"
 
 msgid "CPU Number"
-msgstr "Nombre de CPU"
+msgstr ""
+"Nombre d'UC"
 
 msgid "Manually set CPU topology"
 msgstr ""
+"D?finir manuellement la topologie d'UC"
 
 msgid "Cores"
 msgstr ""
+"Coeurs"
 
 msgid "Threads"
 msgstr ""
+"Unit?s d'ex?cution"
 
 msgid "CPU"
-msgstr "CPU"
+msgstr ""
+"UC"
 
 msgid "Disk I/O"
-msgstr "E/S Disque"
+msgstr ""
+"E-S disque"
 
 msgid "Network I/O"
-msgstr "E/S R?seau"
+msgstr ""
+"E-S r?seau"
 
 msgid "Livetile"
-msgstr "Livetile"
+msgstr ""
+"Livetile"
 
 msgid "No guests found."
-msgstr "Aucun invit? trouv?."
+msgstr ""
+"Aucun invit? trouv?."
 
 msgid "Shut down"
-msgstr "?teindre"
+msgstr ""
+"Arr?ter"
 
 msgid "Restart"
-msgstr "Red?marrer"
+msgstr ""
+"Red?marrer"
 
 msgid "Basic Information"
-msgstr "Informations de Base"
+msgstr ""
+"Informations de base"
 
 msgid "OS Distro"
-msgstr "Distro de l'OS"
+msgstr ""
+"SE distribution"
 
 msgid "OS Code Name"
-msgstr "Nom de code de l'OS"
+msgstr ""
+"Nom de code SE"
 
 msgid "CPU(s)"
 msgstr ""
+"UC"
 
 msgid "System Statistics"
-msgstr "Statistiques Syst?me"
+msgstr ""
+"Statistiques syst?me"
 
 msgid "Update Progress"
-msgstr "Progr?s de la Mise ? Jour"
+msgstr ""
+"Progression de la mise ? jour"
 
 msgid "Network Name"
-msgstr "Nom de R?seau"
+msgstr ""
+"Nom du r?seau"
 
 msgid "State"
-msgstr "?tat"
+msgstr ""
+"Etat"
 
 msgid "Network Type"
-msgstr "Type de R?seau"
+msgstr ""
+"Type de r?seau"
 
 msgid "Address Space"
-msgstr "Espace d'adressage"
+msgstr ""
+"Espace adresse"
 
 msgid "Name should not contain '/' and '\"'."
-msgstr "Le nom ne devrait pas contenir '/' et '\"'."
+msgstr ""
+"Le nom ne doit pas contenir '/' et '\"'."
 
 msgid "Isolated: no external network connection"
-msgstr "Isol?: pas de connexion ? un r?seau externe"
+msgstr ""
+"Isol? : aucune connexion r?seau externe"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT: connexion physique au r?seau sortant uniquement"
+msgstr ""
+"NAT : connexion r?seau physique sortante uniquement"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
-"Bridg?: Les macines virtuelles sont connect?es directement au r?seau physique"
+"Rout? : machines virtuelles directement connect?es au r?seau physique"
 
 msgid "(No interfaces found)"
-msgstr "(Aucune interface trouv?e)"
+msgstr ""
+"(Interface introuvable)"
 
 msgid "Destination"
-msgstr "Destination"
+msgstr ""
+"Destination"
 
 msgid "Enable VLAN"
-msgstr "Activer le VLAN"
+msgstr ""
+"Activer le r?seau local virtuel"
 
 msgid "VLAN ID"
-msgstr "ID de VLAN"
+msgstr ""
+"ID r?seau local virtuel"
 
 msgid "Stop"
-msgstr "Arr?ter"
+msgstr ""
+"Arr?ter"
 
 msgid "%Used"
 msgstr ""
+"%Util"
 
 msgid "Location"
-msgstr "Emplacement"
+msgstr ""
+"Emplacement"
 
 msgid "Capacity"
-msgstr "Capacit?"
+msgstr ""
+"Capacit?"
 
 msgid "Allocated"
-msgstr "Allou?"
+msgstr ""
+"Allou?"
 
 msgid "active"
-msgstr "actif"
+msgstr ""
+"actif"
 
 msgid "inactive"
-msgstr "inactif"
+msgstr ""
+"inactif"
 
 msgid "Deactivate"
-msgstr "D?sactiver"
+msgstr ""
+"D?sactiver"
 
 msgid "Activate"
-msgstr "Activer"
+msgstr ""
+"Activer"
 
 msgid "Add Volume"
-msgstr "Ajouter un Volume"
+msgstr ""
+"Ajouter un volume"
 
 msgid "Extend"
-msgstr "?tendre"
+msgstr ""
+"Extension"
 
 msgid "Undefine"
-msgstr "Supprimer"
+msgstr ""
+"Annuler d?finition"
 
 msgid "Format"
-msgstr "Format"
+msgstr ""
+"Format"
 
 msgid "Allocation"
-msgstr "Allocation"
+msgstr ""
+"Allocation"
 
 msgid "No templates found."
-msgstr "Aucun mod?le trouv?."
+msgstr ""
+"Aucun mod?le trouv?."
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/po/it_IT.po b/po/it_IT.po
index bfc1a84..50dc7c8 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,5 +1,6 @@
 # English translations for kimchi package.
 # Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
@@ -9,82 +10,99 @@ msgstr ""
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: it_IT\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
 msgstr ""
+"Parametro sconosciuto %(value)s"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "Eliminazione non consentita per %(resource)s"
+msgstr ""
+"Eliminazione non consentita per %(resource)s"
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s non implementa il metodo di aggiornamento"
+msgstr ""
+"%(resource)s non implementa il metodo di aggiornamento"
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "Creazione non consentita per %(resource)s"
+msgstr ""
+"Creazione non consentita per %(resource)s"
 
 msgid "Unable to parse JSON request"
-msgstr "Impossibile analizzare la richiesta JSON"
+msgstr ""
+"Impossibile analizzare la richiesta JSON"
 
 msgid "This API only supports JSON"
-msgstr "L'API supporta solo JSON"
+msgstr ""
+"L'API supporta solo JSON"
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
 msgstr ""
+"I parametri non corrispondono ai requisiti nello schema: %(err)s"
 
 msgid "You don't have permission to perform this operation."
 msgstr ""
+"Non si dispone dell'autorizzazione per eseguire questa operazione. "
 
 msgid "Datastore is not initiated in the model object."
-msgstr "Archivio dati non inizializzato nell'oggetto modello."
+msgstr ""
+"Archivio dati non inizializzato nell'oggetto modello."
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
-msgstr "Impossibile avviare l'attivit? a causa dell'errore: %(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 ""
+"? stato raggiunto il timeout di %(seconds)s secondi durante l'esecuzione dell'attivit? '%(task)s."
 
 #, 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: "
-"%(code)s]"
+"Autenticazione non riuscita per l'utente '%(username)s'. [Codice di errore: %(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi"
+msgstr ""
+"Non si dispone dell'autorizzazione ad accedere a Kimchi"
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "Specificare %(item)s per accedere a Kimchi"
+msgstr ""
+"Specificare %(item)s per accedere a Kimchi"
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
 msgstr ""
+"Utente %(user_id)s non trovato con le impostazioni LDAP fornite. "
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
 msgstr ""
+"Configurazione LDAP non valida: %(item)s : %(value)s"
 
 msgid "Unknown \"_cap\" specified"
 msgstr ""
+"Specificato \"_cap\" sconosciuto"
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
 msgstr ""
+"\"_passthrough\" deve essere \"true\" o \"false\""
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
 msgstr ""
+"\"_passthrough_affected_by\" deve essere una stringa nome dispositivo"
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
@@ -94,59 +112,63 @@ msgstr ""
 #, python-format
 msgid "Error while getting block device information for %(device)s."
 msgstr ""
-"Errore durante il richiamo delle informazioni sul dispositivo del blocco per "
-"%(device)s."
+"Errore durante il richiamo delle informazioni sul dispositivo del blocco per %(device)s."
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "Impossibile trovare il file distro: %(filename)s"
+msgstr ""
+"Impossibile trovare il file distro: %(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
 msgstr ""
-"Impossibile analizzare il file distro: %(filename)s. Verificare che sia un "
-"file JSON."
+"Impossibile analizzare il file distro: %(filename)s. Verificare che sia un file JSON."
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
 msgstr ""
-"Impossibile accedere a %(portal)s di destinazione host iSCSI. Dettagli: "
-"%(err)s"
+"Impossibile accedere alla destinazione host iSCSI %(portal)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr "Impossibile accedere alla destinazione %(target)s host %(host)s iSCSI"
+msgstr ""
+"Impossibile accedere alla destinazione %(target)s host %(host)s iSCSI"
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
 msgstr ""
+"Impossibile trovare il file ISO %(filename)s"
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "Il file ISO %(filename)s non ? avviabile"
+msgstr ""
+"Il file ISO %(filename)s non ? avviabile"
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
-msgstr "Il file ISO %(filename)s non ha un record di avvio El Torito valido"
+msgstr ""
+"Il file ISO %(filename)s non ha un record di avvio El Torito valido"
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr "Voce di convalida El Torito non valida in ISO %(filename)s"
+msgstr ""
+"Voce di convalida El Torito non valida in ISO %(filename)s"
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "Indicatore di avvio El Torito non valido in ISO %(filename)s"
+msgstr ""
+"Indicatore di avvio El Torito non valido in ISO %(filename)s"
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
-msgstr "Tipo di volume imprevisto per il volume primario in ISO %(filename)s"
+msgstr ""
+"Tipo di volume imprevisto per il volume primario in ISO %(filename)s"
 
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"Formato non corretto durante la lettura del descrittore volume in ISO "
-"%(filename)s"
+"Formato non corretto durante la lettura del descrittore volume in ISO %(filename)s"
 
 #, python-format
 msgid ""
@@ -156,41 +178,50 @@ msgid ""
 "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"L'hypervisor non dispone dell'autorizzazione per utilizzare questo ISO "
-"%(filename)s. Spostarlo in /var/lib/libvirt o impostare l'autorizzazione di "
-"ricerca per gli elenchi di controllo accesso ai file per l'utente "
-"'%(user)s',  se possibile, o aggiungere '%(user)s' al gruppo percorso ISO o "
-"(non consigliato) 'chmod -R o+x 'path_to_iso'. Dettagli: %(err)s"
+"L'hypervisor non dispone dell'autorizzazione per utilizzare questo ISO %(filename)s. "
+"Spostarlo in /var/lib/libvirt o impostare l'autorizzazione di ricerca "
+"sugli elenchi di controllo di accesso file per l'utente '%(user)s' se possibile, oppure aggiungere "
+"'%(user)s' al gruppo percorso ISO oppure (non consigliato) 'chmod -R o+x "
+"'path_to_iso'. Dettagli: %(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
+"Si ? verificato un errore durante l'analisi delle informazioni SO immagine."
 
 msgid "No OS information found in given image."
 msgstr ""
+"Nessuna informazione SO trovata nell'immagine fornita."
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
 msgstr ""
+"Impossibile leggere il file immagine %(filename)s"
 
 #, python-format
 msgid ""
 "Image file must be an existing file on system. %(filename)s is not a valid "
 "input."
 msgstr ""
+"Il file immagine deve essere un file esistente sul sistema. %(filename)s non ? un valido "
+"input."
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "Macchina virtuale %(name)s gi? esistente"
+msgstr ""
+"Macchina virtuale %(name)s gi? esistente"
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "La macchina virtuale %(name)s non esiste"
+msgstr ""
+"La macchina virtuale %(name)s non esiste"
 
 #, python-format
 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 ""
+"Impossibile ridenominare la macchina virtuale %(name)s. Il nome %(new_name)s ? gi? "
+"in uso o la macchina virtuale non ? spenta."
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
@@ -198,19 +229,23 @@ msgstr ""
 "Impossibile richiamare l'immagine per la macchina virtuale arrestata %(name)s"
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "L'immagine ISO remota non ? supportata da questo server."
+msgstr ""
+"L'immagine ISO remota non ? supportata da questo server."
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
 msgstr ""
+"L'esecuzione di un'immagine non ? supportata sulla macchina virtuale %(name)s"
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile aggiornare la macchina virtuale %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
@@ -220,149 +255,188 @@ msgstr ""
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
 msgstr ""
+"Impossibile connettere la macchina virtuale %(name)s."
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"Il nome della macchina virtuale deve essere una stringa senza barre (/)"
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
 msgstr ""
+"URI modello non valido %(value)s specificato per la macchina virtuale"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
 msgstr ""
+"URI pool di memoria non valido %(value)s specificato per la macchina virtuale"
 
 msgid "Supported virtual machine graphics are Spice or VNC"
 msgstr ""
+"I grafici macchina virtuale supportati sono Spice o VNC"
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
 msgstr ""
 "L'indirizzo dei grafici su cui rimanere in ascolto deve essere IPv4 o IPv6"
 
 msgid "Specify a template to create a virtual machine from"
-msgstr "Specificare un modello da cui creare una macchina virtuale"
+msgstr ""
+"Specificare un modello da cui creare una macchina virtuale"
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile spegnere la macchina virtuale %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossibile eliminare la macchina virtuale %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile eliminare la macchina virtuale %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"Impossibile ridenominare la macchina virtuale %(name)s. Dettagli: %(err)s"
+"Impossibile reimpostare la macchina virtuale %(name)s. Dettagli: %(err)s"
 
 msgid "User name list must be an array"
 msgstr ""
+"L'elenco di nomi utente deve essere un array"
 
 msgid "User name must be a string"
-msgstr "Il nome della rete deve essere una stringa"
+msgstr ""
+"Il nome utente deve essere una stringa"
 
 msgid "Group name list must be an array"
 msgstr ""
+"L'elenco di nomi gruppo deve essere un array"
 
 msgid "Group name must be a string"
-msgstr "Il nome della rete deve essere una stringa"
+msgstr ""
+"Il nome gruppo deve essere una stringa"
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "L'utente '%(users)s' non esiste."
+msgstr ""
+"L'utente o gli utenti '%(users)s' non esistono"
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "L'utente '%(groups)s' non esiste."
+msgstr ""
+"Il gruppo o i gruppi '%(groups)s' non esistono"
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile ottenere i metadati di accesso della macchina virtuale %(name)s. Dettagli: %(err)s"
 
 msgid "The guest console password must be a string."
 msgstr ""
+"La password della console della macchina guest deve essere una stringa. "
 
 msgid "The life time for the guest console password must be a number."
 msgstr ""
+"La durata per la password della console della macchina guest deve essere un numero. "
 
 #, python-format
 msgid "Virtual machine '%(name)s' must be stopped before cloning it."
 msgstr ""
+"La macchina virtuale '%(name)s' deve essere arrestata prima di poterla clonare. "
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
 msgstr ""
+"Spazio su disco insufficiente per clonare la macchina virtuale '%(name)s'"
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Impossibile clonare la VM '%(name)s'. Dettagli: %(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"Operazione non valida per la macchina virtuale non persistente %(name)s"
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"Impossibile sospendere la VM '%(name)s' perch? non ? in esecuzione. "
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Impossibile sospendere la VM '%(name)s'. Dettagli: %(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"Impossibile riprendere la VM '%(name)s' perch? non ? in pausa. "
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"Impossibile riprendere la VM '%(name)s'. Dettagli: %(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"La memoria assegnata ? superiore al massimo consentito nell'host. "
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"La VM '%(name)s' non supporta l'aggiornamento della memoria live. Aggiornare la memoria con"
+"la macchina fuori linea per abilitare questa funzione. "
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"Nelle VM attive ? consentito solo aumentare la memoria. "
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"Per l'aggiornamento della memoria live, il nuovo valore di memoria deve essere uguale al vecchio pi?"
+"multipli di 1024 Mib"
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"Non sono presenti sufficienti slot liberi di 1024 Mib nella macchina  guest."
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"La versione libvirt dell'host non supporta dispositivi di memoria. Libvirt deve essere >= "
+"1.2.14"
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"Errore durante il collegamento del dispositivo di memoria. Dettagli: %(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
+"La VM %(vmid)s non contiene un dispositivo host assegnato direttamente %(dev_name)s."
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
 msgstr ""
+"Il dispositivo host %(dev_name)s non consente di assegnare direttamente al VM."
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -371,19 +445,28 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
+"Non ? stato trovato alcun gruppo IOMMU. Per funzionare correttamente il pass-through PCI host "
+"ha bisogno del gruppo IOMMU. Abilitare Intel VT-d o AMD IOMMU nel BIOS e verificare quindi che "
+"il Kernel sia compilato con il supporto IOMMU. per la CPU Intel, aggiungere intel_iommu=on "
+"al parametro Kernel in /boot/grub2/grub.conf. Per la CPU AMD, aggiungere iommu=pt "
+"iommu=1."
 
 msgid "\"name\" should be a device name string"
 msgstr ""
+"\"name\" deve essere una stringa nome dispositivo"
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"Il dispositivo %(name)s ? probabilmente utilizzato dall'host. Impossibile collegarlo"
+"alla macchina guest."
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr "L'interfaccia %(iface)s non esiste nella macchina virtuale %(name)s"
+msgstr ""
+"L'interfaccia %(iface)s non esiste nella macchina virtuale %(name)s"
 
 #, python-format
 msgid ""
@@ -397,8 +480,7 @@ msgstr ""
 
 msgid "Network name for virtual machine interface must be a string"
 msgstr ""
-"Il nome di rete per l'interfaccia della macchina virtuale deve essere una "
-"stringa"
+"Il nome di rete per l'interfaccia della macchina virtuale deve essere una stringa"
 
 msgid "Invalid network model card specified for virtual machine interface"
 msgstr ""
@@ -406,25 +488,29 @@ msgstr ""
 
 msgid "Specify type and network to add a new virtual machine interface"
 msgstr ""
-"Specificare il tipo e la rete per aggiungere una nuova interfaccia della "
-"macchina virtuale"
+"Specificare il tipo e la rete per aggiungere una nuova interfaccia della macchina virtuale"
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"L'indirizzo MAC deve rispettare il formato FF:FF:FF:FF:FF:FF"
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"L'indirizzo MAC %(mac)s esiste gi? nella macchina virtuale %(name)s"
 
 msgid "Invalid MAC Address"
 msgstr ""
+"Indirizzo MAC non valido"
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"Impossibile modificare l'indirizzo MAC di una macchina virtuale in esecuzione"
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "Modello %(name)s gi? esistente"
+msgstr ""
+"Modello %(name)s gi? esistente"
 
 #, python-format
 msgid ""
@@ -436,18 +522,17 @@ msgstr ""
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
 msgstr ""
-"Il pool di memoria %(pool)s specificato per il modello %(template)s non "
-"esiste"
+"Il pool di memoria %(pool)s specificato per il modello %(template)s non esiste"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
 msgstr ""
-"Il pool di memoria %(pool)s specificato per il modello %(template)s non ? "
-"attivo"
+"Il pool di memoria %(pool)s specificato per il modello %(template)s non ? attivo"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "Parametro non valido %(param)s' specificato per CDROM."
+msgstr ""
+"Parametro non valido '%(param)s' specificato per CDROM."
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
@@ -455,216 +540,260 @@ msgstr ""
 "La rete %(network)s specificata per il modello %(template)s non ? attiva"
 
 msgid "Template name must be a string"
-msgstr "Il nome del modello deve essere una stringa"
+msgstr ""
+"Il nome del modello deve essere una stringa"
 
 msgid "Template icon must be a path to the image"
-msgstr "L'icona del modello deve essere un percorso all'immagine"
+msgstr ""
+"L'icona del modello deve essere un percorso all'immagine"
 
 msgid "Template distribution must be a string"
-msgstr "La distribuzione del modello deve essere una stringa"
+msgstr ""
+"La distribuzione del modello deve essere una stringa"
 
 msgid "Template distribution version must be a string"
-msgstr "La versione della distribuzione del modello deve essere una stringa"
+msgstr ""
+"La versione della distribuzione del modello deve essere una stringa"
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "Il numero di CPU deve essere un numero intero"
+msgstr ""
+"Il numero di CPU deve essere un numero intero maggiore di 0"
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
 msgstr ""
 "La quantit? di memoria (MB) deve essere un numero intero maggiore di  512"
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "Il CDROM del modello deve essere un file ISO locale o remoto"
+msgstr ""
+"Il CDROM del modello deve essere un file ISO locale o remoto"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
-msgstr "URI pool di memoria non valido: %(value)s specificato per il modello"
+msgstr ""
+"URI pool di memoria non valido %(value)s specificato per il modello"
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr "Specificare un'immagine ISO come CDROM per creare un modello"
+msgstr ""
+"Specificare un'immagine ISO come CDROM o un'immagine di base per creare un modello"
 
 msgid "All networks for the template must be specified in a list."
-msgstr "Tutte le reti per il modello devono essere specificate in un elenco."
+msgstr ""
+"Tutte le reti per il modello devono essere specificate in un elenco."
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
 msgstr ""
+"Se il pool di memoria ? iSCSI o SCSI specificare un volume per un modello"
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
 msgstr ""
+"Il volume %(volume)s non ? nel pool di memoria %(pool)s"
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
-msgstr "Impossibile creare il modello a causa dell'errore: %(err)s"
+msgstr ""
+"Impossibile creare il modello a causa dell'errore: %(err)s"
 
 #, python-format
 msgid "Unable to delete template due error: %(err)s"
-msgstr "Impossibile eliminare il modello a causa dell'errore: %(err)s"
+msgstr ""
+"Impossibile eliminare il modello a causa dell'errore: %(err)s"
 
 msgid "Disk size must be an integer greater than 1GB."
 msgstr ""
+"La dimensione del disco deve essere un numero intero maggiore di 1GB."
 
 msgid "Template base image must be a valid local image file"
-msgstr "Il CDROM del modello deve essere un file ISO locale o remoto"
+msgstr ""
+"L'immagine di base del modello deve essere un file immagine locale valido"
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
 msgstr ""
+"Impossibile identificare il formato %(path)s dell'immagine di base"
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
 msgstr ""
+"Quando si specifica la topologia CPU, le VCPU devono essere composte da socket, core e"
+"thread."
 
 msgid ""
 "When specifying CPU topology, each element must be an integer greater than "
 "zero."
 msgstr ""
+"Quando si specifica la topologia CPU, ogni elemento deve essere un numero intero maggiore di"
+"zero."
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"Formato immagine disco non valido. Formati validi: bochs, cloop, cow, dmg, qcow, "
+"qcow2, qed, raw, vmdk, vpc."
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "Pool di memoria %(name)s gi? esistente"
+msgstr ""
+"Pool di memoria %(name)s gi? esistente"
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "Il pool di memoria %(name)s non esiste"
+msgstr ""
+"Il pool di memoria %(name)s non esiste"
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr "Specificare %(item)s per poter creare il  pool di memoria %(name)s"
+msgstr ""
+"Specificare %(item)s per poter creare il  pool di memoria %(name)s"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "Impossibile eliminare il pool di memoria attivo %(name)s"
+msgstr ""
+"Impossibile eliminare il pool di memoria attivo %(name)s"
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "Impossibile elencare i pool di memoria. Dettagli: %(err)s"
+msgstr ""
+"Impossibile elencare i pool di memoria. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr "Impossibile creare il pool di memoria %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile creare il pool di memoria %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
 msgstr ""
-"Impossibile ottenere il numero di volumi di memoria nel pool di memoria "
-"%(name)s. Dettagli: %(err)s"
+"Impossibile ottenere il numero di volumi di memoria nel pool di memoria %(name)s. Dettagli: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr "Impossibile attivare il pool di memoria %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile attivare il pool di memoria %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
-msgstr "Impossibile disattivare il pool di memoria %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile disattivare il pool di memoria %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
-msgstr "Impossibile eliminare il pool di memoria %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile eliminare il pool di memoria %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
 msgstr ""
-"Impossibile creare il pool NFS poich? il percorso di esportazione %(path)s "
-"potrebbe bloccarsi durante il montaggio"
+"Impossibile creare il pool NFS poich? il percorso di esportazione %(path)s potrebbe bloccarsi durante il montaggio"
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"Impossibile creare il pool NFS poich? il montaggio del percorso di "
-"esportazione %(path)s ha avuto esito negativo"
+"Impossibile creare il pool NFS poich? il montaggio del percorso di esportazione %(path)s ha avuto esito negativo"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "Tipo di pool di memoria non supportato: %(type)s"
+msgstr ""
+"Tipo di pool di memoria non supportato: %(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
 msgstr ""
+"Errore durante il richiamo dell'XML del pool di memoria per %(pool)s"
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"Il nome del pool di memoria deve essere una stringa senza barre (/)"
 
 msgid ""
 "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
 "iso"
 msgstr ""
+"I tipi di pool di memoria supportati sono dir, netfs, logico, iscsi, isci e kimchi-"
+"iso"
 
 msgid "Storage pool path must be a string"
-msgstr "Il percorso del pool di memoria deve essere una stringa"
+msgstr ""
+"Il percorso del pool di memoria deve essere una stringa"
 
 msgid "Storage pool host must be a IP or hostname"
-msgstr "L'host del pool di memoria deve essere un nome host o IP"
+msgstr ""
+"L'host del pool di memoria deve essere un nome host o IP"
 
 msgid "Storage pool device must be the absolute path to the block device"
 msgstr ""
+"Il dispositivo pool di memoria deve essere il percorso assoluto al dispositivo del blocco"
 
 msgid "Storage pool devices parameter must be a list"
-msgstr "Il parametro dispositivi pool di memoria deve essere un elenco"
+msgstr ""
+"Il parametro dispositivi pool di memoria deve essere un elenco"
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "L'IQN di destinazione di un pool iSCSI deve essere una stringa"
+msgstr ""
+"L'IQN di destinazione di un pool iSCSI deve essere una stringa"
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
 msgstr ""
-"La porta di un server di memoria remoto deve essere un numero intero tra 1 e "
-"65535"
+"La porta di un server di memoria remoto deve essere un numero intero tra 1 e 65535"
 
 msgid "iSCSI target username must be a string"
 msgstr ""
+"Il nome utente della destinazione iSCSI deve essere una stringa"
 
 msgid "iSCSI target password must be a string"
 msgstr ""
+"La password della destinazione iSCSI deve essere una stringa"
 
 msgid "Specify name and type to create a storage pool"
-msgstr "Specificare nome e tipo per creare un pool di memoria"
+msgstr ""
+"Specificare nome e tipo per creare un pool di memoria"
 
 #, python-format
 msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
 msgstr ""
-"%(disk)s non ? un disco/partizione valido. Impossibile aggiungerlo al pool "
+"%(disk)s non ? un disco/partizione valido. Impossibile aggiungerlo al pool"
 "%(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
 msgstr ""
+"Impossibile estendere il pool logico %(pool)s. Dettagli: %(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
 msgstr ""
 "Solo il parametro dischi pu? essere aggiornato per il pool di memoria logico."
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "Il nome adattatore host SCSI deve essere una stringa."
+msgstr ""
+"Il nome adattatore host SCSI deve essere una stringa."
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr "Il pool di memoria kimchi_isos ? riservato per uso interno"
+msgstr ""
+"Il pool di memoria kimchi_isos ? riservato per uso interno"
 
 #, python-format
 msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossibile attivare il pool di memoria NFS %(name)s. Il server NFS "
-"%(server)s ? irraggiungibile."
+"Impossibile attivare il pool di memoria NFS %(name)s. Il server NFS %(server)s ? "
+"irraggiungibile."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"Impossibile disattivare il pool di memoria NFS %(name)s. Il server NFS "
-"%(server)s ? irraggiungibile."
+"Impossibile disattivare il pool di memoria NFS %(name)s. Il server NFS %(server)s ? "
+"irraggiungibile."
 
 #, python-format
 msgid ""
@@ -682,62 +811,66 @@ msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
 msgstr ""
-"Un gruppo di volumi denominato '%(name)s' esiste gi?. Scegliere un altro "
-"nome per creare il pool logico."
+"Un gruppo di volumi denominato '%(name)s' esiste gi?. Scegliere un altro nome "
+"per creare il pool logico."
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
 msgstr ""
-"Impossibile aggiornare il database con informazioni approfondite sulla "
-"scansione a causa dell'errore: %(err)s"
+"Impossibile aggiornare il database con informazioni approfondite sulla scansione a causa dell'errore: %(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "Volume di memoria %(name)s gi? esistente"
+msgstr ""
+"Volume di memoria %(name)s gi? esistente"
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
-msgstr "Il volume di memoria %(name)s non esiste nel pool di memoria %(pool)s"
+msgstr ""
+"Il volume di memoria %(name)s non esiste nel pool di memoria %(pool)s"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
 msgstr ""
+"Impossibile creare il volume di memoria %(volume)s perch? il pool di memoria %(pool)s "
+"non ? attivo"
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
-msgstr "Specificare %(item)s per poter creare il volume di memoria %(volume)s"
+msgstr ""
+"Specificare %(item)s per poter creare il volume di memoria %(volume)s"
 
 #, 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 "
-"non ? attivo"
+"Impossibile elencare i volumi di memoria poich? il pool di memoria %(pool)s non ? attivo"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
 msgstr ""
-"Impossibile creare il volume di memoria %(name)s nel pool di memoria "
-"%(pool)s. Dettagli: %(err)s"
+"Impossibile creare il volume di memoria %(name)s nel pool di memoria %(pool)s. Dettagli: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"Impossibile elencare i volumi di memoria nel pool di memoria %(pool)s. "
-"Dettagli: %(err)s"
+"Impossibile elencare i volumi di memoria nel pool di memoria %(pool)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
-msgstr "Impossibile ripulire i volumi di memoria %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile ripulire i volumi di memoria %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
-msgstr "Impossibile eliminare il volume di memoria %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile eliminare il volume di memoria %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
@@ -747,91 +880,110 @@ msgstr ""
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
 msgstr ""
-"Il tipo di memoria %(type)s non supporta la creazione ed eliminazione del "
-"volume"
+"Il tipo di memoria %(type)s non supporta la creazione ed eliminazione del volume"
 
 msgid "Storage volume name must be a string"
-msgstr "Il nome del volume di memoria deve essere una stringa"
+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"
+msgstr ""
+"L'assegnazione del volume di memoria deve essere un numero intero"
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"Formato del volume di memoria non supportato. Formati validi: bochs, cloop, cow, dmg, "
+"qcow, qcow2, qed, raw, vmdk, vpc."
 
 msgid "Storage volume requires a volume name"
-msgstr "Il volume di memoria richiede un nome volume"
+msgstr ""
+"Il volume di memoria richiede un nome volume"
 
 #, python-format
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
 msgstr ""
-"Impossibile aggiornare il database con informazioni sul volume di memoria a "
-"causa dell'errore: %(err)s"
+"Impossibile aggiornare il database con informazioni sul volume di memoria a causa dell'errore: %(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
 msgstr ""
+"? possibile specificare solo un parametro %(param)s"
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
 msgstr ""
+"La creazione del volume da %(param)s non ? supportata"
 
 msgid "Storage volume capacity must be an integer number."
 msgstr ""
+"La capacit? del volume di memoria deve essere un numero intero."
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
 msgstr ""
+"L'URL del volume di memoria deve essere http://, https://, ftp:// o ftps://."
 
 #, python-format
 msgid "Unable to access file %(url)s. Please, check it."
 msgstr ""
+"Impossibile accedere al file %(url)s. Verificare."
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossibile clonare il volume di memoria '%(name)s' nel pool '%(pool)s'. Dettagli: "
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"Specificare dati sezione e dimensioni per caricare un file. "
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"Per caricare un volume di memoria, specificare il parametro 'upload'. "
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"Impossibile caricare i dati sezione perch? non corrispondono con la dimensione sezione richiesta. "
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"Il volume di memoria %(vol)s non ? sottoposto a un processo di caricamento. "
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"I dati sezione da caricare supereranno la dimensione del volume di memoria. "
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"Impossibile caricare i dati sezione nel volume di memoria. Dettagli: %(err)s. "
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "L'interfaccia %(name)s non esiste"
+msgstr ""
+"L'interfaccia %(name)s non esiste"
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "Rete %(name)s gi? esistente"
+msgstr ""
+"Rete %(name)s gi? esistente"
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "La rete %(name)s non esiste"
+msgstr ""
+"La rete %(name)s non esiste"
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
 msgstr ""
-"La sottorete %(subnet)s specificata per la rete %(network)s non ? valida ."
+"La sottorete %(subnet)s specificata per la rete %(network)s non ? valida."
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
@@ -840,7 +992,8 @@ msgstr ""
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "Impossibile eliminare la rete attiva %(name)s"
+msgstr ""
+"Impossibile eliminare la rete attiva %(name)s"
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
@@ -849,66 +1002,72 @@ msgstr ""
 
 msgid "Interface should be bare NIC, bonding or bridge device."
 msgstr ""
-"L'interfaccia deve essere un dispositivo bridge o di collegamento NIC bare-"
-"metal."
+"L'interfaccia deve essere un dispositivo bridge o di collegamento NIC bare-metal."
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile creare la rete %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'"
+msgstr ""
+"Impossibile trovare un indirizzo IP libero per la rete '%(name)s'"
 
 #, python-format
 msgid "The interface %(iface)s already exists."
-msgstr "L'interfaccia %(iface)s gi? esistente."
+msgstr ""
+"Interfaccia %(iface)s gi? esistente."
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"Il nome della rete deve essere una stringa senza barre (/) o virgolette (\")"
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "I tipi di rete supportati sono isolata, NAT e   bridge"
+msgstr ""
+"I tipi di rete supportati sono isolata, NAT e bridge"
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
 msgstr ""
-"La sottorete della rete deve essere una stringa con indirizzo IP e prefisso "
-"o maschera di rete"
+"La sottorete della rete deve essere una stringa con indirizzo IP e prefisso o maschera di rete"
 
 msgid "Network interface must be a string"
-msgstr "L'interfaccia di rete deve essere una stringa"
+msgstr ""
+"L'interfaccia di rete deve essere una stringa"
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "L'ID VLAN di rete deve essere un numero intero tra 1 e 4094"
+msgstr ""
+"L'ID VLAN di rete deve essere un numero intero tra 1 e 4094"
 
 msgid "Specify name and type to create a Network"
-msgstr "Specificare nome e tipo per creare una rete"
+msgstr ""
+"Specificare nome e tipo per creare una rete"
 
 #, python-format
 msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
-"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali "
-"%(vms)s e/o modelli collegati a tale rete."
+"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali %(vms)s "
+"e/o modelli collegati a tale rete."
 
 #, python-format
 msgid ""
 "Unable to deactivate network %(name)s. There are some virtual machines "
 "%(vms)s and/or templates linked to this network."
 msgstr ""
-"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie "
+"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtuali "
 "%(vms)s e/o modelli collegati a tale rete."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
 msgstr ""
-"Il dispositivo bridge %(name)s non pu? essere il dispositivo trunk di una "
-"VLAN."
+"Il dispositivo bridge %(name)s non pu? essere il dispositivo trunk di una VLAN."
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "Impossibile attivare l'interfaccia %(iface)s: %(err)s."
+msgstr ""
+"Impossibile attivare l'interfaccia %(iface)s: %(err)s."
 
 #, python-format
 msgid ""
@@ -921,127 +1080,150 @@ msgstr ""
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
 msgstr ""
+"Impossibile avviare la rete %(name)s. Dettagli: %(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "Il report di debug %(name)s non esiste"
+msgstr ""
+"Il report di debug %(name)s non esiste"
 
 msgid "Debug report tool not found in system"
-msgstr "Strumento report di debug non trovato nel sistema"
+msgstr ""
+"Strumento report di debug non trovato nel sistema"
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
-msgstr "Impossibile creare il report di debug %(name)s. Dettagli: %(err)s."
+msgstr ""
+"Impossibile creare il report di debug %(name)s. Dettagli: %(err)s. "
 
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
 msgstr ""
+"Impossibile trovare un report di debug con il nome fornito %(name)s"
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
-msgstr "Impossibile generare il report di debug %(name)s. Dettagli: %(err)s"
+msgstr ""
+"Impossibile generare il report di debug %(name)s. Dettagli: %(err)s"
 
 msgid "You should give a name for the debug report file."
 msgstr ""
+"? necessario fornire un nome per il file report di debug. "
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
+"Il nome report di debug deve essere una stringa. Sono consentiti solo lettere, cifre, sottolineature ('_') "
+"e trattini ('-')."
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
 msgstr ""
-"Un gruppo di volumi denominato '%(name)s' esiste gi?. Scegliere un altro "
-"nome per creare il pool logico."
+"Il report di debug con il nome specificato  \"%(name)s\" gi? esiste. Utilizzare "
+"un altro."
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "Il server di memoria %(server)s non ? stato utilizzato da Kimchi"
+msgstr ""
+"Il server di memoria %(server)s non ? stato utilizzato da Kimchi"
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "Distro '%(name)s' non esistente"
+msgstr ""
+"Distro '%(name)s' non esistente"
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "La partizione %(name)s non esiste nell'host"
+msgstr ""
+"La partizione %(name)s non esiste nell'host"
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
 msgstr ""
-"Impossibile arrestare la macchina host poich? sono presenti macchine "
-"virtuali in esecuzione"
+"Impossibile arrestare la macchina host poich? sono presenti macchine virtuali in esecuzione"
 
 msgid "Unable to reboot host machine as there are running virtual machines"
 msgstr ""
-"Impossibile riavviare la macchina host poich? sono presenti macchine "
-"virtuali in esecuzione"
+"Impossibile riavviare la macchina host poich? sono presenti macchine virtuali in esecuzione"
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "Dispositivo nodo '%(name)s' non trovato"
+msgstr ""
+"Dispositivo nodo '%(name)s' non trovato"
 
 msgid "Conflicting flag filters specified."
 msgstr ""
+"Sono stati specificati dei filtri indicatore in conflitto."
 
 msgid "No packages marked for update"
-msgstr "Nessun pacchetto contrassegnato per l'aggiornamento"
+msgstr ""
+"Nessun pacchetto contrassegnato per l'aggiornamento"
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "Il pacchetto %(name)s non ? contrassegnato per l'aggiornamento."
+msgstr ""
+"Il pacchetto %(name)s non ? contrassegnato per l'aggiornamento. "
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
 msgstr ""
-"Errore durante il richiamo dei pacchetti contrassegnati per l'aggiornamento. "
-"Dettagli: %(err)s"
+"Errore durante il richiamo dei pacchetti contrassegnati per l'aggiornamento. Dettagli: %(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "Non ? presente un gestore pacchetti compatibile per questo sistema."
+msgstr ""
+"Non ? presente un gestore pacchetti compatibile per questo sistema."
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "Impossibile trovare %(item)s nell'archivio dati"
+msgstr ""
+"Impossibile trovare %(item)s nell'archivio dati"
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "URI %(uri)s non valido"
+msgstr ""
+"URI non valido %(uri)s"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
 msgstr ""
-"? stato raggiunto il timeout durante l'esecuzione del comando '%(cmd)s' dopo "
-"%(seconds)s secondi"
+"Timeout durante l'esecuzione del comando '%(cmd)s' dopo %(seconds)s secondi"
 
 msgid "Unable to choose a virtual machine name"
 msgstr ""
+"Impossibile scegliere un nome di macchina virtuale"
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"Valore dati non valido '%(value)s'"
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"Unit? dati non valida '%(unit)s'"
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "Tipo di memoria non valido. I tipi supportati sono: 'cdrom'"
+msgstr ""
+"Tipo di memoria non valido. Tipi supportati: 'cdrom', 'disk'"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
 msgstr ""
+"Il percorso '%(value)s' non ? un percorso locale/remoto valido per il dispositivo"
 
 msgid "Only CDROM path can be update."
 msgstr ""
+"? possibile aggiornare solo il percorso CDROM."
 
 #, python-format
 msgid ""
 "The storage device %(dev_name)s does not exist in the virtual machine "
 "%(vm_name)s"
 msgstr ""
+"Il dispositivo di memoria %(dev_name)s non esiste nella macchina virtuale"
+"%(vm_name)s"
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
@@ -1050,20 +1232,23 @@ msgstr ""
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
-msgstr "Errore durante l'aggiornamento del dispositivo di memoria: %(error)s"
+msgstr ""
+"Errore durante l'aggiornamento del dispositivo di memoria: %(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
-msgstr "Errore durante la rimozione del dispositivo di memoria: %(error)s"
+msgstr ""
+"Errore durante la rimozione del dispositivo di memoria: %(error)s"
 
 msgid "Do not support IDE device hot plug"
 msgstr ""
+"Non supportare hot plug dispositivo IDE"
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
 msgstr ""
-"Specificare tipo e percorso per aggiungere un nuovo disco della macchina "
+"Specificare il tipo e il percorso oppure il tipo e il pool/volume per aggiungere un nuovo disco di macchina "
 "virtuale"
 
 msgid "Specify path to update virtual machine disk"
@@ -1073,90 +1258,110 @@ msgstr ""
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
 msgstr ""
+"Il tipo di controller %(type)s ha raggiunto il limite di %(limit)s dispositivi"
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
 msgstr ""
+"Impossibile richiamare le informazioni del percorso disco per il pool/volume fornito: %(error)s"
 
 msgid "Volume already in use by other virtual machine."
 msgstr ""
+"Il volume ? gi? utilizzato da un'altra macchina virtuale."
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
 msgstr ""
-"Specificare tipo e percorso per aggiungere un nuovo disco della macchina "
-"virtuale"
+"? possibile specificare solo uno tra percorso o pool/volume per aggiungere un nuovo"
+"disco di macchina virtuale"
 
 #, python-format
 msgid ""
 "Volume chosen with format %(format)s does not fit in the storage type "
 "%(type)s"
 msgstr ""
+"Il volume scelto con il formato %(format)s non si adatta nel tipo di memoria "
+"%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
-msgstr "L'ID repository YUM deve essere una stringa di una sola parola."
+msgstr ""
+"L'ID repository YUM deve essere una stringa di una sola parola."
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "L'URL del repository deve essere http://, ftp:// o file:// URL."
+msgstr ""
+"L'URL del repository deve essere http://, ftp:// o file:// URL."
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
 "repository type."
 msgstr ""
-"La configurazione del repository ? un dizionario con valori specifici in "
-"base al tipo di repository."
+"La configurazione del repository ? un dizionario con valori specifici in base al "
+"tipo di repository."
 
 msgid "Distribution to DEB repository must be a string"
-msgstr "La distribuzione al repository DEB deve essere una stringa"
+msgstr ""
+"La distribuzione al repository DEB deve essere una stringa"
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "I componenti per il repository DEB devono essere elencati in un array"
+msgstr ""
+"I componenti per il repository DEB devono essere elencati in un array"
 
 msgid "Components to DEB repository must be a string"
-msgstr "I componenti per il repository DEB devono essere una stringa"
+msgstr ""
+"I componenti per il repository DEB devono essere una stringa"
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"L'elenco di elementi speculari per il repository deve essere una stringa"
 
 msgid "YUM Repository name must be string."
-msgstr "Il nome del repository YUM deve essere una stringa."
+msgstr ""
+"Il nome del repository YUM deve essere una stringa."
 
 msgid "GPG check must be a boolean value."
-msgstr "Il controllo GPG deve essere un valore booleano."
+msgstr ""
+"Il controllo GPG deve essere un valore booleano."
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr "La chiave GPG deve essere un URL che punta al file blindato ASCII."
+msgstr ""
+"La chiave GPG deve essere un URL che punta al file blindato ASCII."
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "Impossibile aggiornare il repository %(repo_id)s."
+msgstr ""
+"Impossibile aggiornare il repository %(repo_id)s."
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "Il repository %(repo_id)s non esiste."
+msgstr ""
+"Il repository %(repo_id)s non esiste."
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"Specificare l'URL di base del repository, l'elenco di elementi speculari o metalink per poter creare o "
+"aggiornare un repository YUM."
 
 msgid "Repository management tool was not recognized for your system."
 msgstr ""
-"Lo strumento di gestione del repository non ? stato riconosciuto per il "
-"sistema."
+"Lo strumento di gestione del repository non ? stato riconosciuto per il sistema."
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "Il repository %(repo_id)s ? gi? abilitato."
+msgstr ""
+"Il repository %(repo_id)s ? gi? abilitato."
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "Il repository %(repo_id)s ? gi? disabilitato."
+msgstr ""
+"Il repository %(repo_id)s ? gi? disabilitato."
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "Impossibile rimuovere il repository %(repo_id)s."
+msgstr ""
+"Impossibile rimuovere il repository %(repo_id)s."
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
@@ -1165,26 +1370,30 @@ msgstr ""
 
 msgid "Specify repository distribution in order to create a DEB repository."
 msgstr ""
-"Specificare la distribuzione del repository per poter creare un repository "
-"DEB."
+"Specificare la distribuzione del repository per poter creare un repository DEB."
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "Impossibile abilitare il repository %(repo_id)s."
+msgstr ""
+"Impossibile abilitare il repository %(repo_id)s."
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "Impossibile disabilitare il repository %(repo_id)s."
+msgstr ""
+"Impossibile disabilitare il repository %(repo_id)s."
 
 msgid "YUM Repository ID already exists"
-msgstr "ID repository YUM gi? esistente"
+msgstr ""
+"ID repository YUM gi? esistente"
 
 msgid "YUM Repository name must be a string"
-msgstr "Il nome del repository YUM deve essere una stringa"
+msgstr ""
+"Il nome del repository YUM deve essere una stringa"
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "Impossibile elencare i repository. Dettagli: '%(err)s'"
+msgstr ""
+"Impossibile elencare i repository. Dettagli: '%(err)s'"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
@@ -1193,1062 +1402,1359 @@ msgstr ""
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "Impossibile aggiungere il repository. Dettagli: '%(err)s'"
+msgstr ""
+"Impossibile aggiungere il repository. Dettagli: '%(err)s'"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "Impossibile rimuovere il repository. Dettagli: '%(err)s'"
+msgstr ""
+"Impossibile rimuovere il repository. Dettagli: '%(err)s'"
 
 #, python-format
 msgid ""
 "Configuration items: '%(items)s' are not supported by repository manager"
 msgstr ""
+"Elementi di configurazione: '%(items)s' non supportati dal gestore repository "
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"Il metalink del repository deve essere http://, ftp:// o file:// URL."
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"Impossibile specificare contemporaneamente elenco di elementi speculari e metalink. "
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
 msgstr ""
+"La macchina virtuale '%(vm)s' deve essere arrestata prima di poterne creare l'istantanea. "
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossibile creare l'istantanea '%(name)s' sulla macchina virtuale '%(vm)s'. Dettagli: "
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
 msgstr ""
+"L'istantanea '%(name)s' non esiste sulla macchina virtuale '%(vm)s'."
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossibile richiamare l'istantanea '%(name)s' sulla macchina virtuale '%(vm)s'. Dettagli: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
+"Impossibile elencare le istantanee sulla macchina virtuale '%(vm)s'. Dettagli: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossibile eliminare l'istantanea '%(name)s' sulla macchina virtuale '%(vm)s'. Dettagli: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossibile richiamare l'istantanea corrente sulla macchina virtuale '%(vm)s'. Dettagli: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
 msgstr ""
+"Impossibile invertire la macchina virtuale '%(vm)s' alla istantanea '%(name)s'. Dettagli: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
+"Impossibile creare l'istantanea della macchina virtuale '%(vm)s' perch? contiene un "
+"disco con formato '%(format)s'; solo 'qcow2' ? supportato."
 
 msgid "The number of vCPUs is too large for this system."
 msgstr ""
+"Il numero di vCPU ? troppo grande per questo sistema. "
 
 msgid "Invalid vCPU/topology combination."
 msgstr ""
+"Combinazione vCPU/topologia non valida. "
 
 msgid "This host (or current configuration) does not allow CPU topology."
 msgstr ""
+"Questo host (o configurazione corrente) non consente la topologia CPU."
 
 msgid "ERROR CODE"
-msgstr "CODICE DI ERRORE"
+msgstr ""
+"CODICE DI ERRORE"
 
 msgid "REASON"
-msgstr "CAUSA"
+msgstr ""
+"CAUSA"
 
 msgid "STACK"
-msgstr "STACK"
+msgstr ""
+"STACK"
 
 msgid "Go to Homepage"
-msgstr "Vai alla home page"
+msgstr ""
+"Vai alla home page"
 
 msgid "Create a New Virtual Machine"
-msgstr "Crea una nuova macchina virtuale"
+msgstr ""
+"Crea una nuova macchina virtuale"
 
 msgid "Virtual Machine Name"
-msgstr "Nome macchina virtuale"
+msgstr ""
+"Nome macchina virtuale"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
 msgstr ""
-"Il nome utilizzato per identificare la macchina virtuale. Se il nome viene "
-"omesso ne verr? scelto uno in base al modello utilizzato."
+"Il nome utilizzato per identificare la macchina virtuale. Se il nome viene omesso "
+"ne verr? scelto uno in base al modello utilizzato."
 
 msgid "Template"
-msgstr "Modello"
+msgstr ""
+"Modello"
 
 msgid "Please create a template first."
-msgstr "Creare prima un modello."
+msgstr ""
+"Creare prima un modello."
 
 msgid "Create a Template"
-msgstr "Crea un modello"
+msgstr ""
+"Crea un modello"
 
 msgid "Please choose a template."
-msgstr "Scegliere un modello."
+msgstr ""
+"Scegliere un modello."
 
 msgid "OS"
-msgstr "SO"
+msgstr ""
+"SO"
 
 msgid "OS Version"
-msgstr "Versione SO"
+msgstr ""
+"Versione SO"
 
 msgid "CPUS"
-msgstr "CPUS"
+msgstr ""
+"CPUS"
 
 msgid "Memory"
-msgstr "Memoria"
+msgstr ""
+"Memoria"
 
 msgid "Create"
-msgstr "Crea"
+msgstr ""
+"Crea"
 
 msgid "Creating..."
 msgstr ""
+"Creazione..."
 
 msgid "Edit Guest"
-msgstr "Modifica guest"
+msgstr ""
+"Modifica macchina guest"
 
 msgid "General"
-msgstr "Generale"
+msgstr ""
+"Generale"
 
 msgid "Storage"
-msgstr "Memoria"
+msgstr ""
+"Memoria"
 
 msgid "Interface"
-msgstr "Interfaccia"
+msgstr ""
+"Interfaccia"
 
 msgid "Permission"
-msgstr "Versione"
+msgstr ""
+"Autorizzazione"
 
 msgid "Host PCI Device"
 msgstr ""
+"Dispositivo PCI host"
 
 msgid "Snapshot"
 msgstr ""
+"Istantanea"
 
 msgid "Name"
-msgstr "Nome"
+msgstr ""
+"Nome"
 
 msgid "CPUs"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Memory (MB)"
-msgstr "Memoria"
+msgstr ""
+"Memoria (MB)"
 
 msgid "Icon"
-msgstr "Icona"
+msgstr ""
+"Icona"
 
 msgid "Device"
-msgstr "Nome dispositivo"
+msgstr ""
+"Unit?"
 
 msgid "Path"
-msgstr "Percorso NFS"
+msgstr ""
+"Percorso"
 
 msgid "Network"
-msgstr "Rete"
+msgstr ""
+"Rete"
 
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
+"Tipo"
 
 msgid "MAC Address"
 msgstr ""
+"Indirizzo MAC"
 
 msgid "Available system users and groups"
 msgstr ""
+"Utenti e gruppi di sistema disponibili"
 
 msgid "Selected system users and groups"
 msgstr ""
+"Utenti e gruppi di sistema selezionati"
 
 msgid "User"
 msgstr ""
+"Utente "
 
 msgid "All"
-msgstr "Tutti"
+msgstr ""
+"Tutti"
 
 msgid "To Add"
 msgstr ""
+"Da aggiungere"
 
 msgid "Added"
 msgstr ""
+"Aggiunto"
 
 msgid "filter"
 msgstr ""
+"filtro"
 
 msgid "Product"
 msgstr ""
+"Prodotto"
 
 msgid "Vendor"
-msgstr "Fornitore"
+msgstr ""
+"Fornitore"
 
 msgid "Created"
 msgstr ""
+"Creato"
 
 msgid "Save"
-msgstr "Salva"
+msgstr ""
+"Salva"
 
 msgid "Replace"
-msgstr "Sostituisci"
+msgstr ""
+"Sostituisci"
 
 msgid "Detach"
-msgstr "Scollega"
+msgstr ""
+"Scollega"
 
 msgid "Cancel"
-msgstr "Annulla"
+msgstr ""
+"Annulla"
 
 msgid "revert"
 msgstr ""
+"Inverti"
 
 msgid "Add a Storage Device to VM"
-msgstr "Aggiungi un dispositivo di memoria alla VM"
+msgstr ""
+"Aggiungi un dispositivo di memoria alla VM"
 
 msgid "Device Type"
-msgstr "Tipo dispositivo"
+msgstr ""
+"Tipo dispositivo"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr "Il tipo di dispositivo. Attualmente, ? supportato solo \"cdrom\"."
+msgstr ""
+"Il tipo di dispositivo. Attualmente, sono supportati \"cdrom\" e \"disk\"."
 
 msgid "Storage Pool"
-msgstr "Pool di memoria"
+msgstr ""
+"Pool di memoria"
 
 msgid "Storage pool which volume located in"
-msgstr "Il percorso del pool di memoria deve essere una stringa"
+msgstr ""
+"Pool di memoria in cui si trova il volume"
 
 msgid "Storage Volume"
-msgstr "Nome pool di memoria"
+msgstr ""
+"Volume di memoria"
 
 msgid "Storage volume to be attached"
-msgstr "Il nome del volume di memoria deve essere una stringa"
+msgstr ""
+"Volume di memoria oggetto del collegamento"
 
 msgid "File Path"
-msgstr "Percorso file"
+msgstr ""
+"Percorso file"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "Il percorso file ISO nel server per CDROM."
+msgstr ""
+"Il percorso file ISO nel server per CDROM."
 
 msgid "Attach"
-msgstr "Allega"
+msgstr ""
+"Allega"
 
 msgid "Start"
-msgstr "Avvia"
+msgstr ""
+"Avvia"
 
 msgid "Reset"
-msgstr "Reimposta"
+msgstr ""
+"Reimposta"
 
 msgid "Pause"
 msgstr ""
+"In pausa"
 
 msgid "Resume"
 msgstr ""
+"Riprendi"
 
 msgid "Power Off"
 msgstr ""
+"Spegni"
 
 msgid "Actions"
-msgstr "Azioni"
+msgstr ""
+"Azioni"
 
 msgid "Connect"
-msgstr "Connetti"
+msgstr ""
+"Connetti"
 
 msgid "Clone"
 msgstr ""
+"Clona"
 
 msgid "Edit"
-msgstr "Modifica"
+msgstr ""
+"Modifica"
 
 msgid "Shut Down"
-msgstr "Arresta"
+msgstr ""
+"Arresta"
 
 msgid "Delete"
-msgstr "Elimina"
+msgstr ""
+"Elimina"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
-"Il nome utente o la password immessi non sono corretti. Ripetere "
-"l'operazione."
+"Il nome utente o la password immessi non sono corretti. Ripetere l'operazione."
 
 msgid "This field is required."
-msgstr "Questo campo ? obbligatorio."
+msgstr ""
+"Questo campo ? obbligatorio."
 
 msgid "Log in"
-msgstr "Accedi"
+msgstr ""
+"Accedi"
 
 msgid "Logging in..."
-msgstr "Accesso in corso..."
+msgstr ""
+"Accesso in corso..."
 
 msgid "Host"
-msgstr "Host"
+msgstr ""
+"Host"
 
 msgid "Guests"
-msgstr "Guest"
+msgstr ""
+"Guest"
 
 msgid "Templates"
-msgstr "Modelli"
+msgstr ""
+"Modelli"
 
 msgid "Failed to get application configuration"
-msgstr "Richiamo della configurazione dell'applicazione non riuscito"
+msgstr ""
+"Richiamo della configurazione dell'applicazione non riuscito"
 
 msgid "This is not a valid Linux path"
-msgstr "Non ? un percorso Linux valido"
+msgstr ""
+"Non ? un percorso Linux valido"
 
 msgid "This is not a valid URL."
-msgstr "Non ? un URL valido."
+msgstr ""
+"Non ? un URL valido."
 
 msgid "No such data available."
-msgstr "Dati indicati non disponibili."
+msgstr ""
+"Dati indicati non disponibili."
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"Impossibile contattare il sistema host. Verificare che il sistema host sia "
-"attivo e che si disponga della connettivit? di rete per tale sistema. "
-"Risposta alla richiesta HTTP %1. "
+"Impossibile contattare il sistema host. Verificare che il sistema host sia attivo e che "
+"abbia la connettivit? di rete. Risposta alla richiesta HTTP %1. "
 
 msgid "Unable to read file."
 msgstr ""
+"Impossibile leggere il file."
 
 msgid "Error while uploading file."
 msgstr ""
+"Errore durante il caricamento del file."
 
 msgid "Delete Confirmation"
-msgstr "Conferma eliminazione"
+msgstr ""
+"Conferma eliminazione"
 
 msgid "OK"
-msgstr "OK"
+msgstr ""
+"OK"
 
 msgid "Confirm"
-msgstr "Conferma"
+msgstr ""
+"Conferma"
 
 msgid "Warning"
-msgstr "Avvertenza"
+msgstr ""
+"Avvertenza"
 
 msgid "Cloning..."
 msgstr ""
+"Clonazione..."
 
 msgid "Loading..."
-msgstr "Caricamento in corso..."
+msgstr ""
+"Caricamento in corso..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"Si ? verificato un errore durante il richiamo delle informazioni di sistema. "
 
 msgid "Retry"
-msgstr "Riprova"
+msgstr ""
+"Riprova"
 
 msgid "Detailed message:"
-msgstr "Messaggio dettagliato:"
+msgstr ""
+"Messaggio dettagliato:"
 
 msgid "No ISO found"
 msgstr ""
+"Nessun file ISO trovato"
 
 msgid "This is not a valid ISO file."
-msgstr "Non ? un file ISO valido."
+msgstr ""
+"Non ? un file ISO valido."
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "Richieder? molto tempo. Continuare?"
+msgstr ""
+"Questa operazione pu? richiedere del tempo. Si desidera continuare?"
 
 msgid "This will permanently delete the template. Would you like to continue?"
-msgstr "L'azione eliminer? permanentemente il modello. Continuare?"
+msgstr ""
+"L'azione eliminer? permanentemente il modello. Si desidera continuare?"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
 msgstr ""
-"Impossibile arrestare il sistema poich? sono in esecuzione alcune macchine "
-"virtuali."
+"Impossibile arrestare il sistema poich? sono in esecuzione alcune macchine virtuali."
 
 msgid "Max:"
-msgstr "Massimo:"
+msgstr ""
+"Massimo:"
 
 msgid "Utilization"
-msgstr "Utilizzo"
+msgstr ""
+"Utilizzo"
 
 msgid "Available"
-msgstr "Disponibile"
+msgstr ""
+"Disponibile"
 
 msgid "Read Rate"
-msgstr "Velocit? di lettura"
+msgstr ""
+"Velocit? di lettura"
 
 msgid "Write Rate"
-msgstr "Velocit? di scrittura"
+msgstr ""
+"Velocit? di scrittura"
 
 msgid "Received"
-msgstr "Ricevuti"
+msgstr ""
+"Ricevuti"
 
 msgid "Sent"
-msgstr "Inviati"
+msgstr ""
+"Inviati"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
 msgstr ""
-"L'arresto o il riavvio dell'host provocher? la perdita del lavoro non "
-"salvato. Continuare con l'arresto o il riavvio?"
+"L'arresto o il riavvio dell'host provocher? la perdita del lavoro non salvato. Continuare con "
+"l'arresto o il riavvio?"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"Il repository verr? rimosso permanentemente e non potr? essere ripristinato. "
-"Si desidera continuare?"
+"Il repository verr? rimosso permanentemente e non potr? essere ripristinato. Si desidera "
+"continuare?"
 
 msgid "Repositories"
-msgstr "Repository"
+msgstr ""
+"Repository"
 
 msgid "ID"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Base URL"
-msgstr "URL di base"
+msgstr ""
+"URL di base"
 
 msgid "Is Mirror"
-msgstr "? speculare"
+msgstr ""
+"? speculare"
 
 msgid "URL Args"
-msgstr "Argomenti URL"
+msgstr ""
+"Argomenti URL"
 
 msgid "Enabled"
-msgstr "Abilitato"
+msgstr ""
+"Abilitato"
 
 msgid "GPG Check"
-msgstr "Controllo GPG"
+msgstr ""
+"Controllo GPG"
 
 msgid "GPG Key"
-msgstr "Chiave GPG"
+msgstr ""
+"Chiave GPG"
 
 msgid "Add"
-msgstr "Aggiungi"
+msgstr ""
+"Aggiungi"
 
 msgid "Remove"
-msgstr "Rimuovi"
+msgstr ""
+"Rimuovi"
 
 msgid "Enable"
-msgstr "Abilita"
+msgstr ""
+"Abilita"
 
 msgid "Disable"
-msgstr "Disabilita"
+msgstr ""
+"Disabilita"
 
 msgid "Software Updates"
-msgstr "Aggiornamenti del software"
+msgstr ""
+"Aggiornamenti del software"
 
 msgid "Package Name"
-msgstr "Nome pacchetto"
+msgstr ""
+"Nome pacchetto"
 
 msgid "Version"
-msgstr "Versione"
+msgstr ""
+"Versione"
 
 msgid "Architecture"
-msgstr "Architettura"
+msgstr ""
+"Architettura"
 
 msgid "Repository"
-msgstr "Repository"
+msgstr ""
+"Repository"
 
 msgid "Update All"
-msgstr "Aggiorna tutto"
+msgstr ""
+"Aggiorna tutto"
 
 msgid "Updating..."
-msgstr "Aggiornamento in corso..."
+msgstr ""
+"Aggiornamento in corso..."
 
 msgid "Failed to retrieve packages update information."
 msgstr ""
+"Richiamo delle informazioni di aggiornamento dei pacchetti non riuscito."
 
 msgid "Failed to update package(s)."
-msgstr "Aggiornamento dei pacchetti non riuscito."
+msgstr ""
+"Aggiornamento dei pacchetti non riuscito."
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"Il report del debug verr? rimosso permanentemente e non potr? essere "
-"ripristinato. Si desidera continuare?"
+"Il report del debug verr? rimosso permanentemente e non potr? essere ripristinato. Si desidera "
+"continuare?"
 
 msgid "Debug Reports"
-msgstr "Report di debug"
+msgstr ""
+"Report di debug"
 
 msgid "Generated Time"
-msgstr "Ora di creazione"
+msgstr ""
+"Ora di creazione"
 
 msgid "Generate"
-msgstr "Crea"
+msgstr ""
+"Crea"
 
 msgid "Generating..."
-msgstr "Creazione in corso..."
+msgstr ""
+"Creazione in corso..."
 
 msgid "Rename"
-msgstr "Ridenomina"
+msgstr ""
+"Ridenomina"
 
 msgid "Download"
-msgstr "Scarica"
+msgstr ""
+"Scarica"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
 msgstr ""
-"Il nome del report pu? contenere solo lettere, cifre e/o trattini  ('-')."
+"Il nome del report pu? contenere solo lettere, cifre, sottolineature ('_') e/o "
+"trattini ('-')."
 
 msgid "Pending..."
-msgstr "Caricamento in corso..."
+msgstr ""
+"In sospeso..."
 
 msgid "Report name is the same as the original one."
 msgstr ""
+"Il nome report ? uguale a quello originale. "
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
 msgstr ""
 "L'operazione eliminer? la macchina virtuale e i relativi dischi virtuali e "
-"non ? reversibile. Continuare?"
+"non ? reversibile. Si desidera continuare?"
 
 msgid "Power off Confirmation"
-msgstr "Conferma eliminazione"
+msgstr ""
+"Conferma spegnimento"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
 msgstr ""
+"Questa azione pu? produrre dei risultati indesiderabili, ad esempio una cache di disco "
+"non ripulita nella macchina guest. Si desidera continuare?"
 
 msgid "Reset Confirmation"
-msgstr "Conferma eliminazione"
+msgstr ""
+"Conferma reimpostazione"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
 msgstr ""
+"C'? un rischio di perdita di dati causato dalla reimpostazione senza l'arresto del sistema operativo della macchina guest. "
+"Si desidera continuare?"
 
 msgid "Shut Down Confirmation"
-msgstr "Conferma eliminazione"
+msgstr ""
+"Conferma dell'arresto"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
-msgstr "L'azione eliminer? permanentemente il modello. Continuare?"
+msgstr ""
+"Notare che il sistema operativo della macchina guest pu? ignorare questa richiesta. Si desidera continuare?"
 
 msgid "Virtual Machine delete Confirmation"
 msgstr ""
+"Conferma di eliminazione della macchina virtuale"
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
 msgstr ""
+"Questa macchina virtuale non ? persistente. Lo spegnimento la eliminer?. Continuare?"
 
 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 ""
+"Quando la macchina guest di destinazione ha volumi SCSI o iSCSI, essi verranno clonati sul"
+"pool di memoria predefinito. Lo stesso accadr? se il pool di destinazione non"
+"ha spazio sufficiente per clonare i volumi. Si desidera continuare?"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
 msgstr ""
-"Il CDROM verr? scollegato permanentemente e non sar? possibile ricollegarlo. "
-"Continuare con lo scollegamento?"
+"Il CDROM verr? scollegato permanentemente e non sar? possibile ricollegarlo. Continuare con "
+"lo scollegamento?"
 
 msgid "Attaching..."
-msgstr "Collegamento in corso..."
+msgstr ""
+"Collegamento in corso..."
 
 msgid "Replacing..."
-msgstr "Sostituzione in corso..."
+msgstr ""
+"Sostituzione in corso..."
 
 msgid "Successfully attached!"
-msgstr "Collegamento riuscito."
+msgstr ""
+"Collegamento riuscito."
 
 msgid "Successfully replaced!"
-msgstr "Sostituzione riuscita."
+msgstr ""
+"Sostituzione riuscita."
 
 msgid "Successfully detached!"
-msgstr "Scollegamento riuscito."
+msgstr ""
+"Scollegamento riuscito."
 
 msgid ""
 "This disk will be detached permanently and you can re-attach it. Continue to "
 "detach it?"
 msgstr ""
+"Il disco verr? scollegato permanentemente e sar? possibile ricollegarlo. Continuare con "
+"lo scollegamento?"
 
 msgid "interface:"
 msgstr ""
+"interfaccia:"
 
 msgid "address:"
 msgstr ""
+"indirizzo:"
 
 msgid "link_type:"
 msgstr ""
+"tipo_link:"
 
 msgid "block:"
 msgstr ""
+"blocco:"
 
 msgid "drive_type:"
 msgstr ""
+"tipo_drive:"
 
 msgid "model:"
 msgstr ""
+"modello:"
 
 msgid "Affected devices:"
 msgstr ""
+"Dispositivi influenzati:"
 
 msgid "The VLAN id must be between 1 and 4094."
-msgstr "L'ID VLAN deve essere compreso tra 1 e 4094."
+msgstr ""
+"L'ID VLAN deve essere compreso tra 1 e 4094."
 
 msgid "unavailable"
-msgstr "non disponibile"
+msgstr ""
+"non disponibile"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
 "depend on this network."
 msgstr ""
-"L'azione interromper? la connettivit? di rete per qualsiasi macchina "
-"virtuale che dipende da questa rete."
+"L'azione interromper? la connettivit? di rete per qualsiasi macchina virtuale che "
+"dipende da questa rete."
 
 msgid "Create a network"
-msgstr "Crea una rete"
+msgstr ""
+"Crea una rete"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"Il pool di memoria non ? permanente. Invece di disattivarlo, l'azione lo "
-"eliminer? permanentemente. Continuare?"
+"Questa rete non ? permanente. Invece di arrestarla, questa azione la "
+"eliminer? permanentemente. Si desidera continuare?"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"La tag VLAN con bridge potrebbe non funzionare bene con NetworkManager abilitato. Si "
+"dovrebbe prendere in considerazione la sua disabilitazione. "
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
-msgstr "L'azione eliminer? permanentemente il pool di memoria. Continuare?"
+msgstr ""
+"L'azione eliminer? permanentemente il pool di memoria. Si desidera continuare?"
 
 msgid "This storage pool is empty."
-msgstr "Il pool di memoria ? vuoto."
+msgstr ""
+"Il pool di memoria ? vuoto."
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
 "to continue? "
 msgstr ""
-"Il disco verr? formattato e tutti i dati su di esso andranno persi, sicuri "
-"di voler continuare? "
+"Il disco verr? formattato e tutti i dati su di esso andranno persi, sicuri di voler "
+"continuare? "
 
 msgid "SCSI Fibre Channel"
-msgstr "Canale a fibre ottiche SCSI"
+msgstr ""
+"Canale a fibre ottiche SCSI"
 
 msgid "No SCSI adapters found."
-msgstr "Nessun adattatore SCSI trovato."
+msgstr ""
+"Nessun adattatore SCSI trovato."
 
 msgid "Loading iSCSI targets..."
 msgstr ""
+"Caricamento delle destinazioni iSCSI..."
 
 msgid "No iSCSI found. Please input one."
 msgstr ""
+"iSCSI non trovato. Immetterne uno."
 
 msgid "Failed to load iSCSI targets."
 msgstr ""
+"Impossibile caricare le destinazioni iSCSI."
 
 msgid "The storage pool name can not be blank."
-msgstr "Il campo per il nome del pool di memoria non pu? essere vuoto."
+msgstr ""
+"Il campo per il nome del pool di memoria non pu? essere vuoto."
 
 msgid "The storage pool path can not be blank."
-msgstr "Il campo per il percorso del pool di memoria non pu? essere vuoto."
+msgstr ""
+"Il campo per il percorso del pool di memoria non pu? essere vuoto."
 
 msgid "NFS server mount path can not be blank."
 msgstr ""
 "Il campo per il percorso di montaggio del server NFS non pu? essere vuoto."
 
 msgid "Invalid NFS mount path."
-msgstr "Percorso di montaggio NFS non valido."
+msgstr ""
+"Percorso di montaggio NFS non valido."
 
 msgid "No logical device selected."
-msgstr "Nessun dispositivo logico selezionato."
+msgstr ""
+"Nessun dispositivo logico selezionato."
 
 msgid "The iSCSI target can not be blank."
-msgstr "Il campo per la destinazione iSCSI non pu? essere vuoto."
+msgstr ""
+"Il campo per la destinazione iSCSI non pu? essere vuoto."
 
 msgid "Server name can not be blank."
-msgstr "Il campo per il nome del server non pu? essere vuoto."
+msgstr ""
+"Il campo per il nome del server non pu? essere vuoto."
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
 msgstr ""
+"Nome server o IP non validi. Modificarli."
 
 msgid "Looking for available partitions ..."
-msgstr "Ricerca di partizioni disponibili in corso..."
+msgstr ""
+"Ricerca di partizioni disponibili in corso..."
 
 msgid "No available partitions found."
-msgstr "Nessuna partizione disponibile trovata."
+msgstr ""
+"Nessuna partizione disponibile trovata."
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
 "Il pool di memoria non ? permanente. Invece di disattivarlo, l'azione lo "
-"eliminer? permanentemente. Continuare?"
+"eliminer? permanentemente. Si desidera continuare?"
 
 msgid "Unable to retrieve partitions information."
 msgstr ""
-"Impossibile richiamare le informazioni sul repository. Dettagli: '%(err)s'"
+"Impossibile caricare le informazioni sulla partizione. "
 
 msgid "In progress..."
 msgstr ""
+"In corso..."
 
 msgid "Failed!"
 msgstr ""
+"Non riuscito."
 
 msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
 msgstr ""
+"Il percorso CDROM deve essere un percorso locale/remoto valido e non pu? essere vuoto."
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "Il campo per il nome del pool di memoria non pu? essere vuoto."
+msgstr ""
+"Il volume o il pool di dischi non pu? essere vuoto."
 
 msgid "Peers"
 msgstr ""
+"Peer"
 
 msgid "Searching"
 msgstr ""
+"Ricerca "
 
 msgid "No peers found."
 msgstr ""
+"Nessun peer trovato. "
 
 msgid "Help"
-msgstr "Guida"
+msgstr ""
+"Guida"
 
 msgid "About"
-msgstr "Info su"
+msgstr ""
+"Info su"
 
 msgid "Log out"
-msgstr "Disconnetti"
+msgstr ""
+"Disconnetti"
 
 msgid "Version:"
-msgstr "Versione:"
+msgstr ""
+"Versione:"
 
 msgid "Session timeout, please re-login."
 msgstr ""
+"Timeout della sessione; rieseguire l'accesso."
 
 msgid "User Name"
-msgstr "Nome utente"
+msgstr ""
+"Nome utente"
 
 msgid "Password"
-msgstr "Password"
+msgstr ""
+"Password"
 
 msgid "Generate a New Debug Report"
-msgstr "Crea un nuovo report di debug"
+msgstr ""
+"Crea un nuovo report di debug"
 
 msgid "Report Name"
-msgstr "Nome report"
+msgstr ""
+"Nome report"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"Il nome utilizzato per identificare il report. Se il nome viene omesso, ne "
-"viene scelto uno in base all'ora corrente. Il nome pu? contenere lettere, "
-"cifre e trattini (\"-\")."
+"Il nome utilizzato per identificare il report. Se il nome viene omesso, ne viene scelto uno "
+"in base all'ora corrente. Il nome pu? contenere lettere, cifre, sottolineature (\"_\") "
+"e trattini (\"-\")."
 
 msgid "Rename a Debug Report"
-msgstr "Crea un nuovo report di debug"
+msgstr ""
+"Ridenomina un report di debug"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
 msgstr ""
-"Il nome utilizzato per identificare il report. Se il nome viene omesso, ne "
-"viene scelto uno in base all'ora corrente. Il nome pu? contenere lettere, "
-"cifre e trattini (\"-\")."
+"Il nome utilizzato per identificare il report. Il nome pu? contenere lettere, cifre e"
+"trattini (\"-\")."
 
 msgid "Submit"
 msgstr ""
+"Inoltra"
 
 msgid "Add a Repository"
-msgstr "Aggiungi un repository"
+msgstr ""
+"Aggiungi un repository"
 
 msgid "Identifier"
-msgstr "Identificativo"
+msgstr ""
+"Identificativo"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "Identificativo univoco di una sola parola per il  repository."
+msgstr ""
+"Identificativo univoco di una sola parola per il  repository."
 
 msgid "Textual name for the repository."
-msgstr "Nome in formato testo per il repository."
+msgstr ""
+"Nome in formato testo per il repository."
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "Campo obbligatorio"
+msgstr ""
+"Campo obbligatorio"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "URL al repository. I protocolli supportati sono http, ftp e file."
+msgstr ""
+"URL al repository. I protocolli supportati sono http, ftp e file."
 
 msgid "Repository is a mirror"
-msgstr "Il repository ? un elemento speculare."
+msgstr ""
+"Il repository ? un elemento speculare"
 
 msgid "Distribution"
-msgstr "Distribuzione"
+msgstr ""
+"Distribuzione"
 
 msgid "Distribution of the DEB repository."
-msgstr "Distribuzione del repository DEB."
+msgstr ""
+"Distribuzione del repository DEB."
 
 msgid "Components"
-msgstr "Componenti"
+msgstr ""
+"Componenti"
 
 msgid "List of components in DEB repository."
-msgstr "Elenco di componenti nel repository DEB."
+msgstr ""
+"Elenco di componenti nel repository DEB."
 
 msgid "Edit Repository"
-msgstr "Modifica repository"
+msgstr ""
+"Modifica repository"
 
 msgid "Mirror List URL"
-msgstr "URL elenco elementi speculari"
+msgstr ""
+"URL elenco elementi speculari"
 
 msgid "Yes"
-msgstr "S?"
+msgstr ""
+"S?"
 
 msgid "No"
-msgstr "No"
+msgstr ""
+"No"
 
 msgid "Add a Volume to Storage Pool"
 msgstr ""
+"Aggiungi un volume al pool di memoria"
 
 msgid "Fetch from remote URL"
 msgstr ""
+"Richiama da URL remoto"
 
 msgid "Enter the remote URL here."
 msgstr ""
+"Immettere qui l'URL remoto. "
 
 msgid "Upload a file"
 msgstr ""
+"Carica un file"
 
 msgid "Choose the file you want to upload."
 msgstr ""
+"Selezionare il file da caricare. "
 
 msgid "Define a New Storage Pool"
-msgstr "Definisci un nuovo pool di memoria"
+msgstr ""
+"Definisci un nuovo pool di memoria"
 
 msgid "Storage Pool Name"
-msgstr "Nome pool di memoria"
+msgstr ""
+"Nome pool di memoria"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
 msgstr ""
-"Il nome utilizzato per identificare i pool di memoria; il campo non deve "
-"essere vuoto."
+"Il nome utilizzato per identificare i pool di memoria; il campo non deve essere vuoto."
 
 msgid "Storage Pool Type"
-msgstr "Tipo di pool di memoria"
+msgstr ""
+"Tipo di pool di memoria"
 
 msgid "Storage Path"
-msgstr "Percorso di memoria"
+msgstr ""
+"Percorso di memoria"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
 msgstr ""
-"Il percorso del pool di memoria. Ogni pool di memoria deve avere un percorso "
-"univoco."
+"Il percorso del pool di memoria. Ogni pool di memoria deve avere un percorso univoco."
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
 msgstr ""
-"Kimchi tenter? di creare la directory nel caso non esista ancora sul sistema."
+"Kimchi tenter? di creare la directory nel caso non esista ancora sul "
+"sistema."
 
 msgid "NFS Server IP"
-msgstr "IP server NFS"
+msgstr ""
+"IP server NFS"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
 msgstr ""
-"Il nome host o l'indirizzo IP del server NFS. ? possibile immetterlo o "
-"sceglierlo dalla cronologia."
+"Il nome host o l'indirizzo IP del server NFS. ? possibile immetterlo o sceglierlo dalla cronologia."
 
 msgid "NFS Path"
-msgstr "Percorso NFS"
+msgstr ""
+"Percorso NFS"
 
 msgid "The NFS exported path on NFS server."
-msgstr "Il percorso esportato NFS sul server NFS."
+msgstr ""
+"Il percorso esportato NFS sul server NFS."
 
 msgid "Device path"
-msgstr "Percorso dispositivo"
+msgstr ""
+"Percorso dispositivo"
 
 msgid "iSCSI Server"
-msgstr "Server iSCSI"
+msgstr ""
+"Server iSCSI"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
 msgstr ""
-"Il nome host o l'indirizzo IP del server iSCSI. Il campo non deve essere "
-"vuoto."
+"Il nome host o l'indirizzo IP del server iSCSI. Il campo non deve essere vuoto."
 
 msgid "Server"
-msgstr "Server"
+msgstr ""
+"Server"
 
 msgid "Port"
-msgstr "Porta"
+msgstr ""
+"Porta"
 
 msgid "Target"
-msgstr "Destinazione"
+msgstr ""
+"Destinazione"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "La destinazione iSCSI sul server iSCSI"
+msgstr ""
+"La destinazione iSCSI sul server iSCSI"
 
 msgid "Add iSCSI Authentication"
-msgstr "Aggiungi autenticazione iSCSI"
+msgstr ""
+"Aggiungi autenticazione iSCSI"
 
 msgid "iSCSI Authentication"
-msgstr "Autenticazione iSCSI"
+msgstr ""
+"Autenticazione iSCSI"
 
 msgid "SCSI Adapter"
-msgstr "Adattatore SCSI"
+msgstr ""
+"Adattatore SCSI"
 
 msgid "Please, wait..."
-msgstr "Attendere..."
+msgstr ""
+"Attendere..."
 
 msgid "Add Template"
-msgstr "Aggiungi modello"
+msgstr ""
+"Aggiungi modello"
 
 msgid "Where is the source media for this template? "
-msgstr "Dov'? il supporto di origine per questo modello?"
+msgstr ""
+"Dov'? il supporto di origine per questo modello? "
 
 msgid "Local ISO Image"
-msgstr "Immagine ISO locale"
+msgstr ""
+"Immagine ISO locale"
 
 msgid "Local Image File"
 msgstr ""
+"File immagine locale"
 
 msgid "Remote ISO Image"
-msgstr "Immagine ISO remota"
+msgstr ""
+"Immagine ISO remota"
 
 msgid "Search ISOs"
-msgstr "Ricerca ISO"
+msgstr ""
+"Ricerca ISO"
 
 msgid "The following ISOs are available:"
-msgstr "Sono disponibili i seguenti file ISO:"
+msgstr ""
+"Sono disponibili i seguenti file ISO:"
 
 msgid "OS: "
-msgstr "SO: "
+msgstr ""
+"SO: "
 
 msgid "Version: "
-msgstr "Versione: "
+msgstr ""
+"Versione: "
 
 msgid "Size: "
-msgstr "Dimensione: "
+msgstr ""
+"Dimensione: "
 
 msgid "Search more ISOs"
-msgstr "Ricerca pi? ISO"
+msgstr ""
+"Ricerca pi? ISO"
 
 msgid "Create Templates from Selected ISO"
-msgstr "Crea modelli da ISO selezionato"
+msgstr ""
+"Crea modelli da ISO selezionato"
 
 msgid "I want to use a specific ISO file"
-msgstr "Utilizzare un file ISO specifico"
+msgstr ""
+"Utilizzare un file ISO specifico"
 
 msgid "Loading default remote ISOs ..."
-msgstr "Caricamento di ISO remoti predefiniti in corso..."
+msgstr ""
+"Caricamento di ISO remoti predefiniti in corso..."
 
 msgid "Arch: "
-msgstr "Arch: "
+msgstr ""
+"Arch: "
 
 msgid "I want to use a custom URL"
-msgstr "Utilizzare un URL personalizzato"
+msgstr ""
+"Utilizzare un URL personalizzato"
 
 msgid "Edit Template"
-msgstr "Modifica modello"
+msgstr ""
+"Modifica modello"
 
 msgid "Processor"
-msgstr "Processore"
+msgstr ""
+"Processore"
 
 msgid "CDROM"
-msgstr "CDROM"
+msgstr ""
+"CDROM"
 
 msgid "Image File"
 msgstr ""
+"File immagine "
 
 msgid "Graphics"
-msgstr "Grafici"
+msgstr ""
+"Grafici"
 
 msgid "Disk(GB)"
 msgstr ""
+"Disco (GB)"
 
 msgid "Disk Format"
 msgstr ""
+"Formato disco"
 
 msgid "CPU Number"
-msgstr "Numero CPU"
+msgstr ""
+"Numero CPU"
 
 msgid "Manually set CPU topology"
 msgstr ""
+"Imposta manualmente la topologia CPU"
 
 msgid "Cores"
 msgstr ""
+"Core"
 
 msgid "Threads"
 msgstr ""
+"Thread"
 
 msgid "CPU"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Disk I/O"
-msgstr "I/O disco"
+msgstr ""
+"I/O disco"
 
 msgid "Network I/O"
-msgstr "I/O di rete"
+msgstr ""
+"I/O di rete"
 
 msgid "Livetile"
-msgstr "Riquadro animato"
+msgstr ""
+"Riquadro animato"
 
 msgid "No guests found."
-msgstr "Nessuna macchina guest trovata."
+msgstr ""
+"Nessuna macchina guest trovata."
 
 msgid "Shut down"
-msgstr "Arresta"
+msgstr ""
+"Arresta"
 
 msgid "Restart"
-msgstr "Riavvia"
+msgstr ""
+"Riavvia"
 
 msgid "Basic Information"
-msgstr "Informazioni di base"
+msgstr ""
+"Informazioni di base"
 
 msgid "OS Distro"
-msgstr "Distro SO"
+msgstr ""
+"Distro SO"
 
 msgid "OS Code Name"
-msgstr "Nome codice SO"
+msgstr ""
+"Nome codice SO"
 
 msgid "CPU(s)"
 msgstr ""
+"CPU"
 
 msgid "System Statistics"
-msgstr "Statistiche di sistema"
+msgstr ""
+"Statistiche di sistema"
 
 msgid "Update Progress"
-msgstr "Avanzamento aggiornamento"
+msgstr ""
+"Avanzamento aggiornamento"
 
 msgid "Network Name"
-msgstr "Nome rete"
+msgstr ""
+"Nome rete"
 
 msgid "State"
-msgstr "Stato"
+msgstr ""
+"Stato"
 
 msgid "Network Type"
-msgstr "Tipo di Rete"
+msgstr ""
+"Tipo di Rete"
 
 msgid "Address Space"
-msgstr "Spazio indirizzo"
+msgstr ""
+"Spazio indirizzo"
 
 msgid "Name should not contain '/' and '\"'."
-msgstr "Nome pool di memoria non valido. Non deve contenere '/'."
+msgstr ""
+"Il nome non deve contenere '/' e '\"'."
 
 msgid "Isolated: no external network connection"
-msgstr "Isolata: nessuna connessione di rete fisica"
+msgstr ""
+"Isolata: nessuna connessione di rete esterna"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT: solo connessione di rete fisica in uscita"
+msgstr ""
+"NAT: solo connessione di rete fisica in uscita"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
 msgstr ""
@@ -2256,57 +2762,80 @@ msgstr ""
 
 msgid "(No interfaces found)"
 msgstr ""
+"(Nessuna interfaccia trovata)"
 
 msgid "Destination"
-msgstr "Destinazione:"
+msgstr ""
+"Destinazione"
 
 msgid "Enable VLAN"
-msgstr "Abilita VLAN:"
+msgstr ""
+"Abilita VLAN"
 
 msgid "VLAN ID"
-msgstr "ID VLAN:"
+msgstr ""
+"ID VLAN"
 
 msgid "Stop"
-msgstr "Arresta"
+msgstr ""
+"Arresta"
 
 msgid "%Used"
 msgstr ""
+"% utilizzata"
 
 msgid "Location"
-msgstr "Ubicazione"
+msgstr ""
+"Ubicazione"
 
 msgid "Capacity"
-msgstr "Capacit?"
+msgstr ""
+"Capacit?"
 
 msgid "Allocated"
-msgstr "Assegnato"
+msgstr ""
+"Assegnato"
 
 msgid "active"
-msgstr "attivo"
+msgstr ""
+"attivo"
 
 msgid "inactive"
-msgstr "non attivo"
+msgstr ""
+"non attivo"
 
 msgid "Deactivate"
-msgstr "Disattiva"
+msgstr ""
+"Disattiva"
 
 msgid "Activate"
-msgstr "Attiva"
+msgstr ""
+"Attiva"
 
 msgid "Add Volume"
 msgstr ""
+"Aggiungi volume"
 
 msgid "Extend"
 msgstr ""
+"Estendi"
 
 msgid "Undefine"
-msgstr "Rimuovi definizione"
+msgstr ""
+"Rimuovi definizione"
 
 msgid "Format"
-msgstr "Formato:"
+msgstr ""
+"Formato"
 
 msgid "Allocation"
-msgstr "Allocazione:"
+msgstr ""
+"Assegnazione"
 
 msgid "No templates found."
-msgstr "Nessun modello trovato."
+msgstr ""
+"Nessun modello trovato."
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 5007684..bda3e57 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -1,5 +1,6 @@
 # English translations for kimchi package.
 # Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
@@ -9,119 +10,145 @@ msgstr ""
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: ko_KR\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
 msgstr ""
+"? ? ?? ???? %(value)s"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "%(resource)s? ??? ???? ??"
+msgstr ""
+"%(resource)s? ??? ???? ????."
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s??? ???? ???? ???? ??"
+msgstr ""
+"%(resource)s??? ???? ???? ???? ????."
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "%(resource)s? ??? ???? ??"
+msgstr ""
+"%(resource)s? ??? ???? ????."
 
 msgid "Unable to parse JSON request"
-msgstr "JSON ??? ?? ??? ? ????."
+msgstr ""
+"JSON ??? ?? ??? ? ????."
 
 msgid "This API only supports JSON"
-msgstr "? API? JSON? ?????."
+msgstr ""
+"? API? JSON? ?????."
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
 msgstr ""
+"????? ???? ????? ???? ??: %(err)s"
 
 msgid "You don't have permission to perform this operation."
 msgstr ""
+"? ??? ??? ? ?? ??? ????."
 
 msgid "Datastore is not initiated in the model object."
-msgstr "??? ???? ?? ?????? ???? ?????."
+msgstr ""
+"??? ???? ?? ?????? ???? ?????."
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
-msgstr "?? ??? ??? ??? ? ??: %(err)s"
+msgstr ""
+"?? ??? ??? ??? ? ??: %(err)s"
 
 #, python-format
 msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
 msgstr ""
+"'%(task)s ??? ?? ?? %(seconds)s?? ????? ???????."
 
 #, python-format
 msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
-msgstr "??? '%(username)s'? ??? ??????. [?? ??: %(code)s]"
+msgstr ""
+"'%(username)s' ??? ??? ??????. [?? ??: %(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "Kimchi? ???? ??? ????."
+msgstr ""
+"Kimchi? ???? ??? ????."
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "Kimchi? ?????? %(item)s?(?) ??????."
+msgstr ""
+"Kimchi? ?????? %(item)s?(?) ??????."
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
 msgstr ""
+"??? LDAP ???? %(user_id)s ???? ?? ?????."
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
 msgstr ""
+"???? ?? LDAP ??: %(item)s : %(value)s"
 
 msgid "Unknown \"_cap\" specified"
 msgstr ""
+"? ? ?? \"_cap\"? ???????."
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
 msgstr ""
+"\"_passthrough\"? \"true\" ?? \"false\"?? ???."
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
 msgstr ""
+"\"_passthrough_affected_by\"? ?? ?? ?????? ???."
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
-msgstr "?? ??? ???? ?? ??? ??????. ????: %(err)s"
+msgstr ""
+"?? ??? ???? ?? ??? ??????. ????: %(err)s"
 
 #, python-format
 msgid "Error while getting block device information for %(device)s."
-msgstr "%(device)s? ?? ?? ?? ??? ???? ?? ??? ??????."
+msgstr ""
+"%(device)s? ?? ?? ?? ??? ???? ?? ??? ??????."
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "distro ??? ?? ? ??: %(filename)s"
+msgstr ""
+"distro ??? ?? ? ??: %(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
 msgstr ""
-"distro ??(%(filename)s)? ?? ??? ? ????. JSON ???? ?????"
-"?."
+"distro ??? ?? ??? ? ??: %(filename)s. JSON ???? ??????."
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
-msgstr "iSCSI ??? ?? %(portal)s? ???? ? ????. ????: %(err)s"
+msgstr ""
+"iSCSI ??? ?? %(portal)s? ???? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr "iSCSI host %(host)s ?? %(target)s? ???? ? ????."
+msgstr ""
+"iSCSI ??? %(host)s ?? %(target)s? ???? ? ????."
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
 msgstr ""
+"ISO ?? %(filename)s?(?) ?? ? ????."
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "ISO ?? %(filename)s?(?) ?? ???? ????."
+msgstr ""
+"ISO ?? %(filename)s?(?) ?? ???? ????."
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
-msgstr "ISO ?? %(filename)s? ??? El Torito ?? ???? ????."
+msgstr ""
+"ISO ?? %(filename)s? ??? El Torito ?? ???? ????."
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
@@ -130,17 +157,18 @@ msgstr ""
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "ISO %(filename)s? ???? ?? El Torito ?? ???? ????."
+msgstr ""
+"ISO %(filename)s? ???? ?? El Torito ?? ???? ????."
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
-msgstr "ISO %(filename)s?? ?? ??? ??? ?? ?? ?????."
+msgstr ""
+"ISO %(filename)s?? ?? ??? ??? ?? ?? ?????."
 
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
 msgstr ""
-"ISO %(filename)s?? ?? ?????? ?? ?? ??? ??? ??????"
-"?."
+"ISO %(filename)s?? ?? ?????? ?? ?? ??? ??? ???????."
 
 #, python-format
 msgid ""
@@ -150,209 +178,265 @@ msgid ""
 "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"??????? ? ISO %(filename)s?(?) ??? ??? ????. ?? /var/"
-"lib/libvirt ??? ??????, (??? ??) ?? ??? '%(user)s' ???"
-"? ?? ??? ?? ??? ?????, '%(user)s'?(?) ISO ?? ??? ??"
-"???, 'chmod -R o+x 'path_to_iso'(???? ??)? ??????. ????: "
-"%(err)s"
+"??????? ? ISO %(filename)s?(?) ??? ??? ????. "
+"?? /var/lib/libvirt ??? ?????? (??? ??) ?? ??? "
+"'%(user)s' ???? ?? ??? ?? ??? ????? "
+"'%(user)s'?(?) ISO ?? ?? ?? (???? ??) 'chmod -R o+x "
+"'path_to_iso'? ??????. ????: %(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
+"??? OS ??? ????? ?? ??? ??????."
 
 msgid "No OS information found in given image."
 msgstr ""
+"??? ???? OS ??? ????."
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
 msgstr ""
+"??? ?? %(filename)s?(?) ?? ? ????."
 
 #, python-format
 msgid ""
 "Image file must be an existing file on system. %(filename)s is not a valid "
 "input."
 msgstr ""
+"??? ??? ???? ?? ?? ????? ???. %(filename)s?(?) ???? ??"
+"?????."
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "?? ?? %(name)s?(?) ?? ?????."
+msgstr ""
+"?? ?? %(name)s?(?) ?? ?????."
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "?? ?? %(name)s?(?) ????."
+msgstr ""
+"?? ?? %(name)s?(?) ????."
 
 #, python-format
 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 ""
+"?? ?? %(name)s? ??? ?? ? ????. %(new_name)s ??? ??"
+"?? ???? ?? ??? ??? ?????."
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
-msgstr "??? ?? ?? %(name)s? ?? ????? ??? ? ????."
+msgstr ""
+"??? ?? ?? %(name)s? ?? ????? ??? ? ????."
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "?? ISO ???? ? ???? ???? ????."
+msgstr ""
+"?? ISO ???? ? ???? ???? ????."
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
 msgstr ""
+"????? ?? ?? %(name)s?? ???? ????."
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s?(?) ????? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
 msgstr ""
+"??? ?? ?? ?? %(name)s? ??? ? ????."
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"?? ?? ??? ???(/)? ???? ?? ?????? ???."
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
 msgstr ""
+"?? ??? ?? ???? ?? ???? URI %(value)s?(?) ???????."
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
 msgstr ""
+"?? ??? ?? ???? ?? ???? URI %(value)s?(?) ???????."
 
 msgid "Supported virtual machine graphics are Spice or VNC"
 msgstr ""
+"???? ?? ?? ???? Spice ?? VNC???."
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
-msgstr "?? ?? ??? ??? IPv4 ?? IPv6?? ???."
+msgstr ""
+"?? ?? ??? ??? IPv4 ?? IPv6?? ???."
 
 msgid "Specify a template to create a virtual machine from"
-msgstr "?? ??? ???? ?? ????? ??????."
+msgstr ""
+"?? ??? ???? ?? ????? ??????."
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s? ??? ? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s? ??? ?? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s?(?) ?? ??? ? ????. ????: %(err)s"
 
 msgid "User name list must be an array"
 msgstr ""
+"??? ?? ??? ????? ???."
 
 msgid "User name must be a string"
-msgstr "???? ??? ?????? ???."
+msgstr ""
+"??? ??? ?????? ???."
 
 msgid "Group name list must be an array"
 msgstr ""
+"?? ?? ??? ????? ???."
 
 msgid "Group name must be a string"
-msgstr "???? ??? ?????? ???."
+msgstr ""
+"?? ??? ?????? ???."
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "'%(users)s' ???? ????."
+msgstr ""
+"??? '%(users)s'?(?) ????."
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "'%(groups)s' ???? ????."
+msgstr ""
+"?? '%(groups)s'?(?) ????."
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"?? ?? %(name)s? ??? ?? ?????? ??? ? ????. ????: %(err)s"
 
 msgid "The guest console password must be a string."
 msgstr ""
+"??? ?? ????? ?????? ???."
 
 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 ""
+"?? ?? '%(name)s'?(?) ???? ?? ???? ???."
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
 msgstr ""
+"?? ?? '%(name)s'?(?) ?????? ??? ??? ???? ????."
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"VM '%(name)s'?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"???? ?? ?? %(name)s? ?? ???? ?? ?????."
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"VM '%(name)s'?(?) ?? ?? ???? ????? ? ????."
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"VM %(name)s?(?) ????? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"VM '%(name)s'?(?) ?????? ??? ??? ??? ? ????."
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"VM '%(name)s'?(?) ??? ? ????. ????: %(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"??? ???? ????? ???? ?? ???? ???."
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"VM '%(name)s'??? ??? ??? ????? ???? ????. ?? ???? ??? ???? ??????"
+"? ??? ???? ??????."
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"?? VM??? ??? ???? ?????."
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"??? ??? ????? ?? ? ??? ?? ?? ??? ?? 1024 Mib? ??? ?? ??"
+"??? ???."
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"???? 1024Mib? ?? ??? ????."
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"???? libvirt ????? ??? ??? ???? ????. Libvirt?"
+"1.2.14????? ???."
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"??? ??? ???? ? ??? ??????. ????: %(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
+"VM %(vmid)s?(?) ?? ??? ??? ?? %(dev_name)s?(?) ???? ?? ????."
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
 msgstr ""
+"??? ?? %(dev_name)s?(?) ?? VM? ??? ? ????."
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -361,102 +445,127 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
+"IOMMU ??? ?? ? ????. ???? ????? ??? PCI pass through? "
+"IOMMU ??? ??? ???. BIOS?? Intel VT-d ?? AMD IOMMU? ????? ??? ? "
+"??? IOMMU ???? ??????? ??????. Intel CPU? ??, "
+"/boot/grub2/grub.conf? ?? ?? ????? intel_iommu=on? ??????. AMD CPU? ??,"
+"iommu=pt iommu=1? ??????."
 
 msgid "\"name\" should be a device name string"
 msgstr ""
+"\"name\"?(?) ?? ?? ?????? ???."
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"%(name)s ??? ????? ?? ?? ? ????. ???? ??? ?"
+"????."
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr "?? ?? %(name)s? %(iface)s ?????? ????."
+msgstr ""
+"?? ?? %(name)s? %(iface)s ?????? ????."
 
 #, python-format
 msgid ""
 "Network %(network)s specified for virtual machine %(name)s does not exist"
-msgstr "?? ?? %(name)s? ?? ??? %(network)s ????? ????."
+msgstr ""
+"?? ?? %(name)s? ??? %(network)s ????? ????."
 
 msgid "Supported virtual machine interfaces type is only network"
-msgstr "???? ?? ?? ????? ??? ????????."
+msgstr ""
+"???? ?? ?? ????? ??? ????????."
 
 msgid "Network name for virtual machine interface must be a string"
-msgstr "?? ?? ?????? ???? ??? ?????? ???."
+msgstr ""
+"?? ?? ?????? ???? ??? ?????? ???."
 
 msgid "Invalid network model card specified for virtual machine interface"
 msgstr ""
-"?? ?? ?????? ?? ???? ?? ???? ?? ??? ??????"
-"?."
+"?? ?? ?????? ?? ???? ?? ???? ?? ??? ???????."
 
 msgid "Specify type and network to add a new virtual machine interface"
-msgstr "? ?? ?? ?????? ??? ?? ? ????? ??????."
+msgstr ""
+"? ?? ?? ?????? ??? ?? ? ????? ??????."
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"MAC ??? FF:FF:FF:FF:FF:FF ??? ???? ???."
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"?? ?? %(name)s? MAC ?? %(mac)s?(?) ?? ?????."
 
 msgid "Invalid MAC Address"
 msgstr ""
+"???? ?? MAC ?????."
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"?? ?? ?? ??? MAC ??? ??? ? ????."
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "???? %(name)s?(?) ?? ?????."
+msgstr ""
+"???? %(name)s?(?) ?? ?????."
 
 #, python-format
 msgid ""
 "Network '%(network)s' specified for template %(template)s does not exist"
-msgstr "???? %(template)s? ?? ??? '%(network)s' ????? ????."
+msgstr ""
+"%(template)s ????? ??? '%(network)s' ????? ????."
 
 #, python-format
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
 msgstr ""
-"???? %(template)s? ?? ??? ???? ? %(pool)s?(?) ????."
+"%(template)s ????? ??? ???? ? %(pool)s?(?) ????."
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
 msgstr ""
-"???? %(template)s? ?? ??? ???? ? %(pool)s?(?) ??? ???"
-"?."
+"%(template)s ????? ??? ???? ? %(pool)s?(?) ??? ????."
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "CDROM? ?? ???? ?? ???? '%(param)s'?(?) ???????."
+msgstr ""
+"CDROM? ?? ???? ?? ???? '%(param)s' ?(?) ???????."
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
 msgstr ""
-"???? %(template)s? ?? ??? %(network)s ????? ??? ????."
+"%(template)s ????? ??? %(network)s ????? ??? ????."
 
 msgid "Template name must be a string"
-msgstr "???? ??? ?????? ???."
+msgstr ""
+"???? ??? ?????? ???."
 
 msgid "Template icon must be a path to the image"
-msgstr "???? ???? ???? ???? ???."
+msgstr ""
+"???? ???? ???? ???? ???."
 
 msgid "Template distribution must be a string"
-msgstr "???? ??? ?????? ???."
+msgstr ""
+"???? ??? ?????? ???."
 
 msgid "Template distribution version must be a string"
-msgstr "???? ?? ??? ?????? ???."
+msgstr ""
+"???? ?? ??? ?????? ???."
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "CPU ?? ???? ???."
+msgstr ""
+"CPU ?? 0?? ? ???? ???."
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr "??? ??(MB)? 512?? ? ???? ???."
+msgstr ""
+"??? ??(MB)? 512?? ? ???? ???."
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "???? CDROM? ?? ?? ?? ISO ????? ???."
+msgstr ""
+"???? CDROM? ?? ?? ?? ISO ????? ???."
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
@@ -464,101 +573,124 @@ msgstr ""
 "????? ?? ???? ?? ???? ? URI %(value)s?(?) ???????."
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr "????? ????? ISO ???? CDROM?? ??????."
+msgstr ""
+"????? ????? ISO ???? CDROM ?? ?? ???? ??????."
 
 msgid "All networks for the template must be specified in a list."
-msgstr "????? ?? ????? ??? ????? ???."
+msgstr ""
+"????? ?? ????? ??? ????? ???."
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
 msgstr ""
+"???? ?? iSCSI ?? SCSI? ?? ??? ????? ??????."
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
 msgstr ""
+"%(volume)s ??? ???? ? %(pool)s? ????."
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
-msgstr "?? ??? ????? ??? ? ??: %(err)s"
+msgstr ""
+"?? ??? ????? ??? ? ??: %(err)s"
 
 #, python-format
 msgid "Unable to delete template due error: %(err)s"
-msgstr "?? ??? ????? ??? ? ??: %(err)s"
+msgstr ""
+"?? ??? ????? ??? ? ??: %(err)s"
 
 msgid "Disk size must be an integer greater than 1GB."
 msgstr ""
+"??? ??? 1GB?? ? ???? ???."
 
 msgid "Template base image must be a valid local image file"
-msgstr "???? CDROM? ?? ?? ?? ISO ????? ???."
+msgstr ""
+"???? ?? ???? ??? ?? ??? ????? ???."
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
 msgstr ""
+"?? ??? %(path)s ??? ??? ? ????."
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
 msgstr ""
+"CPU ????? ??? ? VCPU? ??, ?? ? ??? ?????"
+"???."
 
 msgid ""
 "When specifying CPU topology, each element must be an integer greater than "
 "zero."
 msgstr ""
+"CPU ????? ??? ? ? ??? 0?? ? ????"
+"???."
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"???? ?? ??? ??? ?????. ??? ??? bochs, cloop, cow, dmg, qcow, "
+"qcow2, qed, raw, vmdk, vpc???."
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "???? ? %(name)s?(?) ?? ?????."
+msgstr ""
+"???? ? %(name)s?(?) ?? ?????."
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "???? ? %(name)s?(?) ????."
+msgstr ""
+"???? ? %(name)s?(?) ????."
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr "???? ? %(name)s?(?) ????? %(item)s?(?) ??????."
+msgstr ""
+"???? ? %(name)s?(?) ????? %(item)s?(?) ??????."
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "?? ???? ? %(name)s?(?) ??? ? ????."
+msgstr ""
+"?? ???? ? %(name)s?(?) ??? ? ????."
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "???? ?? ??? ? ????. ????: %(err)s"
+msgstr ""
+"???? ?? ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr "???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
 msgstr ""
-"???? ? %(name)s? ?? ???? ??? ?? ??? ? ????. ???"
-"?: %(err)s"
+"???? ? %(name)s? ?? ???? ??? ?? ??? ? ????. ????: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr "???? ? %(name)s?(?) ???? ? ????. ????: %(err)s"
+msgstr ""
+"???? ? %(name)s?(?) ???? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
-msgstr "???? ? %(name)s?(?) ????? ? ????. ????: %(err)s"
+msgstr ""
+"???? ? %(name)s?(?) ????? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
-msgstr "???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
 msgstr ""
-"???? ?? %(path)s?(?) ??? ?? ??? ? ???? NFS ?? ??? "
-"? ????."
+"???? ?? %(path)s?(?) ??? ?? ??? ? ???? NFS ?? ??? ? ????."
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
@@ -567,82 +699,100 @@ msgstr ""
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "???? ?? ???? ? ??: %(type)s"
+msgstr ""
+"???? ?? ???? ? ??: %(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
 msgstr ""
+"%(pool)s? ?? ???? ? XML? ???? ?? ??? ??????."
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"???? ? ??? ???(/)? ???? ?? ?????? ???."
 
 msgid ""
 "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
 "iso"
 msgstr ""
+"???? ???? ? ??? dir, netfs, logical, iscsi, isci ? kimchi-"
+"iso???."
 
 msgid "Storage pool path must be a string"
-msgstr "???? ? ??? ?????? ???."
+msgstr ""
+"???? ? ??? ?????? ???."
 
 msgid "Storage pool host must be a IP or hostname"
-msgstr "???? ? ???? IP ?? ??? ????? ???."
+msgstr ""
+"???? ? ???? IP ?? ??? ????? ???."
 
 msgid "Storage pool device must be the absolute path to the block device"
 msgstr ""
+"???? ? ??? ?? ??? ?? ?? ???? ???."
 
 msgid "Storage pool devices parameter must be a list"
-msgstr "???? ? ??? ????? ???."
+msgstr ""
+"???? ? ??? ????? ???."
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "iSCSI ?? ?? IQN? ?????? ???."
+msgstr ""
+"iSCSI ?? ?? IQN? ?????? ???."
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
-msgstr "?? ???? ??? ??? 1? 65535 ??? ???? ???."
+msgstr ""
+"?? ???? ??? ??? 1? 65535 ??? ???? ???."
 
 msgid "iSCSI target username must be a string"
 msgstr ""
+"iSCSI ?? ??? ??? ?????? ???."
 
 msgid "iSCSI target password must be a string"
 msgstr ""
+"iSCSI ?? ????? ?????? ???."
 
 msgid "Specify name and type to create a storage pool"
-msgstr "???? ?? ????? ?? ? ??? ??????."
+msgstr ""
+"???? ?? ????? ?? ? ??? ??????."
 
 #, python-format
 msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
 msgstr ""
-"%(disk)s?(?) ??? ???/???? ????. ?? %(pool)s ?? ??? ? "
-"????."
+"%(disk)s?(?) ??? ???/???? ????. ?? ?"
+"%(pool)s? ??? ? ????."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
 msgstr ""
+"?? ? %(pool)s?(?) ??? ? ????. ????: %(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
-msgstr "?? ???? ?? ???? ???? ????? ? ????."
+msgstr ""
+"?? ???? ?? ???? ???? ????? ? ????."
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "SCSI ??? ??? ??? ?????? ???."
+msgstr ""
+"SCSI ??? ??? ??? ?????? ???."
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr "???? ? kimchi_isos? ?? ??? ???????."
+msgstr ""
+"???? ? kimchi_isos? ?? ??? ???????."
 
 #, python-format
 msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"NFS ???? ? %(name)s?(?) ???? ? ????. NFS ?? %(server)s? ?"
-"?? ? ????."
+"NFS ???? ? %(name)s?(?) ???? ? ????. NFS ?? %(server)s?(?)"
+"??? ? ????."
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
 msgstr ""
-"NFS ???? ? %(name)s?(?) ????? ? ????. NFS ?? %(server)s? "
+"NFS ???? ? %(name)s?(?) ????? ? ????. NFS ?? %(server)s?(?)"
 "??? ? ????."
 
 #, python-format
@@ -653,15 +803,16 @@ msgstr ""
 
 #, python-format
 msgid "Unable to delete pool %(name)s as it is associated with some templates"
-msgstr "?? ????? ???? ???? %(name)s ?? ??? ? ????."
+msgstr ""
+"?? ????? ???? ???? %(name)s ?? ??? ? ????."
 
 #, python-format
 msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
 msgstr ""
-"??? '%(name)s'? ?? ??? ?? ?????. ?? ?? ????? ?? ?"
-"?? ??????."
+"??? '%(name)s'? ?? ??? ?? ?????. ?? ?? ?????"
+"?? ??? ??????."
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
@@ -670,72 +821,85 @@ msgstr ""
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "???? ?? %(name)s?(?) ?? ?????."
+msgstr ""
+"???? ?? %(name)s?(?) ?? ?????."
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
-msgstr "???? ?? %(name)s?(?) ???? ? %(pool)s? ????."
+msgstr ""
+"???? ?? %(name)s?(?) ???? ? %(pool)s? ????."
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
 msgstr ""
+"???? ? %(pool)?(?) ??? ???? ???? ?? %(volume)s?(?)"
+"??? ? ????."
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
-msgstr "???? ?? %(volume)s?(?) ????? %(item)s?(?) ??????."
+msgstr ""
+"???? ?? %(name)s?(?) ????? %(item)s?(?) ??????."
 
 #, python-format
 msgid ""
 "Unable to list storage volumes because storage pool %(pool)s is not active"
 msgstr ""
-"???? ? %(pool)s?(?) ??? ???? ???? ??? ??? ? ???"
-"?."
+"???? ? %(pool)s?(?) ??? ???? ???? ??? ??? ? ????."
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
 msgstr ""
-"???? ?? %(name)s?(?) ???? ? %(pool)s? ??? ? ????. ??"
-"??: %(err)s"
+"???? ?? %(name)s?(?) ???? ? %(pool)s? ??? ? ????. ????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"???? ? %(pool)s? ???? ??? ??? ? ????. ????: %(err)s"
+"???? ? %(pool)s? ?? ???? ??? ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
-msgstr "???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"???? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
-msgstr "???? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"???? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
-msgstr "???? ?? %(name)s? ??? ??? ? ????. ????: %(err)s"
+msgstr ""
+"???? ?? %(name)s? ??? ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
-msgstr "???? ?? %(type)s?(?) ?? ?? ? ??? ???? ????."
+msgstr ""
+"???? ?? %(type)s?(?) ?? ?? ? ??? ???? ????."
 
 msgid "Storage volume name must be a string"
-msgstr "???? ?? ??? ?????? ???."
+msgstr ""
+"???? ?? ??? ?????? ???."
 
 msgid "Storage volume allocation must be an integer number"
-msgstr "???? ?? ??? ???? ???."
+msgstr ""
+"???? ?? ??? ???? ???."
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"???? ?? ??? ???? ????. ??? ??? bochs, cloop, cow, dmg, "
+"qcow, qcow2, qed, raw, vmdk, vpc???."
 
 msgid "Storage volume requires a volume name"
-msgstr "???? ??? ?? ??? ?????."
+msgstr ""
+"???? ??? ?? ??? ?????."
 
 #, python-format
 msgid ""
@@ -746,64 +910,80 @@ msgstr ""
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
 msgstr ""
+"??? ???? %(param)s? ??? ? ????."
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
 msgstr ""
+"%(param)s??? ?? ??? ???? ????."
 
 msgid "Storage volume capacity must be an integer number."
 msgstr ""
+"???? ?? ??? ???? ???."
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
 msgstr ""
+"???? ?? URL? http://, https://, ftp:// ?? ftps://?? ???."
 
 #, python-format
 msgid "Unable to access file %(url)s. Please, check it."
 msgstr ""
+"?? %(url)s? ???? ? ????. ??????."
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
 msgstr ""
+"'%(pool)s' ?? ???? ?? '%(name)s'?(?) ??? ? ????. ????: "
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"??? ?????? ?? ??? ? ?? ??? ??????."
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"???? ??? ????? ?? '???' ????? ??????."
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"??? ?? ??? ???? ?? ??? ?? ???? ???? ? ????."
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"???? ?? %(vol)s?(?) ??? ????? ??? ?? ????."
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"??? ?? ???? ???? ?? ??? ?????."
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"???? ??? ?? ???? ???? ? ????. ????: %(err)s."
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "????? %(name)s?(?) ????."
+msgstr ""
+"%(name)s ?????? ????."
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "???? %(name)s?(?) ?? ?????."
+msgstr ""
+"%(name)s ????? ?? ?????."
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "???? %(name)s?(?) ????."
+msgstr ""
+"%(name)s ????? ????."
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
 msgstr ""
-"???? %(network)s? ?? ??? ??? %(subnet)s?(?) ???? ????."
+"%(network)s ????? ??? %(subnet)s ???? ???? ????."
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
@@ -812,1423 +992,1850 @@ msgstr ""
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "?? ???? %(name)s?(?) ??? ? ????."
+msgstr ""
+"?? ???? %(name)s?(?) ??? ? ????."
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
 msgstr ""
-"???? %(network)s? ?? ??? ????? %(iface)s?(?) ?? ?? ??"
-"??."
+"%(network)s ????? ??? %(iface)s ?????? ?? ?? ????."
 
 msgid "Interface should be bare NIC, bonding or bridge device."
-msgstr "?????? ?? NIC, ?? ?? ??? ???? ???."
+msgstr ""
+"?????? ?? NIC, ?? ?? ??? ???? ???."
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "???? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"%(name)s ????? ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "???? '%(name)s'? ?? ?? IP ??? ?? ? ????."
+msgstr ""
+"???? '%(name)s'? ?? ?? IP ??? ?? ? ????."
 
 #, python-format
 msgid "The interface %(iface)s already exists."
 msgstr ""
+"%(iface)s ?????? ?? ?????."
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"???? ??? ???(/) ?? ???(\")? ???? ?? ?????? ???."
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "???? ???? ??? ??, NAT ? ??????."
+msgstr ""
+"???? ???? ??? ??, NAT ? ??????."
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
 msgstr ""
 "???? ???? IP ?? ? ??? ?? ????? ?? ?????? ???."
 
 msgid "Network interface must be a string"
-msgstr "???? ?????? ?????? ???."
+msgstr ""
+"???? ?????? ?????? ???."
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "???? VLAN ID? 1? 4094 ??? ???? ???."
+msgstr ""
+"???? VLAN ID? 1? 4094 ??? ???? ???."
 
 msgid "Specify name and type to create a Network"
-msgstr "????? ????? ?? ? ??? ??????."
+msgstr ""
+"????? ????? ?? ? ??? ??????."
 
 #, python-format
 msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
+"%(name)s ????? ??? ? ????. ? ????? ??? ?? ?? ?? %(vms)s "
+"?/?? ????? ????."
 
 #, python-format
 msgid ""
 "Unable to deactivate network %(name)s. There are some virtual machines "
 "%(vms)s and/or templates linked to this network."
 msgstr ""
+"%(name)s ????? ????? ? ????. ? ????? ??? ?? ?? ??"
+"%(vms)s ?/?? ????? ????."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
-msgstr "??? ?? %(name)s?(?) VLAN? ??? ??? ? ? ????."
+msgstr ""
+"??? ?? %(name)s?(?) VLAN? ??? ??? ? ? ????."
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "%(iface)s ?????? ????? ??: %(err)s."
+msgstr ""
+"%(iface)s ????? ??? ??: %(err)s."
 
 #, python-format
 msgid ""
 "Failed to activate interface %(iface)s. Please check the physical link "
 "status."
 msgstr ""
-"%(iface)s ?????? ????? ?????. ??? ?? ??? ?????"
-"?."
+"%(iface)s ?????? ???? ? ????. ??? ?? ???"
+"??????."
 
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
 msgstr ""
+"%(name)s ????? ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "??? ??? %(name)s?(?) ????."
+msgstr ""
+"??? ??? %(name)s?(?) ????."
 
 msgid "Debug report tool not found in system"
-msgstr "??? ??? ??? ???? ????."
+msgstr ""
+"??? ??? ??? ???? ????."
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
-msgstr "??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s."
 
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
 msgstr ""
+"??? ?? %(name)s? ??? ???? ?? ? ????."
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
-msgstr "??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s"
+msgstr ""
+"??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s"
 
 msgid "You should give a name for the debug report file."
 msgstr ""
+"??? ??? ??? ??? ???? ???."
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
+"??? ??? ??? ?????? ???. ??, ??, ??('_')"
+"? ???('-')? ?????."
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
 msgstr ""
-"??? '%(name)s'? ?? ??? ?? ?????. ?? ?? ????? ?? ?"
-"?? ??????."
+"??? ?? \"%(name)s\"? ??? ???? ?? ????. ?? ???"
+"??????."
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "???? ?? %(server)s?(?) Kimchi?? ???? ?????."
+msgstr ""
+"???? ?? %(server)s?(?) Kimchi?? ???? ?????."
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "Distro '%(name)s'?(?) ????."
+msgstr ""
+"Distro '%(name)s'?(?) ????."
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "??? %(name)s?(?) ???? ????."
+msgstr ""
+"??? %(name)s?(?) ???? ????."
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
-msgstr "?? ??? ?? ?? ??? ??? ??? ? ????."
+msgstr ""
+"?? ??? ?? ?? ??? ??? ??? ? ????."
 
 msgid "Unable to reboot host machine as there are running virtual machines"
-msgstr "?? ??? ?? ?? ??? ??? ?? ??? ? ????."
+msgstr ""
+"?? ??? ?? ?? ??? ??? ?? ??? ? ????."
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "?? ?? '%(name)s'?(?) ????."
+msgstr ""
+"?? ?? '%(name)s'?(?) ????."
 
 msgid "Conflicting flag filters specified."
 msgstr ""
+"???? ??? ??? ??????."
 
 msgid "No packages marked for update"
-msgstr "???? ??? ???? ????."
+msgstr ""
+"???? ??? ???? ????."
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "??? %(name)s?(?) ??????? ???? ?????."
+msgstr ""
+"??? %(name)s?(?) ??????? ???? ?????."
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
 msgstr ""
-"??????? ??? ???? ???? ?? ??? ??????. ????: "
-"%(err)s"
+"??????? ??? ???? ???? ?? ??? ??????. ????: %(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "? ???? ?? ?? ??? ??? ???? ????."
+msgstr ""
+"? ???? ?? ?? ??? ??? ???? ????."
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "??? ????? %(item)s?(?) ?? ? ????."
+msgstr ""
+"??? ????? %(item)s?(?) ?? ? ????."
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "???? ?? URI %(uri)s"
+msgstr ""
+"???? ?? URI %(uri)s"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "%(seconds)s? ?? '%(cmd)s' ?? ?? ? ????? ???????."
+msgstr ""
+"%(seconds)s? ? '%(cmd)s' ??? ???? ?? ????? ???????."
 
 msgid "Unable to choose a virtual machine name"
 msgstr ""
+"?? ?? ??? ??? ? ????."
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"???? ?? ??? ? '%(value)s'???."
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"???? ?? ??? ?? '%(unit)s'???."
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "???? ?? ???? ?????. ???? ??: 'cdrom'"
+msgstr ""
+"???? ?? ???? ?????. ???? ??: 'cdrom', 'disk'"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
 msgstr ""
+"'%(value)s' ??? ??? ??? ??/?? ??? ????."
 
 msgid "Only CDROM path can be update."
 msgstr ""
+"CDROM ??? ????? ? ????."
 
 #, python-format
 msgid ""
 "The storage device %(dev_name)s does not exist in the virtual machine "
 "%(vm_name)s"
 msgstr ""
+"???? ?? %(dev_name)s?(?) ?? ??"
+"%(vm_name)s? ????."
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
-msgstr "? ???? ??? ???? ?? ?? ??: %(error)s"
+msgstr ""
+"? ???? ??? ???? ?? ?? ??: %(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
-msgstr "???? ??? ?????? ?? ?? ??: %(error)s"
+msgstr ""
+"???? ??? ?????? ?? ?? ??: %(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
-msgstr "???? ??? ???? ?? ?? ??: %(error)s"
+msgstr ""
+"???? ??? ???? ?? ?? ??: %(error)s"
 
 msgid "Do not support IDE device hot plug"
 msgstr ""
+"IDE ?? ? ???? ???? ????."
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
-msgstr "? ?? ?? ???? ??? ?? ? ??? ??????."
+msgstr ""
+"? ?? ?? ???? ??? ?? ? ?? ?? ?? ? ?/??? "
+"??????."
 
 msgid "Specify path to update virtual machine disk"
-msgstr "?? ?? ???? ????? ??? ??????."
+msgstr ""
+"?? ?? ???? ????? ??? ??????."
 
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
 msgstr ""
+"??? ??? ?? %(type)s ?? %(limit)s? ??????."
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
 msgstr ""
+"??? ?/??? ?? ??? ??? ??? ? ??: %(error)s"
 
 msgid "Volume already in use by other virtual machine."
 msgstr ""
+"??? ?? ?? ?? ???? ?? ????."
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
-msgstr "? ?? ?? ???? ??? ?? ? ??? ??????."
+msgstr ""
+"?? ?? ?/?? ? ??? ??? ?? ?? ???? "
+"??? ? ????."
 
 #, python-format
 msgid ""
 "Volume chosen with format %(format)s does not fit in the storage type "
 "%(type)s"
 msgstr ""
+"%(format)s ???? ??? ??? ???? ??"
+"%(type)s? ???? ????."
 
 msgid "YUM Repository ID must be one word only string."
-msgstr "YUM ??? ID? ?? ??? ?????? ???."
+msgstr ""
+"YUM ??? ID? ?? ??? ?????? ???."
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "??? URL? http://, ftp:// ?? file:// URL??? ???."
+msgstr ""
+"??? URL? http://, ftp:// ?? file:// URL??? ???."
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
 "repository type."
-msgstr "??? ??? ??? ??? ?? ?? ?? ?? ?????."
+msgstr ""
+"??? ??? ??? ??? ?? ?? ?? ?? "
+"?????."
 
 msgid "Distribution to DEB repository must be a string"
-msgstr "DEB ???? ?? ??? ?????? ???."
+msgstr ""
+"DEB ???? ?? ??? ?????? ???."
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "DEB ???? ?? ????? ??? ????? ???."
+msgstr ""
+"DEB ???? ?? ????? ??? ????? ???."
 
 msgid "Components to DEB repository must be a string"
-msgstr "DEB ???? ?? ????? ?????? ???."
+msgstr ""
+"DEB ???? ?? ????? ?????? ???."
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"???? ?? ?? ??? ?????? ???."
 
 msgid "YUM Repository name must be string."
-msgstr "YUM ??? ??? ?????? ???."
+msgstr ""
+"YUM ??? ??? ?????? ???."
 
 msgid "GPG check must be a boolean value."
-msgstr "GPG ??? ?? ???? ???."
+msgstr ""
+"GPG ??? ?? ???? ???."
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr "GPG ?? ASCII ?? ??? ???? URL??? ???."
+msgstr ""
+"GPG ?? ASCII ?? ??? ???? URL??? ???."
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "%(repo_id)s ???? ????? ? ????."
+msgstr ""
+"'%(repo_id)s' ???? ?????? ?????."
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "%(repo_id)s ???? ????."
+msgstr ""
+"%(repo_id)s ???? ????."
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"YUM ???? ?? ?? ??????? ??? ?? URL, ?? ?? ??  "
+"metalink? ??????."
 
 msgid "Repository management tool was not recognized for your system."
-msgstr "?? ???? ?? ??? ?? ??? ???? ?????."
+msgstr ""
+"?? ???? ?? ??? ?? ??? ???? ?????."
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "%(repo_id)s ???? ?? ???? ???? ????."
+msgstr ""
+"%(repo_id)s ???? ?? ???? ???? ????."
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "%(repo_id)s ???? ?? ?? ???? ???? ????."
+msgstr ""
+"%(repo_id)s ???? ?? ?? ???? ???? ????."
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "%(repo_id)s ???? ??? ? ????."
+msgstr ""
+"%(repo_id)s ???? ???? ?????."
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
-msgstr "??? ?? ?? %(repo_file)s?(?) ??? ? ????."
+msgstr ""
+"??? ?? ?? %(repo_file)s?(?) ??? ? ????."
 
 msgid "Specify repository distribution in order to create a DEB repository."
-msgstr "DEB ???? ????? ??? ??? ??????."
+msgstr ""
+"DEB ???? ????? ??? ??? ??????."
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "%(repo_id)s ???? ???? ??? ? ????."
+msgstr ""
+"%(repo_id)s ???? ???? ???? ?????."
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "%(repo_id)s ???? ?? ???? ??? ? ????."
+msgstr ""
+"%(repo_id)s ???? ?? ???? ???? ?????."
 
 msgid "YUM Repository ID already exists"
-msgstr "YUM ??? ID? ?? ?????."
+msgstr ""
+"YUM ??? ID? ?? ?????."
 
 msgid "YUM Repository name must be a string"
-msgstr "YUM ??? ??? ?????? ???."
+msgstr ""
+"YUM ??? ??? ?????? ???."
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "???? ??? ? ????. ????: '%(err)s'"
+msgstr ""
+"???? ??? ? ????. ????: '%(err)s'"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
-msgstr "??? ??? ??? ? ????. ????: '%(err)s'"
+msgstr ""
+"??? ??? ??? ? ????. ????: '%(err)s'"
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "???? ??? ? ????. ????: '%(err)s'"
+msgstr ""
+"???? ??? ? ????. ????: '%(err)s'"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "???? ??? ? ????. ????: '%(err)s'"
+msgstr ""
+"???? ??? ? ????. ????: '%(err)s'"
 
 #, python-format
 msgid ""
 "Configuration items: '%(items)s' are not supported by repository manager"
 msgstr ""
+"?? ??: '%(items)s'?(?) ??? ???? ?? ???? ????."
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"??? metalink? http://, ftp:// ?? file:// URL??? ???."
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"mirrorlist ? metalink? ??? ??? ? ????."
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
 msgstr ""
+"?? ?? '%(vm)s'?(?) ???? ???? ?? ???? ???."
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ?? '%(vm)s'? '%(name)s' ???? ??? ? ????. ????: "
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
 msgstr ""
+"?? ?? '%(vm)s'? '%(name)s' ???? ????."
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ?? '%(vm)s'?? '%(name)s' ???? ??? ? ????. ????: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
+"?? ?? '%(vm)s'? ???? ??? ? ????. ????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ?? '%(vm)s'?? '%(name)s' ???? ??? ? ????. ????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ?? '%(vm)s'? ?? ???? ??? ? ????. ????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
 msgstr ""
+"'%(name)s' ???? ?? ?? ?? '%(vm)s'?(?) ??? ? ????. ????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
+"'%(format)s' ??? ???? ???? ?? ???"
+"?? ?? '%(vm)s'? ???? ??? ? ????. 'qcow2'? ?????."
 
 msgid "The number of vCPUs is too large for this system."
 msgstr ""
+"? ???? vCPU ?? ?? ???."
 
 msgid "Invalid vCPU/topology combination."
 msgstr ""
+"???? ?? vCPU/???? ?????."
 
 msgid "This host (or current configuration) does not allow CPU topology."
 msgstr ""
+"? ???(?? ?? ??)??? CPU ????? ???? ????."
 
 msgid "ERROR CODE"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "REASON"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "STACK"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Go to Homepage"
-msgstr "? ???? ??"
+msgstr ""
+"? ???? ??"
 
 msgid "Create a New Virtual Machine"
-msgstr "? ?? ?? ??"
+msgstr ""
+"? ?? ?? ??"
 
 msgid "Virtual Machine Name"
-msgstr "?? ?? ??"
+msgstr ""
+"?? ?? ??"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
 msgstr ""
-"?? ??? ???? ? ???? ?????. ???? ??? ??? ????"
-"? ???? ?????."
+"?? ??? ???? ? ???? ?????. ???? ??? "
+"??? ????? ???? ?????."
 
 msgid "Template"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Please create a template first."
-msgstr "????? ?? ??????."
+msgstr ""
+"????? ?? ??????."
 
 msgid "Create a Template"
-msgstr "???? ??"
+msgstr ""
+"???? ??"
 
 msgid "Please choose a template."
-msgstr "????? ??????."
+msgstr ""
+"????? ??????."
 
 msgid "OS"
-msgstr "OS"
+msgstr ""
+"OS"
 
 msgid "OS Version"
-msgstr "OS ??"
+msgstr ""
+"OS ??"
 
 msgid "CPUS"
-msgstr "CPUS"
+msgstr ""
+"CPUS"
 
 msgid "Memory"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Create"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Creating..."
 msgstr ""
+"?? ?..."
 
 msgid "Edit Guest"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid "General"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Storage"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Interface"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Permission"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Host PCI Device"
 msgstr ""
+"??? PCI ??"
 
 msgid "Snapshot"
 msgstr ""
+"???"
 
 msgid "Name"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "CPUs"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Memory (MB)"
-msgstr "???"
+msgstr ""
+"???(MB)"
 
 msgid "Icon"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Device"
-msgstr "?? ??"
+msgstr ""
+"??"
 
 msgid "Path"
-msgstr "NFS ??"
+msgstr ""
+"??"
 
 msgid "Network"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Type"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "MAC Address"
 msgstr ""
+"MAC ??"
 
 msgid "Available system users and groups"
 msgstr ""
+"?? ??? ??? ??? ? ??"
 
 msgid "Selected system users and groups"
 msgstr ""
+"??? ??? ??? ? ??"
 
 msgid "User"
 msgstr ""
+"???"
 
 msgid "All"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "To Add"
 msgstr ""
+"?? ??"
 
 msgid "Added"
 msgstr ""
+"???"
 
 msgid "filter"
 msgstr ""
+"??"
 
 msgid "Product"
 msgstr ""
+"??"
 
 msgid "Vendor"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Created"
 msgstr ""
+"???"
 
 msgid "Save"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Replace"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Detach"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Cancel"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "revert"
 msgstr ""
+"????"
 
 msgid "Add a Storage Device to VM"
-msgstr "???? ??? VM? ??"
+msgstr ""
+"???? ??? VM? ??"
 
 msgid "Device Type"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr "?? ?????. ?? \"cdrom\"? ?????."
+msgstr ""
+"?? ??. ?? \"cdrom\" ? \"disk\"? ?????."
 
 msgid "Storage Pool"
-msgstr "???? ?"
+msgstr ""
+"???? ?"
 
 msgid "Storage pool which volume located in"
-msgstr "???? ? ??? ?????? ???."
+msgstr ""
+"??? ??? ???? ?"
 
 msgid "Storage Volume"
-msgstr "???? ? ??"
+msgstr ""
+"???? ??"
 
 msgid "Storage volume to be attached"
-msgstr "???? ?? ??? ?????? ???."
+msgstr ""
+"??? ???? ??"
 
 msgid "File Path"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM? ?? ??? ISO ?? ?????."
+msgstr ""
+"CDROM? ?? ??? ISO ?? ?????."
 
 msgid "Attach"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Start"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Reset"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Pause"
 msgstr ""
+"????"
 
 msgid "Resume"
 msgstr ""
+"??"
 
 msgid "Power Off"
 msgstr ""
+"?? ??"
 
 msgid "Actions"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Connect"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Clone"
 msgstr ""
+"??"
 
 msgid "Edit"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Shut Down"
-msgstr "??? ??"
+msgstr ""
+"??"
 
 msgid "Delete"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "The username or password you entered is incorrect. Please try again."
 msgstr ""
 "??? ??? ?? ?? ????? ???? ????. ?? ??????."
 
 msgid "This field is required."
-msgstr "? ??? ?????."
+msgstr ""
+"? ??? ?????."
 
 msgid "Log in"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Logging in..."
-msgstr "??? ?..."
+msgstr ""
+"??? ?..."
 
 msgid "Host"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Guests"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Templates"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Failed to get application configuration"
-msgstr "?????? ??? ???? ?????."
+msgstr ""
+"?????? ??? ???? ?????."
 
 msgid "This is not a valid Linux path"
-msgstr "??? Linux ??? ????."
+msgstr ""
+"??? Linux ??? ????."
 
 msgid "This is not a valid URL."
-msgstr "??? URL? ????."
+msgstr ""
+"??? URL? ????."
 
 msgid "No such data available."
-msgstr "?? ???? ????."
+msgstr ""
+"?? ???? ????."
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"??? ???? ??? ? ????. ??? ???? ????? ?? ?? ??"
-"?? ??? ??? ??????. HTTP ?? ?? %1. "
+"??? ???? ??? ? ????. ??? ???? ????? "
+"?? ?? ???? ??? ??? ??????. HTTP ?? ?? %1???. "
 
 msgid "Unable to read file."
 msgstr ""
+"??? ?? ? ????. "
 
 msgid "Error while uploading file."
 msgstr ""
+"??? ????? ?? ??? ??????."
 
 msgid "Delete Confirmation"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "OK"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Confirm"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Warning"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Cloning..."
 msgstr ""
+"?? ?..."
 
 msgid "Loading..."
-msgstr "?? ?..."
+msgstr ""
+"?? ?..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"??? ??? ???? ?? ??? ??????."
 
 msgid "Retry"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Detailed message:"
-msgstr "?? ???:"
+msgstr ""
+"?? ???:"
 
 msgid "No ISO found"
 msgstr ""
+"ISO? ????."
 
 msgid "This is not a valid ISO file."
-msgstr "??? ISO ??? ????."
+msgstr ""
+"??? ISO ??? ????."
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "??? ?? ????. ?????????"
+msgstr ""
+"??? ?? ?? ? ????. ?????????"
 
 msgid "This will permanently delete the template. Would you like to continue?"
-msgstr "????? ????? ?????. ?????????"
+msgstr ""
+"????? ????? ?????. ?????????"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
-msgstr "?? ?? ??? ?? ???? ???? ??? ? ????."
+msgstr ""
+"?? ?? ??? ?? ???? ???? ??? ? ????."
 
 msgid "Max:"
-msgstr "??:"
+msgstr ""
+"??:"
 
 msgid "Utilization"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Available"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Read Rate"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Write Rate"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Received"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Sent"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
 msgstr ""
-"???? ????? ?? ???? ???? ?? ??? ?????. ??? ?"
-"?/?? ??? ?????????"
+"???? ????? ?? ???? ???? ?? ??? ?????. ??? ??/?? ??? "
+"?????????"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
-msgstr "???? ????? ???? ??? ? ????. ?????????"
+msgstr ""
+"???? ????? ???? ??? ? ????. "
+"?????????"
 
 msgid "Repositories"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "ID"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Base URL"
-msgstr "?? URL"
+msgstr ""
+"?? URL"
 
 msgid "Is Mirror"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "URL Args"
-msgstr "URL ??"
+msgstr ""
+"URL ??"
 
 msgid "Enabled"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "GPG Check"
-msgstr "GPG ??"
+msgstr ""
+"GPG ??"
 
 msgid "GPG Key"
-msgstr "GPG ?"
+msgstr ""
+"GPG ?"
 
 msgid "Add"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Remove"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Enable"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Disable"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Software Updates"
-msgstr "????? ????"
+msgstr ""
+"????? ????"
 
 msgid "Package Name"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid "Version"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Architecture"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Repository"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Update All"
-msgstr "?? ????"
+msgstr ""
+"?? ????"
 
 msgid "Updating..."
-msgstr "???? ?..."
+msgstr ""
+"???? ?..."
 
 msgid "Failed to retrieve packages update information."
 msgstr ""
+"??? ???? ??? ???? ?????."
 
 msgid "Failed to update package(s)."
-msgstr "???? ?????? ?????."
+msgstr ""
+"???? ?????? ?????."
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"??? ???? ????? ???? ??? ? ????. ?????????"
+"??? ???? ????? ???? ??? ? ????. "
+"?????????"
 
 msgid "Debug Reports"
-msgstr "??? ???"
+msgstr ""
+"??? ???"
 
 msgid "Generated Time"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Generate"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Generating..."
-msgstr "?? ?..."
+msgstr ""
+"?? ?..."
 
 msgid "Rename"
-msgstr "?? ???"
+msgstr ""
+"?? ???"
 
 msgid "Download"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
-msgstr "??? ???? ??, ?? ?/?? ???('-')? ????? ???."
+msgstr ""
+"??? ???? ??, ??, ??('_') ? ??"
+"???('-')? ????? ???."
 
 msgid "Pending..."
-msgstr "?? ?..."
+msgstr ""
+"?? ?..."
 
 msgid "Report name is the same as the original one."
 msgstr ""
+"??? ??? ??? ?????."
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
 msgstr ""
-"?? ?? ? ?? ?? ???? ?????. ? ??? ?? ??? ? ???"
-"?. ?????????"
+"?? ?? ? ?? ?? ???? ?????. ? ??? "
+"?? ??? ? ????. ?????????"
 
 msgid "Power off Confirmation"
-msgstr "?? ??"
+msgstr ""
+"?? ?? ??"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
 msgstr ""
+"? ??? ??? ?? ??? ??? ? ????(?: ???? ???? ?? "
+"??? ??? ??). ?????????"
 
 msgid "Reset Confirmation"
-msgstr "?? ??"
+msgstr ""
+"?? ?? ??"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
 msgstr ""
+"??? OS? ???? ?? ?? ????? ?? ??? ?? ??? ????. "
+"?????????"
 
 msgid "Shut Down Confirmation"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
-msgstr "????? ????? ?????. ?????????"
+msgstr ""
+"??? OS? ? ??? ??? ? ??? ??????. ?????????"
 
 msgid "Virtual Machine delete Confirmation"
 msgstr ""
+"?? ?? ?? ??"
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
 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 ""
+"?? ???? SCSI ?? iSCSI ??? ??? ?? ???? ??"
+"?????. ?? ?? ??? ??? ? ?? ??? ???? ?? ????"
+"???????. ?????????"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
 msgstr ""
-"? CDROM? ????? ???? ?? ??? ? ????. ??? ???????"
-"??"
+"? CDROM? ????? ???? ?? ??? ? ????. ??? "
+"?????????"
 
 msgid "Attaching..."
-msgstr "?? ?..."
+msgstr ""
+"?? ?..."
 
 msgid "Replacing..."
-msgstr "?? ?..."
+msgstr ""
+"?? ?..."
 
 msgid "Successfully attached!"
-msgstr "???????."
+msgstr ""
+"???????."
 
 msgid "Successfully replaced!"
-msgstr "???????."
+msgstr ""
+"???????."
 
 msgid "Successfully detached!"
-msgstr "???????."
+msgstr ""
+"???????."
 
 msgid ""
 "This disk will be detached permanently and you can re-attach it. Continue to "
 "detach it?"
 msgstr ""
+"? ???? ????? ???? ?? ??? ? ????. ??? "
+"?????????"
 
 msgid "interface:"
 msgstr ""
+"?????:"
 
 msgid "address:"
 msgstr ""
+"??:"
 
 msgid "link_type:"
 msgstr ""
+"link_type:"
 
 msgid "block:"
 msgstr ""
+"??:"
 
 msgid "drive_type:"
 msgstr ""
+"drive_type:"
 
 msgid "model:"
 msgstr ""
+"??:"
 
 msgid "Affected devices:"
 msgstr ""
+"?? ??:"
 
 msgid "The VLAN id must be between 1 and 4094."
-msgstr "VLAN ID? 1? 4094 ???? ???."
+msgstr ""
+"VLAN ID? 1? 4094 ???? ???."
 
 msgid "unavailable"
-msgstr "?? ???"
+msgstr ""
+"?? ???"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
 "depend on this network."
 msgstr ""
-"? ??? ? ????? ???? ?? ??? ???? ??? ???????."
+"? ??? ? ????? ???? ?? ??? ???? ??? "
+"???????."
 
 msgid "Create a network"
-msgstr "???? ??"
+msgstr ""
+"???? ??"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"? ???? ?? ????? ????. ? ??? ?? ?????? ?? ???"
-"?? ?????. ?????????"
+"? ????? ????? ????. ? ??? ???? ?? "
+"????? ?????. ?????????"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"NetworkManager? ???? ???? ???? VLAN ??? ? ???? ?? ? ????. ?? ????"
+"???? ?? ????."
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
-msgstr "???? ?? ????? ?????. ?????????"
+msgstr ""
+"???? ?? ????? ?????. ?????????"
 
 msgid "This storage pool is empty."
-msgstr "? ???? ?? ?? ????."
+msgstr ""
+"? ???? ?? ?? ????."
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
 "to continue? "
-msgstr "???? ???? ???? ?????. ????????? "
+msgstr ""
+"???? ???? ???? ?????. "
+"????????? "
 
 msgid "SCSI Fibre Channel"
-msgstr "SCSI ??? ??"
+msgstr ""
+"SCSI ??? ??"
 
 msgid "No SCSI adapters found."
-msgstr "SCSI ???? ????."
+msgstr ""
+"SCSI ???? ????."
 
 msgid "Loading iSCSI targets..."
 msgstr ""
+"iSCSI ?? ?? ?..."
 
 msgid "No iSCSI found. Please input one."
 msgstr ""
+"iSCSI? ????. ??????."
 
 msgid "Failed to load iSCSI targets."
 msgstr ""
+"iSCSI ??? ???? ?????."
 
 msgid "The storage pool name can not be blank."
-msgstr "???? ? ??? ??? ? ????."
+msgstr ""
+"???? ? ??? ??? ? ????."
 
 msgid "The storage pool path can not be blank."
-msgstr "???? ? ??? ??? ? ????."
+msgstr ""
+"???? ? ??? ??? ? ????."
 
 msgid "NFS server mount path can not be blank."
-msgstr "NFS ?? ??? ??? ??? ? ????."
+msgstr ""
+"NFS ?? ??? ??? ??? ? ????."
 
 msgid "Invalid NFS mount path."
-msgstr "???? ?? NFS ??? ?????."
+msgstr ""
+"???? ?? NFS ??? ?????."
 
 msgid "No logical device selected."
-msgstr "?? ??? ???? ?????."
+msgstr ""
+"?? ??? ???? ?????."
 
 msgid "The iSCSI target can not be blank."
-msgstr "iSCSI ??? ??? ? ????."
+msgstr ""
+"iSCSI ??? ??? ? ????."
 
 msgid "Server name can not be blank."
-msgstr "?? ??? ??? ? ????."
+msgstr ""
+"?? ??? ??? ? ????."
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
 msgstr ""
+"??? ?? ?? ?? IP? ????.  ??????."
 
 msgid "Looking for available partitions ..."
-msgstr "?? ??? ???? ?? ?..."
+msgstr ""
+"?? ??? ???? ?? ?..."
 
 msgid "No available partitions found."
-msgstr "?? ??? ???? ????."
+msgstr ""
+"?? ??? ???? ????."
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"? ???? ?? ????? ????. ? ??? ?? ?????? ?? ???"
-"?? ?????. ?????????"
+"? ???? ?? ????? ????. ? ??? ?? ?????? ?? "
+"????? ?????. ?????????"
 
 msgid "Unable to retrieve partitions information."
-msgstr "??? ??? ??? ? ????. ????: '%(err)s'"
+msgstr ""
+"??? ??? ??? ? ????. "
 
 msgid "In progress..."
 msgstr ""
+"?? ?..."
 
 msgid "Failed!"
 msgstr ""
+"???!"
 
 msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
 msgstr ""
+"CDROM ??? ??? ??/?? ???? ?? ??? ? ????."
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "???? ? ??? ??? ? ????."
+msgstr ""
+"??? ? ?? ??? ??? ? ????."
 
 msgid "Peers"
 msgstr ""
+"??"
 
 msgid "Searching"
 msgstr ""
+"?? ?"
 
 msgid "No peers found."
 msgstr ""
+"??? ????."
 
 msgid "Help"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "About"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Log out"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Version:"
-msgstr "??: "
+msgstr ""
+"??: "
 
 msgid "Session timeout, please re-login."
 msgstr ""
+"?? ????? ???????. ?? ???????."
 
 msgid "User Name"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid "Password"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Generate a New Debug Report"
-msgstr "? ??? ??? ??"
+msgstr ""
+"? ??? ??? ??"
 
 msgid "Report Name"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"???? ???? ? ???? ?????. ???? ??? ?? ??? ???"
-"? ?????. ??? ??, ?? ? ???(\"-\")? ??? ? ????."
+"???? ???? ? ???? ?????. ???? ??? "
+"?? ??? ???? ?????. ???? ??, ??, ??(\"_\")"
+"? ???(\"-\")? ??? ? ????."
 
 msgid "Rename a Debug Report"
-msgstr "? ??? ??? ??"
+msgstr ""
+"??? ??? ?? ???"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
 msgstr ""
-"???? ???? ? ???? ?????. ???? ??? ?? ??? ???"
-"? ?????. ??? ??, ?? ? ???(\"-\")? ??? ? ????."
+"???? ???? ? ???? ?????. ???? ??, ?? ?"
+"???(\"-\")? ??? ? ????."
 
 msgid "Submit"
 msgstr ""
+"??"
 
 msgid "Add a Repository"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid "Identifier"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "???? ?? ?? ??? ?? ID???."
+msgstr ""
+"???? ?? ?? ??? ?? ID???."
 
 msgid "Textual name for the repository."
-msgstr "???? ?? ??? ?????."
+msgstr ""
+"???? ?? ??? ?????."
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "???? ?? URL???. ???? ????? http, ftp ? file???."
+msgstr ""
+"???? ?? URL???. ???? ????? http, ftp ? file???."
 
 msgid "Repository is a mirror"
-msgstr "???? ?????."
+msgstr ""
+"???? ?????."
 
 msgid "Distribution"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Distribution of the DEB repository."
-msgstr "DEB ???? ?????."
+msgstr ""
+"DEB ???? ?????."
 
 msgid "Components"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "List of components in DEB repository."
-msgstr "DEB ???? ???? ?????."
+msgstr ""
+"DEB ???? ???? ?????."
 
 msgid "Edit Repository"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid "Mirror List URL"
-msgstr "?? ?? URL"
+msgstr ""
+"?? ?? URL"
 
 msgid "Yes"
-msgstr "?"
+msgstr ""
+"?"
 
 msgid "No"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Add a Volume to Storage Pool"
 msgstr ""
+"???? ?? ?? ??"
 
 msgid "Fetch from remote URL"
 msgstr ""
+"?? URL?? ??"
 
 msgid "Enter the remote URL here."
 msgstr ""
+"??? ?? URL? ??????."
 
 msgid "Upload a file"
 msgstr ""
+"?? ???"
 
 msgid "Choose the file you want to upload."
 msgstr ""
+"???? ??? ??????."
 
 msgid "Define a New Storage Pool"
-msgstr "? ???? ? ??"
+msgstr ""
+"? ???? ? ??"
 
 msgid "Storage Pool Name"
-msgstr "???? ? ??"
+msgstr ""
+"???? ? ??"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
-msgstr "???? ?? ???? ? ???? ???? ?? ?? ??? ???."
+msgstr ""
+"???? ?? ???? ? ???? ???? ?? ?? ??? ???."
 
 msgid "Storage Pool Type"
-msgstr "???? ? ??"
+msgstr ""
+"???? ? ??"
 
 msgid "Storage Path"
-msgstr "???? ??"
+msgstr ""
+"???? ??"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
-msgstr "???? ?? ?????. ? ???? ?? ?? ??? ??? ???."
+msgstr ""
+"???? ?? ?????. ? ???? ?? ?? ??? ??? ???."
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
 msgstr ""
-"????? ???? ?? ???? ??? Kimchi? ???? ??? ?????."
+"????? ???? ?? ???? ??? Kimchi? ???? ??? "
+"?????."
 
 msgid "NFS Server IP"
-msgstr "NFS ?? IP"
+msgstr ""
+"NFS ?? IP"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
 msgstr ""
-"NFS ?? IP ?? ??? ?????. ??? ????? ?????? ??? ? "
-"????."
+"NFS ?? IP ?? ??? ?????. ??? ????? ?????? ??? ? ????."
 
 msgid "NFS Path"
-msgstr "NFS ??"
+msgstr ""
+"NFS ??"
 
 msgid "The NFS exported path on NFS server."
-msgstr "NFS ???? NFS? ??? ?????."
+msgstr ""
+"NFS ???? NFS? ??? ?????."
 
 msgid "Device path"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "iSCSI Server"
-msgstr "iSCSI ??"
+msgstr ""
+"iSCSI ??"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "iSCSI ?? IP ?? ??? ?????. ?? ?? ??? ???."
+msgstr ""
+"iSCSI ?? IP ?? ??? ?????. ?? ?? ??? ???."
 
 msgid "Server"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Port"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Target"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "iSCSI ??? iSCSI ??"
+msgstr ""
+"iSCSI ??? iSCSI ??"
 
 msgid "Add iSCSI Authentication"
-msgstr "iSCSI ?? ??"
+msgstr ""
+"iSCSI ?? ??"
 
 msgid "iSCSI Authentication"
-msgstr "iSCSI ??"
+msgstr ""
+"iSCSI ??"
 
 msgid "SCSI Adapter"
-msgstr "SCSI ???"
+msgstr ""
+"SCSI ???"
 
 msgid "Please, wait..."
-msgstr "?? ??? ????."
+msgstr ""
+"?? ??? ????."
 
 msgid "Add Template"
-msgstr "???? ??"
+msgstr ""
+"???? ??"
 
 msgid "Where is the source media for this template? "
-msgstr "? ????? ?? ??? ??? ?????"
+msgstr ""
+"? ????? ?? ??? ??? ?????"
 
 msgid "Local ISO Image"
-msgstr "?? ISO ???"
+msgstr ""
+"?? ISO ???"
 
 msgid "Local Image File"
 msgstr ""
+"?? ??? ??"
 
 msgid "Remote ISO Image"
-msgstr "?? ISO ???"
+msgstr ""
+"?? ISO ???"
 
 msgid "Search ISOs"
-msgstr "ISO ??"
+msgstr ""
+"ISO ??"
 
 msgid "The following ISOs are available:"
-msgstr "?? ISO? ?? ?????."
+msgstr ""
+"?? ISO? ?? ?????."
 
 msgid "OS: "
-msgstr "OS: "
+msgstr ""
+"OS: "
 
 msgid "Version: "
-msgstr "??: "
+msgstr ""
+"??: "
 
 msgid "Size: "
-msgstr "??: "
+msgstr ""
+"??: "
 
 msgid "Search more ISOs"
-msgstr "?? ISO ??"
+msgstr ""
+"?? ISO ??"
 
 msgid "Create Templates from Selected ISO"
-msgstr "??? ISO??? ???? ??"
+msgstr ""
+"??? ISO??? ???? ??"
 
 msgid "I want to use a specific ISO file"
-msgstr "?? ISO ??? ????? ???."
+msgstr ""
+"?? ISO ??? ????? ???."
 
 msgid "Loading default remote ISOs ..."
-msgstr "?? ?? ISO ?? ?..."
+msgstr ""
+"?? ?? ISO ?? ?..."
 
 msgid "Arch: "
-msgstr "Arch: "
+msgstr ""
+"Arch: "
 
 msgid "I want to use a custom URL"
-msgstr "??? ?? URL? ????? ???."
+msgstr ""
+"??? ?? URL? ????? ???."
 
 msgid "Edit Template"
-msgstr "???? ??"
+msgstr ""
+"???? ??"
 
 msgid "Processor"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "CDROM"
-msgstr "CDROM"
+msgstr ""
+"CDROM"
 
 msgid "Image File"
 msgstr ""
+"??? ??"
 
 msgid "Graphics"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Disk(GB)"
 msgstr ""
+"???(GB)"
 
 msgid "Disk Format"
 msgstr ""
+"??? ??"
 
 msgid "CPU Number"
-msgstr "CPU ??"
+msgstr ""
+"CPU ??"
 
 msgid "Manually set CPU topology"
 msgstr ""
+"CPU ???? ?? ??"
 
 msgid "Cores"
 msgstr ""
+"??"
 
 msgid "Threads"
 msgstr ""
+"???"
 
 msgid "CPU"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Disk I/O"
-msgstr "??? I/O"
+msgstr ""
+"??? I/O"
 
 msgid "Network I/O"
-msgstr "???? I/O"
+msgstr ""
+"???? I/O"
 
 msgid "Livetile"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "No guests found."
-msgstr "???? ????."
+msgstr ""
+"???? ????."
 
 msgid "Shut down"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid "Restart"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Basic Information"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "OS Distro"
-msgstr "OS Distro"
+msgstr ""
+"OS Distro"
 
 msgid "OS Code Name"
-msgstr "OS ?? ??"
+msgstr ""
+"OS ?? ??"
 
 msgid "CPU(s)"
 msgstr ""
+"CPU"
 
 msgid "System Statistics"
-msgstr "??? ??"
+msgstr ""
+"??? ??"
 
 msgid "Update Progress"
-msgstr "???? ????"
+msgstr ""
+"???? ????"
 
 msgid "Network Name"
-msgstr "???? ??"
+msgstr ""
+"???? ??"
 
 msgid "State"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Network Type"
-msgstr "???? ??"
+msgstr ""
+"???? ??"
 
 msgid "Address Space"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Name should not contain '/' and '\"'."
-msgstr "???? ?? ???? ? ?????. '/'? ???? ??? ???."
+msgstr ""
+"???? '/' ? '\"'? ???? ??? ???."
 
 msgid "Isolated: no external network connection"
-msgstr "???: ??? ???? ?? ??"
+msgstr ""
+"???: ?? ???? ?? ??"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT: ????? ??? ???? ???"
+msgstr ""
+"NAT: ????? ??? ???? ???"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "????: ?? ??? ??? ????? ?? ???"
+msgstr ""
+"????: ?? ??? ??? ????? ?? ???"
 
 msgid "(No interfaces found)"
 msgstr ""
+"(?????? ?? ? ??)"
 
 msgid "Destination"
-msgstr "??:"
+msgstr ""
+"???"
 
 msgid "Enable VLAN"
-msgstr "VLAN ??:"
+msgstr ""
+"VLAN ??"
 
 msgid "VLAN ID"
-msgstr "VLAN ID:"
+msgstr ""
+"VLAN ID"
 
 msgid "Stop"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "%Used"
 msgstr ""
+"%Used"
 
 msgid "Location"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Capacity"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Allocated"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "active"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "inactive"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Deactivate"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Activate"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Add Volume"
 msgstr ""
+"?? ??"
 
 msgid "Extend"
 msgstr ""
+"??"
 
 msgid "Undefine"
-msgstr "?? ??"
+msgstr ""
+"?? ??"
 
 msgid "Format"
-msgstr "??:"
+msgstr ""
+"??"
 
 msgid "Allocation"
-msgstr "??:"
+msgstr ""
+"??"
 
 msgid "No templates found."
-msgstr "????? ????."
+msgstr ""
+"????? ????."
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 5c17518..b2d4586 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,123 +1,149 @@
 # English translations for kimchi package.
 # Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-24 09:39-0300\n"
-"PO-Revision-Date: 2014-08-28 17:32+0000\n"
-"Last-Translator: Aline Manera <aline.manera at gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/"
-"ru/)\n"
-"Language: ru_RU\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
 msgstr ""
+"??????????? ???????? %(value)s"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "???????? ????????? ??? %(resource)s"
+msgstr ""
+"???????? ????????? ??? %(resource)s"
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s ?? ????????? ????? ??????????"
+msgstr ""
+"%(resource)s ?? ????? ?????????? ?????? ??????????"
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "???????? ????????? ??? %(resource)s"
+msgstr ""
+"???????? ????????? ??? %(resource)s"
 
 msgid "Unable to parse JSON request"
-msgstr "?????? ??????? ??????? JSON"
+msgstr ""
+"?????? ??????? ??????? JSON"
 
 msgid "This API only supports JSON"
-msgstr "??? ??????? API ???????????? ?????? JSON"
+msgstr ""
+"??? ??????? API ???????????? ?????? JSON"
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
 msgstr ""
+"????????? ?? ????????????? ??????????? ?????: %(err)s"
 
 msgid "You don't have permission to perform this operation."
 msgstr ""
+"???????????? ???? ??????? ??? ?????????? ???? ????????."
 
 msgid "Datastore is not initiated in the model object."
-msgstr "????????? ?????? ? ??????? ?????? ?? ????????????????."
+msgstr ""
+"????????? ?????? ? ??????? ?????? ?? ????????????????."
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
-msgstr "?? ??????? ????????? ?????? ??-?? ?????? %(err)s"
+msgstr ""
+"?? ??????? ????????? ?????? ??-?? ??????: %(err)s"
 
 #, python-format
 msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
 msgstr ""
+"?? ????? ?????????? ?????? %(task)s ????? ????-??? (%(seconds)s ?)."
 
 #, python-format
 msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
-msgstr "???? ????????????? ???????????? %(username)s. [??? ??????: %(code)s]"
+msgstr ""
+"???? ????????????? ??? ???????????? %(username)s. [??? ??????: %(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "??? ???? ??????? ? Kimchi"
+msgstr ""
+"??? ???? ??????? ? Kimchi"
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "??????? %(item)s ??? ????? ? Kimchi"
+msgstr ""
+"??????? %(item)s ??? ????? ? Kimchi"
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
 msgstr ""
+"???????????? %(user_id)s ?? ?????? ? ?????????? ??????????? LDAP."
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
 msgstr ""
+"???????????? ???????????? LDAP: %(item)s : %(value)s"
 
 msgid "Unknown \"_cap\" specified"
 msgstr ""
+"??????? ??????????? ???????? \"_cap\""
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
 msgstr ""
+"???????? \"_passthrough\" ?????? ???? \"true\" ??? \"false\""
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
 msgstr ""
+"???????? \"_passthrough_affected_by\" ?????? ???? ??????? ? ?????? ??????????"
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
-msgstr "?????? ????????? ??????? ?????????. ????????: %(err)s"
+msgstr ""
+"?????? ????????? ??????? ?????????. ????????: %(err)s"
 
 #, python-format
 msgid "Error while getting block device information for %(device)s."
-msgstr "?????? ????????? ?????????? ? ??????? ??????????? ??? %(device)s."
+msgstr ""
+"?????? ????????? ?????????? ? ??????? ??????????? ??? %(device)s."
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "?? ?????? ???? ???????? ??: %(filename)s"
+msgstr ""
+"?? ?????? ???? ???????? ??: %(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
 msgstr ""
-"?????? ??????? ????? ???????? ?? %(filename)s. ?????????, ??? ??? ???? JSON."
+"?????? ??????? ????? ???????? ??: %(filename)s. ?????????, ??? ??? ???? JSON."
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
-msgstr "?? ??????? ????? ? ??????? %(portal)s ????? iSCSI. ????????: %(err)s"
+msgstr ""
+"?? ??????? ????? ? ??????? %(portal)s ????? iSCSI. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr "?? ??????? ????? ? ??????? %(target)s ????? iSCSI %(host)s"
+msgstr ""
+"?? ??????? ????? ? ??????? %(target)s ????? %(host)s iSCSI"
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
 msgstr ""
+"?? ?????? ???? ISO %(filename)s"
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "???? ISO %(filename)s ?? ???????????"
+msgstr ""
+"???? ISO %(filename)s ?? ???????????"
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
@@ -126,19 +152,23 @@ msgstr ""
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr "???????????? ?????? ???????? El Torito ? ?????? ISO %(filename)s"
+msgstr ""
+"???????????? ?????? ???????? El Torito ? ?????? ISO %(filename)s"
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "???????????? ????????? ???????? El Torito ? ?????? ISO %(filename)s"
+msgstr ""
+"???????????? ????????? ???????? El Torito ? ?????? ISO %(filename)s"
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
-msgstr "??????????? ??? ???? ??? ???????? ???? ? ?????? ISO %(filename)s"
+msgstr ""
+"??????????? ??? ???????? ???? ? ?????? ISO %(filename)s"
 
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
-msgstr "???????? ?????? ??????????? ???? ? ?????? ISO %(filename)s"
+msgstr ""
+"???????? ?????? ??????????? ???? ? ?????? ISO %(filename)s"
 
 #, python-format
 msgid ""
@@ -148,214 +178,265 @@ msgid ""
 "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"? ??????????? ??? ???? ??????? ??? ????????????? ????? ?????? ISO "
-"%(filename)s. ??????????? ??? ? ??????? /var/lib/libvirt, ???????? "
-"?????????? ?? ????? ? ?????? ???????? ??????? ??? ???????????? %(user)s, "
-"???? ??? ????????, ???????? %(user)s ? ?????? ???? ? ?????? ISO ??? (?? "
-"?????????????) ????????? ??????? 'chmod -R o+x 'path_to_iso'. ????????: "
-"%(err)s"
+"? ??????????? ??? ???? ??????? ??? ????????????? ????? ?????? ISO %(filename)s."
+"??????????? ??? ? ??????? /var/lib/libvirt, ???????? ?????????? ?? ????? "
+"? ?????? ???????? ??????? ??? ???????????? %(user)s, ???? ??? ????????, ???????? "
+"%(user)s ? ?????? ???? ? ?????? ISO ??? (?? ?????????????) ????????? ??????? 'chmod -R o+x"
+"????-?-iso'. ????????: %(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
+"?????? ???????? ?????????? ?? ?? ??????."
 
 msgid "No OS information found in given image."
 msgstr ""
+"? ?????? ?????? ?? ??????? ?????????? ?? ??."
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
 msgstr ""
+"?? ??????? ????????? ???? ?????? %(filename)s"
 
 #, python-format
 msgid ""
 "Image file must be an existing file on system. %(filename)s is not a valid "
 "input."
 msgstr ""
+"???? ?????? ?????? ???????????? ? ???????. ??? ????? %(filename)s ?? ???????? ?????????? "
+"??????."
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "??????????? ?????? %(name)s ??? ??????????"
+msgstr ""
+"??????????? ?????? %(name)s ??? ??????????"
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "??????????? ?????? %(name)s ?? ??????????"
+msgstr ""
+"??????????? ?????? %(name)s ?? ??????????"
 
 #, python-format
 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 ""
+"?? ??????? ????????????? ??????????? ?????? %(name)s. ??? %(new_name)s ??? "
+"??????, ??? ??????????? ?????? ?? ?????????."
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
 msgstr ""
-"?? ??????? ???????? ?????? ?????? ??? ????????????? ??????????? ?????? "
-"%(name)s"
+"?? ??????? ???????? ?????? ?????? ??? ????????????? ??????????? ?????? %(name)s"
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "????????? ????? ISO ?? ?????????????? ???? ????????."
+msgstr ""
+"????????? ????? ISO ?? ?????????????? ???? ????????."
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
 msgstr ""
+"?????? ?????? ?? ?????????????? ? ??????????? ?????? %(name)s"
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
 msgstr ""
+"?? ??????? ???????????? ? ??????????? ??????????? ?????? %(name)s."
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"??? ??????????? ?????? ?????? ???? ??????? ??? ???????? ????? ????? (/)"
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
 msgstr ""
+"??? ??????????? ?????? ?????? ???????????? URI ??????? %(value)s"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
 msgstr ""
+"??? ??????????? ?????? ?????? ???????????? URI ???? ?????? %(value)s"
 
 msgid "Supported virtual machine graphics are Spice or VNC"
 msgstr ""
+"?????????????? ??????????? ?????????? ??????????? ??????: Spice, VNC"
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
 msgstr ""
 "????? ?????? ???????? ??? ??????????? ?????????? ?????? ???? IPv4 ??? IPv6"
 
 msgid "Specify a template to create a virtual machine from"
-msgstr "??????? ?????? ??? ???????? ??????????? ??????"
+msgstr ""
+"??????? ?????? ??? ???????? ??????????? ??????"
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ?????????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
 msgstr ""
-"?? ??????? ????????????? ??????????? ?????? %(name)s. ????????: %(err)s"
+"?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 msgid "User name list must be an array"
 msgstr ""
+"?????? ???? ????????????? ?????? ???? ????????"
 
 msgid "User name must be a string"
-msgstr "??? ???? ?????? ???? ???????"
+msgstr ""
+"??? ???????????? ?????? ???? ???????"
 
 msgid "Group name list must be an array"
 msgstr ""
+"?????? ???? ????? ?????? ???? ????????"
 
 msgid "Group name must be a string"
-msgstr "??? ???? ?????? ???? ???????"
+msgstr ""
+"??? ?????? ?????? ???? ???????"
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "???????????? %(users)s ?? ??????????."
+msgstr ""
+"????????? ???????????? ?? ??????????: %(users)s"
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "???????????? %(groups)s ?? ??????????."
+msgstr ""
+"????????? ?????? ?? ??????????: %(groups)s"
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ?????????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ????????? ?????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????? ?????? ? ?????????? ??????????? ?????? %(name)s. ????????: %(err)s"
 
 msgid "The guest console password must be a string."
 msgstr ""
+"?????? ??????? ???????? ??????? ?????? ???? ???????."
 
 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 ""
+"??????????? ?????? '%(name)s' ?????????? ?????????? ????? ????????? ?? ?????."
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
 msgstr ""
+"???????????? ???????? ?????? ??? ???????????? ??????????? ?????? '%(name)s'"
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"?? ??????? ??????????? ??????????? ?????? '%(name)s'. ????????: %(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"???????????? ???????? ??? ???????????? ??????????? ?????? %(name)s"
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"?????????? ????????????? ??????????? ?????? '%(name)s', ????????? ??? ?? ????????."
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"?? ??????? ????????????? ??????????? ?????? '%(name)s'. ????????: %(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"?????????? ??????????? ?????????? ??????????? ?????? '%(name)s', ????????? ??? ?? ??????????????."
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"?? ??????? ??????????? ?????????? ??????????? ?????? '%(name)s'. ????????: %(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"??????????? ????? ?????? ????????? ??????????? ??????????? ????? ?? ?????."
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"??????????? ?????? '%(name)s' ?? ???????????? ??????????? ????????? ?????? ??????. ???????? ????? ??????, "
+"????? ?????? ?????????, ????? ???????? ??? ???????."
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"? ???????? ??????????? ??????? ????? ?????? ????? ?????? ???????????"
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"??? ???????????? ????????? ?????? ?????? ????? ???????? ?????? ?????? ?????? ???? ????? ???????? ?????? ?????? ???? "
+"????????, ??????? 1024 ???"
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"???????????? ????????? ???????? ???????? 1024 ??? ? ???????? ???????."
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"?????? ?????????? libvirt ????? ?? ???????????? ?????????? ??????. ?????? ?????????? libvirt ?????? ???? >= "
+"1.2.14"
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"?????? ??????????? ?????????? ??????. ????????: %(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
+"??????????? ?????? %(vmid)s ?? ???????? ??????????????? ???????????? ?????????? ????? %(dev_name)s."
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
 msgstr ""
+"?????? ?????????? ??????????? ?????? ??????????? ??? ????? %(dev_name)s."
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -364,19 +445,28 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
+"?? ??????? ?????? IOMMU. ??? ??????????? ???????????????? ???????? ???????? PCI ????? ????????? ?????? IOMMU. "
+"? BIOS ???????? ????????? Intel VT-d ??? AMD IOMMU ? ?????????, "
+"?????????????? ?? ???? ?? ? ?????????? IOMMU. ??? ?????????? Intel ???????? intel_iommu=on "
+"? ????????? ???? ? ????? /boot/grub2/grub.conf. ??? ?????????? AMD ???????? iommu=pt "
+"iommu=1."
 
 msgid "\"name\" should be a device name string"
 msgstr ""
+"???????? \"name\" ?????? ???? ??????? ? ?????? ??????????"
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"????????, ?????????? %(name)s ???????????? ??????. ??? ?????????? ?????????? ? "
+"???????? ???????."
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr "????????? %(iface)s ?? ?????????? ? ??????????? ?????? %(name)s"
+msgstr ""
+"????????? %(iface)s ?? ?????????? ? ??????????? ?????? %(name)s"
 
 #, python-format
 msgid ""
@@ -385,247 +475,309 @@ msgstr ""
 "???? %(network)s, ????????? ??? ??????????? ?????? %(name)s, ?? ??????????"
 
 msgid "Supported virtual machine interfaces type is only network"
-msgstr "?????????????? ?????? ???? ??? ??????????? ??????????? ?????? - ????"
+msgstr ""
+"?????????????? ?????? ???? ??? ??????????? ??????????? ?????? - ????"
 
 msgid "Network name for virtual machine interface must be a string"
-msgstr "??? ???? ??? ?????????? ??????????? ?????? ?????? ???? ???????"
+msgstr ""
+"??? ???? ??? ?????????? ??????????? ?????? ?????? ???? ???????"
 
 msgid "Invalid network model card specified for virtual machine interface"
 msgstr ""
 "??????? ???????????? ????? ?????? ???? ??? ?????????? ??????????? ??????"
 
 msgid "Specify type and network to add a new virtual machine interface"
-msgstr "??????? ??? ? ???? ??? ?????????? ?????? ?????????? ??????????? ??????"
+msgstr ""
+"??????? ??? ? ???? ??? ?????????? ?????? ?????????? ??????????? ??????"
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"MAC-????? ?????? ????? ?????? FF:FF:FF:FF:FF:FF"
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"MAC-????? %(mac)s ??? ?????????? ? ??????????? ?????? %(name)s"
 
 msgid "Invalid MAC Address"
 msgstr ""
+"???????????? MAC-?????"
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"?????? ???????? MAC-????? ?????????? ??????????? ??????"
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "?????? %(name)s ??? ??????????"
+msgstr ""
+"?????? %(name)s ??? ??????????"
 
 #, python-format
 msgid ""
 "Network '%(network)s' specified for template %(template)s does not exist"
-msgstr "???? %(network)s, ????????? ??? ??????? %(template)s, ?? ??????????"
+msgstr ""
+"???? '%(network)s', ????????? ??? ??????? %(template)s, ?? ??????????"
 
 #, python-format
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
-msgstr "??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?? ??????????"
+msgstr ""
+"??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?? ??????????"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
-msgstr "??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?? ???????"
+msgstr ""
+"??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?????????"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "?????? ???????????? ???????? %(param)s ??? CDROM."
+msgstr ""
+"?????? ???????????? ???????? %(param)s ??? CDROM."
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
-msgstr "???? %(network)s, ????????? ??? ??????? %(template)s, ?? ???????"
+msgstr ""
+"???? %(network)s, ????????? ??? ??????? %(template)s, ?????????"
 
 msgid "Template name must be a string"
-msgstr "??? ??????? ?????? ???? ???????"
+msgstr ""
+"??? ??????? ?????? ???? ???????"
 
 msgid "Template icon must be a path to the image"
-msgstr "?????? ??????? ?????? ???? ????? ? ??????"
+msgstr ""
+"?????? ??????? ?????? ???? ????? ? ??????"
 
 msgid "Template distribution must be a string"
-msgstr "??????? ??????? ?????? ???? ???????"
+msgstr ""
+"??????? ??????? ?????? ???? ???????"
 
 msgid "Template distribution version must be a string"
-msgstr "?????? ???????? ??????? ?????? ???? ???????"
+msgstr ""
+"?????? ???????? ??????? ?????? ???? ???????"
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "????? ??????????? ?????? ???? ????? ??????"
+msgstr ""
+"????? ??????????? ?????? ???? ????? ??????, ??????? 0"
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr "????? ?????? (??) ?????? ???? ????? ?????? ?????? 512"
+msgstr ""
+"????? ?????? (??) ?????? ???? ????? ?????? ?????? 512"
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "CDROM ??????? ?????? ???? ????????? ??? ????????? ?????? ISO"
+msgstr ""
+"CDROM ??????? ?????? ???? ????????? ??? ????????? ?????? ISO"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
-msgstr "??? ??????? ?????? ???????????? URI ???? ?????? %(value)s"
+msgstr ""
+"??? ??????? ?????? ???????????? URI ???? ?????? %(value)s"
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr "??????? ????? ISO ? ???????? CDROM ??? ???????? ???????"
+msgstr ""
+"??????? ????? ISO ? ???????? CDROM ??? ???????? ?????? ??? ???????? ???????"
 
 msgid "All networks for the template must be specified in a list."
-msgstr "??? ???? ??? ??????? ?????? ???? ??????? ? ??????."
+msgstr ""
+"??? ???? ??? ??????? ?????? ???? ??????? ? ??????."
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
 msgstr ""
+"??????? ??? ??? ???????, ????? ??? ?????? - iSCSI ??? SCSI"
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
 msgstr ""
+"??? %(volume)s ??????????? ? ???? ?????? %(pool)s"
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
-msgstr "?? ??????? ??????? ?????? ??-?? ?????? %(err)s"
+msgstr ""
+"?? ??????? ??????? ?????? ??-?? ????????? ??????: %(err)s"
 
 #, python-format
 msgid "Unable to delete template due error: %(err)s"
-msgstr "?? ??????? ??????? ?????? ??-?? ?????? %(err)s"
+msgstr ""
+"?? ??????? ??????? ?????? ??-?? ????????? ??????: %(err)s"
 
 msgid "Disk size must be an integer greater than 1GB."
 msgstr ""
+"?????? ????? ?????? ???? ????? ?????? ?????? 1 ??."
 
 msgid "Template base image must be a valid local image file"
-msgstr "CDROM ??????? ?????? ???? ????????? ??? ????????? ?????? ISO"
+msgstr ""
+"??????? ????? ??????? ?????? ???? ?????????? ????????? ?????? ??????"
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
 msgstr ""
+"?? ??????? ???????????????? ?????? %(path)s ???????? ??????"
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
 msgstr ""
+"??? ???????? ????????? ??????????? ?????????? ??????????? ??????????? ?????? ???? ????????????? ????? ???????, ???? ? "
+"?????."
 
 msgid ""
 "When specifying CPU topology, each element must be an integer greater than "
 "zero."
 msgstr ""
+"??? ???????? ????????? ??????????? ?????? ??????? ?????? ???? ????? ?????? ?????? "
+"????."
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"???????????? ?????? ?????? ?????. ?????????? ???????: bochs, cloop, cow, dmg, qcow, "
+"qcow2, qed, raw, vmdk, vpc."
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "??? ?????? %(name)s ??? ??????????"
+msgstr ""
+"??? ?????? %(name)s ??? ??????????"
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "??? ?????? %(name)s ?? ??????????"
+msgstr ""
+"??? ?????? %(name)s ?? ??????????"
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr "??????? %(item)s ??? ???????? ???? ?????? %(name)s"
+msgstr ""
+"??????? %(item)s, ????? ??????? ??? ?????? %(name)s"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "?? ??????? ??????? ???????? ??? ?????? %(name)s"
+msgstr ""
+"?? ??????? ??????? ??? ?????? %(name)s"
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "?? ??????? ??????? ?????? ????? ??????. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ?????? ????? ??????. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
 msgstr ""
-"?? ??????? ???????? ????? ????? ? ???? ?????? %(name)s. ????????: %(err)s"
+"?? ??????? ???????? ????? ????? ? ???? ?????? %(name)s. ????????: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr "?? ??????? ???????????? ??? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????????? ??? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
-msgstr "?? ??????? ?????????????? ??? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ?????????????? ??? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
 msgstr ""
-"?? ??????? ??????? ??? NFS: ???????????????? ???? %(path)s ??? ???? "
-"???????????? ?? ????? ????????????"
+"?? ??????? ??????? ??? NFS: ???????????????? ???? %(path)s ??? ???? ???????????? ?? ????? ????????????"
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
 msgstr ""
-"?? ??????? ??????? ??? NFS: ?? ??????? ???????????? ???????????????? ???? "
-"%(path)s"
+"?? ??????? ??????? ??? NFS: ?? ??????? ???????????? ???????????????? ???? %(path)s"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "???????????????? ??? ???? ??????: %(type)s"
+msgstr ""
+"???????????????? ??? ???? ??????: %(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
 msgstr ""
+"?????? ????????? XML ???? ?????? ??? %(pool)s"
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"??? ???? ?????? ?????? ???? ??????? ??? ???????? ????? ????? (/)"
 
 msgid ""
 "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
 "iso"
 msgstr ""
+"?????????????? ???? ????? ??????: dir, netfs, logical, iscsi, isci ? kimchi-"
+"iso"
 
 msgid "Storage pool path must be a string"
-msgstr "???? ? ???? ?????? ?????? ???? ???????"
+msgstr ""
+"???? ? ???? ?????? ?????? ???? ???????"
 
 msgid "Storage pool host must be a IP or hostname"
-msgstr "???? ???? ?????? ?????? ???? IP-??????? ??? ?????? ?????"
+msgstr ""
+"???? ???? ?????? ?????? ???? IP-??????? ??? ?????? ?????"
 
 msgid "Storage pool device must be the absolute path to the block device"
 msgstr ""
+"?????????? ???? ?????? ?????? ???? ?????????? ????? ? ???????? ??????????"
 
 msgid "Storage pool devices parameter must be a list"
-msgstr "???????? ????????? ???? ?????? ?????? ???? ???????"
+msgstr ""
+"???????? ????????? ???? ?????? ?????? ???? ???????"
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "??????? IQN ???? iSCSI ?????? ???? ???????"
+msgstr ""
+"??????? IQN ???? iSCSI ?????? ???? ???????"
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
-msgstr "???? ?????????? ??????? ?????? ?????? ???? ????? ?????? ?? 1 ?? 65535"
+msgstr ""
+"???? ?????????? ??????? ?????? ?????? ???? ????? ?????? ?? 1 ?? 65535"
 
 msgid "iSCSI target username must be a string"
 msgstr ""
+"??? ???????????? ???????? ??????? iSCSI ?????? ???? ???????"
 
 msgid "iSCSI target password must be a string"
 msgstr ""
+"?????? ???????? ??????? iSCSI ?????? ???? ???????"
 
 msgid "Specify name and type to create a storage pool"
-msgstr "??????? ??? ? ??? ??? ???????? ???? ??????"
+msgstr ""
+"??????? ??? ? ??? ??? ???????? ???? ??????"
 
 #, python-format
 msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
 msgstr ""
-"%(disk)s ?? ???????? ?????????? ??????/????????. ?? ??????? ???????? ??? ? "
-"??? %(pool)s."
+"%(disk)s ?? ???????? ?????????? ??????/????????. ??? ?? ??????? ???????? ? ??? "
+"%(pool)s."
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
 msgstr ""
+"?? ??????? ????????? ?????????? ??? %(pool)s. ????????: %(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
-msgstr "????? ?????????? ????? ????????? ?????? ??? ??????????? ???? ??????."
+msgstr ""
+"????? ?????????? ????? ????????? ?????? ??? ??????????? ???? ??????."
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "??? ???????? ????? SCSI ?????? ???? ???????."
+msgstr ""
+"??? ???????? ????? SCSI ?????? ???? ???????."
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr "kimchi_isos ???? ?????? ?????????????? ??? ??????????? ?????????????"
+msgstr ""
+"kimchi_isos ???? ?????? ?????????????? ??? ??????????? ?????????????"
 
 #, python-format
 msgid ""
@@ -647,158 +799,191 @@ msgstr ""
 msgid ""
 "Unable to deactivate pool %(name)s as it is associated with some templates"
 msgstr ""
-"?? ??????? ?????????????? ??? %(name)s: ??? ?????? ? ?????????? ?????????"
+"?? ??????? ?????????????? ??? %(name)s: ??? ?????? ? ?????????"
 
 #, python-format
 msgid "Unable to delete pool %(name)s as it is associated with some templates"
-msgstr "?? ??????? ??????? ??? %(name)s: ??? ?????? ? ?????????? ?????????"
+msgstr ""
+"?? ??????? ??????? ??? %(name)s: ??? ?????? ? ?????????"
 
 #, python-format
 msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
 msgstr ""
-"?????? ????? ? ?????? %(name)s ??? ??????????. ???????? ?????? ??? ??? "
-"???????? ??????????? ????."
+"?????? ????? ? ?????? '%(name)s' ??? ??????????. ???????? ?????? ??? "
+"??? ???????? ??????????? ????."
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
 msgstr ""
-"?? ??????? ???????? ???? ?????? ? ??????????? ????????? ???????????? ??-?? "
-"?????? %(err)s"
+"?? ??????? ???????? ???? ?????? ??????????? ????????? ???????????? ??-?? ????????? ??????: %(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "??? %(name)s ??? ??????????"
+msgstr ""
+"??? ?????? %(name)s ??? ??????????"
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
-msgstr "??? %(name)s ?? ?????????? ? ???? ?????? %(pool)s"
+msgstr ""
+"??? ?????? %(name)s ?? ?????????? ? ???? ?????? %(pool)s"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
 msgstr ""
+"?? ??????? ??????? ??? ?????? %(volume)s, ????????? ??? ?????? %(pool)s "
+"?????????"
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
-msgstr "??????? %(item)s ??? ???????? ???? %(volume)s"
+msgstr ""
+"??????? %(item)s, ????? ??????? ??? ?????? %(volume)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes because storage pool %(pool)s is not active"
-msgstr "?? ??????? ??????? ?????? ?????: ??? ?????? %(pool)s ?? ???????"
+msgstr ""
+"?? ??????? ??????? ?????? ?????: ??? ?????? %(pool)s ?????????"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
 msgstr ""
-"?? ??????? ??????? ??? %(name)s ? ???? ?????? %(pool)s. ????????: %(err)s"
+"?? ??????? ??????? ??? ?????? %(name)s ? ???? ?????? %(pool)s. ????????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
 msgstr ""
-"?? ??????? ??????? ?????? ????? ? ???? ?????? %(pool)s. ????????: %(err)s"
+"?? ??????? ??????? ?????? ????? ?????? ? ???? ?????? %(pool)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ???? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ???? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ??? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
-msgstr "?? ??????? ???????? ?????? ???? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????? ?????? ???? ?????? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
-msgstr "??? ?????? %(type)s ?? ???????????? ???????? ? ???????? ?????"
+msgstr ""
+"??? ?????? %(type)s ?? ???????????? ???????? ? ???????? ?????"
 
 msgid "Storage volume name must be a string"
-msgstr "??? ???? ?????? ???? ???????"
+msgstr ""
+"??? ???? ?????? ???? ???????"
 
 msgid "Storage volume allocation must be an integer number"
-msgstr "????????? ???? ?????? ???? ????? ??????"
+msgstr ""
+"????????? ???? ?????? ???? ????? ??????"
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"?????? ???? ?????? ?? ??????????????. ?????????? ???????: bochs, cloop, cow, dmg, "
+"qcow, qcow2, qed, raw, vmdk, vpc."
 
 msgid "Storage volume requires a volume name"
-msgstr "???? ????????? ???"
+msgstr ""
+"???? ????????? ???"
 
 #, python-format
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
 msgstr ""
-"?? ??????? ???????? ???? ?????? ? ??????????? ? ????? ??-?? ?????? %(err)s"
+"?? ??????? ???????? ???? ?????? ??????????? ? ????? ?????? ??-?? ????????? ??????: %(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
 msgstr ""
+"????? ??????? ?????? ???? ???????? %(param)s"
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
 msgstr ""
+"???????? ???? ?? %(param)s ?? ??????????????"
 
 msgid "Storage volume capacity must be an integer number."
 msgstr ""
+"??????? ???? ?????? ?????? ???? ????? ??????."
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
 msgstr ""
+"URL ???? ?????? ?????? ???? http://, https://, ftp:// ??? ftps://."
 
 #, python-format
 msgid "Unable to access file %(url)s. Please, check it."
 msgstr ""
+"??? ??????? ? ????? %(url)s. ????????? ???."
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ??????? ??????????? ??? ?????? '%(name)s' ? ???? '%(pool)s'. ????????: "
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"??????? ?????? ????? ? ??? ?????? ??? ???????? ?????."
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"??? ???????? ???? ?????? ??????? ???????? upload."
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"?? ??????? ???????? ?????? ?????, ????????? ??? ?? ????????????? ???????????? ??????? ?????."
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"??? ?????? %(vol)s ?? ????????? ? ???????? ????????."
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"?????? ????? ???????? ???????? ?????? ???? ??????."
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"?? ??????? ???????? ?????? ????? ???????? ? ??? ??????. ????????: %(err)s."
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "????????? %(name)s ?? ??????????"
+msgstr ""
+"????????? %(name)s ?? ??????????"
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "???? %(name)s ??? ??????????"
+msgstr ""
+"???? %(name)s ??? ??????????"
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "???? %(name)s ?? ??????????"
+msgstr ""
+"???? %(name)s ?? ??????????"
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
-msgstr "??????? %(subnet)s, ????????? ??? ???? %(network)s, ???????????."
+msgstr ""
+"??????? %(subnet)s, ????????? ??? ???? %(network)s, ???????????."
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
@@ -807,59 +992,72 @@ msgstr ""
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "?? ??????? ??????? ???????? ???? %(name)s"
+msgstr ""
+"?? ??????? ??????? ???????? ???? %(name)s"
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
-msgstr "????????? %(iface)s, ????????? ??? ???? %(network)s, ??? ????????????"
+msgstr ""
+"????????? %(iface)s, ????????? ??? ???? %(network)s, ??? ????????????"
 
 msgid "Interface should be bare NIC, bonding or bridge device."
 msgstr ""
-"????????? ?????? ???? ??????? ??????, ??????????? ????? ??? ????????? "
-"???????????."
+"????????? ?????? ???? ??????? ??????, ??????????? ????? ??? ????????? ???????????."
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ???? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ???? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "?? ?????? ????????? IP-????? ??? ???? %(name)s"
+msgstr ""
+"?? ?????? ????????? IP-????? ??? ???? %(name)s"
 
 #, python-format
 msgid "The interface %(iface)s already exists."
 msgstr ""
+"????????? %(iface)s ??? ??????????."
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"??? ???? ?????? ???? ??????? ??? ???????? ????? ????? (/) ? ??????? (\")"
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "?????????????? ???? ?????: isolated, NAT ? bridge"
+msgstr ""
+"?????????????? ???? ?????: isolated, NAT ? bridge"
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
 msgstr ""
 "??????? ???? ?????? ???? ???????, ?????????? IP-?????, ??????? ??? ????? ????"
 
 msgid "Network interface must be a string"
-msgstr "??????? ????????? ?????? ???? ???????"
+msgstr ""
+"??????? ????????? ?????? ???? ???????"
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "??????? ?? VLAN ?????? ???? ????? ?????? ?? 1 ?? 4094"
+msgstr ""
+"??????? ?? VLAN ?????? ???? ????? ?????? ?? 1 ?? 4094"
 
 msgid "Specify name and type to create a Network"
-msgstr "??????? ??? ? ??? ??? ???????? ????"
+msgstr ""
+"??????? ??? ? ??? ??? ???????? ????"
 
 #, python-format
 msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
+"?? ??????? ??????? ???? %(name)s. ???? ??????????? ?????? %(vms)s "
+"??? ???????, ????????? ? ?????? ?????."
 
 #, python-format
 msgid ""
 "Unable to deactivate network %(name)s. There are some virtual machines "
 "%(vms)s and/or templates linked to this network."
 msgstr ""
+"?? ??????? ?????????????? ???? %(name)s. ???? ??????????? ?????? "
+"%(vms)s ??? ???????, ????????? ? ?????? ?????."
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -868,185 +1066,231 @@ msgstr ""
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "?? ??????? ???????????? ????????? %(iface)s: %(err)s."
+msgstr ""
+"?? ??????? ???????????? ????????? %(iface)s: %(err)s."
 
 #, python-format
 msgid ""
 "Failed to activate interface %(iface)s. Please check the physical link "
 "status."
 msgstr ""
-"?? ?????? ???????????? ????????? %(iface)s. ????????? ????????? ?????????? "
-"????? ?????. "
+"?? ??????? ???????????? ????????? %(iface)s. ????????? ?????????? ????? ????? "
+""
 
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
 msgstr ""
+"?? ??????? ????????? ???? %(name)s. ????????: %(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "?????????? ????? %(name)s ?? ??????????"
+msgstr ""
+"?????????? ????? %(name)s ?? ??????????"
 
 msgid "Debug report tool not found in system"
-msgstr "?????????? ??????????? ?????? ?? ?????? ? ???????"
+msgstr ""
+"?????????? ??????????? ?????? ?? ?????? ? ???????"
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
-msgstr "?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s."
+msgstr ""
+"?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s."
 
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
 msgstr ""
+"?? ?????? ?????????? ????? ? ?????? %(name)s"
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
-msgstr "?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s"
 
 msgid "You should give a name for the debug report file."
 msgstr ""
+"?????????? ????????? ??? ????? ??????????? ??????."
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
+"??? ??????????? ?????? ?????? ???? ???????. ?????? ?????, ?????, ????????????? ('_') "
+"? ????? ('-') ?????????."
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
 msgstr ""
-"?????? ????? ? ?????? %(name)s ??? ??????????. ???????? ?????? ??? ??? "
-"???????? ??????????? ????."
+"?????????? ????? ? ?????? \"%(name)s\" ??? ??????????. ??????? "
+"?????? ???."
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "?????? ?????? %(server)s ?? ????????????? Kimchi"
+msgstr ""
+"?????? ?????? %(server)s ?? ????????????? Kimchi"
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "??????? ?? %(name)s ?? ??????????"
+msgstr ""
+"??????? ?? '%(name)s' ?? ??????????"
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "?????? %(name)s ?? ?????????? ?? ?????"
+msgstr ""
+"?????? %(name)s ?? ?????????? ?? ?????"
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
 msgstr ""
 "?? ??????? ????????? ?????? ??????? ?????: ??????????? ??????????? ??????"
 
 msgid "Unable to reboot host machine as there are running virtual machines"
-msgstr "?? ??????? ????????????? ??????? ?????: ??????????? ??????????? ??????"
+msgstr ""
+"?? ??????? ????????????? ??????? ?????: ??????????? ??????????? ??????"
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "?????????? %(name)s ???? ?? ???????"
+msgstr ""
+"?????????? ???? '%(name)s' ?? ???????"
 
 msgid "Conflicting flag filters specified."
 msgstr ""
+"??????? ????????????? ????? ???????."
 
 msgid "No packages marked for update"
-msgstr "??? ???????, ?????????? ??? ??????????"
+msgstr ""
+"??? ???????, ?????????? ??? ??????????"
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "????? %(name)s ?? ??????? ??? ??????????."
+msgstr ""
+"????? %(name)s ?? ??????? ??? ??????????."
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
-msgstr "?????? ????????? ???????, ?????????? ??? ??????????. ????????: %(err)s"
+msgstr ""
+"?????? ????????? ???????, ?????????? ??? ??????????. ????????: %(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "??? ???????????? ?????????????? ??????? ??? ???? ???????."
+msgstr ""
+"??? ???????????? ?????????????? ??????? ??? ???? ???????."
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "?? ?????? %(item)s ? ????????? ??????"
+msgstr ""
+"?? ?????? %(item)s ? ????????? ??????"
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "???????????? URI %(uri)s"
+msgstr ""
+"???????????? URI %(uri)s"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "????? ????-??? ?????????? ??????? %(cmd)s (%(seconds)s ?)"
+msgstr ""
+"????? ????-??? ?? ????? ?????????? ??????? '%(cmd)s' ????? %(seconds)s ?"
 
 msgid "Unable to choose a virtual machine name"
 msgstr ""
+"?? ??????? ??????? ??? ??????????? ??????"
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"???????????? ???????? ?????? '%(value)s'"
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"???????????? ??????? ????????? ?????? '%(unit)s'"
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "???????????? ??? ??????. ?????????????? ????: cdrom"
+msgstr ""
+"???????????? ??? ??????. ?????????????? ????: 'cdrom', 'disk'"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
 msgstr ""
+"???? '%(value)s' ?? ???????? ?????????? ?????????/????????? ????? ??? ??????????"
 
 msgid "Only CDROM path can be update."
 msgstr ""
+"????? ???????? ?????? ???? ? CDROM."
 
 #, python-format
 msgid ""
 "The storage device %(dev_name)s does not exist in the virtual machine "
 "%(vm_name)s"
 msgstr ""
+"?????????? ???????? %(dev_name)s ?? ?????????? ? ??????????? ?????? "
+"%(vm_name)s"
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
-msgstr "?????? ???????? ?????????? ????????: %(error)s"
+msgstr ""
+"?????? ???????? ?????????? ????????: %(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
-msgstr "?????? ?????????? ?????????? ????????: %(error)s"
+msgstr ""
+"?????? ?????????? ?????????? ????????: %(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
-msgstr "?????? ???????? ?????????? ????????: %(error)s"
+msgstr ""
+"?????? ???????? ?????????? ????????: %(error)s"
 
 msgid "Do not support IDE device hot plug"
 msgstr ""
+"?? ?????????????? ??????????? ??????????? ????????? IDE"
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
-msgstr "??????? ??? ? ???? ??? ?????????? ?????? ????? ??????????? ??????"
+msgstr ""
+"??????? ??? ? ????, ???? ??? ? ???/??? ??? ?????????? ?????? ????? ??????????? "
+"??????"
 
 msgid "Specify path to update virtual machine disk"
-msgstr "??????? ???? ??? ?????????? ????? ??????????? ??????"
+msgstr ""
+"??????? ???? ??? ?????????? ????? ??????????? ??????"
 
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
 msgstr ""
+"?????????? ??????????? ?? ????? ????????? (%(limit)s) ??? ???? ??????????? %(type)s"
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
 msgstr ""
+"?? ??????? ???????? ?????????? ? ???? ? ????? ??? ??????? ????/????: %(error)s"
 
 msgid "Volume already in use by other virtual machine."
 msgstr ""
+"??? ??? ???????????? ?????? ??????????? ???????."
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
-msgstr "??????? ??? ? ???? ??? ?????????? ?????? ????? ??????????? ??????"
+msgstr ""
+"??? ?????????? ?????? ????? ??????????? ?????? ??????? ???? ????, "
+"???? ??? ? ???"
 
 #, python-format
 msgid ""
 "Volume chosen with format %(format)s does not fit in the storage type "
 "%(type)s"
 msgstr ""
+"????????? ??? ? ???????? %(format)s ?? ???????? ??? ???? ?????? "
+"%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
 msgstr ""
 "?? ????????? YUM ?????? ???? ???????, ????????? ?????? ?? ?????? ?????."
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "URL ????????? ?????? ???? http://, ftp:// ??? file:// ."
+msgstr ""
+"URL ????????? ?????? ???? http://, ftp:// ??? file:// ."
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
@@ -1056,688 +1300,896 @@ msgstr ""
 "????? ?????????."
 
 msgid "Distribution to DEB repository must be a string"
-msgstr "??????? ??? ????????? DEB ?????? ???? ???????"
+msgstr ""
+"??????? ??? ????????? DEB ?????? ???? ???????"
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "?????????? ??? ????????? DEB ?????? ???? ??????????? ? ???????"
+msgstr ""
+"?????????? ??? ????????? DEB ?????? ???? ??????????? ? ???????"
 
 msgid "Components to DEB repository must be a string"
-msgstr "?????????? ??? ????????? DEB ?????? ???? ???????"
+msgstr ""
+"?????????? ??? ????????? DEB ?????? ???? ???????"
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"?????? ?????????? ????? ??? ????????? ?????? ???? ???????"
 
 msgid "YUM Repository name must be string."
-msgstr "??? ????????? YUM ?????? ???? ???????."
+msgstr ""
+"??? ????????? YUM ?????? ???? ???????."
 
 msgid "GPG check must be a boolean value."
-msgstr "???????? GPG ?????? ???? ????????? ?????????."
+msgstr ""
+"???????? GPG ?????? ???? ????????? ?????????."
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
 msgstr ""
-"???? GPG ?????? ???? URL, ??????????? ?? ?????????? ???? ? ???????????? "
-"ASCII."
+"???? GPG ?????? ???? URL, ??????????? ?? ?????????? ???? ? ???????????? ASCII."
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "?? ??????? ???????? ????????? %(repo_id)s."
+msgstr ""
+"?? ??????? ???????? ????????? %(repo_id)s."
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "????????? %(repo_id)s ?? ??????????."
+msgstr ""
+"????????? %(repo_id)s ?? ??????????."
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"??????? ??????? URL ?????????, ?????? ?????? ? ?????????? ??? ???????? ??? "
+"????????? ????????? YUM."
 
 msgid "Repository management tool was not recognized for your system."
-msgstr "?? ????????? ?????????? ?????????? ?????????? ??? ???????."
+msgstr ""
+"?? ????????? ?????????? ?????????? ?????????? ??? ???????."
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "????????? %(repo_id)s ??? ????????."
+msgstr ""
+"????????? %(repo_id)s ??? ????????."
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "????????? %(repo_id)s ??? ?????????."
+msgstr ""
+"????????? %(repo_id)s ??? ?????????."
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "?? ??????? ??????? ????????? %(repo_id)s."
+msgstr ""
+"?? ??????? ??????? ????????? %(repo_id)s."
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
-msgstr "?? ??????? ???????? ? ???? ???????????? ????????? %(repo_file)s"
+msgstr ""
+"?? ??????? ???????? ? ???? ???????????? ????????? %(repo_file)s"
 
 msgid "Specify repository distribution in order to create a DEB repository."
-msgstr "??????? ??????? ????????? ??? ???????? ????????? DEB."
+msgstr ""
+"??????? ??????? ????????? ??? ???????? ????????? DEB."
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "?? ??????? ???????? ????????? %(repo_id)s."
+msgstr ""
+"?? ??????? ???????? ????????? %(repo_id)s."
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "?? ??????? ????????? ????????? %(repo_id)s."
+msgstr ""
+"?? ??????? ????????? ????????? %(repo_id)s."
 
 msgid "YUM Repository ID already exists"
-msgstr "?? ????????? YUM ??? ??????????"
+msgstr ""
+"?? ????????? YUM ??? ??????????"
 
 msgid "YUM Repository name must be a string"
-msgstr "??? ????????? YUM ?????? ???? ???????"
+msgstr ""
+"??? ????????? YUM ?????? ???? ???????"
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "?? ??????? ??????? ?????? ????????. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ?????? ????????. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
-msgstr "?? ??????? ???????? ?????????? ? ?????????. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????? ?????????? ?????????. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "?? ??????? ???????? ?????????. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????? ?????????. ????????: %(err)s"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "?? ??????? ??????? ?????????. ????????: %(err)s"
+msgstr ""
+"?? ??????? ??????? ?????????. ????????: %(err)s"
 
 #, python-format
 msgid ""
 "Configuration items: '%(items)s' are not supported by repository manager"
 msgstr ""
+"???????? ???????????? '%(items)s' ?? ?????????????? ??????????????? ?????????"
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"?????????? ????????? ?????? ???? URL http://, ftp:// ??? file://."
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"?????? ?????? ? ?????????? ?????? ????????? ????????????."
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
 msgstr ""
+"??????????? ?????? '%(vm)s' ?????? ???? ??????????? ????? ????????? ?? ???????????? ?????."
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ??????? ??????? ???????????? ????? '%(name)s' ??????????? ?????? '%(vm)s'. ????????: "
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
 msgstr ""
+"???????????? ????? '%(name)s' ?? ?????????? ? ??????????? ?????? '%(vm)s'."
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ??????? ???????? ???????????? ????? '%(name)s' ??????????? ?????? '%(vm)s'. ????????: "
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
+"?? ??????? ??????? ?????? ???????????? ????? ??????????? ?????? '%(vm)s'. ????????: %(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ??????? ??????? ???????????? ????? '%(name)s' ??????????? ?????? '%(vm)s'. ????????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ??????? ???????? ??????? ???????????? ????? ??????????? ?????? '%(vm)s'. ????????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
 msgstr ""
+"?? ??????? ???????????? ????????? ??????????? ?????? '%(vm)s' ?? ???????????? ????? '%(name)s'. ????????: "
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
+"?? ??????? ??????? ???????????? ????? ??????????? ?????? '%(vm)s', ????????? ??? ???????? "
+"???? ? ??????? %(format)s. ?????????????? ?????? ?????? qcow2."
 
 msgid "The number of vCPUs is too large for this system."
 msgstr ""
+"????? ??????????? ??????????? ??????? ?????? ??? ???? ???????."
 
 msgid "Invalid vCPU/topology combination."
 msgstr ""
+"???????????? ????????? ??????????? ??????????? ? ?????????."
 
 msgid "This host (or current configuration) does not allow CPU topology."
 msgstr ""
+"?? ???? ????? (??? ? ??????? ????????????) ?? ????????? ????????? ???????????."
 
 msgid "ERROR CODE"
-msgstr "??? ??????"
+msgstr ""
+"??? ??????"
 
 msgid "REASON"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "STACK"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Go to Homepage"
-msgstr "??????? ?? ??????? ????????"
+msgstr ""
+"??????? ?? ???????? ????????"
 
 msgid "Create a New Virtual Machine"
-msgstr "??????? ????? ??????????? ??????"
+msgstr ""
+"??????? ????? ??????????? ??????"
 
 msgid "Virtual Machine Name"
-msgstr "??? ??????????? ??????"
+msgstr ""
+"??? ??????????? ??????"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
 msgstr ""
-"??? ??? ????????????? ??????????? ??????. ???? ?? ???????, ??? ????? ??????? "
-"? ??????????? ?? ????????????? ???????."
+"??? ??? ????????????? ??????????? ??????. ???? ?? ???????, ??? ????? "
+"??????? ? ??????????? ?? ????????????? ???????."
 
 msgid "Template"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Please create a template first."
-msgstr "??????????, ???????? ?????? ? ?????? ???????."
+msgstr ""
+"??????? ???????? ??????."
 
 msgid "Create a Template"
-msgstr "??????? ??????"
+msgstr ""
+"??????? ??????"
 
 msgid "Please choose a template."
-msgstr "??????????, ???????? ??????."
+msgstr ""
+"???????? ??????."
 
 msgid "OS"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "OS Version"
-msgstr "?????? ??"
+msgstr ""
+"?????? ??"
 
 msgid "CPUS"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "Memory"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Create"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Creating..."
 msgstr ""
+"????????..."
 
 msgid "Edit Guest"
-msgstr "???????? ???????? ???????"
+msgstr ""
+"???????? ???????? ???????"
 
 msgid "General"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Storage"
-msgstr "?????????"
+msgstr ""
+"???????? ??????"
 
 msgid "Interface"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Permission"
-msgstr "??????"
+msgstr ""
+"????? ???????"
 
 msgid "Host PCI Device"
 msgstr ""
+"?????????? PCI ?????"
 
 msgid "Snapshot"
 msgstr ""
+"???????????? ?????"
 
 msgid "Name"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "CPUs"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "Memory (MB)"
-msgstr "?????? (??)"
+msgstr ""
+"????? ?????? (??)"
 
 msgid "Icon"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Device"
-msgstr "??? ??????????"
+msgstr ""
+"??????????"
 
 msgid "Path"
-msgstr "???? NFS"
+msgstr ""
+"????"
 
 msgid "Network"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Type"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "MAC Address"
 msgstr ""
+"MAC-?????"
 
 msgid "Available system users and groups"
 msgstr ""
+"????????? ????????? ???????????? ? ??????"
 
 msgid "Selected system users and groups"
 msgstr ""
+"????????? ????????? ???????????? ? ??????"
 
 msgid "User"
 msgstr ""
+"????????????"
 
 msgid "All"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "To Add"
 msgstr ""
+"????????"
 
 msgid "Added"
 msgstr ""
+"?????????"
 
 msgid "filter"
 msgstr ""
+"??????"
 
 msgid "Product"
 msgstr ""
+"???????"
 
 msgid "Vendor"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Created"
 msgstr ""
+"???? ????????"
 
 msgid "Save"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Replace"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Detach"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Cancel"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "revert"
 msgstr ""
+"????????????"
 
 msgid "Add a Storage Device to VM"
-msgstr "???????? ?????????? ???????? ? VM"
+msgstr ""
+"???????? ?????????? ???????? ? VM"
 
 msgid "Device Type"
-msgstr "??? ??????????"
+msgstr ""
+"??? ??????????"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr "??? ??????????. ? ?????? ?????? ?????????????? ?????? \"cdrom\"."
+msgstr ""
+"??? ??????????. ? ?????? ?????? ?????????????? \"cdrom\" ? \"disk\"."
 
 msgid "Storage Pool"
-msgstr "??? ??????"
+msgstr ""
+"??? ??????"
 
 msgid "Storage pool which volume located in"
-msgstr "???? ? ???? ?????? ?????? ???? ???????"
+msgstr ""
+"??? ???? ?????? ????????? ?"
 
 msgid "Storage Volume"
-msgstr "??? ???? ??????"
+msgstr ""
+"??? ??????"
 
 msgid "Storage volume to be attached"
-msgstr "??? ???? ?????? ???? ???????"
+msgstr ""
+"??? ?????????"
 
 msgid "File Path"
-msgstr "???? ? ?????"
+msgstr ""
+"???? ? ?????"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "???? ? ????? ISO ??? CDROM ?? ???????."
+msgstr ""
+"???? ? ????? ISO ??? CDROM ?? ???????."
 
 msgid "Attach"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "Start"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Reset"
-msgstr "????????"
+msgstr ""
+"?????"
 
 msgid "Pause"
 msgstr ""
+"?????????????"
 
 msgid "Resume"
 msgstr ""
+"???????????"
 
 msgid "Power Off"
-msgstr "?????????"
+msgstr ""
+"????????? ???????"
 
 msgid "Actions"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Connect"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "Clone"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "Edit"
-msgstr "?????????????"
+msgstr ""
+"????????"
 
 msgid "Shut Down"
-msgstr "????????? ??????"
+msgstr ""
+"????????? ??????"
 
 msgid "Delete"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "The username or password you entered is incorrect. Please try again."
-msgstr "??????? ???????? ??? ???????????? ??? ??????. ??????? ??? ???."
+msgstr ""
+"??????? ???????? ??? ???????????? ??? ??????. ??????? ??? ???."
 
 msgid "This field is required."
-msgstr "??? ???????????? ????."
+msgstr ""
+"??? ???????????? ????."
 
 msgid "Log in"
-msgstr "?????"
+msgstr ""
+"???? ? ???????"
 
 msgid "Logging in..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Host"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Guests"
-msgstr "???????? ???????"
+msgstr ""
+"???????? ???????"
 
 msgid "Templates"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Failed to get application configuration"
-msgstr "?? ??????? ???????? ???????????? ??????????"
+msgstr ""
+"?? ??????? ???????? ???????????? ??????????"
 
 msgid "This is not a valid Linux path"
-msgstr "???? ???????????? ???? ? Linux"
+msgstr ""
+"???? ???????????? ???? ? Linux"
 
 msgid "This is not a valid URL."
-msgstr "??? ???????????? URL."
+msgstr ""
+"??? ???????????? URL."
 
 msgid "No such data available."
-msgstr "??? ????? ??????."
+msgstr ""
+"??? ????? ??????."
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"??? ????? ? ???????? ?????. ?????????, ??? ??????? ????? ???????? ? ???????? "
-"??? ???????????. ????? ?? ?????? HTTP: %1. "
+"??? ????? ? ???????? ?????. ?????????, ??? ??????? ????? ???????? ? "
+"???????? ??? ???????????. ????? ?? ?????? HTTP: %1. "
 
 msgid "Unable to read file."
 msgstr ""
+"?? ??????? ????????? ????."
 
 msgid "Error while uploading file."
 msgstr ""
+"?????? ???????? ?????."
 
 msgid "Delete Confirmation"
-msgstr "????????????? ????????"
+msgstr ""
+"????????????? ????????"
 
 msgid "OK"
-msgstr "OK"
+msgstr ""
+"OK"
 
 msgid "Confirm"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "Warning"
-msgstr "??????????????"
+msgstr ""
+"??????????????"
 
 msgid "Cloning..."
 msgstr ""
+"????????????..."
 
 msgid "Loading..."
-msgstr "???????????..."
+msgstr ""
+"???????????..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"?????? ????????? ????????? ??????????."
 
 msgid "Retry"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Detailed message:"
-msgstr "????????? ?????????:"
+msgstr ""
+"????????? ?????????:"
 
 msgid "No ISO found"
 msgstr ""
+"?? ?????? ????? ISO"
 
 msgid "This is not a valid ISO file."
-msgstr "???? ???? ?? ???????? ?????????? ??????? ISO."
+msgstr ""
+"???? ???? ?? ???????? ?????????? ??????? ISO."
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "??? ?????? ????? ???????. ???????????"
+msgstr ""
+"??? ????? ?????? ????? ???????. ???????????"
 
 msgid "This will permanently delete the template. Would you like to continue?"
-msgstr "?????? ????? ???????????? ??????. ???????????"
+msgstr ""
+"?????? ????? ???????????? ??????. ???????????"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
 msgstr ""
-"?????????? ????????? ?????? ???????, ????????? ? ??? ???????? ??????????? "
-"??????!"
+"?????????? ????????? ?????? ???????, ????????? ? ??? ???????? ??????????? ??????!"
 
 msgid "Max:"
-msgstr "????.:"
+msgstr ""
+"????.:"
 
 msgid "Utilization"
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 msgid "Available"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Read Rate"
-msgstr "???????? ??????"
+msgstr ""
+"???????? ??????"
 
 msgid "Write Rate"
-msgstr "???????? ??????"
+msgstr ""
+"???????? ??????"
 
 msgid "Received"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Sent"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
 msgstr ""
-"?????????? ?????? ? ?????????? ????? ???????? ? ?????? ????????????? ??????. "
-"?????????? ?????????? ??????/???????????"
+"?????????? ?????? ? ?????????? ????? ???????? ? ?????? ????????????? ??????. ?????????? "
+"?????????? ??????/???????????"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
-msgstr "????????? ????? ??????? ??? ??????????? ??????????????. ???????????"
+msgstr ""
+"????????? ????? ??????? ??? ??????????? ??????????????. "
+"???????????"
 
 msgid "Repositories"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "ID"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Base URL"
-msgstr "??????? URL"
+msgstr ""
+"??????? URL"
 
 msgid "Is Mirror"
-msgstr "?????????? ?????"
+msgstr ""
+"?????????? ?????"
 
 msgid "URL Args"
-msgstr "????????? URL"
+msgstr ""
+"????????? URL"
 
 msgid "Enabled"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "GPG Check"
-msgstr "???????? GPG"
+msgstr ""
+"???????? GPG"
 
 msgid "GPG Key"
-msgstr "???? GPG"
+msgstr ""
+"???? GPG"
 
 msgid "Add"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Remove"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Enable"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Disable"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Software Updates"
-msgstr "?????????? ???????????? ???????????"
+msgstr ""
+"?????????? ???????????? ???????????"
 
 msgid "Package Name"
-msgstr "??? ??????"
+msgstr ""
+"??? ??????"
 
 msgid "Version"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Architecture"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "Repository"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Update All"
-msgstr "???????? ???"
+msgstr ""
+"???????? ???"
 
 msgid "Updating..."
-msgstr "??????????..."
+msgstr ""
+"??????????..."
 
 msgid "Failed to retrieve packages update information."
 msgstr ""
+"?????? ????????? ?????????? ??? ?????????? ???????."
 
 msgid "Failed to update package(s)."
-msgstr "?? ??????? ???????? ??????."
+msgstr ""
+"?? ??????? ???????? ??????."
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
 msgstr ""
-"?????????? ????? ????? ?????? ??? ??????????? ??????????????. ???????????"
+"?????????? ????? ????? ?????? ??? ??????????? ??????????????. "
+"???????????"
 
 msgid "Debug Reports"
-msgstr "?????????? ??????"
+msgstr ""
+"?????????? ??????"
 
 msgid "Generated Time"
-msgstr "????? ????????"
+msgstr ""
+"????? ????????"
 
 msgid "Generate"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Generating..."
-msgstr "????????..."
+msgstr ""
+"????????..."
 
 msgid "Rename"
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 msgid "Download"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
-msgstr "??? ?????? ?????? ????????? ?????? ?????, ????? ? ?????? ('-')."
+msgstr ""
+"??? ?????? ?????? ????????? ?????? ?????, ?????, ????????????? ('_') ? "
+"?????? ('-')."
 
 msgid "Pending..."
-msgstr "???????????..."
+msgstr ""
+"????????..."
 
 msgid "Report name is the same as the original one."
 msgstr ""
+"??? ?????? ????????? ? ????????."
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
 msgstr ""
-"????? ??????? ??????????? ?????? ?????? ?? ?????? ???????????? ???????. ??? "
-"??????????? ????????. ???????????"
+"??????????? ?????? ????? ??????? ?????? ?? ?????? ???????????? ???????. ??? ???????? "
+"??????????. ???????????"
 
 msgid "Power off Confirmation"
-msgstr "????????????? ????????"
+msgstr ""
+"????????????? ?????????? ???????"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
 msgstr ""
+"??? ???????? ????? ???????? ? ????????????? ????????????. ????????, ???????????? ???????? "
+"??? ? ???????? ???????. ???????????"
 
 msgid "Reset Confirmation"
-msgstr "????????????? ????????"
+msgstr ""
+"????????????? ??????"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
 msgstr ""
+"?????? ?????? ?????? ??? ?????? ??? ??????????? ?????? ???????? ??. "
+"???????????"
 
 msgid "Shut Down Confirmation"
-msgstr "????????????? ????????"
+msgstr ""
+"????????????? ?????????? ??????"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
-msgstr "?????? ????? ???????????? ??????. ???????????"
+msgstr ""
+"???????? ????????, ??? ???????? ?? ????? ??????????????? ???? ??????. ???????????"
 
 msgid "Virtual Machine delete Confirmation"
 msgstr ""
+"????????????? ???????? ??????????? ??????"
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
 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 ""
+"???? ? ??????? ???????? ??????? ???? ???? SCSI ??? iSCSI, ??? ????? ??????????? "
+"? ??? ?????? ?? ?????????. ?? ?? ????? ??????????, ???? ? ??????? ???? "
+"???????????? ?????????? ????? ??? ???????????? ?????. ???????????"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
 msgstr ""
-"???? CDROM ????? ????????. ??? ????? ????? ????? ??????????. ??????????"
+"???? CDROM ????? ????????. ??? ????? ????? ????? ??????????. "
+"??????????"
 
 msgid "Attaching..."
-msgstr "???????????..."
+msgstr ""
+"???????????..."
 
 msgid "Replacing..."
-msgstr "??????..."
+msgstr ""
+"??????..."
 
 msgid "Successfully attached!"
-msgstr "??????? ?????????!"
+msgstr ""
+"??????? ?????????!"
 
 msgid "Successfully replaced!"
-msgstr "??????? ???????!"
+msgstr ""
+"??????? ???????!"
 
 msgid "Successfully detached!"
-msgstr "??????? ????????!"
+msgstr ""
+"??????? ????????!"
 
 msgid ""
 "This disk will be detached permanently and you can re-attach it. Continue to "
 "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."
+msgstr ""
+"?? VLAN ?????? ???? ?? 1 ?? 4094."
 
 msgid "unavailable"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
@@ -1747,490 +2199,643 @@ msgstr ""
 "??????? ?? ???? ????."
 
 msgid "Create a network"
-msgstr "??????? ????"
+msgstr ""
+"??????? ????"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"???? ??? ?????? ?? ??????????. ?????? ???????????, ??? ???????? ???????????? "
-"??? ??????. ???????????"
+"??? ???? ?? ??????????. ?????? ?????????, ??? ???????? "
+"???????????? ?????? ??. ???????????"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"??? ??????????? VLAN ????? ???????? ??????????? ? ?????????? NetworkManager.  "
+"??? ????????????? ?????????."
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
-msgstr "??? ?????? ????? ???????????? ??????. ???????????"
+msgstr ""
+"??? ?????? ????? ???????????? ??????. ???????????"
 
 msgid "This storage pool is empty."
-msgstr "???? ??? ?????? ??????."
+msgstr ""
+"???? ??? ?????? ??????."
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
 "to continue? "
 msgstr ""
-"???? ????? ??????????????, ? ??? ?????? ?? ??? ????? ????????. ?? "
-"????????????? ?????? ??????????? "
+"???? ????? ??????????????, ? ??? ?????? ?? ??? ????? ????????. ?? ????????????? ?????? "
+"??????????? "
 
 msgid "SCSI Fibre Channel"
-msgstr "SCSI Fibre Channel"
+msgstr ""
+"SCSI Fibre Channel"
 
 msgid "No SCSI adapters found."
-msgstr "?? ??????? ???????? SCSI."
+msgstr ""
+"?? ??????? ???????? SCSI."
 
 msgid "Loading iSCSI targets..."
 msgstr ""
+"???????? ??????? ???????? iSCSI..."
 
 msgid "No iSCSI found. Please input one."
 msgstr ""
+"?? ?????? iSCSI. ???????."
 
 msgid "Failed to load iSCSI targets."
 msgstr ""
+"?? ??????? ????????? ??????? ??????? iSCSI."
 
 msgid "The storage pool name can not be blank."
-msgstr "?? ??????? ??? ???? ??????."
+msgstr ""
+"?? ??????? ??? ???? ??????."
 
 msgid "The storage pool path can not be blank."
-msgstr "?? ?????? ???? ? ???? ??????."
+msgstr ""
+"?? ?????? ???? ? ???? ??????."
 
 msgid "NFS server mount path can not be blank."
-msgstr "?? ?????? ???? ???????????? ??????? NFS."
+msgstr ""
+"?? ?????? ???? ???????????? ??????? NFS."
 
 msgid "Invalid NFS mount path."
-msgstr "???????????? ???? ???????????? NFS."
+msgstr ""
+"???????????? ???? ???????????? NFS."
 
 msgid "No logical device selected."
-msgstr "?? ??????? ?????????? ??????????."
+msgstr ""
+"?? ??????? ?????????? ??????????."
 
 msgid "The iSCSI target can not be blank."
-msgstr "?? ?????? ??????? ?????? iSCSI."
+msgstr ""
+"?? ?????? ??????? ?????? iSCSI."
 
 msgid "Server name can not be blank."
-msgstr "?? ??????? ??? ???????."
+msgstr ""
+"?? ??????? ??? ???????."
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
 msgstr ""
+"??? ?? ?????????? ??? ??? IP-????? ???????. ???????? ???."
 
 msgid "Looking for available partitions ..."
-msgstr "????? ????????? ????????..."
+msgstr ""
+"????? ????????? ????????..."
 
 msgid "No available partitions found."
-msgstr "?? ??????? ????????? ???????."
+msgstr ""
+"?? ??????? ????????? ???????."
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"???? ??? ?????? ?? ??????????. ?????? ???????????, ??? ???????? ???????????? "
-"??? ??????. ???????????"
+"???? ??? ?????? ?? ??????????. ?????? ???????????, ??? ???????? "
+"???????????? ?????? ???. ???????????"
 
 msgid "Unable to retrieve partitions information."
-msgstr "?? ??????? ???????? ?????????? ? ?????????. ????????: %(err)s"
+msgstr ""
+"?? ??????? ???????? ?????????? ? ????????."
 
 msgid "In progress..."
 msgstr ""
+"??????????..."
 
 msgid "Failed!"
 msgstr ""
+"????!"
 
 msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
 msgstr ""
+"???? ? CDROM ?????? ???? ?????????? ????????? ??? ????????? ????? ? ?? ????? ???? ??????."
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "?? ??????? ??? ???? ??????."
+msgstr ""
+"?? ?????? ??? ??? ??? ?????."
 
 msgid "Peers"
 msgstr ""
+"???????????? ????"
 
 msgid "Searching"
 msgstr ""
+"?????"
 
 msgid "No peers found."
 msgstr ""
+"?? ??????? ???????????? ????."
 
 msgid "Help"
-msgstr "??????"
+msgstr ""
+"???????"
 
 msgid "About"
-msgstr "? ?????????"
+msgstr ""
+"? ?????????"
 
 msgid "Log out"
-msgstr "?????"
+msgstr ""
+"??????? ?????"
 
 msgid "Version:"
-msgstr "??????:"
+msgstr ""
+"??????:"
 
 msgid "Session timeout, please re-login."
 msgstr ""
+"????-??? ??????. ??????????, ??????? ??????."
 
 msgid "User Name"
-msgstr "??? ????????????"
+msgstr ""
+"??? ????????????"
 
 msgid "Password"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Generate a New Debug Report"
-msgstr "??????? ????? ?????????? ?????"
+msgstr ""
+"??????? ????? ?????????? ?????"
 
 msgid "Report Name"
-msgstr "??? ??????"
+msgstr ""
+"??? ??????"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"??? ??? ????????????? ??????. ???? ?? ???????, ??? ????? ???????????? ?? "
-"?????? ???????? ???????. ??? ????? ?????????: ?????, ????? ? ?????? (\"-\")."
+"??? ??? ????????????? ??????. ???? ?? ???????, ??? ????? "
+"???????????? ?? ?????? ???????? ???????. ??? ????? ???????? ?????, ?????, ????????????? (\"_\") "
+"? ?????? (\"-\")."
 
 msgid "Rename a Debug Report"
-msgstr "??????? ????? ?????????? ?????"
+msgstr ""
+"????????????? ?????????? ?????"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
 msgstr ""
-"??? ??? ????????????? ??????. ???? ?? ???????, ??? ????? ???????????? ?? "
-"?????? ???????? ???????. ??? ????? ?????????: ?????, ????? ? ?????? (\"-\")."
+"???, ???????????? ??? ????????????? ??????. ??? ????? ???????? ?????, ????? ? "
+"????????????? (\"-\")."
 
 msgid "Submit"
-msgstr "???????????"
+msgstr ""
+"?????????"
 
 msgid "Add a Repository"
-msgstr "???????? ?????????"
+msgstr ""
+"???????? ?????????"
 
 msgid "Identifier"
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "????????? ????? - ?????????? ????????????? ?????????."
+msgstr ""
+"????????? ????? - ?????????? ????????????? ?????????."
 
 msgid "Textual name for the repository."
-msgstr "????????? ??? ?????????."
+msgstr ""
+"????????? ??? ?????????."
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "???????????? ????"
+msgstr ""
+"???????????? ????"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "URL ?????????. ?????????????? ?????????: http, ftp, file."
+msgstr ""
+"URL ?????????. ?????????????? ?????????: http, ftp, file."
 
 msgid "Repository is a mirror"
-msgstr "????????? ???????? ?????????? ??????."
+msgstr ""
+"????????? ???????? ?????????? ??????"
 
 msgid "Distribution"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Distribution of the DEB repository."
-msgstr "??????? ????????? DEB."
+msgstr ""
+"??????? ????????? DEB."
 
 msgid "Components"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "List of components in DEB repository."
-msgstr "?????? ??????????? ? ????????? DEB."
+msgstr ""
+"?????? ??????????? ? ????????? DEB."
 
 msgid "Edit Repository"
-msgstr "???????? ?????????"
+msgstr ""
+"???????? ?????????"
 
 msgid "Mirror List URL"
-msgstr "URL ?????? ?????????? ?????"
+msgstr ""
+"URL ?????? ?????????? ?????"
 
 msgid "Yes"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "No"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Add a Volume to Storage Pool"
 msgstr ""
+"???????? ??? ? ??? ??????"
 
 msgid "Fetch from remote URL"
 msgstr ""
+"????????? ? ?????????? URL"
 
 msgid "Enter the remote URL here."
 msgstr ""
+"??????? ???? ????????? URL."
 
 msgid "Upload a file"
 msgstr ""
+"???????? ????"
 
 msgid "Choose the file you want to upload."
 msgstr ""
+"???????? ???? ??? ????????."
 
 msgid "Define a New Storage Pool"
-msgstr "??????? ??? ??????"
+msgstr ""
+"??????? ??? ??????"
 
 msgid "Storage Pool Name"
-msgstr "??? ???? ??????"
+msgstr ""
+"??? ???? ??????"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
-msgstr "??? ??? ????????????? ????? ??????. ?? ????? ???? ??????."
+msgstr ""
+"??? ??? ????????????? ????? ??????. ?? ????? ???? ??????."
 
 msgid "Storage Pool Type"
-msgstr "??? ???? ??????"
+msgstr ""
+"??? ???? ??????"
 
 msgid "Storage Path"
-msgstr "???? ? ?????"
+msgstr ""
+"???? ? ?????"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
-msgstr "???? ? ???? ??????. ?????? ??? ?????? ?????? ????? ?????????? ????."
+msgstr ""
+"???? ? ???? ??????. ?????? ??? ?????? ?????? ????? ?????????? ????."
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
-msgstr "Kimchi ?????????? ??????? ???????, ???? ?? ?? ?????????? ? ???????."
+msgstr ""
+"Kimchi ?????????? ??????? ???????, ???? ?? ?? ?????????? "
+"? ???????."
 
 msgid "NFS Server IP"
-msgstr "IP-????? ??????? NFS"
+msgstr ""
+"IP-????? ??????? NFS"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
 msgstr ""
-"IP-????? ??? ??? ????? ??????? NFS. ??? ????? ?????? ??? ??????? ? "
-"??????????."
+"IP-????? ??? ??? ????? ??????? NFS. ??? ????? ?????? ??? ??????? ? ??????????."
 
 msgid "NFS Path"
-msgstr "???? NFS"
+msgstr ""
+"???? NFS"
 
 msgid "The NFS exported path on NFS server."
-msgstr "???????????????? ???? NFS ?? ??????? NFS."
+msgstr ""
+"???????????????? ???? NFS ?? ??????? NFS."
 
 msgid "Device path"
-msgstr "???? ? ??????????"
+msgstr ""
+"???? ? ??????????"
 
 msgid "iSCSI Server"
-msgstr "?????? iSCSI"
+msgstr ""
+"?????? iSCSI"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "IP-????? ??? ??? ????? ??????? iSCSI. ?? ????? ???? ??????."
+msgstr ""
+"IP-????? ??? ??? ????? ??????? iSCSI. ?? ????? ???? ??????."
 
 msgid "Server"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Port"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Target"
-msgstr "??????? ??????"
+msgstr ""
+"??????? ??????"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "??????? ?????? iSCSI ?? ??????? iSCSI"
+msgstr ""
+"??????? ?????? iSCSI ?? ??????? iSCSI"
 
 msgid "Add iSCSI Authentication"
-msgstr "???????? ????????????? iSCSI"
+msgstr ""
+"???????? ????????????? iSCSI"
 
 msgid "iSCSI Authentication"
-msgstr "????????????? iSCSI"
+msgstr ""
+"????????????? iSCSI"
 
 msgid "SCSI Adapter"
-msgstr "??????? SCSI"
+msgstr ""
+"??????? SCSI"
 
 msgid "Please, wait..."
-msgstr "?????????..."
+msgstr ""
+"?????????..."
 
 msgid "Add Template"
-msgstr "???????? ??????"
+msgstr ""
+"???????? ??????"
 
 msgid "Where is the source media for this template? "
-msgstr "??? ????????? ???????? ???????? ??? ????? ????????"
+msgstr ""
+"??? ????????? ???????? ???????? ??? ????? ???????? "
 
 msgid "Local ISO Image"
-msgstr "????????? ????? ISO"
+msgstr ""
+"????????? ????? ISO"
 
 msgid "Local Image File"
 msgstr ""
+"????????? ???? ??????"
 
 msgid "Remote ISO Image"
-msgstr "????????? ????? ISO"
+msgstr ""
+"????????? ????? ISO"
 
 msgid "Search ISOs"
-msgstr "????? ??????? ISO"
+msgstr ""
+"????? ??????? ISO"
 
 msgid "The following ISOs are available:"
-msgstr "????????? ?????? ISO:"
+msgstr ""
+"????????? ?????? ISO:"
 
 msgid "OS: "
-msgstr "??: "
+msgstr ""
+"??: "
 
 msgid "Version: "
-msgstr "??????: "
+msgstr ""
+"??????: "
 
 msgid "Size: "
-msgstr "??????: "
+msgstr ""
+"??????: "
 
 msgid "Search more ISOs"
-msgstr "????? ?????????????? ??????? ISO"
+msgstr ""
+"????? ?????????????? ??????? ISO"
 
 msgid "Create Templates from Selected ISO"
-msgstr "??????? ??????? ?? ????????? ??????? ISO"
+msgstr ""
+"??????? ??????? ?? ????????? ??????? ISO"
 
 msgid "I want to use a specific ISO file"
-msgstr "???????????? ?????????? ???? ISO"
+msgstr ""
+"???????????? ?????????? ???? ISO"
 
 msgid "Loading default remote ISOs ..."
-msgstr "???????? ????????? ISO ?? ?????????..."
+msgstr ""
+"???????? ????????? ISO ?? ?????????..."
 
 msgid "Arch: "
-msgstr "???????????: "
+msgstr ""
+"???????????: "
 
 msgid "I want to use a custom URL"
-msgstr "???????????? ?????? URL"
+msgstr ""
+"???????????? ?????? URL"
 
 msgid "Edit Template"
-msgstr "???????? ??????"
+msgstr ""
+"???????? ??????"
 
 msgid "Processor"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "CDROM"
-msgstr "CDROM"
+msgstr ""
+"CDROM"
 
 msgid "Image File"
 msgstr ""
+"???? ??????"
 
 msgid "Graphics"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Disk(GB)"
 msgstr ""
+"???? (??)"
 
 msgid "Disk Format"
 msgstr ""
+"?????? ?????"
 
 msgid "CPU Number"
-msgstr "?????????? ???????????"
+msgstr ""
+"?????????? ???????????"
 
 msgid "Manually set CPU topology"
 msgstr ""
+"??????? ????????? ????????? ???????????"
 
 msgid "Cores"
 msgstr ""
+"????"
 
 msgid "Threads"
 msgstr ""
+"????"
 
 msgid "CPU"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Disk I/O"
-msgstr "???????? ????-?????"
+msgstr ""
+"???????? ????-?????"
 
 msgid "Network I/O"
-msgstr "??????? ????-?????"
+msgstr ""
+"??????? ????-?????"
 
 msgid "Livetile"
-msgstr "Livetile"
+msgstr ""
+"Livetile"
 
 msgid "No guests found."
-msgstr "?? ??????? ???????? ???????."
+msgstr ""
+"?? ??????? ???????? ???????."
 
 msgid "Shut down"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Restart"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "Basic Information"
-msgstr "??????? ??????????"
+msgstr ""
+"??????? ??????????"
 
 msgid "OS Distro"
-msgstr "??????? ??"
+msgstr ""
+"??????? ??"
 
 msgid "OS Code Name"
-msgstr "??????? ??? ??"
+msgstr ""
+"??????? ??? ??"
 
 msgid "CPU(s)"
 msgstr ""
+"??????????"
 
 msgid "System Statistics"
-msgstr "????????? ??????????"
+msgstr ""
+"????????? ??????????"
 
 msgid "Update Progress"
-msgstr "??? ??????????"
+msgstr ""
+"??? ??????????"
 
 msgid "Network Name"
-msgstr "??? ????"
+msgstr ""
+"??? ????"
 
 msgid "State"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Network Type"
-msgstr "??? ????"
+msgstr ""
+"??? ????"
 
 msgid "Address Space"
-msgstr "???????? ????????????"
+msgstr ""
+"???????? ????????????"
 
 msgid "Name should not contain '/' and '\"'."
-msgstr "???????????? ??? ???? ??????. ? ????? ?? ?????? ???? ???????? '/'."
+msgstr ""
+"??? ?? ?????? ????????? '/' ? '\"'."
 
 msgid "Isolated: no external network connection"
-msgstr "????????????? (??? ?????????? ??????? ??????????)"
+msgstr ""
+"?????????????: ??? ??????? ??????? ??????????"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT (?????? ????????? ?????????? ??????? ??????????)"
+msgstr ""
+"NAT (?????? ????????? ?????????? ??????? ??????????)"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "????? ???? (?????? ??????????? ??????????? ????? ? ?????????? ????)"
+msgstr ""
+"????? ???? (?????? ??????????? ??????????? ????? ? ?????????? ????)"
 
 msgid "(No interfaces found)"
 msgstr ""
+"(?????????? ?? ???????)"
 
 msgid "Destination"
-msgstr "??????? ????????????:"
+msgstr ""
+"??????? ????????????"
 
 msgid "Enable VLAN"
-msgstr "???????? VLAN:"
+msgstr ""
+"???????? VLAN"
 
 msgid "VLAN ID"
 msgstr ""
+"????????????? VLAN"
 
 msgid "Stop"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "%Used"
 msgstr ""
+"%????????????"
 
 msgid "Location"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 msgid "Capacity"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Allocated"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "active"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "inactive"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Deactivate"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Activate"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 msgid "Add Volume"
 msgstr ""
+"???????? ???"
 
 msgid "Extend"
 msgstr ""
+"?????????"
 
 msgid "Undefine"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Format"
-msgstr "??????:"
+msgstr ""
+"??????"
 
 msgid "Allocation"
-msgstr "????????? ????????:"
+msgstr ""
+"?????????"
 
 msgid "No templates found."
-msgstr "?? ??????? ???????."
+msgstr ""
+"?? ??????? ???????."
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bb31f03..f7d2787 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,158 +1,174 @@
-# i18n portable object for kimchi.
-# Copyright (C) IBM, Corp. 2013-2014
-# ShaoHe Feng <shaohef at linux.vnet.ibm.com>, 2013-04-18.
-#
-# 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
+# English translations for kimchi package.
+# Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kimchi 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-24 09:39-0300\n"
-"PO-Revision-Date: 2013-06-27 10:48+0000\n"
-"Last-Translator: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
-"Language-Team: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2013-07-11 17:32-0400\n"
+"Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
+"Language-Team: English\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"X-Poedit-Country: CHINA\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=1; plural=0;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
-msgstr "???? %(value)s"
+msgstr ""
+"???? %(value)s"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "?????%(resource)s"
+msgstr ""
+"????? %(resource)s"
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "?????%(resource)s"
+msgstr ""
+"%(resource)s ???????"
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "?????%(resource)s"
+msgstr ""
+"????? %(resource)s"
 
 msgid "Unable to parse JSON request"
-msgstr "????JSON??"
+msgstr ""
+"???? JSON ??"
 
 msgid "This API only supports JSON"
-msgstr "??API???JSON"
+msgstr ""
+"? API ??? JSON"
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
-msgstr "???????????%(err)s"
+msgstr ""
+"?????????????%(err)s"
 
 msgid "You don't have permission to perform this operation."
-msgstr "????????????"
+msgstr ""
+"??????????????"
 
 msgid "Datastore is not initiated in the model object."
-msgstr "???model??????????"
+msgstr ""
+"???????????????"
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
-msgstr "????%(err)s??????"
+msgstr ""
+"???????????????%(err)s"
 
 #, python-format
 msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
-msgstr "??'%(task)s??%(seconds)s??"
+msgstr ""
+"????????%(seconds)s ????????%(task)s?"
 
 #, python-format
 msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
-msgstr "??'%(username)s'??????.[?????%(code)s]"
+msgstr ""
+"????%(username)s???????[?????%(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "????????Kimchi"
+msgstr ""
+"????? Kimchi"
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "????Kimchi?%(item)s"
+msgstr ""
+"?? %(item)s ??? Kimchi"
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
-msgstr "?????LDAP?????%(user_id)s??"
+msgstr ""
+"??????? LDAP ????? %(user_id)s?"
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
-msgstr "???LDAP???%(item)s : %(value)s"
+msgstr ""
+"?? LDAP ???%(item)s : %(value)s"
 
 msgid "Unknown \"_cap\" specified"
-msgstr "????\"_cap\""
+msgstr ""
+"??????_cap?"
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
-msgstr "\"_passthrough\"???\"true\"??\"false\""
+msgstr ""
+"?_passthrough?????true???false?"
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
-msgstr "\"_passthrough_affected_by\"???????????"
+msgstr ""
+"?_passthrough_affected_by??????????"
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
-msgstr "????????????%(err)s"
+msgstr ""
+"??????????????%(err)s"
 
 #, python-format
 msgid "Error while getting block device information for %(device)s."
-msgstr "????? %(device)s ??????"
+msgstr ""
+"?? %(device)s ??????????"
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "?????????%(filename)s"
+msgstr ""
+"??? Distro ???%(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
-msgstr "??????????%(filename)s????????JSON??????"
+msgstr ""
+"???? Distro ???%(filename)s???????? JSON ???"
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
-msgstr "???? %(portal)s ??iSCSI?????????%(err)s"
+msgstr ""
+"???? iSCSI ???? %(portal)s??????%(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr "????iSCSI??%(host)s????%(target)s?"
+msgstr ""
+"???? iSCSI ?? %(host)s ?? %(target)s"
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
-msgstr "????ISO?? %(filename)s"
+msgstr ""
+"??? ISO ?? %(filename)s"
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "ISO??%(filename)s?????"
+msgstr ""
+"ISO ?? %(filename)s ????"
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
-msgstr "ISO??%(filename)s?????El Torito?????"
+msgstr ""
+"ISO ?? %(filename)s ????? EI Torito ????"
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr "?ISO??%(filename)s??????El Torito??????"
+msgstr ""
+"ISO %(filename)s ?? El Torito ??????"
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "ISO??%(filename)s?El Torito????????"
+msgstr ""
+"ISO %(filename)s ?? El Torito ???????"
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
-msgstr "????ISO??%(filename)s?????"
+msgstr ""
+"ISO %(filename)s ????????????"
 
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
-msgstr "ISO??%(filename)s?????????"
+msgstr ""
+"? ISO %(filename)s ?????????????"
 
 #, python-format
 msgid ""
@@ -162,209 +178,265 @@ msgid ""
 "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"hypervisor????ISO??%(filename)s???????ISO??/var/lib/libvirt?"
-"?????'%(user)s'???????????'%(user)s'?????ISO??????"
-"?????????????? 'chmod -R o+x '?????????%(err)s"
+"????????? ISO %(filename)s ?????"
+"??????? /var/lib/libvirt ????"
+"??%(user)s????????????????????????????"
+"????%(user)s???? ISO ??????????????chmod -R o+x "
+"path_to_iso???????%(err)s"
 
 msgid "An error occurred when probing image OS information."
-msgstr "????????????????"
+msgstr ""
+"????????????????"
 
 msgid "No OS information found in given image."
-msgstr "???????????????????"
+msgstr ""
+"????????????????"
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
-msgstr "???????? %(filename)s"
+msgstr ""
+"???????? %(filename)s"
 
 #, python-format
 msgid ""
 "Image file must be an existing file on system. %(filename)s is not a valid "
 "input."
-msgstr "?????????????%(filename)s???????"
+msgstr ""
+"????????????????%(filename)s ????"
+"???"
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "???%(name)s????"
+msgstr ""
+"??? %(name)s ???"
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "???%(name)s???"
+msgstr ""
+"??? %(name)s ???"
 
 #, python-format
 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 ""
-"??????? %(name)s ?????? %(new_name)s ????????????"
-"??"
+"?????? %(name)s ???????? %(new_name)s ?"
+"?????????????????"
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
-msgstr "????????????%(name)s???"
+msgstr ""
+"?????????? %(name)s ?????"
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "?????????ISO???"
+msgstr ""
+"?? ISO ???????????"
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
-msgstr "??? %(name)s ?????"
+msgstr ""
+"???????? %(name)s ?????"
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
-msgstr "???%(name)s?????????"
+msgstr ""
+"?????????????? %(name)s?"
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"???????????? (/) ????"
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
-msgstr "????????URI %(value)s"
+msgstr ""
+"????????? URI %(value)s ??"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
-msgstr "?????????URI %(value)s"
+msgstr ""
+"?????????? URI %(value)s ??"
 
 msgid "Supported virtual machine graphics are Spice or VNC"
-msgstr "??????????Spice??VNC"
+msgstr ""
+"?????????? Spice ? VNC"
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
-msgstr "??????????????IPv4?IPv6???"
+msgstr ""
+"??????????? IPv4 ? IPv6"
 
 msgid "Specify a template to create a virtual machine from"
-msgstr "????????????"
+msgstr ""
+"?????????????"
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr "??????? %(name)s. ???%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s ?????????%(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
-msgstr "??????? %(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 msgid "User name list must be an array"
-msgstr "????????????"
+msgstr ""
+"??????????"
 
 msgid "User name must be a string"
-msgstr "???????????"
+msgstr ""
+"?????????"
 
 msgid "Group name list must be an array"
-msgstr "????????????"
+msgstr ""
+"?????????"
 
 msgid "Group name must be a string"
-msgstr "?????????????"
+msgstr ""
+"????????"
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "??'%(users)s'???"
+msgstr ""
+"???%(users)s????"
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "???'%(groups)s'???"
+msgstr ""
+"??%(groups)s????"
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "??????? %(name)s????????%(err)s"
+msgstr ""
+"??????? %(name)s ??????????%(err)s"
 
 msgid "The guest console password must be a string."
-msgstr "?????????????????"
+msgstr ""
+"??????????????"
 
 msgid "The life time for the guest console password must be a number."
-msgstr "????????????????????"
+msgstr ""
+"?????????????????"
 
 #, python-format
 msgid "Virtual machine '%(name)s' must be stopped before cloning it."
-msgstr "???'%(name)s'???????????"
+msgstr ""
+"??????%(name)s???????????????"
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
-msgstr "?????'%(name)s'???????????"
+msgstr ""
+"?????????????????%(name)s?????"
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
-msgstr "?????????'%(name)s'??????%(err)s"
+msgstr ""
+"??? VM?%(name)s???????????%(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"???????? %(name)s ?????"
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"???? VM?%(name)s??????????"
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"???? VM?%(name)s???????%(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"???? VM?%(name)s?????????"
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"???? VM?%(name)s???????%(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"???????????????????"
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"VM?%(name)s?????????????????????"
+"???????????"
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"?????? VM ?????"
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"??????????????????????? "
+"1024 Mib ???"
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"???????????????? 1024 Mib??"
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"??? Libvirt ??????????Libvirt ?? >= "
+"1.2.14"
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"???????????????%(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
-msgstr "???%(vmid)s???????????%(dev_name)s?"
+msgstr ""
+"VM %(vmid)s ???????????? %(dev_name)s?"
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
-msgstr "????%(dev_name)s????????????"
+msgstr ""
+"???????? %(dev_name)s ????? VM?"
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -373,1830 +445,2397 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
-"???IOMMU groups???PCI pass through??IOMMU group??????????"
-"BIOS????Intel VT-d ?? AMD IOMMU ?????????????IOMMU???"
-"Intel CPU????/boot/grub2/grub.conf???????intel_iommu=on???AMD "
-"CPU????iommu=pt iommu=1?"
+"????? IOMMU ???? PCI ???? IOMMU ???"
+"??????? BIOS ??? Intel VT-d ? AMD IOMMU?"
+"????????????? IOMMU ??????? Intel CPU??? intel_iommu=on "
+"??? /boot/grub2/grub.conf ????????? AMD CPU???? iommu=pt "
+"iommu=1?"
 
 msgid "\"name\" should be a device name string"
-msgstr "\"name\"?????????????"
+msgstr ""
+"?name??????????"
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"?????????? %(name)s??????????"
+"???"
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr "??? %(name)s ????? %(iface)s"
+msgstr ""
+"?? %(iface)s ???? %(name)s ????"
 
 #, python-format
 msgid ""
 "Network %(network)s specified for virtual machine %(name)s does not exist"
-msgstr "????%(name)s?????%(network)s???"
+msgstr ""
+"??????????? %(network)s ????%(name)"
 
 msgid "Supported virtual machine interfaces type is only network"
-msgstr "?????????????"
+msgstr ""
+"???????????????"
 
 msgid "Network name for virtual machine interface must be a string"
-msgstr "????????????????"
+msgstr ""
+"???????????????"
 
 msgid "Invalid network model card specified for virtual machine interface"
-msgstr "???????????????"
+msgstr ""
+"?????????????????"
 
 msgid "Specify type and network to add a new virtual machine interface"
-msgstr "???????????????"
+msgstr ""
+"????????????????"
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"MAC ???????? FF:FF:FF:FF:FF:FF"
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"MAC ?? %(mac)s ????? %(name)s ???"
 
 msgid "Invalid MAC Address"
 msgstr ""
+"?? MAC ??"
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"????????????? MAC ??"
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "?? %(name)s ????"
+msgstr ""
+"?? %(name)s ???"
 
 #, python-format
 msgid ""
 "Network '%(network)s' specified for template %(template)s does not exist"
-msgstr "??? %(template)s ????? '%(network)s' ???"
+msgstr ""
+"???????????%(network)s?????%(template)s"
 
 #, python-format
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
-msgstr "??? %(template)s ?????? '%(pool)s' ???"
+msgstr ""
+"??????????? %(pool)s ????%(template)s"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
-msgstr "??? %(template)s ?????? '%(pool)s' ????"
+msgstr ""
+"??????????? %(pool)s ????????%(template)s"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "?CDROM????? '%(param)s' ??"
+msgstr ""
+"? CDROM ??????%(param)s????"
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
-msgstr "??? %(template)s ????? '%(network)s' ????"
+msgstr ""
+"?????????? %(network)s ????????%(template)s"
 
 msgid "Template name must be a string"
-msgstr "?????????????"
+msgstr ""
+"??????????"
 
 msgid "Template icon must be a path to the image"
-msgstr "?????????????????"
+msgstr ""
+"????????????"
 
 msgid "Template distribution must be a string"
-msgstr "??????????????"
+msgstr ""
+"???????????"
 
 msgid "Template distribution version must be a string"
-msgstr "?????????????????"
+msgstr ""
+"?????????????"
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "CPU?????????0???"
+msgstr ""
+"CPU ?????????? 0 ???"
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr "?????MB???????????512???"
+msgstr ""
+"??? (MB) ??????? 512 ???"
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "???CDROM????????????ISO??"
+msgstr ""
+"?? CDROM ?????????? ISO ??"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
-msgstr "????????????URI %(value)s"
+msgstr ""
+"????????? URI %(value)s ??"
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr "????ISO?????????CDROM??????"
+msgstr ""
+"?? ISO ???? CDROM ??????????"
 
 msgid "All networks for the template must be specified in a list."
-msgstr "????????????????"
+msgstr ""
+"???????????????"
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
-msgstr "???????iSCSI??SCSI????????????"
+msgstr ""
+"????? iSCSI ? SCSI ??????????"
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
-msgstr "?%(volume)s?????%(pool)s?"
+msgstr ""
+"? %(volume)s ????? %(pool)s ?"
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
-msgstr "??????????%(err)s"
+msgstr ""
+"???????????????%(err)s"
 
 #, python-format
 msgid "Unable to delete template due error: %(err)s"
-msgstr "?????%(err)s???????"
+msgstr ""
+"???????????????%(err)s"
 
 msgid "Disk size must be an integer greater than 1GB."
-msgstr "????????1GB?"
+msgstr ""
+"????????? 1 GB ????"
 
 msgid "Template base image must be a valid local image file"
-msgstr "????????????????????"
+msgstr ""
+"??????????????????"
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
-msgstr "????????%(path)s??"
+msgstr ""
+"???????? %(path)s ??"
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
-msgstr "CPU????VCPUs????sockets, cores ??threads?"
+msgstr ""
+"?? CPU ????vCPU ?????????????"
+"???????"
 
 msgid ""
 "When specifying CPU topology, each element must be an integer greater than "
 "zero."
-msgstr "CPU???????????????????"
+msgstr ""
+"?? CPU ??????????????"
+"?????"
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
-"?????????????????bochs, cloop, cow, dmg, qcow, qcow2, qed, "
-"raw, vmdk, vpc?"
+"??????????????bochs?cloop?cow?dmg?qcow?"
+"qcow2?qed?raw?vmdk ? vpc?"
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "???%(name)s????"
+msgstr ""
+"??? %(name)s ???"
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "???%(name)s???"
+msgstr ""
+"??? %(name)s ???"
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr "?????%(name)s??%(item)s"
+msgstr ""
+"?? %(item)s ?????? %(name)s"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "?????????? %(name)s"
+msgstr ""
+"????????? %(name)s"
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "???????? ??? %(err)s"
+msgstr ""
+"?????????????%(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr "??????? %(name)s???? %(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
-msgstr "???????%(name)s????????? %(err)s"
+msgstr ""
+"??????? %(name)s ?????????????"
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr "???????%(name)s???? %(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
-msgstr "???????%(name)s???? %(err)s"
+msgstr ""
+"????????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
-msgstr "???????%(name)s???? %(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
-msgstr "????NFS??????????%(path)s????????"
+msgstr ""
+"???? NFS ???????? %(path)s ??????????"
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
-msgstr "????NFS??????????%(path)s??"
+msgstr ""
+"???? NFS ?????????? %(path)s ??"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "??????????%(type)s"
+msgstr ""
+"???????????%(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
-msgstr "?????XML?%(pool)s?????"
+msgstr ""
+"???? XML ??? %(pool)s ???"
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"???????????? (/) ????"
 
 msgid ""
 "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
 "iso"
-msgstr "????????dir?netfs?logical?iscsi?isci??kimchi-iso"
+msgstr ""
+"?????????? dir?netfs?logical?iscsi?isci ? kimchi-"
+"iso"
 
 msgid "Storage pool path must be a string"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "Storage pool host must be a IP or hostname"
-msgstr "??????????IP?????"
+msgstr ""
+"?????????? IP ????"
 
 msgid "Storage pool device must be the absolute path to the block device"
-msgstr "??????????????????"
+msgstr ""
+"????????????????"
 
 msgid "Storage pool devices parameter must be a list"
-msgstr "??????????????"
+msgstr ""
+"??????????????"
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "iSCSI??????IQN??????"
+msgstr ""
+"iSCSI ???? IQN ??????"
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
-msgstr "?????????????1?65535?????"
+msgstr ""
+"????????????????? 1 ? 65535 ?????"
 
 msgid "iSCSI target username must be a string"
-msgstr "iSCSI?????????????"
+msgstr ""
+"iSCSI ???????????"
 
 msgid "iSCSI target password must be a string"
-msgstr "iSCSI????????????"
+msgstr ""
+"iSCSI ??????????"
 
 msgid "Specify name and type to create a storage pool"
-msgstr "????????????"
+msgstr ""
+"?????????????"
 
 #, python-format
 msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
-msgstr "%(disk)s ???????/????????????%(pool)s?"
+msgstr ""
+"%(disk)s ??????/???????????"
+"%(pool)s?"
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
-msgstr "???????%(pool)s???????%(err)s"
+msgstr ""
+"??????? %(pool)s??????%(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
-msgstr "????????????????"
+msgstr ""
+"???????????????"
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "SCSI?????????????"
+msgstr ""
+"SCSI ??????????????"
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr "???kimchi_isos??????"
+msgstr ""
+"??? kimchi_isos ????????"
 
 #, python-format
 msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
-msgstr "????NFS???%(name)s?NFS???%(server)s?????"
+msgstr ""
+"???? NFS ??? %(name)s?NFS ??? %(server)s"
+"?????"
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
-msgstr "????NFS???%(name)s?NFS???%(server)s?????"
+msgstr ""
+"?????? NFS ??? %(name)s?NFS ??? %(server)s"
+"?????"
 
 #, python-format
 msgid ""
 "Unable to deactivate pool %(name)s as it is associated with some templates"
-msgstr "???????%(name)s????????????"
+msgstr ""
+"??????? %(name)s????????????"
 
 #, python-format
 msgid "Unable to delete pool %(name)s as it is associated with some templates"
-msgstr "???????%(name)s????????????"
+msgstr ""
+"????? %(name)s????????????"
 
 #, python-format
 msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
-msgstr "??'%(name)s'??????????????????????"
+msgstr ""
+"???%(name)s???????????????"
+"???????"
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
-msgstr "??????????????%(err)s?"
+msgstr ""
+"????????????????????????%(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "???%(name)s????"
+msgstr ""
+"??? %(name)s ???"
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
-msgstr "???%(pool)s??????%(name)s"
+msgstr ""
+"??? %(name)s ???? %(pool)s ????"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
-msgstr "???????%(volume)s??????%(pool)s ????"
+msgstr ""
+"??????? %(volume)s?????? %(pool)s"
+"???????"
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
-msgstr "?????%(volume)s????%(item)s"
+msgstr ""
+"?? %(item)s ?????? %(volume)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes because storage pool %(pool)s is not active"
-msgstr "?????????????%(pool)s????"
+msgstr ""
+"????????????? %(pool)s ???????"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
-msgstr "??????%(pool)s??????%(name)s????%(err)s"
+msgstr ""
+"?????????????? %(name)s?%(pool)s??????"
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
-msgstr "??????%(pool)s??????????%(err)s"
+msgstr ""
+"??????? %(pool)s ???????????%(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
-msgstr "???????%(name)s????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
-msgstr "???????%(name)s???????%(err)s"
+msgstr ""
+"??????? %(name)s ?????????%(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
-msgstr "????%(type)s??????????"
+msgstr ""
+"???? %(type)s ?????????"
 
 msgid "Storage volume name must be a string"
-msgstr "????????????"
+msgstr ""
+"???????????"
 
 msgid "Storage volume allocation must be an integer number"
-msgstr "???????????"
+msgstr ""
+"??????????????"
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
-"????????????????bochs, cloop, cow, dmg, qcow, qcow2, qed, "
-"raw, vmdk, vpc?"
+"???????????????bochs?cloop?cow?dmg?"
+"qcow?qcow2?qed?raw?vmdk ? vpc?"
 
 msgid "Storage volume requires a volume name"
-msgstr "???????"
+msgstr ""
+"?????????"
 
 #, python-format
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
-msgstr "?????????????%(err)s"
+msgstr ""
+"???????????????????????%(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
-msgstr "?????%(param)s????????"
+msgstr ""
+"?????? %(param)s ??"
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
-msgstr "????%(param)s?????"
+msgstr ""
+"????? %(param)s ???"
 
 msgid "Storage volume capacity must be an integer number."
-msgstr "????????????"
+msgstr ""
+"?????????????"
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
-msgstr "???URL???http://?https://?ftp://?ftps://"
+msgstr ""
+"??? URL ??? http://?https://?ftp:// ? ftps://?"
 
 #, python-format
 msgid "Unable to access file %(url)s. Please, check it."
-msgstr "??????%(url)s????????????"
+msgstr ""
+"?????? %(url)s????????"
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
-msgstr "??????'%(pool)s'?????'%(name)s'???????%(err)s"
+msgstr ""
+"????????????%(name)s???????%(pool)s???????"
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"????????????????"
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"???????????upload????"
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"?????????????????????????"
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"??? %(vol)s ??????????"
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"???????????????"
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"???????????????????%(err)s?"
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "??%(name)s???"
+msgstr ""
+"?? %(name)s ???"
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "??%(name)s????"
+msgstr ""
+"?? %(name)s ???"
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "??%(name)s???"
+msgstr ""
+"?? %(name)s ???"
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
-msgstr "???%(network)s?????%(subnet)s??"
+msgstr ""
+"?????????? %(subnet)s ???%(network)s?"
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
-msgstr "??????????????????%(name)s"
+msgstr ""
+"????????????? %(name)s"
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "?????????%(name)s"
+msgstr ""
+"???????? %(name)s"
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
-msgstr "???%(network)s?????%(iface)s????"
+msgstr ""
+"?????????? %(iface)s ??????%(network)s"
 
 msgid "Interface should be bare NIC, bonding or bridge device."
-msgstr "???????????????bonding???????"
+msgstr ""
+"??????? NIC?????????"
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "??????%(name)s????%(err)s"
+msgstr ""
+"?????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "?????'%(name)s'????????IP?????"
+msgstr ""
+"??????%(name)s???? IP ??"
 
 #, python-format
 msgid "The interface %(iface)s already exists."
 msgstr ""
+"?? %(iface)s ????"
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"?????????? (/) ??? (\") ????"
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "???????????NAT???"
+msgstr ""
+"????????????NAT ???"
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
-msgstr "?????????IP????????????????"
+msgstr ""
+"????????? IP ???????????????"
 
 msgid "Network interface must be a string"
-msgstr "????????????"
+msgstr ""
+"??????????"
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "??VLAN????1?4094?????"
+msgstr ""
+"?? VLAN ????????? 1 ? 4094 ?????"
 
 msgid "Specify name and type to create a Network"
-msgstr "???????????"
+msgstr ""
+"????????????"
 
 #, python-format
 msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
+"?????? %(name)s?????? %(vms)s "
+"?/???????????"
 
 #, python-format
 msgid ""
 "Unable to deactivate network %(name)s. There are some virtual machines "
 "%(vms)s and/or templates linked to this network."
 msgstr ""
+"???????? %(name)s?????? "
+"%(vms)s ?/???????????"
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
-msgstr "??????%(name)s??VLAN?trunk???"
+msgstr ""
+"???? %(name)s ??? VLAN ??????"
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "???????? %(iface)s?%(err)s?"
+msgstr ""
+"?????? %(iface)s?%(err)s?"
 
 #, python-format
 msgid ""
 "Failed to activate interface %(iface)s. Please check the physical link "
 "status."
-msgstr "????%(iface)s???????????????"
+msgstr ""
+"?????? %(iface)s????????"
+"???"
 
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
-msgstr "????%(name)s??????%(err)s"
+msgstr ""
+"?????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "????%(name)s???"
+msgstr ""
+"???? %(name)s ???"
 
 msgid "Debug report tool not found in system"
-msgstr "???????????"
+msgstr ""
+"????????????"
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
-msgstr "????????%(name)s????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s?"
 
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
-msgstr "????????%(name)s?????"
+msgstr ""
+"????????? %(name)s ???????"
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
-msgstr "????????%(name)s????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 msgid "You should give a name for the debug report file."
-msgstr "????????%(name)s????%(err)s"
+msgstr ""
+"???????????????"
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
-"????????????????????????????('_')?????('-')"
-"??????"
+"?????????????????????????????_??"
+"??????-???"
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
-msgstr "???\"'%(name)s\"???????????????????"
+msgstr ""
+"???????%(name)s?????????????"
+"??????"
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "?????%(server)s??Kimchi??"
+msgstr ""
+"Kimchi ???????? %(server)s"
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "????'%(name)s'???"
+msgstr ""
+"Distro?%(name)s????"
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "????????%(name)s"
+msgstr ""
+"?? %(name)s ???????"
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
-msgstr "??????????????"
+msgstr ""
+"???????????????????"
 
 msgid "Unable to reboot host machine as there are running virtual machines"
-msgstr "??????????????"
+msgstr ""
+"?????????????????????"
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "????????'%(name)s'"
+msgstr ""
+"????????%(name)s?"
 
 msgid "Conflicting flag filters specified."
-msgstr "flag filters???"
+msgstr ""
+"????????????"
 
 msgid "No packages marked for update"
-msgstr "??????????"
+msgstr ""
+"????????????"
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "???%(name)s????????"
+msgstr ""
+"??? %(name)s ??????????"
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
-msgstr "???????????????????%(err)s"
+msgstr ""
+"????????????????????????%(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "??????????????"
+msgstr ""
+"??????????????????"
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "?????????%(item)s"
+msgstr ""
+"?????????? %(item)s"
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "???URI %(uri)s"
+msgstr ""
+"?? URI %(uri)s"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "??'%(cmd)s'??%(seconds)s?????"
+msgstr ""
+"?????%(cmd)s???? %(seconds)s ????"
 
 msgid "Unable to choose a virtual machine name"
-msgstr "???????????"
+msgstr ""
+"?????????"
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"??????%(value)s?"
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"???????%(unit)s?"
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "??????????????'cdrom'?'disk'"
+msgstr ""
+"???????????????cdrom???disk?"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
-msgstr "??'%(value)s'?????????/????"
+msgstr ""
+"???%(value)s??????????/????"
 
 msgid "Only CDROM path can be update."
-msgstr "???CDROM?????"
+msgstr ""
+"???? CDROM ???"
 
 #, python-format
 msgid ""
 "The storage device %(dev_name)s does not exist in the virtual machine "
 "%(vm_name)s"
-msgstr "????%(dev_name)s????%(vm_name)s????"
+msgstr ""
+"???? %(dev_name)s ???? "
+"%(vm_name)s ????"
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
-msgstr "????????????%(error)s"
+msgstr ""
+"???????????%(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
-msgstr "??????????%(error)s"
+msgstr ""
+"??????????%(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
-msgstr "??????????%(error)s"
+msgstr ""
+"??????????%(error)s"
 
 msgid "Do not support IDE device hot plug"
-msgstr "???IDE??????"
+msgstr ""
+"??? IDE ?????"
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
-msgstr "?????????????????????????/???"
+msgstr ""
+"???????????/?????????"
+"??"
 
 msgid "Specify path to update virtual machine disk"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
-msgstr "??????%(type)s???????%(limit)s"
+msgstr ""
+"???????? %(type)s ?? %(limit)s"
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
-msgstr "?????????/??????????????%(error)s"
+msgstr ""
+"???????/?????????%(error)s"
 
 msgid "Volume already in use by other virtual machine."
-msgstr "?????????????"
+msgstr ""
+"????????????"
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
-msgstr "???????????????????/???????"
+msgstr ""
+"??????????/????? "
+"?????"
 
 #, python-format
 msgid ""
 "Volume chosen with format %(format)s does not fit in the storage type "
 "%(type)s"
-msgstr "???%(format)s?????????%(type)s"
+msgstr ""
+"?????? %(format)s ?????????? "
+"%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
-msgstr "YUM????ID??????????????"
+msgstr ""
+"Yum ???????????????????"
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "????URL???http://? ftp:// ? file://"
+msgstr ""
+"??? URL ??? http://?ftp:// ? file:// URL?"
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
 "repository type."
-msgstr "??????????????????????"
+msgstr ""
+"????????????????????"
+"???"
 
 msgid "Distribution to DEB repository must be a string"
-msgstr "DEB???????????????"
+msgstr ""
+"DEB ?????????????"
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "DEB??????????????"
+msgstr ""
+"DEB ??????????????"
 
 msgid "Components to DEB repository must be a string"
-msgstr "DEB?????????????"
+msgstr ""
+"DEB ????????????"
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"??????????????"
 
 msgid "YUM Repository name must be string."
-msgstr "YUM?????????????"
+msgstr ""
+"Yum ????????????"
 
 msgid "GPG check must be a boolean value."
-msgstr "GPG??????????"
+msgstr ""
+"GPG ???????????"
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr "GPG????????ASCII?????.asc????URL"
+msgstr ""
+"GPG ??????? ASCII ????? URL?"
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "????????%(repo_id)s"
+msgstr ""
+"??????? %(repo_id)s?"
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "????%(repo_id)s????"
+msgstr ""
+"??? %(repo_id)s ????"
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"??????? URL?????????????"
+"?? Yum ????"
 
 msgid "Repository management tool was not recognized for your system."
-msgstr "??????????????"
+msgstr ""
+"????????????????"
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "????%(repo_id)s?????"
+msgstr ""
+"?????? %(repo_id)s?"
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "????%(repo_id)s?????"
+msgstr ""
+"?????? %(repo_id)s?"
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "????????%(repo_id)s"
+msgstr ""
+"??????? %(repo_id)s?"
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
-msgstr "????????????%(repo_file)s"
+msgstr ""
+"??????????? %(repo_file)s"
 
 msgid "Specify repository distribution in order to create a DEB repository."
-msgstr "???????????????DEB???"
+msgstr ""
+"??????????? DEB ????"
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "????????%(repo_id)s"
+msgstr ""
+"??????? %(repo_id)s?"
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "????????%(repo_id)s"
+msgstr ""
+"??????? %(repo_id)s?"
 
 msgid "YUM Repository ID already exists"
-msgstr "YUM??ID????"
+msgstr ""
+"Yum ????????"
 
 msgid "YUM Repository name must be a string"
-msgstr "YUM????????????"
+msgstr ""
+"Yum ???????????"
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "????????????'%(err)s'"
+msgstr ""
+"??????????????%(err)s?"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
-msgstr "???????????????'%(err)s'"
+msgstr ""
+"????????????????%(err)s?"
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "????????????'%(err)s'"
+msgstr ""
+"??????????????%(err)s?"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "????????????'%(err)s'"
+msgstr ""
+"??????????????%(err)s?"
 
 #, python-format
 msgid ""
 "Configuration items: '%(items)s' are not supported by repository manager"
-msgstr "???????????: %(items)s"
+msgstr ""
+"?????%(items)s???????????"
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"????????? http://?ftp:// ? file:// URL?"
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"???????????????"
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
-msgstr "???'%(vm)s'???????????"
+msgstr ""
+"???????%(vm)s??????????????"
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
-msgstr "??????'%(vm)s'????'%(name)s'????%(err)s"
+msgstr ""
+"??????????????%(name)s???%(vm)s???????"
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
-msgstr "??'%(name)s'??????'%(vm)s'??"
+msgstr ""
+"???%(name)s??????%(vm)s??????"
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
-msgstr "??????'%(vm)s'????'%(name)s'????%(err)s"
+msgstr ""
+"??????????????%(name)s???%(vm)s???????"
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
-msgstr "???????'%(vm)s'???????%(err)s"
+msgstr ""
+"????????%(vm)s???????????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
-msgstr "???????'%(vm)s'??'%(name)s'????%(err)s"
-
+msgstr ""
+"??????????????%(name)s???%(vm)s???????"
+"%(err)s"
+
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
-msgstr "???????'%(vm)s'????????%(err)s"
+msgstr ""
+"????????%(vm)s????????????"
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
-msgstr "???????'%(vm)s'???'%(name)s'????%(err)s"
+msgstr ""
+"???????%(vm)s???????%(name)s???????"
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
-"??????'%(vm)s'?????????????'%(format)s'????????"
-"?'qcow2'???"
+"????????%(vm)s??????????"
+"????%(format)s???????qcow2?????"
 
 msgid "The number of vCPUs is too large for this system."
-msgstr "vCPUs????????????"
+msgstr ""
+"vCPU ?????????"
 
 msgid "Invalid vCPU/topology combination."
-msgstr "???vCPU/topology???"
+msgstr ""
+"?? vCPU/?????"
 
 msgid "This host (or current configuration) does not allow CPU topology."
-msgstr "??????????????CPU???"
+msgstr ""
+"??????????????? CPU ???"
 
 msgid "ERROR CODE"
-msgstr "???"
+msgstr ""
+"????"
 
 msgid "REASON"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "STACK"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Go to Homepage"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Create a New Virtual Machine"
-msgstr "?????????"
+msgstr ""
+"??????"
 
 msgid "Virtual Machine Name"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
-msgstr "???????????????????????????????"
+msgstr ""
+"?????????????????????????????"
+"?????"
 
 msgid "Template"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Please create a template first."
-msgstr "????????"
+msgstr ""
+"???????"
 
 msgid "Create a Template"
-msgstr "??????"
+msgstr ""
+"????"
 
 msgid "Please choose a template."
-msgstr "??????"
+msgstr ""
+"????????"
 
 msgid "OS"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "OS Version"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "CPUS"
-msgstr "?????"
+msgstr ""
+"CPUS"
 
 msgid "Memory"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Create"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Creating..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Edit Guest"
-msgstr "?????"
+msgstr ""
+"????"
 
 msgid "General"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Storage"
-msgstr "??"
+msgstr ""
+"???"
 
 msgid "Interface"
-msgstr "????"
+msgstr ""
+"??"
 
 msgid "Permission"
-msgstr "??"
+msgstr ""
+"???"
 
 msgid "Host PCI Device"
-msgstr "??PCI??"
+msgstr ""
+"?? PCI ??"
 
 msgid "Snapshot"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Name"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "CPUs"
-msgstr "?????"
+msgstr ""
+"CPU ?"
 
 msgid "Memory (MB)"
-msgstr "??(MB)"
+msgstr ""
+"???MB?"
 
 msgid "Icon"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Device"
-msgstr "????"
+msgstr ""
+"??"
 
 msgid "Path"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Network"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Type"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "MAC Address"
 msgstr ""
+"MAC ??"
 
 msgid "Available system users and groups"
-msgstr "???????????"
+msgstr ""
+"????????"
 
 msgid "Selected system users and groups"
-msgstr "???????????"
+msgstr ""
+"????????"
 
 msgid "User"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "All"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "To Add"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Added"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "filter"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Product"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Vendor"
-msgstr "??"
+msgstr ""
+"???"
 
 msgid "Created"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Save"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Replace"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Detach"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Cancel"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "revert"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Add a Storage Device to VM"
-msgstr "????????????"
+msgstr ""
+"???????? VM"
 
 msgid "Device Type"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr "??????????????\"cdrom\"?\"disk\"? "
+msgstr ""
+"??????????cdrom???disk??"
 
 msgid "Storage Pool"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Storage pool which volume located in"
-msgstr "?????????"
+msgstr ""
+"???????????"
 
 msgid "Storage Volume"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Storage volume to be attached"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "File Path"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "????CDROM????ISO????"
+msgstr ""
+"CDROM ????? ISO ???"
 
 msgid "Attach"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Start"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Reset"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Pause"
 msgstr ""
+"??"
 
 msgid "Resume"
 msgstr ""
+"??"
 
 msgid "Power Off"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Actions"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Connect"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Clone"
-msgstr "????"
+msgstr ""
+"??"
 
 msgid "Edit"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Shut Down"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Delete"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "The username or password you entered is incorrect. Please try again."
-msgstr "???????????????"
+msgstr ""
+"???????????????????"
 
 msgid "This field is required."
-msgstr "??????"
+msgstr ""
+"?????????"
 
 msgid "Log in"
-msgstr "??"
+msgstr ""
+"???"
 
 msgid "Logging in..."
-msgstr "???..."
+msgstr ""
+"????..."
 
 msgid "Host"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Guests"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Templates"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Failed to get application configuration"
-msgstr "????????"
+msgstr ""
+"??????????"
 
 msgid "This is not a valid Linux path"
-msgstr "????????Linux??"
+msgstr ""
+"?????? Linux ??"
 
 msgid "This is not a valid URL."
-msgstr "????????URL"
+msgstr ""
+"?????? URL?"
 
 msgid "No such data available."
-msgstr "???????"
+msgstr ""
+"?????????"
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"??????????????????????????????HTTP?????%1"
+"???????????????????????"
+"????????????HTTP ???? %1?"
 
 msgid "Unable to read file."
 msgstr ""
+"???????"
 
 msgid "Error while uploading file."
 msgstr ""
+"????????"
 
 msgid "Delete Confirmation"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "OK"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Confirm"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Warning"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Cloning..."
 msgstr ""
+"????..."
 
 msgid "Loading..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"????????????"
 
 msgid "Retry"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Detailed message:"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "No ISO found"
-msgstr "????ISO??"
+msgstr ""
+"??? ISO"
 
 msgid "This is not a valid ISO file."
-msgstr "????????ISO??"
+msgstr ""
+"?????? ISO ???"
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "?????????????"
+msgstr ""
+"???????????????"
 
 msgid "This will permanently delete the template. Would you like to continue?"
-msgstr "??????????????"
+msgstr ""
+"???????????????"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
-msgstr "???????????????"
+msgstr ""
+"??????????????????????"
 
 msgid "Max:"
-msgstr "???"
+msgstr ""
+"????"
 
 msgid "Utilization"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Available"
-msgstr "????"
+msgstr ""
+"??"
 
 msgid "Read Rate"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Write Rate"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Received"
-msgstr "??"
+msgstr ""
+"???"
 
 msgid "Sent"
-msgstr "??"
+msgstr ""
+"???"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
-msgstr "?????????????????????????/???"
+msgstr ""
+"????????????????????????"
+"??/??????"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
-msgstr "?????????????????????"
+msgstr ""
+"?????????????????"
+"????"
 
 msgid "Repositories"
-msgstr "????"
+msgstr ""
+"???"
 
 msgid "ID"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Base URL"
-msgstr "??URL"
+msgstr ""
+"?? URL"
 
 msgid "Is Mirror"
-msgstr "?????"
+msgstr ""
+"???"
 
 msgid "URL Args"
-msgstr "URL??"
+msgstr ""
+"URL ??"
 
 msgid "Enabled"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "GPG Check"
-msgstr "GPG??"
+msgstr ""
+"GPG ??"
 
 msgid "GPG Key"
-msgstr "GPG?"
+msgstr ""
+"GPG ??"
 
 msgid "Add"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Remove"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Enable"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Disable"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Software Updates"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Package Name"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Version"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Architecture"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Repository"
-msgstr "????"
+msgstr ""
+"???"
 
 msgid "Update All"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Updating..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Failed to retrieve packages update information."
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 msgid "Failed to update package(s)."
-msgstr "???????"
+msgstr ""
+"????????"
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
-msgstr "???????????????????????"
+msgstr ""
+"??????????????????"
+"????"
 
 msgid "Debug Reports"
-msgstr "??????"
+msgstr ""
+"????"
 
 msgid "Generated Time"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Generate"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Generating..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Rename"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Download"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
-msgstr "??????????????????('_')????('-')"
+msgstr ""
+"????????????????????_???/?"
+"?????-???"
 
 msgid "Pending..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Report name is the same as the original one."
-msgstr "????????????"
+msgstr ""
+"??????????????"
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
-msgstr "???????????????????????????"
+msgstr ""
+"????????????????"
+"??????????"
 
 msgid "Power off Confirmation"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
-msgstr "????????????????????????????????"
+msgstr ""
+"??????????????????"
+"????????????????????"
 
 msgid "Reset Confirmation"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
-msgstr "??????????????????????????????????"
+msgstr ""
+"????????????????????????"
+"?????"
 
 msgid "Shut Down Confirmation"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
-msgstr "???????????????????????????"
+msgstr ""
+"???????????????????????"
 
 msgid "Virtual Machine delete Confirmation"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
-msgstr "????????????????????????????"
+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 ""
-"????????SCSI??iSCSI???????????????????????"
-"??????????????????????????????????"
+"??????? SCSI ? iSCSI ???????????"
+"?????????????????????????"
+"????????????????????"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
-msgstr "CDROM?????????????????????"
+msgstr ""
+"? CDROM ????????????????????"
+"??????"
 
 msgid "Attaching..."
-msgstr "????"
+msgstr ""
+"????..."
 
 msgid "Replacing..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Successfully attached!"
-msgstr "????"
+msgstr ""
+"??????"
 
 msgid "Successfully replaced!"
-msgstr "????"
+msgstr ""
+"??????"
 
 msgid "Successfully detached!"
-msgstr "????"
+msgstr ""
+"??????"
 
 msgid ""
 "This disk will be detached permanently and you can re-attach it. Continue to "
 "detach it?"
-msgstr "??????????????????????????????"
+msgstr ""
+"??????????????????????"
+"???????"
 
 msgid "interface:"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "address:"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "link_type:"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "block:"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "drive_type:"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "model:"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Affected devices:"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "The VLAN id must be between 1 and 4094."
-msgstr "VLAN ??????1?4094??"
+msgstr ""
+"VLAN ?????? 1 ? 4094 ???"
 
 msgid "unavailable"
-msgstr "????"
+msgstr ""
+"???"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
 "depend on this network."
-msgstr "??????????????????????"
+msgstr ""
+"??????????????????"
+"??????"
 
 msgid "Create a network"
-msgstr "??????"
+msgstr ""
+"????"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"??????????????????????????????????????"
-"???"
+"?????????????????"
+"????????????????"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"???????????????? VLAN ?????????????"
+"????????????"
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
-msgstr "???????????????"
+msgstr ""
+"????????????????"
 
 msgid "This storage pool is empty."
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
 "to continue? "
-msgstr "????????????????????????????"
+msgstr ""
+"???????????????????????????"
+"????"
 
 msgid "SCSI Fibre Channel"
-msgstr "SCSI????"
+msgstr ""
+"SCSI ????"
 
 msgid "No SCSI adapters found."
-msgstr "????SCSI???"
+msgstr ""
+"????? SCSI ????"
 
 msgid "Loading iSCSI targets..."
-msgstr "??iSCSI??..."
+msgstr ""
+"???? iSCSI ??..."
 
 msgid "No iSCSI found. Please input one."
-msgstr "????iSCSI,??????"
+msgstr ""
+"??? iSCSI?????? iSCSI?"
 
 msgid "Failed to load iSCSI targets."
-msgstr "??iSCSI?????"
+msgstr ""
+"???? iSCSI ???"
 
 msgid "The storage pool name can not be blank."
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "The storage pool path can not be blank."
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "NFS server mount path can not be blank."
-msgstr "NFS????????????"
+msgstr ""
+"NFS ?????????????"
 
 msgid "Invalid NFS mount path."
-msgstr "???NFS?????"
+msgstr ""
+"NFS ???????"
 
 msgid "No logical device selected."
-msgstr "?????????"
+msgstr ""
+"??????????"
 
 msgid "The iSCSI target can not be blank."
-msgstr "iSCSI???????"
+msgstr ""
+"? iscsi ????????"
 
 msgid "Server name can not be blank."
-msgstr "????????"
+msgstr ""
+"???????????"
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
-msgstr "??????????????IP???????????"
+msgstr ""
+"???????????? IP?????????"
 
 msgid "Looking for available partitions ..."
-msgstr "??????? ..."
+msgstr ""
+"????????..."
 
 msgid "No available partitions found."
-msgstr "???????"
+msgstr ""
+"??????????"
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
-msgstr "?????????????????????????????????"
+msgstr ""
+"???????????????????????"
+"???????????????"
 
 msgid "Unable to retrieve partitions information."
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "In progress..."
-msgstr "????..."
+msgstr ""
+"?????..."
 
 msgid "Failed!"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
-msgstr "CDROM???????????/??????????"
+msgstr ""
+"CDROM ??????????/?????????????"
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "?????????"
+msgstr ""
+"???????????"
 
 msgid "Peers"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Searching"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "No peers found."
-msgstr "????????"
+msgstr ""
+"??????"
 
 msgid "Help"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "About"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Log out"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Version:"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Session timeout, please re-login."
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "User Name"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Password"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Generate a New Debug Report"
-msgstr "??????????"
+msgstr ""
+"???????"
 
 msgid "Report Name"
-msgstr "?????"
+msgstr ""
+"????"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"??????????????????????????????????????"
-"?????????? ('_') ?????'-'?"
+"????????????????????????"
+"???????????????????????_??"
+"??????-???"
 
 msgid "Rename a Debug Report"
-msgstr "?????????"
+msgstr ""
+"???????"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
-msgstr "????????????????????????????(\"-\")?"
+msgstr ""
+"???????????????????????"
+"?????-???"
 
 msgid "Submit"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Add a Repository"
-msgstr "????????"
+msgstr ""
+"?????"
 
 msgid "Identifier"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 msgid "Textual name for the repository."
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "?????"
+msgstr ""
+"????"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "?????URL???????http?ftp??file"
+msgstr ""
+"???? URL???????? http?ftp ? file?"
 
 msgid "Repository is a mirror"
-msgstr "?????????"
+msgstr ""
+"????????"
 
 msgid "Distribution"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Distribution of the DEB repository."
-msgstr "DEB??????"
+msgstr ""
+"DEB ????????"
 
 msgid "Components"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "List of components in DEB repository."
-msgstr "DEB????????"
+msgstr ""
+"DEB ??????????"
 
 msgid "Edit Repository"
-msgstr "??????"
+msgstr ""
+"?????"
 
 msgid "Mirror List URL"
-msgstr "????URL"
+msgstr ""
+"???? URL"
 
 msgid "Yes"
-msgstr "?"
+msgstr ""
+"?"
 
 msgid "No"
-msgstr "?"
+msgstr ""
+"?"
 
 msgid "Add a Volume to Storage Pool"
-msgstr "?????????"
+msgstr ""
+"????????"
 
 msgid "Fetch from remote URL"
-msgstr "???URL??"
+msgstr ""
+"??? URL ???"
 
 msgid "Enter the remote URL here."
-msgstr "???????URL?"
+msgstr ""
+"??????? URL?"
 
 msgid "Upload a file"
-msgstr "??????"
+msgstr ""
+"????"
 
 msgid "Choose the file you want to upload."
-msgstr "??????????"
+msgstr ""
+"?????????"
 
 msgid "Define a New Storage Pool"
-msgstr "?????????"
+msgstr ""
+"??????"
 
 msgid "Storage Pool Name"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
-msgstr "?????????????????????"
+msgstr ""
+"????????????????????"
 
 msgid "Storage Pool Type"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Storage Path"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
-msgstr "??????.?????????????"
+msgstr ""
+"??????????????????????"
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
-msgstr "????????KIMCHI???????????????"
+msgstr ""
+"Kimchi ???????????????"
+"???????"
 
 msgid "NFS Server IP"
-msgstr "NFS???IP"
+msgstr ""
+"NFS ??? IP"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
-msgstr "NFS???IP???????????????????????"
+msgstr ""
+"NFS ??? IP ????????????????????????"
 
 msgid "NFS Path"
-msgstr "NFS ??"
+msgstr ""
+"NFS ??"
 
 msgid "The NFS exported path on NFS server."
-msgstr "NFS???????NFS??"
+msgstr ""
+"NFS ???? NFS ??????"
 
 msgid "Device path"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "iSCSI Server"
-msgstr "iSCSI???"
+msgstr ""
+"iSCSI ???"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "iSCSI???IP?????? ?????"
+msgstr ""
+"iSCSI ??? IP ???????????"
 
 msgid "Server"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Port"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Target"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "iSCSI??"
+msgstr ""
+"iSCSI ????? iSCSI ??"
 
 msgid "Add iSCSI Authentication"
-msgstr "??ISCSI??"
+msgstr ""
+"?? iSCSI ??"
 
 msgid "iSCSI Authentication"
-msgstr "iSCSI??"
+msgstr ""
+"iSCSI ??"
 
 msgid "SCSI Adapter"
-msgstr "SCSI???"
+msgstr ""
+"SCSI ???"
 
 msgid "Please, wait..."
-msgstr "???..."
+msgstr ""
+"???..."
 
 msgid "Add Template"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Where is the source media for this template? "
-msgstr "??????????"
+msgstr ""
+"???????????"
 
 msgid "Local ISO Image"
-msgstr "??ISO??"
+msgstr ""
+"?? ISO ??"
 
 msgid "Local Image File"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Remote ISO Image"
-msgstr "??ISO??"
+msgstr ""
+"?? ISO ??"
 
 msgid "Search ISOs"
-msgstr "??ISO"
+msgstr ""
+"?? ISO"
 
 msgid "The following ISOs are available:"
-msgstr "??ISO????"
+msgstr ""
+"?? ISO ???"
 
 msgid "OS: "
-msgstr "????? "
+msgstr ""
+"?????"
 
 msgid "Version: "
-msgstr "??? "
+msgstr ""
+"???"
 
 msgid "Size: "
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Search more ISOs"
-msgstr "????ISO"
+msgstr ""
+"???? ISO"
 
 msgid "Create Templates from Selected ISO"
-msgstr "????ISO?????"
+msgstr ""
+"??? ISO ????"
 
 msgid "I want to use a specific ISO file"
-msgstr "????ISO??"
+msgstr ""
+"?????? ISO ??"
 
 msgid "Loading default remote ISOs ..."
-msgstr "???????ISOs ..."
+msgstr ""
+"???????? ISO..."
 
 msgid "Arch: "
-msgstr "?????"
+msgstr ""
+"???"
 
 msgid "I want to use a custom URL"
-msgstr "?????????URL"
+msgstr ""
+"?????? URL"
 
 msgid "Edit Template"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Processor"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "CDROM"
-msgstr "??"
+msgstr ""
+"CDROM"
 
 msgid "Image File"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Graphics"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Disk(GB)"
-msgstr "??(GB)"
+msgstr ""
+"?? (GB)"
 
 msgid "Disk Format"
 msgstr ""
+"????"
 
 msgid "CPU Number"
-msgstr "CPU??"
+msgstr ""
+"CPU ?"
 
 msgid "Manually set CPU topology"
-msgstr "????CPU??"
+msgstr ""
+"???? CPU ??"
 
 msgid "Cores"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Threads"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "CPU"
-msgstr "???"
+msgstr ""
+"CPU"
 
 msgid "Disk I/O"
-msgstr "??I/O"
+msgstr ""
+"?? I/O"
 
 msgid "Network I/O"
-msgstr "??I/O"
+msgstr ""
+"?? I/O"
 
 msgid "Livetile"
-msgstr "??"
+msgstr ""
+"Livetile"
 
 msgid "No guests found."
-msgstr "???????"
+msgstr ""
+"??????"
 
 msgid "Shut down"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Restart"
-msgstr "??"
+msgstr ""
+"????"
 
 msgid "Basic Information"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "OS Distro"
-msgstr "???????"
+msgstr ""
+"???? Distro"
 
 msgid "OS Code Name"
-msgstr "??????"
+msgstr ""
+"????????"
 
 msgid "CPU(s)"
-msgstr "CPU(s)"
+msgstr ""
+"CPU"
 
 msgid "System Statistics"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Update Progress"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Network Name"
-msgstr "????"
+msgstr ""
+"???"
 
 msgid "State"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Network Type"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Address Space"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Name should not contain '/' and '\"'."
-msgstr "????????/??'\"'?"
+msgstr ""
+"???????/???\"??"
 
 msgid "Isolated: no external network connection"
-msgstr "??: ????????"
+msgstr ""
+"???????????"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT: ?????????????"
+msgstr ""
+"NAT?????????????"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "???????????????????"
+msgstr ""
+"????????????????"
 
 msgid "(No interfaces found)"
-msgstr "(????????)"
+msgstr ""
+"?????????"
 
 msgid "Destination"
-msgstr "????"
+msgstr ""
+"???"
 
 msgid "Enable VLAN"
-msgstr "??VLAN"
+msgstr ""
+"?? VLAN"
 
 msgid "VLAN ID"
-msgstr "VLAN?"
+msgstr ""
+"VLAN ??"
 
 msgid "Stop"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "%Used"
 msgstr ""
+"?????"
 
 msgid "Location"
-msgstr "??"
+msgstr ""
+"?? "
 
 msgid "Capacity"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Allocated"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "active"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "inactive"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Deactivate"
-msgstr "??"
+msgstr ""
+"????"
 
 msgid "Activate"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Add Volume"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Extend"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Undefine"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Format"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Allocation"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "No templates found."
-msgstr "??????"
+msgstr ""
+"????????"
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 342142a..33755d7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,5 +1,6 @@
 # English translations for kimchi package.
 # Copyright (C) 2013 ORGANIZATION
+# Adam Litke <agl at us.ibm.com>, 2013.
 #
 msgid ""
 msgstr ""
@@ -9,133 +10,165 @@ msgstr ""
 "PO-Revision-Date: 2013-07-11 17:32-0400\n"
 "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
 "Language-Team: English\n"
-"Language: zh_TW\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;"
 
 #, python-format
 msgid "Unknown parameter %(value)s"
 msgstr ""
+"???? %(value)s"
 
 #, python-format
 msgid "Delete is not allowed for %(resource)s"
-msgstr "????? %(resource)s ????"
+msgstr ""
+"????? %(resource)s ??????"
 
 #, python-format
 msgid "%(resource)s does not implement update method"
-msgstr "%(resource)s ???????"
+msgstr ""
+"%(resource)s ???????"
 
 #, python-format
 msgid "Create is not allowed for %(resource)s"
-msgstr "????? %(resource)s ????"
+msgstr ""
+"????? %(resource)s ??????"
 
 msgid "Unable to parse JSON request"
-msgstr "???? JSON ??"
+msgstr ""
+"???? JSON ??"
 
 msgid "This API only supports JSON"
-msgstr "? API ??? JSON"
+msgstr ""
+"? API ??? JSON"
 
 #, python-format
 msgid "Parameters does not match requirement in schema: %(err)s"
 msgstr ""
+"????????????%(err)s"
 
 msgid "You don't have permission to perform this operation."
 msgstr ""
+"??????????"
 
 msgid "Datastore is not initiated in the model object."
-msgstr "???????????????"
+msgstr ""
+"???????????????"
 
 #, python-format
 msgid "Unable to start task due error: %(err)s"
-msgstr "??????????????%(err)s"
+msgstr ""
+"??????????????%(err)s"
 
 #, python-format
 msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
 msgstr ""
+"???? '%(task)s' ??????? %(seconds)s ??"
 
 #, python-format
 msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
-msgstr "??? '%(username)s' ??????[????%(code)s]"
+msgstr ""
+"????? '%(username)s' ??????[????%(code)s]"
 
 msgid "You are not authorized to access Kimchi"
-msgstr "???????? Kimchi"
+msgstr ""
+"???????? Kimchi"
 
 #, python-format
 msgid "Specify %(item)s to login into Kimchi"
-msgstr "?? %(item)s ??? Kimchi"
+msgstr ""
+"?? %(item)s ??? Kimchi"
 
 #, python-format
 msgid "User %(user_id)s not found with given LDAP settings."
 msgstr ""
+"??????? LDAP ?????? %(user_id)s?"
 
 #, python-format
 msgid "Invalid LDAP configuration: %(item)s : %(value)s"
 msgstr ""
+"LDAP ?????%(item)s?%(value)s"
 
 msgid "Unknown \"_cap\" specified"
 msgstr ""
+"??? \"_cap\" ??"
 
 msgid "\"_passthrough\" should be \"true\" or \"false\""
 msgstr ""
+"\"_passthrough\" ??? \"true\" ? \"false\""
 
 msgid "\"_passthrough_affected_by\" should be a device name string"
 msgstr ""
+"\"_passthrough_affected_by\" ?????????"
 
 #, python-format
 msgid "Error while getting block devices. Details: %(err)s"
-msgstr "?????????????????%(err)s"
+msgstr ""
+"?????????????????%(err)s"
 
 #, python-format
 msgid "Error while getting block device information for %(device)s."
-msgstr "?? %(device)s ?????????????"
+msgstr ""
+"?? %(device)s ?????????????"
 
 #, python-format
 msgid "Unable to find distro file: %(filename)s"
-msgstr "??? distro ???%(filename)s"
+msgstr ""
+"??? distro ??%(filename)s"
 
 #, python-format
 msgid ""
 "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
-msgstr "???? distro ???%(filename)s?????? JSON ???"
+msgstr ""
+"???? distro ??%(filename)s???????? JSON ??"
 
 #, python-format
 msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
-msgstr "???? iSCSI ???? %(portal)s??????%(err)s"
+msgstr ""
+"???? iSCSI ???? %(portal)s??????%(err)s"
 
 #, python-format
 msgid "Unable to login to iSCSI host %(host)s target %(target)s"
-msgstr "???? iSCSI ?? %(host)s ?? %(target)s"
+msgstr ""
+"???? iSCSI ?? %(host)s ?? %(target)s"
 
 #, python-format
 msgid "Unable to find ISO file %(filename)s"
 msgstr ""
+"??? ISO ? %(filename)s"
 
 #, python-format
 msgid "The ISO file %(filename)s is not bootable"
-msgstr "ISO ?? %(filename)s ????"
+msgstr ""
+"ISO ? %(filename)s ????"
 
 #, python-format
 msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
-msgstr "ISO ?? %(filename)s ????? El Torito ????"
+msgstr ""
+"ISO ? %(filename)s ????? El Torito ????"
 
 #, python-format
 msgid "Invalid El Torito validation entry in ISO %(filename)s"
-msgstr "ISO %(filename)s ????? El Torito ????"
+msgstr ""
+"ISO %(filename)s ????? El Torito ????"
 
 #, python-format
 msgid "Invalid El Torito boot indicator in ISO %(filename)s"
-msgstr "ISO %(filename)s ????? El Torito ?????"
+msgstr ""
+"ISO %(filename)s ????? El Torito ?????"
 
 #, python-format
 msgid "Unexpected volume type for primary volume in ISO %(filename)s"
-msgstr "ISO %(filename)s ???????????????"
+msgstr ""
+"ISO %(filename)s ???????????????"
 
 #, python-format
 msgid "Bad format while reading volume descriptor in ISO %(filename)s"
-msgstr "?? ISO %(filename)s ???????????????"
+msgstr ""
+"?? ISO %(filename)s ???????????????"
 
 #, python-format
 msgid ""
@@ -145,208 +178,265 @@ msgid ""
 "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
 "'path_to_iso'.Details: %(err)s"
 msgstr ""
-"Hypervisor ????? ISO %(filename)s ????????????? /var/lib/"
-"libvirt ??????????'%(user)s' ???????????????????"
-"? '%(user)s' ??? ISO ?????????????????? 'chmod -R o+x "
-"'path_to_iso'??????%(err)s"
+"Hypervisor ????? ISO %(filename)s?"
+"???????? /var/lib/libvirt ??????????"
+"'%(user)s' ???????????????????"
+"? '%(user)s' ??? ISO ????????????????"
+"'chmod -R o+x 'path_to_iso'??????%(err)s"
 
 msgid "An error occurred when probing image OS information."
 msgstr ""
+"????? OS ????????"
 
 msgid "No OS information found in given image."
 msgstr ""
+"???????????? OS ???"
 
 #, python-format
 msgid "Unable to read image file %(filename)s"
 msgstr ""
+"??????? %(filename)s"
 
 #, python-format
 msgid ""
 "Image file must be an existing file on system. %(filename)s is not a valid "
 "input."
 msgstr ""
+"???????????????%(filename)s ?????"
+"???"
 
 #, python-format
 msgid "Virtual machine %(name)s already exists"
-msgstr "???? %(name)s ???"
+msgstr ""
+"???? %(name)s ????"
 
 #, python-format
 msgid "Virtual machine %(name)s does not exist"
-msgstr "???? %(name)s ???"
+msgstr ""
+"???? %(name)s ???"
 
 #, python-format
 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 ""
+"?????????? %(name)s??? %(new_name)s ??"
+"???????????????????"
 
 #, python-format
 msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
-msgstr "??????????? %(name)s ???"
+msgstr ""
+"??????????? %(name)s ???"
 
 msgid "Remote ISO image is not supported by this server."
-msgstr "????????? ISO ????"
+msgstr ""
+"????????? ISO ????"
 
 #, python-format
 msgid "Screenshot is not supported on virtual machine %(name)s"
 msgstr ""
+"????????? %(name)s ?????"
 
 #, python-format
 msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to connect to powered off virtual machine %(name)s."
 msgstr ""
+"??????????????? %(name)s?"
 
 msgid "Virtual machine name must be a string without slashes (/)"
 msgstr ""
+"????????????? (/) ???"
 
 #, python-format
 msgid "Invalid template URI %(value)s specified for virtual machine"
 msgstr ""
+"?????????? URI %(value)s ??"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for virtual machine"
 msgstr ""
+"??????????? URI %(value)s ??"
 
 msgid "Supported virtual machine graphics are Spice or VNC"
 msgstr ""
+"??????????? Spice ? VNC"
 
 msgid "Graphics address to listen on must be IPv4 or IPv6"
-msgstr "???????????? IPv4 ? IPv6"
+msgstr ""
+"???????????? IPv4 ? IPv6"
 
 msgid "Specify a template to create a virtual machine from"
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 #, python-format
 msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s ?????????%(err)s"
 
 #, python-format
 msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
-msgstr "?????????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 msgid "User name list must be an array"
 msgstr ""
+"????????????"
 
 msgid "User name must be a string"
-msgstr "?????????"
+msgstr ""
+"??????????"
 
 msgid "Group name list must be an array"
 msgstr ""
+"???????????"
 
 msgid "Group name must be a string"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 #, python-format
 msgid "User(s) '%(users)s' do not exist"
-msgstr "??? '%(users)s' ????"
+msgstr ""
+"??? '%(users)s' ???"
 
 #, python-format
 msgid "Group(s) '%(groups)s' do not exist"
-msgstr "??? '%(groups)s' ????"
+msgstr ""
+"?? '%(groups)s' ???"
 
 #, python-format
 msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s ??? meta ????????%(err)s"
 
 msgid "The guest console password must be a string."
 msgstr ""
+"?????????????"
 
 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 ""
+"????????? '%(name)s'????????????"
 
 #, python-format
 msgid "Insufficient disk space to clone virtual machine '%(name)s'"
 msgstr ""
+"??????????????? '%(name)s'"
 
 #, python-format
 msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"???? VM '%(name)s'??????%(err)s"
 
 #, python-format
 msgid "Invalid operation for non-persistent virtual machine %(name)s"
 msgstr ""
+"?????????? %(name)s ?????"
 
 #, python-format
 msgid "Cannot suspend VM '%(name)s' because it is not running."
 msgstr ""
+"???? VM '%(name)s'???? VM ?????????"
 
 #, python-format
 msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"???? VM '%(name)s'??????%(err)s"
 
 #, python-format
 msgid "Cannot resume VM '%(name)s' because it is not paused."
 msgstr ""
+"???? VM '%(name)s'???? VM ????????"
 
 #, python-format
 msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
 msgstr ""
+"???? VM '%(name)s'??????%(err)s"
 
 msgid "Memory assigned is higher then the maximum allowed in the host."
 msgstr ""
+"?????????????????????"
 
 #, python-format
 msgid ""
 "VM '%(name)s' does not support live memory update. Update the memory with "
 "the machine offline to enable this feature."
 msgstr ""
+"VM '%(name)s' ??????????????????????"
+"?????????????"
 
 msgid "Only increase memory is allowed in active VMs"
 msgstr ""
+"???? VM ????????"
 
 msgid ""
 "For live memory update, new memory value must be equal old memory value plus "
 "multiples of 1024 Mib"
 msgstr ""
+"???????????????????????????"
+"1024 Mib ???"
 
 msgid "There are not enough free slots of 1024 Mib in the guest."
 msgstr ""
+"?????? 1024 Mib ?????"
 
 msgid ""
 "Host's libvirt version does not support memory devices. Libvirt must be >= "
 "1.2.14"
 msgstr ""
+"??? libvirt ???????????Libvirt ??????"
+"1.2.14"
 
 #, python-format
 msgid "Error attaching memory device. Details: %(error)s"
 msgstr ""
+"??????????????????%(error)s"
 
 #, python-format
 msgid ""
 "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
 msgstr ""
+"VM %(vmid)s ???????????? %(dev_name)s?"
 
 #, python-format
 msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
 msgstr ""
+"???????? %(dev_name)s ????? VM?"
 
 msgid ""
 "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
@@ -355,1822 +445,2397 @@ msgid ""
 "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
 "iommu=1."
 msgstr ""
+"??? IOMMU ????? PCI ???? IOMMU ????"
+"??????? BIOS ??? Intel VT-d ? AMD IOMMU?????"
+"???? IOMMU ?????????? Intel CPU??? intel_iommu=on "
+"??? /boot/grub2/grub.conf ????????? AMD CPU???? iommu=pt "
+"iommu=1?"
 
 msgid "\"name\" should be a device name string"
 msgstr ""
+"\"name\" ?????????"
 
 #, python-format
 msgid ""
 "The device %(name)s is probably in use by the host. Unable to attach it to "
 "the guest."
 msgstr ""
+"?????????? %(name)s??????????"
+"???"
 
 #, python-format
 msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
-msgstr "?? %(iface)s ???????? %(name)s ?"
+msgstr ""
+"?? %(iface)s ?????? %(name)s ?"
 
 #, python-format
 msgid ""
 "Network %(network)s specified for virtual machine %(name)s does not exist"
-msgstr "????? %(name)s ????? %(network)s ???"
+msgstr ""
+"????? %(name)s ????? %(network)s ???"
 
 msgid "Supported virtual machine interfaces type is only network"
-msgstr "?????????????????"
+msgstr ""
+"?????????????????"
 
 msgid "Network name for virtual machine interface must be a string"
-msgstr "????????????????"
+msgstr ""
+"????????????????"
 
 msgid "Invalid network model card specified for virtual machine interface"
-msgstr "?????????????????"
+msgstr ""
+"?????????????????"
 
 msgid "Specify type and network to add a new virtual machine interface"
-msgstr "????????????????"
+msgstr ""
+"????????????????"
 
 msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
 msgstr ""
+"?MAC ????????????FF:FF:FF:FF:FF:FF"
 
 #, python-format
 msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
 msgstr ""
+"?MAC ???%(mac)s ????????? %(name)s ?"
 
 msgid "Invalid MAC Address"
 msgstr ""
+"MAC ????"
 
 msgid "Cannot change MAC address of a running virtual machine"
 msgstr ""
+"???????????? MAC ??"
 
 #, python-format
 msgid "Template %(name)s already exists"
-msgstr "?? %(name)s ???"
+msgstr ""
+"?? %(name)s ????"
 
 #, python-format
 msgid ""
 "Network '%(network)s' specified for template %(template)s does not exist"
-msgstr "??? %(template)s ????? '%(network)s' ???"
+msgstr ""
+"??? %(template)s ????? '%(network)s' ???"
 
 #, python-format
 msgid ""
 "Storage pool %(pool)s specified for template %(template)s does not exist"
-msgstr "??? %(template)s ?????? '%(pool)s' ???"
+msgstr ""
+"??? %(template)s ?????? %(pool)s ???"
 
 #, python-format
 msgid "Storage pool %(pool)s specified for template %(template)s is not active"
-msgstr "??? %(template)s ?????? '%(pool)s' ????????"
+msgstr ""
+"??? %(template)s ?????? %(pool)s ????????"
 
 #, python-format
 msgid "Invalid parameter '%(param)s' specified for CDROM."
-msgstr "? CDROM ????? '%(param)s' ???"
+msgstr ""
+"? CDROM ????? '%(param)s' ???"
 
 #, python-format
 msgid "Network %(network)s specified for template %(template)s is not active"
-msgstr "??? %(template)s ????? %(network)s ????????"
+msgstr ""
+"??? %(template)s ????? %(network)s ????????"
 
 msgid "Template name must be a string"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Template icon must be a path to the image"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 msgid "Template distribution must be a string"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "Template distribution version must be a string"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "The number of CPUs must be an integer greater than 0"
-msgstr "CPU ???????"
+msgstr ""
+"CPU ??????? 0 ???"
 
 msgid "Amount of memory (MB) must be an integer greater than 512"
-msgstr "????? (MB) ????? 512 ???"
+msgstr ""
+"????? (MB) ????? 512 ???"
 
 msgid "Template CDROM must be a local or remote ISO file"
-msgstr "?? CDROM ???????? ISO ??"
+msgstr ""
+"?? CDROM ???????? ISO ??"
 
 #, python-format
 msgid "Invalid storage pool URI %(value)s specified for template"
-msgstr "????????? URI %(value)s ??"
+msgstr ""
+"????????? URI %(value)s ??"
 
 msgid "Specify an ISO image as CDROM or a base image to create a template"
-msgstr "?? ISO ????? CDROM ?????"
+msgstr ""
+"?? ISO ????? CDROM ????????????"
 
 msgid "All networks for the template must be specified in a list."
-msgstr "?????????????????"
+msgstr ""
+"?????????????????"
 
 msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
 msgstr ""
+"????? iSCSI ? SCSI ???????????"
 
 #, python-format
 msgid "The volume %(volume)s is not in storage pool %(pool)s"
 msgstr ""
+"?? %(volume)s ????? %(pool)s ?"
 
 #, python-format
 msgid "Unable to create template due error: %(err)s"
-msgstr "??????????????%(err)s"
+msgstr ""
+"??????????????%(err)s"
 
 #, python-format
 msgid "Unable to delete template due error: %(err)s"
-msgstr "??????????????%(err)s"
+msgstr ""
+"??????????????%(err)s"
 
 msgid "Disk size must be an integer greater than 1GB."
 msgstr ""
+"????????? 1 GB ????"
 
 msgid "Template base image must be a valid local image file"
-msgstr "?? CDROM ???????? ISO ??"
+msgstr ""
+"??????????????????"
 
 #, python-format
 msgid "Cannot identify base image %(path)s format"
 msgstr ""
+"????????? %(path)s ??"
 
 msgid ""
 "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
 "threads."
 msgstr ""
+"?? CPU ????VCPU ??? Socket????"
+"???????"
 
 msgid ""
 "When specifying CPU topology, each element must be an integer greater than "
 "zero."
 msgstr ""
+"?? CPU ??????????????? 0 ?"
+"???"
 
 msgid ""
 "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
 "qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"????????????????bochs?cloop?cow?dmg?qcow?"
+"qcow2?qed?raw?vmdk ? vpc?"
 
 #, python-format
 msgid "Storage pool %(name)s already exists"
-msgstr "??? %(name)s ???"
+msgstr ""
+"??? %(name)s ????"
 
 #, python-format
 msgid "Storage pool %(name)s does not exist"
-msgstr "??? %(name)s ???"
+msgstr ""
+"??? %(name)s ???"
 
 #, python-format
 msgid "Specify %(item)s in order to create the storage pool %(name)s"
-msgstr "?? %(item)s ?????? %(name)s"
+msgstr ""
+"?? %(item)s ?????? %(name)s"
 
 #, python-format
 msgid "Unable to delete active storage pool %(name)s"
-msgstr "??????????? %(name)s"
+msgstr ""
+"??????????? %(name)s"
 
 #, python-format
 msgid "Unable to list storage pools. Details: %(err)s"
-msgstr "?????????????%(err)s"
+msgstr ""
+"?????????????%(err)s"
 
 #, python-format
 msgid "Unable to create storage pool %(name)s. Details: %(err)s"
-msgstr "??????? %(name)s??????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to get number of storage volumes in storage pool %(name)s. Details: "
 "%(err)s"
-msgstr "??????? %(name)s ??????????????%(err)s"
+msgstr ""
+"??????? %(name)s ??????????????"
+"%(err)s"
 
 #, python-format
 msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
-msgstr "??????? %(name)s??????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
-msgstr "????????? %(name)s??????%(err)s"
+msgstr ""
+"????????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
-msgstr "??????? %(name)s??????%(err)s"
+msgstr ""
+"??????? %(name)s??????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create NFS Pool as export path %(path)s may block during mount"
-msgstr "???? NFS ???????????????? %(path)s ?????"
+msgstr ""
+"???? NFS ???????????????? %(path)s ?????"
 
 #, python-format
 msgid "Unable to create NFS Pool as export path %(path)s mount failed"
-msgstr "???? NFS ?????????? %(path)s ????"
+msgstr ""
+"???? NFS ?????????? %(path)s ????"
 
 #, python-format
 msgid "Unsupported storage pool type: %(type)s"
-msgstr "???????????%(type)s"
+msgstr ""
+"???????????%(type)s"
 
 #, python-format
 msgid "Error while retrieving storage pool XML to %(pool)s"
 msgstr ""
+"????? XML ? %(pool)s ?????"
 
 msgid "Storage pool name must be a string without slashes (/)"
 msgstr ""
+"???????????? (/) ???"
 
 msgid ""
 "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
 "iso"
 msgstr ""
+"?????????? dir?netfs????iscsi?isci ? kimchi-"
+"iso"
 
 msgid "Storage pool path must be a string"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "Storage pool host must be a IP or hostname"
-msgstr "???????? IP ?????"
+msgstr ""
+"???????? IP ?????"
 
 msgid "Storage pool device must be the absolute path to the block device"
 msgstr ""
+"?????????????????"
 
 msgid "Storage pool devices parameter must be a list"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 msgid "Target IQN of an iSCSI pool must be a string"
-msgstr "iSCSI ?????? IQN ?????"
+msgstr ""
+"iSCSI ?????? IQN ?????"
 
 msgid "Port of a remote storage server must be an integer between 1 and 65535"
-msgstr "??????????????? 1 ? 65535 ?????"
+msgstr ""
+"??????????????? 1 ? 65535 ?????"
 
 msgid "iSCSI target username must be a string"
 msgstr ""
+"iSCSI ????????????"
 
 msgid "iSCSI target password must be a string"
 msgstr ""
+"iSCSI ?????????"
 
 msgid "Specify name and type to create a storage pool"
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 #, python-format
 msgid ""
 "%(disk)s is not a valid disk/partition. Could not add it to the pool "
 "%(pool)s."
-msgstr "%(disk)s ???????/??????????????%(pool)s?"
+msgstr ""
+"%(disk)s ???????/??????????????"
+"%(pool)s?"
 
 #, python-format
 msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
 msgstr ""
+"????????? %(pool)s??????%(err)s"
 
 msgid "The parameter disks only can be updated for logical storage pool."
-msgstr "????????????????????"
+msgstr ""
+"????????????????????"
 
 msgid "The SCSI host adapter name must be a string."
-msgstr "SCSI ?????????????"
+msgstr ""
+"SCSI ?????????????"
 
 msgid "The storage pool kimchi_isos is reserved for internal use"
-msgstr "??? kimchi_isos ???????"
+msgstr ""
+"??? kimchi_isos ???????"
 
 #, python-format
 msgid ""
 "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
-msgstr "???? NFS ??? %(name)s?NFS ??? %(server)s?????"
+msgstr ""
+"???? NFS ??? %(name)s?NFS ??? %(server)s"
+"?????"
 
 #, python-format
 msgid ""
 "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
 "unreachable."
-msgstr "?????? NFS ??? %(name)s?NFS ??? %(server)s?????"
+msgstr ""
+"?????? NFS ??? %(name)s?NFS ??? %(server)s"
+"?????"
 
 #, python-format
 msgid ""
 "Unable to deactivate pool %(name)s as it is associated with some templates"
-msgstr "????????? %(name)s????????????"
+msgstr ""
+"????????? %(name)s????????????"
 
 #, python-format
 msgid "Unable to delete pool %(name)s as it is associated with some templates"
-msgstr "??????? %(name)s????????????"
+msgstr ""
+"??????? %(name)s????????????"
 
 #, python-format
 msgid ""
 "A volume group named '%(name)s' already exists. Please, choose another name "
 "to create the logical pool."
-msgstr "?? '%(name)s' ??????????????????????????"
+msgstr ""
+"?? '%(name)s' ?????????????????"
+"?????????"
 
 #, python-format
 msgid "Unable to update database with deep scan information due error: %(err)s"
-msgstr "????????????????????????%(err)s"
+msgstr ""
+"????????????????????????%(err)s"
 
 #, python-format
 msgid "Storage volume %(name)s already exists"
-msgstr "???? %(name)s ???"
+msgstr ""
+"???? %(name)s ????"
 
 #, python-format
 msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
-msgstr "???? %(name)s ??????? %(pool)s ?"
+msgstr ""
+"???? %(name)s ????? %(pool)s ?"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
 "not active"
 msgstr ""
+"???????? %(volume)s?????? %(pool)s"
+"????????"
 
 #, python-format
 msgid "Specify %(item)s in order to create storage volume %(volume)s"
-msgstr "?? %(item)s ??????? %(volume)s"
+msgstr ""
+"?? %(item)s ??????? %(volume)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes because storage pool %(pool)s is not active"
-msgstr "?????????????? %(pool)s ????????"
+msgstr ""
+"?????????????? %(pool)s ????????"
 
 #, python-format
 msgid ""
 "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
 "%(err)s"
-msgstr "?????? %(pool)s ??????? %(name)s??????%(err)s"
+msgstr ""
+"?????? %(pool)s ??????? %(name)s??????"
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
-msgstr "??????? %(pool)s ????????????%(err)s"
+msgstr ""
+"??????? %(pool)s ????????????%(err)s"
 
 #, python-format
 msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s ?????????%(err)s"
+msgstr ""
+"???????? %(name)s ?????????%(err)s"
 
 #, python-format
 msgid "Storage type %(type)s does not support volume create and delete"
-msgstr "????? %(type)s ??????????"
+msgstr ""
+"????? %(type)s ??????????"
 
 msgid "Storage volume name must be a string"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid "Storage volume allocation must be an integer number"
-msgstr "???????????"
+msgstr ""
+"???????????"
 
 msgid ""
 "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
 "qcow, qcow2, qed, raw, vmdk, vpc."
 msgstr ""
+"?????????????????bochs?cloop?cow?dmg?"
+"qcow?qcow2?qed?raw?vmdk ? vpc?"
 
 msgid "Storage volume requires a volume name"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 #, python-format
 msgid ""
 "Unable to update database with storage volume information due error: %(err)s"
-msgstr "????????????????????????%(err)s"
+msgstr ""
+"????????????????????????%(err)s"
 
 #, python-format
 msgid "Only one of parameter %(param)s can be specified"
 msgstr ""
+"?????????? %(param)s"
 
 #, python-format
 msgid "Create volume from %(param)s is not supported"
 msgstr ""
+"???? %(param)s ????"
 
 msgid "Storage volume capacity must be an integer number."
 msgstr ""
+"????????????"
 
 msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
 msgstr ""
+"???? URL ??? http://?https://?ftp:// ? ftps://?"
 
 #, python-format
 msgid "Unable to access file %(url)s. Please, check it."
 msgstr ""
+"?????? %(url)s????????"
 
 #, python-format
 msgid ""
 "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
 "%(err)s"
 msgstr ""
+"??????? '%(pool)s' ?????? '%(name)s'??????"
+"%(err)s"
 
 msgid "Specify chunk data and its size to upload a file."
 msgstr ""
+"????????????????"
 
 msgid "In order to upload a storage volume, specify the 'upload' parameter."
 msgstr ""
+"???????????? 'upload' ???"
 
 msgid ""
 "Unable to upload chunk data as it does not match with requested chunk size."
 msgstr ""
+"????????????????????????????"
 
 #, python-format
 msgid "The storage volume %(vol)s is not under an upload process."
 msgstr ""
+"???? %(vol)s ????????"
 
 msgid "The upload chunk data will exceed the storage volume size."
 msgstr ""
+"????????????????"
 
 #, python-format
 msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
 msgstr ""
+"????????????????????%(err)s?"
 
 #, python-format
 msgid "Interface %(name)s does not exist"
-msgstr "?? %(name)s ???"
+msgstr ""
+"?? %(name)s ???"
 
 #, python-format
 msgid "Network %(name)s already exists"
-msgstr "?? %(name)s ???"
+msgstr ""
+"?? %(name)s ????"
 
 #, python-format
 msgid "Network %(name)s does not exist"
-msgstr "?? %(name)s ???"
+msgstr ""
+"?? %(name)s ???"
 
 #, python-format
 msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
-msgstr "??? %(network)s ?????? %(subnet)s ???"
+msgstr ""
+"??? %(network)s ?????? %(subnet)s ???"
 
 #, python-format
 msgid "Specify a network interface to create bridged network %(name)s"
-msgstr "?????????????? %(name)s"
+msgstr ""
+"?????????????? %(name)s"
 
 #, python-format
 msgid "Unable to delete active network %(name)s"
-msgstr "?????????? %(name)s"
+msgstr ""
+"?????????? %(name)s"
 
 #, python-format
 msgid "Interface %(iface)s specified for network %(network)s is already in use"
-msgstr "??? %(network)s ????? %(iface)s ?????"
+msgstr ""
+"??? %(network)s ????? %(iface)s ??????"
 
 msgid "Interface should be bare NIC, bonding or bridge device."
-msgstr "??????? NIC????????????"
+msgstr ""
+"??????? NIC????????????"
 
 #, python-format
 msgid "Unable to create network %(name)s. Details: %(err)s"
-msgstr "?????? %(name)s??????%(err)s"
+msgstr ""
+"?????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Unable to find a free IP address for network '%(name)s'"
-msgstr "????? '%(name)s' ??? IP ??"
+msgstr ""
+"????? '%(name)s' ??? IP ??"
 
 #, python-format
 msgid "The interface %(iface)s already exists."
 msgstr ""
+"?? %(iface)s ?????"
 
 msgid "Network name must be a string without slashes (/) or quotes (\")"
 msgstr ""
+"??????????? (/) ??? (\") ???"
 
 msgid "Supported network types are isolated, NAT and bridge"
-msgstr "?????????????NAT ????"
+msgstr ""
+"?????????????NAT ????"
 
 msgid "Network subnet must be a string with IP address and prefix or netmask"
-msgstr "??????????? IP ?????????????"
+msgstr ""
+"??????????? IP ?????????????"
 
 msgid "Network interface must be a string"
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "Network VLAN ID must be an integer between 1 and 4094"
-msgstr "?? VLAN ID ????? 1 ? 4094 ?????"
+msgstr ""
+"?? VLAN ID ????? 1 ? 4094 ?????"
 
 msgid "Specify name and type to create a Network"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 #, python-format
 msgid ""
 "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
 "and/or templates linked to this network."
 msgstr ""
+"?????? %(name)s???????? %(vms)s "
+"?/???????????"
 
 #, python-format
 msgid ""
 "Unable to deactivate network %(name)s. There are some virtual machines "
 "%(vms)s and/or templates linked to this network."
 msgstr ""
+"???????? %(name)s????????"
+"%(vms)s ?/???????????"
 
 #, python-format
 msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
-msgstr "????? %(name)s ??? VLAN ??????"
+msgstr ""
+"????? %(name)s ??? VLAN ??????"
 
 #, python-format
 msgid "Failed to activate interface %(iface)s: %(err)s."
-msgstr "?????? %(iface)s?%(err)s?"
+msgstr ""
+"?????? %(iface)s?%(err)s?"
 
 #, python-format
 msgid ""
 "Failed to activate interface %(iface)s. Please check the physical link "
 "status."
-msgstr "?????? %(iface)s???????????"
+msgstr ""
+"?????? %(iface)s????????"
+"???"
 
 #, python-format
 msgid "Failed to start network %(name)s. Details: %(err)s"
 msgstr ""
+"?????? %(name)s??????%(err)s"
 
 #, python-format
 msgid "Debug report %(name)s does not exist"
-msgstr "???? %(name)s ???"
+msgstr ""
+"???? %(name)s ???"
 
 msgid "Debug report tool not found in system"
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 #, python-format
 msgid "Unable to create debug report %(name)s. Details: %(err)s."
-msgstr "???????? %(name)s??????%(err)s?"
+msgstr ""
+"???????? %(name)s??????%(err)s?"
 
 #, python-format
 msgid "Can not find any debug report with the given name %(name)s"
 msgstr ""
+"????????? %(name)s ???????"
 
 #, python-format
 msgid "Unable to generate debug report %(name)s. Details: %(err)s"
-msgstr "???????? %(name)s??????%(err)s"
+msgstr ""
+"???????? %(name)s??????%(err)s"
 
 msgid "You should give a name for the debug report file."
 msgstr ""
+"??????????"
 
 msgid ""
 "Debug report name must be a string. Only letters, digits, underscore ('_') "
 "and hyphen ('-') are allowed."
 msgstr ""
+"????????????????????????? ('_') "
+"???? ('-')?"
 
 #, python-format
 msgid ""
 "The debug report with specified name \"%(name)s\" already exists. Please use "
 "another one."
-msgstr "?? '%(name)s' ??????????????????????????"
+msgstr ""
+"?????? \"%(name)s\" ?????????????"
+"??????"
 
 #, python-format
 msgid "Storage server %(server)s was not used by Kimchi"
-msgstr "Kimchi ????????? %(server)s"
+msgstr ""
+"Kimchi ????????? %(server)s"
 
 #, python-format
 msgid "Distro '%(name)s' does not exist"
-msgstr "Distro '%(name)s' ???"
+msgstr ""
+"Distro '%(name)s' ???"
 
 #, python-format
 msgid "Partition %(name)s does not exist in the host"
-msgstr "??? %(name)s ???????"
+msgstr ""
+"??? %(name)s ?????"
 
 msgid "Unable to shutdown host machine as there are running virtual machines"
-msgstr "?????????????????????"
+msgstr ""
+"?????????????????????"
 
 msgid "Unable to reboot host machine as there are running virtual machines"
-msgstr "????????????????????????"
+msgstr ""
+"????????????????????????"
 
 #, python-format
 msgid "Node device '%(name)s' not found"
-msgstr "??????? '%(name)s'"
+msgstr ""
+"??????? '%(name)s'"
 
 msgid "Conflicting flag filters specified."
 msgstr ""
+"????????????"
 
 msgid "No packages marked for update"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 #, python-format
 msgid "Package %(name)s is not marked to be updated."
-msgstr "?? %(name)s ??????????"
+msgstr ""
+"?? %(name)s ??????????"
 
 #, python-format
 msgid "Error while getting packages marked to be updated. Details: %(err)s"
-msgstr "????????????????????????%(err)s"
+msgstr ""
+"????????????????????????%(err)s"
 
 msgid "There is no compatible package manager for this system."
-msgstr "???????????????"
+msgstr ""
+"???????????????"
 
 #, python-format
 msgid "Unable to find %(item)s in datastore"
-msgstr "?????????? %(item)s"
+msgstr ""
+"?????????? %(item)s"
 
 #, python-format
 msgid "Invalid URI %(uri)s"
-msgstr "URI %(uri)s ??"
+msgstr ""
+"??? URI %(uri)s"
 
 #, python-format
 msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
-msgstr "???? '%(cmd)s' %(seconds)s ?????"
+msgstr ""
+"???? '%(cmd)s' ??? %(seconds)s ?????"
 
 msgid "Unable to choose a virtual machine name"
 msgstr ""
+"??????????"
 
 #, python-format
 msgid "Invalid data value '%(value)s'"
 msgstr ""
+"?????? '%(value)s'"
 
 #, python-format
 msgid "Invalid data unit '%(unit)s'"
 msgstr ""
+"??????? '%(unit)s'"
 
 msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
-msgstr "???????????????'cdrom'"
+msgstr ""
+"??????????????'cdrom' ? 'disk'"
 
 #, python-format
 msgid "The path '%(value)s' is not a valid local/remote path for the device"
 msgstr ""
+"?? '%(value)s' ??????????/????"
 
 msgid "Only CDROM path can be update."
 msgstr ""
+"???? CDROM ???"
 
 #, python-format
 msgid ""
 "The storage device %(dev_name)s does not exist in the virtual machine "
 "%(vm_name)s"
 msgstr ""
+"???? %(dev_name)s ??????????"
+"%(vm_name)s"
 
 #, python-format
 msgid "Error while creating new storage device: %(error)s"
-msgstr "??????????????%(error)s"
+msgstr ""
+"??????????????%(error)s"
 
 #, python-format
 msgid "Error while updating storage device: %(error)s"
-msgstr "????????????%(error)s"
+msgstr ""
+"????????????%(error)s"
 
 #, python-format
 msgid "Error while removing storage device: %(error)s"
-msgstr "????????????%(error)s"
+msgstr ""
+"????????????%(error)s"
 
 msgid "Do not support IDE device hot plug"
 msgstr ""
+"???? IDE ?????"
 
 msgid ""
 "Specify type and path or type and pool/volume to add a new virtual machine "
 "disk"
-msgstr "????????????????"
+msgstr ""
+"???????????????/??????????"
+"??"
 
 msgid "Specify path to update virtual machine disk"
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 #, python-format
 msgid "Controller type %(type)s limitation of %(limit)s devices reached"
 msgstr ""
+"???????? %(type)s ???%(limit)s ???"
 
 #, python-format
 msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
 msgstr ""
+"?????????/??????????%(error)s"
 
 msgid "Volume already in use by other virtual machine."
 msgstr ""
+"??????????????"
 
 msgid ""
 "Only one of path or pool/volume can be specified to add a new virtual "
 "machine disk"
-msgstr "????????????????"
+msgstr ""
+"????????????/??????"
+"??????"
 
 #, python-format
 msgid ""
 "Volume chosen with format %(format)s does not fit in the storage type "
 "%(type)s"
 msgstr ""
+"????? %(format)s ???????????"
+"%(type)s"
 
 msgid "YUM Repository ID must be one word only string."
-msgstr "YUM ??? ID ?????????????"
+msgstr ""
+"YUM ??? ID ?????????????"
 
 msgid "Repository URL must be an http://, ftp:// or file:// URL."
-msgstr "??? URL ??? http://?ftp:// ? file:// URL?"
+msgstr ""
+"??? URL ??? http://?ftp:// ? file:// URL?"
 
 msgid ""
 "Repository configuration is a dictionary with specific values according to "
 "repository type."
-msgstr "??????????????????????????"
+msgstr ""
+"??????????????"
+"????????????"
 
 msgid "Distribution to DEB repository must be a string"
-msgstr "DEB ?????????????"
+msgstr ""
+"DEB ?????????????"
 
 msgid "Components to DEB repository must be listed in a array"
-msgstr "DEB ????????????????"
+msgstr ""
+"DEB ????????????????"
 
 msgid "Components to DEB repository must be a string"
-msgstr "DEB ???????????"
+msgstr ""
+"DEB ???????????"
 
 msgid "Mirror list to repository must be a string"
 msgstr ""
+"?????????????"
 
 msgid "YUM Repository name must be string."
-msgstr "YUM ???????????"
+msgstr ""
+"YUM ???????????"
 
 msgid "GPG check must be a boolean value."
-msgstr "GPG ?????????"
+msgstr ""
+"GPG ?????????"
 
 msgid "GPG key must be a URL pointing to the ASCII-armored file."
-msgstr "GPG ??????? ASCII ????? URL?"
+msgstr ""
+"GPG ??????? ASCII ????? URL?"
 
 #, python-format
 msgid "Could not update repository %(repo_id)s."
-msgstr "??????? %(repo_id)s?"
+msgstr ""
+"??????? %(repo_id)s?"
 
 #, python-format
 msgid "Repository %(repo_id)s does not exist."
-msgstr "??? %(repo_id)s ????"
+msgstr ""
+"??? %(repo_id)s ????"
 
 msgid ""
 "Specify repository base URL,  mirror list or metalink in order to create or "
 "update a YUM repository."
 msgstr ""
+"??????? URL?????? meta ??????"
+"?? Yum ????"
 
 msgid "Repository management tool was not recognized for your system."
-msgstr "???????????????"
+msgstr ""
+"???????????????"
 
 #, python-format
 msgid "Repository %(repo_id)s is already enabled."
-msgstr "?????? %(repo_id)s?"
+msgstr ""
+"?????? %(repo_id)s?"
 
 #, python-format
 msgid "Repository %(repo_id)s is already disabled."
-msgstr "?????? %(repo_id)s?"
+msgstr ""
+"?????? %(repo_id)s?"
 
 #, python-format
 msgid "Could not remove repository %(repo_id)s."
-msgstr "??????? %(repo_id)s?"
+msgstr ""
+"??????? %(repo_id)s?"
 
 #, python-format
 msgid "Could not write repository configuration file %(repo_file)s"
-msgstr "?????????? %(repo_file)s"
+msgstr ""
+"?????????? %(repo_file)s"
 
 msgid "Specify repository distribution in order to create a DEB repository."
-msgstr "???????????? DEB ????"
+msgstr ""
+"???????????? DEB ????"
 
 #, python-format
 msgid "Could not enable repository %(repo_id)s."
-msgstr "??????? %(repo_id)s?"
+msgstr ""
+"??????? %(repo_id)s?"
 
 #, python-format
 msgid "Could not disable repository %(repo_id)s."
-msgstr "??????? %(repo_id)s?"
+msgstr ""
+"??????? %(repo_id)s?"
 
 msgid "YUM Repository ID already exists"
-msgstr "YUM ??? ID ???"
+msgstr ""
+"YUM ??? ID ???"
 
 msgid "YUM Repository name must be a string"
-msgstr "YUM ??????????"
+msgstr ""
+"YUM ??????????"
 
 #, python-format
 msgid "Unable to list repositories. Details: '%(err)s'"
-msgstr "?????????????'%(err)s'"
+msgstr ""
+"?????????????'%(err)s'"
 
 #, python-format
 msgid "Unable to retrieve repository information. Details: '%(err)s'"
-msgstr "???????????????'%(err)s'"
+msgstr ""
+"???????????????'%(err)s'"
 
 #, python-format
 msgid "Unable to add repository. Details: '%(err)s'"
-msgstr "?????????????'%(err)s'"
+msgstr ""
+"?????????????'%(err)s'"
 
 #, python-format
 msgid "Unable to remove repository. Details: '%(err)s'"
-msgstr "?????????????'%(err)s'"
+msgstr ""
+"?????????????'%(err)s'"
 
 #, python-format
 msgid ""
 "Configuration items: '%(items)s' are not supported by repository manager"
 msgstr ""
+"???????????????'%(items)s'"
 
 msgid "Repository metalink must be an http://, ftp:// or file:// URL."
 msgstr ""
+"??? meta ????? http://?ftp:// ? file:// URL?"
 
 msgid "Cannot specify mirrorlist and metalink at the same time."
 msgstr ""
+"??????????? meta ???"
 
 #, python-format
 msgid ""
 "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
 msgstr ""
+"????????? '%(vm)s'???????????? Snapshot?"
 
 #, python-format
 msgid ""
 "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"??????? '%(vm)s' ??? Snapshot '%(name)s'??????"
+"%(err)s"
 
 #, python-format
 msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
 msgstr ""
+"Snapshot '%(name)s' ?????? '%(vm)s' ??"
 
 #, python-format
 msgid ""
 "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"???????? '%(vm)s' ?? Snapshot '%(name)s'??????"
+"%(err)s"
 
 #, python-format
 msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
 msgstr ""
+"???????? '%(vm)s' ?? Snapshot??????%(err)s"
 
 #, python-format
 msgid ""
 "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"???????? '%(vm)s' ?? Snapshot '%(name)s'??????"
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
 "%(err)s"
 msgstr ""
+"???????? '%(vm)s' ??? Snapshot??????"
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
 "%(err)s"
 msgstr ""
+"??????? '%(vm)s' ??? Snapshot '%(name)s'??????"
+"%(err)s"
 
 #, python-format
 msgid ""
 "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
 "disk with format '%(format)s'; only 'qcow2' is supported."
 msgstr ""
+"???????? '%(vm)s' ? Snapshot??????????"
+"??? '%(format)s' ??????? 'qcow2'?"
 
 msgid "The number of vCPUs is too large for this system."
 msgstr ""
+"????? vCPU ?????"
 
 msgid "Invalid vCPU/topology combination."
 msgstr ""
+"vCPU/???????"
 
 msgid "This host (or current configuration) does not allow CPU topology."
 msgstr ""
+"??????????????? CPU ???"
 
 msgid "ERROR CODE"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "REASON"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "STACK"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Go to Homepage"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Create a New Virtual Machine"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Virtual Machine Name"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid ""
 "The name used to identify the virtual machine. If omitted, a name will be "
 "chosen based on the template used."
-msgstr "???????????????????????????????"
+msgstr ""
+"???????????????????"
+"????????????"
 
 msgid "Template"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Please create a template first."
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Create a Template"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Please choose a template."
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "OS"
-msgstr "OS"
+msgstr ""
+"OS"
 
 msgid "OS Version"
-msgstr "OS ??"
+msgstr ""
+"OS ??"
 
 msgid "CPUS"
-msgstr "CPUS"
+msgstr ""
+"CPUS"
 
 msgid "Memory"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Create"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Creating..."
 msgstr ""
+"????..."
 
 msgid "Edit Guest"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "General"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Storage"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Interface"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Permission"
-msgstr "??"
+msgstr ""
+"???"
 
 msgid "Host PCI Device"
 msgstr ""
+"?? PCI ??"
 
 msgid "Snapshot"
 msgstr ""
+"Snapshot"
 
 msgid "Name"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "CPUs"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Memory (MB)"
-msgstr "???"
+msgstr ""
+"??? (MB)"
 
 msgid "Icon"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Device"
-msgstr "????"
+msgstr ""
+"??"
 
 msgid "Path"
-msgstr "NFS ??"
+msgstr ""
+"??"
 
 msgid "Network"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Type"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "MAC Address"
 msgstr ""
+"MAC ??"
 
 msgid "Available system users and groups"
 msgstr ""
+"???????????"
 
 msgid "Selected system users and groups"
 msgstr ""
+"???????????"
 
 msgid "User"
 msgstr ""
+"???"
 
 msgid "All"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "To Add"
 msgstr ""
+"???"
 
 msgid "Added"
 msgstr ""
+"???"
 
 msgid "filter"
 msgstr ""
+"???"
 
 msgid "Product"
 msgstr ""
+"??"
 
 msgid "Vendor"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Created"
 msgstr ""
+"???"
 
 msgid "Save"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Replace"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Detach"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Cancel"
-msgstr "?? "
+msgstr ""
+"?? "
 
 msgid "revert"
 msgstr ""
+"??"
 
 msgid "Add a Storage Device to VM"
-msgstr "???????? VM"
+msgstr ""
+"???????? VM"
 
 msgid "Device Type"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
-msgstr "?????????? \"cdrom\"?"
+msgstr ""
+"????????? \"cdrom\" ? \"disk\"?"
 
 msgid "Storage Pool"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Storage pool which volume located in"
-msgstr "??????????"
+msgstr ""
+"????????"
 
 msgid "Storage Volume"
-msgstr "?????"
+msgstr ""
+"????"
 
 msgid "Storage volume to be attached"
-msgstr "???????????"
+msgstr ""
+"????????"
 
 msgid "File Path"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM ? ISO ??????????"
+msgstr ""
+"CDROM ? ISO ??????????"
 
 msgid "Attach"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Start"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Reset"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Pause"
 msgstr ""
+"??"
 
 msgid "Resume"
 msgstr ""
+"??"
 
 msgid "Power Off"
 msgstr ""
+"????"
 
 msgid "Actions"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Connect"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Clone"
 msgstr ""
+"??"
 
 msgid "Edit"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Shut Down"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Delete"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "The username or password you entered is incorrect. Please try again."
-msgstr "????????????????????"
+msgstr ""
+"????????????????????"
 
 msgid "This field is required."
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Log in"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Logging in..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Host"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Guests"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Templates"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Failed to get application configuration"
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "This is not a valid Linux path"
-msgstr "????? Linux ??"
+msgstr ""
+"????? Linux ??"
 
 msgid "This is not a valid URL."
-msgstr "????? URL?"
+msgstr ""
+"????? URL?"
 
 msgid "No such data available."
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid ""
 "Can not contact the host system. Verify the host system is up and that you "
 "have network connectivity to it. HTTP request response %1. "
 msgstr ""
-"????????????????????????????????????HTTP "
-"????? %1?"
+"?????????????????????????"
+"???????????HTTP ????? %1? "
 
 msgid "Unable to read file."
 msgstr ""
+"???????"
 
 msgid "Error while uploading file."
 msgstr ""
+"??????????"
 
 msgid "Delete Confirmation"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "OK"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Confirm"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Warning"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Cloning..."
 msgstr ""
+"????..."
 
 msgid "Loading..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "An error occurred while retrieving system information."
 msgstr ""
+"????????????"
 
 msgid "Retry"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Detailed message:"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "No ISO found"
 msgstr ""
+"??? ISO"
 
 msgid "This is not a valid ISO file."
-msgstr "????? ISO ???"
+msgstr ""
+"????? ISO ???"
 
 msgid "This may take a long time. Do you want to continue?"
-msgstr "??????????????"
+msgstr ""
+"????????????????"
 
 msgid "This will permanently delete the template. Would you like to continue?"
-msgstr "?????????????????"
+msgstr ""
+"???????????????"
 
 msgid "Unable to shut down system as there are some virtual machines running!"
-msgstr "??????????????????????"
+msgstr ""
+"??????????????????????"
 
 msgid "Max:"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Utilization"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Available"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Read Rate"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Write Rate"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Received"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Sent"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid ""
 "Shutting down or restarting host will cause unsaved work lost. Continue to "
 "shut down/restarting?"
-msgstr "??????????????????????????/??????"
+msgstr ""
+"????????????????????????"
+"??/??????"
 
 msgid ""
 "Repository will be removed permanently and can't be recovered. Do you want "
 "to continue?"
-msgstr "??????????????????????"
+msgstr ""
+"?????????????????"
+"?????"
 
 msgid "Repositories"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "ID"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Base URL"
-msgstr "?? URL"
+msgstr ""
+"?? URL"
 
 msgid "Is Mirror"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "URL Args"
-msgstr "URL ??"
+msgstr ""
+"URL ??"
 
 msgid "Enabled"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "GPG Check"
-msgstr "GPG ??"
+msgstr ""
+"GPG ??"
 
 msgid "GPG Key"
-msgstr "GPG ??"
+msgstr ""
+"GPG ??"
 
 msgid "Add"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Remove"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Enable"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Disable"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Software Updates"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Package Name"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Version"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Architecture"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Repository"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Update All"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Updating..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Failed to retrieve packages update information."
 msgstr ""
+"???????????"
 
 msgid "Failed to update package(s)."
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid ""
 "Debug report will be removed permanently and can't be recovered. Do you want "
 "to continue?"
-msgstr "???????????????????????"
+msgstr ""
+"??????????????????"
+"?????"
 
 msgid "Debug Reports"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Generated Time"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Generate"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Generating..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Rename"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Download"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid ""
 "Report name should contain only letters, digits, underscore ('_') and/or "
 "hyphen ('-')."
-msgstr "???????????????/???? ('-')?"
+msgstr ""
+"????????????????? ('_') ?/?"
+"??? ('-')?"
 
 msgid "Pending..."
-msgstr "????..."
+msgstr ""
+"???..."
 
 msgid "Report name is the same as the original one."
 msgstr ""
+"????????????"
 
 msgid ""
 "This will delete the virtual machine and its virtual disks. This operation "
 "cannot be undone. Would you like to continue?"
-msgstr "???????????????????????????????"
+msgstr ""
+"?????????????????????"
+"???????????"
 
 msgid "Power off Confirmation"
-msgstr "????"
+msgstr ""
+"??????"
 
 msgid ""
 "This action may produce undesirable results, for example unflushed disk "
 "cache in the guest. Would you like to continue?"
 msgstr ""
+"??????????????????????????"
+"?????????"
 
 msgid "Reset Confirmation"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid ""
 "There is a risk of data loss caused by reset without the guest OS shutdown. "
 "Would you like to continue?"
 msgstr ""
+"???????? OS ????????????????????"
+"??????"
 
 msgid "Shut Down Confirmation"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Note the guest OS may ignore this request. Would you like to continue?"
-msgstr "?????????????????"
+msgstr ""
+"?????? OS ???????????????"
 
 msgid "Virtual Machine delete Confirmation"
 msgstr ""
+"????????"
 
 msgid ""
 "This virtual machine is not persistent. Power Off will delete it. Continue?"
 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 ""
+"??????? SCSI ? iSCSI ????????????"
+"???????????????????????????"
+"????????????????"
 
 msgid ""
 "This CDROM will be detached permanently and you can re-attach it. Continue "
 "to detach it?"
 msgstr ""
-"???????? CDROM??????????????????? CDROM ??"
+"???????? CDROM????????????????"
+"??? CDROM ??"
 
 msgid "Attaching..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Replacing..."
-msgstr "????..."
+msgstr ""
+"????..."
 
 msgid "Successfully attached!"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Successfully replaced!"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Successfully detached!"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid ""
 "This disk will be detached permanently and you can re-attach it. Continue to "
 "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 ???"
+msgstr ""
+"VLAN ID ???? 1 ? 4094 ???"
 
 msgid "unavailable"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid ""
 "This action will interrupt network connectivity for any virtual machine that "
 "depend on this network."
-msgstr "????????????????????????????"
+msgstr ""
+"?????????????????????"
+"???????"
 
 msgid "Create a network"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid ""
 "This network is not persistent. Instead of stop, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"??????????????????????????????????????"
-"??"
+"??????????????????????"
+"?????????????"
 
 msgid ""
 "The bridged VLAN tag may not work well with NetworkManager enabled. You "
 "should consider disabling it."
 msgstr ""
+"?? NetworkManager ???? VLAN ???????????"
+"?????????"
 
 msgid ""
 "This will permanently delete the storage pool. Would you like to continue?"
-msgstr "??????????????????"
+msgstr ""
+"????????????????"
 
 msgid "This storage pool is empty."
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid ""
 "It will format your disk and you will loose any data in there, are you sure "
 "to continue? "
-msgstr "??????????????????????????????????"
+msgstr ""
+"?????????????????????????????"
+"?????"
 
 msgid "SCSI Fibre Channel"
-msgstr "SCSI ????"
+msgstr ""
+"SCSI ????"
 
 msgid "No SCSI adapters found."
-msgstr "??? SCSI ????"
+msgstr ""
+"??? SCSI ????"
 
 msgid "Loading iSCSI targets..."
 msgstr ""
+"???? iSCSI ??..."
 
 msgid "No iSCSI found. Please input one."
 msgstr ""
+"??? iSCSI???????"
 
 msgid "Failed to load iSCSI targets."
 msgstr ""
+"???? iSCSI ???"
 
 msgid "The storage pool name can not be blank."
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "The storage pool path can not be blank."
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "NFS server mount path can not be blank."
-msgstr "NFS ????????????"
+msgstr ""
+"NFS ????????????"
 
 msgid "Invalid NFS mount path."
-msgstr "NFS ???????"
+msgstr ""
+"NFS ???????"
 
 msgid "No logical device selected."
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "The iSCSI target can not be blank."
-msgstr "iSCSI ???????"
+msgstr ""
+"iSCSI ???????"
 
 msgid "Server name can not be blank."
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid "This is not a valid Server Name or IP. Please, modify it."
 msgstr ""
+"?????????????? IP???????"
 
 msgid "Looking for available partitions ..."
-msgstr "?????????? ..."
+msgstr ""
+"?????????? ..."
 
 msgid "No available partitions found."
-msgstr "??????????"
+msgstr ""
+"??????????"
 
 msgid ""
 "This storage pool is not persistent. Instead of deactivate, this action will "
 "permanently delete it. Would you like to continue?"
 msgstr ""
-"??????????????????????????????????????"
-"??"
+"???????????????????????????"
+"?????????????"
 
 msgid "Unable to retrieve partitions information."
-msgstr "???????????????'%(err)s'"
+msgstr ""
+"??????????"
 
 msgid "In progress..."
 msgstr ""
+"???..."
 
 msgid "Failed!"
 msgstr ""
+"???"
 
 msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
 msgstr ""
+"CDROM ??????????/????????????"
 
 msgid "Disk pool or volume cannot be blank."
-msgstr "??????????"
+msgstr ""
+"?????????????"
 
 msgid "Peers"
 msgstr ""
+"???"
 
 msgid "Searching"
 msgstr ""
+"????"
 
 msgid "No peers found."
 msgstr ""
+"???????"
 
 msgid "Help"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "About"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Log out"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Version:"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Session timeout, please re-login."
 msgstr ""
+"?????????????"
 
 msgid "User Name"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Password"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Generate a New Debug Report"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid "Report Name"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid ""
 "The name used to identify the report. If omitted, a name will be chosen "
 "based on current time. Name can contain: letters, digits, underscore (\"_\") "
 "and hyphen (\"-\")."
 msgstr ""
-"??????????????????????????????????????"
-"?????? (\"-\")?"
+"?????????????????"
+"??????????????????????????? (\"_\")"
+"???? (\"-\")?"
 
 msgid "Rename a Debug Report"
-msgstr "????????"
+msgstr ""
+"????????"
 
 msgid ""
 "The name used to identify the report. Name can contain: letters, digits and "
 "hyphen (\"-\")."
 msgstr ""
-"??????????????????????????????????????"
-"?????? (\"-\")?"
+"???????????????????????"
+"??? (\"-\")?"
 
 msgid "Submit"
 msgstr ""
+"??"
 
 msgid "Add a Repository"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Identifier"
-msgstr "ID"
+msgstr ""
+"ID"
 
 msgid "Single word, unique identifier for the repository."
-msgstr "????????? ID?"
+msgstr ""
+"????????? ID?"
 
 msgid "Textual name for the repository."
-msgstr "?????????"
+msgstr ""
+"?????????"
 
 msgid "URL"
-msgstr "URL"
+msgstr ""
+"URL"
 
 msgid "Required Field"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "URL to the repository. Supported protocols are http, ftp, and file."
-msgstr "???? URL??????????? http?ftp ? file?"
+msgstr ""
+"???? URL??????????? http?ftp ? file?"
 
 msgid "Repository is a mirror"
-msgstr "???????"
+msgstr ""
+"??????"
 
 msgid "Distribution"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Distribution of the DEB repository."
-msgstr "DEB ?????????"
+msgstr ""
+"DEB ?????????"
 
 msgid "Components"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "List of components in DEB repository."
-msgstr "DEB ??????????"
+msgstr ""
+"DEB ??????????"
 
 msgid "Edit Repository"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Mirror List URL"
-msgstr "???? URL"
+msgstr ""
+"???? URL"
 
 msgid "Yes"
-msgstr "?"
+msgstr ""
+"?"
 
 msgid "No"
-msgstr "?"
+msgstr ""
+"?"
 
 msgid "Add a Volume to Storage Pool"
 msgstr ""
+"?????????"
 
 msgid "Fetch from remote URL"
 msgstr ""
+"??? URL ??"
 
 msgid "Enter the remote URL here."
 msgstr ""
+"??????? URL?"
 
 msgid "Upload a file"
 msgstr ""
+"????"
 
 msgid "Choose the file you want to upload."
 msgstr ""
+"?????????"
 
 msgid "Define a New Storage Pool"
-msgstr "???????"
+msgstr ""
+"???????"
 
 msgid "Storage Pool Name"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid ""
 "The name used to identify the storage pools, and it should not be empty."
-msgstr "??????????????????"
+msgstr ""
+"??????????????????"
 
 msgid "Storage Pool Type"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid "Storage Path"
-msgstr "?????"
+msgstr ""
+"?????"
 
 msgid ""
 "The path of the Storage Pool. Each Storage Pool must have a unique path."
-msgstr "?????????????????????????"
+msgstr ""
+"?????????????????????????"
 
 msgid ""
 "Kimchi will try to create the directory when it does not already exist in "
 "your system."
-msgstr "Kimchi ????????????????????????"
+msgstr ""
+"Kimchi ?????????????????"
+"???????"
 
 msgid "NFS Server IP"
-msgstr "NFS ??? IP"
+msgstr ""
+"NFS ??? IP"
 
 msgid "NFS server IP or hostname. It can be input or chosen from history."
-msgstr "NFS ??? IP ???????????????????????"
+msgstr ""
+"NFS ??? IP ???????????????????????"
 
 msgid "NFS Path"
-msgstr "NFS ??"
+msgstr ""
+"NFS ??"
 
 msgid "The NFS exported path on NFS server."
-msgstr "NFS ???? NFS ??????"
+msgstr ""
+"NFS ???? NFS ??????"
 
 msgid "Device path"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "iSCSI Server"
-msgstr "iSCSI ???"
+msgstr ""
+"iSCSI ???"
 
 msgid "iSCSI server IP or hostname. It should not be empty."
-msgstr "iSCSI ??? IP ??????????????"
+msgstr ""
+"iSCSI ??? IP ??????????????"
 
 msgid "Server"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Port"
-msgstr "?"
+msgstr ""
+"?"
 
 msgid "Target"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "The iSCSI target on iSCSI server"
-msgstr "iSCSI ????? iSCSI ??"
+msgstr ""
+"iSCSI ????? iSCSI ??"
 
 msgid "Add iSCSI Authentication"
-msgstr "?? iSCSI ??"
+msgstr ""
+"?? iSCSI ??"
 
 msgid "iSCSI Authentication"
-msgstr "iSCSI ??"
+msgstr ""
+"iSCSI ??"
 
 msgid "SCSI Adapter"
-msgstr "SCSI ???"
+msgstr ""
+"SCSI ???"
 
 msgid "Please, wait..."
-msgstr "???..."
+msgstr ""
+"???..."
 
 msgid "Add Template"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Where is the source media for this template? "
-msgstr "?????????????"
+msgstr ""
+"?????????????"
 
 msgid "Local ISO Image"
-msgstr "?? ISO ???"
+msgstr ""
+"?? ISO ???"
 
 msgid "Local Image File"
 msgstr ""
+"?????"
 
 msgid "Remote ISO Image"
-msgstr "?? ISO ???"
+msgstr ""
+"?? ISO ???"
 
 msgid "Search ISOs"
-msgstr "?? ISO"
+msgstr ""
+"?? ISO"
 
 msgid "The following ISOs are available:"
-msgstr "?? ISO ???"
+msgstr ""
+"?? ISO ???"
 
 msgid "OS: "
-msgstr "OS?"
+msgstr ""
+"OS?"
 
 msgid "Version: "
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Size: "
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Search more ISOs"
-msgstr "???? ISO"
+msgstr ""
+"???? ISO"
 
 msgid "Create Templates from Selected ISO"
-msgstr "??? ISO ????"
+msgstr ""
+"??? ISO ????"
 
 msgid "I want to use a specific ISO file"
-msgstr "??????? ISO ??"
+msgstr ""
+"??????? ISO ??"
 
 msgid "Loading default remote ISOs ..."
-msgstr "???????? ISO ..."
+msgstr ""
+"???????? ISO ..."
 
 msgid "Arch: "
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "I want to use a custom URL"
-msgstr "?????? URL"
+msgstr ""
+"?????? URL"
 
 msgid "Edit Template"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Processor"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "CDROM"
-msgstr "CDROM"
+msgstr ""
+"CDROM"
 
 msgid "Image File"
 msgstr ""
+"???"
 
 msgid "Graphics"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "Disk(GB)"
 msgstr ""
+"?? (GB)"
 
 msgid "Disk Format"
 msgstr ""
+"????"
 
 msgid "CPU Number"
-msgstr "CPU ??"
+msgstr ""
+"CPU ??"
 
 msgid "Manually set CPU topology"
 msgstr ""
+"???? CPU ??"
 
 msgid "Cores"
 msgstr ""
+"??"
 
 msgid "Threads"
 msgstr ""
+"???"
 
 msgid "CPU"
-msgstr "CPU"
+msgstr ""
+"CPU"
 
 msgid "Disk I/O"
-msgstr "?? I/O"
+msgstr ""
+"?? I/O"
 
 msgid "Network I/O"
-msgstr "?? I/O"
+msgstr ""
+"?? I/O"
 
 msgid "Livetile"
-msgstr "Livetile"
+msgstr ""
+"Livetile"
 
 msgid "No guests found."
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Shut down"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Restart"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Basic Information"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "OS Distro"
-msgstr "OS Distro"
+msgstr ""
+"OS Distro"
 
 msgid "OS Code Name"
-msgstr "OS ?????"
+msgstr ""
+"OS ?????"
 
 msgid "CPU(s)"
 msgstr ""
+"CPU"
 
 msgid "System Statistics"
-msgstr "??????"
+msgstr ""
+"??????"
 
 msgid "Update Progress"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Network Name"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "State"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Network Type"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Address Space"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Name should not contain '/' and '\"'."
-msgstr "?????????????? '/'?"
+msgstr ""
+"?????? '/' ? '\"'?"
 
 msgid "Isolated: no external network connection"
-msgstr "????????????"
+msgstr ""
+"????????????"
 
 msgid "NAT: outbound physical network connection only"
-msgstr "NAT???????????"
+msgstr ""
+"NAT???????????"
 
 msgid "Bridged: Virtual machines are connected to physical network directly"
-msgstr "??????????????????"
+msgstr ""
+"??????????????????"
 
 msgid "(No interfaces found)"
 msgstr ""
+"???????"
 
 msgid "Destination"
-msgstr "????"
+msgstr ""
+"???"
 
 msgid "Enable VLAN"
-msgstr "?? VLAN?"
+msgstr ""
+"?? VLAN"
 
 msgid "VLAN ID"
-msgstr "VLAN ID?"
+msgstr ""
+"VLAN ID"
 
 msgid "Stop"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "%Used"
 msgstr ""
+"???????"
 
 msgid "Location"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Capacity"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Allocated"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "active"
-msgstr "???"
+msgstr ""
+"???"
 
 msgid "inactive"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Deactivate"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Activate"
-msgstr "??"
+msgstr ""
+"??"
 
 msgid "Add Volume"
 msgstr ""
+"????"
 
 msgid "Extend"
 msgstr ""
+"??"
 
 msgid "Undefine"
-msgstr "????"
+msgstr ""
+"????"
 
 msgid "Format"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "Allocation"
-msgstr "???"
+msgstr ""
+"??"
 
 msgid "No templates found."
-msgstr "??????"
+msgstr ""
+"??????"
+
+# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
+# T9N_SRC_ID 92
+# T9N_SH1P_STR1NG KV310AAP001 1
diff --git a/ui/pages/help/de_DE/guests.dita b/ui/pages/help/de_DE/guests.dita
index 1d64469..7ec80f3 100644
--- a/ui/pages/help/de_DE/guests.dita
+++ b/ui/pages/help/de_DE/guests.dita
@@ -9,22 +9,21 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="de-de">
 <title>G?ste</title>
-<shortdesc>Auf der Seite <wintitle>G?ste</wintitle> sind die definierten virtuellen
-Maschinen von KVM aufgelistet.</shortdesc>
+<shortdesc>Auf der Seite <wintitle>G?ste</wintitle> sind die definierten G?ste Ihres Servers aufgelistet. </shortdesc>
 <csbody>
 <p>F?r jeden Gast werden die folgenden Informationen angezeigt:<dl><dlentry>
 <dt>Name</dt>
-<dd>Name der virtuellen Maschine.</dd>
+<dd>Name des Gastes. </dd>
 </dlentry><dlentry>
 <dt>CPU</dt>
-<dd>Prozentsatz der Prozessorauslastung in der virtuellen Maschine.</dd>
-</dlentry><dlentry>
-<dt>Netz-E/A</dt>
-<dd>Netz-E/A-?bertragungsrate in KB pro Sekunde.</dd>
+<dd>Prozentsatz der Prozessorauslastung auf dem Gastsystem. </dd>
 </dlentry><dlentry>
 <dt>Platten-E/A</dt>
 <dd>Platten-E/A-?bertragungsrate in KB pro Sekunde.</dd>
 </dlentry><dlentry>
+<dt>Netz-E/A</dt>
+<dd>Netz-E/A-?bertragungsrate in KB pro Sekunde.</dd>
+</dlentry><dlentry>
 <dt>Live Tile</dt>
 <dd>Status der Konsole f?r das Gastbetriebssystem oder ein Symbol, das die
 <tm tmtype="tm" trademark="Linux">Linux</tm>-Verteilung darstellt, wenn
@@ -42,86 +41,79 @@ ist er ausgeschaltet. Wenn das Symbol gr?n ist, ist er eingeschaltet.</dd>
 <p>Die folgenden Aktionen k?nnen f?r jeden Gast ausgew?hlt werden:<ul>
 <li>W?hlen Sie <uicontrol>Verbinden</uicontrol> aus, um eine Verbindung zur fernen Konsole
 f?r das Gastbetriebssystem herzustellen.</li>
-<li>W?hlen Sie <uicontrol>Medien verwalten</uicontrol> aus, um den Pfad zu den
-Installationsmedien zu ?ndern.</li>
-<li>W?hlen Sie <uicontrol>Zur?cksetzen</uicontrol> aus, um den Gast zur?ckzusetzen.</li>
+<li>W?hlen Sie <uicontrol>Klonen</uicontrol> aus, um eine vorhandene Gastdefinition zur Erstellung eines Gastes zu kopieren. </li>
+<li>W?hlen Sie <uicontrol>Zur?cksetzen</uicontrol> aus, um den Gast zur?ckzusetzen. Sie k?nnen nur G?ste zur?cksetzen, die bereits gestartet
+wurden. </li>
 <li>W?hlen Sie <uicontrol>Bearbeiten</uicontrol> aus, um die Eigenschaften eines
 bestehenden Gastes zu bearbeiten. G?ste k?nnen nur bearbeitet werden, wenn sie gestoppt sind.</li>
+<li>W?hlen Sie <uicontrol>Starten</uicontrol> aus, um einen Gast zu starten. </li>
+<li>W?hlen Sie <uicontrol>Herunterfahren</uicontrol> aus, um einen Gast ordnungsgem?? zu beenden. </li>
+<li>W?hlen Sie <uicontrol>Ausschalten</uicontrol> aus, um eine sofortige Beendigung des Gastes zu erzwingen. </li>
 <li>W?hlen Sie <uicontrol>L?schen</uicontrol> aus, um den Gast zu l?schen.</li>
-</ul>Um einen Gast bzw. eine virtuelle Maschine zu erstellen, klicken Sie auf das <uicontrol>Plus (+)</uicontrol>-Symbol oben rechts auf der Seite.</p>
+</ul>Um einen Gast zu erstellen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> auf der Seite. </p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="de-de">
-<title>Virtuelle Maschine erstellen</title>
-<shortdesc>Erstellen Sie eine virtuelle Maschine mithilfe einer bestehenden Vorlage.</shortdesc>
+<title>Gast erstellen</title>
+<shortdesc>Erstellen Sie einen Gast mithilfe einer bestehenden Vorlage. </shortdesc>
 <csbody>
 <p> <ol>
-<li>Geben Sie den Namen ein, mit dem die virtuelle Maschine gekennzeichnet wird.</li>
-<li rev="rev1">W?hlen Sie eine Vorlage aus. <ul>
+<li>Geben Sie den Namen ein, mit dem der Gast gekennzeichnet wird. </li>
+<li>W?hlen Sie eine Vorlage aus. <ul>
 <li>Wenn Vorlagen vorhanden sind, w?hlen Sie eine aus den angezeigten Vorlagen aus.</li>
 <li>Wenn keine Vorlagen vorhanden sind, klicken Sie auf <uicontrol>Vorlage erstellen</uicontrol>, um eine Vorlage zu erstellen.</li>
-</ul></li>
+</ul>Sie k?nnen Informationen zu einer Vorlage anzeigen, wenn Sie den Mauszeiger ?ber das entsprechende Element bewegen. </li>
 <li>Klicken Sie auf <uicontrol>Erstellen</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="de-de">
 <title>Gast bearbeiten</title>
-<shortdesc>Bearbeiten Sie die Eigenschaften einer bestehenden virtuellen Maschine. Einige Eigenschaften k?nnen nur bearbeitet werden, solange der Gast gestoppt ist. Andere Eigenschaften treten beim n?chsten Booten in Kraft. </shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
+<shortdesc>Bearbeiten Sie die Eigenschaften eines vorhandenen Gastes. Einige Eigenschaften k?nnen nur bearbeitet werden, solange der Gast gestoppt ist. Andere Eigenschaften treten beim n?chsten Booten in Kraft. </shortdesc>
 <csbody>
-<p>F?r jeden Gast werden die folgenden Informationen auf der Registerkarte <wintitle>Allgemein</wintitle> angezeigt:<dl>
-<dlentry>
-<dt>Name</dt>
-<dd>Name der virtuellen Maschine. (Kann nur bearbeitet werden, solange der Gast gestoppt ist.)</dd>
-</dlentry><dlentry>
-<dt>CPUs</dt>
-<dd>Anzahl der Prozessoren. (Wenn der Gast aktiv ist, tritt die neue Menge beim n?chsten Booten in Kraft.)
-</dd>
+<dl><dlentry>
+<dt>Allgemein</dt>
+<dd>Zeigt Informationen zu Ihrem Gast (einschlie?lich Name, CPUs, Speicher) und ein Symbol an, das f?r Ihren Gast verwendet werden kann. Sie k?nnen den Namen eines gestoppten Gastes bearbeiten. ?nderungen der CPUs und des Speichers werden nach dem n?chsten Bootvorgang wirksam. </dd>
 </dlentry><dlentry>
 <dt>Speicher</dt>
-<dd>Speicherkapazit?t in MB. (Wenn der Gast aktiv ist, tritt die neue Menge beim n?chsten Booten in Kraft.)
-</dd>
-</dlentry><dlentry>
-<dt>Symbol</dt>
-<dd>Grafikbild, das die Linux-Verteilung darstellt und anstelle des aktuellen Status (Live Tile) angezeigt werden soll, wenn der Gast nicht aktiv ist.</dd>
-</dlentry></dl></p>
-<p>Die folgenden Informationen werden auf der Registerkarte <wintitle>Speicher</wintitle> angezeigt.</p>
+<dd>Zeigt die Einheit und den Speicherpfad f?r den ausgew?hlten Gast an.
+Sie k?nnen Speichereinheiten f?r Ihren Gast hinzuf?gen, bearbeiten und entfernen. </dd>
+</dlentry></dl>
 <dl><dlentry>
-<dt>Speicher</dt>
-<dd>Zeigt die Position der ISO-Datei an, die f?r die Installation verwendet wird.</dd>
+<dt>Schnittstelle</dt>
+<dd>Zeigt Netzinformationen f?r den Gast (einschlie?lich Name, Typ und MAC-Adresse) an. Sie k?nnen Schnittstellen f?r Ihren Gast hinzuf?gen, bearbeiten und entfernen. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Berechtigung</dt>
+<dd>Zeigt die Benutzer und Gruppen an, die ?ber eine Berechtigung f?r den Gast verf?gen. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>PCI-Einheit f?r Host</dt>
+<dd>Zeigt eine Liste aller PCI-Einheiten an, die auf dem Host verf?gbar sind. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Snapshot</dt>
+<dd>Zeigt Snapshots des Gastes an. Sie k?nnen einen Snapshot erstellen, bearbeiten oder l?schen. Durch Auswahl eines Snapshots und der Option zum Zur?cksetzen wird der Gast auf den zu einem bestimmten Zeitpunkt in der Vergangenheit bestehenden Status zur?ckgesetzt, der anhand der Snapshotdaten ermittelt wird. Alle ?nderungen, die nach diesem Zeitpunkt durchgef?hrt wurden, werden verworfen. </dd>
 </dlentry></dl>
 <p> Felder, die nicht inaktiviert sind, k?nnen bearbeitet werden. Nachdem Sie ein Feld bearbeitet haben, klicken Sie auf <uicontrol>Speichern</uicontrol>. </p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="de-de">
-<title>Speichereinheit hinzuf?gen, ersetzen oder abh?ngen</title>
-<shortdesc rev="rev1">Sie k?nnen eine Speichereinheit zu Ihrer virtuellen Maschine hinzuf?gen oder diese ersetzen oder abh?ngen. Die einzige unterst?tzte Einheit ist CD-ROM. F?hren Sie die folgenden Schritte aus, um Ihre Speichereinheiten zu bearbeiten:</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="de-de">
+<title>Gast klonen</title>
+<shortdesc>Durch das Klonen eines Gastes kann eine Kopie des Gastes erstellt werden. </shortdesc>
 <csbody>
+<p>Gehen Sie wie folgt vor, um einen Gast zu klonen: </p>
 <ol>
-<li>W?hlen Sie im Fenster <wintitle>Gast bearbeiten</wintitle> die Option <wintitle>Speicher</wintitle> aus.</li>
-<li>Um eine Speichereinheit zu ersetzen, klicken Sie auf das erste Symbol mit dem <uicontrol>orangefarbenen Schr?gstrich (/)</uicontrol>. Geben Sie den ISO-Dateipfad ein und klicken Sie auf <uicontrol>Ersetzen</uicontrol>.</li>
-<li>Um eine Speichereinheit abzuh?ngen, klicken Sie auf das zweite Symbol mit dem <uicontrol>roten Gedankenstrich (-)</uicontrol>. Best?tigen Sie den L?schvorgang und klicken Sie auf <uicontrol>OK</uicontrol>.</li>
-<li>Um eine Speichereinheit hinzuzuf?gen, klicken Sie auf das dritte Symbol mit dem gr?nen <uicontrol>Pluszeichen (+)</uicontrol>. Geben Sie einen Einheitennamen und einen ISO-Dateipfad ein und klicken Sie auf <uicontrol>Anh?ngen</uicontrol>.</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="de-de">
-<title>CD-ROM f?r VM ersetzen</title>
-<shortdesc rev="rev1">Sie k?nnen den Inhalt der CD-ROM f?r eine virtuelle Maschine nach Abschluss der Installation ersetzen.</shortdesc>
-<csbody>
-<ol>
-<li>Stellen Sie sicher, dass die virtuelle Maschine gestartet ist.</li>
-<li>W?hlen Sie aus dem Aktionsmen? die Option <uicontrol>Medien verwalten</uicontrol> aus.</li>
-<li>Um das zu ?ndern, was aktuell in der CD-ROM geladen ist, klicken Sie auf das Symbol mit dem <uicontrol>orangefarbenen Schr?gstrich (/)</uicontrol> neben dem hdc-Feld.</li>
-<li>Geben Sie auf der Seite <wintitle>CD-ROM f?r VM ersetzen</wintitle> den ISO-Dateipfad ein. Die anderen beiden Felder sind schreibgesch?tzt.</li>
-<li>Klicken Sie auf <uicontrol>Ersetzen</uicontrol>.</li>
+<li>W?hlen Sie im Aktionsmen? eines Gastes <uicontrol>Klonen</uicontrol> aus. </li>
+<li>Akzeptieren Sie die Warnung. <note>Wenn ein Zielgast mit SCSI- oder iSCSI-Datentr?gern arbeitet oder wenn der Zielpool nicht ?ber gen?gend Speicherplatz verf?gt, dann wird der Klon in einem Standardspeicherpool erstellt. </note></li>
 </ol>
+<p>Ein Gast wird in Ihrer Liste mit der Bezeichnung <uicontrol>Wird geklont...</uicontrol> angezeigt. Nach Abschluss des Prozesses steht der geklonte Gast zur Benutzung zur Verf?gung. </p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/de_DE/host.dita b/ui/pages/help/de_DE/host.dita
index 33a40e3..9f676df 100644
--- a/ui/pages/help/de_DE/host.dita
+++ b/ui/pages/help/de_DE/host.dita
@@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li>W?hlen Sie <uicontrol>Erneut starten</uicontrol> aus, um das Hostsystem erneut zu starten.</li>
 <li>W?hlen Sie <uicontrol>Verbinden</uicontrol> aus, um eine VNC-Verbindung zum Hostsystem herzustellen, wenn noch keine Verbindung besteht.</li>
 </ul></p>
-<p>Klicken Sie auf die folgenden Abschnitte, um Informationen zum Host anzuzeigen:<dl>
-<dlentry>
+<p>Klicken Sie auf die folgenden Abschnitte, um Informationen zum Host anzuzeigen:</p>
+<dl><dlentry>
 <dt>Basisinformationen</dt>
-<dd>Dieser Abschnitt zeigt die Verteilung, die Version und den Codenamen des Hostbetriebssystems sowie den Prozessortyp und die Speicherkapazit?t in GB an.</dd>
+<dd>Dieser Abschnitt zeigt die Verteilung, die Version und den Codenamen des Hostbetriebssystems sowie den Prozessortyp, die Anzahl der Online-CPUs und die Speicherkapazit?t in GB an. </dd>
 </dlentry><dlentry>
 <dt>Systemstatistik</dt>
-<dd>Dieser Abschnitt zeigt mithilfe von Grafiken Statistiken f?r CPU, Speicher, Platten-E/A und Netz-E/A f?r den Host an. W?hlen Sie <uicontrol>Daten werden nach dem Verlassen dieser Seite gesammelt</uicontrol> aus, um mit der Sammlung von Daten fortzufahren, wenn die Host-Registerkarte nicht angezeigt wird.</dd>
+<dd>Dieser Abschnitt zeigt mithilfe von Grafiken Statistiken f?r CPU, Speicher, Platten-E/A und Netz-E/A f?r den Host an. </dd>
 </dlentry><dlentry>
 <dt>Software-Updates</dt>
 <dd>Dieser Abschnitt zeigt Informationen f?r alle Pakete an, bei denen Aktualisierungen verf?gbar sind, einschlie?lich Paketname, Version, Architektur und Repository. Sie k?nnen alle aufgelisteten Pakete aktualisieren, indem Sie <uicontrol>Alle aktualisieren</uicontrol> ausw?hlen. Sie k?nnen nicht einzelne Pakete zur Aktualisierung ausw?hlen.</dd>
@@ -31,19 +31,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dd>Dieser Abschnitt zeigt Repositorys an, die dem Hostsystem zugeordnet sind. Sie k?nnen Repositorys hinzuf?gen, aktivieren, bearbeiten oder entfernen. Beim Hinzuf?gen wird ein Repository dem Hostsystem zugeordnet. Das Aktivieren eines Repositorys dagegen erm?glicht dem Host den Zugriff auf das Repository. Wenn Ihr System Red Hat Enterprise
 Linux oder Fedora ist, k?nnen Sie <filepath>yum</filepath>-Repositorys hinzuf?gen.
 Wenn Ihr System Ubuntu oder Debian ist, f?gen Sie <filepath>deb</filepath>-Repositorys hinzu.<p>Wenn Sie mit yum-Repositorys arbeiten, k?nnen Sie eine GPG-Pr?fung hinzuf?gen, um sicherzustellen, dass ein Paket aus diesem Repository nicht besch?digt wurde.
-W?hlen Sie ein Repository und dann <uicontrol>Bearbeiten</uicontrol> aus. W?hlen Sie <uicontrol>Ja</uicontrol> aus, um die GPG-Pr?fung zu aktivieren, und geben Sie dann ein URL zur GPG-Schl?sseldatei f?r das Repository ein.</p></dd>
+W?hlen Sie ein Repository und dann <uicontrol>Bearbeiten</uicontrol> aus. W?hlen Sie <uicontrol>Ja</uicontrol> aus, um <uicontrol>GPG-Pr?fung</uicontrol> zu aktivieren, und geben Sie dann eine URL zur GPG-Schl?sseldatei f?r das Repository ein. </p></dd>
 </dlentry><dlentry>
 <dt>Debugberichte</dt>
 <dd>Dieser Abschnitt zeigt Debugberichte, einschlie?lich Name und Dateipfad, an.
 Sie haben die M?glichkeit, einen neuen Bericht zu erstellen oder einen bestehenden Bericht umzubenennen, zu entfernen oder herunterzuladen.<p>Der Debugbericht wird w?hrend des Befehls <cmdname>sosreport</cmdname> generiert. Er ist verf?gbar f?r Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>-, Fedora-
 und Ubuntu-Verteilungen. Der Befehl generiert eine .tar-Datei, die Konfigurations- und Diagnoseinformationen enth?lt, wie zum Beispiel Kernelversion, geladene Module sowie System- und Servicekonfigurationdateien.
 Der Befehl f?hrt zudem externe Programme aus, um weitere Informationen zu sammeln, und speichert diese Ausgabe im resultierenden Archiv.</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/de_DE/network.dita b/ui/pages/help/de_DE/network.dita
index 49a2935..830715c 100644
--- a/ui/pages/help/de_DE/network.dita
+++ b/ui/pages/help/de_DE/network.dita
@@ -32,7 +32,7 @@ Address Translation, Netzadressumsetzung).</dd>
 <li rev="rev1">W?hlen Sie <uicontrol>Starten</uicontrol> aus, um die Netzverbindung herzustellen.</li>
 <li>W?hlen Sie <uicontrol>Stoppen</uicontrol> aus, um die Netzverbindung zu beenden.</li>
 <li>W?hlen Sie <uicontrol>L?schen</uicontrol> aus, um die Verbindungsinformationen zu l?schen.</li>
-</ul>Um ein Netz zu erstellen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> oben rechts in der Anzeige.</p>
+</ul>Um ein Netz zu erstellen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol>. </p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="de-de">
 <title>Netz erstellen</title>
@@ -57,6 +57,6 @@ Address Translation, Netzadressumsetzung).</dd>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/de_DE/storage.dita b/ui/pages/help/de_DE/storage.dita
index 7f89603..18c199d 100644
--- a/ui/pages/help/de_DE/storage.dita
+++ b/ui/pages/help/de_DE/storage.dita
@@ -14,7 +14,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>F?r jeden Speicherpool werden die folgenden Informationen angezeigt:<dl>
 <dlentry>
 <dt>Name</dt>
-<dd>Name des Speicherpools und genutzter Prozentsatz.</dd>
+<dd>Name des Speicherpools. </dd>
+</dlentry><dlentry>
+<dt>% belegt</dt>
+<dd>Prozentsatz des Speicherpools, der momentan belegt ist. </dd>
 </dlentry><dlentry>
 <dt>Status</dt>
 <dd>Status des Speicherpools, aktiv (gr?n) oder inaktiv (rot). </dd>
@@ -34,21 +37,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>Die folgenden Aktionen k?nnen f?r jeden Speicherpool ausgew?hlt werden:<ul>
 <li>W?hlen Sie <uicontrol>Aktivieren</uicontrol> aus, um den Speicherpool zu aktivieren, damit er genutzt werden kann.</li>
 <li>W?hlen Sie <uicontrol>Inaktivieren</uicontrol> aus, um einen aktiven Speicherpool zu inaktivieren.</li>
-<li>W?hlen Sie <uicontrol>Definition aufheben</uicontrol>, um einen inaktiven Speicherpool  zu entfernen.</li>
+<li>W?hlen Sie <uicontrol>Datentr?ger hinzuf?gen</uicontrol> aus, um einem aktiven Speicherpool weitere Datentr?ger hinzuzuf?gen. </li>
+<li>W?hlen Sie <uicontrol>Definition aufheben</uicontrol>, um einen inaktiven Speicherpool zu entfernen.</li>
 </ul></p>
-<p>Um Details zum Speicherdatentr?ger anzuzeigen, klicken Sie auf den Pfeil auf der rechten Seite der Speicherpoolzeile.  Zu den Details geh?ren folgende Informationen:<dl><dlentry>
-<dt>Typ</dt>
-<dd>Typ des Datentr?gers, zum Beispiel <uicontrol>file</uicontrol>.</dd>
-</dlentry><dlentry>
-<dt>Format</dt>
-<dd>Das Format, variiert abh?ngig vom Typ.</dd>
-</dlentry><dlentry>
-<dt>Kapazit?t</dt>
-<dd>Gr??e des Speicherdatentr?gers.</dd>
-</dlentry><dlentry>
-<dt>Zuordnung</dt>
-<dd>Speicherplatz, der bereits im Speicherpool zugeordnet ist.</dd>
-</dlentry></dl>Um einen Speicherpool zu definieren, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> oben rechts in der Anzeige.</p>
+<p>Um Details zum Speicherdatentr?ger anzuzeigen, klicken Sie auf den Pfeil auf der rechten Seite der Speicherpoolzeile. Um einen Speicherpool zu definieren, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol>. </p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="de-de">
 <title>Speicherpool definieren</title>
@@ -74,13 +66,28 @@ Wenn Sie <uicontrol>iSCSI</uicontrol> ausw?hlen, geben Sie die IP-Adresse vom <
 <dt><uicontrol>SCSI-Fibre Channel</uicontrol></dt>
 <dd>Gibt einen Pool an, der auf einem SCSI-Fibre Channel basiert. W?hlen Sie aus, welcher Adapter verwendet werden soll.</dd>
 </dlentry></dl></li>
+<li>Geben Sie einen Speicherpfad f?r den Speicherpool an. Der Speicherpfad gibt die Position im lokalen Dateisystem an, der der Pool zugeordnet ist.
+Der Pfad muss eindeutig sein. Wenn das Verzeichnis bei der Poolerstellung noch nicht vorhanden ist, dann wird es vom System f?r Sie erstellt. </li>
 <li>Klicken Sie auf <uicontrol>Erstellen</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="de-de">
+<title>Datentr?ger hinzuf?gen</title>
+<shortdesc>F?gt einen Datentr?ger zu einem Speicherpool hinzu. </shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>?ber Remote URL abrufen</dt>
+<dd>Gibt eine Position an, von der der Datentr?ger heruntergeladen werden soll. Beispiel: <filepath>https://my-server/fedora22.img</filepath>.</dd>
+</dlentry><dlentry>
+<dt>Datei hochladen</dt>
+<dd>Gibt eine Position auf Ihrem lokalen System an. </dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/de_DE/templates.dita b/ui/pages/help/de_DE/templates.dita
index 5063930..efe145a 100644
--- a/ui/pages/help/de_DE/templates.dita
+++ b/ui/pages/help/de_DE/templates.dita
@@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <title>Vorlagen</title>
 <shortdesc>Die Seite <wintitle>Vorlagen</wintitle> zeigt die definierten Vorlagen der virtuellen Maschine an, die zum Erstellen von KVM-G?sten verwendet werden k?nnen.</shortdesc>
 <csbody>
-<p>F?r jede Vorlage werden die folgenden Informationen angezeigt:<dl>
-<dlentry>
+<p>F?r jede Vorlage werden die folgenden Informationen angezeigt:</p>
+<dl><dlentry>
 <dt>BS</dt>
 <dd>Name des Betriebssystems oder der Verteilung.</dd>
 </dlentry><dlentry>
@@ -24,66 +24,60 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>Speicher</dt>
 <dd>Gr??e des zuzuordnenden Arbeitsspeichers in MB.</dd>
-</dlentry></dl></p>
-<p>Die folgenden Aktionen k?nnen f?r jede Vorlage ausgew?hlt werden:<ul>
+</dlentry></dl>
+<p>Die folgenden Aktionen k?nnen f?r jede Vorlage ausgew?hlt werden:</p>
+<ul>
 <li>W?hlen Sie <uicontrol>Bearbeiten</uicontrol> aus, um die Vorlage zu bearbeiten.</li>
+<li>W?hlen Sie <uicontrol>Klonen</uicontrol> aus, um eine Vorlage zu kopieren. </li>
 <li>W?hlen Sie <uicontrol>L?schen</uicontrol> aus, um die Vorlage zu l?schen.</li>
-</ul>Um eine Vorlage hinzuzuf?gen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> oben rechts in der Anzeige.</p>
+</ul>
+<p>Um eine Vorlage hinzuzuf?gen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol>. </p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="de-de">
 <title>Vorlage bearbeiten</title>
 <shortdesc>Bearbeiten Sie eine bestehende Vorlage.</shortdesc>
 <csbody>
-<p>F?r jede Vorlage werden die folgenden Informationen angezeigt: <dl>
-<dlentry>
-<dt>Name</dt>
-<dd>Name der Vorlage.</dd>
-</dlentry><dlentry>
-<dt>Anbieter</dt>
-<dd>Der Name des Unternehmens, das das Betriebssystem oder die Verteilung erstellt hat, f?r die die Vorlage konfiguriert ist.</dd>
-</dlentry><dlentry>
-<dt>Version</dt>
-<dd>Die Version des Betriebssystems oder der Verteilung, f?r die die Vorlage konfiguriert ist.</dd>
-</dlentry><dlentry>
-<dt>CPU-Anzahl</dt>
-<dd>Anzahl der Prozessoren, die f?r die Vorlage definiert sind.</dd>
+<p>F?r jede Vorlage werden die folgenden Informationen angezeigt: </p>
+<dl><dlentry>
+<dt>Allgemein</dt>
+<dd>Zeigt den Namen, die Anbieterverteilung, die Version, den Speicher sowie den Dateipfad zur ISO-Datei und die Grafikvorgaben an. </dd>
 </dlentry><dlentry>
 <dt>Speicher</dt>
-<dd>Speicherkapazit?t in MB, die der virtuellen Maschine zugeordnet werden soll.</dd>
-</dlentry><dlentry>
-<dt>Platte</dt>
-<dd>Plattengr??e in GB.</dd>
+<dd>Geben Sie die Speicherpoolinformationen f?r die Vorlage an. </dd>
 </dlentry><dlentry>
-<dt>CD-ROM</dt>
-<dd>Dateipfad zur Position der ISO-Datei an, die f?r die Installation des KVM-Gastes verwendet wird.</dd>
+<dt>Schnittstelle</dt>
+<dd>Zeigt die Standardnetzschnittstellen an, die f?r den KVM-Gast verf?gbar sind.
+Sie k?nnen mehrere Netze ausw?hlen.</dd>
 </dlentry><dlentry>
-<dt>Speicherpool</dt>
-<dd>Bestimmter Speicherpool oder der Standardspeicherpool.</dd>
-</dlentry><dlentry>
-<dt>Netz</dt>
-<dd>Standardnetzschnittstelle, die f?r den KVM-Gast verf?gbar ist. Sie k?nnen mehrere Netze ausw?hlen.</dd>
-</dlentry></dl> Felder, die nicht inaktiviert sind, k?nnen bearbeitet werden. Nachdem Sie ein Feld bearbeitet haben, klicken Sie auf <uicontrol>Speichern</uicontrol>. </p>
+<dt>Prozessor</dt>
+<dd>Geben Sie im Feld <uicontrol>CPU-Anzahl</uicontrol> die Anzahl der Prozessoren an, die f?r die Vorlage definiert sind. </dd>
+<dd>W?hlen Sie aus, dass die CPU-Topologie f?r jeden Gast manuell definiert werden soll. </dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>Vorlage hinzuf?gen</title>
 <shortdesc>F?gen Sie eine Vorlage vom Quellendatentr?ger hinzu. Sie k?nnen f?r eine nachfolgende Erkennung Ihr eigenes ISO-Image zum Speicherpool 'ISO' hinzuf?gen.</shortdesc>
 <csbody>
-<p>W?hlen Sie die Position des Quellendatentr?gers aus den folgenden Optionen aus:<dl>
-<dlentry>
+<p>W?hlen Sie die Position des Quellendatentr?gers aus den folgenden Optionen aus:</p>
+<dl><dlentry>
 <dt>Lokales ISO-Image</dt>
 <dd>W?hlen Sie diese Option aus, um Speicherpools nach Installations-ISO-Images zu durchsuchen, die im System verf?gbar sind.</dd>
 </dlentry><dlentry>
+<dt>Lokale Imagedatei</dt>
+<dd>W?hlen Sie aus, dass ein Pfad zur lokalen Imagedatei angegeben werden soll. </dd>
+</dlentry><dlentry>
 <dt>Fernes ISO-Image</dt>
 <dd>W?hlen Sie diese Option aus, um eine ferne Position f?r ein Installations-ISO-Image anzugeben.</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>Vorlage hinzuf?gen - lokales ISO-Image</title>
-<shortdesc>F?gen Sie eine Vorlage aus einem lokalen ISO-Image hinzu.</shortdesc>
+<title>Vorlage hinzuf?gen - ISO-Image</title>
+<shortdesc>F?gen Sie eine Vorlage aus einem ISO-Image hinzu. </shortdesc>
 <csbody>
-<p>Die im System verf?gbaren ISO-Images werden angezeigt.<dl><dlentry>
+<p>Die im System verf?gbaren fernen ISO-Images werden angezeigt. </p>
+<dl><dlentry>
 <dt>BS</dt>
 <dd>Name des Betriebssystems oder der Verteilung.</dd>
 </dlentry><dlentry>
@@ -92,21 +86,22 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>Gr??e</dt>
 <dd>Gr??e des ISO-Image.</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 <p>Um eine Vorlage aus einem ISO-Image zu erstellen, w?hlen Sie aus den folgenden
-Optionen aus:<ul>
+Optionen aus:</p>
+<ul>
 <li>W?hlen Sie ein ISO-Image aus, aus dem Sie eine Vorlage erstellen m?chten, und klicken Sie dann auf <uicontrol>Vorlagen aus ausgew?hltem ISO erstellen</uicontrol>.</li>
 <li>W?hlen Sie <uicontrol>Alle</uicontrol> aus, um eine Vorlage aus jedem aufgelisteten ISO-Image zu erstellen, und klicken Sie dann auf <uicontrol>Vorlagen aus ausgew?hltem ISO erstellen</uicontrol>.</li>
 <li>Wenn das ISO-Image, das Sie verwenden m?chten, nicht in den Suchergebnissen angezeigt wird, k?nnen Sie aus den folgenden Optionen ausw?hlen:<ul>
 <li>W?hlen Sie <uicontrol>Ich m?chte eine bestimmte ISO-Datei verwenden</uicontrol> aus, um einen Pfad zum ISO-Image anzugeben.</li>
 <li>Klicken Sie auf <uicontrol>Weitere ISOs suchen</uicontrol>, um weitere ISO-Images zu suchen.</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/es_ES/guests.dita b/ui/pages/help/es_ES/guests.dita
index 88e77e0..5d84c8c 100644
--- a/ui/pages/help/es_ES/guests.dita
+++ b/ui/pages/help/es_ES/guests.dita
@@ -9,21 +9,21 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="es-es">
 <title>Invitados</title>
-<shortdesc>La p?gina <wintitle>Invitados</wintitle> lista las m?quinas virtuales KVM definidas.</shortdesc>
+<shortdesc>En la p?gina <wintitle>Invitados</wintitle> se listan los invitados definidos para su servidor. </shortdesc>
 <csbody>
 <p>Se visualiza la siguiente informaci?n para cada invitado:<dl><dlentry>
 <dt>Nombre</dt>
-<dd>Nombre de la m?quina virtual.</dd>
+<dd>Nombre del invitado. </dd>
 </dlentry><dlentry>
 <dt>CPU</dt>
-<dd>Porcentaje de utilizaci?n de procesador en la m?quina virtual.</dd>
-</dlentry><dlentry>
-<dt>E/S de red</dt>
-<dd>Velocidad de transmisi?n de entrada/salida de red en KB por segundos.</dd>
+<dd>Porcentaje de utilizaci?n del procesador en el invitado. </dd>
 </dlentry><dlentry>
 <dt>E/S de disco</dt>
 <dd>Velocidad de transmisi?n de entrada/salida de disco en KB por segundos.</dd>
 </dlentry><dlentry>
+<dt>E/S de red</dt>
+<dd>Velocidad de transmisi?n de entrada/salida de red en KB por segundos.</dd>
+</dlentry><dlentry>
 <dt>Livetile</dt>
 <dd>Estado de la consola del sistema operativo invitado, o un icono que representa la distribuci?n de <tm tmtype="tm" trademark="Linux">Linux</tm> si el invitado no est? activo.</dd>
 </dlentry></dl></p>
@@ -37,84 +37,77 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry></dl> </p>
 <p>Se pueden seleccionar las siguientes acciones para cada invitado:<ul>
 <li>Seleccione <uicontrol>Conectar</uicontrol> para conectarse a la consola remota para el sistema operativo invitado.</li>
-<li>Seleccione <uicontrol>Gestionar soporte</uicontrol> para cambiar la v?a de acceso al soporte de instalaci?n.</li>
-<li>Seleccione <uicontrol>Restablecer</uicontrol> para restablecer el invitado.</li>
+<li>Seleccione <uicontrol>Clonar</uicontrol> para copiar una definici?n de invitado existente con el fin de crear un invitado. </li>
+<li>Seleccione <uicontrol>Restablecer</uicontrol> para restablecer el invitado. Solamente puede restablecer un invitado que se haya iniciado. </li>
 <li>Seleccione <uicontrol>Editar</uicontrol> para editar las propiedades de un invitado existente. Los invitados s?lo pueden editarse mientras est?n detenidos.</li>
+<li>Seleccione <uicontrol>Iniciar</uicontrol> para iniciar un invitado</li>
+<li>Seleccione <uicontrol>Concluir</uicontrol> para concluir un invitado con elegancia.</li>
+<li>Seleccione <uicontrol>Apagar</uicontrol> para forzar una conclusi?n inmediata del invitado. </li>
 <li>Seleccione <uicontrol>Suprimir</uicontrol> para suprimir el invitado.</li>
-</ul>Para crear un invitado o m?quina virtual, pulse el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la p?gina.</p>
+</ul>Para crear un invitado, pulse el icono <uicontrol>m?s (+)</uicontrol> en la p?gina.</p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="es-es">
-<title>Crear m?quina virtual</title>
-<shortdesc>Crear una m?quina virtual utilizando una plantilla existente.</shortdesc>
+<title>Creaci?n de un invitado</title>
+<shortdesc>Cree un invitado utilizando una plantilla existente. </shortdesc>
 <csbody>
 <p> <ol>
-<li>Escriba el nombre a utilizar para identificar la m?quina virtual.</li>
-<li rev="rev1">Seleccione una plantilla. <ul>
+<li>Escriba el nombre que se va a utilizar para identificar al invitado. </li>
+<li>Seleccione una plantilla. <ul>
 <li>Si existen plantillas, seleccione entre las plantillas mostradas.</li>
 <li>Si no existen plantillas, pulse <uicontrol>Crear una plantilla</uicontrol> para crear una plantilla.</li>
-</ul></li>
+</ul>Puede ver informaci?n sobre una plantilla pasando el cursor por encima. </li>
 <li>Pulse <uicontrol>Crear</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="es-es">
 <title>Editar invitado</title>
-<shortdesc>Editar las propiedades de una m?quina virtual existente. Algunas propiedades pueden editarse s?lo cuando el invitado se ha detenido. Otras surtir?n efecto en el arranque siguiente.</shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
+<shortdesc>Edite las propiedades de un invitado existente. Algunas propiedades pueden editarse s?lo cuando el invitado se ha detenido. Otras surtir?n efecto en el arranque siguiente.</shortdesc>
 <csbody>
-<p>Se visualiza la siguiente informaci?n para cada invitado en la pesta?a <wintitle>General</wintitle>:<dl>
-<dlentry>
-<dt>Nombre</dt>
-<dd>Nombre de la m?quina virtual.(s?lo puede editarse cuando el invitado se ha detenido)</dd>
-</dlentry><dlentry>
-<dt>CPUs</dt>
-<dd>N?mero de procesadores.(si el invitado est? en ejecuci?n, la nueva cantidad surtir? efecto en el siguiente arranque)
-</dd>
-</dlentry><dlentry>
-<dt>Memoria</dt>
-<dd>Cantidad de memoria en MB.(si el invitado est? en ejecuci?n, la nueva cantidad surtir? efecto en el siguiente arranque)
-</dd>
-</dlentry><dlentry>
-<dt>Icono</dt>
-<dd>Imagen gr?fica que representa la distribuci?n de Linux a visualizar en lugar del estado actual (Livetile) cuando el invitado no est? activo.</dd>
-</dlentry></dl></p>
-<p>Se visualiza la siguiente informaci?n en la pesta?a <wintitle>Almacenamiento</wintitle>.</p>
 <dl><dlentry>
+<dt>General</dt>
+<dd>Muestra informaci?n sobre el invitado, incluyendo el nombre, las CPU, la memoria y el icono para utilizarlo con su invitado. Puede editar el nombre de un invitado detenido. El cambio de CPU y de memoria entra en vigor tras el siguiente arranque. </dd>
+</dlentry><dlentry>
 <dt>Almacenamiento</dt>
-<dd>Muestra la ubicaci?n del archivo ISO utilizado para la instalaci?n.</dd>
+<dd>Muestra el dispositivo y la v?a de acceso para el almacenamiento del invitado seleccionado.
+Puede a?adir, editar y eliminar dispositivos de almacenamiento para su invitado. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Interfaz</dt>
+<dd>Muestra informaci?n de red del invitado, incluyendo el nombre, el tipo y la direcci?n MAC. Puede a?adir, editar y eliminar interfaces para su invitado. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Permiso</dt>
+<dd>Muestra los usuarios y grupos que est?n autorizados para el invitado. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Dispositivo PCI de host</dt>
+<dd>Muestra una lista de todos los dispositivos PCI disponibles en el host. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Instant?nea</dt>
+<dd>Muestra las instant?neas del invitado. Puede crear, editar o suprimir una instant?nea. Al seleccionar una instant?nea y seleccionar revertir, se restaura el invitado en un punto del pasado, que viene determinado por los datos de la instant?nea y se descartan los cambios realizados pasado ese punto del tiempo. </dd>
 </dlentry></dl>
 <p> Los campos que no est?n inhabilitados pueden editarse. Despu?s de editar un campo, pulse <uicontrol>Guardar</uicontrol>. </p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="es-es">
-<title>A?adir, sustituir o desconectar un dispositivo de almacenamiento</title>
-<shortdesc rev="rev1">Puede a?adir, sustituir o desconectar un dispositivo de almacenamiento a la m?quina virtual. El ?nico dispositivo soportado es CDROM. Para editar los dispositivos de almacenamiento, siga estos pasos:</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="es-es">
+<title>Clonaci?n de un invitado </title>
+<shortdesc>La clonaci?n de un invitado le permite crear una copia de un invitado. </shortdesc>
 <csbody>
+<p>Para clonar un invitado: </p>
 <ol>
-<li>En la ventana <wintitle>Editar invitado</wintitle>, seleccione <wintitle>Almacenamiento</wintitle>.</li>
-<li>Para sustituir un dispositivo de almacenamiento, pulse el primer icono con la <uicontrol>barra inclinada naranja (/)</uicontrol>. Especifique la v?a de acceso del archivo ISO y pulse <uicontrol>Sustituir</uicontrol>.</li>
-<li>Para desconectar un dispositivo de almacenamiento, pulse el segundo icono con el <uicontrol>gui?n rojo (-)</uicontrol>. Confirme la supresi?n y pulse <uicontrol>Aceptar</uicontrol>.</li>
-<li>Para a?adir un dispositivo de almacenamiento, pulse el tercer icono con el <uicontrol>signo m?s (+)</uicontrol> verde. Especifique un nombre de dispositivo y la v?a de acceso del archivo ISO y pulse <uicontrol>Conectar</uicontrol>.</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="es-es">
-<title>Sustituir un CDROM de m?quina virtual</title>
-<shortdesc rev="rev1">Puede sustituir el contenido del CDROM para una m?quina virtual despu?s de completarse la instalaci?n.</shortdesc>
-<csbody>
-<ol>
-<li>Aseg?rese de que la m?quina virtual se ha iniciado.</li>
-<li>En el men? Acciones, seleccione <uicontrol>Gestionar soporte</uicontrol>.</li>
-<li>Para cambiar lo que est? cargado actualmente en el CDROM, pulse el icono <uicontrol>barra inclinada naranja (/)</uicontrol> junto al campo hdc.</li>
-<li>En la p?gina <wintitle>Sustituir un CDROM de m?quina virtual</wintitle>, especifique la v?a de acceso del archivo ISO. Los otros dos campos son de s?lo lectura.</li>
-<li>Pulse <uicontrol>Sustituir</uicontrol>.</li>
+<li>Seleccione <uicontrol>Clonar</uicontrol> del men? Acci?n de un invitado. </li>
+<li>Acepte el aviso. <note>Cuando un invitado de destino est? utilizando vol?menes SCSI o iSCSI o si la agrupaci?n de destino no tiene suficiente espacio, el clon se crear? en una agrupaci?n de almacenamiento predeterminada. </note></li>
 </ol>
+<p>Un invitado aparece en su lista con la etiqueta <uicontrol>Clonando...</uicontrol> Cuando el proceso se ha completado, el invitado clonado est? disponible para utilizarlo. </p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/es_ES/host.dita b/ui/pages/help/es_ES/host.dita
index 7734244..90f60f8 100644
--- a/ui/pages/help/es_ES/host.dita
+++ b/ui/pages/help/es_ES/host.dita
@@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li>Seleccione <uicontrol>Reiniciar</uicontrol> para reiniciar el sistema host.</li>
 <li>Seleccione <uicontrol>Conectar</uicontrol> para abrir una conexi?n VNC al sistema host, si no est? conectado a?n.</li>
 </ul></p>
-<p>Pulse en las secciones siguientes para visualizar informaci?n acerca del host:<dl>
-<dlentry>
+<p>Pulse en las secciones siguientes para visualizar informaci?n acerca del host:</p>
+<dl><dlentry>
 <dt>Informaci?n b?sica</dt>
-<dd>Esta secci?n muestra la distribuci?n del sistema operativo de host, la versi?n y el nombre de c?digo, as? como el tipo de procesador y la cantidad de memoria en GB.</dd>
+<dd>Esta secci?n muestra la distribuci?n del sistema operativo de host, la versi?n, el nombre de c?digo, as? como el tipo de procesador, el n?mero de CPU en l?nea y la cantidad de memoria en GB.</dd>
 </dlentry><dlentry>
 <dt>Estad?sticas del sistema</dt>
-<dd>Esta secci?n muestra gr?ficos para mostrar estad?sticas para CPU, memoria, E/S de disco y E/S de red para el host. Seleccione <uicontrol>Recoger datos despu?s de salir de esta p?gina</uicontrol> para continuar la recogida de datos cuando la pesta?a principal ya no est? a la vista.</dd>
+<dd>Esta secci?n muestra gr?ficos para mostrar estad?sticas para CPU, memoria, E/S de disco y E/S de red para el host. </dd>
 </dlentry><dlentry>
 <dt>Actualizaciones de software</dt>
 <dd>En esta secci?n se muestra informaci?n para todos los paquetes que tienen actualizaciones disponibles, incluido el nombre de paquete, versi?n, arquitectura y repositorio. Puede actualizar todos los paquetes listados seleccionando <uicontrol>Actualizar todo</uicontrol>. No puede seleccionar paquetes individuales para las actualizaciones.</dd>
@@ -31,19 +31,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dd>En esta secci?n se muestran los repositorios que est?n asociados con el sistema host. Puede a?adir, habilitar, editar o eliminar repositorios. A?adir un repositorio lo asocia con el sistema host mientras que habilitar un repositorio permite que el host acceda a ?l. Si el sistema es Red Hat Enterprise
 Linux o Fedora, puede a?adir repositorios <filepath>yum</filepath>.
 Si el sistema es Ubuntu o Debian, a?ada repositorios <filepath>deb</filepath>.<p>Si est? trabajando con repositorios yum, puede a?adir una comprobaci?n GPG para verificar que un paquete de este repositorio no ha resultado da?ado.
-Seleccione un repositorio y, a continuaci?n, <uicontrol>Editar</uicontrol>. Seleccione <uicontrol>S?</uicontrol> para habilitar la comprobaci?n GPG y, a continuaci?n, especifique un URL al archivo de claves GPG para el repositorio.</p></dd>
+Seleccione un repositorio y, a continuaci?n, <uicontrol>Editar</uicontrol>. Seleccione <uicontrol>S?</uicontrol> para habilitar <uicontrol>Comprobaci?n GPG</uicontrol> y, a continuaci?n, especifique un URL al archivo de claves GPG para el repositorio. </p></dd>
 </dlentry><dlentry>
 <dt>Informes de depuraci?n</dt>
 <dd>En esta secci?n se muestran informes de depuraci?n, incluido el nombre y la ruta de archivo.
 Puede seleccionar entre opciones para generar un informe nuevo, o bien redenominar, eliminar o descargar un informe existente.<p>El informe de depuraci?n se genera utilizando el mandato <cmdname>sosreport</cmdname>. Est? disponible para distribuciones de Red
 Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora y Ubuntu. El mandato genera un archivo .tar que contiene la informaci?n de configuraci?n y de diagn?stico, como la versi?n de kernel en ejecuci?n, los m?dulos de carga y los archivos de configuraci?n del sistema y servicio.
 El mandato tambi?n ejecuta programas externos para recopilar informaci?n adicional y almacena esta salida en el archivo resultante.</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/es_ES/network.dita b/ui/pages/help/es_ES/network.dita
index 3654531..0cda3c0 100644
--- a/ui/pages/help/es_ES/network.dita
+++ b/ui/pages/help/es_ES/network.dita
@@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li rev="rev1">Seleccione <uicontrol>Iniciar</uicontrol> para iniciar la conexi?n de red.</li>
 <li>Seleccione <uicontrol>Detener</uicontrol> para finalizar la conexi?n de red.</li>
 <li>Seleccione <uicontrol>Suprimir</uicontrol> para suprimir la informaci?n de conexi?n.</li>
-</ul>Para crear una red, pulse en el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la pantalla.</p>
+</ul>Para crear una red, pulse el icono <uicontrol>m?s (+)</uicontrol>. </p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="es-es">
 <title>Crear una red</title>
@@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/es_ES/storage.dita b/ui/pages/help/es_ES/storage.dita
index 0c68951..ee2083d 100644
--- a/ui/pages/help/es_ES/storage.dita
+++ b/ui/pages/help/es_ES/storage.dita
@@ -15,7 +15,10 @@ Si desea utilizar su propia ISO, a??dala a la v?a de acceso de la agrupaci?n
 <p>Se visualiza la siguiente informaci?n para cada agrupaci?n de almacenamiento:<dl>
 <dlentry>
 <dt>Nombre</dt>
-<dd>Nombre de la agrupaci?n de almacenamiento y el porcentaje utilizado.</dd>
+<dd>El nombre de la agrupaci?n de almacenamiento. </dd>
+</dlentry><dlentry>
+<dt>% utilizado</dt>
+<dd>Porcentaje de la agrupaci?n de almacenamiento que se est? utilizando. </dd>
 </dlentry><dlentry>
 <dt>Estado</dt>
 <dd>Estado de la agrupaci?n de almacenamiento, activa (verde) o inactiva (rojo). </dd>
@@ -35,21 +38,10 @@ Si desea utilizar su propia ISO, a??dala a la v?a de acceso de la agrupaci?n
 <p>Se pueden seleccionar las siguientes acciones para cada agrupaci?n de almacenamiento:<ul>
 <li>Seleccione <uicontrol>Activar</uicontrol> para activar la agrupaci?n de almacenamiento para que pueda utilizarse.</li>
 <li>Seleccione <uicontrol>Desactivar</uicontrol> para desactivar una agrupaci?n de almacenamiento activa.</li>
+<li>Seleccione <uicontrol>A?adir volumen</uicontrol> para a?adir m?s volumen a una agrupaci?n de almacenamiento activa. </li>
 <li>Seleccione <uicontrol>No definir</uicontrol> para eliminar una agrupaci?n de almacenamiento inactiva.</li>
 </ul></p>
-<p>Para visualizar detalles de volumen de almacenamiento para una agrupaci?n de almacenamiento, pulse la flecha situada en el lado derecho de la fila de agrupaci?n de almacenamiento. Los detalles incluyen lo siguiente:<dl><dlentry>
-<dt>Tipo</dt>
-<dd>El tipo de volumen, por ejemplo, <uicontrol>archivo</uicontrol>.</dd>
-</dlentry><dlentry>
-<dt>Formato</dt>
-<dd>El formato, variable dependiendo del tipo.</dd>
-</dlentry><dlentry>
-<dt>Capacidad</dt>
-<dd>Tama?o del volumen de almacenamiento.</dd>
-</dlentry><dlentry>
-<dt>Asignaci?n</dt>
-<dd>Cantidad de espacio que ya est? asignado en la agrupaci?n de almacenamiento.</dd>
-</dlentry></dl>Para definir una agrupaci?n de almacenamiento, pulse en el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la pantalla.</p>
+<p>Para visualizar detalles de volumen de almacenamiento para una agrupaci?n de almacenamiento, pulse la flecha situada en el lado derecho de la fila de agrupaci?n de almacenamiento. Para definir una agrupaci?n de almacenamiento, pulse el icono <uicontrol>m?s (+)</uicontrol>. </p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="es-es">
 <title>Definir una agrupaci?n de almacenamiento</title>
@@ -74,13 +66,28 @@ Al seleccionar <uicontrol>iSCSI</uicontrol>, escriba la direcci?n IP del <uicon
 <dt><uicontrol>Canal de fibra de SCSI</uicontrol></dt>
 <dd>Especifica una agrupaci?n basada en un Canal de fibra SCSI. Seleccione qu? adaptador SCSI se utilizar?.</dd>
 </dlentry></dl></li>
+<li>Especifique una v?a de acceso de almacenamiento para la agrupaci?n de almacenamiento. La v?a de acceso de almacenamiento es la ubicaci?n en el sistema de archivos local al que se correlaciona la agrupaci?n.
+La v?a de acceso debe ser exclusiva. Si el directorio no existe cuando se crea la agrupaci?n, se crear? para el usuario. </li>
 <li>Pulse <uicontrol>Crear</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="es-es">
+<title>A?adir volumen</title>
+<shortdesc>A?ade volumen a una agrupaci?n de almacenamiento. </shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>Captar de URL remoto</dt>
+<dd>Especifica una ubicaci?n de donde descargar el volumen. Por ejemplo: <filepath>https://my-server/fedora22.img</filepath>.</dd>
+</dlentry><dlentry>
+<dt>Cargar un archivo</dt>
+<dd>Especifica una ubicaci?n en su sistema local. </dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/es_ES/templates.dita b/ui/pages/help/es_ES/templates.dita
index 8cceee7..9c0ef97 100644
--- a/ui/pages/help/es_ES/templates.dita
+++ b/ui/pages/help/es_ES/templates.dita
@@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <title>Plantillas</title>
 <shortdesc>La p?gina <wintitle>Plantillas</wintitle> muestra las plantillas de m?quina virtual definidas que se pueden utilizar para crear invitados KVM.</shortdesc>
 <csbody>
-<p>Se visualiza la siguiente informaci?n para cada plantilla:<dl>
-<dlentry>
+<p>Se visualiza la siguiente informaci?n para cada plantilla:</p>
+<dl><dlentry>
 <dt>SO</dt>
 <dd>Nombre del sistema operativo o distribuci?n.</dd>
 </dlentry><dlentry>
@@ -24,66 +24,60 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>Memoria</dt>
 <dd>Cantidad de memoria de acceso aleatorio a asignar, en MB.</dd>
-</dlentry></dl></p>
-<p>Se pueden seleccionar las siguientes acciones para cada plantilla:<ul>
+</dlentry></dl>
+<p>Se pueden seleccionar las siguientes acciones para cada plantilla:</p>
+<ul>
 <li>Seleccione <uicontrol>Editar</uicontrol> para editar la plantilla.</li>
+<li>Seleccione <uicontrol>Clonar</uicontrol> para copiar una plantilla. </li>
 <li>Seleccione <uicontrol>Suprimir</uicontrol> para suprimir la plantilla.</li>
-</ul>Para a?adir una plantilla, pulse en el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la pantalla.</p>
+</ul>
+<p>Para a?adir una plantilla, pulse el icono <uicontrol>m?s (+)</uicontrol>. </p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="es-es">
 <title>Editar plantilla</title>
 <shortdesc>Editar una plantilla existente.</shortdesc>
 <csbody>
-<p>Se visualiza la siguiente informaci?n para cada plantilla: <dl>
-<dlentry>
-<dt>Nombre</dt>
-<dd>Nombre de la plantilla.</dd>
+<p>Se visualiza la siguiente informaci?n para cada plantilla: </p>
+<dl><dlentry>
+<dt>General</dt>
+<dd>Muestra el nombre, la distribuci?n de proveedor, la versi?n, la memoria, la v?a de acceso del archivo al archivo ISO y las preferencias de gr?ficos. </dd>
 </dlentry><dlentry>
-<dt>Proveedor</dt>
-<dd>El nombre de la empresa que cre? el sistema operativo o distribuci?n que la plantilla est? configurada para utilizar.</dd>
+<dt>Almacenamiento</dt>
+<dd>Especifica informaci?n de la agrupaci?n de almacenamiento para la plantilla. </dd>
 </dlentry><dlentry>
-<dt>Versi?n</dt>
-<dd>La versi?n del sistema operativo o distribuci?n que la plantilla est? configurada para utilizar.</dd>
-</dlentry><dlentry>
-<dt>N?mero de CPU</dt>
-<dd>N?mero de procesadores que est?n definidos para la plantilla.</dd>
-</dlentry><dlentry>
-<dt>Memoria</dt>
-<dd>Cantidad de memoria en MB a asignar a la m?quina virtual.</dd>
+<dt>Interfaz</dt>
+<dd>Muestra las interfaces de red predeterminadas que hay disponibles para el invitado KVM.
+Puede seleccionar varias redes.</dd>
 </dlentry><dlentry>
-<dt>Disco</dt>
-<dd>Tama?o de disco en GB.</dd>
-</dlentry><dlentry>
-<dt>CDROM</dt>
-<dd>V?a de acceso de archivo a la ubicaci?n del archivo ISO utilizado para instalar el invitado KVM.</dd>
-</dlentry><dlentry>
-<dt>Agrupaci?n de almacenamiento</dt>
-<dd>Agrupaci?n de almacenamiento espec?fica o la agrupaci?n de almacenamiento predeterminada.</dd>
-</dlentry><dlentry>
-<dt>Red</dt>
-<dd>Interfaces de red predeterminadas disponibles para el invitado KVM. Puede seleccionar varias redes.</dd>
-</dlentry></dl> Los campos que no est?n inhabilitados pueden editarse. Despu?s de editar un campo, pulse <uicontrol>Guardar</uicontrol>. </p>
+<dt>Procesador</dt>
+<dd>En el campo <uicontrol>N?mero de CPU</uicontrol>, especifique el n?mero de procesadores que se han definido para la plantilla. </dd>
+<dd>Seleccione Establecer manualmente la topolog?a de la CPU para cada invitado. </dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>A?adir plantilla</title>
 <shortdesc>A?adir una plantilla desde el soporte de origen. Puede a?adir su propia imagen ISO a la agrupaci?n de almacenamiento 'ISO' para el siguiente descubrimiento.</shortdesc>
 <csbody>
-<p>Seleccione la ubicaci?n del soporte de origen entre una de las opciones siguientes:<dl>
-<dlentry>
+<p>Seleccione la ubicaci?n del soporte de origen entre una de las opciones siguientes:</p>
+<dl><dlentry>
 <dt>Imagen ISO local</dt>
 <dd>Seleccione esta opci?n para explorar las agrupaciones de almacenamiento en busca de im?genes ISO de instalaci?n disponibles en el sistema.</dd>
 </dlentry><dlentry>
+<dt>Archivo de imagen local</dt>
+<dd>Seleccione esta opci?n para especificar una v?a de acceso al archivo de imagen local. </dd>
+</dlentry><dlentry>
 <dt>Imagen ISO remota</dt>
 <dd>Seleccione esta opci?n para especificar una ubicaci?n remota para una imagen ISO de instalaci?n.</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>A?adir plantilla ? imagen ISO local</title>
-<shortdesc>A?adir una plantilla desde una imagen ISO local.</shortdesc>
+<title>A?adir plantilla - imagen ISO</title>
+<shortdesc>A?ade una plantilla desde una imagen ISO. </shortdesc>
 <csbody>
-<p>Se visualizan las im?genes ISO disponibles en el sistema.<dl><dlentry>
+<p>Las im?genes ISO disponibles en el sistema se visualizan de forma remota. </p>
+<dl><dlentry>
 <dt>SO</dt>
 <dd>Nombre del sistema operativo o distribuci?n.</dd>
 </dlentry><dlentry>
@@ -92,20 +86,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>Tama?o</dt>
 <dd>Tama?o de la imagen ISO.</dd>
-</dlentry></dl></p>
-<p>Para crear una plantilla a partir de una imagen ISO, elija entre las opciones siguientes:<ul>
+</dlentry></dl>
+<p>Para crear una plantilla a partir de una imagen ISO, elija entre las opciones siguientes:</p>
+<ul>
 <li>Seleccione una imagen ISO desde la que desea crear una plantilla y, a continuaci?n, pulse <uicontrol>Crear plantillas desde ISO seleccionada</uicontrol>.</li>
 <li>Seleccione <uicontrol>Todo</uicontrol> para crear una plantilla desde cada imagen ISO en la lista y, a continuaci?n, pulse <uicontrol>Crear plantillas desde ISO seleccionada</uicontrol>.</li>
 <li>Si la imagen ISO que desea utilizar no aparece en los resultados de la exploraci?n, puede seleccionar entre las opciones siguientes:<ul>
 <li>Seleccione <uicontrol>Deseo utilizar un archivo ISO espec?fico</uicontrol> para especificar una v?a de acceso a la imagen ISO.</li>
 <li>Pulse <uicontrol>Buscar m?s ISO</uicontrol> para buscar m?s im?genes ISO.</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/fr_FR/guests.dita b/ui/pages/help/fr_FR/guests.dita
index ad5b4e4..f86d3ed 100644
--- a/ui/pages/help/fr_FR/guests.dita
+++ b/ui/pages/help/fr_FR/guests.dita
@@ -9,21 +9,21 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="fr-fr">
 <title>Invit?s</title>
-<shortdesc>La page <wintitle>Invit?s</wintitle> r?pertorie les machines virtuelles KVM d?finies.</shortdesc>
+<shortdesc>La page <wintitle>Invit?s</wintitle> r?pertorie les invit?s d?finis pour le serveur.</shortdesc>
 <csbody>
 <p>Pour chaque invit?, les informations suivantes sont affich?es :<dl><dlentry>
 <dt>Nom</dt>
-<dd>Nom de la machine virtuelle.</dd>
+<dd>Nom de l'invit?.</dd>
 </dlentry><dlentry>
 <dt>UC</dt>
-<dd>Pourcentage d'utilisation du processeur sur la machine virtuelle.</dd>
-</dlentry><dlentry>
-<dt>E-S r?seau</dt>
-<dd>Vitesse de transmission d'entr?e-sortie du r?seau, exprim?e en ko par seconde.</dd>
+<dd>Pourcentage d'utilisation du processeur sur l'invit?.</dd>
 </dlentry><dlentry>
 <dt>E-S disque</dt>
 <dd>Vitesse de transmission d'entr?e-sortie du disque, exprim?e en ko par seconde.</dd>
 </dlentry><dlentry>
+<dt>E-S r?seau</dt>
+<dd>Vitesse de transmission d'entr?e-sortie du r?seau, exprim?e en ko par seconde.</dd>
+</dlentry><dlentry>
 <dt>Livetile</dt>
 <dd>Etat de la console du syst?me d'exploitation de l'h?te, ou
 ic?ne repr?sentant la distribution <tm tmtype="tm" trademark="Linux">Linux</tm>
@@ -41,90 +41,78 @@ l'alimentation est d?marr?e ; si l'ic?ne est verte, l'alimentation est arr?t
 <p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque invit? :<ul>
 <li>S?lectionnez <uicontrol>Connexion</uicontrol> pour vous connecter ? la console
 distante du syst?me d'exploitation invit?.</li>
-<li>S?lectionnez <uicontrol>G?rer le support</uicontrol> pour modifier le chemin
-d'acc?s au support d'installation.</li>
-<li>S?lectionnez <uicontrol>R?initialiser</uicontrol> pour r?initialiser l'invit?.</li>
+<li>S?lectionnez <uicontrol>Cloner</uicontrol> pour copier une d?finition d'invit? existante afin de cr?er un invit?.</li>
+<li>S?lectionnez <uicontrol>R?initialiser</uicontrol> pour r?initialiser l'invit?. Seul un h?te d?marr? peut ?tre r?initialis?.</li>
 <li>S?lectionnez <uicontrol>Editer</uicontrol> pour ?diter les propri?t?s d'un invit? existant. Les invit?s peuvent ?tre ?dit?s uniquement lorsqu'ils sont ? l'arr?t.</li>
+<li>S?lectionnez <uicontrol>D?marrer</uicontrol> pour d?marrer un invit?</li>
+<li>S?lectionnez <uicontrol>Arr?ter</uicontrol> pour arr?ter un invit?.</li>
+<li>S?lectionnez <uicontrol>Mettre hors tension</uicontrol> pour forcer un arr?t imm?diat de l'invit?.</li>
 <li>S?lectionnez <uicontrol>Supprimer</uicontrol> pour supprimer l'invit?.</li>
-</ul>Pour cr?er un invit?, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
-dans le coin sup?rieur droit de la page.</p>
+</ul>Pour cr?er un invit?, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol> sur la page.</p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="fr-fr">
-<title>Cr?er une machine virtuelle</title>
-<shortdesc>Cr?ez une machine virtuelle en utilisant un mod?le existant.</shortdesc>
+<title>Cr?er un invit?</title>
+<shortdesc>Cr?ation d'un invit? ? l'aide d'un mod?le existant.</shortdesc>
 <csbody>
 <p> <ol>
-<li>Entrez le nom ? utiliser pour identifier la machine virtuelle.</li>
-<li rev="rev1">S?lectionnez un mod?le. <ul>
+<li>Entrez le nom ? utiliser pour identifier l'invit?.</li>
+<li>S?lectionnez un mod?le. <ul>
 <li>Si des mod?les existent, faites un choix parmi les mod?les affich?s.</li>
 <li>Si aucun mod?le n'existe, cliquez sur <uicontrol>Cr?er un mod?le</uicontrol> pour cr?er un mod?le.</li>
-</ul></li>
+</ul>Vous pouvez afficher des informations sur un mod?le en le survolant avec la souris.</li>
 <li>Cliquez sur <uicontrol>Cr?er</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="fr-fr">
 <title>Editer l'invit?</title>
-<shortdesc>Editez les propri?t?s d'une machine virtuelle existante. Certaines propri?t?s
+<shortdesc>Edition des propri?t?s d'un invit? existant. Certaines propri?t?s
 peuvent ?tre ?dit?es uniquement lorsque l'invit? est arr?t?. D'autres seront appliqu?es ? l'amor?age suivant.</shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
 <csbody>
-<p>Pour chaque invit?, les informations suivantes sont affich?es dans l'onglet <wintitle>G?n?ral</wintitle> :<dl>
-<dlentry>
-<dt>Nom</dt>
-<dd>Nom de la machine virtuelle. (Ne peut ?tre ?dit? que lorsque l'invit? est arr?t?)</dd>
-</dlentry><dlentry>
-<dt>UC</dt>
-<dd>Nombre de processeurs. (Si l'invit? est en cours d'ex?cution, la nouvelle quantit? sera appliqu?e ? l'amor?age suivant)</dd>
-</dlentry><dlentry>
-<dt>M?moire</dt>
-<dd>Quantit? de m?moire en Mo. (Si l'invit? est en cours d'ex?cution, la nouvelle quantit? sera appliqu?e ? l'amor?age suivant)</dd>
-</dlentry><dlentry>
-<dt>Ic?ne</dt>
-<dd>Image graphique repr?sentant la distribution Linux ? afficher ? la place
-du statut en cours (Livetile) lorsque l'invit? n'est pas actif.</dd>
-</dlentry></dl></p>
-<p>Les informations suivantes sont affich?es dans l'onglet <wintitle>Stockage</wintitle>.</p>
 <dl><dlentry>
+<dt>G?n?ral</dt>
+<dd>Affiche des informations sur l'invit?, parmi lesquelles le nom, les UC, la m?moire et l'ic?ne ? utiliser pour l'invit?. Vous pouvez modifier le nom d'un invit? arr?t?. La modification des UC et de la m?moire prend effet ? l'amor?age suivant.</dd>
+</dlentry><dlentry>
 <dt>Stockage</dt>
-<dd>Affiche l'emplacement du fichier ISO utilis? pour l'installation.</dd>
+<dd>Affiche l'unit? et le chemin pour le stockage de l'invit? s?lectionn?.
+Vous pouvez ajouter, modifier et supprimer les unit?s de stockage de l'invit?.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Interface</dt>
+<dd>Affiche les informations de r?seau pour l'invit?, parmi lesquelles le nom, le type et l'adresse MAC. Vous pouvez ajouter, modifier et supprimer les interfaces de l'invit?.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Droits</dt>
+<dd>Affiche les utilisateurs et les groupes autoris?s pour l'invit?. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Unit? PCI h?te</dt>
+<dd>Affiche une liste de toutes les unit?s PCI disponibles sur l'h?te. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Image instantan?e</dt>
+<dd>Affiche les images instantan?es de l'invit?. Vous pouvez cr?er, modifier ou supprimer une image instantan?e. En s?lectionnant une image instantan?e et en choisissant l'option de r?tablissement, l'invit? est restaur? ? un point dans le pass?, d?termin? par les donn?es d'image instantan?e et annule les modifications apport?es au-del? de ce point dans le temps.</dd>
 </dlentry></dl>
 <p> Les zones qui ne sont pas d?sactiv?es peuvent ?tre ?dit?es. Apr?s que vous avez ?dit? une zone, cliquez sur <uicontrol>Sauvegarder</uicontrol>. </p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="fr-fr">
-<title>Ajoutez, remplacez ou d?tachez une unit? de stockage</title>
-<shortdesc rev="rev1">Vous pouvez ajouter, remplacer ou d?tacher une unit? de stockage
-pour votre machine virtuelle. Seule une unit? CD-ROM est prise en charge. Pour ?diter vos unit?s de stockage, proc?dez comme suit :</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="fr-fr">
+<title>Clonage d'un invit?</title>
+<shortdesc>Le clonage d'un invit? permet de cr?er une copie d'un invit?.</shortdesc>
 <csbody>
+<p>Pour cloner un invit? :</p>
 <ol>
-<li>Dans la fen?tre <wintitle>Editer l'invit?</wintitle>, s?lectionnez <wintitle>Stockage</wintitle>.</li>
-<li>Pour remplacer une unit? de stockage, cliquez sur la premi?re ic?ne avec la <uicontrol>barre oblique (/) orange</uicontrol>. Entrez le chemin d'acc?s au fichier ISO et cliquez sur <uicontrol>Remplacer</uicontrol>.</li>
-<li>Pour d?tacher une unit? de stockage, cliquez sur la deuxi?me ic?ne avec le <uicontrol>tiret (-) rouge</uicontrol>. Confirmer la suppression et cliquez sur <uicontrol>OK</uicontrol>.</li>
-<li>Pour ajouter une unit? de stockage, cliquez sur la troisi?me ic?ne avec le <uicontrol>signe plus (+) vert</uicontrol>. Entrez un nom d'unit? et un chemin d'acc?s au fichier ISO puis cliquez sur <uicontrol>Attacher</uicontrol>.</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="fr-fr">
-<title>Remplacer l'unit? CD-ROM d'une machine virtuelle</title>
-<shortdesc rev="rev1">Vous pouvez remplacer le contenu du CD-ROM pour
-une machine virtuelle une fois l'installation termin?e.</shortdesc>
-<csbody>
-<ol>
-<li>V?rifiez que la machine virtuelle est d?marr?e.</li>
-<li>Dans le menu Actions, s?lectionnez <uicontrol>G?rer le support</uicontrol>.</li>
-<li>Pour modifier les donn?es actuellement charg?es dans l'unit? de CD-ROM, cliquez sur l'ic?ne
-<uicontrol>barre oblique (/) orange</uicontrol> en regard de la zone hdc.</li>
-<li>Sur la page <wintitle>Remplacer une unit? CD-ROM d'une machine virtuelle</wintitle>,
-entrez le chemin d'acc?s au fichier ISO. Les deux autres zones sont en lecture seule.</li>
-<li>Cliquez sur <uicontrol>Remplacer</uicontrol>.</li>
+<li>S?lectionnez <uicontrol>Cloner</uicontrol> dans le menu Action d'un invit?.</li>
+<li>Acceptez l'avertissement. <note>Lorsqu'un invit? cible utilise des volumes SCSI ou iSCSI ou si le pool cible ne dispose pas de suffisamment d'espace, le clone est cr?? dans un pool de stockage par d?faut. </note></li>
 </ol>
+<p>Un invit? appara?t dans la liste avec le libell? <uicontrol>Clonage en cours...</uicontrol> Une fois le processus termin?, l'invit? clon? est disponible.</p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/fr_FR/host.dita b/ui/pages/help/fr_FR/host.dita
index f4c330b..099d342 100644
--- a/ui/pages/help/fr_FR/host.dita
+++ b/ui/pages/help/fr_FR/host.dita
@@ -19,17 +19,15 @@ connecter ? l'h?te.</shortdesc>
 <li>S?lectionnez <uicontrol>Connexion</uicontrol> pour ouvrir une connexion VNC
 au syst?me h?te, si celui-ci n'est pas d?j? connect?.</li>
 </ul></p>
-<p>Cliquez sur les sections suivantes pour afficher des informations sur l'h?te :<dl>
-<dlentry>
+<p>Cliquez sur les sections suivantes pour afficher des informations sur l'h?te :</p>
+<dl><dlentry>
 <dt>Informations de base</dt>
 <dd>Cette section affiche la distribution, la version et le nom de code
-du syst?me d'exploitation h?te, ainsi que le type de processeur et la quantit?
-de m?moire en Go.</dd>
+du syst?me d'exploitation h?te, ainsi que le type de processeur, le nombre d'UC en ligne et la quantit? de m?moire en Go.</dd>
 </dlentry><dlentry>
 <dt>Statistiques syst?me</dt>
 <dd>Cette section affiche les graphiques des statistiques pour l'UC, m?moire, ainsi que
-les E-S disque et E-S r?seau pour l'h?te. S?lectionnez <uicontrol>Collecte des donn?es une fois la page quitt?e</uicontrol>
-pour continuer la collecte de donn?es lorsque l'onglet h?te n'est plus visible.</dd>
+les E-S disque et E-S r?seau pour l'h?te. </dd>
 </dlentry><dlentry>
 <dt>Mises ? jour logicielles</dt>
 <dd>Cette section affiche des informations pour tous les modules qui
@@ -44,8 +42,7 @@ vous pouvez ajouter des r?f?rentiels <filepath>yum</filepath>.
 Si votre syst?me est de type Ubuntu ou Debian, ajoutez des r?f?rentiels
 <filepath>deb</filepath>.<p>Si vous travaillez avec des r?f?rentiels yum, vous pouvez ajouter un contr?le GPG
 afin de v?rifier qu'un module provenant de ce r?f?rentiel n'a pas ?t? endommag?.
-S?lectionnez un r?f?rentiel puis cliquez sur <uicontrol>Editer</uicontrol>. S?lectionnez <uicontrol>Oui</uicontrol> pour activer le contr?le GPG,
-puis entrez une URL pour le fichier de cl?s GPG du r?f?rentiel.</p></dd>
+S?lectionnez un r?f?rentiel puis cliquez sur <uicontrol>Editer</uicontrol>. S?lectionnez <uicontrol>Oui</uicontrol> pour activer <uicontrol>Contr?le GPG</uicontrol>, puis entrez une URL pour le fichier de cl?s GPG du r?f?rentiel.</p></dd>
 </dlentry><dlentry>
 <dt>Rapports de d?bogage</dt>
 <dd>Cette section affiche les rapports de d?bogage, y compris le nom et le chemin du fichier.
@@ -57,12 +54,12 @@ telles que la version du noyau d'ex?cution, les modules charg?s, ainsi que les
 du syst?me et de la maintenance.
 La commande ex?cute ?galement des programmes externes pour collecter des informations
 suppl?mentaires et stocke cette sortie dans l'archive r?sultante.</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/fr_FR/network.dita b/ui/pages/help/fr_FR/network.dita
index 5c2e9dd..f27e01f 100644
--- a/ui/pages/help/fr_FR/network.dita
+++ b/ui/pages/help/fr_FR/network.dita
@@ -31,8 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li rev="rev1">S?lectionnez <uicontrol>D?marrer</uicontrol> pour d?marrer la connexion au r?seau.</li>
 <li>S?lectionnez <uicontrol>Arr?ter</uicontrol> pour mettre fin ? la connexion au r?seau.</li>
 <li>S?lectionnez <uicontrol>Supprimer</uicontrol> pour supprimer les informations de connexion.</li>
-</ul>Pour cr?er un r?seau, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
-dans le coin sup?rieur droit de l'?cran.</p>
+</ul>Pour cr?er un r?seau, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="fr-fr">
 <title>Cr?er un r?seau</title>
@@ -62,6 +61,6 @@ sur la destination et le r?seau local virtuel.</dd>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/fr_FR/storage.dita b/ui/pages/help/fr_FR/storage.dita
index eebf2bb..fd0e7ca 100644
--- a/ui/pages/help/fr_FR/storage.dita
+++ b/ui/pages/help/fr_FR/storage.dita
@@ -10,13 +10,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhstor" xml:lang="fr-fr">
 <title>Stockage</title>
 <shortdesc>La page <wintitle>Stockage</wintitle> r?pertorie les pools de stockage disponibles,
-y compris les pools de stockage 'default' et 'ISO' pr?ts ? l'emploi.
-Si vous souhaitez utiliser votre propre pool de stockage ISO, ajoutez-le dans le chemin du pool de stockage 'ISO'.</shortdesc>
+y compris les pools de stockage 'default' et 'ISO' pr?ts ? l'emploi. Si vous souhaitez utiliser votre propre pool de stockage ISO, ajoutez-le dans le chemin du pool de stockage 'ISO'.</shortdesc>
 <csbody>
 <p>Pour chaque pool de stockage, les informations suivantes sont affich?es :<dl>
 <dlentry>
 <dt>Nom</dt>
-<dd>Nom du pool de stockage et pourcentage d'utilisation.</dd>
+<dd>Nom du pool de stockage.</dd>
+</dlentry><dlentry>
+<dt>% utilis?</dt>
+<dd>Pourcentage du pool de stockage utilis?.</dd>
 </dlentry><dlentry>
 <dt>Etat</dt>
 <dd>Etat du pool de stockage, actif (vert) ou inactif (rouge). </dd>
@@ -36,23 +38,11 @@ Si vous souhaitez utiliser votre propre pool de stockage ISO, ajoutez-le dans le
 <p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque pool de stockage :<ul>
 <li>S?lectionnez <uicontrol>Activer</uicontrol> pour activer le pool de stockage pour utilisation.</li>
 <li>S?lectionnez <uicontrol>D?sactiver</uicontrol> pour d?sactiver un pool de stockage actif.</li>
+<li>S?lectionnez <uicontrol>Ajouter un volume</uicontrol> pour ajouter un volume suppl?mentaire ? un pool de stockage actif.</li>
 <li>S?lectionnez <uicontrol>Annuler d?finition</uicontrol> pour retirer un pool de stockage inactif.</li>
 </ul></p>
 <p>Pour afficher les d?tails de volume de stockage pour un pool de stockage, cliquez sur la
-fl?che situ?e ? droite de la ligne du pool de stockage.  D?tails inclus :<dl><dlentry>
-<dt>Type</dt>
-<dd>Type de volume, par exemple <uicontrol>file</uicontrol>.</dd>
-</dlentry><dlentry>
-<dt>Format</dt>
-<dd>Format, variable selon le type.</dd>
-</dlentry><dlentry>
-<dt>Capacit?</dt>
-<dd>Taille du volume de stockage.</dd>
-</dlentry><dlentry>
-<dt>Allocation</dt>
-<dd>Quantit? d'espace d?j? allou?e dans le pool de stockage.</dd>
-</dlentry></dl>Pour d?finir un pool de stockage, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
-dans le coin sup?rieur droit de l'?cran.</p>
+fl?che situ?e ? droite de la ligne du pool de stockage.  Pour d?finir un pool de stockage, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="fr-fr">
 <title>D?finir un pool de stockage</title>
@@ -81,13 +71,28 @@ et la <uicontrol>Cible</uicontrol> sur le serveur iSCSI. Vous avez la possibilit
 <dt><uicontrol>Fibre Channel SCSI</uicontrol></dt>
 <dd>Indique un pool bas?e sur une connexion Fibre Channel SCSI. S?lectionnez l'adaptateur SCSI ? utiliser.</dd>
 </dlentry></dl></li>
+<li>Indiquez un chemin de stockage pour le pool de stockage. Le chemin de stockage est l'emplacement sur le syst?me de fichiers local vers lequel le pool est mapp?.
+Le chemin doit ?tre unique. Si le r?pertoire n'existe pas lorsque le pool est cr??, il est cr??.</li>
 <li>Cliquez sur <uicontrol>Cr?er</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="fr-fr">
+<title>Ajouter un volume</title>
+<shortdesc>Ajoute un volume ? un pool de stockage.</shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>Extraire de l'URL distante</dt>
+<dd>Indiquez l'emplacement ? partir duquel le volume est t?l?charg?. Exemple : <filepath>https://my-server/fedora22.img</filepath>.</dd>
+</dlentry><dlentry>
+<dt>T?l?charger un fichier</dt>
+<dd>Indique un emplacement sur le syst?me local.</dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/fr_FR/templates.dita b/ui/pages/help/fr_FR/templates.dita
index a517e33..abf08bc 100644
--- a/ui/pages/help/fr_FR/templates.dita
+++ b/ui/pages/help/fr_FR/templates.dita
@@ -12,8 +12,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <shortdesc>La page <wintitle>Mod?les</wintitle> affiche les mod?les de machine virtuelle d?finis
 pouvant ?tre utilis?s pour cr?er des h?tes KVM.</shortdesc>
 <csbody>
-<p>Pour chaque mod?le, les informations suivantes sont affich?es :<dl>
-<dlentry>
+<p>Pour chaque mod?le, les informations suivantes sont affich?es :</p>
+<dl><dlentry>
 <dt>SE</dt>
 <dd>Nom du syst?me d'exploitation ou de la distribution.</dd>
 </dlentry><dlentry>
@@ -25,71 +25,61 @@ pouvant ?tre utilis?s pour cr?er des h?tes KVM.</shortdesc>
 </dlentry><dlentry>
 <dt>M?moire</dt>
 <dd>Quantit? de m?moire vive ? allouer, en Mo.</dd>
-</dlentry></dl></p>
-<p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque mod?le :<ul>
+</dlentry></dl>
+<p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque mod?le :</p>
+<ul>
 <li>S?lectionnez <uicontrol>Editer</uicontrol> pour ?diter le mod?le.</li>
+<li>S?lectionnez <uicontrol>Cloner</uicontrol> pour copier un mod?le.</li>
 <li>S?lectionnez <uicontrol>Supprimer</uicontrol> pour supprimer le mod?le.</li>
-</ul>Pour ajouter un mod?le, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
-dans le coin sup?rieur droit de l'?cran.</p>
+</ul>
+<p>Pour ajouter un mod?le, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="fr-fr">
 <title>Editer un mod?le</title>
-<shortdesc>Editez un mod?le existant.</shortdesc>
+<shortdesc>Modifie un mod?le existant.</shortdesc>
 <csbody>
-<p>Pour chaque mod?le, les informations suivantes sont affich?es : <dl>
-<dlentry>
-<dt>Nom</dt>
-<dd>Nom du mod?le.</dd>
+<p>Pour chaque mod?le, les informations suivantes sont affich?es : </p>
+<dl><dlentry>
+<dt>G?n?ral</dt>
+<dd>Affiche le nom, la distribution de fournisseur, la version, la m?moire, le chemin d'acc?s au fichier ISO et les pr?f?rences graphiques.</dd>
 </dlentry><dlentry>
-<dt>Fournisseur</dt>
-<dd>Nom de la soci?t? qui a cr?? le syst?me d'exploitation ou la distribution
-pour lequel/laquelle le mod?le est configur?.</dd>
+<dt>Stockage</dt>
+<dd>Indique les informations de pool de stockage pour le mod?le.</dd>
 </dlentry><dlentry>
-<dt>Version</dt>
-<dd>Version du syst?me d'exploitation ou de la distribution
-pour lequel/laquelle le mod?le est configur?.</dd>
-</dlentry><dlentry>
-<dt>Nombre d'UC</dt>
-<dd>Nombre de processeurs d?finis pour le mod?le.</dd>
-</dlentry><dlentry>
-<dt>M?moire</dt>
-<dd>Quantit? de m?moire en Mo ? allouer ? la machine virtuelle.</dd>
-</dlentry><dlentry>
-<dt>Disque</dt>
-<dd>Taille du disque en Go.</dd>
-</dlentry><dlentry>
-<dt>CD-ROM</dt>
-<dd>chemin d'acc?s au fichier pour l'emplacement du fichier ISO utilis? pour l'installation de l'invit? KVM.</dd>
-</dlentry><dlentry>
-<dt>Pool de stockage</dt>
-<dd>Pool de stockage sp?cifique ou pool de stockage par d?faut.</dd>
-</dlentry><dlentry>
-<dt>R?seau</dt>
-<dd>Interfaces r?seau par d?faut disponibles pour l'invit? KVM. Vous pouvez
+<dt>Interface</dt>
+<dd>Affiche les interfaces r?seau par d?faut disponibles pour l'invit? KVM.
+Vous pouvez
 s?lectionner plusieurs r?seaux.</dd>
-</dlentry></dl> Les zones qui ne sont pas d?sactiv?es peuvent ?tre ?dit?es. Apr?s que vous avez ?dit? une zone, cliquez sur <uicontrol>Sauvegarder</uicontrol>. </p>
+</dlentry><dlentry>
+<dt>Processeur</dt>
+<dd>Dans la zone <uicontrol>Nombre d'UC</uicontrol>, indiquez le nombre de processus d?finis pour le mod?le.</dd>
+<dd>Choisissez de d?finir manuellement la topologie d'UC pour chaque invit?.</dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>Ajouter un mod?le</title>
-<shortdesc>Ajoutez un mod?le ? partir du support source.
-Vous pouvez ajouter votre propre image ISO au pool de stockage 'ISO' pour la reconnaissance suivante.</shortdesc>
+<shortdesc>Ajoute un mod?le ? partir du support source. Vous pouvez ajouter votre propre image ISO au pool de stockage 'ISO' pour la reconnaissance suivante.</shortdesc>
 <csbody>
-<p>S?lectionnez l'emplacement du support source ? partir des options suivantes :<dl>
-<dlentry>
+<p>S?lectionnez l'emplacement du support source ? partir des options suivantes :</p>
+<dl><dlentry>
 <dt>Image ISO locale</dt>
 <dd>S?lectionnez cette option pour rechercher dans les pools de stockage l'image d'installation ISO disponible sur le syst?me.</dd>
 </dlentry><dlentry>
+<dt>Fichier image local</dt>
+<dd>Choisissez de s?lectionner un chemin d'acc?s au fichier image local.</dd>
+</dlentry><dlentry>
 <dt>Image ISO distante</dt>
 <dd>S?lectionnez cette option pour indiquer un emplacement distant pour une image d'installation ISO.</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>Ajouter un mod?le - Image ISO locale</title>
-<shortdesc>Ajoutez un mod?le ? partir d'une image ISO locale.</shortdesc>
+<title>Ajouter un mod?le - image ISO</title>
+<shortdesc>Ajoute un mod?le ? partir d'une image ISO.</shortdesc>
 <csbody>
-<p>Les images ISO disponibles sur le syst?me sont affich?es.<dl><dlentry>
+<p>Les images ISO disponibles sur le syst?me s'affichent ? distance.</p>
+<dl><dlentry>
 <dt>SE</dt>
 <dd>Nom du syst?me d'exploitation ou de la distribution.</dd>
 </dlentry><dlentry>
@@ -98,8 +88,9 @@ Vous pouvez ajouter votre propre image ISO au pool de stockage 'ISO' pour la rec
 </dlentry><dlentry>
 <dt>Taille</dt>
 <dd>Taille de l'image ISO.</dd>
-</dlentry></dl></p>
-<p>Pour cr?er un mod?le ? partir d'une image ISO, choisissez parmi les options suivantes :<ul>
+</dlentry></dl>
+<p>Pour cr?er un mod?le ? partir d'une image ISO, choisissez parmi les options suivantes :</p>
+<ul>
 <li>S?lectionnez une image ISO ? partir de laquelle cr?er un mod?le, puis cliquez sur <uicontrol>Cr?er des mod?les ? partir de l'ISO s?lectionn? </uicontrol>.</li>
 <li>S?lectionnez <uicontrol>Tout</uicontrol> pour cr?er un mod?le ? partir de chaque
 image ISO r?pertori?e, puis cliquez sur <uicontrol>Cr?er des mod?les ? partir de l'ISO s?lectionn?</uicontrol>.</li>
@@ -109,12 +100,12 @@ d'analyse, vous pouvez faire un choix parmi les options suivantes :<ul>
 sp?cifier un chemin d'acc?s ? l'image ISO.</li>
 <li>Cliquez sur <uicontrol>Rechercher d'autres images ISO</uicontrol> pour rechercher des images ISO suppl?mentaires.</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/it_IT/guests.dita b/ui/pages/help/it_IT/guests.dita
index e05db7e..26a5fbd 100644
--- a/ui/pages/help/it_IT/guests.dita
+++ b/ui/pages/help/it_IT/guests.dita
@@ -9,22 +9,22 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="it-it">
 <title>Guest</title>
-<shortdesc>La pagina <wintitle>Guest</wintitle> elenca le macchine virtuali
-KVM definite.</shortdesc>
+<shortdesc>La pagina <wintitle>Guest</wintitle> elenca le macchine guest
+definite per il server.</shortdesc>
 <csbody>
 <p>Per ciascuna macchina guest vengono visualizzate le seguenti informazioni:<dl><dlentry>
 <dt>Nome</dt>
-<dd>Il nome della macchina virtuale.</dd>
+<dd>Il nome della macchina guest.</dd>
 </dlentry><dlentry>
 <dt>CPU</dt>
-<dd>La percentuale di utilizzo del processore nella macchina virtuale.</dd>
-</dlentry><dlentry>
-<dt>I/O di rete</dt>
-<dd>La velocit? di trasmissione dell'input/output di rete in KB al  secondo.</dd>
+<dd>La percentuale di utilizzo del processore nella macchina guest.</dd>
 </dlentry><dlentry>
 <dt>I/O disco</dt>
 <dd>La velocit? di trasmissione dell'input/output disco in KB al  secondo.</dd>
 </dlentry><dlentry>
+<dt>I/O di rete</dt>
+<dd>La velocit? di trasmissione dell'input/output di rete in KB al  secondo.</dd>
+</dlentry><dlentry>
 <dt>Riquadro animato</dt>
 <dd>Lo stato della console del sistema operativo della macchina guest o un'icona che rappresenta la distribuzione <tm tmtype="tm" trademark="Linux">Linux</tm> se la macchina guest non ? attiva.</dd>
 </dlentry></dl></p>
@@ -38,86 +38,79 @@ KVM definite.</shortdesc>
 </dlentry></dl> </p>
 <p>Per ciascuna macchina guest ? possibile selezionare le azioni indicate di seguito:<ul>
 <li>Selezionare <uicontrol>Connetti</uicontrol> per effettuare la connessione alla console remota per il sistema operativo della macchina guest.</li>
-<li>Selezionare <uicontrol>Gestisci supporti</uicontrol> per modificare il percorso al supporto di installazione.</li>
-<li>Selezionare <uicontrol>Reimposta</uicontrol> per reimpostare la macchina guest.</li>
+<li>Selezionare <uicontrol>Clona</uicontrol> per copiare una definizione di macchina guest esistente e creare una macchina guest.</li>
+<li>Selezionare <uicontrol>Reimposta</uicontrol> per reimpostare la macchina guest. ? possibile reimpostare solo una macchina guest che ? stata avviata. </li>
 <li>Selezionare <uicontrol>Modifica</uicontrol> per modificare le propriet??di una macchina guest esistente. ? possibile modificare le macchine guest solo se sono arrestate.</li>
+<li>Selezionare <uicontrol>Avvia</uicontrol> per avviare una macchina guest. </li>
+<li>Selezionare <uicontrol>Arresta</uicontrol> per arrestare una macchina guest con il periodo di grazia. </li>
+<li>Selezionare <uicontrol>Spegni</uicontrol> per forzare un arresto immediato della macchina guest. </li>
 <li>Selezionare <uicontrol>Elimina</uicontrol> per eliminare la macchina guest.</li>
-</ul>Per creare una macchina guest, o macchina virtuale, fare clic sull'icona <uicontrol>pi?
-(+)</uicontrol> nella parte in alto a destra della pagina.</p>
+</ul>Per creare una macchina guest fare clic sull'icona <uicontrol>pi?
+(+)</uicontrol> sulla pagina. </p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="it-it">
-<title>Creare una macchina virtuale</title>
-<shortdesc>Creare una macchina virtuale utilizzando un modello esistente.</shortdesc>
+<title>Creare una macchina guest</title>
+<shortdesc>Creare una macchina guest utilizzando un modello esistente.</shortdesc>
 <csbody>
 <p> <ol>
-<li>Immettere il nome da utilizzare per identificare la macchina virtuale.</li>
-<li rev="rev1">Selezionare un modello. <ul>
+<li>Immettere il nome da utilizzare per identificare la macchina guest.</li>
+<li>Selezionare un modello. <ul>
 <li>Se il modello esiste, selezionarlo dai modelli visualizzati.</li>
 <li>Se non esiste alcun modello, fare clic su <uicontrol>Crea un modello</uicontrol> per crearne uno.</li>
-</ul></li>
+</ul>? possibile visualizzare le informazioni su un modello passando con il cursore del mouse su esso. </li>
 <li>Fare clic su <uicontrol>Crea</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="it-it">
 <title>Modifica macchina guest</title>
-<shortdesc>Modificare le propriet? di una macchina virtuale esistente. Alcune propriet? possono essere
+<shortdesc>Modificare le propriet? di una macchina guest esistente. Alcune propriet? possono essere
 modificate solo mentre la macchina guest ? arrestata. Altre diventeranno effettive al prossimo avvio.</shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
 <csbody>
-<p>Per ciascuna macchina guest vengono visualizzate le seguenti informazioni sulla scheda <wintitle>Generale</wintitle>:<dl>
-<dlentry>
-<dt>Nome</dt>
-<dd>Il nome della macchina virtuale. (Pu? essere modificato solo mentre la macchina guest ? arrestata)</dd>
-</dlentry><dlentry>
-<dt>CPU</dt>
-<dd>Il numero di processori. (Se la macchina guest ? in esecuzione, la nuova quantit? diventer? effettiva
-al prossimo avvio)</dd>
+<dl><dlentry>
+<dt>Generale</dt>
+<dd>Visualizza informazioni sulla macchina guest, incluso il nome, le CPU, la memoria e l'icona per utilizzare la macchina guest. ? possibile modificare il nome di una macchina guest arrestata. La modifica delle CPU e della memoria ha effetto al successivo avvio. </dd>
 </dlentry><dlentry>
 <dt>Memoria</dt>
-<dd>La quantit? di memoria in MB. (Se la macchina guest ? in esecuzione, la nuova quantit? diventer? effettiva
-al prossimo avvio)</dd>
-</dlentry><dlentry>
-<dt>Icona</dt>
-<dd>L'immagine grafica che rappresenta la distribuzione Linux da visualizzare al posto dello stato corrente (Riquadro animato) quando la macchina guest non ? attiva.</dd>
-</dlentry></dl></p>
-<p>Sulla scheda <wintitle>Memoria</wintitle> vengono visualizzate le seguenti informazioni.</p>
+<dd>Visualizza il dispositivo e il percorso per la memoria della macchina guest selezionata.
+? possibile aggiungere, modificare e rimuovere i dispositivi di memoria per la macchina guest. </dd>
+</dlentry></dl>
 <dl><dlentry>
-<dt>Memoria</dt>
-<dd>Visualizza l'ubicazione del file ISO utilizzato per  l'installazione.</dd>
+<dt>Interfaccia</dt>
+<dd>Visualizza le informazioni di rete per la macchina guest, incluso il nome, il tipo e l'indirizzo MAC. ? possibile aggiungere, modificare e rimuovere le interfacce per la macchina guest. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Autorizzazione</dt>
+<dd>Visualizza gli utenti e i gruppi autorizzati per la macchina guest. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Dispositivo PCI host</dt>
+<dd>Visualizza un elenco di tutti i dispositivi PCI disponibili sull'host. </dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Istantanea</dt>
+<dd>Visualizza le istantanee della macchina guest. ? possibile creare, modificare o eliminare un'istantanea. Selezionando un'istantanea e scegliendo l'opzione Inverti, la macchina guest viene ripristinata a un punto nel passato, determinato dai dati dell'istantanea, ed elimina le modifiche effettuate dopo tale punto nel tempo. </dd>
 </dlentry></dl>
 <p> I campi non disabilitati possono essere modificati. Dopo aver modificato un campo, fare clic su <uicontrol>Salva</uicontrol>. </p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="it-it">
-<title>Aggiungere, sostituire o scollegare un dispositivo di memoria.</title>
-<shortdesc rev="rev1">? possibile aggiungere, sostituire o scollegare un dispositivo di memoria per la macchina virtuale. L'unico dispositivo supportato ? CDROM. Per modificare i dispositivi di memoria, attenersi alla seguente procedura:</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="it-it">
+<title>Clonazione di una macchina guest</title>
+<shortdesc>La clonazione di una macchina guest consente all'utente di creare una copia di una macchina guest. </shortdesc>
 <csbody>
+<p>Per clonare una macchina guest:</p>
 <ol>
-<li>Nella finestra <wintitle>Modifica macchina guest</wintitle>, selezionare <wintitle>Memoria</wintitle>.</li>
-<li>Per sostituire un dispositivo di memoria, fare clic sulla prima icona con la <uicontrol>barra (/) arancione</uicontrol>. Immettere il percorso del file ISO e fare clic su <uicontrol>Sostituisci</uicontrol>.</li>
-<li>Per scollegare un dispositivo di memoria, fare clic sulla seconda  icona con il <uicontrol>trattino (-) rosso</uicontrol>. Confermare l'eliminazione facendo clic su <uicontrol>OK</uicontrol>.</li>
-<li>Per aggiungere un dispositivo di memoria, fare clic sulla terza icona con il <uicontrol>segno pi? (+)</uicontrol> verde. Immettere un nome dispositivo e percorso file ISO e fare clic su <uicontrol>Collega</uicontrol>.</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="it-it">
-<title>Sostituisci un CDROM della macchina virtuale</title>
-<shortdesc rev="rev1">? possibile sostituire il contenuto del CDROM per una macchina virtuale dopo il completamento dell'installazione.</shortdesc>
-<csbody>
-<ol>
-<li>Assicurarsi che la macchina virtuale sia avviata.</li>
-<li>Dal menu Azioni, selezionare <uicontrol>Gestisci supporti</uicontrol>.</li>
-<li>Per modificare il contenuto correntemente caricato sul CDROM, fare clic sull'icona della <uicontrol>barra (/) arancione</uicontrol> accanto al campo hdc.</li>
-<li>Sulla pagina <wintitle>Sostituisci un CDROM della macchina virtuale</wintitle>, immettere il percorso del file ISO. Gli altri due campi sono di sola lettura.</li>
-<li>Fare clic su <uicontrol>Sostituisci</uicontrol>.</li>
+<li>Selezionare <uicontrol>Clona</uicontrol> dal menu Azione di una macchina guest. </li>
+<li>Accettare l'avvertenza. <note>Se una macchina guest di destinazione utilizza volumi SCSI o iSCSI o se un pool di destinazione non dispone di spazio sufficiente, il clone verr? creato su un pool di memoria predefinito. </note></li>
 </ol>
+<p>Una macchina guest viene visualizzata nell'elenco con l'etichetta <uicontrol>Clonazione...</uicontrol>. Quando il processo ? completo, la macchina guest clonata ? disponibile per l'uso. </p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/it_IT/host.dita b/ui/pages/help/it_IT/host.dita
index 63d3367..c2783bf 100644
--- a/ui/pages/help/it_IT/host.dita
+++ b/ui/pages/help/it_IT/host.dita
@@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li>Selezionare <uicontrol>Riavvia</uicontrol> per riavviare il sistema host.</li>
 <li>Selezionare <uicontrol>Connetti</uicontrol> per aprire una connessione VNC al sistema host, se non ? gi? connesso.</li>
 </ul></p>
-<p>Fare clic sulle seguenti sezioni per visualizzare le informazioni sull'host:<dl>
-<dlentry>
+<p>Fare clic sulle seguenti sezioni per visualizzare le informazioni sull'host:</p>
+<dl><dlentry>
 <dt>Informazioni di base</dt>
-<dd>Questa sezione visualizza il nome codice, la versione e la distribuzione del sistema operativo, come pure il tipo di processore e la quantit? di memoria in GB.</dd>
+<dd>Questa sezione visualizza il nome codice, la versione e la distribuzione del sistema operativo, come pure il tipo di processore, il numero di CPU in linea e la quantit? di memoria in GB.</dd>
 </dlentry><dlentry>
 <dt>Statistiche di sistema</dt>
-<dd>Questa sezione visualizza i grafici che mostrano le statistiche per la CPU, la memoria, l'I/O disco e di rete per l'host. Selezionare <uicontrol>Raccolta dati all'uscita dalla pagina</uicontrol> per continuare la raccolta dei dati quando la scheda host non ? pi? visibile.</dd>
+<dd>Questa sezione visualizza i grafici che mostrano le statistiche per la CPU, la memoria, l'I/O disco e di rete per l'host. </dd>
 </dlentry><dlentry>
 <dt>Aggiornamenti del software</dt>
 <dd>Questa sezione visualizza le informazioni per tutti i pacchetti per cui sono disponibili gli aggiornamenti, incluso il nome, la versione, l'architettura e il repository del pacchetto. ? possibile aggiornare tutti i pacchetti elencati, selezionando <uicontrol>Aggiorna tutto</uicontrol>. Non ? possibile selezionare singoli pacchetti per gli aggiornamenti.</dd>
@@ -32,7 +32,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 consente all'host di accedervi. Se il sistema ? Red Hat Enterprise
 Linux o Fedora, ? possibile aggiungere i repository <filepath>yum</filepath>.
 Se il sistema ? Ubuntu o Debian, aggiungere i repository <filepath>deb</filepath>.<p>Se si stanno utilizzando i repository yum,  ? possibile aggiungere un controllo GPG per verificare che un pacchetto da questo repository non sia stato corrotto.
-Selezionare un repository, quindi <uicontrol>Modifica</uicontrol>. Selezionare <uicontrol>S?</uicontrol> per abilitare il controllo GPG, quindi immettere un URL al file di chiavi GPG per il
+Selezionare un repository, quindi <uicontrol>Modifica</uicontrol>. Selezionare <uicontrol>S?</uicontrol> per abilitare il <uicontrol>controllo GPG</uicontrol>, quindi immettere un URL al file di chiavi GPG per il
 repository.</p></dd>
 </dlentry><dlentry>
 <dt>Report di debug</dt>
@@ -40,12 +40,12 @@ repository.</p></dd>
 Le opzioni disponibili consentono di generare un nuovo report oppure ridenominare, rimuovere o scaricare un report esistente.<p>Il report di debug viene generato utilizzando il comando <cmdname>sosreport</cmdname>. ? disponibile per le distribuzioni Red
 Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora e Ubuntu. Il comando genera un file .tar che contiene informazioni di diagnostica e configurazione, come la versione del kernel in esecuzione, i moduli caricati e i file di configurazione del servizio e del sistema.
 Il comando esegue anche programmi esterni per raccogliere ulteriori informazioni e memorizza l'output nell'archivio risultante.</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/it_IT/network.dita b/ui/pages/help/it_IT/network.dita
index a396d58..2cdec19 100644
--- a/ui/pages/help/it_IT/network.dita
+++ b/ui/pages/help/it_IT/network.dita
@@ -33,7 +33,7 @@ address translation).</dd>
 <li>Selezionare <uicontrol>Arresta</uicontrol> per terminare la connessione di rete.</li>
 <li>Selezionare <uicontrol>Elimina</uicontrol> per eliminare le informazioni di connessione.</li>
 </ul>Per creare una rete fare clic sull'icona <uicontrol>pi?
-(+)</uicontrol> nella parte in alto a destra del pannello.</p>
+(+)</uicontrol>. </p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="it-it">
 <title>Crea una rete</title>
@@ -58,6 +58,6 @@ address translation).</dd>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/it_IT/storage.dita b/ui/pages/help/it_IT/storage.dita
index 5a9bc25..becf007 100644
--- a/ui/pages/help/it_IT/storage.dita
+++ b/ui/pages/help/it_IT/storage.dita
@@ -10,13 +10,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhstor" xml:lang="it-it">
 <title>Memoria</title>
 <shortdesc>La pagina <wintitle>Memoria</wintitle> elenca i pool di memoria
-disponibili, compresi i pool di memoria pronti per l'uso 'default' e 'ISO'.
-Se si desidera utilizzare un proprio ISO, aggiungerlo al percorso del pool di memoria 'ISO'.</shortdesc>
+disponibili, compresi i pool di memoria pronti per l'uso 'default' e 'ISO'. Se si desidera utilizzare un proprio ISO, aggiungerlo al percorso del pool di memoria 'ISO'.</shortdesc>
 <csbody>
 <p>Per ciascun pool di memoria vengono visualizzate le seguenti informazioni:<dl>
 <dlentry>
 <dt>Nome</dt>
-<dd>Il nome del pool di memoria e la percentuale utilizzata.</dd>
+<dd>Il nome del pool di memoria.</dd>
+</dlentry><dlentry>
+<dt>% utilizzata</dt>
+<dd>La percentuale del pool di memoria utilizzata. </dd>
 </dlentry><dlentry>
 <dt>Stato</dt>
 <dd>Lo stato del pool di memoria, attivo (verde) o non attivo (rosso). </dd>
@@ -36,22 +38,11 @@ Se si desidera utilizzare un proprio ISO, aggiungerlo al percorso del pool di me
 <p>Per ciascun pool di memoria ? possibile selezionare le azioni indicate di seguito:<ul>
 <li>Selezionare <uicontrol>Attiva</uicontrol> per attivare il pool di memoria in modo da poterlo utilizzare.</li>
 <li>Selezionare <uicontrol>Disattiva</uicontrol> per disattivare un pool di memoria attivo.</li>
+<li>Selezionare <uicontrol>Aggiungi volume</uicontrol> per aggiungere altri volumi a un pool di memoria attivo.</li>
 <li>Selezionare <uicontrol>Rimuovi definizione</uicontrol> per rimuovere un pool di memoria non attivo.</li>
 </ul></p>
-<p>Per visualizzare i dettagli del volume di memoria per un pool di memoria, fare clic sulla freccia sul lato destro della riga del pool di memoria.  I dettagli includono:<dl><dlentry>
-<dt>Tipo</dt>
-<dd>Il tipo di volume, ad esempio, <uicontrol>file</uicontrol>.</dd>
-</dlentry><dlentry>
-<dt>Formato</dt>
-<dd>Il formato, che varia in base al tipo.</dd>
-</dlentry><dlentry>
-<dt>Capacit?</dt>
-<dd>La dimensione del volume di memoria.</dd>
-</dlentry><dlentry>
-<dt>Assegnazione</dt>
-<dd>La quantit? di spazio gi? assegnato nel pool di memoria.</dd>
-</dlentry></dl>Per definire un pool di memoria fare clic sull'icona <uicontrol>pi?
-(+)</uicontrol> nella parte in alto a destra del pannello.</p>
+<p>Per visualizzare i dettagli del volume di memoria per un pool di memoria, fare clic sulla freccia sul lato destro della riga del pool di memoria.  Per definire un pool di memoria fare clic sull'icona <uicontrol>pi?
+(+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="it-it">
 <title>Definire un pool di memoria</title>
@@ -79,13 +70,29 @@ Quando si seleziona <uicontrol>iSCSI</uicontrol>, immettere l'indirizzo IP del <
 <dd>Specifica un pool basato su un canale a fibre ottiche SCSI. Selezionare quale adattatore
 SCSI utilizzare.</dd>
 </dlentry></dl></li>
+<li>Specificare un percorso di memoria per il pool di memoria. Il percorso di memoria ? l'ubicazione nel file system locale con cui il pool ? associato.
+Il percorso deve essere univoco. Se la directory non esiste al momento della creazione del
+pool, verr? creata per l'utente. </li>
 <li>Fare clic su <uicontrol>Crea</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="it-it">
+<title>Aggiungi volume</title>
+<shortdesc>Aggiunge volumi a un pool di memoria.</shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>Richiama da URL remoto</dt>
+<dd>Specifica un'ubicazione da cui scaricare il volume. Ad esempio: <filepath>https://my-server/fedora22.img</filepath>.</dd>
+</dlentry><dlentry>
+<dt>Carica un file</dt>
+<dd>Specifica un'ubicazione sul sistema locale. </dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/it_IT/templates.dita b/ui/pages/help/it_IT/templates.dita
index 9b84b16..5b992c1 100644
--- a/ui/pages/help/it_IT/templates.dita
+++ b/ui/pages/help/it_IT/templates.dita
@@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <title>Modelli</title>
 <shortdesc>La pagina <wintitle>Modelli</wintitle> visualizza i modelli di macchina virtuale definiti che ? possibile utilizzare per creare macchine guest KVM.</shortdesc>
 <csbody>
-<p>Per ciascun modello vengono visualizzate le seguenti informazioni:<dl>
-<dlentry>
+<p>Per ciascun modello vengono visualizzate le seguenti informazioni:</p>
+<dl><dlentry>
 <dt>SO</dt>
 <dd>Il nome del sistema operativo o della distribuzione.</dd>
 </dlentry><dlentry>
@@ -24,69 +24,61 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>Memoria</dt>
 <dd>La quantit? di memoria ad accesso casuale da assegnare, in MB.</dd>
-</dlentry></dl></p>
-<p>Per ciascun modello ? possibile selezionare le azioni indicate di seguito:<ul>
+</dlentry></dl>
+<p>Per ciascun modello ? possibile selezionare le azioni indicate di seguito:</p>
+<ul>
 <li>Selezionare <uicontrol>Modifica</uicontrol> per modificare il modello.</li>
+<li>Selezionare <uicontrol>Clona</uicontrol> per copiare un modello. </li>
 <li>Selezionare <uicontrol>Elimina</uicontrol> per eliminare il modello.</li>
-</ul>Per aggiungere un modello fare clic sull'icona <uicontrol>pi?
-(+)</uicontrol> nella parte in alto a destra del pannello.</p>
+</ul>
+<p>Per aggiungere un modello fare clic sull'icona <uicontrol>pi?
+(+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="it-it">
 <title>Modifica modello</title>
 <shortdesc>Modificare un modello esistente.</shortdesc>
 <csbody>
-<p>Per ciascun modello vengono visualizzate le seguenti informazioni: <dl>
-<dlentry>
-<dt>Nome</dt>
-<dd>Il nome del modello.</dd>
-</dlentry><dlentry>
-<dt>Fornitore</dt>
-<dd>Il nome della societ? che ha creato il sistema operativo o la distribuzione per il cui utilizzo ? configurato il modello.</dd>
-</dlentry><dlentry>
-<dt>Versione</dt>
-<dd>La versione del sistema operativo o della distribuzione per il cui utilizzo ? configurato il modello.</dd>
-</dlentry><dlentry>
-<dt>Numero CPU</dt>
-<dd>Il numero di processori definiti per il modello.</dd>
+<p>Per ciascun modello vengono visualizzate le seguenti informazioni: </p>
+<dl><dlentry>
+<dt>Generale</dt>
+<dd>Visualizza il nome, la distribuzione fornitore, la versione, la memoria, il percorso file al file ISO e le preferenze grafiche. </dd>
 </dlentry><dlentry>
 <dt>Memoria</dt>
-<dd>La quantit? di memoria in MB da assegnare alla macchina virtuale.</dd>
-</dlentry><dlentry>
-<dt>Disco</dt>
-<dd>La dimensione del disco in GB.</dd>
+<dd>Specificare le informazioni pool di memoria per il modello. </dd>
 </dlentry><dlentry>
-<dt>CDROM</dt>
-<dd>Il percorso file all'ubicazione del file ISO utilizzato per installare la macchina guest
-KVM.</dd>
+<dt>Interfaccia</dt>
+<dd>Visualizza le interfacce di rete predefinite disponibili per la macchina guest KVM.
+? possibile selezionare pi? reti.</dd>
 </dlentry><dlentry>
-<dt>Pool di memoria</dt>
-<dd>Un pool di memoria specifico o quello predefinito.</dd>
-</dlentry><dlentry>
-<dt>Rete</dt>
-<dd>Le interfacce di rete predefinite disponibili per la macchina guest KVM. ? possibile selezionare pi? reti.</dd>
-</dlentry></dl> I campi non disabilitati possono essere modificati. Dopo aver modificato un campo, fare clic su <uicontrol>Salva</uicontrol>. </p>
+<dt>Processore</dt>
+<dd>Il campo <uicontrol>Numero CPU</uicontrol>, specifica il numero di processori definiti per il modello. </dd>
+<dd>Selezionare l'impostazione manuale della topologia della CPU per ogni macchina  guest.</dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>Aggiungi modello</title>
-<shortdesc>Aggiungere un modello dal supporto di origine.
-? possibile aggiungere una propria immagine ISO al pool di memoria 'ISO' per la seguente individuazione.</shortdesc>
+<shortdesc>Aggiungere un modello dal supporto di origine. ? possibile aggiungere una propria immagine ISO al pool di memoria 'ISO' per la seguente individuazione.</shortdesc>
 <csbody>
-<p>Selezionare l'ubicazione del supporto di origine dalle seguenti opzioni:<dl>
-<dlentry>
+<p>Selezionare l'ubicazione del supporto di origine dalle seguenti opzioni:</p>
+<dl><dlentry>
 <dt>Immagine ISO locale</dt>
 <dd>Selezionare questa opzione per eseguire la scansione dei pool di memoria alla ricerca di immagini ISO di installazione disponibili sul sistema.</dd>
 </dlentry><dlentry>
+<dt>File immagine locale</dt>
+<dd>Selezionare per specificare un percorso al file immagine locale. </dd>
+</dlentry><dlentry>
 <dt>Immagine ISO remota</dt>
 <dd>Selezionare questa opzione per specificare un'ubicazione remota per un'immagine ISO di installazione.</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>Aggiungi modello - Immagine ISO locale</title>
-<shortdesc>Aggiungere un modello da un'immagine ISO locale.</shortdesc>
+<title>Aggiungi modello - Immagine ISO</title>
+<shortdesc>Aggiungere un modello da un'immagine ISO.</shortdesc>
 <csbody>
-<p>Vengono visualizzate le immagini ISO disponibili sul sistema.<dl><dlentry>
+<p>Vengono visualizzate in remoto le immagini ISO disponibili sul sistema.</p>
+<dl><dlentry>
 <dt>SO</dt>
 <dd>Il nome del sistema operativo o della distribuzione.</dd>
 </dlentry><dlentry>
@@ -95,8 +87,9 @@ KVM.</dd>
 </dlentry><dlentry>
 <dt>Dimensione</dt>
 <dd>La dimensione dell'immagine ISO.</dd>
-</dlentry></dl></p>
-<p>Per creare un modello da un'immagine ISO scegliere tra le seguenti opzioni:<ul>
+</dlentry></dl>
+<p>Per creare un modello da un'immagine ISO scegliere tra le seguenti opzioni:</p>
+<ul>
 <li>Selezionare un'immagine ISO da cui creare un modello, quindi fare clic su <uicontrol>Crea modelli da ISO selezionato</uicontrol>.</li>
 <li>Selezionare <uicontrol>Tutti</uicontrol> per creare un modello da ciascuna immagine ISO elencata, quindi fare clic su <uicontrol>Crea modelli da ISO selezionato</uicontrol>.</li>
 <li>Se nei risultati della scansione non viene visualizzata l'immagine ISO che si desidera utilizzare, ? possibile selezionare dalle seguenti opzioni:<ul>
@@ -104,12 +97,12 @@ KVM.</dd>
 <li>Fare clic su <uicontrol>Ricerca pi? ISO</uicontrol> per ricercare pi? immagini
 ISO.</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ko_KR/guests.dita b/ui/pages/help/ko_KR/guests.dita
index 2d9f32b..b0df5b9 100644
--- a/ui/pages/help/ko_KR/guests.dita
+++ b/ui/pages/help/ko_KR/guests.dita
@@ -9,21 +9,22 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="ko-kr">
 <title>???</title>
-<shortdesc><wintitle>???</wintitle> ????? ??? KVM ?? ??? ?????.</shortdesc>
+<shortdesc><wintitle>???</wintitle> ????? ??? ???
+???? ?????.</shortdesc>
 <csbody>
 <p>? ???? ?? ?? ??? ?????.<dl><dlentry>
 <dt>??</dt>
-<dd>?? ??? ?????.</dd>
+<dd>???? ?????.</dd>
 </dlentry><dlentry>
 <dt>CPU</dt>
-<dd>?? ??? ???? ??????.</dd>
-</dlentry><dlentry>
-<dt>???? I/O</dt>
-<dd>?? ???? ?/??(I/O) ?? ??(KB)???.</dd>
+<dd>???? ???? ??????.</dd>
 </dlentry><dlentry>
 <dt>??? I/O</dt>
 <dd>?? ??? ?/??(I/O) ?? ??(KB)???.</dd>
 </dlentry><dlentry>
+<dt>???? I/O</dt>
+<dd>?? ???? ?/??(I/O) ?? ??(KB)???.</dd>
+</dlentry><dlentry>
 <dt>?????</dt>
 <dd>??? ?? ??? ?????, ???? ??? ?? ?? <tm tmtype="tm" trademark="Linux">Linux</tm> ??? ???? ??????.</dd>
 </dlentry></dl></p>
@@ -37,83 +38,93 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry></dl> </p>
 <p>? ????? ?? ??? ??? ? ????.<ul>
 <li>??? ?? ??? ?? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
-<li>??? ?? ??? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
-<li>???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
+<li>???? ????? <uicontrol>??</uicontrol>? ???? ?? ??? ???
+?????.</li>
+<li>???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????. ??? ????
+?? ??? ? ????.</li>
 <li>?? ???? ??? ????? <uicontrol>??</uicontrol>? ?????. ???? ?? ??? ?? ??? ? ????.</li>
+<li>???? ????? <uicontrol>??</uicontrol>? ?????.</li>
+<li>???? ????? <uicontrol>??? ??</uicontrol>? ?????.</li>
+<li>???? ?? ??? ?? ????? <uicontrol>?? ??</uicontrol>?
+?????.</li>
 <li>???? ????? <uicontrol>??</uicontrol>? ?????.</li>
-</ul>??? ?? ?? ??? ????? ??? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
+</ul>???? ????? ???? ?? <uicontrol>???(+)</uicontrol> ????
+?????.</p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="ko-kr">
-<title>?? ?? ??</title>
-<shortdesc>?? ????? ???? ?? ??? ?????.</shortdesc>
+<title>??? ??</title>
+<shortdesc>?? ????? ???? ???? ?????.</shortdesc>
 <csbody>
 <p> <ol>
-<li>?? ??? ???? ? ??? ??? ??????.</li>
-<li rev="rev1">????? ??????. <ul>
+<li>???? ???? ? ??? ??? ??????.</li>
+<li>????? ??????. <ul>
 <li>????? ???? ??, ??? ???? ??? ??????.</li>
 <li>????? ?? ??, <uicontrol>???? ??</uicontrol>? ???? ????? ??????.</li>
-</ul></li>
+</ul>???? ?? ??? ???? ??? ? ? ????.</li>
 <li><uicontrol>??</uicontrol>? ??????.</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="ko-kr">
 <title>??? ??</title>
-<shortdesc>?? ?? ??? ??? ?????. ?? ??? ???? ??? ???? ??? ? ????.
+<shortdesc>?? ???? ??? ?????. ?? ??? ???? ??? ???? ??? ? ????.
 ?? ??? ?? ???? ?????. </shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
 <csbody>
-<p>? ???? ?? ?? ??? <wintitle>??</wintitle> ?? ?????.<dl>
-<dlentry>
-<dt>??</dt>
-<dd>?? ??? ?????(???? ??? ???? ??? ? ??).</dd>
-</dlentry><dlentry>
-<dt>CPU</dt>
-<dd>???? ????(???? ?? ?? ?? ? ??? ?? ???? ???).</dd>
-</dlentry><dlentry>
-<dt>???</dt>
-<dd>??? ??(MB)???(???? ?? ?? ?? ? ??? ?? ???? ???).</dd>
-</dlentry><dlentry>
-<dt>???</dt>
-<dd>???? ??? ?? ? ?? ??(?????) ??? ??? Linux ??? ???? ??? ??????.</dd>
-</dlentry></dl></p>
-<p>?? ??? <wintitle>????</wintitle> ?? ?????.</p>
 <dl><dlentry>
+<dt>??</dt>
+<dd>???? ??? ??, CPU, ??? ? ???? ????
+???? ?? ??? ?????. ??? ???? ??? ??? ?
+????. CPU? ???? ???? ?? ?? ? ?????.</dd>
+</dlentry><dlentry>
 <dt>????</dt>
-<dd>??? ??? ISO ??? ??? ?????.</dd>
+<dd>??? ???? ?? ????? ?? ? ??? ?????.
+???? ???? ??? ??, ?? ? ??? ? ????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>?????</dt>
+<dd>??, ?? ? MAC ??? ???? ???? ?? ???? ???
+?????. ???? ?????? ??, ?? ? ??? ?
+????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>??</dt>
+<dd>???? ?? ??? ??? ??? ? ??? ?????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>??? PCI ??</dt>
+<dd>????? ?? ??? ?? PCI ?? ??? ?????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>???</dt>
+<dd>???? ???? ?????. ???? ??, ?? ?? ??? ?
+????. ???? ???? ????? ?????? ????
+??? ???? ?? ???? ??? ???? ????
+?? ??? ?? ??? ????? ?????.</dd>
 </dlentry></dl>
 <p> ?? ???? ???? ?? ??? ??? ? ????. ??? ??? ?? <uicontrol>??</uicontrol>? ?????. </p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="ko-kr">
-<title>???? ?? ??, ?? ?? ??</title>
-<shortdesc rev="rev1">?? ??? ?? ???? ??? ??, ?? ?? ??? ? ????. ???? ??? CDROM????. ???? ??? ????? ?? ??? ??????.</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="ko-kr">
+<title>??? ??</title>
+<shortdesc>???? ???? ??? ??? ??? ? ????.</shortdesc>
 <csbody>
+<p>???? ????? ??? ??????.</p>
 <ol>
-<li><wintitle>??? ??</wintitle> ??? <wintitle>????</wintitle>? ??????.</li>
-<li>???? ??? ????? <uicontrol>??? ???(/)</uicontrol>? ?? ? ?? ???? ??????. ISO ?? ??? ???? <uicontrol>??</uicontrol>? ??????.</li>
-<li>???? ??? ????? <uicontrol>??? ??(-)</uicontrol>? ?? ? ?? ???? ??????. ?? ??? ???? <uicontrol>??</uicontrol>? ??????.</li>
-<li>???? ??? ????? ?? <uicontrol>??? ??(+)</uicontrol>? ?? ? ?? ???? ??????. ?? ?? ? ISO ?? ??? ???? <uicontrol>??</uicontrol>? ??????.</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="ko-kr">
-<title>VM? CDROM ??</title>
-<shortdesc rev="rev1">??? ??? ?? ?? ??? ?? CDROM? ???? ?? ? ????.</shortdesc>
-<csbody>
-<ol>
-<li>?? ??? ?????? ??????.</li>
-<li>?? ???? <uicontrol>?? ??</uicontrol>? ??????.</li>
-<li>CDROM? ?? ??? ??? ???? ?? hdc ?? ?? ?? <uicontrol>??? ???(/)</uicontrol> ???? ??????.</li>
-<li><wintitle>VM? CDROM ??</wintitle> ????? ISO ?? ??? ??????. ?? ? ??? ?? ?????.</li>
-<li><uicontrol>??</uicontrol>? ??????.</li>
+<li>???? ?? ???? <uicontrol>??</uicontrol>?
+?????.</li>
+<li>??? ?????. <note>?? ???? SCSI ??
+iSCSI ??? ????? ?? ?? ??? ??? ?? ??
+??? ?? ???? ?? ?????.</note></li>
 </ol>
+<p>????? ???? <uicontrol>?? ?...</uicontrol> ??? ??? ???? ????
+??? ???? ??? ? ????.</p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ko_KR/host.dita b/ui/pages/help/ko_KR/host.dita
index ee4a9c3..220e166 100644
--- a/ui/pages/help/ko_KR/host.dita
+++ b/ui/pages/help/ko_KR/host.dita
@@ -16,13 +16,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li>??? ???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
 <li>?? ???? ?? ?? ??, ??? ???? ?? VNC ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
 </ul></p>
-<p>???? ?? ??? ????? ?? ??? ??????.<dl>
-<dlentry>
+<p>???? ?? ??? ????? ?? ??? ??????.</p>
+<dl><dlentry>
 <dt>?? ??</dt>
-<dd>? ???? ??? ?? ?? ??, ??, ?? ??, ???? ??, ??? ??(GB) ?? ?????.</dd>
+<dd>? ???? ??? ?? ?? ??,
+??, ?? ??, ???? ??, ??? CPU ?,
+??? ??(GB) ?? ?????.</dd>
 </dlentry><dlentry>
 <dt>??? ??</dt>
-<dd>? ???? ???? CPU, ???, ??? I/O, ???? I/O? ?? ??? ???? ???? ?????. ??? ?? ??? ? ??? ??? ????? <uicontrol>? ???? ?? ?? ??? ??</uicontrol>? ?????.</dd>
+<dd>? ???? ???? CPU, ???, ??? I/O, ???? I/O? ?? ??? ???? ???? ?????. </dd>
 </dlentry><dlentry>
 <dt>????? ????</dt>
 <dd>? ???? ??? ??, ??, ????, ???? ???? ?? ??? ????? ?? ?? ???? ?? ??? ?????. <uicontrol>?? ????</uicontrol>? ???? ??? ?? ???? ????? ? ????. ????? ?? ?? ???? ??? ?? ????.</dd>
@@ -30,18 +32,20 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dt>???</dt>
 <dd>? ???? ??? ???? ??? ???? ?????. ???? ?????, ???? ?????, ?????, ??? ? ????. ???? ???? ???? ??? ???? ????, ???? ???? ???? ???? ???? ???? ? ????. ?? ???? Red Hat Enterprise Linux ?? Fedora? ??, <filepath>yum</filepath> ???? ??? ? ????.
 ?? ???? Ubuntu ?? Debian? ??, <filepath>deb</filepath> ???? ??????.<p>yum ???? ???? ??, GPG ??? ???? ? ???? ???? ???? ???? ??? ? ????.
-???? ??? ? <uicontrol>??</uicontrol>? ??????. <uicontrol>?</uicontrol>? ???? GPG ??? ???? ??? ? ???? ?? GPG ? ??? URL? ??????.</p></dd>
+???? ??? ? <uicontrol>??</uicontrol>? ??????. <uicontrol>?</uicontrol>? ????
+<uicontrol>GPG ??</uicontrol>? ???? ??? ?
+???? ?? GPG ? ??? URL? ??????.</p></dd>
 </dlentry><dlentry>
 <dt>??? ???</dt>
 <dd>? ???? ?? ? ?? ??? ??? ??? ???? ?????.
 ? ??? ??, ?? ??? ?? ???, ??, ???? ?? ?? ??? ??? ? ????.<p>??? ???? <cmdname>sosreport</cmdname> ??? ???? ?????. ?? Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora ? Ubuntu ???? ?? ?????. ? ??? ?? ? ?? ??(?: ?? ?? ?? ??, ??? ??, ??? ? ??? ?? ??)? ???? .tar ??? ?????.
 ?? ? ??? ?? ????? ???? ?? ??? ???? ?? ????? ? ??? ?????.</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ko_KR/network.dita b/ui/pages/help/ko_KR/network.dita
index 451510f..d907abc 100644
--- a/ui/pages/help/ko_KR/network.dita
+++ b/ui/pages/help/ko_KR/network.dita
@@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li rev="rev1">???? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
 <li>???? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
 <li>?? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
-</ul>????? ????? ?? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
+</ul>????? ????? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="ko-kr">
 <title>???? ??</title>
@@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ko_KR/storage.dita b/ui/pages/help/ko_KR/storage.dita
index 2e6f5e8..da01678 100644
--- a/ui/pages/help/ko_KR/storage.dita
+++ b/ui/pages/help/ko_KR/storage.dita
@@ -15,7 +15,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>? ???? ?? ?? ?? ??? ?????.<dl>
 <dlentry>
 <dt>??</dt>
-<dd>???? ?? ?? ? ??????.</dd>
+<dd>???? ?? ?????.</dd>
+</dlentry><dlentry>
+<dt>% Used</dt>
+<dd>?? ?? ???? ?? ??????.</dd>
 </dlentry><dlentry>
 <dt>??</dt>
 <dd>???? ?? ??(??? ?? ??, ???? ?? ???)???. </dd>
@@ -35,21 +38,12 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>? ???? ??? ?? ??? ??? ? ????.<ul>
 <li>?? ????? ???? ?? ?????? <uicontrol>???</uicontrol>? ?????.</li>
 <li>???? ?? ??????? <uicontrol>????</uicontrol>? ?????.</li>
+<li>?? ???? ?? ??? ????? <uicontrol>?? ??</uicontrol>?
+?????.</li>
 <li>??? ???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
 </ul></p>
-<p>???? ?? ?? ???? ?? ????? ????? ???? ? ?? ???? ?? ???? ??????. ?????? ??? ?????.<dl><dlentry>
-<dt>??</dt>
-<dd>??? ?????. ?: <uicontrol>??</uicontrol></dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>??? ??? ?? ?????.</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>???? ??? ?????.</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>???? ?? ?? ??? ??? ????.</dd>
-</dlentry></dl>???? ?? ????? ?? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
+<p>???? ?? ?? ???? ?? ????? ????? ???? ? ?? ???? ?? ???? ??????. ???? ?? ?????
+<uicontrol>???(+)</uicontrol> ???? ?????.</p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="ko-kr">
 <title>???? ? ??</title>
@@ -74,13 +68,30 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dt><uicontrol>SCSI ??? ??</uicontrol></dt>
 <dd>SCSI ??? ??? ???? ?? ?????. ??? SCSI ???? ?????.</dd>
 </dlentry></dl></li>
+<li>???? ?? ???? ??? ?????. ???? ???
+?? ???? ?? ?? ???? ?????.
+??? ???? ???. ?? ??? ? ????? ?? ??
+???? ?? ?????.</li>
 <li><uicontrol>??</uicontrol>? ??????.</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="ko-kr">
+<title>?? ??</title>
+<shortdesc>???? ?? ??? ?????.</shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>?? URL?? ??</dt>
+<dd>??? ????? ??? ?????. ?? ??, <filepath>https://my-server/fedora22.img</filepath>???.</dd>
+</dlentry><dlentry>
+<dt>?? ???</dt>
+<dd>?? ???? ??? ?????.</dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ko_KR/templates.dita b/ui/pages/help/ko_KR/templates.dita
index de16d6e..8aa4286 100644
--- a/ui/pages/help/ko_KR/templates.dita
+++ b/ui/pages/help/ko_KR/templates.dita
@@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <title>????</title>
 <shortdesc><wintitle>????</wintitle> ????? KVM ???? ???? ? ??? ? ?? ??? ?? ?? ????? ?????.</shortdesc>
 <csbody>
-<p>? ????? ?? ?? ??? ?????.<dl>
-<dlentry>
+<p>? ????? ?? ?? ??? ?????.</p>
+<dl><dlentry>
 <dt>OS</dt>
 <dd>?? ?? ?? ??? ?????.</dd>
 </dlentry><dlentry>
@@ -24,66 +24,62 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>???</dt>
 <dd>??? RAM(Random Access Memory)? ?(MB)???.</dd>
-</dlentry></dl></p>
-<p>? ?????? ?? ??? ??? ? ????.<ul>
+</dlentry></dl>
+<p>? ?????? ?? ??? ??? ? ????.</p>
+<ul>
 <li>????? ????? <uicontrol>??</uicontrol>? ?????.</li>
+<li>????? ????? <uicontrol>??</uicontrol>? ?????.</li>
 <li>????? ????? <uicontrol>??</uicontrol>? ?????.</li>
-</ul>????? ????? ?? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
+</ul>
+<p>????? ????? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="ko-kr">
 <title>???? ??</title>
 <shortdesc>?? ????? ?????.</shortdesc>
 <csbody>
-<p>? ????? ?? ?? ??? ?????. <dl>
-<dlentry>
-<dt>??</dt>
-<dd>????? ?????.</dd>
+<p>? ????? ?? ?? ??? ?????. </p>
+<dl><dlentry>
+<dt>??</dt>
+<dd>??, ?? ??, ??, ???,
+ISO ??? ?? ?? ?? ? ??? ?? ??? ?????.</dd>
 </dlentry><dlentry>
-<dt>????</dt>
-<dd>????? ????? ??? ?? ?? ?? ??? ??? ??? ?????.</dd>
+<dt>????</dt>
+<dd>????? ?? ???? ? ??? ?????.</dd>
 </dlentry><dlentry>
-<dt>??</dt>
-<dd>????? ????? ??? ?? ?? ?? ??? ?????.</dd>
-</dlentry><dlentry>
-<dt>CPU ?</dt>
-<dd>????? ?? ??? ????? ????.</dd>
-</dlentry><dlentry>
-<dt>???</dt>
-<dd>?? ??? ??? ??? ??(MB)???.</dd>
+<dt>?????</dt>
+<dd>KVM ???? ?? ??? ?? ???? ?????? ?????.
+?? ????? ??? ? ????.</dd>
 </dlentry><dlentry>
-<dt>???</dt>
-<dd>??? ??(GB)???.</dd>
-</dlentry><dlentry>
-<dt>CDROM</dt>
-<dd>KVM ???? ???? ? ??? ISO ??? ??? ?? ?? ?????.</dd>
-</dlentry><dlentry>
-<dt>???? ?</dt>
-<dd>?? ???? ? ?? ?? ???? ????.</dd>
-</dlentry><dlentry>
-<dt>????</dt>
-<dd>KVM ???? ?? ??? ?? ???? ????????. ?? ????? ??? ? ????.</dd>
-</dlentry></dl> ?? ???? ???? ?? ??? ??? ? ????. ??? ??? ?? <uicontrol>??</uicontrol>? ?????. </p>
+<dt>????</dt>
+<dd><uicontrol>CPU ??</uicontrol> ???? ????? ?? ???
+????? ?? ?????.</dd>
+<dd>? ???? ?? CPU ????? ???? ????? ?????.</dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>???? ??</title>
 <shortdesc>?? ????? ????? ?????. ?? ??? ?? 'ISO' ???? ?? ??? ?? ISO ???? ??? ? ????. </shortdesc>
 <csbody>
-<p>?? ?? ??? ?? ??? ??? ??????.<dl>
-<dlentry>
+<p>?? ?? ??? ?? ??? ??? ??????.</p>
+<dl><dlentry>
 <dt>?? ISO ???</dt>
 <dd>????? ?? ??? ?? ISO ???? ???? ?? ????? ?????.</dd>
 </dlentry><dlentry>
+<dt>?? ??? ??</dt>
+<dd>?? ??? ?? ??? ????? ?????.</dd>
+</dlentry><dlentry>
 <dt>?? ISO ???</dt>
 <dd>?? ISO ???? ?? ??? ????? ?????.</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>???? ?? - ?? ISO ???</title>
-<shortdesc>?? ISO ?????? ????? ?????.</shortdesc>
+<title>???? ?? - ISO ???</title>
+<shortdesc>ISO ?????? ????? ?????.</shortdesc>
 <csbody>
-<p>????? ?? ??? ISO ???? ?????.<dl><dlentry>
+<p>????? ?? ??? ISO ???? ???? ?????.</p>
+<dl><dlentry>
 <dt>OS</dt>
 <dd>?? ?? ?? ??? ?????.</dd>
 </dlentry><dlentry>
@@ -92,20 +88,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>??</dt>
 <dd>ISO ???? ?????.</dd>
-</dlentry></dl></p>
-<p>ISO ?????? ????? ????? ?? ?? ??? ??????.<ul>
+</dlentry></dl>
+<p>ISO ?????? ????? ????? ?? ?? ??? ??????.</p>
+<ul>
 <li>????? ???? ?? ISO ???? ??? ? <uicontrol>??? ISO??? ???? ??</uicontrol>? ?????.</li>
 <li>??? ? ISO ?????? ????? ????? <uicontrol>??</uicontrol>? ??? ? <uicontrol>??? ISO??? ???? ??</uicontrol>? ?????.</li>
 <li>????? ISO ???? ?? ??? ???? ?? ??, ?? ?? ??? ??? ? ????.<ul>
 <li>ISO ???? ??? ????? <uicontrol>?? ISO ??? ????? ???.</uicontrol>? ?????.</li>
 <li>?? ISO ???? ????? <uicontrol>?? ISO ??</uicontrol>? ?????.</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ru_RU/guests.dita b/ui/pages/help/ru_RU/guests.dita
index 701dd7e..893b9cd 100644
--- a/ui/pages/help/ru_RU/guests.dita
+++ b/ui/pages/help/ru_RU/guests.dita
@@ -9,21 +9,21 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="ru-ru">
 <title>???????? ???????</title>
-<shortdesc>?? ???????? <wintitle>???????? ???????</wintitle> ???????????? ?????? ????????? ??????????? ????? KVM.</shortdesc>
+<shortdesc>???????? <wintitle>???????? ???????</wintitle> ???????? ?????? ???????? ?????? ???????.</shortdesc>
 <csbody>
 <p>??? ?????? ???????? ??????? ???????????? ????????? ??????????:<dl><dlentry>
 <dt>???</dt>
-<dd>??? ??????????? ??????.</dd>
+<dd>??? ???????? ???????.</dd>
 </dlentry><dlentry>
 <dt>?????????</dt>
-<dd>??????? ????????????? ?????????? ? ??????????? ??????.</dd>
-</dlentry><dlentry>
-<dt>??????? ????-?????</dt>
-<dd>???????? ???????? ?????-?????? ? ??/?.</dd>
+<dd>??????? ????????????? ?????????? ? ???????? ???????.</dd>
 </dlentry><dlentry>
 <dt>???????? ????-?????</dt>
 <dd>???????? ????????? ?????-?????? ? ??/?.</dd>
 </dlentry><dlentry>
+<dt>??????? ????-?????</dt>
+<dd>???????? ???????? ?????-?????? ? ??/?.</dd>
+</dlentry><dlentry>
 <dt>Livetile</dt>
 <dd>????????? ??????? ???????? ???????????? ??????? ??? ??????, ?????????????? ??????? ?? <tm tmtype="tm" trademark="Linux">Linux</tm>, ???? ???????? ??????? ?? ???????.</dd>
 </dlentry></dl></p>
@@ -37,86 +37,81 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry></dl> </p>
 <p>??? ?????? ???????? ??????? ???????? ????????? ????????:<ul>
 <li><uicontrol>????????????</uicontrol> - ???????????? ? ????????? ??????? ???????? ???????????? ???????.</li>
-<li><uicontrol>?????????? ??????????</uicontrol> - ????????? ???? ? ????????????? ????????.</li>
-<li><uicontrol>?????</uicontrol> - ????? ???????? ???????.</li>
+<li>???????? <uicontrol>???????????</uicontrol>, ????? ??????????? ???????????? ??????????? ???????? ??????? ? ??????? ?????.</li>
+<li><uicontrol>?????</uicontrol> - ????? ???????? ???????. ???????? ????? ?????? ?????????? ???????? ???????.</li>
 <li><uicontrol>????????</uicontrol> - ????????? ??????? ???????? ???????. ???????? ???????? ??????? ????? ????????, ?????? ????? ??????? ???????????.</li>
-<li><uicontrol>???????</uicontrol> - ??????? ???????? ???????.</li>
-</ul>??? ???????? ???????? ??????? (??????????? ??????) ???????? ?? ?????? <uicontrol>????
-(+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
+<li>???????? <uicontrol>????</uicontrol>, ????? ????????? ???????? ???????</li>
+<li>???????? <uicontrol>????????? ??????</uicontrol>, ????? ?????? ????????? ?????? ???????? ???????.</li>
+<li>???????? <uicontrol>?????????</uicontrol>, ????? ????????????? ????????? ?????? ???????? ???????.</li>
+<li>???????? <uicontrol>???????</uicontrol>, ????? ??????? ???????? ???????.</li>
+</ul>??? ???????? ???????? ??????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ?? ????????.</p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="ru-ru">
-<title>???????? ??????????? ??????</title>
-<shortdesc>???????? ??????????? ?????? ? ??????? ???????.</shortdesc>
+<title>???????? ???????? ???????</title>
+<shortdesc>???????? ???????? ??????? ?? ???????? ???????.</shortdesc>
 <csbody>
 <p> <ol>
-<li>??????? ??? ??? ????????????? ??????????? ??????.</li>
-<li rev="rev1">???????? ??????. <ul>
+<li>??????? ???, ? ??????? ???????? ????? ?????????????????? ???????? ???????.</li>
+<li>???????? ??????. <ul>
 <li>???? ???? ???????, ???????? ?????? ? ??????.</li>
 <li>???? ???????? ???, ???????? ?? <uicontrol>??????? ??????</uicontrol>, ????? ??????? ??????.</li>
-</ul></li>
+</ul>??? ????????? ?????????? ? ??????? ???????? ?????? ???? ?? ????.</li>
 <li>???????? ?? <uicontrol>???????</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="ru-ru">
 <title>????????? ???????? ???????</title>
-<shortdesc>????????? ??????? ???????????? ??????????? ??????. ????????? ???????? ????? ???????? ?????? ???? ??????????? ???????? ?????. ?????? ???????? ? ???? ????? ????????? ????????????.</shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
+<shortdesc>????????? ??????? ???????????? ???????? ???????. ????????? ???????? ????? ???????? ?????? ???? ??????????? ???????? ?????. ?????? ???????? ? ???? ????? ????????????.</shortdesc>
 <csbody>
-<p>??? ?????? ???????? ??????? ???????????? ????????? ?????????? ?? ??????? <wintitle>?????</wintitle>:<dl>
-<dlentry>
-<dt>???</dt>
-<dd>??? ??????????? ??????. (????? ????????????? ???? ??????????? ???????? ?????)</dd>
-</dlentry><dlentry>
-<dt>??????????</dt>
-<dd>????? ???????????. (???? ???????? ????? ????????, ????? ????? ??????? ? ???? ????? ????????????)</dd>
-</dlentry><dlentry>
-<dt>??????</dt>
-<dd>????? ?????? ? ??. (???? ???????? ????? ????????, ????? ????? ??????? ? ???? ????? ????????????)</dd>
-</dlentry><dlentry>
-<dt>??????</dt>
-<dd>??????????? ???????????, ?????????????? ??????? ?? Linux. ??? ???????????? ?????? ???????? ?????????
-(Livetile), ????? ???????? ??????? ?? ???????.</dd>
-</dlentry></dl></p>
-<p>?? ??????? <wintitle>???????? ??????</wintitle> ???????????? ????????? ??????????.</p>
 <dl><dlentry>
+<dt>?????</dt>
+<dd>?????????? ? ???????? ???????, ??????? ???, ????? ???????????, ????? ?????? ? ??????. ??? ????????????? ???????? ??????? ????? ????????. ????????? ????? ??????????? ? ?????? ?????? ???????? ? ???? ????? ????????????.</dd>
+</dlentry><dlentry>
 <dt>???????? ??????</dt>
-<dd>?????????? ???????????? ????? ISO ??? ?????????.</dd>
+<dd>?????????? ?? ?????????? ? ???? ? ???????? ?????? ????????? ???????? ???????.
+????? ?????????, ???????? ? ??????? ?????????? ???????? ???????? ???????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>?????????</dt>
+<dd>??????? ?????????? ??? ???????? ???????, ??????? ???, ??? ? MAC-?????.
+????? ?????????, ???????? ? ??????? ?????????? ???????? ???????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>????? ???????</dt>
+<dd>?????????? ? ????????????? ? ???????, ??????? ???????? ?????? ? ???????? ???????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>?????????? PCI ?????</dt>
+<dd>?????? ???? ????????? PCI, ????????? ?? ?????.</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>???????????? ?????</dt>
+<dd>?????????? ? ???????????? ?????? ???????? ???????. ????? ?????????, ???????? ? ??????? ???????????? ?????. ???????? ???????????? ????? ? ???????? ?? ???????????? - ????????????? ???? ?? ??????? ????????? ???????? ???????, ??????????? ? ???????????? ?????; ??? ?????????, ????????? ???????, ????? ????????.
+</dd>
 </dlentry></dl>
 <p> ???????? ???? ????? ????????. ????? ????????? ???? ???????? ?? <uicontrol>?????????</uicontrol>. </p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="ru-ru">
-<title>??????????, ?????? ? ?????????? ????????? ????????</title>
-<shortdesc rev="rev1">? ??????????? ?????? ????? ?????????, ???????? ? ????????? ?????????? ????????. ???????????? ?????????????? ?????????? - CDROM. ??? ????????? ????????? ???????? ????????? ????????? ????????:</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="ru-ru">
+<title>???????????? ???????? ??????</title>
+<shortdesc>???????????? ???????? ?????? ????????? ????????? ????? ???????? ??????.</shortdesc>
 <csbody>
+<p>??? ???????????? ???????? ??????? ????????? ????????? ????????:</p>
 <ol>
-<li>? ???? <wintitle>???????? ???????? ???????</wintitle> ???????? <wintitle>???????? ??????</wintitle>.</li>
-<li>??? ?????? ?????????? ???????? ???????? ?? ?????? ?????? ? <uicontrol>????????? ????? ?????? (/)</uicontrol>. ??????? ???? ? ????? ISO ? ???????? ?? <uicontrol>????????</uicontrol>.</li>
-<li>??? ?????????? ?????????? ???????? ???????? ?? ?????? ?????? ? <uicontrol>??????? ?????????????? ?????? (-)</uicontrol>. ??????????? ???????? ? ??????? ?????? <uicontrol>OK</uicontrol>.</li>
-<li>??? ?????????? ?????????? ???????? ???????? ?? ??????? ?????? ? <uicontrol>??????? ??????
-(+)</uicontrol>. ??????? ??? ?????????? ? ???? ? ????? ISO ? ???????? ?? <uicontrol>??????????</uicontrol>.</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="ru-ru">
-<title>?????? CDROM ??????????? ??????</title>
-<shortdesc rev="rev1">?? ????????? ????????? ????? ???????? ?????????? CDROM ??? ??????????? ??????.</shortdesc>
-<csbody>
-<ol>
-<li>????????? ??????????? ??????.</li>
-<li>? ???? ???????? ???????? <uicontrol>?????????? ??????????</uicontrol>.</li>
-<li>??? ?????? ????????, ???????????? ? CDROM, ???????? ?? ?????? ? <uicontrol>????????? ????? ??????
-(/)</uicontrol> ????? ? ????? hdc.</li>
-<li>?? ???????? <wintitle>?????? CDROM ??????????? ??????</wintitle> ??????? ???? ? ????? ISO. ??? ?????? ???? ???????? ?????? ??? ??????.</li>
-<li>???????? ????? <uicontrol>????????</uicontrol>.</li>
+<li>???????? <uicontrol>???????????</uicontrol> ? ???? ???????? ???????? ???????.</li>
+<li>??????? ??????????????.<note>???? ? ??????? ???????? ??????? ???????????? ???? SCSI ??? iSCSI ??? ???? ? ??????? ???? ???????????? ?????????? ?????, ???????? ????? ?????? ? ???? ?????? ?? ?????????.
+</note></li>
 </ol>
+<p>???????? ???????? ??????? ? ?????? ? ???????? <uicontrol>????????...</uicontrol>. ?? ????????? ???????? ????? ???????? ??????? ?????? ???????? ??? ?????????????.
+</p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ru_RU/host.dita b/ui/pages/help/ru_RU/host.dita
index fb72c21..54a78f5 100644
--- a/ui/pages/help/ru_RU/host.dita
+++ b/ui/pages/help/ru_RU/host.dita
@@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li><uicontrol>?????????????</uicontrol> - ????????????? ??????? ?????.</li>
 <li><uicontrol>????????????</uicontrol> - ??????? ?????????? VNC ? ???????? ?????, ???? ??? ??? ?? ???????????.</li>
 </ul></p>
-<p>???????? ?? ????????? ???????? ??? ????????? ?????????? ? ?????:<dl>
-<dlentry>
+<p>???????? ?? ????????? ???????? ??? ????????? ?????????? ? ?????:</p>
+<dl><dlentry>
 <dt>??????? ??????????</dt>
-<dd>? ???? ??????? ???????????? ??????? ???????????? ???????, ??? ?????? ? ??????? ???, ? ????? ??? ?????????? ? ????? ?????? ? ??.</dd>
+<dd>? ???? ??????? ???????????? ??????? ???????????? ???????, ??? ?????? ? ??????? ???, ? ????? ??? ??????????, ????? ???????????? ??????????? ? ????? ?????? ? ??.</dd>
 </dlentry><dlentry>
 <dt>????????? ??????????</dt>
-<dd>? ???? ??????? ???????????? ???????, ?????????? ?????????????? ?????????? ? ??????????, ??????, ???????? ?????-?????? ? ??????? ?????-?????? ??? ?????. ???????? <uicontrol>???? ?????? ????? ???????? ???? ????????</uicontrol>, ????? ???? ?????? ??????????? ????? ???????? ??????? ????.</dd>
+<dd>? ???? ??????? ???????????? ???????, ?????????? ?????????????? ?????????? ? ??????????, ??????, ???????? ?????-?????? ? ??????? ?????-?????? ??? ?????. </dd>
 </dlentry><dlentry>
 <dt>?????????? ???????????? ???????????</dt>
 <dd>? ???? ??????? ???????????? ?????????? ??? ???? ???????, ??? ??????? ???????? ??????????, ??????? ??? ??????, ??????, ??????????? ? ?????????. ????? ???????? ??? ?????? ? ?????? ??????? ?? <uicontrol>???????? ???</uicontrol>. ????????? ?????? ??? ?????????? ??????? ??????.</dd>
@@ -30,19 +30,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dt>?????????</dt>
 <dd>? ???? ??????? ???????????? ?????????, ????????? ? ???????? ?????. ????????? ????? ?????????, ????????????, ???????? ? ???????. ??? ?????????? ????????? ??????????? ? ???????? ?????, ??? ????????? ????????? ?????????? ????????? ??? ?????. ???? ??????? - Red Hat Enterprise Linux ??? Fedora, ????? ???????? ????????? <filepath>yum</filepath>.
 ???? ??????? - Ubuntu ??? Debian, ???????? ????????? <filepath>deb</filepath>.<p>??? ?????? ? ??????????? yum ????? ???????? ???????? GPG ??? ???????? ??????????? ??????? ?? ??????? ?????????.
-???????? ????????? ? ???????? ?? <uicontrol>????????</uicontrol>. ???????? <uicontrol>??</uicontrol>, ????? ???????? ???????? GPG, ? ??????? URL ????? ?????? GPG ??? ?????????.</p></dd>
+???????? ????????? ? ???????? ?? <uicontrol>????????</uicontrol>. ???????? <uicontrol>??</uicontrol>, ????? ???????? <uicontrol>???????? GPG</uicontrol>, ? ??????? URL ????? ?????? GPG ??? ?????????.</p></dd>
 </dlentry><dlentry>
 <dt>?????????? ??????</dt>
 <dd>? ???? ??????? ???????????? ?????????? ??????, ??????? ??? ? ????.
 ???????? ??????? ??? ????????, ??????????????, ???????? ? ???????? ???????.<p>?????????? ????? ????????? ???????? <cmdname>sosreport</cmdname>. ?? ???????? ??? Red
 Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora ? Ubuntu. ??????? ??????? ???? .tar ? ???????????????? ? ??????????????? ???????????, ????? ??? ?????? ????, ??????????? ?????? ? ????? ???????????? ??????? ? ?????.
 ??????? ????? ????????? ??????? ????????? ??? ????? ?????????????? ?????????? ? ????????? ?? ????? ? ?????????????? ??????.</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ru_RU/network.dita b/ui/pages/help/ru_RU/network.dita
index 9cdcdd1..b92ecd2 100644
--- a/ui/pages/help/ru_RU/network.dita
+++ b/ui/pages/help/ru_RU/network.dita
@@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li rev="rev1"><uicontrol>?????????</uicontrol> - ??????? ??????? ??????????.</li>
 <li><uicontrol>??????????</uicontrol> - ??????? ??????? ??????????.</li>
 <li><uicontrol>???????</uicontrol> - ??????? ?????????? ? ??????????.</li>
-</ul>??? ???????? ???? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
+</ul>??? ???????? ???? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="ru-ru">
 <title>???????? ????</title>
@@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ru_RU/storage.dita b/ui/pages/help/ru_RU/storage.dita
index fa37edc..1e3dee1 100644
--- a/ui/pages/help/ru_RU/storage.dita
+++ b/ui/pages/help/ru_RU/storage.dita
@@ -9,13 +9,15 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhstor" xml:lang="ru-ru">
 <title>???????? ??????</title>
-<shortdesc>?? ???????? <wintitle>???????? ??????</wintitle> ???????????? ?????? ????????? ????? ??????, ??????? ???? ?????? '?? ?????????' ? 'ISO'.
-???? ?? ?????? ???????????? ??????????? ISO, ???????? ??? ? ???? ???????? ?????? 'ISO'.</shortdesc>
+<shortdesc>?? ???????? <wintitle>???????? ??????</wintitle> ???????????? ?????? ????????? ????? ??????, ??????? ???? ?????? '?? ?????????' ? 'ISO'. ??? ????????????? ???????????? ISO ???????? ??? ? ???? ? ???? ?????? 'ISO'.</shortdesc>
 <csbody>
 <p>??? ??????? ???? ?????? ???????????? ????????? ??????????:<dl>
 <dlentry>
 <dt>???</dt>
-<dd>??? ???? ?????? ? ??????? ?????????????.</dd>
+<dd>??? ???? ??????.</dd>
+</dlentry><dlentry>
+<dt>% ??????</dt>
+<dd>??????? ???????? ????? ? ???? ??????.</dd>
 </dlentry><dlentry>
 <dt>?????????</dt>
 <dd>????????? ???? ?????? - ???????? (???????) ??? ?????????? (???????). </dd>
@@ -30,26 +32,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dd>????? ???? ??????.</dd>
 </dlentry><dlentry>
 <dt>????????</dt>
-<dd>????? ?????????? ?????? ? ????.</dd>
+<dd>????? ?????????? ?????? ? ???? ??????.</dd>
 </dlentry></dl></p>
 <p>??? ??????? ???? ?????? ????? ???????? ????????? ????????:<ul>
 <li><uicontrol>????????????</uicontrol> - ???????????? ??? ??????, ????? ??? ????? ???? ????????????.</li>
 <li><uicontrol>??????????????</uicontrol> - ?????????????? ???????? ??? ??????.</li>
+<li>???????? <uicontrol>???????? ???</uicontrol>, ????? ???????? ?????????????? ??? ? ???????? ??? ??????. </li>
 <li><uicontrol>???????</uicontrol> - ??????? ?????????? ??? ??????.</li>
 </ul></p>
-<p>??? ????????? ???????? ? ????? ???? ?????? ???????? ?? ??????? ? ?????? ????? ?????? ???? ??????.  ???????? ????????:<dl><dlentry>
-<dt>???</dt>
-<dd>??? ????, ???????? <uicontrol>????</uicontrol>.</dd>
-</dlentry><dlentry>
-<dt>??????</dt>
-<dd>?????? (??????? ?? ????).</dd>
-</dlentry><dlentry>
-<dt>???????</dt>
-<dd>?????? ????.</dd>
-</dlentry><dlentry>
-<dt>?????????</dt>
-<dd>????? ?????????? ?????? ? ????.</dd>
-</dlentry></dl>??? ???????? ???? ?????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
+<p>??? ????????? ???????? ? ????? ???? ?????? ???????? ?? ??????? ? ?????? ????? ?????? ???? ??????. ??? ???? ????? ??????? ??? ??????, ???????? ?? ?????? <uicontrol>????? (+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="ru-ru">
 <title>???????? ???? ??????</title>
@@ -76,13 +67,27 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dt><uicontrol>SCSI Fibre Channel</uicontrol></dt>
 <dd>?????? ??? ?? ?????? SCSI Fibre Channel. ???????? ??????? SCSI.</dd>
 </dlentry></dl></li>
+<li>??????? ???? ? ???? ??????. ???? ? ???? ?????? ????????? ?? ????? ? ???????? ???????, ???? ????????? ??? ??????. ???? ?????? ???? ??????????. ???? ??????? ?? ?????????? ? ?????? ???????? ????, ?? ????? ?????? ?????????????.</li>
 <li>???????? ?? <uicontrol>???????</uicontrol>.</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="ru-ru">
+<title>?????????? ????</title>
+<shortdesc>?????????? ???? ? ??? ??????.</shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>????????? ? ?????????? URL</dt>
+<dd>?????????, ?????? ??????? ????????? ???. ??????: <filepath>https://my-server/fedora22.img</filepath>.</dd>
+</dlentry><dlentry>
+<dt>???????? ????</dt>
+<dd>?????? ????? ? ????????? ???????.</dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/ru_RU/templates.dita b/ui/pages/help/ru_RU/templates.dita
index 27ce4ae..36bc90b 100644
--- a/ui/pages/help/ru_RU/templates.dita
+++ b/ui/pages/help/ru_RU/templates.dita
@@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <title>???????</title>
 <shortdesc>?? ???????? <wintitle>???????</wintitle> ???????????? ????????? ??????? ??????????? ?????, ??????? ????? ???????????? ??? ???????? ???????? ?????? KVM.</shortdesc>
 <csbody>
-<p>??? ??????? ??????? ???????????? ????????? ??????????:<dl>
-<dlentry>
+<p>??? ??????? ??????? ???????????? ????????? ??????????:</p>
+<dl><dlentry>
 <dt>??</dt>
 <dd>??? ???????????? ??????? ??? ???????? ???????????? ???????.</dd>
 </dlentry><dlentry>
@@ -24,66 +24,59 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>??????</dt>
 <dd>?????????? ????? ??????????? ?????? ? ??.</dd>
-</dlentry></dl></p>
-<p>??? ??????? ??????? ????? ???????? ????????? ????????:<ul>
+</dlentry></dl>
+<p>??? ??????? ??????? ????? ???????? ????????? ????????:</p>
+<ul>
 <li><uicontrol>????????</uicontrol> - ???????? ??????.</li>
+<li>???????? <uicontrol>???????????</uicontrol>, ????? ??????????? ??????.</li>
 <li><uicontrol>???????</uicontrol> - ??????? ??????.</li>
-</ul>??? ?????????? ??????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
+</ul>
+<p>??? ???????? ??????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol>.</p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="ru-ru">
 <title>???????? ??????</title>
 <shortdesc>???????? ???????????? ??????.</shortdesc>
 <csbody>
-<p>??? ??????? ??????? ???????????? ????????? ??????????: <dl>
-<dlentry>
-<dt>???</dt>
-<dd>??? ???????.</dd>
+<p>??? ??????? ??????? ???????????? ????????? ??????????: </p>
+<dl><dlentry>
+<dt>?????</dt>
+<dd>?????????? ?? ?????, ???????? ?? ?? ???????, ??????, ??????, ???? ? ????? ISO ? ??????????? ??????????.</dd>
 </dlentry><dlentry>
-<dt>??????</dt>
-<dd>??? ????????, ????????? ???????????? ??????? ??? ??????? ???????????? ???????, ??? ????????????? ??????? ????????????? ??????.</dd>
+<dt>???????? ??????</dt>
+<dd>????????? ???? ?????? ??? ???????.</dd>
 </dlentry><dlentry>
-<dt>??????</dt>
-<dd>?????? ???????????? ??????? ??? ???????? ???????????? ???????, ??? ????????????? ??????? ????????????? ??????.</dd>
-</dlentry><dlentry>
-<dt>?????????? ???????????</dt>
-<dd>?????????? ??????????? ??? ???????.</dd>
-</dlentry><dlentry>
-<dt>??????</dt>
-<dd>????? ?????? ? ??, ?????????? ??????????? ??????.</dd>
+<dt>?????????</dt>
+<dd>??????? ?????????? ?? ?????????, ????????? ???????? ??????? KVM. ????? ??????? ????????? ?????.</dd>
 </dlentry><dlentry>
-<dt>????</dt>
-<dd>?????? ????? ? ??.</dd>
-</dlentry><dlentry>
-<dt>CDROM</dt>
-<dd>???? ? ????? ISO ??? ????????? ???????? ??????? KVM.</dd>
-</dlentry><dlentry>
-<dt>??? ??????</dt>
-<dd>???????????? ??? ?????? ??? ??? ?????? ?? ?????????.</dd>
-</dlentry><dlentry>
-<dt>????</dt>
-<dd>??????? ?????????? ?? ?????????, ????????? ??? ???????? ??????? KVM. ????? ??????? ????????? ?????.</dd>
-</dlentry></dl> ???????? ???? ????? ????????. ????? ????????? ???? ???????? ?? <uicontrol>?????????</uicontrol>. </p>
+<dt>?????????</dt>
+<dd>? ???? <uicontrol>?????????? ???????????</uicontrol> ??????? ????? ??????????? ??? ???????.</dd>
+<dd>????? ????? ??????? ????????? ????????? ??????????? ??? ?????? ???????? ???????.</dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>?????????? ???????</title>
-<shortdesc>?????????? ??????? ? ????????? ????????. ???????? ??????????? ????? ISO ? ???????? ?????? ISO ??? ??????????? ??????.</shortdesc>
+<shortdesc>?????????? ??????? ? ????????? ????????. ???????? ??????????? ????? ISO ? ??? ?????? ISO ??? ??????????? ??????.</shortdesc>
 <csbody>
-<p>???????? ???? ?? ????????? ????????? ???????????? ????????? ????????:<dl>
-<dlentry>
+<p>???????? ???? ?? ????????? ????????? ???????????? ????????? ????????:</p>
+<dl><dlentry>
 <dt>????????? ????? ISO</dt>
 <dd>???????? ???? ??????? ??? ?????? ???????????? ??????? ISO ? ????????? ????? ?????? ???????.</dd>
 </dlentry><dlentry>
+<dt>????????? ???? ??????</dt>
+<dd>????? ????? ??????? ???? ? ?????????? ????? ??????.</dd>
+</dlentry><dlentry>
 <dt>????????? ????? ISO</dt>
 <dd>???????? ???? ???????, ????? ??????? ????????? ???????????? ????????????? ?????? ISO.</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>?????????? ??????? (????????? ????? ISO)</title>
-<shortdesc>?????????? ??????? ?? ?????????? ?????? ISO.</shortdesc>
+<title>?????????? ??????? (????? ISO)</title>
+<shortdesc>?????????? ??????? ?? ?????? ISO.</shortdesc>
 <csbody>
-<p>????? ???????? ?????? ISO, ????????? ? ???????.<dl><dlentry>
+<p>????? ???????? ?????? ISO, ????????? ? ??????? ????????.</p>
+<dl><dlentry>
 <dt>??</dt>
 <dd>??? ???????????? ??????? ??? ???????? ???????????? ???????.</dd>
 </dlentry><dlentry>
@@ -92,20 +85,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>??????</dt>
 <dd>?????? ?????? ISO.</dd>
-</dlentry></dl></p>
-<p>??? ???????? ??????? ?? ?????? ISO ???????? ???? ?? ????????? ?????????:<ul>
+</dlentry></dl>
+<p>??? ???????? ??????? ?? ?????? ISO ???????? ???? ?? ????????? ?????????:</p>
+<ul>
 <li>???????? ????? ISO, ?? ???????? ????? ??????? ??????, ????? ???????? ?? <uicontrol>??????? ??????? ?? ????????? ??????? ISO</uicontrol>.</li>
 <li>???????? <uicontrol>???</uicontrol>, ????? ??????? ?????? ?? ??????? ?????? ISO ? ??????, ????? ???????? ?? <uicontrol>??????? ??????? ?? ????????? ??????? ISO</uicontrol>.</li>
 <li>???? ????????? ????? ISO ??????????? ? ??????????? ??????, ???????? ???? ?? ????????? ?????????:<ul>
 <li>???????? <uicontrol>???????????? ?????????? ???? ISO</uicontrol>, ????? ??????? ???? ? ?????? ISO.</li>
 <li>???????? ?? <uicontrol>????? ?????????????? ??????? ISO</uicontrol> ??? ?????? ?????????????? ??????? ISO.</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_CN/guests.dita b/ui/pages/help/zh_CN/guests.dita
index d684af2..ee33e47 100644
--- a/ui/pages/help/zh_CN/guests.dita
+++ b/ui/pages/help/zh_CN/guests.dita
@@ -9,21 +9,21 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="zh-cn">
 <title>??</title>
-<shortdesc>?<wintitle>??</wintitle>????????? KVM ????</shortdesc>
+<shortdesc>?<wintitle>??</wintitle>????????????????</shortdesc>
 <csbody>
 <p>???????????????<dl><dlentry>
 <dt>??</dt>
-<dd>???????</dd>
+<dd>??????</dd>
 </dlentry><dlentry>
 <dt>CPU</dt>
-<dd>?????????????</dd>
-</dlentry><dlentry>
-<dt>?? I/O</dt>
-<dd>????/???????? KB/????</dd>
+<dd>?????????????</dd>
 </dlentry><dlentry>
 <dt>?? I/O</dt>
 <dd>????/???????? KB/????</dd>
 </dlentry><dlentry>
+<dt>?? I/O</dt>
+<dd>????/???????? KB/????</dd>
+</dlentry><dlentry>
 <dt>Livetile</dt>
 <dd>???????????????????????????? <tm tmtype="tm" trademark="Linux">Linux</tm> ???????</dd>
 </dlentry></dl></p>
@@ -37,82 +37,78 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry></dl> </p>
 <p>?????????????<ul>
 <li>??<uicontrol>??</uicontrol>?????????????????</li>
-<li>??<uicontrol>????</uicontrol>???????????</li>
-<li>??<uicontrol>??</uicontrol>??????</li>
+<li>??<uicontrol>??</uicontrol>???????????????</li>
+<li>??<uicontrol>??</uicontrol>??????????????????</li>
 <li>??<uicontrol>??</uicontrol>???????????????????????</li>
+<li>??<uicontrol>??</uicontrol>??????</li>
+<li>??<uicontrol>??</uicontrol>????????</li>
+<li>??<uicontrol>????</uicontrol>??????????</li>
 <li>??<uicontrol>??</uicontrol>??????</li>
-</ul>???????????????????<uicontrol>??? (+) </uicontrol> ???</p>
+</ul>?????????????<uicontrol>?? (+)</uicontrol> ???</p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="zh-cn">
-<title>?????</title>
-<shortdesc>??????????????</shortdesc>
+<title>????</title>
+<shortdesc>??????????????</shortdesc>
 <csbody>
 <p> <ol>
-<li>?????????????</li>
-<li rev="rev1">?????<ul>
-<li>?????????????????????</li>
+<li>????????????</li>
+<li>?????<ul>
+<li>????????????????????</li>
 <li>?????????????<uicontrol>????</uicontrol>??????</li>
-</ul></li>
+</ul>???????????????????????????</li>
 <li>??<uicontrol>??</uicontrol>?</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="zh-cn">
 <title>????</title>
-<shortdesc>?????????????????????????????????????????????</shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
+<shortdesc>????????????????????????????????????????????</shortdesc>
 <csbody>
-<p>??????????<wintitle>??</wintitle>????????????<dl>
-<dlentry>
-<dt>??</dt>
-<dd>???????????????????????</dd>
-</dlentry><dlentry>
-<dt>CPU ?</dt>
-<dd>???????????????????????????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>????? MB ???????????????????????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>????????????????? Linux ?????????? (Livetile) ??????</dd>
-</dlentry></dl></p>
-<p>???<wintitle>???</wintitle>????????????</p>
 <dl><dlentry>
+<dt>??</dt>
+<dd>???????????????????????CPU?????????????????????? CPU
+????????????????</dd>
+</dlentry><dlentry>
 <dt>???</dt>
-<dd>??????? ISO ????????</dd>
+<dd>????????????????????????????????????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>??</dt>
+<dd>???????????????????? MAC ????????????????????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>???</dt>
+<dd>??????????????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>?? PCI ??</dt>
+<dd>????????? PCI ??????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>??</dt>
+<dd>??????????????????????????????????????????????????????????????????????????????</dd>
 </dlentry></dl>
 <p> ???????????????????????<uicontrol>??</uicontrol>?</p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="zh-cn">
-<title>????????????</title>
-<shortdesc rev="rev1">????????????????????????????? CDROM?????????????????</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="zh-cn">
+<title>???????</title>
+<shortdesc>????????????????????</shortdesc>
 <csbody>
+<p>?????????????????</p>
 <ol>
-<li>??<wintitle>????</wintitle>????????<wintitle>???</wintitle>??</li>
-<li>???????????????????<uicontrol>???? (/)</uicontrol>??? ISO ???????<uicontrol>??</uicontrol>?</li>
-<li>???????????????????<uicontrol>????? (-)</uicontrol>????????????<uicontrol>??</uicontrol>?</li>
-<li>???????????????????<uicontrol>????? (+)</uicontrol>??????? ISO ???????<uicontrol>??</uicontrol>?</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="zh-cn">
-<title>?? VM ? CDROM</title>
-<shortdesc rev="rev1">???????????????? CDROM ????</shortdesc>
-<csbody>
-<ol>
-<li>??????????</li>
-<li>???????????<uicontrol>????</uicontrol>?</li>
-<li>???????? CDROM ???????? hdc ?????<uicontrol>???? (/)</uicontrol> ???</li>
-<li>??<wintitle>?? VM ? CDROM</wintitle>??????? ISO ???????????????</li>
-<li>??<uicontrol>??</uicontrol>?</li>
+<li>?????????????<uicontrol>??</uicontrol>?</li>
+<li>?????<note>?????????? SCSI ?
+iSCSI ???????????????????????????????</note></li>
 </ol>
+<p>??????????????<uicontrol>????...</uicontrol>??????????????????</p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_CN/host.dita b/ui/pages/help/zh_CN/host.dita
index 78a89c3..a8622a2 100644
--- a/ui/pages/help/zh_CN/host.dita
+++ b/ui/pages/help/zh_CN/host.dita
@@ -16,30 +16,30 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li>??<uicontrol>????</uicontrol>??????????</li>
 <li>??<uicontrol>??</uicontrol>????????? VNC ???????????</li>
 </ul></p>
-<p>?????????????????<dl>
-<dlentry>
+<p>?????????????????</p>
+<dl><dlentry>
 <dt>????</dt>
-<dd>??????????????????????????????????? GB ???</dd>
+<dd>???????????????????????????????? CPU ????????? GB ???</dd>
 </dlentry><dlentry>
 <dt>??????</dt>
-<dd>??????????????? CPU?????? I/O ??? I/O ????????<uicontrol>???????????</uicontrol>????????????????????</dd>
+<dd>??????????????? CPU?????? I/O ??? I/O ??????</dd>
 </dlentry><dlentry>
 <dt>????</dt>
 <dd>???????????????????????????????????????????????<uicontrol>????</uicontrol>???????????????????????????</dd>
 </dlentry><dlentry>
 <dt>???</dt>
-<dd>????????????????????????????????????????????????????????????????????????????? Red Hat Enterprise Linux ? Fedora?????? <filepath>yum</filepath> ??????????? Ubuntu ? Debian?????? <filepath>deb</filepath> ????<p>????? Yum ????????? GPG ????????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>??? GPG ??????????? GPG ????? URL?</p></dd>
+<dd>????????????????????????????????????????????????????????????????????????????? Red Hat Enterprise Linux ? Fedora?????? <filepath>yum</filepath> ??????????? Ubuntu ? Debian?????? <filepath>deb</filepath> ????<p>????? Yum ????????? GPG ????????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>??? <uicontrol>GPG ??</uicontrol>????????? GPG ????? URL?</p></dd>
 </dlentry><dlentry>
 <dt>????</dt>
 <dd>???????????????????????????????????????????????????????????<p>???????
 <cmdname>sosreport</cmdname> ??????????? Red
 Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>?Fedora ? Ubuntu ???????????????????? .tar ???????????????????????????????????????????????????????????????????</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_CN/network.dita b/ui/pages/help/zh_CN/network.dita
index f6aa532..aa99988 100644
--- a/ui/pages/help/zh_CN/network.dita
+++ b/ui/pages/help/zh_CN/network.dita
@@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li rev="rev1">??<uicontrol>??</uicontrol>????????</li>
 <li>??<uicontrol>??</uicontrol>????????</li>
 <li>??<uicontrol>??</uicontrol>????????</li>
-</ul>????????????????<uicontrol>??? (+)</uicontrol> ???</p>
+</ul>?????????<uicontrol>?? (+)</uicontrol> ???</p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="zh-cn">
 <title>????</title>
@@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_CN/storage.dita b/ui/pages/help/zh_CN/storage.dita
index cfb09f5..e49dac4 100644
--- a/ui/pages/help/zh_CN/storage.dita
+++ b/ui/pages/help/zh_CN/storage.dita
@@ -14,7 +14,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>????????????????<dl>
 <dlentry>
 <dt>??</dt>
-<dd>??????????????</dd>
+<dd>???????</dd>
+</dlentry><dlentry>
+<dt>?????</dt>
+<dd>?????????????</dd>
 </dlentry><dlentry>
 <dt>??</dt>
 <dd>??????????????????????</dd>
@@ -34,21 +37,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>??????????????<ul>
 <li>??<uicontrol>??</uicontrol>?????????????</li>
 <li>??<uicontrol>????</uicontrol>???????????</li>
+<li>??<uicontrol>???</uicontrol>??????????????</li>
 <li>??<uicontrol>????</uicontrol>??????????</li>
 </ul></p>
-<p>???????????????????????????????????????<dl><dlentry>
-<dt>??</dt>
-<dd>????????<uicontrol>??</uicontrol>?</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>???????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>???????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>????????????</dd>
-</dlentry></dl>?????????????????<uicontrol>??? (+)</uicontrol> ???</p>
+<p>??????????????????????????????????????<uicontrol>?? (+)</uicontrol> ???</p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="zh-cn">
 <title>?????</title>
@@ -72,13 +64,28 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dt><uicontrol>SCSI ????</uicontrol></dt>
 <dd>?? SCSI ?????????????? SCSI ????</dd>
 </dlentry></dl></li>
+<li>????????????????????????????????????????????????????????????????????
+</li>
 <li>??<uicontrol>??</uicontrol>?</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="zh-cn">
+<title>???</title>
+<shortdesc>?????????</shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>??? URL ???</dt>
+<dd>???????????????<filepath>https://my-server/fedora22.img</filepath>?</dd>
+</dlentry><dlentry>
+<dt>????</dt>
+<dd>???????????</dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_CN/templates.dita b/ui/pages/help/zh_CN/templates.dita
index ca50119..919cd5b 100644
--- a/ui/pages/help/zh_CN/templates.dita
+++ b/ui/pages/help/zh_CN/templates.dita
@@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <title>??</title>
 <shortdesc>?<wintitle>??</wintitle>?????????? KVM ????????????</shortdesc>
 <csbody>
-<p>???????????????<dl>
-<dlentry>
+<p>???????????????</p>
+<dl><dlentry>
 <dt>????</dt>
 <dd>????????????</dd>
 </dlentry><dlentry>
@@ -24,66 +24,59 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>??</dt>
 <dd>????????????? MB ???</dd>
-</dlentry></dl></p>
-<p>?????????????<ul>
+</dlentry></dl>
+<p>?????????????</p>
+<ul>
 <li>??<uicontrol>??</uicontrol>??????</li>
+<li>??<uicontrol>??</uicontrol>??????</li>
 <li>??<uicontrol>??</uicontrol>??????</li>
-</ul>????????????????<uicontrol>??? (+)</uicontrol> ???</p>
+</ul>
+<p>?????????<uicontrol>?? (+)</uicontrol> ???</p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="zh-cn">
 <title>????</title>
 <shortdesc>???????</shortdesc>
 <csbody>
-<p>???????????????<dl>
-<dlentry>
-<dt>??</dt>
-<dd>??????</dd>
+<p>???????????????</p>
+<dl><dlentry>
+<dt>??</dt>
+<dd>??????????????????ISO ???????????????</dd>
 </dlentry><dlentry>
-<dt>???</dt>
-<dd>????????????????????????????</dd>
+<dt>???</dt>
+<dd>???????????</dd>
 </dlentry><dlentry>
-<dt>??</dt>
-<dd>????????????????????</dd>
-</dlentry><dlentry>
-<dt>CPU ??</dt>
-<dd>???????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>????????????? MB ???</dd>
+<dt>??</dt>
+<dd>???? KVM ??????????????????????</dd>
 </dlentry><dlentry>
-<dt>??</dt>
-<dd>?????? GB ???</dd>
-</dlentry><dlentry>
-<dt>CDROM</dt>
-<dd>???? KVM ??? ISO ????????????</dd>
-</dlentry><dlentry>
-<dt>???</dt>
-<dd>????????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>?? KVM ??????????????????????</dd>
-</dlentry></dl> ???????????????????????<uicontrol>??</uicontrol>?</p>
+<dt>???</dt>
+<dd>? <uicontrol>CPU ?</uicontrol>??????????????????</dd>
+<dd>?????????????? CPU ???</dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>????</title>
 <shortdesc>?????????????????? ISO ??????ISO????????????</shortdesc>
 <csbody>
-<p>????????????????<dl>
-<dlentry>
+<p>????????????????</p>
+<dl><dlentry>
 <dt>?? ISO ??</dt>
-<dd>?????????????? ISO ???????????</dd>
+<dd>?????????????????????????? ISO ???</dd>
+</dlentry><dlentry>
+<dt>??????</dt>
+<dd>?????????????????</dd>
 </dlentry><dlentry>
 <dt>?? ISO ??</dt>
 <dd>????????? ISO ????????</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>???? - ?? ISO ??</title>
-<shortdesc>??? ISO ???????</shortdesc>
+<title>???? - ISO ??</title>
+<shortdesc>? ISO ????????</shortdesc>
 <csbody>
-<p>????????? ISO ???<dl><dlentry>
+<p>????????????? ISO ???</p>
+<dl><dlentry>
 <dt>????</dt>
 <dd>????????????</dd>
 </dlentry><dlentry>
@@ -92,20 +85,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry><dlentry>
 <dt>??</dt>
 <dd>ISO ??????</dd>
-</dlentry></dl></p>
-<p>?? ISO ?????????????????<ul>
+</dlentry></dl>
+<p>?? ISO ?????????????????</p>
+<ul>
 <li>?????????? ISO ???????<uicontrol>??? ISO ????</uicontrol>?</li>
 <li>??<uicontrol>??</uicontrol>???????? ISO ???????????<uicontrol>??? ISO ????</uicontrol>?</li>
-<li>??????? ISO ????????????????????????<ul>
+<li>?????? ISO ????????????????????????<ul>
 <li>??<uicontrol>?????? ISO ??</uicontrol>??? ISO ??????</li>
 <li>??<uicontrol>???? ISO</uicontrol> ????? ISO ???</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_TW/guests.dita b/ui/pages/help/zh_TW/guests.dita
index cf73785..7807ecc 100644
--- a/ui/pages/help/zh_TW/guests.dita
+++ b/ui/pages/help/zh_TW/guests.dita
@@ -9,21 +9,21 @@ For support please see:
 https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <cshelp id="kimhvirtm" xml:lang="zh-tw">
 <title>??</title>
-<shortdesc>?<wintitle>??</wintitle>?????????? KVM ?????</shortdesc>
+<shortdesc>?<wintitle>??</wintitle>????????????????</shortdesc>
 <csbody>
 <p>?????????????????<dl><dlentry>
 <dt>??</dt>
-<dd>????????</dd>
+<dd>??????</dd>
 </dlentry><dlentry>
 <dt>CPU</dt>
-<dd>????????????????</dd>
-</dlentry><dlentry>
-<dt>?? I/O</dt>
-<dd>????/?????? (KB/s)?</dd>
+<dd>??????????????</dd>
 </dlentry><dlentry>
 <dt>?? I/O</dt>
 <dd>????/?????? (KB/s)?</dd>
 </dlentry><dlentry>
+<dt>?? I/O</dt>
+<dd>????/?????? (KB/s)?</dd>
+</dlentry><dlentry>
 <dt>Livetile</dt>
 <dd>????????????????? <tm tmtype="tm" trademark="Linux">Linux</tm> ??????????????????????</dd>
 </dlentry></dl></p>
@@ -37,84 +37,89 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </dlentry></dl> </p>
 <p>???????????????<ul>
 <li>??<uicontrol>??</uicontrol>?????????????????</li>
-<li>??<uicontrol>????</uicontrol>???????????</li>
-<li>??<uicontrol>??</uicontrol>??????</li>
+<li>??<uicontrol>??</uicontrol>????????????????
+</li>
+<li>??<uicontrol>??</uicontrol>???????????????????
+</li>
 <li>??<uicontrol>??</uicontrol>????????????????????????</li>
+<li>??<uicontrol>??</uicontrol>?????</li>
+<li>??<uicontrol>??</uicontrol>????????</li>
+<li>??<uicontrol>????</uicontrol>??????????
+</li>
 <li>??<uicontrol>??</uicontrol>??????</li>
-</ul>????????????????????????<uicontrol>?? (+)</uicontrol> ???</p>
+</ul>????????????????<uicontrol>?? (+)</uicontrol> ???
+</p>
 </csbody>
 <cshelp id="kimhvirtmcrt" xml:lang="zh-tw">
-<title>??????</title>
-<shortdesc>?????????????</shortdesc>
+<title>????</title>
+<shortdesc>????????????</shortdesc>
 <csbody>
 <p> <ol>
-<li>??????????????</li>
-<li rev="rev1">?????<ul>
+<li>?????????????</li>
+<li>?????<ul>
 <li>??????????????????</li>
 <li>???????????<uicontrol>????</uicontrol>??????</li>
-</ul></li>
+</ul>????????????????????????</li>
 <li>???<uicontrol>??</uicontrol>?</li>
 </ol> </p>
 </csbody>
 </cshelp>
 <cshelp id="kimhvirtmedit" xml:lang="zh-tw">
 <title>????</title>
-<shortdesc>????????????????????????????????????????????</shortdesc>
-<csprolog><csmetadata></csmetadata></csprolog>
+<shortdesc>??????????????????????????????????????????</shortdesc>
 <csbody>
-<p>????????????<wintitle>??</wintitle>???????????<dl>
-<dlentry>
-<dt>??</dt>
-<dd>??????????????????????</dd>
-</dlentry><dlentry>
-<dt>CPU</dt>
-<dd>???????????????????????????????</dd>
-</dlentry><dlentry>
-<dt>???</dt>
-<dd>????? (MB)??????????????????????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>???????????????????? (Livetile) ????? Linux ??????????</dd>
-</dlentry></dl></p>
-<p>?????????<wintitle>??</wintitle>?????</p>
 <dl><dlentry>
+<dt>??</dt>
+<dd>??????????????????????CPU????????
+??????????????
+?? CPU ????????????????</dd>
+</dlentry><dlentry>
 <dt>???</dt>
-<dd>??????? ISO ??????</dd>
+<dd>???????????????
+???????????????????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>??</dt>
+<dd>???????????????????? MAC ???
+?????????????????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>???</dt>
+<dd>?????????????????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>?? PCI ??</dt>
+<dd>?????????? PCI ?????</dd>
+</dlentry></dl>
+<dl><dlentry>
+<dt>Snapshot</dt>
+<dd>????? Snapshot???????????? Snapshot?
+???? Snapshot ?????????????????????? Snapshot ???????????????????????
+</dd>
 </dlentry></dl>
 <p> ?????????????????????<uicontrol>??</uicontrol>?</p>
 </csbody>
 </cshelp>
-<cshelp id="kimstoragedevice" xml:lang="zh-tw">
-<title>????????????</title>
-<shortdesc rev="rev1">?????????????????????????????? CDROM??????????????????</shortdesc>
+<cshelp id="kimhvirtmclone" xml:lang="zh-tw">
+<title>????</title>
+<shortdesc>???????????????</shortdesc>
 <csbody>
+<p>????????????????</p>
 <ol>
-<li>??<wintitle>????</wintitle>????????<wintitle>???</wintitle>??</li>
-<li>???????????????<uicontrol>???? (/)</uicontrol> ?????????
-ISO ??????????<uicontrol>??</uicontrol>?</li>
-<li>???????????????<uicontrol>???? (/)</uicontrol> ?????????????????<uicontrol>??</uicontrol>?</li>
-<li>?????????????????<uicontrol>?? (+)</uicontrol> ??????????????
-ISO ??????????<uicontrol>??</uicontrol>?</li>
-</ol>
-</csbody>
-</cshelp>
-<cshelp id="kimreplacemedia" xml:lang="zh-tw">
-<title>??????? CDROM</title>
-<shortdesc rev="rev1">????????????????? CDROM ????</shortdesc>
-<csbody>
-<ol>
-<li>??????????</li>
-<li>????????????<uicontrol>????</uicontrol>?</li>
-<li>??????? CDROM ??????????? hdc ?????<uicontrol>???? (/)</uicontrol> ???</li>
-<li>??<wintitle>??????? CDROM</wintitle>??????? ISO ????????????????</li>
-<li>???<uicontrol>??</uicontrol>?</li>
+<li>???????????????<uicontrol>??</uicontrol>?
+</li>
+<li>?????<note>????????? SCSI ? iSCSI ???????????????????????????????????
+</note></li>
 </ol>
+<p>?????????????????<uicontrol>????...</uicontrol>?????????????????????
+</p>
+
 </csbody>
 </cshelp>
 <?tm 1391540919 3?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 231 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_TW/host.dita b/ui/pages/help/zh_TW/host.dita
index a55aae4..550945e 100644
--- a/ui/pages/help/zh_TW/host.dita
+++ b/ui/pages/help/zh_TW/host.dita
@@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li>??<uicontrol>????</uicontrol>??????????</li>
 <li>??<uicontrol>??</uicontrol>????????? VNC ????????????????</li>
 </ul></p>
-<p>??????????????????<dl>
-<dlentry>
+<p>??????????????????</p>
+<dl><dlentry>
 <dt>????</dt>
-<dd>?????????????????????????????????????? (GB)?</dd>
+<dd>??????????????????????????????????? CPU ???????? (GB)?</dd>
 </dlentry><dlentry>
 <dt>??????</dt>
-<dd>????????????????? CPU??????? I/O ??? I/O ????????<uicontrol>???????????</uicontrol>?????????????????????</dd>
+<dd>????????????????? CPU??????? I/O ??? I/O ??????</dd>
 </dlentry><dlentry>
 <dt>????</dt>
 <dd>???????????????????????????????????????????????<uicontrol>????</uicontrol>?????????????????????????</dd>
@@ -31,20 +31,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dd>??????????????????????????????????????????????????????????????????????????????
 Red Hat Enterprise Linux ? Fedora?????? <filepath>yum</filepath> ???????????
 Ubuntu ? Debian?????? <filepath>deb</filepath> ????<p>???????
-yum ????????? GPG ???????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>???
-GPG ??????????? GPG ???? URL?</p></dd>
+yum ????????? GPG ???????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>??? <uicontrol>GPG ??</uicontrol>????????? GPG ???? URL?</p></dd>
 </dlentry><dlentry>
 <dt>????</dt>
 <dd>???????????????????????????????????????????????????<p>???????
 <cmdname>sosreport</cmdname> ???????????? Red
 Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>?Fedora
 ? Ubuntu ??????????? .tar ????????????????????????????????????????????????????????????????????????????</p> </dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 <?tm 1392659967 1?>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 232 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_TW/network.dita b/ui/pages/help/zh_TW/network.dita
index f392060..7c2926b 100644
--- a/ui/pages/help/zh_TW/network.dita
+++ b/ui/pages/help/zh_TW/network.dita
@@ -31,7 +31,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <li rev="rev1">??<uicontrol>??</uicontrol>????????</li>
 <li>??<uicontrol>??</uicontrol>????????</li>
 <li>??<uicontrol>??</uicontrol>????????</li>
-</ul>???????????????????<uicontrol>?? (+)</uicontrol> ???</p>
+</ul>????????????<uicontrol>?? (+)</uicontrol> ???
+</p>
 </csbody>
 <cshelp id="kimhnetwcrt" xml:lang="zh-tw">
 <title>????</title>
@@ -56,6 +57,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 230 -->
-<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_TW/storage.dita b/ui/pages/help/zh_TW/storage.dita
index 971619c..ff3ab95 100644
--- a/ui/pages/help/zh_TW/storage.dita
+++ b/ui/pages/help/zh_TW/storage.dita
@@ -14,7 +14,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>??????????????????<dl>
 <dlentry>
 <dt>??</dt>
-<dd>??????????????</dd>
+<dd>???????</dd>
+</dlentry><dlentry>
+<dt>??????</dt>
+<dd>???????????</dd>
 </dlentry><dlentry>
 <dt>??</dt>
 <dd>????????????????????????</dd>
@@ -34,21 +37,12 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <p>????????????????<ul>
 <li>??<uicontrol>??</uicontrol>??????????????</li>
 <li>??<uicontrol>????</uicontrol>?????????????</li>
+<li>??<uicontrol>????</uicontrol>?????????????????
+</li>
 <li>??<uicontrol>????</uicontrol>????????????</li>
 </ul></p>
-<p>??????????????????????????????????????????<dl><dlentry>
-<dt>??</dt>
-<dd>?????????<uicontrol>??</uicontrol>?</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>?????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>?????????????</dd>
-</dlentry></dl>????????????????????<uicontrol>?? (+)</uicontrol> ???</p>
+<p>????????????????????????????????????????????<uicontrol>?? (+)</uicontrol> ???
+</p>
 </csbody>
 <cshelp id="kimhdefstor" xml:lang="zh-tw">
 <title>?????</title>
@@ -76,13 +70,29 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <dt><uicontrol>SCSI ????</uicontrol></dt>
 <dd>?? SCSI ???????????????? SCSI ????</dd>
 </dlentry></dl></li>
+<li>????????????????????????????????????
+????????????????????????????????????
+</li>
 <li>???<uicontrol>??</uicontrol>?</li>
 </ol> </p>
 </csbody>
 </cshelp>
+<cshelp id="kimhdefstor" xml:lang="zh-tw">
+<title>????</title>
+<shortdesc>??????????</shortdesc>
+<csbody>
+<dl><dlentry>
+<dt>??? URL ??</dt>
+<dd>???????????????<filepath>https://my-server/fedora22.img</filepath>?</dd>
+</dlentry><dlentry>
+<dt>????</dt>
+<dd>?????????????</dd>
+</dlentry></dl>
+</csbody>
+</cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 233 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
diff --git a/ui/pages/help/zh_TW/templates.dita b/ui/pages/help/zh_TW/templates.dita
index 4b3a6a6..38617a8 100644
--- a/ui/pages/help/zh_TW/templates.dita
+++ b/ui/pages/help/zh_TW/templates.dita
@@ -12,8 +12,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
 <shortdesc>?<wintitle>??</wintitle>???????????
 KVM ?????????????</shortdesc>
 <csbody>
-<p>?????????????????<dl>
-<dlentry>
+<p>?????????????????</p>
+<dl><dlentry>
 <dt>OS</dt>
 <dd>????????????????</dd>
 </dlentry><dlentry>
@@ -25,66 +25,63 @@ KVM ?????????????</shortdesc>
 </dlentry><dlentry>
 <dt>???</dt>
 <dd>????????????? (MB)?</dd>
-</dlentry></dl></p>
-<p>???????????????<ul>
+</dlentry></dl>
+<p>???????????????</p>
+<ul>
 <li>??<uicontrol>??</uicontrol>??????</li>
+<li>??<uicontrol>??</uicontrol>??????</li>
 <li>??<uicontrol>??</uicontrol>??????</li>
-</ul>???????????????????<uicontrol>?? (+)</uicontrol> ???</p>
+</ul>
+<p>????????????<uicontrol>?? (+)</uicontrol> ???
+</p>
 </csbody>
 <cshelp id="kimhedittempl" xml:lang="zh-tw">
 <title>????</title>
 <shortdesc>???????</shortdesc>
 <csbody>
-<p>?????????????????<dl>
-<dlentry>
-<dt>??</dt>
-<dd>??????</dd>
+<p>?????????????????</p>
+<dl><dlentry>
+<dt>??</dt>
+<dd>??????????????????ISO ??????????????
+</dd>
 </dlentry><dlentry>
-<dt>???</dt>
-<dd>??????????????????????????</dd>
+<dt>???</dt>
+<dd>???????????</dd>
 </dlentry><dlentry>
-<dt>??</dt>
-<dd>?????????????????????</dd>
-</dlentry><dlentry>
-<dt>CPU ??</dt>
-<dd>????????????</dd>
-</dlentry><dlentry>
-<dt>???</dt>
-<dd>?????????????? (MB)?</dd>
+<dt>??</dt>
+<dd>????? KVM ??????????
+??????????</dd>
 </dlentry><dlentry>
-<dt>??</dt>
-<dd>???? (GB)?</dd>
-</dlentry><dlentry>
-<dt>CDROM</dt>
-<dd>???? KVM ??? ISO ??????????</dd>
-</dlentry><dlentry>
-<dt>???</dt>
-<dd>????????????</dd>
-</dlentry><dlentry>
-<dt>??</dt>
-<dd>KVM ???????????????????????</dd>
-</dlentry></dl> ?????????????????????<uicontrol>??</uicontrol>?</p>
+<dt>???</dt>
+<dd>? <uicontrol>CPU ??</uicontrol>??????????????????
+</dd>
+<dd>??????????????? CPU ???</dd>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>????</title>
 <shortdesc>?????????????????? ISO ?????? 'ISO' ????????????</shortdesc>
 <csbody>
-<p>????????????????<dl>
-<dlentry>
+<p>????????????????</p>
+<dl><dlentry>
 <dt>?? ISO ???</dt>
 <dd>????????????????????? ISO ????</dd>
 </dlentry><dlentry>
+<dt>?????</dt>
+<dd>????????????????</dd>
+</dlentry><dlentry>
 <dt>?? ISO ???</dt>
 <dd>????????? ISO ?????????</dd>
-</dlentry></dl></p>
+</dlentry></dl>
 </csbody>
 </cshelp>
 <cshelp id="kimhaddloct">
-<title>???? - ?? ISO ???</title>
-<shortdesc>??? ISO ????????</shortdesc>
+<title>???? - ISO ???</title>
+<shortdesc>? ISO ????????</shortdesc>
 <csbody>
-<p>?????????? ISO ????<dl><dlentry>
+<p>???????????? ISO ????</p>
+<dl><dlentry>
 <dt>OS</dt>
 <dd>????????????????</dd>
 </dlentry><dlentry>
@@ -93,20 +90,21 @@ KVM ?????????????</shortdesc>
 </dlentry><dlentry>
 <dt>??</dt>
 <dd>ISO ???????</dd>
-</dlentry></dl></p>
-<p>??? ISO ??????????????????<ul>
+</dlentry></dl>
+<p>??? ISO ??????????????????</p>
+<ul>
 <li>?????????? ISO ?????????<uicontrol>??? ISO ????</uicontrol>?</li>
 <li>??<uicontrol>??</uicontrol>???????? ISO ?????????????<uicontrol>??? ISO ????</uicontrol>?</li>
 <li>?????? ISO ?????????????????????????<ul>
 <li>??<uicontrol>??????? ISO ??</uicontrol>??? ISO ???????</li>
 <li>???<uicontrol>???? ISO</uicontrol> ????? ISO ????</li>
 </ul></li>
-</ul></p>
+</ul>
 </csbody>
 </cshelp>
 </cshelp>
 
 
-<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
+<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
 <!-- T9N_SRC_ID 229 -->
-<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
+<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
-- 
2.4.3



From dhbarboza82 at gmail.com  Wed Jul 22 13:09:43 2015
From: dhbarboza82 at gmail.com (Daniel Henrique Barboza)
Date: Wed, 22 Jul 2015 10:09:43 -0300
Subject: [Kimchi-devel] [PATCH] Translation updates
In-Reply-To: <1437501859-16862-1-git-send-email-dhbarboza82@gmail.com>
References: <1437501859-16862-1-git-send-email-dhbarboza82@gmail.com>
Message-ID: <55AF9617.9030609@gmail.com>

Patch applied to master branch of https://github.com/danielhb/kimchi

On 07/21/2015 03:04 PM, dhbarboza82 at gmail.com wrote:
> From: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
>
> This patch includes updated translation strings for several languages
> that Kimchi supports.
>
> Signed-off-by: Daniel Henrique Barboza <dhbarboza82 at gmail.com>
> ---
>   po/de_DE.po                        | 1485 +++++++++++++++++++----------
>   po/es_ES.po                        | 1474 ++++++++++++++++++----------
>   po/fr_FR.po                        | 1671 ++++++++++++++++++++------------
>   po/it_IT.po                        | 1467 +++++++++++++++++++---------
>   po/ko_KR.po                        | 1507 ++++++++++++++++++++---------
>   po/ru_RU.po                        | 1503 ++++++++++++++++++++---------
>   po/zh_CN.po                        | 1843 ++++++++++++++++++++++++------------
>   po/zh_TW.po                        | 1541 +++++++++++++++++++++---------
>   ui/pages/help/de_DE/guests.dita    |  106 +--
>   ui/pages/help/de_DE/host.dita      |   16 +-
>   ui/pages/help/de_DE/network.dita   |    6 +-
>   ui/pages/help/de_DE/storage.dita   |   41 +-
>   ui/pages/help/de_DE/templates.dita |   77 +-
>   ui/pages/help/es_ES/guests.dita    |  105 +-
>   ui/pages/help/es_ES/host.dita      |   16 +-
>   ui/pages/help/es_ES/network.dita   |    6 +-
>   ui/pages/help/es_ES/storage.dita   |   39 +-
>   ui/pages/help/es_ES/templates.dita |   79 +-
>   ui/pages/help/fr_FR/guests.dita    |  110 +--
>   ui/pages/help/fr_FR/host.dita      |   19 +-
>   ui/pages/help/fr_FR/network.dita   |    7 +-
>   ui/pages/help/fr_FR/storage.dita   |   43 +-
>   ui/pages/help/fr_FR/templates.dita |   89 +-
>   ui/pages/help/it_IT/guests.dita    |  107 +--
>   ui/pages/help/it_IT/host.dita      |   16 +-
>   ui/pages/help/it_IT/network.dita   |    6 +-
>   ui/pages/help/it_IT/storage.dita   |   45 +-
>   ui/pages/help/it_IT/templates.dita |   83 +-
>   ui/pages/help/ko_KR/guests.dita    |  119 +--
>   ui/pages/help/ko_KR/host.dita      |   20 +-
>   ui/pages/help/ko_KR/network.dita   |    6 +-
>   ui/pages/help/ko_KR/storage.dita   |   43 +-
>   ui/pages/help/ko_KR/templates.dita |   81 +-
>   ui/pages/help/ru_RU/guests.dita    |  113 ++-
>   ui/pages/help/ru_RU/host.dita      |   16 +-
>   ui/pages/help/ru_RU/network.dita   |    6 +-
>   ui/pages/help/ru_RU/storage.dita   |   43 +-
>   ui/pages/help/ru_RU/templates.dita |   80 +-
>   ui/pages/help/zh_CN/guests.dita    |  106 +--
>   ui/pages/help/zh_CN/host.dita      |   16 +-
>   ui/pages/help/zh_CN/network.dita   |    6 +-
>   ui/pages/help/zh_CN/storage.dita   |   39 +-
>   ui/pages/help/zh_CN/templates.dita |   82 +-
>   ui/pages/help/zh_TW/guests.dita    |  117 +--
>   ui/pages/help/zh_TW/host.dita      |   17 +-
>   ui/pages/help/zh_TW/network.dita   |    7 +-
>   ui/pages/help/zh_TW/storage.dita   |   42 +-
>   ui/pages/help/zh_TW/templates.dita |   82 +-
>   48 files changed, 9535 insertions(+), 5013 deletions(-)
>
> diff --git a/po/de_DE.po b/po/de_DE.po
> index bfd82d0..1347df6 100644
> --- a/po/de_DE.po
> +++ b/po/de_DE.po
> @@ -1,5 +1,6 @@
>   # English translations for kimchi package.
>   # Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
> @@ -9,44 +10,53 @@ msgstr ""
>   "PO-Revision-Date: 2013-07-11 17:32-0400\n"
>   "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
>   "Language-Team: English\n"
> -"Language: de_DE\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
> +"Plural-Forms: nplurals=2; plural=n != 1;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
>   msgstr ""
> +"Unbekannter Parameter %(value)s"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "L?schen ist nicht zul?ssig f?r %(resource)s"
> +msgstr ""
> +"L?schen ist nicht zul?ssig f?r %(resource)s"
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "%(resource)s implementiert keine Aktualisierungsmethode"
> +msgstr ""
> +"%(resource)s implementiert keine Aktualisierungsmethode"
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "Erstellen ist nicht zul?ssig f?r %(resource)s"
> +msgstr ""
> +"Erstellen ist nicht zul?ssig f?r %(resource)s"
>   
>   msgid "Unable to parse JSON request"
> -msgstr "JSON-Anfrage konnte nicht analysiert werden"
> +msgstr ""
> +"JSON-Anfrage konnte nicht analysiert werden"
>   
>   msgid "This API only supports JSON"
> -msgstr "Diese API unterst?tzt nur JSON"
> +msgstr ""
> +"Diese API unterst?tzt nur JSON"
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
>   msgstr ""
> +"Parameter entsprechen nicht der Anforderung im Schema: %(err)s"
>   
>   msgid "You don't have permission to perform this operation."
>   msgstr ""
> +"Sie verf?gen nicht ?ber die Berechtigung zur Ausf?hrung dieser Operation."
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "Datenspeicher wird nicht im Modellobjekt initialisiert."
> +msgstr ""
> +"Datenspeicher wird nicht im Modellobjekt initialisiert."
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> @@ -56,83 +66,99 @@ msgstr ""
>   #, python-format
>   msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
>   msgstr ""
> +"Zeitlimit von %(seconds)s Sekunden ist w?hrend der Ausf?hrung von Task '%(task)s' abgelaufen."
>   
>   #, python-format
>   msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
>   msgstr ""
> -"Authentifizierung f?r Benutzer '%(username)s' fehlgeschlagen. [Fehlercode: "
> -"%(code)s]"
> +"Authentifizierung f?r Benutzer '%(username)s' fehlgeschlagen. [Fehlercode: %(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen"
> +msgstr ""
> +"Sie sind nicht berechtigt, auf Kimchi zuzugreifen"
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "Geben Sie %(item)s an, um sich bei Kimchi anzumelden"
> +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 ""
> +"Benutzer %(user_id)s mit den angegebenen LDAP-Einstellungen wurde nicht gefunden."
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
>   msgstr ""
> +"Ung?ltige LDAP-Konfiguration: %(item)s : %(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
>   msgstr ""
> +"Unbekanntes Element \"_cap\" angegeben"
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
>   msgstr ""
> +"F?r \"_passthrough\" muss \"true\" oder \"false\" angegeben werden"
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
>   msgstr ""
> +"F?r \"_passthrough_affected_by\" muss eine Einheitennamenszeichenfolge angegeben werden"
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
> -msgstr "Fehler beim Abrufen von Blockeinheiten. Details: %(err)s"
> +msgstr ""
> +"Fehler beim Abrufen von Blockeinheiten. Details: %(err)s"
>   
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
> -msgstr "Fehler beim Abrufen von Blockeinheitinformationen f?r %(device)s."
> +msgstr ""
> +"Fehler beim Abrufen von Blockeinheiteninformationen f?r %(device)s."
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "Distro-Datei konnte nicht gefunden werden: %(filename)s"
> +msgstr ""
> +"Distro-Datei konnte nicht gefunden werden: %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
>   msgstr ""
> -"Distro-Datei konnte nicht analysiert werden: %(filename)s. Stellen Sie "
> -"sicher, dass es sich um eine JSON-Datei handelt."
> +"Distro-Datei konnte nicht analysiert werden: %(filename)s. Stellen Sie sicher, dass es sich um eine JSON-Datei handelt."
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
> -msgstr "Fehler beim Anmelden bei iSCSI-Hostziel %(portal)s. Details: %(err)s"
> +msgstr ""
> +"Fehler beim Anmelden bei iSCSI-Hostziel %(portal)s. Details: %(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
> -msgstr "Anmeldung bei iSCSI-Host %(host)s Ziel %(target)s nicht m?glich"
> +msgstr ""
> +"Anmeldung bei iSCSI-Host %(host)s Ziel %(target)s nicht m?glich"
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
>   msgstr ""
> +"ISO-Datei %(filename)s konnte nicht gefunden werden"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "Die ISO-Datei %(filename)s ist nicht bootf?hig"
> +msgstr ""
> +"Die ISO-Datei %(filename)s ist nicht bootf?hig"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
> -msgstr "Die ISO-Datei %(filename)s hat keinen g?ltigen El Torito-Bootsatz"
> +msgstr ""
> +"Die ISO-Datei %(filename)s hat keinen g?ltigen El Torito-Bootsatz"
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> -msgstr "Ung?ltiger El Torito-Pr?feintrag in ISO-Datei %(filename)s"
> +msgstr ""
> +"Ung?ltiger El Torito-Pr?feintrag in ISO-Datei %(filename)s"
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "Ung?ltiger El Torito-Boot-Indikator in ISO-Datei %(filename)s"
> +msgstr ""
> +"Ung?ltiger El Torito-Boot-Indikator in ISO-Datei %(filename)s"
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
> @@ -142,8 +168,7 @@ msgstr ""
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
>   msgstr ""
> -"Ung?ltiges Format beim Lesen des Datentr?gerdeskriptors in ISO-Datei "
> -"%(filename)s"
> +"Ung?ltiges Format beim Lesen des Datentr?gerdeskriptors in ISO-Datei %(filename)s"
>   
>   #, python-format
>   msgid ""
> @@ -153,54 +178,64 @@ msgid ""
>   "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
>   "'path_to_iso'.Details: %(err)s"
>   msgstr ""
> -"Der Hypervisor hat nicht die Berechtigung, die ISO-Datei %(filename)s zu "
> -"verwenden. Verschieben Sie sie entweder nach /var/lib/libvirt oder setzen "
> -"Sie, sofern m?glich, die Suchberechtigung auf Dateizugriffssteuerungslisten "
> -"f?r den Benutzer '%(user)s' oder f?gen Sie '%(user)s' der ISO-Pfadgruppe "
> -"hinzu oder (nicht empfohlen) 'chmod -R o+x 'path_to_iso'. Details: %(err)s"
> +"Der Hypervisor hat nicht die Berechtigung, die ISO-Datei %(filename)s zu verwenden."
> +"Verschieben Sie sie entweder nach /var/lib/libvirt oder setzen Sie, sofern m?glich, die Suchberechtigung "
> +"auf Dateizugriffssteuerungslisten f?r den Benutzer '%(user)s' oder f?gen Sie "
> +"'%(user)s' der ISO-Pfadgruppe hinzu oder (nicht empfohlen) 'chmod -R o+x "
> +"'path_to_iso'. Details: %(err)s"
>   
>   msgid "An error occurred when probing image OS information."
>   msgstr ""
> +"Beim Pr?fen der OS-Informationen des Image ist ein Fehler aufgetreten."
>   
>   msgid "No OS information found in given image."
>   msgstr ""
> +"Im angegebenen Image wurden keine OS-Informationen gefunden."
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
>   msgstr ""
> +"Die Imagedatei %(filename)s konnte nicht gelesen werden"
>   
>   #, python-format
>   msgid ""
>   "Image file must be an existing file on system. %(filename)s is not a valid "
>   "input."
>   msgstr ""
> +"Bei der Imagedatei muss es sich um eine auf dem System vorhandene Datei handeln. %(filename)s ist keine g?ltige "
> +"Eingabe."
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "Virtuelle Maschine %(name)s ist bereits vorhanden"
> +msgstr ""
> +"Virtuelle Maschine %(name)s ist bereits vorhanden"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "Virtuelle Maschine %(name)s ist nicht vorhanden"
> +msgstr ""
> +"Virtuelle Maschine %(name)s ist nicht vorhanden"
>   
>   #, python-format
>   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 ""
> +"Virtuelle Maschine %(name)s konnte nicht umbenannt werden. Der Name %(new_name)s ist bereits belegt "
> +"oder die virtuelle Maschine wurde nicht ausgeschaltet."
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
>   msgstr ""
> -"Screenshot f?r gestoppte virtuelle Maschine %(name)s konnte nicht abgerufen "
> -"werden"
> +"Screenshot f?r gestoppte virtuelle Maschine %(name)s konnte nicht abgerufen werden"
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "Fernes ISO-Image wird von diesem Server nicht unterst?tzt."
> +msgstr ""
> +"Fernes ISO-Image wird von diesem Server nicht unterst?tzt."
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
>   msgstr ""
> +"Screenshot wird auf virtueller Maschine %(name)s nicht unterst?tzt"
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> @@ -210,7 +245,7 @@ msgstr ""
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Virtuelle Maschine %(name)s konnte nicht erstellt werden. Details: %(err)s"
> +"Virtuelle Maschine %(name)s konnte nicht aktualisiert werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
> @@ -220,28 +255,33 @@ msgstr ""
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
>   msgstr ""
> -"Verbindung zur abgeschalteten Maschine %(name)s konnte nicht hergestellt "
> -"werden."
> +"Verbindung zu ausgeschalteter virtueller Maschine %(name)s konnte nicht hergestellt werden."
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"Name der virtuellen Maschine muss eine Zeichenfolge ohne Schr?gstriche (/) sein"
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
>   msgstr ""
> +"Ung?ltiger Vorlagen-URI %(value)s f?r virtuelle Maschine angegeben"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
>   msgstr ""
> +"Ung?ltiger Speicherpool-URI %(value)s f?r virtuelle Maschine angegeben"
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
>   msgstr ""
> +"Unterst?tzte Grafiken f?r virtuelle Maschine sind Spice oder VNC"
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
> -msgstr "Zu ?berwachende Grafikadresse muss IPv4 oder IPv6 sein"
> +msgstr ""
> +"Zu ?berwachende Grafikadresse muss IPv4 oder IPv6 sein"
>   
>   msgid "Specify a template to create a virtual machine from"
> -msgstr "Vorlage angeben, aus der eine virtuelle Maschine erstellt werden soll"
> +msgstr ""
> +"Vorlage angeben, aus der eine virtuelle Maschine erstellt werden soll"
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> @@ -251,7 +291,7 @@ msgstr ""
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Virtuelle Maschine %(name)s konnte nicht gestoppt werden. Details: %(err)s"
> +"Virtuelle Maschine %(name)s konnte nicht ausgeschaltet werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
> @@ -261,114 +301,142 @@ msgstr ""
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Virtuelle Maschine %(name)s konnte nicht umbenannt werden. Details: %(err)s"
> +"Virtuelle Maschine %(name)s konnte nicht zur?ckgesetzt werden. Details: %(err)s"
>   
>   msgid "User name list must be an array"
>   msgstr ""
> +"Benutzernamensliste muss ein Array sein"
>   
>   msgid "User name must be a string"
> -msgstr "Netzname muss eine Zeichenfolge sein"
> +msgstr ""
> +"Benutzername muss eine Zeichenfolge sein"
>   
>   msgid "Group name list must be an array"
>   msgstr ""
> +"Gruppennamensliste muss ein Array sein"
>   
>   msgid "Group name must be a string"
> -msgstr "Netzname muss eine Zeichenfolge sein"
> +msgstr ""
> +"Gruppenname muss eine Zeichenfolge sein"
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "Benutzer '%(users)s' ist nicht vorhanden."
> +msgstr ""
> +"Benutzer '%(users)s' nicht vorhanden"
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "Benutzer '%(groups)s' ist nicht vorhanden."
> +msgstr ""
> +"Gruppe(n) '%(groups)s' nicht vorhanden"
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Virtuelle Maschine %(name)s konnte nicht gestoppt werden. Details: %(err)s"
> +"Virtuelle Maschine %(name)s konnte nicht heruntergefahren werden. Details: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Virtuelle Maschine %(name)s konnte nicht gestartet werden. Details: %(err)s"
> +"Zugriff auf die Metadaten der virtuellen Maschine %(name)s nicht m?glich. Details: %(err)s"
>   
>   msgid "The guest console password must be a string."
>   msgstr ""
> +"Das Konsolenkennwort des Gastes muss eine Zeichenfolge sein."
>   
>   msgid "The life time for the guest console password must be a number."
>   msgstr ""
> +"Die Lebensdauer f?r das Konsolenkennwort des Gastes muss eine Zahl sein."
>   
>   #, python-format
>   msgid "Virtual machine '%(name)s' must be stopped before cloning it."
>   msgstr ""
> +"Die virtuelle Maschine '%(name)s' muss vor dem Klonen gestoppt werden."
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
>   msgstr ""
> +"Nicht gen?gend Plattenspeicherplatz zum Klonen der virtuellen Maschine '%(name)s' vorhanden"
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Virtuelle Maschine '%(name)s' konnte nicht geklont werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"Ung?ltige Operation f?r nicht permanente virtuelle Maschine %(name)s"
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"Die virtuelle Maschine '%(name)s' kann nicht ausgesetzt werden, weil sie momentan nicht aktiv ist."
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Virtuelle Maschine '%(name)s' konnte nicht ausgesetzt werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"Die virtuelle Maschine '%(name)s' kann nicht fortgesetzt werden, weil sie nicht angehalten wurde."
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Virtuelle Maschine '%(name)s' konnte nicht fortgesetzt werden. Details: %(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"Der zugewiesene Speicher ?berschreitet den auf dem Host zul?ssigen Maximalwert."
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"Die Live-Speicheraktualisierung wird von der virtuellen Maschine '%(name)s' nicht unterst?tzt. Aktualisieren Sie den Speicher mit "
> +"der Maschine im Offlinemodus, um diese Funktion zu aktivieren."
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"Die Speichervergr??erung ist nur in aktiven virtuellen Maschinen zul?ssig"
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"F?r die Live-Speicheraktualisierung muss der neue Speicherwert gleich dem alten Speicherwert plus "
> +"ein Vielfaches von 1024 Mebibyte sein"
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"Auf dem Gast sind nicht gen?gend freie Slots mit 1024 Mebibyte vorhanden."
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"Die libvirt-Version des Hosts unterst?tzt keine Speichereinheiten. F?r libvirt muss >= "
> +"1.2.14 angegeben sein"
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"Fehler beim Anschlie?en der Speichereinheit. Details: %(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
>   msgstr ""
> +"VM %(vmid)s enth?lt die direkt zugewiesene Hosteinheit %(dev_name)s nicht."
>   
>   #, python-format
>   msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
>   msgstr ""
> +"Die Hosteinheit %(dev_name)s darf nicht direkt einer VM zugewiesen werden."
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -377,15 +445,23 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> +"Keine IOMMU-Gruppen gefunden. F?r den Host-PCI-Durchgriff muss die IOMMU-Gruppe "
> +"ordnungsgem?? funktionieren. Aktivieren Sie Intel VT-d oder AMD IOMMU in Ihrem BIOS "
> +"und pr?fen Sie dann, ob der Kernel mit IOMMU-Unterst?tzung kompiliert wurde. F?gen Sie "
> +"Ihrem Kernelparameter f?r die Intel-CPU intel_iommu=on in /boot/grub2/grub.conf hinzu. "
> +"F?r AMD-CPU m?ssen Sie iommu=pt iommu=1 hinzuf?gen."
>   
>   msgid "\"name\" should be a device name string"
>   msgstr ""
> +"F?r \"name\" muss eine Einheitennamenszeichenfolge angegeben werden"
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"Die Einheit %(name)s wird vermutlich vom Host benutzt. Es kann keine Verbindung der Einheit zum "
> +"Gast hergestellt werden."
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> @@ -396,110 +472,122 @@ msgstr ""
>   msgid ""
>   "Network %(network)s specified for virtual machine %(name)s does not exist"
>   msgstr ""
> -"Das f?r die virtuelle Maschine %(name)s angegebene Netz %(network)s ist "
> -"nicht vorhanden"
> +"Das Netz %(network)s, das f?r die virtuelle Maschine %(name)s angegeben wurde, ist nicht vorhanden"
>   
>   msgid "Supported virtual machine interfaces type is only network"
> -msgstr "Unterst?tzter Schnittstellentyp einer virtuellen Maschine ist nur Netz"
> +msgstr ""
> +"Unterst?tzter Schnittstellentyp einer virtuellen Maschine ist nur Netz"
>   
>   msgid "Network name for virtual machine interface must be a string"
>   msgstr ""
> -"Netzname f?r Schnittstelle einer virtuellen Maschine muss eine Zeichenfolge "
> -"sein"
> +"Netzname f?r Schnittstelle einer virtuellen Maschine muss eine Zeichenfolge sein"
>   
>   msgid "Invalid network model card specified for virtual machine interface"
>   msgstr ""
> -"Ung?ltige Netzmodellkarte f?r Schnittstelle einer virtuellen Maschine "
> -"angegeben"
> +"Ung?ltige Netzmodellkarte f?r Schnittstelle einer virtuellen Maschine angegeben"
>   
>   msgid "Specify type and network to add a new virtual machine interface"
>   msgstr ""
> -"Geben Sie Typ und Netz an, um eine neue Schnittstelle f?r eine virtuelle "
> -"Maschine hinzuzuf?gen"
> +"Geben Sie Typ und Netz an, um eine neue Schnittstelle f?r eine virtuelle Maschine hinzuzuf?gen"
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"MAC-Adresse muss folgendes Format verwenden: FF:FF:FF:FF:FF:FF"
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"MAC-Adresse %(mac)s ist in virtueller Maschine %(name)s bereits vorhanden"
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"Ung?ltige MAC-Adresse"
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"MAC-Adresse einer aktiven virtuellen Maschine kann nicht ge?ndert werden"
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "Vorlage %(name)s ist bereits vorhanden"
> +msgstr ""
> +"Vorlage %(name)s ist bereits vorhanden"
>   
>   #, python-format
>   msgid ""
>   "Network '%(network)s' specified for template %(template)s does not exist"
>   msgstr ""
> -"Das f?r Vorlage %(template)s angegebene Netz '%(network)s' ist nicht "
> -"vorhanden"
> +"Netz '%(network)s', das f?r Vorlage %(template)s angegeben wurde, ist nicht vorhanden"
>   
>   #, python-format
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
>   msgstr ""
> -"Der f?r Vorlage %(template)s angegebene Speicherpool '%(pool)s' ist nicht "
> -"vorhanden"
> +"Speicherpool %(pool)s, der f?r Vorlage %(template)s angegeben wurde, ist nicht vorhanden"
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
>   msgstr ""
> -"Der f?r Vorlage %(template)s angegebene Speicherpool '%(pool)s' ist nicht "
> -"aktiv"
> +"Speicherpool %(pool)s, der f?r Vorlage %(template)s angegeben wurde, ist nicht aktiv"
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "Ung?ltiger Parameter '%(param)s' f?r CD-ROM angegeben."
> +msgstr ""
> +"Ung?ltiger Parameter '%(param)s' f?r CD-ROM angegeben."
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
>   msgstr ""
> -"Das f?r Vorlage %(template)s angegebene Netz %(network)s ist nicht aktiv"
> +"Netz %(network)s, das f?r Vorlage %(template)s angegeben wurde, ist nicht aktiv"
>   
>   msgid "Template name must be a string"
> -msgstr "Vorlagenname muss eine Zeichenfolge sein"
> +msgstr ""
> +"Vorlagenname muss eine Zeichenfolge sein"
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "Vorlagensymbol muss ein Pfad zum Image sein"
> +msgstr ""
> +"Vorlagensymbol muss ein Pfad zum Image sein"
>   
>   msgid "Template distribution must be a string"
> -msgstr "Vorlagenverteilung muss eine Zeichenfolge sein"
> +msgstr ""
> +"Vorlagenverteilung muss eine Zeichenfolge sein"
>   
>   msgid "Template distribution version must be a string"
> -msgstr "Vorlagenverteilungsversion muss eine Zeichenfolge sein"
> +msgstr ""
> +"Vorlagenverteilungsversion muss eine Zeichenfolge sein"
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "Die Anzahl der CPUs muss eine Ganzzahl sein"
> +msgstr ""
> +"Die Anzahl der CPUs muss eine Ganzzahl gr??er als 0 sein"
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
> -msgstr "Speicherkapazit?t (MB) muss eine Ganzzahl gr??er als 512 sein"
> +msgstr ""
> +"Speicherkapazit?t (MB) muss eine Ganzzahl gr??er als 512 sein"
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
> +msgstr ""
> +"Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
> -msgstr "Ung?ltiger Speicherpool-URI %(value)s f?r Vorlage angegeben"
> +msgstr ""
> +"Ung?ltiger Speicherpool-URI %(value)s f?r Vorlage angegeben"
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
> -msgstr "Geben Sie ein ISO-Image als CD-ROM an, um eine Vorlage zu erstellen"
> +msgstr ""
> +"Geben Sie ein ISO-Image als CD-ROM oder ein Basisimage an, um eine Vorlage zu erstellen"
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "Alle Netze f?r die Vorlage m?ssen in einer Liste angegeben werden."
> +msgstr ""
> +"Alle Netze f?r die Vorlage m?ssen in einer Liste angegeben werden."
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
>   msgstr ""
> +"Geben Sie einen Datentr?ger f?r eine Vorlage an, wenn der Speicherpool iSCSI oder SCSI ist"
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
>   msgstr ""
> +"Der Datentr?ger %(volume)s ist nicht im Speicherpool %(pool)s vorhanden"
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> @@ -513,64 +601,80 @@ msgstr ""
>   
>   msgid "Disk size must be an integer greater than 1GB."
>   msgstr ""
> +"Plattengr??e muss eine Ganzzahl gr??er als 1 GB sein."
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein"
> +msgstr ""
> +"Basisimage der Vorlage muss eine g?ltige lokale Imagedatei sein"
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
>   msgstr ""
> +"Format f?r %(path)s des Basisimage kann nicht ermittelt werden"
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
>   msgstr ""
> +"Bei der Angabe der CPU-Topologie m?ssen VCPUs ein Produkt der Sockets, Kerne und "
> +"Threads sein."
>   
>   msgid ""
>   "When specifying CPU topology, each element must be an integer greater than "
>   "zero."
>   msgstr ""
> +"Bei Angabe der CPU-Topologie muss jedes Element eine Ganzzahl gr??er als "
> +"null sein."
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"Ung?ltiges Plattenimageformat. G?ltige Formate: bochs, cloop, cow, dmg, qcow, "
> +"qcow2, qed, raw, vmdk, vpc."
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "Speicherpool %(name)s ist bereits vorhanden"
> +msgstr ""
> +"Speicherpool %(name)s ist bereits vorhanden"
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "Speicherpool %(name)s ist nicht vorhanden"
> +msgstr ""
> +"Speicherpool %(name)s ist nicht vorhanden"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
> -msgstr "Geben Sie %(item)s an, um den Speicherpool %(name)s zu erstellen"
> +msgstr ""
> +"Geben Sie %(item)s an, um den Speicherpool %(name)s zu erstellen"
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "Aktiver Speicherpool %(name)s konnte nicht gel?scht werden"
> +msgstr ""
> +"Aktiver Speicherpool %(name)s konnte nicht gel?scht werden"
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "Speicherpools konnten nicht aufgelistet werden. Details: %(err)s"
> +msgstr ""
> +"Speicherpools konnten nicht aufgelistet werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> -msgstr "Speicherpool %(name)s konnte nicht erstellt werden. Details: %(err)s"
> +msgstr ""
> +"Speicherpool %(name)s konnte nicht erstellt werden. Details: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"Anzahl der Speicherdatentr?ger im Speicherpool %(name)s konnte nicht "
> -"abgerufen werden. Details: %(err)s"
> +"Anzahl der Speicherdatentr?ger im Speicherpool %(name)s konnte nicht abgerufen werden. Details: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
> -msgstr "Speicherpool %(name)s konnte nicht aktiviert werden. Details: %(err)s"
> +msgstr ""
> +"Speicherpool %(name)s konnte nicht aktiviert werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
> @@ -579,135 +683,146 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
> -msgstr "Speicherpool %(name)s konnte nicht gel?scht werden. Details: %(err)s"
> +msgstr ""
> +"Speicherpool %(name)s konnte nicht gel?scht werden. Details: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
>   msgstr ""
> -"NFS-Pool konnte nicht erstellt werden, weil Exportpfad %(path)s beim Mounten "
> -"blockieren kann"
> +"NFS-Pool konnte nicht erstellt werden, weil Exportpfad %(path)s beim Mounten blockieren kann"
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
>   msgstr ""
> -"NFS-Pool konnte nicht erstellt werden, weil das Mounten des Exportpfads"
> -"%(path)s fehlgeschlagen ist"
> +"NFS-Pool konnte nicht erstellt werden, weil das Mounten des Exportpfads %(path)s fehlgeschlagen ist"
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "Nicht unterst?tzter Speicherpooltyp: %(type)s"
> +msgstr ""
> +"Nicht unterst?tzter Speicherpooltyp: %(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
>   msgstr ""
> +"Fehler beim Abrufen der XML f?r Speicherpool in %(pool)s"
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"Name des Speicherpools muss eine Zeichenfolge ohne Schr?gstriche (/) sein"
>   
>   msgid ""
>   "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
>   "iso"
>   msgstr ""
> +"Unterst?tzte Speicherpooltypen sind dir, netfs, logical, iscsi, isci und kimchi-"
> +"iso"
>   
>   msgid "Storage pool path must be a string"
> -msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
> +msgstr ""
> +"Speicherpoolpfad muss eine Zeichenfolge sein"
>   
>   msgid "Storage pool host must be a IP or hostname"
> -msgstr "Speicherpoolhost muss eine IP oder ein Hostname sein"
> +msgstr ""
> +"Speicherpoolhost muss eine IP oder ein Hostname sein"
>   
>   msgid "Storage pool device must be the absolute path to the block device"
>   msgstr ""
> +"Speicherpooleinheit muss den absoluten Pfad zur Blockeinheit angeben"
>   
>   msgid "Storage pool devices parameter must be a list"
> -msgstr "Einheitenparameter des Speicherpools muss eine Liste sein"
> +msgstr ""
> +"Einheitenparameter des Speicherpools muss eine Liste sein"
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "Ziel-IQN eines iSCSI-Pools muss eine Zeichenfolge sein"
> +msgstr ""
> +"Ziel-IQN eines iSCSI-Pools muss eine Zeichenfolge sein"
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
>   msgstr ""
> -"Port eines fernen Speicherservers muss eine Ganzzahl zwischen 1 und 65535 "
> -"sein"
> +"Port eines fernen Speicherservers muss eine Ganzzahl zwischen 1 und 65535 sein"
>   
>   msgid "iSCSI target username must be a string"
>   msgstr ""
> +"Benutzername des iSCSI-Ziels muss eine Zeichenfolge sein"
>   
>   msgid "iSCSI target password must be a string"
>   msgstr ""
> +"Kennwort des iSCSI-Ziels muss eine Zeichenfolge sein"
>   
>   msgid "Specify name and type to create a storage pool"
> -msgstr "Geben Sie Name und Typ an, um einen Speicherpool zu erstellen"
> +msgstr ""
> +"Geben Sie Name und Typ an, um einen Speicherpool zu erstellen"
>   
>   #, python-format
>   msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
>   msgstr ""
> -"%(disk)s ist keine g?ltige Platte/Partition. Sie konnte nicht hinzugef?gt "
> -"werden zum Pool %(pool)s."
> +"%(disk)s ist keine g?ltige Platte/Partition. Sie konnte nicht hinzugef?gt werden zum Pool "
> +"%(pool)s."
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
>   msgstr ""
> +"Logischer Pool %(pool)s konnte nicht erweitert werden. Details: %(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
>   msgstr ""
> -"Die Parameterplatten k?nnen nur f?r den logischen Speicherpool aktualisiert "
> -"werden."
> +"Die Parameterplatten k?nnen nur f?r den logischen Speicherpool aktualisiert werden."
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "Der Name des SCSI-Hostadapters muss eine Zeichenfolge sein."
> +msgstr ""
> +"Der Name des SCSI-Hostadapters muss eine Zeichenfolge sein."
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
> -msgstr "Der Speicherpool kimchi_isos ist f?r die interne Verwendung reserviert"
> +msgstr ""
> +"Der Speicherpool kimchi_isos ist f?r die interne Verwendung reserviert"
>   
>   #, python-format
>   msgid ""
>   "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"Der NFS-Speicherpool %(name)s konnte nicht aktiviert werden. NFS-Server "
> -"%(server)s ist nicht erreichbar."
> +"NFS-Speicherpool %(name)s konnte nicht aktiviert werden. NFS-Server %(server)s ist "
> +"nicht erreichbar."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"Der NFS-Speicherpool %(name)s konnte nicht inaktiviert werden. NFS-Server "
> -"%(server)s ist nicht erreichbar."
> +"NFS-Speicherpool %(name)s konnte nicht inaktiviert werden. NFS-Server %(server)s ist "
> +"nicht erreichbar."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate pool %(name)s as it is associated with some templates"
>   msgstr ""
> -"Pool %(name)s konnte nicht inaktiviert werden, weil er einigen Vorlagen "
> -"zugeordnet ist"
> +"Pool %(name)s konnte nicht inaktiviert werden, weil er einigen Vorlagen zugeordnet ist"
>   
>   #, python-format
>   msgid "Unable to delete pool %(name)s as it is associated with some templates"
>   msgstr ""
> -"Pool %(name)s konnte nicht gel?scht werden, weil er einigen Vorlagen "
> -"zugeordnet ist"
> +"Pool %(name)s konnte nicht gel?scht werden, weil er einigen Vorlagen zugeordnet ist"
>   
>   #, python-format
>   msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
>   msgstr ""
> -"Eine Datentr?gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. "
> -"W?hlen Sie einen anderen Namen aus, um den logischen Pool zu erstellen."
> +"Eine Datentr?gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. W?hlen Sie einen anderen Namen aus, "
> +"um den logischen Pool zu erstellen."
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
>   msgstr ""
> -"Datenbank mit Tiefenscaninformationen kann aufgrund des folgenden Fehlers "
> -"nicht aktualisiert werden: %(err)s"
> +"Datenbank mit Tiefenscaninformationen kann aufgrund des folgenden Fehlers nicht aktualisiert werden: %(err)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "Speicherdatentr?ger %(name)s ist bereits vorhanden"
> +msgstr ""
> +"Speicherdatentr?ger %(name)s ist bereits vorhanden"
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
> @@ -719,32 +834,33 @@ msgid ""
>   "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
>   "not active"
>   msgstr ""
> +"Speicherdatentr?ger %(volume)s konnte nicht erstellt werden, weil Speicherpool %(pool)s "
> +"nicht aktiv ist"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create storage volume %(volume)s"
> -msgstr "Geben Sie %(item)s an, um Speicherdatentr?ger %(volume)s zu erstellen"
> +msgstr ""
> +"Geben Sie %(item)s an, um den Speicherdatentr?ger %(volume)s zu erstellen"
>   
>   #, 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 "
> -"%(pool)s nicht aktiv ist"
> +"Speicherdatentr?ger konnten nicht aufgelistet werden, weil Speicherpool %(pool)s nicht aktiv ist"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"Speicherdatentr?ger %(name)s konnte nicht in Speicherpool %(pool)s erstellt "
> -"werden. Details: %(err)s"
> +"Speicherdatentr?ger %(name)s konnte im Speicherpool %(pool)s nicht erstellt werden. Details: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
>   msgstr ""
> -"Speicherdatentr?ger konnten nicht in Speicherpool %(pool)s aufgelistet "
> -"werden. Details: %(err)s"
> +"Speicherdatentr?ger im Speicherpool %(pool)s konnten nicht aufgelistet werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
> @@ -759,419 +875,493 @@ msgstr ""
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
>   msgstr ""
> -"Gr??e des Speicherdatentr?gers %(name)s konnte nicht ge?ndert werden. "
> -"Details: %(err)s"
> +"Gr??e des Speicherdatentr?gers %(name)s konnte nicht ge?ndert werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
>   msgstr ""
> -"Speichertyp %(type)s unterst?tzt nicht das Erstellen und L?schen von "
> -"Datentr?gern"
> +"Speichertyp %(type)s unterst?tzt nicht das Erstellen und L?schen von Datentr?gern"
>   
>   msgid "Storage volume name must be a string"
> -msgstr "Name des Speicherdatentr?gers muss eine Zeichenfolge sein"
> +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"
> +msgstr ""
> +"Zuordnung des Speicherdatentr?gers muss eine Ganzzahl sein"
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"Format des Speicherdatentr?gers wird nicht unterst?tzt. G?ltige Formate: bochs, cloop, cow, dmg, "
> +"qcow, qcow2, qed, raw, vmdk, vpc."
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "Speicherdatentr?ger erfordert einen Datentr?gernamen"
> +msgstr ""
> +"Speicherdatentr?ger erfordert einen Datentr?gernamen"
>   
>   #, python-format
>   msgid ""
>   "Unable to update database with storage volume information due error: %(err)s"
>   msgstr ""
> -"Datenbank mit Datentr?gerinformationen kann aufgrund des folgenden Fehlers "
> -"nicht aktualisiert werden: %(err)s"
> +"Datenbank mit Datentr?gerinformationen kann aufgrund des folgenden Fehlers nicht aktualisiert werden: %(err)s"
>   
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
>   msgstr ""
> +"Der Parameter %(param)s kann nur einmal angegeben werden"
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
>   msgstr ""
> +"Erstellung des Datentr?gers aus %(param)s wird nicht unterst?tzt"
>   
>   msgid "Storage volume capacity must be an integer number."
>   msgstr ""
> +"Kapazit?t des Speicherdatentr?gers muss eine Ganzzahl sein."
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
>   msgstr ""
> +"Speicherdatentr?ger-URL muss eine http://-, https://-, ftp://- oder ftps://-URL sein."
>   
>   #, python-format
>   msgid "Unable to access file %(url)s. Please, check it."
>   msgstr ""
> +"Zugriff auf Datei %(url)s konnte nicht ausgef?hrt werden. ?berpr?fen Sie die Datei."
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Speicherdatentr?ger '%(name)s' im Pool '%(pool)s' konnte nicht geklont werden. Details: "
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"Geben Sie Chunkdaten und deren Gr??e an, um eine Datei hochzuladen."
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"Um einen Speicherdatentr?ger hochzuladen, m?ssen Sie den Parameter 'upload' angeben."
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"Chunkdaten konnten nicht hochgeladen werden, da sie nicht mit der angeforderten Chunkgr??e ?bereinstimmen."
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"Der Speicherdatentr?ger %(vol)s befindet sich nicht in einem Uploadprozess."
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"Die Chunkdaten f?r den Upload ?berschreiten die Gr??e des Speicherdatentr?gers."
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"Chunkdaten konnten nicht auf Speicherdatentr?ger hochgeladen werden. Details: %(err)s."
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "Schnittstelle %(name)s ist nicht vorhanden"
> +msgstr ""
> +"Schnittstelle %(name)s ist nicht vorhanden"
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "Netz %(name)s ist bereits vorhanden"
> +msgstr ""
> +"Netz %(name)s ist bereits vorhanden"
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "Netz %(name)s ist nicht vorhanden"
> +msgstr ""
> +"Netz %(name)s ist nicht vorhanden"
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
>   msgstr ""
> -"Das f?r das Netz %(network)s angegebene Teilnetz %(subnet)s ist nicht g?ltig."
> +"Das Teilnetz %(subnet)s, das f?r das Netz %(network)s angegeben wurde, ist nicht g?ltig."
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
>   msgstr ""
> -"Geben Sie eine Netzschnittstelle an, um ?berbr?cktes Netz %(name)s zu "
> -"erstellen"
> +"Geben Sie eine Netzschnittstelle an, um das ?berbr?ckte Netz %(name)s zu erstellen"
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "Aktives Netz %(name)s konnte nicht gel?scht werden"
> +msgstr ""
> +"Aktives Netz %(name)s konnte nicht gel?scht werden"
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
>   msgstr ""
> -"Die f?r das Netz %(network)s angegebene Schnittstelle %(iface)s wird bereits "
> -"verwendet"
> +"Die Schnittstelle %(iface)s, die f?r das Netz %(network)s angegeben wurde, ist bereits belegt"
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
> -msgstr "Schnittstelle sollte blo?es NIC, Bonding oder Br?ckeneinheit sein."
> +msgstr ""
> +"Schnittstelle sollte blo?es NIC, Bonding oder Br?ckeneinheit sein."
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s"
> +msgstr ""
> +"Netz %(name)s konnte nicht erstellt werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "Es konnte keine freie IP-Adresse f?r Netz '%(name)s' gefunden werden"
> +msgstr ""
> +"Es konnte keine freie IP-Adresse f?r Netz '%(name)s' gefunden werden"
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
>   msgstr ""
> +"Schnittstelle %(iface)s ist bereits vorhanden."
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"Netzname muss eine Zeichenfolge ohne Schr?gstriche (/) oder Anf?hrungszeichen (\") sein"
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "Unterst?tzte Netztypen sind Isoliert, NAT und Br?cke"
> +msgstr ""
> +"Unterst?tzte Netztypen sind Isoliert, NAT und Br?cke"
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
>   msgstr ""
> -"Teilnetz des Netzes muss eine Zeichenfolge mit IP-Adresse und Pr?fix oder "
> -"Netzmaske sein"
> +"Teilnetz des Netzes muss eine Zeichenfolge mit IP-Adresse und Pr?fix oder Netzmaske sein"
>   
>   msgid "Network interface must be a string"
> -msgstr "Netzschnittstelle muss eine Zeichenfolge sein"
> +msgstr ""
> +"Netzschnittstelle muss eine Zeichenfolge sein"
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "Netz-VLAN-ID muss eine Ganzzahl zwischen 1 und 4094 sein"
> +msgstr ""
> +"Netz-VLAN-ID muss eine Ganzzahl zwischen 1 und 4094 sein"
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen"
> +msgstr ""
> +"Geben Sie Name und Typ an, um ein Netz zu erstellen"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
>   "and/or templates linked to this network."
>   msgstr ""
> -"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
> -"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verkn?pft."
> +"Netz %(name)s konnte nicht gel?scht werden. Mit diesem Netz sind einige virtuelle Maschinen %(vms)s "
> +"und/oder Vorlagen verlinkt."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate network %(name)s. There are some virtual machines "
>   "%(vms)s and/or templates linked to this network."
>   msgstr ""
> -"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
> -"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verkn?pft."
> +"Netz %(name)s konnte nicht inaktiviert werden. Mit diesem Netz sind einige virtuelle Maschinen "
> +"%(vms)s und/oder Vorlagen verlinkt."
>   
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
> -msgstr "Br?ckeneinheit %(name)s kann nicht die Trunkeinheit eines VLAN sein."
> +msgstr ""
> +"Br?ckeneinheit %(name)s kann nicht die Trunkeinheit eines VLAN sein."
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "Schnittstelle %(iface)s konnte nicht aktiviert werden: %(err)s."
> +msgstr ""
> +"Schnittstelle %(iface)s konnte nicht aktiviert werden: %(err)s."
>   
>   #, python-format
>   msgid ""
>   "Failed to activate interface %(iface)s. Please check the physical link "
>   "status."
>   msgstr ""
> -"Schnittstelle %(iface)s konnte nicht aktiviert werden. Bitte ?berpr?fen Sie "
> -"den Status der physischen Verbindung."
> +"Schnittstelle %(iface)s konnte nicht aktiviert werden. ?berpr?fen Sie den Status der "
> +"physischen Verbindung."
>   
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
>   msgstr ""
> +"Netz %(name)s konnte nicht gestartet werden. Details: %(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "Debugbericht %(name)s ist nicht vorhanden"
> +msgstr ""
> +"Debugbericht %(name)s ist nicht vorhanden"
>   
>   msgid "Debug report tool not found in system"
> -msgstr "Debugberichtstool nicht im System gefunden"
> +msgstr ""
> +"Debugberichtstool nicht im System gefunden"
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
> -msgstr "Debugbericht %(name)s konnte nicht erstellt werden. Details: %(err)s."
> +msgstr ""
> +"Debugbericht %(name)s konnte nicht erstellt werden. Details: %(err)s."
>   
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
>   msgstr ""
> +"Ein Debugbericht mit dem angegebenen Namen %(name)s konnte nicht gefunden werden"
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
> -msgstr "Debugbericht %(name)s konnte nicht generiert werden. Details: %(err)s"
> +msgstr ""
> +"Debugbericht %(name)s konnte nicht generiert werden. Details: %(err)s"
>   
>   msgid "You should give a name for the debug report file."
>   msgstr ""
> +"Sie m?ssen einen Namen f?r die Debugberichtsdatei angeben."
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> +"Der Name des Debugberichts muss eine Zeichenfolge sein. Nur Buchstaben, Ziffern, Unterstreichungszeichen ('_') "
> +"und Bindestriche ('-') sind zul?ssig."
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
>   msgstr ""
> -"Eine Datentr?gergruppe mit dem Namen '%(name)s' ist bereits vorhanden. "
> -"W?hlen Sie einen anderen Namen aus, um den logischen Pool zu erstellen."
> +"Der Debugbericht mit dem Namen \"%(name)s\" ist bereits vorhanden. Verwenden Sie "
> +"einen anderen Namen."
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "Speicherserver %(server)s wurde nicht von Kimchi verwendet"
> +msgstr ""
> +"Speicherserver %(server)s wurde nicht von Kimchi verwendet"
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "Distro '%(name)s' ist nicht vorhanden"
> +msgstr ""
> +"Distro '%(name)s' ist nicht vorhanden"
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "Partition %(name)s ist nicht im Host vorhanden"
> +msgstr ""
> +"Partition %(name)s ist im Host nicht vorhanden"
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
>   msgstr ""
> -"Hostmaschine konnte nicht heruntergefahren werden, weil virtuelle Maschinen "
> -"ausgef?hrt werden"
> +"Hostmaschine konnte nicht heruntergefahren werden, weil virtuelle Maschinen ausgef?hrt werden"
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
>   msgstr ""
> -"Hostmaschine konnte nicht neu gestartet werden, weil virtuelle Maschinen "
> -"ausgef?hrt werden"
> +"Hostmaschine konnte nicht neu gestartet werden, weil virtuelle Maschinen ausgef?hrt werden"
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "Knoteneinheit '%(name)s' nicht gefunden"
> +msgstr ""
> +"Knoteneinheit '%(name)s' nicht gefunden"
>   
>   msgid "Conflicting flag filters specified."
>   msgstr ""
> +"In Konflikt stehende Flagfilter angegeben."
>   
>   msgid "No packages marked for update"
> -msgstr "Keine Pakete f?r Aktualisierung markiert"
> +msgstr ""
> +"Keine Pakete f?r Aktualisierung markiert"
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "Paket %(name)s ist nicht f?r Aktualisierung markiert."
> +msgstr ""
> +"Paket %(name)s ist nicht f?r Aktualisierung markiert."
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
>   msgstr ""
> -"Fehler beim Abrufen von Paketen, die f?r die Aktualsierung markiert sind. "
> -"Details: %(err)s"
> +"Fehler beim Abrufen von Paketen, die f?r die Aktualisierung markiert sind. Details: %(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "Es gibt keinen kompatiblen Paketmanager f?r dieses System."
> +msgstr ""
> +"Es gibt keinen kompatiblen Paketmanager f?r dieses System."
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "%(item)s konnten nicht im Datenspeicher gefunden werden"
> +msgstr ""
> +"%(item)s konnten nicht im Datenspeicher gefunden werden"
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "Ung?ltiger URI %(uri)s"
> +msgstr ""
> +"Ung?ltiger URI %(uri)s"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
>   msgstr ""
> -"Zeitlimit?berschreitung beim Ausf?hren des Befehls '%(cmd)s' nach "
> -"%(seconds)s Sekunden"
> +"Zeitlimit?berschreitung bei Ausf?hrung des Befehls '%(cmd)s' nach %(seconds)s Sekunden"
>   
>   msgid "Unable to choose a virtual machine name"
>   msgstr ""
> +"Name der virtuellen Maschine konnte nicht ausgew?hlt werden"
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"Ung?ltiger Datenwert '%(value)s'"
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"Ung?ltige Dateneinheit '%(unit)s'"
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "Ung?ltiger Speichertyp. Unterst?tzte Typen: 'cdrom'"
> +msgstr ""
> +"Ung?ltiger Speichertyp. Unterst?tzte Typen: 'cdrom', 'disk'"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
>   msgstr ""
> +"Der Pfad '%(value)s' ist kein g?ltiger lokaler/ferner Pfad f?r die Einheit"
>   
>   msgid "Only CDROM path can be update."
>   msgstr ""
> +"Nur der CD-ROM-Pfad kann aktualisiert werden."
>   
>   #, python-format
>   msgid ""
>   "The storage device %(dev_name)s does not exist in the virtual machine "
>   "%(vm_name)s"
>   msgstr ""
> +"Die Speichereinheit %(dev_name)s ist in der virtuellen Maschine "
> +"%(vm_name)s nicht vorhanden"
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
> -msgstr "Fehler beim Erstellen einer neuen Speichereinheit: %(error)s"
> +msgstr ""
> +"Fehler beim Erstellen einer neuen Speichereinheit: %(error)s"
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
> -msgstr "Fehler beim Aktualisieren einer Speichereinheit: %(error)s"
> +msgstr ""
> +"Fehler beim Aktualisieren einer Speichereinheit: %(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
> -msgstr "Fehler beim Entfernen einer Speichereinheit: %(error)s"
> +msgstr ""
> +"Fehler beim Entfernen einer Speichereinheit: %(error)s"
>   
>   msgid "Do not support IDE device hot plug"
>   msgstr ""
> +"Hot Plug f?r IDE-Einheit nicht unterst?tzen"
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
>   msgstr ""
> -"Geben Sie Typ und Pfad an, um einen neuen Datentr?ger f?r eine virtuelle "
> -"Maschine hinzuzf?gen"
> +"Geben Sie Typ und Pfad oder Typ und Pool/Datentr?ger an, um eine neue "
> +"Platte f?r eine virtuelle Maschine hinzuzuf?gen"
>   
>   msgid "Specify path to update virtual machine disk"
>   msgstr ""
> -"Geben Sie einen Pfad an, um die Platte der virtuellen Maschine zu "
> -"aktualisieren"
> +"Geben Sie einen Pfad an, um die Platte der virtuellen Maschine zu aktualisieren"
>   
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
>   msgstr ""
> +"Begrenzung von %(limit)s Einheiten bei Controllertyp %(type)s erreicht"
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
>   msgstr ""
> +"Plattenpfadinformationen f?r angegebenen Pool/Datentr?ger k?nnen nicht abgerufen werden: %(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
>   msgstr ""
> +"Datentr?ger wird bereits von einer anderen virtuellen Maschine verwendet."
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
>   msgstr ""
> -"Geben Sie Typ und Pfad an, um einen neuen Datentr?ger f?r eine virtuelle "
> -"Maschine hinzuzf?gen"
> +"Es kann nur ein Pfad oder ein Pool/Datentr?ger angegeben werden, um eine neue "
> +"Platte f?r die virtuelle Maschine hinzuzuf?gen"
>   
>   #, python-format
>   msgid ""
>   "Volume chosen with format %(format)s does not fit in the storage type "
>   "%(type)s"
>   msgstr ""
> +"Ausgew?hlter Datentr?ger mit Format %(format)s passt nicht in Speichertyp "
> +"%(type)s"
>   
>   msgid "YUM Repository ID must be one word only string."
>   msgstr ""
>   "YUM-Repository-ID darf nur ein aus einer Zeichenfolge bestehendes Wort sein."
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "Repository-URL muss ein http://-, ftp://- oder file://-URL sein."
> +msgstr ""
> +"Repository-URL muss eine http://-, ftp://- oder file://-URL sein."
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
>   "repository type."
>   msgstr ""
> -"Repository-Konfiguration ist ein W?rterbuch mit bestimmten Werten "
> -"hinsichtlich Repository-Typ."
> +"Repository-Konfiguration ist ein W?rterbuch mit bestimmten Werten hinsichtlich "
> +"Repository-Typ."
>   
>   msgid "Distribution to DEB repository must be a string"
> -msgstr "Verteilung an DEB-Repository muss eine Zeichenfolge sein"
> +msgstr ""
> +"Verteilung an DEB-Repository muss eine Zeichenfolge sein"
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "Komponenten f?r DEB-Repository m?ssen in einem Array aufgelistet sein"
> +msgstr ""
> +"Komponenten f?r DEB-Repository m?ssen in einem Array aufgelistet sein"
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "Komponenten f?r DEB-Repository m?ssen eine Zeichenfolge sein"
> +msgstr ""
> +"Komponenten f?r DEB-Repository m?ssen eine Zeichenfolge sein"
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"Spiegelliste f?r Repository muss eine Zeichenfolge sein"
>   
>   msgid "YUM Repository name must be string."
> -msgstr "Name des YUM-Repositorys muss eine Zeichenfolge sein."
> +msgstr ""
> +"Name des YUM-Repositorys muss eine Zeichenfolge sein."
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "GPG-Pr?fung muss ein boolescher Wert sein."
> +msgstr ""
> +"GPG-Pr?fung muss ein boolescher Wert sein."
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
> -msgstr "GPG-Schl?ssel muss ein URL sein, der auf die ASCII-Armor-Datei zeigt."
> +msgstr ""
> +"GPG-Schl?ssel muss eine URL sein, die auf die ASCII-Armor-Datei verweist."
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "Repository %(repo_id)s konnte nicht aktualisiert werden."
> +msgstr ""
> +"Repository %(repo_id)s konnte nicht aktualisiert werden."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "Repository %(repo_id)s ist nicht vorhanden."
> +msgstr ""
> +"Repository %(repo_id)s ist nicht vorhanden."
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"Geben Sie die Basis-URL, die Spiegelliste oder den Metalink des Repositorys an, um ein "
> +"YUM-Repository zu erstellen oder zu aktualisieren."
>   
>   msgid "Repository management tool was not recognized for your system."
> -msgstr "Repository-Verwaltungstool wurde f?r Ihr System nicht erkannt."
> +msgstr ""
> +"Repository-Verwaltungstool wurde f?r Ihr System nicht erkannt."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "Repository %(repo_id)s ist bereits aktiviert."
> +msgstr ""
> +"Repository %(repo_id)s ist bereits aktiviert."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "Repository %(repo_id)s ist bereits inaktiviert."
> +msgstr ""
> +"Repository %(repo_id)s ist bereits inaktiviert."
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "Repository %(repo_id)s konnte nicht entfernt werden."
> +msgstr ""
> +"Repository %(repo_id)s konnte nicht entfernt werden."
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
> @@ -1184,21 +1374,26 @@ msgstr ""
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "Repository %(repo_id)s konnte nicht aktiviert werden."
> +msgstr ""
> +"Repository %(repo_id)s konnte nicht aktiviert werden."
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "Repository %(repo_id)s konnte nicht inaktiviert werden."
> +msgstr ""
> +"Repository %(repo_id)s konnte nicht inaktiviert werden."
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "YUM-Repository-ID ist bereits vorhanden"
> +msgstr ""
> +"YUM-Repository-ID ist bereits vorhanden"
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "YUM-Repository-Name muss eine Zeichenfolge sein"
> +msgstr ""
> +"YUM-Repository-Name muss eine Zeichenfolge sein"
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "Repositorys konnten nicht aufgelistet werden. Details: '%(err)s'"
> +msgstr ""
> +"Repositorys konnten nicht aufgelistet werden. Details: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> @@ -1207,638 +1402,819 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "Repository konnte nicht hinzugef?gt werden. Details: '%(err)s'"
> +msgstr ""
> +"Repository konnte nicht hinzugef?gt werden. Details: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "Repository konnte nicht entfernt werden. Details: '%(err)s'"
> +msgstr ""
> +"Repository konnte nicht entfernt werden. Details: '%(err)s'"
>   
>   #, python-format
>   msgid ""
>   "Configuration items: '%(items)s' are not supported by repository manager"
>   msgstr ""
> +"Konfigurationselemente: '%(items)s' werden vom Repository-Manager nicht unterst?tzt"
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"Repository-Metalink muss eine http://-, ftp://- oder file://-URL sein."
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"Spiegelliste und Metalink k?nnen nicht gleichzeitig angegeben werden."
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
>   msgstr ""
> +"Die virtuelle Maschine '%(vm)s' muss vor dem Erstellen eines Snapshots gestoppt werden."
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Snapshot '%(name)s' kann auf virtueller Maschine '%(vm)s' nicht erstellt werden. Details: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
>   msgstr ""
> +"Snapshot '%(name)s' ist auf virtueller Maschine '%(vm)s' nicht vorhanden."
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Snapshot '%(name)s' kann auf virtueller Maschine '%(vm)s' nicht abgerufen werden. Details: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
>   msgstr ""
> +"Snapshots k?nnen auf virtueller Maschine '%(vm)s' nicht aufgelistet werden. Details: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Snapshot '%(name)s' kann auf virtueller Maschine '%(vm)s' nicht gel?scht werden. Details: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Aktueller Snapshot der virtuellen Maschine '%(vm)s' kann nicht abgerufen werden. Details: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Virtuelle Maschine '%(vm)s' kann nicht auf Snapshot '%(name)s' zur?ckgesetzt werden. Details: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> +"Snapshot der virtuellen Maschine '%(vm)s' kann nicht erstellt werden, weil er eine "
> +"Platte im Format '%(format)s' enth?lt. Nur 'qcow2' wird unterst?tzt."
>   
>   msgid "The number of vCPUs is too large for this system."
>   msgstr ""
> +"Die Anzahl der vCPUs ist f?r dieses System zu gro?."
>   
>   msgid "Invalid vCPU/topology combination."
>   msgstr ""
> +"Ung?ltige Kombination aus vCPU und Topologie."
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
>   msgstr ""
> +"Dieser Host (oder die aktuelle Konfiguration) erlaubt keine CPU-Topologie."
>   
>   msgid "ERROR CODE"
> -msgstr "FEHLERCODE"
> +msgstr ""
> +"FEHLERCODE"
>   
>   msgid "REASON"
> -msgstr "GRUND"
> +msgstr ""
> +"GRUND"
>   
>   msgid "STACK"
> -msgstr "STACK"
> +msgstr ""
> +"STACK"
>   
>   msgid "Go to Homepage"
> -msgstr "Gehe zu Homepage"
> +msgstr ""
> +"Gehe zu Homepage"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "Neue virtuelle Maschine erstellen"
> +msgstr ""
> +"Neue virtuelle Maschine erstellen"
>   
>   msgid "Virtual Machine Name"
> -msgstr "Name der virtuellen Maschine"
> +msgstr ""
> +"Name der virtuellen Maschine"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
>   msgstr ""
> -"Der f?r die Kennzeichnung der virtuellen Maschine verwendete Name. Falls er "
> -"ausgelassen wird, wird ein Name anhand der verwendeten Vorlage ausgew?hlt."
> +"Der f?r die Kennzeichnung der virtuellen Maschine verwendete Name. Falls er ausgelassen wird, wird ein Name "
> +"anhand der verwendeten Vorlage ausgew?hlt."
>   
>   msgid "Template"
> -msgstr "Vorlage"
> +msgstr ""
> +"Vorlage"
>   
>   msgid "Please create a template first."
> -msgstr "Erstellen Sie zun?chst eine Vorlage."
> +msgstr ""
> +"Erstellen Sie zun?chst eine Vorlage."
>   
>   msgid "Create a Template"
> -msgstr "Vorlage erstellen"
> +msgstr ""
> +"Vorlage erstellen"
>   
>   msgid "Please choose a template."
> -msgstr "W?hlen Sie eine Vorlage aus."
> +msgstr ""
> +"W?hlen Sie eine Vorlage aus."
>   
>   msgid "OS"
> -msgstr "BS"
> +msgstr ""
> +"BS"
>   
>   msgid "OS Version"
> -msgstr "BS-Version"
> +msgstr ""
> +"BS-Version"
>   
>   msgid "CPUS"
> -msgstr "CPUS"
> +msgstr ""
> +"CPUS"
>   
>   msgid "Memory"
> -msgstr "Speicher"
> +msgstr ""
> +"Speicher"
>   
>   msgid "Create"
> -msgstr "Erstellen"
> +msgstr ""
> +"Erstellen"
>   
>   msgid "Creating..."
>   msgstr ""
> +"Wird erstellt..."
>   
>   msgid "Edit Guest"
> -msgstr "Gast bearbeiten"
> +msgstr ""
> +"Gast bearbeiten"
>   
>   msgid "General"
> -msgstr "Allgemein"
> +msgstr ""
> +"Allgemein"
>   
>   msgid "Storage"
> -msgstr "Speicher"
> +msgstr ""
> +"Speicher"
>   
>   msgid "Interface"
> -msgstr "Schnittstelle"
> +msgstr ""
> +"Schnittstelle"
>   
>   msgid "Permission"
> -msgstr "Version"
> +msgstr ""
> +"Berechtigung"
>   
>   msgid "Host PCI Device"
>   msgstr ""
> +"PCI-Einheit f?r Host"
>   
>   msgid "Snapshot"
>   msgstr ""
> +"Snapshot"
>   
>   msgid "Name"
> -msgstr "Name"
> +msgstr ""
> +"Name"
>   
>   msgid "CPUs"
> -msgstr "CPUs"
> +msgstr ""
> +"CPUs"
>   
>   msgid "Memory (MB)"
> -msgstr "Speicher"
> +msgstr ""
> +"Speicher (MB)"
>   
>   msgid "Icon"
> -msgstr "Symbol"
> +msgstr ""
> +"Symbol"
>   
>   msgid "Device"
> -msgstr "Einheitenname"
> +msgstr ""
> +"Einheit"
>   
>   msgid "Path"
> -msgstr "NFS-Pfad"
> +msgstr ""
> +"Pfad"
>   
>   msgid "Network"
> -msgstr "Netz"
> +msgstr ""
> +"Netz"
>   
>   msgid "Type"
> -msgstr "Typ"
> +msgstr ""
> +"Typ"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"MAC-Adresse"
>   
>   msgid "Available system users and groups"
>   msgstr ""
> +"Verf?gbare Systembenutzer und -gruppen"
>   
>   msgid "Selected system users and groups"
>   msgstr ""
> +"Ausgew?hlte Systembenutzer und -gruppen"
>   
>   msgid "User"
>   msgstr ""
> +"Benutzer"
>   
>   msgid "All"
> -msgstr "Alle"
> +msgstr ""
> +"Alle"
>   
>   msgid "To Add"
>   msgstr ""
> +"Hinzuzuf?gen"
>   
>   msgid "Added"
>   msgstr ""
> +"Hinzugef?gt"
>   
>   msgid "filter"
>   msgstr ""
> +"Filter"
>   
>   msgid "Product"
>   msgstr ""
> +"Produkt"
>   
>   msgid "Vendor"
> -msgstr "Anbieter"
> +msgstr ""
> +"Anbieter"
>   
>   msgid "Created"
>   msgstr ""
> +"Erstellt"
>   
>   msgid "Save"
> -msgstr "Speichern"
> +msgstr ""
> +"Speichern"
>   
>   msgid "Replace"
> -msgstr "Ersetzen"
> +msgstr ""
> +"Ersetzen"
>   
>   msgid "Detach"
> -msgstr "Abh?ngen"
> +msgstr ""
> +"Abh?ngen"
>   
>   msgid "Cancel"
> -msgstr "Abbrechen"
> +msgstr ""
> +"Abbrechen"
>   
>   msgid "revert"
>   msgstr ""
> +"zur?cksetzen"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "Speichereinheit zur virtuellen Maschine hinzuf?gen"
> +msgstr ""
> +"Speichereinheit zur virtuellen Maschine hinzuf?gen"
>   
>   msgid "Device Type"
> -msgstr "Einheitentyp"
> +msgstr ""
> +"Einheitentyp"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> -msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterst?tzt."
> +msgstr ""
> +"Der Einheitentyp. Derzeit werden nur \"cdrom\" und \"disk\" unterst?tzt."
>   
>   msgid "Storage Pool"
> -msgstr "Speicherpool"
> +msgstr ""
> +"Speicherpool"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
> +msgstr ""
> +"Speicherpool, in dem sich der Datentr?ger befindet"
>   
>   msgid "Storage Volume"
> -msgstr "Speicherpoolname"
> +msgstr ""
> +"Speicherdatentr?ger"
>   
>   msgid "Storage volume to be attached"
> -msgstr "Name des Speicherdatentr?gers muss eine Zeichenfolge sein"
> +msgstr ""
> +"Anzuh?ngender Speicherdatentr?ger"
>   
>   msgid "File Path"
> -msgstr "Dateipfad"
> +msgstr ""
> +"Dateipfad"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "Der ISO-Dateipfad auf dem Server f?r die CD-ROM."
> +msgstr ""
> +"Der ISO-Dateipfad auf dem Server f?r die CD-ROM."
>   
>   msgid "Attach"
> -msgstr "Anh?ngen"
> +msgstr ""
> +"Anh?ngen"
>   
>   msgid "Start"
> -msgstr "Starten"
> +msgstr ""
> +"Starten"
>   
>   msgid "Reset"
> -msgstr "Zur?cksetzen"
> +msgstr ""
> +"Zur?cksetzen"
>   
>   msgid "Pause"
>   msgstr ""
> +"Anhalten"
>   
>   msgid "Resume"
>   msgstr ""
> +"Fortsetzen"
>   
>   msgid "Power Off"
>   msgstr ""
> +"Ausschalten"
>   
>   msgid "Actions"
> -msgstr "Aktionen"
> +msgstr ""
> +"Aktionen"
>   
>   msgid "Connect"
> -msgstr "Verbinden"
> +msgstr ""
> +"Verbinden"
>   
>   msgid "Clone"
>   msgstr ""
> +"Klonen"
>   
>   msgid "Edit"
> -msgstr "Bearbeiten"
> +msgstr ""
> +"Bearbeiten"
>   
>   msgid "Shut Down"
> -msgstr "Herunterfahren"
> +msgstr ""
> +"Herunterfahren"
>   
>   msgid "Delete"
> -msgstr "L?schen"
> +msgstr ""
> +"L?schen"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr ""
> -"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist "
> -"falsch. Versuchen Sie es bitte erneut."
> +"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist falsch. Versuchen Sie es bitte erneut."
>   
>   msgid "This field is required."
> -msgstr "Dieses Feld ist erforderlich."
> +msgstr ""
> +"Dieses Feld ist erforderlich."
>   
>   msgid "Log in"
> -msgstr "Anmelden"
> +msgstr ""
> +"Anmelden"
>   
>   msgid "Logging in..."
> -msgstr "Wird angemeldet..."
> +msgstr ""
> +"Wird angemeldet..."
>   
>   msgid "Host"
> -msgstr "Host"
> +msgstr ""
> +"Host"
>   
>   msgid "Guests"
> -msgstr "G?ste"
> +msgstr ""
> +"G?ste"
>   
>   msgid "Templates"
> -msgstr "Vorlagen"
> +msgstr ""
> +"Vorlagen"
>   
>   msgid "Failed to get application configuration"
> -msgstr "Anwendungskonfiguration konnte nicht abgerufen werden"
> +msgstr ""
> +"Anwendungskonfiguration konnte nicht abgerufen werden"
>   
>   msgid "This is not a valid Linux path"
> -msgstr "Dies ist kein g?ltiger Linux-Pfad"
> +msgstr ""
> +"Dies ist kein g?ltiger Linux-Pfad"
>   
>   msgid "This is not a valid URL."
> -msgstr "Dies ist kein g?ltiger URL."
> +msgstr ""
> +"Dies ist keine g?ltige URL."
>   
>   msgid "No such data available."
> -msgstr "Keine solchen Daten verf?gbar."
> +msgstr ""
> +"Keine solchen Daten verf?gbar."
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"Hostsystem kann nicht kontaktiert werden. Pr?fen Sie, ob das Hostsystem "
> -"aktiv ist und obNetzkonnektivit?t besteht. HTTP-Anforderungsantwort %1. "
> +"Hostsystem kann nicht kontaktiert werden. Pr?fen Sie, ob das Hostsystem aktiv ist und ob"
> +"Netzkonnektivit?t besteht. HTTP-Anforderungsantwort %1."
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"Datei konnte nicht gelesen werden."
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"Fehler beim Hochladen der Datei."
>   
>   msgid "Delete Confirmation"
> -msgstr "L?schbest?tigung"
> +msgstr ""
> +"L?schbest?tigung"
>   
>   msgid "OK"
> -msgstr "OK"
> +msgstr ""
> +"OK"
>   
>   msgid "Confirm"
> -msgstr "Best?tigen"
> +msgstr ""
> +"Best?tigen"
>   
>   msgid "Warning"
> -msgstr "Warnung"
> +msgstr ""
> +"Warnung"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"Wird geklont..."
>   
>   msgid "Loading..."
> -msgstr "Wird geladen..."
> +msgstr ""
> +"Wird geladen..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"Beim Abrufen der Systeminformationen ist ein Fehler aufgetreten."
>   
>   msgid "Retry"
> -msgstr "Wiederholen"
> +msgstr ""
> +"Wiederholen"
>   
>   msgid "Detailed message:"
> -msgstr "Detaillierte Meldung:"
> +msgstr ""
> +"Detaillierte Meldung:"
>   
>   msgid "No ISO found"
>   msgstr ""
> +"Keine ISO-Datei gefunden"
>   
>   msgid "This is not a valid ISO file."
> -msgstr "Dies ist keine g?ltige ISO-Datei."
> +msgstr ""
> +"Dies ist keine g?ltige ISO-Datei."
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "Dies wird einige Zeit dauern. M?chten Sie fortfahren?"
> +msgstr ""
> +"Dieser Vorgang kann lange dauern. M?chten Sie fortfahren?"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
> -msgstr "Hiermit wird die Vorlage dauerhaft gel?scht. M?chten Sie fortfahren?"
> +msgstr ""
> +"Hiermit wird die Vorlage dauerhaft gel?scht. M?chten Sie fortfahren?"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
>   msgstr ""
> -"System konnte nicht heruntergefahren werden, weil einige virtuellen "
> -"Maschinen ausgef?hrt werden!"
> +"System konnte nicht heruntergefahren werden, weil einige virtuellen Maschinen ausgef?hrt werden!"
>   
>   msgid "Max:"
> -msgstr "Max:"
> +msgstr ""
> +"Max:"
>   
>   msgid "Utilization"
> -msgstr "Auslastung"
> +msgstr ""
> +"Auslastung"
>   
>   msgid "Available"
> -msgstr "Verf?gbar"
> +msgstr ""
> +"Verf?gbar"
>   
>   msgid "Read Rate"
> -msgstr "Leserate"
> +msgstr ""
> +"Leserate"
>   
>   msgid "Write Rate"
> -msgstr "Schreibrate"
> +msgstr ""
> +"Schreibrate"
>   
>   msgid "Received"
> -msgstr "Empfangen"
> +msgstr ""
> +"Empfangen"
>   
>   msgid "Sent"
> -msgstr "Gesendet"
> +msgstr ""
> +"Gesendet"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
>   msgstr ""
> -"Durch das Herunterfahren oder Neustarten des Hosts k?nnen ungesicherte "
> -"Arbeiten verloren gehen. M?chten Sie mit dem Herunterfahren/Neustarten "
> +"Durch das Herunterfahren oder Neustarten des Hosts k?nnen ungesicherte Arbeiten verloren gehen. M?chten Sie mit dem Herunterfahren/Neustarten "
>   "fortfahren?"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"Repository wird dauerhaft entfernt und kann nicht wiederhergestellt werden. "
> -"M?chten Sie fortfahren?"
> +"Repository wird dauerhaft entfernt und kann nicht wiederhergestellt werden. M?chten Sie "
> +"fortfahren?"
>   
>   msgid "Repositories"
> -msgstr "Repositorys"
> +msgstr ""
> +"Repositorys"
>   
>   msgid "ID"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Base URL"
> -msgstr "Basis-URL"
> +msgstr ""
> +"Basis-URL"
>   
>   msgid "Is Mirror"
> -msgstr "Ist Spiegel"
> +msgstr ""
> +"Ist Spiegel"
>   
>   msgid "URL Args"
> -msgstr "URL-Args"
> +msgstr ""
> +"URL-Args"
>   
>   msgid "Enabled"
> -msgstr "Aktiviert"
> +msgstr ""
> +"Aktiviert"
>   
>   msgid "GPG Check"
> -msgstr "GPG-Pr?fung"
> +msgstr ""
> +"GPG-Pr?fung"
>   
>   msgid "GPG Key"
> -msgstr "GPG-Schl?ssel"
> +msgstr ""
> +"GPG-Schl?ssel"
>   
>   msgid "Add"
> -msgstr "Hinzuf?gen"
> +msgstr ""
> +"Hinzuf?gen"
>   
>   msgid "Remove"
> -msgstr "Entfernen"
> +msgstr ""
> +"Entfernen"
>   
>   msgid "Enable"
> -msgstr "Aktivieren"
> +msgstr ""
> +"Aktivieren"
>   
>   msgid "Disable"
> -msgstr "Inaktivieren"
> +msgstr ""
> +"Inaktivieren"
>   
>   msgid "Software Updates"
> -msgstr "Software-Updates"
> +msgstr ""
> +"Software-Updates"
>   
>   msgid "Package Name"
> -msgstr "Paketname"
> +msgstr ""
> +"Paketname"
>   
>   msgid "Version"
> -msgstr "Version"
> +msgstr ""
> +"Version"
>   
>   msgid "Architecture"
> -msgstr "Architektur"
> +msgstr ""
> +"Architektur"
>   
>   msgid "Repository"
> -msgstr "Repository"
> +msgstr ""
> +"Repository"
>   
>   msgid "Update All"
> -msgstr "Alle aktualisieren"
> +msgstr ""
> +"Alle aktualisieren"
>   
>   msgid "Updating..."
> -msgstr "Wird aktualisiert..."
> +msgstr ""
> +"Wird aktualisiert..."
>   
>   msgid "Failed to retrieve packages update information."
>   msgstr ""
> +"Updateinformationen f?r Pakete konnten nicht abgerufen werden."
>   
>   msgid "Failed to update package(s)."
> -msgstr "Pakete konnten nicht aktualisiert werden."
> +msgstr ""
> +"Pakete konnten nicht aktualisiert werden."
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"Debugbericht wird dauerhaft entfernt und kann nicht wiederhergestellt "
> -"werden. M?chten Sie fortfahren?"
> +"Debugbericht wird dauerhaft entfernt und kann nicht wiederhergestellt werden. M?chten Sie "
> +"fortfahren?"
>   
>   msgid "Debug Reports"
> -msgstr "Debugberichte"
> +msgstr ""
> +"Debugberichte"
>   
>   msgid "Generated Time"
> -msgstr "Generierte Zeit"
> +msgstr ""
> +"Generierte Zeit"
>   
>   msgid "Generate"
> -msgstr "Generieren"
> +msgstr ""
> +"Generieren"
>   
>   msgid "Generating..."
> -msgstr "Wird generiert..."
> +msgstr ""
> +"Wird generiert..."
>   
>   msgid "Rename"
> -msgstr "Umbenennen"
> +msgstr ""
> +"Umbenennen"
>   
>   msgid "Download"
> -msgstr "Herunterladen"
> +msgstr ""
> +"Herunterladen"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
>   msgstr ""
> -"Berichtsname darf nur Buchstaben, Zahlen und/oder Bindestriche ('-') "
> -"enthalten."
> +"Der Berichtsname darf nur Buchstaben, Ziffern, Unterstreichungszeichen ('_') und/oder "
> +"Bindestriche ('-') enthalten."
>   
>   msgid "Pending..."
> -msgstr "Wird geladen..."
> +msgstr ""
> +"Anstehend..."
>   
>   msgid "Report name is the same as the original one."
>   msgstr ""
> +"Der Berichtsname stimmt mit dem urspr?nglichen Namen ?berein."
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
>   msgstr ""
> -"Hiermit werden die virtuelle Maschine und deren virtuellen Platten gel?scht. "
> -"Diese Operation kann nicht r?ckg?ngig gemacht werden. M?chten Sie fortfahren?"
> +"Hiermit werden die virtuelle Maschine und deren virtuellen Platten gel?scht. Diese Operation "
> +"kann nicht r?ckg?ngig gemacht werden. M?chten Sie fortfahren?"
>   
>   msgid "Power off Confirmation"
> -msgstr "L?schbest?tigung"
> +msgstr ""
> +"Ausschalten best?tigen"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
>   msgstr ""
> +"Diese Aktion kann zu nicht gew?nschten Ergebnissen f?hren, beispielsweise zu "
> +"einem nicht geleerten Plattencache beim Gast. M?chten Sie fortfahren?"
>   
>   msgid "Reset Confirmation"
> -msgstr "L?schbest?tigung"
> +msgstr ""
> +"Zur?cksetzung best?tigen"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
>   msgstr ""
> +"Bei einer Zur?cksetzung ohne Herunterfahren des Gastbetriebssystems besteht "
> +"das Risiko eines Datenverlusts. M?chten Sie fortfahren?"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "L?schbest?tigung"
> +msgstr ""
> +"Herunterfahren best?tigen"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
> -msgstr "Hiermit wird die Vorlage dauerhaft gel?scht. M?chten Sie fortfahren?"
> +msgstr ""
> +"Hinweis: Diese Anforderung wird vom Gastbetriebssystem m?glicherweise ignoriert. M?chten Sie fortfahren?"
>   
>   msgid "Virtual Machine delete Confirmation"
>   msgstr ""
> +"L?schbest?tigung f?r virtuelle Maschine"
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
>   msgstr ""
> +"Diese virtuelle Maschine ist nicht permanent. Wenn Sie das System ausschalten, wird sie gel?scht. M?chten Sie fortfahren?"
>   
>   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 ""
> +"Wenn der Zielgast ?ber SCSI- oder iSCSI-Datentr?ger verf?gt, dann werden sie im Standardspeicherpool "
> +"geklont. Derselbe Vorgang wird ausgef?hrt, wenn der Zielpool nicht ?ber gen?gend "
> +"Speicherplatz zum Klonen der Datentr?ger verf?gt. M?chten Sie fortfahren?"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
>   msgstr ""
> -"Diese CD-ROM wird dauerhaft abgeh?ngt und Sie k?nnen sie neu anh?ngen. "
> -"M?chten Sie mit dem Abh?ngen fortfahren?"
> +"Diese CD-ROM wird dauerhaft abgeh?ngt und Sie k?nnen sie neu anh?ngen. M?chten Sie "
> +"mit dem Abh?ngen fortfahren?"
>   
>   msgid "Attaching..."
> -msgstr "Wird angeh?ngt..."
> +msgstr ""
> +"Wird angeh?ngt..."
>   
>   msgid "Replacing..."
> -msgstr "Wird ersetzt..."
> +msgstr ""
> +"Wird ersetzt..."
>   
>   msgid "Successfully attached!"
> -msgstr "Erfolgreich angeh?ngt!"
> +msgstr ""
> +"Erfolgreich angeh?ngt!"
>   
>   msgid "Successfully replaced!"
> -msgstr "Erfolgreich ersetzt!"
> +msgstr ""
> +"Erfolgreich ersetzt!"
>   
>   msgid "Successfully detached!"
> -msgstr "Erfolgreich abgeh?ngt!"
> +msgstr ""
> +"Erfolgreich abgeh?ngt!"
>   
>   msgid ""
>   "This disk will be detached permanently and you can re-attach it. Continue to "
>   "detach it?"
>   msgstr ""
> +"Diese Platte wird dauerhaft abgeh?ngt und Sie k?nnen sie neu anh?ngen. M?chten Sie "
> +"mit dem Abh?ngen fortfahren?"
>   
>   msgid "interface:"
>   msgstr ""
> +"Schnittstelle:"
>   
>   msgid "address:"
>   msgstr ""
> +"Adresse:"
>   
>   msgid "link_type:"
>   msgstr ""
> +"Linktyp:"
>   
>   msgid "block:"
>   msgstr ""
> +"Block:"
>   
>   msgid "drive_type:"
>   msgstr ""
> +"Laufwerkstyp:"
>   
>   msgid "model:"
>   msgstr ""
> +"Modell:"
>   
>   msgid "Affected devices:"
>   msgstr ""
> +"Betroffene Einheiten:"
>   
>   msgid "The VLAN id must be between 1 and 4094."
> -msgstr "Die VLAN-ID muss zwischen 1 und 4094 liegen."
> +msgstr ""
> +"Die VLAN-ID muss zwischen 1 und 4094 liegen."
>   
>   msgid "unavailable"
> -msgstr "nicht verf?gbar"
> +msgstr ""
> +"nicht verf?gbar"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
>   "depend on this network."
>   msgstr ""
> -"Diese Aktion unterbricht die Netzkonnektivit?t f?r jede virtuelle Maschine, "
> -"die von diesem Netz abh?ngt."
> +"Diese Aktion unterbricht die Netzkonnektivit?t f?r jede virtuelle Maschine, die "
> +"von diesem Netz abh?ngt."
>   
>   msgid "Create a network"
> -msgstr "Netz erstellen"
> +msgstr ""
> +"Netz erstellen"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht "
> -"inaktiviert, sondern permanent gel?scht. M?chten Sie fortfahren?"
> +"Dieses Netz ist nicht permanent. Durch diese Aktion wird es nicht gestoppt, sondern "
> +"permanent gel?scht. M?chten Sie fortfahren?"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"Der ?berbr?ckte VLAN-Tag arbeitet m?glicherweise nicht korrekt, wenn der Netzmanager aktiviert ist. Sie "
> +"sollten ihn eventuell inaktivieren."
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
> @@ -1846,423 +2222,539 @@ msgstr ""
>   "Hiermit wird der Speicherpool dauerhaft gel?scht. M?chten Sie fortfahren?"
>   
>   msgid "This storage pool is empty."
> -msgstr "Dieser Speicherpool ist leer."
> +msgstr ""
> +"Dieser Speicherpool ist leer."
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
>   "to continue? "
>   msgstr ""
> -"Hiermit wird Ihre Platte formatiert und Sie verlieren s?mtliche Daten "
> -"darauf. Sind Sie sicher, dass Sie fortfahren m?chten? "
> +"Hiermit wird Ihre Platte formatiert und Sie verlieren s?mtliche Daten darauf. Sind Sie sicher, dass "
> +"Sie fortfahren m?chten? "
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "SCSI-Fibre Channel"
> +msgstr ""
> +"SCSI-Fibre Channel"
>   
>   msgid "No SCSI adapters found."
> -msgstr "Keine SCSI-Adapter gefunden."
> +msgstr ""
> +"Keine SCSI-Adapter gefunden."
>   
>   msgid "Loading iSCSI targets..."
>   msgstr ""
> +"iSCSI-Ziele werden geladen..."
>   
>   msgid "No iSCSI found. Please input one."
>   msgstr ""
> +"iSCSI wurde nicht gefunden. Nehmen Sie die iSCSI-Eingabe vor."
>   
>   msgid "Failed to load iSCSI targets."
>   msgstr ""
> +"iSCSI-Ziele konnten nicht geladen werden."
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "Der Speicherpoolname darf nicht leer sein."
> +msgstr ""
> +"Der Speicherpoolname darf nicht leer sein."
>   
>   msgid "The storage pool path can not be blank."
> -msgstr "Der Speicherpoolpfad darf nicht leer sein."
> +msgstr ""
> +"Der Speicherpoolpfad darf nicht leer sein."
>   
>   msgid "NFS server mount path can not be blank."
> -msgstr "Der Mountpfad des NFS-Servers darf nicht leer sein."
> +msgstr ""
> +"Der Mountpfad des NFS-Servers darf nicht leer sein."
>   
>   msgid "Invalid NFS mount path."
> -msgstr "Ung?ltiger NFS-Mountpfad."
> +msgstr ""
> +"Ung?ltiger NFS-Mountpfad."
>   
>   msgid "No logical device selected."
> -msgstr "Keine logische Einheit ausgew?hlt."
> +msgstr ""
> +"Keine logische Einheit ausgew?hlt."
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "Das iSCSI-Ziel darf nicht leer sein."
> +msgstr ""
> +"Das iSCSI-Ziel darf nicht leer sein."
>   
>   msgid "Server name can not be blank."
> -msgstr "Servername darf nicht leer sein."
> +msgstr ""
> +"Servername darf nicht leer sein."
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
>   msgstr ""
> +"Dies ist kein g?ltiger Servername oder keine g?ltige IP. ?ndern Sie den Servernamen oder die IP."
>   
>   msgid "Looking for available partitions ..."
> -msgstr "Es wird nach verf?gbaren Partitionen gesucht..."
> +msgstr ""
> +"Es wird nach verf?gbaren Partitionen gesucht..."
>   
>   msgid "No available partitions found."
> -msgstr "Keine g?ltigen Partitionen gefunden."
> +msgstr ""
> +"Keine g?ltigen Partitionen gefunden."
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht "
> -"inaktiviert, sondern permanent gel?scht. M?chten Sie fortfahren?"
> +"Dieser Speicherpool ist nicht permanent. Durch diese Aktion wird er nicht inaktiviert, sondern "
> +"permanent gel?scht. M?chten Sie fortfahren?"
>   
>   msgid "Unable to retrieve partitions information."
>   msgstr ""
> -"Repository-Informationen konnten nicht abgerufen werden. Details: '%(err)s'"
> +"Partitionsinformationen konnten nicht abgerufen werden."
>   
>   msgid "In progress..."
>   msgstr ""
> +"In Bearbeitung..."
>   
>   msgid "Failed!"
>   msgstr ""
> +"Fehlgeschlagen!"
>   
>   msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
>   msgstr ""
> +"Der CD-ROM-Pfad muss ein g?ltiger lokaler/ferner Pfad sein. Er darf nicht leer sein."
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "Der Speicherpoolname darf nicht leer sein."
> +msgstr ""
> +"Der Plattenpool oder Datentr?ger darf nicht leer sein."
>   
>   msgid "Peers"
>   msgstr ""
> +"Peers"
>   
>   msgid "Searching"
>   msgstr ""
> +"Suche wird durchgef?hrt"
>   
>   msgid "No peers found."
>   msgstr ""
> +"Keine Peers gefunden."
>   
>   msgid "Help"
> -msgstr "Hilfe"
> +msgstr ""
> +"Hilfe"
>   
>   msgid "About"
> -msgstr "Informationen"
> +msgstr ""
> +"Informationen"
>   
>   msgid "Log out"
> -msgstr "Abmelden"
> +msgstr ""
> +"Abmelden"
>   
>   msgid "Version:"
> -msgstr "Version:"
> +msgstr ""
> +"Version:"
>   
>   msgid "Session timeout, please re-login."
>   msgstr ""
> +"Sitzungszeitlimit?berschreitung, melden Sie sich erneut an."
>   
>   msgid "User Name"
> -msgstr "Benutzername"
> +msgstr ""
> +"Benutzername"
>   
>   msgid "Password"
> -msgstr "Kennwort"
> +msgstr ""
> +"Kennwort"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "Neuen Debugbericht erstellen"
> +msgstr ""
> +"Neuen Debugbericht erstellen"
>   
>   msgid "Report Name"
> -msgstr "Berichtsname"
> +msgstr ""
> +"Berichtsname"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"Der Name, mit dem der Bericht gekennzeichnet wird. Falls er ausgelassen "
> -"wird, wird ein Name basierend auf der aktuellen Zeit ausgew?hlt. Der Name "
> -"darf Buchstaben, Zahlen und Bindestriche (\"-\") enthalten."
> +"Der Name, mit dem der Bericht angegeben wird. Falls keine Angabe erfolgt, wird ein Name "
> +"auf Basis der aktuellen Uhrzeit ausgew?hlt. Der Name kann Buchstaben, Ziffern, Unterstreichungszeichen (\"_\") "
> +"und Bindestriche (\"-\") enthalten."
>   
>   msgid "Rename a Debug Report"
> -msgstr "Neuen Debugbericht erstellen"
> +msgstr ""
> +"Debugbericht umbenennen"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
>   msgstr ""
> -"Der Name, mit dem der Bericht gekennzeichnet wird. Falls er ausgelassen "
> -"wird, wird ein Name basierend auf der aktuellen Zeit ausgew?hlt. Der Name "
> -"darf Buchstaben, Zahlen und Bindestriche (\"-\") enthalten."
> +"Der Name, mit dem der Bericht angegeben wird. Der Name kann Buchstaben, Ziffern und "
> +"Bindestriche (\"-\") enthalten."
>   
>   msgid "Submit"
>   msgstr ""
> +"?bergeben"
>   
>   msgid "Add a Repository"
> -msgstr "Repository hinzuf?gen"
> +msgstr ""
> +"Repository hinzuf?gen"
>   
>   msgid "Identifier"
> -msgstr "Kennung"
> +msgstr ""
> +"Kennung"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "Einzelnes Wort, eindeutige Kennung f?r das Repository."
> +msgstr ""
> +"Einzelnes Wort, eindeutige Kennung f?r das Repository."
>   
>   msgid "Textual name for the repository."
> -msgstr "Textname f?r das Repository."
> +msgstr ""
> +"Textname f?r das Repository."
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "Erforderliches Feld"
> +msgstr ""
> +"Erforderliches Feld"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "URL zum Repository. Unterst?tzte Protokolle sind http, ftp und file."
> +msgstr ""
> +"URL zum Repository. Unterst?tzte Protokolle sind http, ftp und file."
>   
>   msgid "Repository is a mirror"
> -msgstr "Repository ist ein Spiegel."
> +msgstr ""
> +"Repository ist ein Spiegel"
>   
>   msgid "Distribution"
> -msgstr "Verteilung"
> +msgstr ""
> +"Verteilung"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "Verteilung des DEB-Repositorys."
> +msgstr ""
> +"Verteilung des DEB-Repositorys."
>   
>   msgid "Components"
> -msgstr "Komponenten"
> +msgstr ""
> +"Komponenten"
>   
>   msgid "List of components in DEB repository."
> -msgstr "Liste der Komponenten im DEB-Repository."
> +msgstr ""
> +"Liste der Komponenten im DEB-Repository."
>   
>   msgid "Edit Repository"
> -msgstr "Repository bearbeiten"
> +msgstr ""
> +"Repository bearbeiten"
>   
>   msgid "Mirror List URL"
> -msgstr "Spiegellisten-URL"
> +msgstr ""
> +"Spiegellisten-URL"
>   
>   msgid "Yes"
> -msgstr "Ja"
> +msgstr ""
> +"Ja"
>   
>   msgid "No"
> -msgstr "Nein"
> +msgstr ""
> +"Nein"
>   
>   msgid "Add a Volume to Storage Pool"
>   msgstr ""
> +"Datentr?ger zu Speicherpool hinzuf?gen"
>   
>   msgid "Fetch from remote URL"
>   msgstr ""
> +"?ber Remote URL abrufen"
>   
>   msgid "Enter the remote URL here."
>   msgstr ""
> +"Remote URL hier eingeben."
>   
>   msgid "Upload a file"
>   msgstr ""
> +"Datei hochladen"
>   
>   msgid "Choose the file you want to upload."
>   msgstr ""
> +"W?hlen Sie die hochzuladende Datei aus."
>   
>   msgid "Define a New Storage Pool"
> -msgstr "Neuen Speicherpool definieren"
> +msgstr ""
> +"Neuen Speicherpool definieren"
>   
>   msgid "Storage Pool Name"
> -msgstr "Speicherpoolname"
> +msgstr ""
> +"Speicherpoolname"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
>   msgstr ""
> -"Der Name, mit dem die Speicherpools gekennzeichnet werden. Er darf nicht "
> -"leer sein."
> +"Der Name, mit dem die Speicherpools gekennzeichnet werden. Er darf nicht leer sein."
>   
>   msgid "Storage Pool Type"
> -msgstr "Speicherpooltyp"
> +msgstr ""
> +"Speicherpooltyp"
>   
>   msgid "Storage Path"
> -msgstr "Speicherpfad"
> +msgstr ""
> +"Speicherpfad"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
>   msgstr ""
> -"Der Pfad des Speicherpools. Jeder Speicherpool muss einen eindeutigen Pfad "
> -"haben."
> +"Der Pfad des Speicherpools. Jeder Speicherpool muss einen eindeutigen Pfad haben."
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
>   msgstr ""
> -"Kimchi versucht, das Verzeichnis zu erstellen, wenn es noch nicht in Ihrem "
> -"System vorhanden ist."
> +"Kimchi versucht, das Verzeichnis zu erstellen, wenn es noch nicht in Ihrem System "
> +"vorhanden ist."
>   
>   msgid "NFS Server IP"
> -msgstr "NFS-Server-IP"
> +msgstr ""
> +"NFS-Server-IP"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
>   msgstr ""
> -"IP oder Hostname des NFS-Servers. Diese(r) kann eingegeben oder aus dem "
> -"Verlauf ausgew?hlt werden."
> +"IP oder Hostname des NFS-Servers. Diese(r) kann eingegeben oder aus dem Verlauf ausgew?hlt werden."
>   
>   msgid "NFS Path"
> -msgstr "NFS-Pfad"
> +msgstr ""
> +"NFS-Pfad"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "Der NFS-Exportpfad auf dem NFS-Server."
> +msgstr ""
> +"Der NFS-Exportpfad auf dem NFS-Server."
>   
>   msgid "Device path"
> -msgstr "Einheitenpfad"
> +msgstr ""
> +"Einheitenpfad"
>   
>   msgid "iSCSI Server"
> -msgstr "iSCSI-Server"
> +msgstr ""
> +"iSCSI-Server"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
> -msgstr "IP oder Hostname des iSCSI-Servers. Diese(r) darf nicht leer sein."
> +msgstr ""
> +"IP oder Hostname des iSCSI-Servers. Diese(r) darf nicht leer sein."
>   
>   msgid "Server"
> -msgstr "Server"
> +msgstr ""
> +"Server"
>   
>   msgid "Port"
> -msgstr "Port"
> +msgstr ""
> +"Port"
>   
>   msgid "Target"
> -msgstr "Ziel"
> +msgstr ""
> +"Ziel"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "Das iSCSI-Ziel auf dem iSCSI-Server"
> +msgstr ""
> +"Das iSCSI-Ziel auf dem iSCSI-Server"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "iSCSI-Authentifizierung hinzuf?gen"
> +msgstr ""
> +"iSCSI-Authentifizierung hinzuf?gen"
>   
>   msgid "iSCSI Authentication"
> -msgstr "iSCSI-Authentifizierung"
> +msgstr ""
> +"iSCSI-Authentifizierung"
>   
>   msgid "SCSI Adapter"
> -msgstr "SCSI-Adapter"
> +msgstr ""
> +"SCSI-Adapter"
>   
>   msgid "Please, wait..."
> -msgstr "Bitte warten..."
> +msgstr ""
> +"Bitte warten..."
>   
>   msgid "Add Template"
> -msgstr "Vorlage hinzuf?gen"
> +msgstr ""
> +"Vorlage hinzuf?gen"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "Wo ist der Quellendatentr?ger f?r diese Vorlage?"
> +msgstr ""
> +"Wo ist der Quellendatentr?ger f?r diese Vorlage?"
>   
>   msgid "Local ISO Image"
> -msgstr "Lokales ISO-Image"
> +msgstr ""
> +"Lokales ISO-Image"
>   
>   msgid "Local Image File"
>   msgstr ""
> +"Lokale Imagedatei"
>   
>   msgid "Remote ISO Image"
> -msgstr "Fernes ISO-Image"
> +msgstr ""
> +"Fernes ISO-Image"
>   
>   msgid "Search ISOs"
> -msgstr "ISOs suchen"
> +msgstr ""
> +"ISOs suchen"
>   
>   msgid "The following ISOs are available:"
> -msgstr "Die folgenden ISOs sind verf?gbar:"
> +msgstr ""
> +"Die folgenden ISOs sind verf?gbar:"
>   
>   msgid "OS: "
> -msgstr "BS: "
> +msgstr ""
> +"BS: "
>   
>   msgid "Version: "
> -msgstr "Version: "
> +msgstr ""
> +"Version: "
>   
>   msgid "Size: "
> -msgstr "Gr??e: "
> +msgstr ""
> +"Gr??e: "
>   
>   msgid "Search more ISOs"
> -msgstr "Weitere ISOs suchen"
> +msgstr ""
> +"Weitere ISOs suchen"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "Vorlagen aus ausgew?hltem ISO erstellen"
> +msgstr ""
> +"Vorlagen aus ausgew?hltem ISO erstellen"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "Ich m?chte eine bestimmte ISO-Datei verwenden"
> +msgstr ""
> +"Ich m?chte eine bestimmte ISO-Datei verwenden"
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "Standardm??ige ferne ISOs werden geladen ..."
> +msgstr ""
> +"Standardm??ige ferne ISOs werden geladen..."
>   
>   msgid "Arch: "
> -msgstr "Arch: "
> +msgstr ""
> +"Arch: "
>   
>   msgid "I want to use a custom URL"
> -msgstr "Ich m?chte einen benutzerdefinierten URL verwenden"
> +msgstr ""
> +"Ich m?chte eine benutzerdefinierte URL verwenden"
>   
>   msgid "Edit Template"
> -msgstr "Vorlage bearbeiten"
> +msgstr ""
> +"Vorlage bearbeiten"
>   
>   msgid "Processor"
> -msgstr "Prozessor"
> +msgstr ""
> +"Prozessor"
>   
>   msgid "CDROM"
> -msgstr "CD-ROM"
> +msgstr ""
> +"CD-ROM"
>   
>   msgid "Image File"
>   msgstr ""
> +"Imagedatei"
>   
>   msgid "Graphics"
> -msgstr "Grafik"
> +msgstr ""
> +"Grafik"
>   
>   msgid "Disk(GB)"
>   msgstr ""
> +"Festplatte (GB)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"Plattenformat"
>   
>   msgid "CPU Number"
> -msgstr "CPU-Anzahl"
> +msgstr ""
> +"CPU-Anzahl"
>   
>   msgid "Manually set CPU topology"
>   msgstr ""
> +"CPU-Topologie manuell festlegen"
>   
>   msgid "Cores"
>   msgstr ""
> +"Kerne"
>   
>   msgid "Threads"
>   msgstr ""
> +"Threads"
>   
>   msgid "CPU"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Disk I/O"
> -msgstr "Platten-E/A"
> +msgstr ""
> +"Platten-E/A"
>   
>   msgid "Network I/O"
> -msgstr "Netz-E/A"
> +msgstr ""
> +"Netz-E/A"
>   
>   msgid "Livetile"
> -msgstr "Live Tile"
> +msgstr ""
> +"Live Tile"
>   
>   msgid "No guests found."
> -msgstr "Keine G?ste gefunden."
> +msgstr ""
> +"Keine G?ste gefunden."
>   
>   msgid "Shut down"
> -msgstr "Herunterfahren"
> +msgstr ""
> +"Herunterfahren"
>   
>   msgid "Restart"
> -msgstr "Erneut starten"
> +msgstr ""
> +"Erneut starten"
>   
>   msgid "Basic Information"
> -msgstr "Basisinformationen"
> +msgstr ""
> +"Basisinformationen"
>   
>   msgid "OS Distro"
> -msgstr "BS-Distro"
> +msgstr ""
> +"BS-Distro"
>   
>   msgid "OS Code Name"
> -msgstr "BS-Codename"
> +msgstr ""
> +"BS-Codename"
>   
>   msgid "CPU(s)"
>   msgstr ""
> +"CPU(s)"
>   
>   msgid "System Statistics"
> -msgstr "Systemstatistik"
> +msgstr ""
> +"Systemstatistik"
>   
>   msgid "Update Progress"
> -msgstr "Aktualisierungsfortschritt"
> +msgstr ""
> +"Aktualisierungsfortschritt"
>   
>   msgid "Network Name"
> -msgstr "Netzname"
> +msgstr ""
> +"Netzname"
>   
>   msgid "State"
> -msgstr "Status"
> +msgstr ""
> +"Status"
>   
>   msgid "Network Type"
> -msgstr "Netztyp"
> +msgstr ""
> +"Netztyp"
>   
>   msgid "Address Space"
> -msgstr "Adressraum"
> +msgstr ""
> +"Adressraum"
>   
>   msgid "Name should not contain '/' and '\"'."
> -msgstr "Ung?ltiger Speicherpoolname. Er darf nicht '/' enthalten."
> +msgstr ""
> +"Der Name darf weder '/' noch '\"' enthalten."
>   
>   msgid "Isolated: no external network connection"
> -msgstr "Isolatiert: keine physisische Netzverbindung"
> +msgstr ""
> +"Isoliert: keine externe Netzverbindung"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT: nur ausgehende physische Netzverbindung"
> +msgstr ""
> +"NAT: nur ausgehende physische Netzverbindung"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
>   msgstr ""
> @@ -2270,57 +2762,80 @@ msgstr ""
>   
>   msgid "(No interfaces found)"
>   msgstr ""
> +"(Keine Schnittstellen gefunden)"
>   
>   msgid "Destination"
> -msgstr "Ziel:"
> +msgstr ""
> +"Zieladresse"
>   
>   msgid "Enable VLAN"
> -msgstr "Virtuelles LAN (VLAN) aktivieren:"
> +msgstr ""
> +"VLAN aktivieren"
>   
>   msgid "VLAN ID"
> -msgstr "VLAN-ID:"
> +msgstr ""
> +"VLAN-ID"
>   
>   msgid "Stop"
> -msgstr "Stoppen"
> +msgstr ""
> +"Stoppen"
>   
>   msgid "%Used"
>   msgstr ""
> +"% belegt"
>   
>   msgid "Location"
> -msgstr "Position"
> +msgstr ""
> +"Position"
>   
>   msgid "Capacity"
> -msgstr "Kapazit?t"
> +msgstr ""
> +"Kapazit?t"
>   
>   msgid "Allocated"
> -msgstr "Zugeordnet"
> +msgstr ""
> +"Zugeordnet"
>   
>   msgid "active"
> -msgstr "aktiv"
> +msgstr ""
> +"aktiv"
>   
>   msgid "inactive"
> -msgstr "inaktiv"
> +msgstr ""
> +"inaktiv"
>   
>   msgid "Deactivate"
> -msgstr "Inaktivieren"
> +msgstr ""
> +"Inaktivieren"
>   
>   msgid "Activate"
> -msgstr "Aktivieren"
> +msgstr ""
> +"Aktivieren"
>   
>   msgid "Add Volume"
>   msgstr ""
> +"Datentr?ger hinzuf?gen"
>   
>   msgid "Extend"
>   msgstr ""
> +"Erweitern"
>   
>   msgid "Undefine"
> -msgstr "Definition aufheben"
> +msgstr ""
> +"Definition aufheben"
>   
>   msgid "Format"
> -msgstr "Format:"
> +msgstr ""
> +"Format"
>   
>   msgid "Allocation"
> -msgstr "Zuordnung:"
> +msgstr ""
> +"Zuordnung"
>   
>   msgid "No templates found."
> -msgstr "Keine Vorlagen gefunden."
> +msgstr ""
> +"Keine Vorlagen gefunden."
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/po/es_ES.po b/po/es_ES.po
> index 5389718..f97760d 100644
> --- a/po/es_ES.po
> +++ b/po/es_ES.po
> @@ -1,5 +1,6 @@
>   # English translations for kimchi package.
>   # Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
> @@ -9,138 +10,155 @@ msgstr ""
>   "PO-Revision-Date: 2013-07-11 17:32-0400\n"
>   "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
>   "Language-Team: English\n"
> -"Language: es_ES\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
> +"Plural-Forms: nplurals=2; plural=n != 1;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
>   msgstr ""
> +"Par?metro %(value)s desconocido"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "Suprimir no est? permitido para %(resource)s"
> +msgstr ""
> +"No se permite la supresi?n para %(resource)s"
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "%(resource)s no implementa m?todo de actualizaci?n"
> +msgstr ""
> +"%(resource)s no implementa el m?todo de actualizaci?n"
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "Crear no est? permitido para %(resource)s"
> +msgstr ""
> +"No se permite la creaci?n para %(resource)s"
>   
>   msgid "Unable to parse JSON request"
> -msgstr "No se puede analizar la solicitud JSON"
> +msgstr ""
> +"No se puede analizar la solicitud JSON"
>   
>   msgid "This API only supports JSON"
> -msgstr "Esta API s?lo da soporte a JSON"
> +msgstr ""
> +"Esta API s?lo da soporte a JSON"
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
>   msgstr ""
> +"Los par?metros no coinciden con el requisito en el esquema: %(err)s"
>   
>   msgid "You don't have permission to perform this operation."
>   msgstr ""
> +"No dispone de permiso para llevar a cabo esta operaci?n."
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "El almac?n de datos no se ha iniciado en el objeto de modelo."
> +msgstr ""
> +"El almac?n de datos no se ha iniciado en el objeto de modelo."
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> -msgstr "No se puede iniciar la tarea debido a un 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 ""
> +"El tiempo de espera de %(seconds)s segundos se ha agotado al ejecutar la tarea '%(task)s."
>   
>   #, 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 "
> -"error: %(code)s]"
> +"Error en la autenticaci?n para el usuario '%(username)s'. [C?digo de error: %(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "No tiene autorizaci?n para acceder a Kimchi"
> +msgstr ""
> +"No tiene autorizaci?n para acceder a Kimchi"
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "Especifique %(item)s para iniciar la sesi?n en Kimchi"
> +msgstr ""
> +"Especifique %(item)s para iniciar sesi?n en Kimchi"
>   
>   #, python-format
>   msgid "User %(user_id)s not found with given LDAP settings."
>   msgstr ""
> +"No se ha encontrado el usuario %(user_id)s con los valores LDAP indicados."
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
>   msgstr ""
> +"Configuraci?n LDAP no v?lida: %(item)s : %(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
>   msgstr ""
> +"Se ha especificado un valor \"_cap\" desconocido"
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
>   msgstr ""
> +"\"_passthrough\" deber?a ser \"true\" o \"false\""
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
>   msgstr ""
> +"\"_passthrough_affected_by\" deber?a ser una cadena de nombre de dispositivo"
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
>   msgstr ""
> -"Se ha producido un error al obtener dispositivos de bloque. Detalles: %(err)s"
> +"Error al obtener dispositivos de bloque. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
>   msgstr ""
> -"Se ha producido un error al obtener informaci?n de dispositivo de bloque "
> -"para %(device)s."
> +"Error al obtener informaci?n de dispositivos de bloque para %(device)s."
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "No se puede encontrar el archivo distro: %(filename)s"
> +msgstr ""
> +"No se ha podido encontrar el archivo distro: %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
>   msgstr ""
> -"No se puede analizar el archivo distro: %(filename)s. Aseg?rese de que es un "
> -"archivo JSON."
> +"No se ha podido analizar el archivo distro: %(filename)s. Aseg?rese de que se trate de un archivo JSON. "
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
>   msgstr ""
> -"No se puede iniciar la sesi?n en %(portal)s del destino de host iSCSI. "
> -"Detalles: %(err)s"
> +"No se puede iniciar sesi?n en el %(portal)s de destino de host iSCSI. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
>   msgstr ""
> -"No se puede iniciar la sesi?n en el destino %(target)s del %(host)s host de "
> -"iSCSI"
> +"No se puede iniciar sesi?n en el host iSCSI %(host)s de destino %(target)s"
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
>   msgstr ""
> +"No se puede encontrar el archivo ISO %(filename)s"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "El archivo ISO %(filename)s no es arrancable"
> +msgstr ""
> +"El archivo ISO %(filename)s no se puede arrancar"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
>   msgstr ""
> -"El archivo ISO %(filename)s no tiene un registro de arranque de El Torito "
> -"v?lido"
> +"El archivo ISO %(filename)s no tiene un registro de arranque El Torito v?lido"
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> -msgstr "Entrada de validaci?n de El Torito no v?lida en ISO %(filename)s"
> +msgstr ""
> +"La entrada de validaci?n de El Torito no es v?lida en ISO %(filename)s"
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "Indicador de arranque de El Torito no v?lido en ISO %(filename)s"
> +msgstr ""
> +"El indicador de arranque de El Torito no es v?lido en ISO %(filename)s"
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
> @@ -150,8 +168,7 @@ msgstr ""
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
>   msgstr ""
> -"Formato incorrecto mientras se le?a el descriptor de volumen en ISO "
> -"%(filename)s"
> +"Formato err?neo al leer el descriptor de vol?menes en ISO %(filename)s"
>   
>   #, python-format
>   msgid ""
> @@ -163,87 +180,104 @@ msgid ""
>   msgstr ""
>   "El hipervisor no tiene permiso para utilizar este ISO %(filename)s. "
>   "Considere moverlo a /var/lib/libvirt, o establezca el permiso de b?squeda en "
> -"listas de control de accesos de archivo para el usuario '%(user)s' si es "
> -"posible, o a?ada el '%(user)s' al grupo de v?as de acceso ISO, o (no "
> -"recomendado) 'chmod -R o+x 'path_to_iso'.Detalles: %(err)s"
> +"las listas de control de acceso de archivos para el usuario '%(user)s', si es posible, o a?ada el "
> +"'%(user)s' al grupo de v?as de acceso ISO o (no recomendado) 'chmod -R o+x "
> +"'path_to_iso'. Detalles: %(err)s"
>   
>   msgid "An error occurred when probing image OS information."
>   msgstr ""
> +"Se ha producido un error al analizar la informaci?n de sistema operativo de las im?genes. "
>   
>   msgid "No OS information found in given image."
>   msgstr ""
> +"No se ha encontrado informaci?n de sistema operativo en una imagen especificada. "
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
>   msgstr ""
> +"No se puede leer el archivo de im?genes %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Image file must be an existing file on system. %(filename)s is not a valid "
>   "input."
>   msgstr ""
> +"El archivo de im?genes debe ser un archivo existente en el sistema. %(filename)s no es una entrada"
> +"v?lida. "
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "La m?quina virtual %(name)s ya existe"
> +msgstr ""
> +"Ya existe la m?quina virtual %(name)s"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "La m?quina virtual %(name)s no existe"
> +msgstr ""
> +"No existe la m?quina virtual %(name)s"
>   
>   #, python-format
>   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 ""
> +"No se puede renombrar la m?quina virtual %(name)s. El nombre %(new_name)s ya "
> +"se est? utilizando o la m?quina virtual no se ha apagado. "
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
>   msgstr ""
> -"No se puede recuperar la captura de pantalla para la m?quina virtual "
> -"detenida %(name)s"
> +"No se puede recuperar la captura de pantalla para la m?quina virtual detenida %(name)s"
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "La imagen ISO remota no est? soportada por este servidor."
> +msgstr ""
> +"La imagen ISO remota no est? soportada por este servidor."
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
>   msgstr ""
> +"No se acepta la captura de pantalla en la m?quina virtual %(name)s"
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede crear la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede crear la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede crear la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede actualizar la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede recuperar la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede recuperar la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
>   msgstr ""
> +"No se puede conectar a la m?quina virtual %(name)s apagada. "
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"El nombre de la m?quina virtual debe ser una serie sin barras inclinadas (/)"
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
>   msgstr ""
> +"Se ha especificado un URI de plantilla %(value)s no v?lido para la m?quina virtual"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
>   msgstr ""
> +"Se ha especificado un URI de agrupaci?n de almacenamiento %(value)s no v?lido para la m?quina virtual"
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
>   msgstr ""
> +"Los gr?ficos de la m?quina virtual soportados son Spice o VNC"
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
>   msgstr ""
> -"La direcci?n de gr?ficos en que hay que estar a la escucha debe ser IPv4 o "
> -"IPv6"
> +"La direcci?n de gr?ficos en que hay que estar a la escucha debe ser IPv4 o IPv6"
>   
>   msgid "Specify a template to create a virtual machine from"
>   msgstr ""
> @@ -251,124 +285,158 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede iniciar la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede iniciar la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede detener la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede apagar la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede suprimir la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede suprimir la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede redenominar la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede restablecer la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   msgid "User name list must be an array"
>   msgstr ""
> +"La lista de nombres de usuarios debe ser una matriz"
>   
>   msgid "User name must be a string"
> -msgstr "El nombre de red debe ser una serie"
> +msgstr ""
> +"El nombre de usuario debe ser una serie"
>   
>   msgid "Group name list must be an array"
>   msgstr ""
> +"La lista de nombres de grupos debe ser una matriz"
>   
>   msgid "Group name must be a string"
> -msgstr "El nombre de red debe ser una serie"
> +msgstr ""
> +"El nombre de grupo debe ser una serie"
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "El usuario '%(users)s' no existe."
> +msgstr ""
> +"No existe el usuario (o usuarios) '%(users)s'"
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "El usuario '%(groups)s' no existe."
> +msgstr ""
> +"No existe el grupo (o grupos) '%(groups)s'"
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede detener la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede apagar la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
> -msgstr "No se puede iniciar la m?quina virtual %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede obtener acceso a los metadatos de la m?quina virtual %(name)s. Detalles: %(err)s"
>   
>   msgid "The guest console password must be a string."
>   msgstr ""
> +"La contrase?a de la consola del invitado debe ser una serie. "
>   
>   msgid "The life time for the guest console password must be a number."
>   msgstr ""
> +"El tiempo de vida para la contrase?a de la consola del invitado debe ser un n?mero. "
>   
>   #, python-format
>   msgid "Virtual machine '%(name)s' must be stopped before cloning it."
>   msgstr ""
> +"La m?quina virtual '%(name)s' se debe detener antes de clonarla."
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
>   msgstr ""
> +"No hay espacio de disco suficiente para clonar la m?quina virtual '%(name)s'"
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"No se puede clonar la m?quina virtual '%(name)s'. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"Operaci?n no v?lida para la m?quina virtual no persistente %(name)s"
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"No se puede suspender la m?quina virtual '%(name)s' porque no se est? ejecutando."
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"No se puede suspender la m?quina virtual '%(name)s'. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"No se puede reanudar la m?quina virtual '%(name)s' porque no se ha puesto en pausa. "
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"No se puede reanudar la m?quina virtual '%(name)s'. Detalles: %(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"La memoria asignada es superior al m?ximo asignado en el host."
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"La m?quina virtual '%(name)s' no admite la actualizaci?n de memoria activa. Actualice la memoria con "
> +"la m?quina fuera de l?nea para habilitar esta caracter?stica. "
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"Solamente se permite aumentar la memoria en las m?quinas virtuales activas"
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"Para la actualizaci?n de memoria en directo, el valor de memoria nuevo debe ser igual al valor anterior de la memoria m?s "
> +"m?ltiplos de 1024 Mib"
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"No hay suficientes ranuras libres de 1024 Mib en el invitado. "
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"La versi?n libvirt del host no admite dispositivos de memoria. Libvirt debe ser >= "
> +"1.2.14"
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"Error al conectar el dispositivo de memoria. Detalles: %(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
>   msgstr ""
> +"La m?quina virtual %(vmid)s no contiene el dispositivo de host asignado directamente %(dev_name)s."
>   
>   #, python-format
>   msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
>   msgstr ""
> +"El dispositivo de host %(dev_name)s no se permite para asignarlo directamente a la m?quina virtual. "
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -377,19 +445,28 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> +"No se han encontrado grupos IOMMU. El paso a trav?s de PCI de host necesita el grupo IOMMU para funcionar "
> +"correctamente. Habilite Intel VT-d o AMD IOMMU en el BIOS y, a continuaci?n, verifique "
> +"que el Kernel se ha compilado con soporte IOMMU. Para Intel CPU, a?ada intel_iommu=on "
> +"al par?metro de Kernel en /boot/grub2/grub.conf. Para AMD CPU, a?ada iommu=pt "
> +"iommu=1."
>   
>   msgid "\"name\" should be a device name string"
>   msgstr ""
> +"\"name\" debe ser una serie de nombre de dispositivo"
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"El dispositivo %(name)s lo est? utilizando probablemente el host. No se puede conectar al "
> +"invitado. "
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> -msgstr "La interfaz %(iface)s no existe en la m?quina virtual %(name)s"
> +msgstr ""
> +"La interfaz %(iface)s no existe en la m?quina virtual %(name)s"
>   
>   #, python-format
>   msgid ""
> @@ -398,7 +475,8 @@ msgstr ""
>   "La red %(network)s especificada para la m?quina virtual %(name)s no existe"
>   
>   msgid "Supported virtual machine interfaces type is only network"
> -msgstr "El tipo de interfaces de m?quina virtual soportado es de red solamente"
> +msgstr ""
> +"El tipo de interfaces de m?quina virtual soportado es de red solamente"
>   
>   msgid "Network name for virtual machine interface must be a string"
>   msgstr ""
> @@ -406,30 +484,33 @@ msgstr ""
>   
>   msgid "Invalid network model card specified for virtual machine interface"
>   msgstr ""
> -"Especificada tarjeta de modelo de red no v?lida para la interfaz de m?quina "
> -"virtual"
> +"Especificada tarjeta de modelo de red no v?lida para la interfaz de m?quina virtual"
>   
>   msgid "Specify type and network to add a new virtual machine interface"
>   msgstr ""
> -"Especifique el tipo y la red para a?adir una interfaz de m?quina virtual "
> -"nueva"
> +"Especifique el tipo y la red para a?adir una interfaz de m?quina virtual nueva"
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"La direcci?n MAC debe respetar este formato FF:FF:FF:FF:FF:FF"
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"La direcci?n MAC %(mac)s ya existe en la m?quina virtual %(name)s"
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"Direcci?n MAC no v?lida"
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"No se puede cambiar la direcci?n MAC de una m?quina virtual en ejecuci?n"
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "La plantilla %(name)s ya existe"
> +msgstr ""
> +"La plantilla %(name)s ya existe"
>   
>   #, python-format
>   msgid ""
> @@ -441,118 +522,141 @@ msgstr ""
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
>   msgstr ""
> -"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla "
> -"%(template)s no existe"
> +"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla %(template)s no existe"
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
>   msgstr ""
> -"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla "
> -"%(template)s no est? activa"
> +"La agrupaci?n de almacenamiento %(pool)s especificada para la plantilla %(template)s no est? activa"
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "Par?metro no v?lido '%(param)s' especificado para CDROM."
> +msgstr ""
> +"Par?metro no v?lido '%(param)s' especificado para CDROM."
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
>   msgstr ""
> -"La red %(network)s especificada para la plantilla %(template)s no est? activa"
> +"La red %(network)s que se ha especificado para la plantilla %(template)s no est? activa"
>   
>   msgid "Template name must be a string"
> -msgstr "El nombre de plantilla debe ser una serie"
> +msgstr ""
> +"El nombre de plantilla debe ser una serie"
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "El icono de plantilla debe ser una v?a de acceso a la imagen"
> +msgstr ""
> +"El icono de plantilla debe ser una v?a de acceso a la imagen"
>   
>   msgid "Template distribution must be a string"
> -msgstr "La distribuci?n de plantilla debe ser una serie"
> +msgstr ""
> +"La distribuci?n de plantilla debe ser una serie"
>   
>   msgid "Template distribution version must be a string"
> -msgstr "La versi?n de distribuci?n de plantilla debe ser una serie"
> +msgstr ""
> +"La versi?n de distribuci?n de plantilla debe ser una serie"
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "El n?mero de CPUs debe ser un entero"
> +msgstr ""
> +"El n?mero de CPU debe ser un entero mayor que 0"
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
> -msgstr "La cantidad de memoria (MB) debe ser un entero mayor que 512"
> +msgstr ""
> +"La cantidad de memoria (MB) debe ser un entero mayor que 512"
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto"
> +msgstr ""
> +"El CDROM de plantilla debe ser un archivo ISO local o remoto"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
>   msgstr ""
> -"URI de agrupaci?n de almacenamiento no v?lido %(value)s especificado para la "
> -"plantilla"
> +"Se ha especificado un URI de agrupaci?n de almacenamiento %(value)s no v?lido para la plantilla"
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
> -msgstr "Especifique una imagen de ISO como CDROM para crear una plantilla"
> +msgstr ""
> +"Especifique una imagen ISO como CDROM o una imagen base para crear una plantilla"
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "Todas las redes para la plantilla deben especificarse en una lista."
> +msgstr ""
> +"Todas las redes para la plantilla deben especificarse en una lista."
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
>   msgstr ""
> +"Especifique un volumen para una plantilla cuando la agrupaci?n de almacenamiento sea iSCSI o SCSI"
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
>   msgstr ""
> +"El volumen %(volume)s no se halla en la agrupaci?n de almacenamiento %(pool)s"
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> -msgstr "No se puede crear la plantilla debido a un error: %(err)s"
> +msgstr ""
> +"No se ha podido crear la plantilla debido al error: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete template due error: %(err)s"
> -msgstr "No se puede suprimir la plantilla debido a un error: %(err)s"
> +msgstr ""
> +"No se ha podido suprimir la plantilla debido a un error: %(err)s"
>   
>   msgid "Disk size must be an integer greater than 1GB."
>   msgstr ""
> +"El tama?o del disco debe ser un entero mayor que 1 GB."
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto"
> +msgstr ""
> +"La imagen base de la plantilla debe ser un archivo de imagen base local v?lido"
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
>   msgstr ""
> +"No se puede identificar el formato de la imagen base %(path)s"
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
>   msgstr ""
> +"Cuando se especifique la topolog?a de CPU, las VCPU deben ser un producto de sockets, n?cleos y "
> +"hebras. "
>   
>   msgid ""
>   "When specifying CPU topology, each element must be an integer greater than "
>   "zero."
>   msgstr ""
> +"Cuando se especifica la topolog?a de CPU, cada elemento debe ser un entero mayor que "
> +"cero."
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"formato de imagen de disco no v?lido. Formatos v?lidos: bochs, cloop, cow, dmg, qcow, "
> +"qcow2, qed, raw, vmdk, vpc."
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "La agrupaci?n de almacenamiento %(name)s ya existe"
> +msgstr ""
> +"Ya existe la agrupaci?n de almacenamiento %(name)s"
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "La agrupaci?n de almacenamiento %(name)s no existe"
> +msgstr ""
> +"No existe la agrupaci?n de almacenamiento %(name)s"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
>   msgstr ""
> -"Especifique %(item)s para poder crear la agrupaci?n de almacenamiento "
> -"%(name)s"
> +"Especifique %(item)s para crear la agrupaci?n de almacenamiento %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "No se puede suprimir la agrupaci?n de almacenamiento activa %(name)s"
> +msgstr ""
> +"No se puede suprimir la agrupaci?n de almacenamiento activo %(name)s"
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "No se pueden listar agrupaciones de almacenamiento. Detalles: %(err)s"
> +msgstr ""
> +"No se pueden listar las agrupaciones de almacenamiento. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> @@ -564,58 +668,59 @@ msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"No se puede obtener el n?mero de vol?menes de almacenamiento en la "
> -"agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
> +"No se puede obtener el n?mero de vol?menes de almacenamiento en la agrupaci?n de almacenamiento %(name)s. Detalles: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
>   msgstr ""
> -"No se puede activar la agrupaci?n de almacenamiento %(name)s. Detalles: "
> -"%(err)s"
> +"No se puede activar la agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
>   msgstr ""
> -"No se puede desactivar la agrupaci?n de almacenamiento %(name)s. Detalles: "
> -"%(err)s"
> +"No se puede desactivar la agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
>   msgstr ""
> -"No se puede suprimir la agrupaci?n de almacenamiento %(name)s. Detalles: "
> -"%(err)s"
> +"No se puede suprimir la agrupaci?n de almacenamiento %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
>   msgstr ""
> -"No se puede crear la agrupaci?n de NFS ya que la v?a de acceso de "
> -"exportaci?n %(path)s podr?a bloquearse durante el montaje"
> +"No se puede crear la agrupaci?n de NFS ya que la v?a de acceso de exportaci?n %(path)s podr?a bloquearse durante el montaje"
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
>   msgstr ""
> -"No se puede crear la agrupaci?n de NFS ya que el montaje de la v?a de acceso "
> -"de exportaci?n %(path)s ha fallado"
> +"No se puede crear la agrupaci?n de NFS ya que ha fallado el montaje de la v?a de acceso de exportaci?n %(path)s"
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "Tipo de agrupaci?n de almacenamiento no soportado: %(type)s"
> +msgstr ""
> +"Tipo de agrupaci?n de almacenamiento no admitido: %(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
>   msgstr ""
> +"Error al recuperar el XML de la agrupaci?n de almacenamiento en %(pool)s"
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"El nombre de la agrupaci?n de almacenamiento debe ser una serie sin barras inclinadas (/)"
>   
>   msgid ""
>   "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
>   "iso"
>   msgstr ""
> +"Los tipos de agrupaci?n de almacenamiento admitidos son dir, netfs, logical, iscsi, isci y kimchi-"
> +"iso"
>   
>   msgid "Storage pool path must be a string"
> -msgstr "La v?a de acceso de la agrupaci?n de almacenamiento debe ser una serie"
> +msgstr ""
> +"La v?a de acceso de la agrupaci?n de almacenamiento debe ser una serie"
>   
>   msgid "Storage pool host must be a IP or hostname"
>   msgstr ""
> @@ -623,25 +728,27 @@ msgstr ""
>   
>   msgid "Storage pool device must be the absolute path to the block device"
>   msgstr ""
> +"El dispositivo de la agrupaci?n de almacenamiento debe ser la v?a de acceso absoluta al dispositivo de bloque"
>   
>   msgid "Storage pool devices parameter must be a list"
>   msgstr ""
> -"El par?metro de los dispositivos de agrupaci?n de almacenamiento debe ser "
> -"una lista"
> +"El par?metro de los dispositivos de agrupaci?n de almacenamiento debe ser una lista"
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "El IQN destino de una agrupaci?n de iSCSI debe ser una serie"
> +msgstr ""
> +"El IQN destino de una agrupaci?n de iSCSI debe ser una serie"
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
>   msgstr ""
> -"El puerto de un servidor de almacenamiento remoto debe ser un entero entre 1 "
> -"y 65535"
> +"El puerto de un servidor de almacenamiento remoto debe ser un entero entre 1 y 65535"
>   
>   msgid "iSCSI target username must be a string"
>   msgstr ""
> +"El nombre de usuario de destino de iSCSI debe ser una serie"
>   
>   msgid "iSCSI target password must be a string"
>   msgstr ""
> +"La contrase?a de destino de iSCSI debe ser una serie"
>   
>   msgid "Specify name and type to create a storage pool"
>   msgstr ""
> @@ -652,20 +759,21 @@ msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
>   msgstr ""
> -"%(disk)s no es un disco/partici?n. No se ha podido a?adir a la agrupaci?n "
> +"%(disk)s no es un disco/partici?n v?lido. No se ha podido a?adir a la agrupaci?n "
>   "%(pool)s."
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
>   msgstr ""
> +"No se puede ampliar la agrupaci?n l?gica %(pool)s. Detalles: %(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
>   msgstr ""
> -"Los discos de par?metro s?lo pueden actualizarse para la agrupaci?n de "
> -"almacenamiento l?gico."
> +"Los discos de par?metro s?lo pueden actualizarse para la agrupaci?n de almacenamiento l?gico."
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "El nombre del adaptador de host SCSI debe ser una serie."
> +msgstr ""
> +"El nombre del adaptador de host SCSI debe ser una serie."
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
>   msgstr ""
> @@ -676,92 +784,88 @@ msgid ""
>   "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"No se puede activar la agrupaci?n de almacenamiento NFS %(name)s. El "
> -"servidor NFS %(server)s est? fuera de alcance."
> +"No se puede activar la agrupaci?n de almacenamiento NFS %(name)s. El servidor NFS %(server)s "
> +"est? fuera de alcance."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"No se puede desactivar la agrupaci?n de almacenamiento NFS %(name)s. El "
> -"servidor NFS %(server)s est? fuera de alcance."
> +"No se puede desactivar la agrupaci?n de almacenamiento NFS %(name)s. El servidor NFS %(server)s "
> +"est? fuera de alcance."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate pool %(name)s as it is associated with some templates"
>   msgstr ""
> -"No se puede desactivar la agrupaci?n %(name)s ya que est? asociada con "
> -"algunas plantillas"
> +"No se puede desactivar la agrupaci?n %(name)s ya que est? asociada con algunas plantillas"
>   
>   #, python-format
>   msgid "Unable to delete pool %(name)s as it is associated with some templates"
>   msgstr ""
> -"No se puede suprimir la agrupaci?n %(name)s ya que est? asociada con algunas "
> -"plantillas"
> +"No se puede suprimir la agrupaci?n %(name)s ya que est? asociada con algunas plantillas"
>   
>   #, python-format
>   msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
>   msgstr ""
> -"Un grupo de vol?menes denominado '%(name)s' ya existe. Elija otro nombre "
> +"Ya existe un grupo de vol?menes denominado '%(name)s'. Elija otro nombre "
>   "para crear la agrupaci?n l?gica."
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
>   msgstr ""
> -"No se puede actualizar la base de datos con la informaci?n de exploraci?n "
> -"profunda debido a un error: %(err)s"
> +"No se puede actualizar la base de datos con la informaci?n de exploraci?n profunda debido a un error: %(err)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "El volumen de almacenamiento %(name)s ya existe"
> +msgstr ""
> +"Ya existe el volumen de almacenamiento %(name)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
>   msgstr ""
> -"El volumen de almacenamiento %(name)s no existe en la agrupaci?n de "
> -"almacenamiento %(pool)s"
> +"No existe el volumen de almacenamiento %(name)s en la agrupaci?n de almacenamiento %(pool)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
>   "not active"
>   msgstr ""
> +"No se puede crear el volumen de almacenamiento %(volume)s porque la agrupaci?n de almacenamiento %(pool)s "
> +"no est? activa"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create storage volume %(volume)s"
>   msgstr ""
> -"Especifique %(item)s para poder crear el volumen de almacenamiento %(volume)s"
> +"Especifique %(item)s para crear el volumen de almacenamiento %(volume)s"
>   
>   #, 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 "
> -"almacenamiento %(pool)s no est? activa"
> +"No se pueden listar los vol?menes de almacenamiento porque la agrupaci?n de almacenamiento %(pool)s no est? activa"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"No se puede crear el volumen de almacenamiento %(name)s en la agrupaci?n de "
> -"almacenamiento %(pool)s. Detalles: %(err)s"
> +"No se puede crear el volumen de almacenamiento %(name)s en la agrupaci?n de almacenamiento %(pool)s. Detalles: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
>   msgstr ""
> -"No se pueden listar vol?menes de almacenamiento en la agrupaci?n de "
> -"almacenamiento %(pool)s. Detalles: %(err)s"
> +"No se pueden listar los vol?menes de almacenamiento en la agrupaci?n de almacenamiento %(pool)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
>   msgstr ""
> -"No se pueden borrar los vol?menes de almacenamiento %(name)s. Detalles: "
> -"%(err)s"
> +"No se pueden limpiar los vol?menes de almacenamiento %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
> @@ -771,91 +875,110 @@ msgstr ""
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
>   msgstr ""
> -"No se puede redimensionar el volumen de almacenamiento %(name)s. Detalles: "
> -"%(err)s"
> +"No se puede redimensionar el volumen de almacenamiento %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
>   msgstr ""
> -"El tipo de almacenamiento %(type)s no da soporte a crear y suprimir vol?menes"
> +"El tipo de almacenamiento %(type)s no admite la creaci?n y supresi?n del volumen"
>   
>   msgid "Storage volume name must be a string"
> -msgstr "El nombre de volumen de almacenamiento debe ser una serie"
> +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"
> +msgstr ""
> +"La asignaci?n de volumen de almacenamiento debe ser un n?mero entero"
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"Formato de volumen de almacenamiento no admitido. Formatos v?lidos: bochs, cloop, cow, dmg, "
> +"qcow, qcow2, qed, raw, vmdk, vpc."
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "El volumen de almacenamiento requiere un nombre de volumen"
> +msgstr ""
> +"El volumen de almacenamiento requiere un nombre de volumen"
>   
>   #, python-format
>   msgid ""
>   "Unable to update database with storage volume information due error: %(err)s"
>   msgstr ""
> -"No se puede actualizar la base de datos con la informaci?n de volumen de "
> -"almacenamiento debido a un error: %(err)s"
> +"No se puede actualizar la base de datos con la informaci?n del volumen de almacenamiento debido a un error: %(err)s"
>   
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
>   msgstr ""
> +"S?lo se puede especificar uno de los par?metros %(param)s"
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
>   msgstr ""
> +"No se admite la creaci?n del volumen de %(param)s"
>   
>   msgid "Storage volume capacity must be an integer number."
>   msgstr ""
> +"La capacidad del volumen de almacenamiento debe ser un n?mero entero. "
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
>   msgstr ""
> +"El URL del volumen de almacenamiento debe ser http://, https://, ftp:// o ftps://."
>   
>   #, python-format
>   msgid "Unable to access file %(url)s. Please, check it."
>   msgstr ""
> +"No se puede acceder al archivo %(url)s. Por favor, compru?belo. "
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"No se puede clonar el volumen de almacenamiento '%(name)s' en la agrupaci?n '%(pool)s'. Detalles: "
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"Especifique datos de fragmento y su tama?o para cargar un archivo. "
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"Para cargar un volumen de almacenamiento, especifique el par?metro 'upload'. "
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"No se pueden cargar datos de fragmento porque no coinciden con el tama?o de fragmento solicitado. "
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"El volumen de almacenamiento %(vol)s no est? bajo un proceso de carga. "
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"Los datos de fragmento de carga superar?n el tama?o del volumen de almacenamiento. "
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"No se pueden cargar datos de fragmento al volumen de almacenamiento. Detalles: %(err)s."
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "La interfaz %(name)s no existe"
> +msgstr ""
> +"No existe la interfaz %(name)s"
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "La red %(name)s ya existe"
> +msgstr ""
> +"Ya existe la red %(name)s"
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "La red %(name)s no existe"
> +msgstr ""
> +"No existe la red %(name)s"
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
> @@ -864,51 +987,61 @@ msgstr ""
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
> -msgstr "Especifique una interfaz de red para crear una red puenteada %(name)s"
> +msgstr ""
> +"Especifique una interfaz de red para crear una red puenteada %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "No se puede suprimir la red activa %(name)s"
> +msgstr ""
> +"No se puede suprimir la red activa %(name)s"
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
>   msgstr ""
> -"La interfaz %(iface)s especificada para la red %(network)s ya est? en uso"
> +"La interfaz %(iface)s especificada para la red %(network)s ya se est? utilizando"
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
> -msgstr "La interfaz debe ser dispositivo de puente, enlazado o NIC simple."
> +msgstr ""
> +"La interfaz debe ser dispositivo de puente, enlazado o NIC simple."
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "No se puede crear la red %(name)s. Detalles: %(err)s"
> +msgstr ""
> +"No se puede crear la red %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "No se puede encontrar una direcci?n IP libre para la red '%(name)s'"
> +msgstr ""
> +"No se puede encontrar una direcci?n IP libre para la red '%(name)s'"
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
> -msgstr "La interfaz %(iface)s ya existe"
> +msgstr ""
> +"La interfaz %(iface)s ya existe."
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"El nombre de red debe ser una serie sin barras inclinadas (/) ni comillas (\")"
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "Los tipos de red soportados son aislada, NAT y puente"
> +msgstr ""
> +"Los tipos de red soportados son aislada, NAT y puente"
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
>   msgstr ""
> -"La subred de red debe ser una serie con direcci?n IP y prefijo o m?scara de "
> -"red"
> +"La subred de red debe ser una serie con direcci?n IP y prefijo o m?scara de red"
>   
>   msgid "Network interface must be a string"
> -msgstr "La interfaz de red debe ser una serie"
> +msgstr ""
> +"La interfaz de red debe ser una serie"
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "El ID de VLAN de red debe ser un entero entre 1 y 4094"
> +msgstr ""
> +"El ID de VLAN de red debe ser un entero entre 1 y 4094"
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "Especifique el nombre y el tipo para crear una red"
> +msgstr ""
> +"Especifique el nombre y el tipo para crear una red"
>   
>   #, python-format
>   msgid ""
> @@ -929,31 +1062,34 @@ msgstr ""
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
>   msgstr ""
> -"El dispositivo de puente %(name)s no puede ser el dispositivo de conexi?n "
> -"troncal de una VLAN."
> +"El dispositivo en puente %(name)s no puede ser el dispositivo de conexi?n troncal de una VLAN."
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "No se puede activar la interfaz %(iface)s: %(err)s."
> +msgstr ""
> +"No se ha podido activar la interfaz %(iface)s: %(err)s."
>   
>   #, python-format
>   msgid ""
>   "Failed to activate interface %(iface)s. Please check the physical link "
>   "status."
>   msgstr ""
> -"No se puede activar la interfaz %(iface)s. Compruebe el estado del enlace "
> -"f?sico."
> +"No se ha podido activar la interfaz %(iface)s. Compruebe el estado del enlace "
> +"f?sico. "
>   
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
>   msgstr ""
> +"No se ha podido iniciar la red %(name)s. Detalles: %(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "El informe de depuraci?n %(name)s no existe"
> +msgstr ""
> +"El informe de depuraci?n %(name)s no existe"
>   
>   msgid "Debug report tool not found in system"
> -msgstr "Herramienta de informes de depuraci?n no encontrada en el sistema"
> +msgstr ""
> +"Herramienta de informes de depuraci?n no encontrada en el sistema"
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
> @@ -963,6 +1099,7 @@ msgstr ""
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
>   msgstr ""
> +"No se puede encontrar ning?n informe de depuraci?n con el nombre indicado %(name)s"
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
> @@ -971,133 +1108,148 @@ msgstr ""
>   
>   msgid "You should give a name for the debug report file."
>   msgstr ""
> +"Deber?a dar un nombre al archivo de informe de depuraci?n."
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> +"El nombre del informe de depuraci?n debe ser una serie. Solamente se permiten letras, d?gitos, car?cter de subrayado ('_') "
> +"y gui?n ('-'). "
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
>   msgstr ""
> -"Un grupo de vol?menes denominado '%(name)s' ya existe. Elija otro nombre "
> -"para crear la agrupaci?n l?gica."
> +"El informe de depuraci?n con el nombre especificado \"%(name)s\" ya existe. Utilice "
> +"otro."
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "Kimchi no utilizaba el servidor de almacenamiento %(server)s"
> +msgstr ""
> +"El servidor de almacenamiento %(server)s no lo ha utilizado Kimchi"
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "Distro '%(name)s' no existe"
> +msgstr ""
> +"No existe Distro '%(name)s'"
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "La partici?n %(name)s no existe en el host"
> +msgstr ""
> +"La partici?n %(name)s no existe en el host"
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
>   msgstr ""
> -"No se puede concluir la m?quina host ya que hay m?quinas virtuales en "
> -"ejecuci?n"
> +"No se puede concluir la m?quina host ya que hay m?quinas virtuales en ejecuci?n"
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
>   msgstr ""
> -"No se puede rearrancar la m?quina host ya que hay m?quinas virtuales en "
> -"ejecuci?n"
> +"No se puede rearrancar la m?quina host ya que hay m?quinas virtuales en ejecuci?n"
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "No se ha encontrado el dispositivo de nodo '%(name)s'"
> +msgstr ""
> +"No se encuentra el dispositivo de nodos '%(name)s'"
>   
>   msgid "Conflicting flag filters specified."
>   msgstr ""
> +"Se han especificado filtros de distintivos en conflicto."
>   
>   msgid "No packages marked for update"
> -msgstr "No hay paquetes marcados para su actualizaci?n"
> +msgstr ""
> +"No hay paquetes marcados para su actualizaci?n"
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "El paquete %(name)s no est? marcado para su actualizaci?n."
> +msgstr ""
> +"El paquete %(name)s no se ha marcado para actualizarlo."
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
>   msgstr ""
> -"Se ha producido un error al obtener paquetes marcados para su actualizaci?n. "
> -"Detalles: %(err)s"
> +"Error al obtener paquetes marcados para su actualizaci?n. Detalles: %(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "No hay ning?n gestor de paquetes compatible para este sistema."
> +msgstr ""
> +"No hay ning?n gestor de paquetes compatible para este sistema."
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "No se puede encontrar %(item)s en el almac?n de datos"
> +msgstr ""
> +"No se puede encontrar %(item)s en el almac?n de datos"
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "URI %(uri)s no v?lido"
> +msgstr ""
> +"URI %(uri)s no v?lido"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
>   msgstr ""
> -"Tiempo de espera excedido al ejecutar el mandato '%(cmd)s' despu?s de "
> -"%(seconds)s segundos"
> +"Tiempo de espera excedido al ejecutar el mandato '%(cmd)s' despu?s de %(seconds)s segundos"
>   
>   msgid "Unable to choose a virtual machine name"
>   msgstr ""
> +"No se puede elegir un nombre de m?quina virtual"
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"Valor de datos '%(value)s' no v?lido"
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"Unidad de datos '%(unit)s' no v?lida"
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "Tipo de almacenamiento no v?lido. Tipos soportados: 'cdrom'"
> +msgstr ""
> +"Tipo de almacenamiento no v?lido. Tipos soportados: 'cdrom', 'disk'"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
>   msgstr ""
> +"La v?a de acceso '%(value)s' no es una v?a de acceso local/remota v?lida para el dispositivo"
>   
>   msgid "Only CDROM path can be update."
>   msgstr ""
> +"Solamente se puede actualizar la v?a de acceso de CDROM. "
>   
>   #, python-format
>   msgid ""
>   "The storage device %(dev_name)s does not exist in the virtual machine "
>   "%(vm_name)s"
>   msgstr ""
> +"El dispositivo de almacenamiento %(dev_name)s no existe en la m?quina virtual. "
> +"%(vm_name)s"
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
>   msgstr ""
> -"Se ha producido un error al crear el nuevo dispositivo de almacenamiento: "
> -"%(error)s"
> +"Error al crear el dispositivo de almacenamiento nuevo: %(error)s"
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
>   msgstr ""
> -"Se ha producido un error al actualizar el dispositivo de almacenamiento: "
> -"%(error)s"
> +"Error al actualizar el dispositivo de almacenamiento: %(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
>   msgstr ""
> -"Se ha producido un error al eliminar el dispositivo de almacenamiento: "
> -"%(error)s"
> +"Error al eliminar el dispositivo de almacenamiento: %(error)s"
>   
>   msgid "Do not support IDE device hot plug"
>   msgstr ""
> +"No se admite la conexi?n en caliente del IDE"
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
>   msgstr ""
> -"Especifique el tipo y la v?a de acceso para a?adir un disco de m?quina "
> -"virtual nuevo"
> +"Especifique el tipo y la v?a de acceso y la agrupaci?n/volumen para a?adir "
> +"un nuevo disco de m?quina virtual"
>   
>   msgid "Specify path to update virtual machine disk"
>   msgstr ""
> @@ -1106,73 +1258,91 @@ msgstr ""
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
>   msgstr ""
> +"Se ha alcanzado el l?mite de tipo de controlador %(type)s de %(limit)s dispositivos"
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
>   msgstr ""
> +"No se puede recuperar la informaci?n de v?a de acceso de disco para la agrupaci?n o el volumen que se ha especificado: %(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
>   msgstr ""
> +"El volumen ya lo est? utilizando otra m?quina virtual. "
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
>   msgstr ""
> -"Especifique el tipo y la v?a de acceso para a?adir un disco de m?quina "
> -"virtual nuevo"
> +"Solo se puede especificar uno de v?a de acceso o agrupaci?n/volumen "
> +"para a?adir un nuevo disco de m?quina virtual"
>   
>   #, python-format
>   msgid ""
>   "Volume chosen with format %(format)s does not fit in the storage type "
>   "%(type)s"
>   msgstr ""
> +"El volumen elegido con el formato %(format)s no se ajusta al tipo de almacenamiento"
> +"%(type)s"
>   
>   msgid "YUM Repository ID must be one word only string."
> -msgstr "El ID de repositorio YUM debe ser una serie de una sola palabra."
> +msgstr ""
> +"El ID de repositorio YUM debe ser una serie de una sola palabra."
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "El URL de repositorio debe ser http://, ftp:// o archivo:// URL."
> +msgstr ""
> +"El URL de repositorio debe ser http://, ftp:// o archivo:// URL."
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
>   "repository type."
>   msgstr ""
> -"La configuraci?n de repositorio es un diccionario con valores espec?ficos "
> -"seg?n el tipo de repositorio."
> +"La configuraci?n de repositorio es un diccionario con valores espec?ficos seg?n "
> +"el tipo de repositorio."
>   
>   msgid "Distribution to DEB repository must be a string"
> -msgstr "El repositorio de Distribuci?n a DEB debe ser una serie"
> +msgstr ""
> +"El repositorio de Distribuci?n a DEB debe ser una serie"
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "El repositorio de Componentes a DEB debe estar listado en una matriz"
> +msgstr ""
> +"El repositorio de Componentes a DEB debe estar listado en una matriz"
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "El repositorio de Componentes a DEB debe ser una serie"
> +msgstr ""
> +"El repositorio de Componentes a DEB debe ser una serie"
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"La lista de duplicados en el repositorios debe ser una serie"
>   
>   msgid "YUM Repository name must be string."
> -msgstr "El nombre del repositorio YUM debe ser una serie."
> +msgstr ""
> +"El nombre del repositorio YUM debe ser una serie."
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "La comprobaci?n de GPG debe ser un valor booleano."
> +msgstr ""
> +"La comprobaci?n de GPG debe ser un valor booleano."
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
> -msgstr "La clave GPG debe ser un URL que apunta al archivo blindado por ASCII."
> +msgstr ""
> +"La clave GPG debe ser un URL que apunta al archivo blindado por ASCII."
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "No se ha podido actualizar el repositorio %(repo_id)s."
> +msgstr ""
> +"No se puede actualizar el repositorio %(repo_id)s."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "El repositorio %(repo_id)s no existe."
> +msgstr ""
> +"El repositorio %(repo_id)s no existe. "
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"Especifique el URL base de repositorio, la lista de duplicados o el metaenlace para crear o "
> +"actualizar un repositorio YUM. "
>   
>   msgid "Repository management tool was not recognized for your system."
>   msgstr ""
> @@ -1180,21 +1350,23 @@ msgstr ""
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "El repositorio %(repo_id)s ya est? habilitado."
> +msgstr ""
> +"El repositorio %(repo_id)s ya est? habilitado."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "El repositorio %(repo_id)s ya est? inhabilitado."
> +msgstr ""
> +"El repositorio %(repo_id)s ya est? inhabilitado. "
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "No se ha podido eliminar el repositorio %(repo_id)s."
> +msgstr ""
> +"No se ha podido eliminar el repositorio %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
>   msgstr ""
> -"No se ha podido grabar el archivo de configuraci?n del repositorio "
> -"%(repo_file)s"
> +"No se ha podido escribir en el archivo de configuraci?n del repositorio %(repo_file)s"
>   
>   msgid "Specify repository distribution in order to create a DEB repository."
>   msgstr ""
> @@ -1202,668 +1374,856 @@ msgstr ""
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "No se ha podido habilitar el repositorio %(repo_id)s."
> +msgstr ""
> +"No se ha podido habilitar el repositorio %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "No se ha podido inhabilitar el repositorio %(repo_id)s."
> +msgstr ""
> +"No se ha podido inhabilitar el repositorio %(repo_id)s."
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "El ID de repositorio de YUM ya existe"
> +msgstr ""
> +"El ID de repositorio de YUM ya existe"
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "El nombre del repositorio de YUM debe ser una serie"
> +msgstr ""
> +"El nombre del repositorio de YUM debe ser una serie"
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "No se pueden listar repositorios. Detalles: '%(err)s'"
> +msgstr ""
> +"No se pueden listar los repositorios. Detalles: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> -msgstr "No se puede recuperar informaci?n del repositorio. Detalles: '%(err)s'"
> +msgstr ""
> +"No se puede recuperar informaci?n de repositorios. Detalles: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "No se puede a?adir el repositorio. Detalles: '%(err)s'"
> +msgstr ""
> +"No se puede a?adir el repositorio. Detalles: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "No se puede eliminar el repositorio. Detalles: '%(err)s'"
> +msgstr ""
> +"No se puede eliminar el repositorio. Detalles: '%(err)s'"
>   
>   #, python-format
>   msgid ""
>   "Configuration items: '%(items)s' are not supported by repository manager"
>   msgstr ""
> +"Elementos de configuraci?n: el gestor de repositorios no admite '%(items)s'"
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"El metaenlace de repositorio debe ser http://, ftp:// o el archivo:// URL."
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"No se puede especificar la lista de duplicados y el metaenlace a la vez. "
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
>   msgstr ""
> +"Se ha de detener la m?quina virtual '%(vm)s' antes de crear una instant?nea de la misma. "
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"No se puede crear la instant?nea '%(name)s' en la m?quina virtual '%(vm)s'. Detalles: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
>   msgstr ""
> +"La instant?nea '%(name)s' no existe en la m?quina virtual '%(vm)s'."
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"No se puede recuperar la instant?nea '%(name)s' en la m?quina virtual '%(vm)s'. Detalles: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
>   msgstr ""
> +"No se pueden listar las instant?neas en la m?quina virtual '%(vm)s'. Detalles: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"No se puede suprimir la instant?nea '%(name)s' en la m?quina virtual '%(vm)s'. Detalles: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"No se puede recuperar la instant?nea actual de la m?quina virtual '%(vm)s'. Detalles: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"No se puede revertir la m?quina virtual '%(vm)s' en la instant?nea '%(name)s'. Detalles: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> +"No se puede crear la instant?nea de la m?quina virtual '%(vm)s' porque contiene un "
> +"disco con el formato '%(format)s'; s?lo se admite 'qcow2'. "
>   
>   msgid "The number of vCPUs is too large for this system."
>   msgstr ""
> +"El n?mero de vCPUs es demasiado grande para este sistema. "
>   
>   msgid "Invalid vCPU/topology combination."
>   msgstr ""
> +"Combinaci?n de vCPU/topolog?a no v?lida."
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
>   msgstr ""
> +"Este host (o la configuraci?n actual) no permite la topolog?a de CPU. "
>   
>   msgid "ERROR CODE"
> -msgstr "C?DIGO DE ERROR"
> +msgstr ""
> +"C?DIGO DE ERROR"
>   
>   msgid "REASON"
> -msgstr "RAZ?N"
> +msgstr ""
> +"RAZ?N"
>   
>   msgid "STACK"
> -msgstr "PILA"
> +msgstr ""
> +"PILA"
>   
>   msgid "Go to Homepage"
> -msgstr "Ir a la p?gina inicial"
> +msgstr ""
> +"Ir a la p?gina inicial"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "Crear una nueva m?quina virtual"
> +msgstr ""
> +"Crear una nueva m?quina virtual"
>   
>   msgid "Virtual Machine Name"
> -msgstr "Nombre de m?quina virtual"
> +msgstr ""
> +"Nombre de m?quina virtual"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
>   msgstr ""
> -"El nombre que se utiliza para identificar la m?quina virtual. Si se omite, "
> -"se elegir? un nombre bas?ndose en la plantilla utilizada."
> +"El nombre que se utiliza para identificar la m?quina virtual. Si se omite, se "
> +"elegir? un nombre bas?ndose en la plantilla utilizada."
>   
>   msgid "Template"
> -msgstr "Plantilla"
> +msgstr ""
> +"Plantilla"
>   
>   msgid "Please create a template first."
> -msgstr "Cree una plantilla primero."
> +msgstr ""
> +"Cree una plantilla primero."
>   
>   msgid "Create a Template"
> -msgstr "Crear una plantilla"
> +msgstr ""
> +"Crear una plantilla"
>   
>   msgid "Please choose a template."
> -msgstr "Elija una plantilla."
> +msgstr ""
> +"Elija una plantilla."
>   
>   msgid "OS"
> -msgstr "SO"
> +msgstr ""
> +"SO"
>   
>   msgid "OS Version"
> -msgstr "Versi?n del SO"
> +msgstr ""
> +"Versi?n del SO"
>   
>   msgid "CPUS"
> -msgstr "CPUS"
> +msgstr ""
> +"CPUS"
>   
>   msgid "Memory"
> -msgstr "Memoria"
> +msgstr ""
> +"Memoria"
>   
>   msgid "Create"
> -msgstr "Crear"
> +msgstr ""
> +"Crear"
>   
>   msgid "Creating..."
>   msgstr ""
> +"Creando..."
>   
>   msgid "Edit Guest"
> -msgstr "Editar invitado"
> +msgstr ""
> +"Editar invitado"
>   
>   msgid "General"
> -msgstr "General"
> +msgstr ""
> +"General"
>   
>   msgid "Storage"
> -msgstr "Almacenamiento"
> +msgstr ""
> +"Almacenamiento"
>   
>   msgid "Interface"
> -msgstr "Interfaz"
> +msgstr ""
> +"Interfaz"
>   
>   msgid "Permission"
> -msgstr "Versi?n"
> +msgstr ""
> +"Permiso"
>   
>   msgid "Host PCI Device"
>   msgstr ""
> +"Dispositivo PCI de host"
>   
>   msgid "Snapshot"
>   msgstr ""
> +"Instant?nea"
>   
>   msgid "Name"
> -msgstr "Nombre"
> +msgstr ""
> +"Nombre"
>   
>   msgid "CPUs"
> -msgstr "CPUs"
> +msgstr ""
> +"CPUs"
>   
>   msgid "Memory (MB)"
> -msgstr "Memoria"
> +msgstr ""
> +"Memoria (MB)"
>   
>   msgid "Icon"
> -msgstr "Icono"
> +msgstr ""
> +"Icono"
>   
>   msgid "Device"
> -msgstr "Nombre de dispositivo"
> +msgstr ""
> +"Dispositivo"
>   
>   msgid "Path"
> -msgstr "V?a de acceso NFS"
> +msgstr ""
> +"V?a de acceso"
>   
>   msgid "Network"
> -msgstr "Red"
> +msgstr ""
> +"Red"
>   
>   msgid "Type"
> -msgstr "Tipo"
> +msgstr ""
> +"Tipo"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"Direcci?n MAC"
>   
>   msgid "Available system users and groups"
>   msgstr ""
> +"Usuarios y grupos del sistema disponibles"
>   
>   msgid "Selected system users and groups"
>   msgstr ""
> +"Usuarios y grupos del sistema seleccionados"
>   
>   msgid "User"
>   msgstr ""
> +"Usuario"
>   
>   msgid "All"
> -msgstr "Todo"
> +msgstr ""
> +"Todo"
>   
>   msgid "To Add"
>   msgstr ""
> +"A a?adir"
>   
>   msgid "Added"
>   msgstr ""
> +"A?adido"
>   
>   msgid "filter"
>   msgstr ""
> +"filtrar"
>   
>   msgid "Product"
>   msgstr ""
> +"Producto"
>   
>   msgid "Vendor"
> -msgstr "Proveedor"
> +msgstr ""
> +"Proveedor"
>   
>   msgid "Created"
>   msgstr ""
> +"Creado"
>   
>   msgid "Save"
> -msgstr "Guardar"
> +msgstr ""
> +"Guardar"
>   
>   msgid "Replace"
> -msgstr "Sustituir"
> +msgstr ""
> +"Sustituir"
>   
>   msgid "Detach"
> -msgstr "Desconectar"
> +msgstr ""
> +"Desconectar"
>   
>   msgid "Cancel"
> -msgstr "Cancelar"
> +msgstr ""
> +"Cancelar"
>   
>   msgid "revert"
>   msgstr ""
> +"revertir"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "A?adir un dispositivo de almacenamiento a VM"
> +msgstr ""
> +"A?adir un dispositivo de almacenamiento a VM"
>   
>   msgid "Device Type"
> -msgstr "Tipo de dispositivo"
> +msgstr ""
> +"Tipo de dispositivo"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> -msgstr "El tipo de dispositivo. Actualmente s?lo est? soportado \"cdrom\"."
> +msgstr ""
> +"El tipo de dispositivo. Actualmente se da soporte a  \"cdrom\" y \"disk\"."
>   
>   msgid "Storage Pool"
> -msgstr "Agrupaci?n de almacenamiento"
> +msgstr ""
> +"Agrupaci?n de almacenamiento"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "La v?a de acceso de la agrupaci?n de almacenamiento debe ser una serie"
> +msgstr ""
> +"Agrupaci?n de almacenamiento con volumen ubicado en"
>   
>   msgid "Storage Volume"
> -msgstr "Nombre de agrupaci?n de almacenamiento"
> +msgstr ""
> +"Volumen de almacenamiento"
>   
>   msgid "Storage volume to be attached"
> -msgstr "El nombre de volumen de almacenamiento debe ser una serie"
> +msgstr ""
> +"Volumen de almacenamiento que se va a adjuntar"
>   
>   msgid "File Path"
> -msgstr "V?a de acceso de archivo"
> +msgstr ""
> +"V?a de acceso de archivo"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "La v?a de acceso del archivo ISO en el servidor para el CDROM."
> +msgstr ""
> +"La v?a de acceso del archivo ISO en el servidor para el CDROM."
>   
>   msgid "Attach"
> -msgstr "Conectar"
> +msgstr ""
> +"Conectar"
>   
>   msgid "Start"
> -msgstr "Iniciar"
> +msgstr ""
> +"Iniciar"
>   
>   msgid "Reset"
> -msgstr "Restablecer"
> +msgstr ""
> +"Restablecer"
>   
>   msgid "Pause"
>   msgstr ""
> +"Poner en pausa"
>   
>   msgid "Resume"
>   msgstr ""
> +"Reanudar"
>   
>   msgid "Power Off"
>   msgstr ""
> +"Apagar"
>   
>   msgid "Actions"
> -msgstr "Acciones"
> +msgstr ""
> +"Acciones"
>   
>   msgid "Connect"
> -msgstr "Conectar"
> +msgstr ""
> +"Conectar"
>   
>   msgid "Clone"
>   msgstr ""
> +"Clonar"
>   
>   msgid "Edit"
> -msgstr "Editar"
> +msgstr ""
> +"Editar"
>   
>   msgid "Shut Down"
> -msgstr "Concluir"
> +msgstr ""
> +"Concluir"
>   
>   msgid "Delete"
> -msgstr "Suprimir"
> +msgstr ""
> +"Suprimir"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr ""
> -"El nombre de usuario o contrase?a que ha especificado es incorrecto. Por "
> -"favor, vuelva a intentarlo."
> +"El nombre de usuario o contrase?a que ha especificado es incorrecto. Por favor, vuelva a intentarlo."
>   
>   msgid "This field is required."
> -msgstr "Este campo es obligatorio."
> +msgstr ""
> +"Este campo es obligatorio."
>   
>   msgid "Log in"
> -msgstr "Iniciar sesi?n"
> +msgstr ""
> +"Iniciar sesi?n"
>   
>   msgid "Logging in..."
> -msgstr "Iniciando sesi?n..."
> +msgstr ""
> +"Iniciando sesi?n..."
>   
>   msgid "Host"
> -msgstr "Host"
> +msgstr ""
> +"Host"
>   
>   msgid "Guests"
> -msgstr "Invitados"
> +msgstr ""
> +"Invitados"
>   
>   msgid "Templates"
> -msgstr "Plantillas"
> +msgstr ""
> +"Plantillas"
>   
>   msgid "Failed to get application configuration"
> -msgstr "No se ha podido obtener la configuraci?n de la aplicaci?n"
> +msgstr ""
> +"No se ha podido obtener la configuraci?n de la aplicaci?n"
>   
>   msgid "This is not a valid Linux path"
> -msgstr "No es una v?a de acceso de Linux v?lida"
> +msgstr ""
> +"No es una v?a de acceso de Linux v?lida"
>   
>   msgid "This is not a valid URL."
> -msgstr "No es un URL v?lido."
> +msgstr ""
> +"No es un URL v?lido."
>   
>   msgid "No such data available."
> -msgstr "No hay datos de ese tipo disponibles."
> +msgstr ""
> +"No hay datos de ese tipo disponibles."
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"No se puede contactar con el sistema host, Verifique que el sistema host "
> -"est? activo y que tiene conectividad de red con ?l. Respuesta de solicitud "
> -"HTTP %1. "
> +"No se puede contactar con el sistema host. Verifique que el sistema host est? activo y que "
> +"tiene conectividad de red con ?l. Respuesta de solicitud HTTP %1. "
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"No se puede leer el archivo. "
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"Error al actualizar el archivo. "
>   
>   msgid "Delete Confirmation"
> -msgstr "Confirmaci?n de supresi?n"
> +msgstr ""
> +"Confirmaci?n de supresi?n"
>   
>   msgid "OK"
> -msgstr "Aceptar"
> +msgstr ""
> +"Aceptar"
>   
>   msgid "Confirm"
> -msgstr "Confirmar"
> +msgstr ""
> +"Confirmar"
>   
>   msgid "Warning"
> -msgstr "Aviso"
> +msgstr ""
> +"Aviso"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"Clonaci?n..."
>   
>   msgid "Loading..."
> -msgstr "Cargando..."
> +msgstr ""
> +"Cargando..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"Se ha producido un error al recuperar la informaci?n del sistema."
>   
>   msgid "Retry"
> -msgstr "Reintentar"
> +msgstr ""
> +"Reintentar"
>   
>   msgid "Detailed message:"
> -msgstr "Mensaje detallado:"
> +msgstr ""
> +"Mensaje detallado:"
>   
>   msgid "No ISO found"
>   msgstr ""
> +"No se ha encontrado ning?n ISO"
>   
>   msgid "This is not a valid ISO file."
> -msgstr "No es un archivo ISO v?lido."
> +msgstr ""
> +"No es un archivo ISO v?lido."
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "Tardar? mucho tiempo. ?Desea continuar?"
> +msgstr ""
> +"Esta operaci?n puede necesitar mucho tiempo. ?Desea continuar?"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
> -msgstr "Esto suprimir? permanentemente la plantilla. ?Desea continuar?"
> +msgstr ""
> +"As? se suprimir? la plantilla de forma permanente. ?Desea continuar?"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
>   msgstr ""
> -"No se puede concluir el sistema ya que hay algunas m?quinas virtuales en "
> -"ejecuci?n."
> +"No se puede concluir el sistema ya que hay algunas m?quinas virtuales en ejecuci?n."
>   
>   msgid "Max:"
> -msgstr "M?x.:"
> +msgstr ""
> +"M?x.:"
>   
>   msgid "Utilization"
> -msgstr "Utilizaci?n"
> +msgstr ""
> +"Utilizaci?n"
>   
>   msgid "Available"
> -msgstr "Disponible"
> +msgstr ""
> +"Disponible"
>   
>   msgid "Read Rate"
> -msgstr "Velocidad de lectura"
> +msgstr ""
> +"Velocidad de lectura"
>   
>   msgid "Write Rate"
> -msgstr "Velocidad de escritura"
> +msgstr ""
> +"Velocidad de escritura"
>   
>   msgid "Received"
> -msgstr "Recibido"
> +msgstr ""
> +"Recibido"
>   
>   msgid "Sent"
> -msgstr "Enviado"
> +msgstr ""
> +"Enviado"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
>   msgstr ""
> -"Concluir o reiniciar el host har? que se pierda el trabajo no guardado. "
> -"?Desea continuar para concluir/reiniciar?"
> +"Concluir o reiniciar el host har? que se pierda el trabajo no guardado. ?Desea continuar "
> +"para concluir/reiniciar?"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"El repositorio se eliminar? de forma permanente y no se puede recuperar. "
> -"?Desea continuar?"
> +"El repositorio se eliminar? de forma permanente y no se puede recuperar. ?Desea "
> +"continuar?"
>   
>   msgid "Repositories"
> -msgstr "Repositorios"
> +msgstr ""
> +"Repositorios"
>   
>   msgid "ID"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Base URL"
> -msgstr "URL base"
> +msgstr ""
> +"URL base"
>   
>   msgid "Is Mirror"
> -msgstr "Es duplicado"
> +msgstr ""
> +"Es duplicado"
>   
>   msgid "URL Args"
> -msgstr "Args de URL"
> +msgstr ""
> +"Args de URL"
>   
>   msgid "Enabled"
> -msgstr "Habilitado"
> +msgstr ""
> +"Habilitado"
>   
>   msgid "GPG Check"
> -msgstr "Comprobaci?n GPG"
> +msgstr ""
> +"Comprobaci?n GPG"
>   
>   msgid "GPG Key"
> -msgstr "Clave GPG"
> +msgstr ""
> +"Clave GPG"
>   
>   msgid "Add"
> -msgstr "A?adir"
> +msgstr ""
> +"A?adir"
>   
>   msgid "Remove"
> -msgstr "Eliminar"
> +msgstr ""
> +"Eliminar"
>   
>   msgid "Enable"
> -msgstr "Habilitar"
> +msgstr ""
> +"Habilitar"
>   
>   msgid "Disable"
> -msgstr "Inhabilitar"
> +msgstr ""
> +"Inhabilitar"
>   
>   msgid "Software Updates"
> -msgstr "Actualizaciones de software"
> +msgstr ""
> +"Actualizaciones de software"
>   
>   msgid "Package Name"
> -msgstr "Nombre de paquete"
> +msgstr ""
> +"Nombre de paquete"
>   
>   msgid "Version"
> -msgstr "Versi?n"
> +msgstr ""
> +"Versi?n"
>   
>   msgid "Architecture"
> -msgstr "Arquitectura"
> +msgstr ""
> +"Arquitectura"
>   
>   msgid "Repository"
> -msgstr "Repositorio"
> +msgstr ""
> +"Repositorio"
>   
>   msgid "Update All"
> -msgstr "Actualizar todo"
> +msgstr ""
> +"Actualizar todo"
>   
>   msgid "Updating..."
> -msgstr "Actualizando..."
> +msgstr ""
> +"Actualizando..."
>   
>   msgid "Failed to retrieve packages update information."
>   msgstr ""
> +"No se ha podido recuperar la informaci?n de actualizaci?n de paquetes. "
>   
>   msgid "Failed to update package(s)."
> -msgstr "No se han podido actualizar paquetes."
> +msgstr ""
> +"No se han podido actualizar paquetes."
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"El informe de depuraci?n se eliminar? permanentemente y no se puede "
> -"recuperar. ?Desea continuar?"
> +"El informe de depuraci?n se eliminar? permanentemente y no se puede recuperar. ?Desea "
> +"continuar?"
>   
>   msgid "Debug Reports"
> -msgstr "Informes de depuraci?n"
> +msgstr ""
> +"Informes de depuraci?n"
>   
>   msgid "Generated Time"
> -msgstr "Tiempo generado"
> +msgstr ""
> +"Tiempo generado"
>   
>   msgid "Generate"
> -msgstr "Generar"
> +msgstr ""
> +"Generar"
>   
>   msgid "Generating..."
> -msgstr "Generando..."
> +msgstr ""
> +"Generando..."
>   
>   msgid "Rename"
> -msgstr "Redenominar"
> +msgstr ""
> +"Redenominar"
>   
>   msgid "Download"
> -msgstr "Descargar"
> +msgstr ""
> +"Descargar"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
>   msgstr ""
> -"El nombre de informe debe contener s?lo letras, d?gitos y/o gui?n ('-')."
> +"El nombre de informe debe contener solamente letras, d?gitos, el car?cter de subrayado ('_') y/o "
> +"de gui?n ('-')."
>   
>   msgid "Pending..."
> -msgstr "Cargando..."
> +msgstr ""
> +"Pendiente..."
>   
>   msgid "Report name is the same as the original one."
>   msgstr ""
> +"El nombre de informe es el mismo que el original. "
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
>   msgstr ""
> -"Esto suprimir? la m?quina virtual y sus discos virtuales. Esta operaci?n no "
> -"puede deshacerse. ?Desea continuar?"
> +"Esto suprimir? la m?quina virtual y sus discos virtuales. Esta operaci?n "
> +"no se puede deshacer. ?Desea continuar?"
>   
>   msgid "Power off Confirmation"
> -msgstr "Confirmaci?n de supresi?n"
> +msgstr ""
> +"Confirmaci?n de apagado"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
>   msgstr ""
> +"Esta acci?n puede producir resultados no deseables, por ejemplo almacenamiento de memoria cach? en disco "
> +"sin vaciar en el invitado. ?Desea continuar?"
>   
>   msgid "Reset Confirmation"
> -msgstr "Confirmaci?n de supresi?n"
> +msgstr ""
> +"Confirmaci?n de restablecimiento"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
>   msgstr ""
> +"Existe un riesgo de p?rdida de datos causado por el restablecimiento sin la conclusi?n del sistema operativo invitado. "
> +"?Desea continuar?"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "Confirmaci?n de supresi?n"
> +msgstr ""
> +"Confirmaci?n de conclusi?n"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
> -msgstr "Esto suprimir? permanentemente la plantilla. ?Desea continuar?"
> +msgstr ""
> +"Tenga en cuenta que el sistema operativo del invitado puede ignorar esta solicitud. ?Desea continuar?"
>   
>   msgid "Virtual Machine delete Confirmation"
>   msgstr ""
> +"Confirmaci?n de supresi?n de la m?quina virtual "
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
>   msgstr ""
> +"Esta m?quina virtual no es persistente. Con la acci?n Apagar se suprimir?. ?Desea 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 ""
> +"Cuando el invitado de destino tiene vol?menes SCSI o iSCSI, se clonar?n en "
> +"la agrupaci?n de almacenamiento predeterminada. Ocurrir? lo mismo cuando la agrupaci?n de destino no "
> +"tenga espacio suficiente para clonar los vol?menes. ?Desea continuar?"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
>   msgstr ""
> -"Este CDROM se desconectar? de forma permanente pero puede volver a "
> -"conectarlo. ?Desea continuar para desconectarlo?"
> +"Este CDROM se desconectar? de forma permanente pero puede volver a conectarlo. ?Desea "
> +"continuar para desconectarlo?"
>   
>   msgid "Attaching..."
> -msgstr "Conectando..."
> +msgstr ""
> +"Conectando..."
>   
>   msgid "Replacing..."
> -msgstr "Sustituyendo..."
> +msgstr ""
> +"Sustituyendo..."
>   
>   msgid "Successfully attached!"
> -msgstr "?Conectado correctamente!"
> +msgstr ""
> +"?Conectado correctamente!"
>   
>   msgid "Successfully replaced!"
> -msgstr "?Sustituido correctamente!"
> +msgstr ""
> +"?Sustituido correctamente!"
>   
>   msgid "Successfully detached!"
> -msgstr "?Desconectado correctamente!"
> +msgstr ""
> +"?Desconectado correctamente!"
>   
>   msgid ""
>   "This disk will be detached permanently and you can re-attach it. Continue to "
>   "detach it?"
>   msgstr ""
> +"Este disco se desconectar? de forma permanente y podr? volver a conectarlo. ?Desea continuar"
> +"desconect?ndolo?"
>   
>   msgid "interface:"
>   msgstr ""
> +"interfaz: "
>   
>   msgid "address:"
>   msgstr ""
> +"direcci?n:"
>   
>   msgid "link_type:"
>   msgstr ""
> +"link_type:"
>   
>   msgid "block:"
>   msgstr ""
> +"bloque:"
>   
>   msgid "drive_type:"
>   msgstr ""
> +"drive_type:"
>   
>   msgid "model:"
>   msgstr ""
> +"modelo:"
>   
>   msgid "Affected devices:"
>   msgstr ""
> +"Dispositivos afectados:"
>   
>   msgid "The VLAN id must be between 1 and 4094."
> -msgstr "El ID de VLAN debe estar entre 1 y 4094."
> +msgstr ""
> +"El ID de VLAN debe estar entre 1 y 4094."
>   
>   msgid "unavailable"
> -msgstr "no disponible"
> +msgstr ""
> +"no disponible"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
>   "depend on this network."
>   msgstr ""
> -"Esta acci?n interrumpir? la conectividad de red para cualquier m?quina "
> -"virtual que dependa de esta red."
> +"Esta acci?n interrumpir? la conectividad de red para cualquier m?quina virtual que "
> +"dependa de esta red."
>   
>   msgid "Create a network"
> -msgstr "Crear una red"
> +msgstr ""
> +"Crear una red"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"Esta agrupaci?n de almacenamiento no es persistente. En lugar de desactivar, "
> -"esta acci?n la suprimir? permanentemente. ?Desea continuar?"
> +"Esta red no es persistente. En lugar de detenerla, esta acci?n "
> +"la suprimir? de forma permanente. ?Desea continuar?"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"Es posible que el c?digo VLAN ponteado no funcione bien si NetworkManager est? habilitado. Deber?a "
> +"considerar la posibilidad de inhabilitarlo. "
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
>   msgstr ""
> -"Esto suprimir? permanentemente la agrupaci?n de almacenamiento. ?Desea "
> -"continuar?"
> +"As? se suprimir? la agrupaci?n de almacenamiento de forma permanente. ?Desea continuar?"
>   
>   msgid "This storage pool is empty."
> -msgstr "Esta agrupaci?n de almacenamiento est? vac?a."
> +msgstr ""
> +"Esta agrupaci?n de almacenamiento est? vac?a."
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
> @@ -1873,471 +2233,609 @@ msgstr ""
>   "de que desea continuar? "
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "Canal de fibra de SCSI"
> +msgstr ""
> +"Canal de fibra de SCSI"
>   
>   msgid "No SCSI adapters found."
> -msgstr "No se han encontrado adaptadores SCSI."
> +msgstr ""
> +"No se han encontrado adaptadores SCSI."
>   
>   msgid "Loading iSCSI targets..."
>   msgstr ""
> +"Se est?n cargando los destinos iSCSI..."
>   
>   msgid "No iSCSI found. Please input one."
>   msgstr ""
> +"No se ha encontrado el iSCSI. Indique uno. "
>   
>   msgid "Failed to load iSCSI targets."
>   msgstr ""
> +"No se han podido cargar los destinos iSCSI. "
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "El nombre de la agrupaci?n de almacenamiento no puede estar en blanco."
> +msgstr ""
> +"El nombre de la agrupaci?n de almacenamiento no puede estar en blanco."
>   
>   msgid "The storage pool path can not be blank."
>   msgstr ""
>   "La v?a de acceso de la agrupaci?n de almacenamiento no puede estar en blanco."
>   
>   msgid "NFS server mount path can not be blank."
> -msgstr "La v?a de acceso de montaje del servidor NFS no puede estar en blanco."
> +msgstr ""
> +"La v?a de acceso de montaje del servidor NFS no puede estar en blanco."
>   
>   msgid "Invalid NFS mount path."
> -msgstr "V?a de acceso de montaje de NFS no v?lida."
> +msgstr ""
> +"V?a de acceso de montaje de NFS no v?lida."
>   
>   msgid "No logical device selected."
> -msgstr "No se ha seleccionado ning?n dispositivo l?gico."
> +msgstr ""
> +"No se ha seleccionado ning?n dispositivo l?gico."
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "El destino iSCSI no puede estar en blanco."
> +msgstr ""
> +"El destino iSCSI no puede estar en blanco."
>   
>   msgid "Server name can not be blank."
> -msgstr "El nombre de servidor no puede estar en blanco."
> +msgstr ""
> +"El nombre de servidor no puede estar en blanco."
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
>   msgstr ""
> +"No es un nombre de servidor v?lido o IP v?lida. Modifique el valor. "
>   
>   msgid "Looking for available partitions ..."
> -msgstr "Buscando particiones disponibles..."
> +msgstr ""
> +"Buscando particiones disponibles..."
>   
>   msgid "No available partitions found."
> -msgstr "No se han encontrado particiones disponibles."
> +msgstr ""
> +"No se han encontrado particiones disponibles."
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"Esta agrupaci?n de almacenamiento no es persistente. En lugar de desactivar, "
> -"esta acci?n la suprimir? permanentemente. ?Desea continuar?"
> +"Esta agrupaci?n de almacenamiento no es persistente. En lugar de desactivar, esta acci?n "
> +"la suprimir? de forma permanente. ?Desea continuar?"
>   
>   msgid "Unable to retrieve partitions information."
> -msgstr "No se puede recuperar informaci?n del repositorio. Detalles: '%(err)s'"
> +msgstr ""
> +"No se puede recuperar la informaci?n de particiones. "
>   
>   msgid "In progress..."
>   msgstr ""
> +"En curso..."
>   
>   msgid "Failed!"
>   msgstr ""
> +"Error"
>   
>   msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
>   msgstr ""
> +"La v?a de acceso de CDROM ha de ser una v?a de acceso local/remota v?lida y no puede dejarse en blanco. "
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "El nombre de la agrupaci?n de almacenamiento no puede estar en blanco."
> +msgstr ""
> +"El volumen o la agrupaci?n de discos no puede estar en blanco."
>   
>   msgid "Peers"
>   msgstr ""
> +"Hom?logos"
>   
>   msgid "Searching"
>   msgstr ""
> +"Buscando"
>   
>   msgid "No peers found."
>   msgstr ""
> +"No se han encontrado hom?logos."
>   
>   msgid "Help"
> -msgstr "Ayuda"
> +msgstr ""
> +"Ayuda"
>   
>   msgid "About"
> -msgstr "Acerca de"
> +msgstr ""
> +"Acerca de"
>   
>   msgid "Log out"
> -msgstr "Finalizar sesi?n"
> +msgstr ""
> +"Finalizar sesi?n"
>   
>   msgid "Version:"
> -msgstr "Versi?n:"
> +msgstr ""
> +"Versi?n:"
>   
>   msgid "Session timeout, please re-login."
>   msgstr ""
> +"Se ha excedido el tiempo de espera de sesi?n; vuelva a iniciar la sesi?n."
>   
>   msgid "User Name"
> -msgstr "Nombre de usuario"
> +msgstr ""
> +"Nombre de usuario"
>   
>   msgid "Password"
> -msgstr "Contrase?a"
> +msgstr ""
> +"Contrase?a"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "Generar un Informe de depuraci?n nuevo"
> +msgstr ""
> +"Generar un Informe de depuraci?n nuevo"
>   
>   msgid "Report Name"
> -msgstr "Nombre de informe"
> +msgstr ""
> +"Nombre de informe"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"El nombre que se utiliza para identificar el informe. Si se omite, se "
> -"elegir? un nombre bas?ndose en la hora actual. El nombre puede contener: "
> -"letras, d?gitos y gui?n (\"-\")."
> +"El nombre que se utiliza para identificar el informe. Si se omite, se elegir? un nombre "
> +"en base a la hora actual. El nombre puede contener: letras, d?gitos, car?cter de subrayado (\"_\") "
> +"y de gui?n (\"-\")."
>   
>   msgid "Rename a Debug Report"
> -msgstr "Generar un Informe de depuraci?n nuevo"
> +msgstr ""
> +"Renombre un informe de depuraci?n"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
>   msgstr ""
> -"El nombre que se utiliza para identificar el informe. Si se omite, se "
> -"elegir? un nombre bas?ndose en la hora actual. El nombre puede contener: "
> -"letras, d?gitos y gui?n (\"-\")."
> +"El nombre utilizado para identificar el informe. El nombre puede contener: letras, d?gitos y "
> +"el car?cter de gui?n (\"-\")."
>   
>   msgid "Submit"
>   msgstr ""
> +"Enviar"
>   
>   msgid "Add a Repository"
> -msgstr "A?adir un repositorio"
> +msgstr ""
> +"A?adir un repositorio"
>   
>   msgid "Identifier"
> -msgstr "Identificador"
> +msgstr ""
> +"Identificador"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "Identificador exclusivo de una sola palabra para el repositorio."
> +msgstr ""
> +"Identificador exclusivo de una sola palabra para el repositorio."
>   
>   msgid "Textual name for the repository."
> -msgstr "Nombre textual para el repositorio."
> +msgstr ""
> +"Nombre textual para el repositorio."
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "Campo obligatorio"
> +msgstr ""
> +"Campo obligatorio"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "URL al repositorio. Los protocolos soportados son http, ftp y archivo."
> +msgstr ""
> +"URL al repositorio. Los protocolos soportados son http, ftp y archivo."
>   
>   msgid "Repository is a mirror"
> -msgstr "El repositorio es un duplicado."
> +msgstr ""
> +"El repositorio es un duplicado"
>   
>   msgid "Distribution"
> -msgstr "Distribuci?n"
> +msgstr ""
> +"Distribuci?n"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "Distribuci?n del repositorio DEB."
> +msgstr ""
> +"Distribuci?n del repositorio DEB."
>   
>   msgid "Components"
> -msgstr "Componentes"
> +msgstr ""
> +"Componentes"
>   
>   msgid "List of components in DEB repository."
> -msgstr "Lista de componentes en el repositorio DEB."
> +msgstr ""
> +"Lista de componentes en el repositorio DEB."
>   
>   msgid "Edit Repository"
> -msgstr "Editar repositorio"
> +msgstr ""
> +"Editar repositorio"
>   
>   msgid "Mirror List URL"
> -msgstr "URL de lista duplicada"
> +msgstr ""
> +"URL de lista duplicada"
>   
>   msgid "Yes"
> -msgstr "S?"
> +msgstr ""
> +"S?"
>   
>   msgid "No"
> -msgstr "No"
> +msgstr ""
> +"No"
>   
>   msgid "Add a Volume to Storage Pool"
>   msgstr ""
> +"A?adir un volumen a la agrupaci?n de almacenamiento"
>   
>   msgid "Fetch from remote URL"
>   msgstr ""
> +"Captar de URL remoto"
>   
>   msgid "Enter the remote URL here."
>   msgstr ""
> +"Escriba el URL remoto aqu?. "
>   
>   msgid "Upload a file"
>   msgstr ""
> +"Cargar un archivo"
>   
>   msgid "Choose the file you want to upload."
>   msgstr ""
> +"Elija el archivo que desee cargar. "
>   
>   msgid "Define a New Storage Pool"
> -msgstr "Definir una agrupaci?n de almacenamiento nueva"
> +msgstr ""
> +"Definir una agrupaci?n de almacenamiento nueva"
>   
>   msgid "Storage Pool Name"
> -msgstr "Nombre de agrupaci?n de almacenamiento"
> +msgstr ""
> +"Nombre de agrupaci?n de almacenamiento"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
>   msgstr ""
> -"El nombre que se utiliza para identificar las agrupaciones de almacenamiento "
> -"y no debe estar vac?o."
> +"El nombre que se utiliza para identificar las agrupaciones de almacenamiento y no debe estar vac?o."
>   
>   msgid "Storage Pool Type"
> -msgstr "Tipo de agrupaci?n de almacenamiento"
> +msgstr ""
> +"Tipo de agrupaci?n de almacenamiento"
>   
>   msgid "Storage Path"
> -msgstr "V?a de acceso de almacenamiento"
> +msgstr ""
> +"V?a de acceso de almacenamiento"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
>   msgstr ""
> -"La v?a de acceso de la agrupaci?n de almacenamiento. Cada agrupaci?n de "
> -"almacenamiento debe tener una v?a de acceso exclusiva."
> +"La v?a de acceso de la agrupaci?n de almacenamiento. Cada agrupaci?n de almacenamiento debe tener una v?a de acceso exclusiva."
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
> -msgstr "Kimchi intentar? crear el directorio cuando no existe en el sistema."
> +msgstr ""
> +"Kimchi intentar? crear el directorio cuando no existe en "
> +"el sistema."
>   
>   msgid "NFS Server IP"
> -msgstr "IP de Servidor NFS"
> +msgstr ""
> +"IP de Servidor NFS"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
>   msgstr ""
> -"IP o nombre de host de servidor NFS. Puede especificarse o elegirse del "
> -"historial."
> +"IP o nombre de host de servidor NFS. Puede especificarse o elegirse del historial."
>   
>   msgid "NFS Path"
> -msgstr "V?a de acceso NFS"
> +msgstr ""
> +"V?a de acceso NFS"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "La v?a de acceso exportada de NFS en el servidor NFS."
> +msgstr ""
> +"La v?a de acceso exportada de NFS en el servidor NFS."
>   
>   msgid "Device path"
> -msgstr "V?a de acceso del dispositivo"
> +msgstr ""
> +"V?a de acceso del dispositivo"
>   
>   msgid "iSCSI Server"
> -msgstr "Servidor iSCSI"
> +msgstr ""
> +"Servidor iSCSI"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
> -msgstr "IP o nombre de host de servidor iSCSI. No debe estar vac?o."
> +msgstr ""
> +"IP o nombre de host de servidor iSCSI. No debe estar vac?o."
>   
>   msgid "Server"
> -msgstr "Servidor"
> +msgstr ""
> +"Servidor"
>   
>   msgid "Port"
> -msgstr "Puerto"
> +msgstr ""
> +"Puerto"
>   
>   msgid "Target"
> -msgstr "Destino"
> +msgstr ""
> +"Destino"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "El destino iSCSI en el servidor iSCSI"
> +msgstr ""
> +"El destino iSCSI en el servidor iSCSI"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "A?adir Autenticaci?n iSCSI"
> +msgstr ""
> +"A?adir Autenticaci?n iSCSI"
>   
>   msgid "iSCSI Authentication"
> -msgstr "Autenticaci?n iSCSI"
> +msgstr ""
> +"Autenticaci?n iSCSI"
>   
>   msgid "SCSI Adapter"
> -msgstr "Adaptador SCSI"
> +msgstr ""
> +"Adaptador SCSI"
>   
>   msgid "Please, wait..."
> -msgstr "Por favor, espere..."
> +msgstr ""
> +"Por favor, espere..."
>   
>   msgid "Add Template"
> -msgstr "A?adir plantilla"
> +msgstr ""
> +"A?adir plantilla"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "?D?nde est? el soporte de origen para esta plantilla?"
> +msgstr ""
> +"?D?nde est? el soporte de origen para esta plantilla?"
>   
>   msgid "Local ISO Image"
> -msgstr "Imagen ISO local"
> +msgstr ""
> +"Imagen ISO local"
>   
>   msgid "Local Image File"
>   msgstr ""
> +"Archivo de imagen local"
>   
>   msgid "Remote ISO Image"
> -msgstr "Imagen ISO remota"
> +msgstr ""
> +"Imagen ISO remota"
>   
>   msgid "Search ISOs"
> -msgstr "Buscar ISOs"
> +msgstr ""
> +"Buscar ISOs"
>   
>   msgid "The following ISOs are available:"
> -msgstr "Las siguientes ISO est?n disponibles:"
> +msgstr ""
> +"Las siguientes ISO est?n disponibles:"
>   
>   msgid "OS: "
> -msgstr "SO: "
> +msgstr ""
> +"SO: "
>   
>   msgid "Version: "
> -msgstr "Versi?n: "
> +msgstr ""
> +"Versi?n: "
>   
>   msgid "Size: "
> -msgstr "Tama?o: "
> +msgstr ""
> +"Tama?o: "
>   
>   msgid "Search more ISOs"
> -msgstr "Buscar m?s ISO"
> +msgstr ""
> +"Buscar m?s ISO"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "Crear plantillas a partir de ISO seleccionadas"
> +msgstr ""
> +"Crear plantillas a partir de ISO seleccionadas"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "Deseo utilizar un archivo ISO espec?fico"
> +msgstr ""
> +"Deseo utilizar un archivo ISO espec?fico"
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "Cargando ISO remotas predeterminadas ..."
> +msgstr ""
> +"Cargando ISO remotas predeterminadas ..."
>   
>   msgid "Arch: "
> -msgstr "Arch: "
> +msgstr ""
> +"Arch: "
>   
>   msgid "I want to use a custom URL"
> -msgstr "Deseo utilizar un URL personalizado"
> +msgstr ""
> +"Deseo utilizar un URL personalizado"
>   
>   msgid "Edit Template"
> -msgstr "Editar plantilla"
> +msgstr ""
> +"Editar plantilla"
>   
>   msgid "Processor"
> -msgstr "Procesador"
> +msgstr ""
> +"Procesador"
>   
>   msgid "CDROM"
> -msgstr "CDROM"
> +msgstr ""
> +"CDROM"
>   
>   msgid "Image File"
>   msgstr ""
> +"Archivo de imagen"
>   
>   msgid "Graphics"
> -msgstr "Gr?ficos"
> +msgstr ""
> +"Gr?ficos"
>   
>   msgid "Disk(GB)"
>   msgstr ""
> +"Disco (GB)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"Formato de disco"
>   
>   msgid "CPU Number"
> -msgstr "N?mero de CPU"
> +msgstr ""
> +"N?mero de CPU"
>   
>   msgid "Manually set CPU topology"
>   msgstr ""
> +"Establezca manualmente la topolog?a de CPU"
>   
>   msgid "Cores"
>   msgstr ""
> +"N?cleos"
>   
>   msgid "Threads"
>   msgstr ""
> +"Hebras"
>   
>   msgid "CPU"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Disk I/O"
> -msgstr "E/S de disco"
> +msgstr ""
> +"E/S de disco"
>   
>   msgid "Network I/O"
> -msgstr "E/S de red"
> +msgstr ""
> +"E/S de red"
>   
>   msgid "Livetile"
> -msgstr "Livetile"
> +msgstr ""
> +"Livetile"
>   
>   msgid "No guests found."
> -msgstr "No se ha encontrado invitados."
> +msgstr ""
> +"No se ha encontrado invitados."
>   
>   msgid "Shut down"
> -msgstr "Concluir"
> +msgstr ""
> +"Concluir"
>   
>   msgid "Restart"
> -msgstr "Reiniciar"
> +msgstr ""
> +"Reiniciar"
>   
>   msgid "Basic Information"
> -msgstr "Informaci?n b?sica"
> +msgstr ""
> +"Informaci?n b?sica"
>   
>   msgid "OS Distro"
> -msgstr "Distro de SO"
> +msgstr ""
> +"Distro de SO"
>   
>   msgid "OS Code Name"
> -msgstr "Nombre de c?digo de SO"
> +msgstr ""
> +"Nombre de c?digo de SO"
>   
>   msgid "CPU(s)"
>   msgstr ""
> +"CPU(s)"
>   
>   msgid "System Statistics"
> -msgstr "Estad?sticas del sistema"
> +msgstr ""
> +"Estad?sticas del sistema"
>   
>   msgid "Update Progress"
> -msgstr "Actualizar progreso"
> +msgstr ""
> +"Actualizar progreso"
>   
>   msgid "Network Name"
> -msgstr "Nombre de red"
> +msgstr ""
> +"Nombre de red"
>   
>   msgid "State"
> -msgstr "Estado"
> +msgstr ""
> +"Estado"
>   
>   msgid "Network Type"
> -msgstr "Tipo de red"
> +msgstr ""
> +"Tipo de red"
>   
>   msgid "Address Space"
> -msgstr "Espacio de direcciones"
> +msgstr ""
> +"Espacio de direcciones"
>   
>   msgid "Name should not contain '/' and '\"'."
>   msgstr ""
> -"Nombre de agrupaci?n de almacenamiento no v?lido. No debe contener '/'."
> +"El nombre no debe contener '/' y '\"'."
>   
>   msgid "Isolated: no external network connection"
> -msgstr "Aislado: no hay conexi?n de red f?sica"
> +msgstr ""
> +"Aislado: no hay conexi?n de red externa"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT: conexi?n de red f?sica saliente solamente"
> +msgstr ""
> +"NAT: conexi?n de red f?sica saliente solamente"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
>   msgstr ""
> -"Puenteado: Las m?quinas virtuales est?n conectadas a la red f?sica "
> -"directamente"
> +"Puenteado: Las m?quinas virtuales est?n conectadas a la red f?sica directamente"
>   
>   msgid "(No interfaces found)"
>   msgstr ""
> +"(No se han encontrado interfaces) "
>   
>   msgid "Destination"
> -msgstr "Destino:"
> +msgstr ""
> +"Destino"
>   
>   msgid "Enable VLAN"
> -msgstr "Habilitar VLAN:"
> +msgstr ""
> +"Habilitar VLAN"
>   
>   msgid "VLAN ID"
> -msgstr "ID de VLAN:"
> +msgstr ""
> +"ID de VLAN"
>   
>   msgid "Stop"
> -msgstr "Detener"
> +msgstr ""
> +"Detener"
>   
>   msgid "%Used"
>   msgstr ""
> +"% Utilizado"
>   
>   msgid "Location"
> -msgstr "Ubicaci?n"
> +msgstr ""
> +"Ubicaci?n"
>   
>   msgid "Capacity"
> -msgstr "Capacidad"
> +msgstr ""
> +"Capacidad"
>   
>   msgid "Allocated"
> -msgstr "Asignado"
> +msgstr ""
> +"Asignado"
>   
>   msgid "active"
> -msgstr "activo"
> +msgstr ""
> +"activo"
>   
>   msgid "inactive"
> -msgstr "inactivo"
> +msgstr ""
> +"inactivo"
>   
>   msgid "Deactivate"
> -msgstr "Desactivar"
> +msgstr ""
> +"Desactivar"
>   
>   msgid "Activate"
> -msgstr "Activar"
> +msgstr ""
> +"Activar"
>   
>   msgid "Add Volume"
>   msgstr ""
> +"A?adir volumen"
>   
>   msgid "Extend"
>   msgstr ""
> +"Ampliar"
>   
>   msgid "Undefine"
> -msgstr "No definir"
> +msgstr ""
> +"No definir"
>   
>   msgid "Format"
> -msgstr "Formato:"
> +msgstr ""
> +"Formato"
>   
>   msgid "Allocation"
> -msgstr "Asignado:"
> +msgstr ""
> +"Asignaci?n"
>   
>   msgid "No templates found."
> -msgstr "No se han encontrado plantillas."
> +msgstr ""
> +"No se han encontrado plantillas."
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/po/fr_FR.po b/po/fr_FR.po
> index 5bfc492..7418acc 100644
> --- a/po/fr_FR.po
> +++ b/po/fr_FR.po
> @@ -1,155 +1,174 @@
>   # English translations for kimchi package.
>   # Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
>   "Project-Id-Version: kimchi 0.1\n"
>   "Report-Msgid-Bugs-To: \n"
>   "POT-Creation-Date: 2015-06-24 09:39-0300\n"
> -"PO-Revision-Date: 2014-08-27 21:30+0000\n"
> -"Last-Translator: BobSynfig\n"
> -"Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/"
> -"fr/)\n"
> -"Language: fr_FR\n"
> +"PO-Revision-Date: 2013-07-11 17:32-0400\n"
> +"Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
> +"Language-Team: English\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
> +"Plural-Forms: nplurals=2; plural=n>1;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
> -msgstr "Param?tre inconnu %(value)s"
> +msgstr ""
> +"Param?tre inconnu %(value)s"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "La suppression n'est pas autoris?e pour %(resource)s"
> +msgstr ""
> +"La suppression n'est pas autoris?e pour %(resource)s"
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "%(resource)s n'impl?mente pas de m?thode de mise ? jour"
> +msgstr ""
> +"%(resource)s n'impl?mente pas la m?thode de mise ? jour"
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "La cr?ation n'est pas autoris?e pour %(resource)s"
> +msgstr ""
> +"La cr?ation n'est pas autoris?e pour %(resource)s"
>   
>   msgid "Unable to parse JSON request"
> -msgstr "Impossible de parser la requ?te JSON"
> +msgstr ""
> +"Impossible d'analyser la demande JSON"
>   
>   msgid "This API only supports JSON"
> -msgstr "Cette API supporte uniquement le JSON"
> +msgstr ""
> +"L'API prend uniquement en charge la notation JSON"
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
>   msgstr ""
> -"Les param?tres ne correspondent pas ? ce qui est requis dans le sch?ma: "
> -"%(err)s"
> +"Les param?tres ne correspondent pas aux exigences du sch?ma : %(err)s"
>   
>   msgid "You don't have permission to perform this operation."
> -msgstr "Vous n'avez pas la permission d'effectuer cette op?ration."
> +msgstr ""
> +"Vous ne disposez pas des droits pour effectuer cette op?ration."
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "Le magasin de donn?es n'est pas initi? dans l'objet mod?le."
> +msgstr ""
> +"Le magasin de donn?es n'est pas initi? dans l'objet de mod?le."
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> -msgstr "Impossible de d?marrer la t?che ? cause de l'erreur: %(err)s"
> +msgstr ""
> +"Impossible de d?marrer la t?che en raison de l'erreur : %(err)s"
>   
>   #, python-format
>   msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
>   msgstr ""
> +"Expiration du d?lai d'attente de %(seconds)s lors de l'ex?cution de la t?che '%(task)s."
>   
>   #, python-format
>   msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
>   msgstr ""
> -"L'authentification a ?chou? pour l'utilisateur '%(username)s'. [Code "
> -"d'Erreur: %(code)s]"
> +"Echec d'authentification pour l'utilisateur '%(username)s'. [Code d'erreur : %(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "Vous n'?tes pas autoris? ? acc?der ? Kimchi"
> +msgstr ""
> +"Vous n'?tes pas autoris? ? acc?der ? Kimchi"
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "Sp?cifiez %(item)s pour vous logguer dans Kimchi"
> +msgstr ""
> +"Indiquez %(item)s pour la connexion ? Kimchi"
>   
>   #, python-format
>   msgid "User %(user_id)s not found with given LDAP settings."
>   msgstr ""
> +"L'utilisateur %(user_id)s est introuvable avec les param?tres LDAP donn?s."
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
>   msgstr ""
> +"Configuration LDAP non valide : %(item)s : %(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
> -msgstr "\"_cap\" sp?cifi?e inconnue"
> +msgstr ""
> +"\"_cap\" inconnu sp?cifi?"
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
> -msgstr "\"_passthrough\" doit ?tre \"true\" ou \"false\""
> +msgstr ""
> +"\"_passthrough\" doit avoir la valeur \"true\" ou \"false\""
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
> -msgstr "\"_passthrough_affected_by\" doit ?tre un nom de p?riph?rique"
> +msgstr ""
> +"\"_passthrough_affected_by\" doit ?tre une cha?ne de nom d'unit?"
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
> -msgstr "Erreur durant l'acc?s aux p?riph?riques de bloc. D?tails: %(err)s"
> +msgstr ""
> +"Erreur lors de l'obtention d'unit?s par bloc. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
>   msgstr ""
> -"Erreur durant l'obtention de l'information sur le p?riph?rique de bloc "
> -"%(device)s."
> +"Erreur lors de l'obtention des informations d'unit? par bloc pour %(device)s."
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "Impossible de trouver le fichier de distro: %(filename)s"
> +msgstr ""
> +"Fichier de distribution introuvable : %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
>   msgstr ""
> -"Impossible de parser le fichier de distro: %(filename)s. Veuillez vous "
> -"assurer qu'il s'agit d'un fichier JSON."
> +"Impossible d'analyser le fichier de distribution : %(filename)s. V?rifiez qu'il s'agit d'un fichier JSON."
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de se connecter ? l'h?te cible iSCSI %(portal)s. D?tails: %(err)s "
> +"Impossible de se connecter ? la cible h?te iSCSI %(portal)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
> -msgstr "Impossible de se connecter ? l'h?te iSCSI %(host)s cible %(target)s"
> +msgstr ""
> +"Impossible de se connecter ? la cible h?te %(host)s iSCSI %(target)s"
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
> -msgstr "Impossible de trouver le fichier ISO %(filename)s"
> +msgstr ""
> +"Fichier ISO introuvable : %(filename)s"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "Le fichier ISO %(filename)s n'est pas bootable"
> +msgstr ""
> +"Le fichier ISO %(filename)s n'est pas amor?able"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
>   msgstr ""
> -"Le fichier ISO %(filename)s n'a pas d'enregistrement de boot El Torito valide"
> +"Le fichier ISO %(filename)s ne poss?de pas d'enregistrement d'amor?age El Torito valide"
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> -msgstr "Entr?e de validation El Torito invalide dans l'ISO %(filename)s"
> +msgstr ""
> +"Entr?e de validation El Torito non valide dans le fichier ISO %(filename)s"
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "Indicateur de boot El Torito invalide dans l'ISO %(filename)s"
> +msgstr ""
> +"Indicateur d'amor?age El Torito non valide dans le fichier ISO %(filename)s"
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
>   msgstr ""
> -"Type de volume inattendu pour le volume primaire dans l'ISO %(filename)s"
> +"Type de volume inattendu pour le volume principal dans le fichier ISO %(filename)s"
>   
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
>   msgstr ""
> -"Mauvais format durant la lecture du descripteur de volume dans l'ISO "
> -"%(filename)s"
> +"Format incorrect lors de la lecture du descripteur de volume dans le fichier ISO %(filename)s"
>   
>   #, python-format
>   msgid ""
> @@ -159,230 +178,265 @@ msgid ""
>   "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
>   "'path_to_iso'.Details: %(err)s"
>   msgstr ""
> -"L'hyperviseur n'a pas la permission d'utiliser cet ISO %(filename)s. "
> -"Veuillez consid?rer de le d?placer sous /var/lib/libvirt,, ou de d?finir la "
> -"permission de recherche sur les listes de contrpole d'acc?s fichier pour "
> -"l'utilisateur '%(user)s' si possible, ou ajouter le '%(user)s' au groupe de "
> -"chemins d'ISO, ou (non recommand?)  'chmod -R o+x 'chemin_vers_iso'.D?tails: "
> -"%(err)s"
> +"L'hyperviseur ne dispose pas des droits pour utiliser ce fichier ISO %(filename)s. "
> +"placez-le dans /var/lib/libvirt, ou d?finissez le droit de recherche sur "
> +"les listes de contr?le d'acc?s d'acc?s aux fichiers pour l'utilisateur '%(user)s', si possible, ou ajoutez "
> +"'%(user)s' au groupe de chemins d'acc?s ISO ou (non recommand?) 'chmod -R o+x "
> +"'path_to_iso'.D?tails : %(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."
> +"Une erreur s'est produite lors de l'application d'une sonde aux informations de syst?me d'exploitation d'image."
>   
>   msgid "No OS information found in given image."
> -msgstr "Aucune information d'OS trouv?e sur l'image donn?e."
> +msgstr ""
> +"Aucune information relative au syst?me d'exploitation n'a ?t? trouv?e dans l'image donn?e."
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
> -msgstr "Impossible de lire le fichier image %(filename)s"
> +msgstr ""
> +"Impossible de lire le fichier image %(filename)s"
>   
>   #, python-format
>   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 entr?e "
> +"valide."
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "La machine virtuelle %(name)s existe d?j?"
> +msgstr ""
> +"La machine virtuelle %(name)s existe d?j?"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "La machine virtuelle %(name)s n'existe pas"
> +msgstr ""
> +"La machine virtuelle nomm?e %(name)s n'existe pas"
>   
>   #, python-format
>   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?j? "
> +"utilis? ou la machine virtuelle n'est pas hors tension."
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
>   msgstr ""
> -"Impossible de r?cup?rer une capture d'?cran pour la machine virtuelle "
> -"stopp?e %(name)s"
> +"Impossible d'extraire la capture d'?cran pour la machine virtuelle arr?t?e %(name)s"
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "L'image ISO distante n'est pas support?e par le serveur."
> +msgstr ""
> +"L'image ISO distante n'est pas prise en charge par ce serveur."
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
> -msgstr "Copie d'?cran non support?e par la machine virtuelle %(name)s"
> +msgstr ""
> +"La capture d'?cran n'est pas prise en charge sur la machine virtuelle %(name)s"
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossible de cr?er la machine virtuelle %(name)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible de cr?er la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de mettre ? jour la machine virtuelle %(name)s. D?tails: %(err)s"
> +"Impossible de mettre ? jour la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de r?cup?rer la machine virtuelle %(name)s. D?tails: %(err)s"
> +"Impossible de r?cup?rer la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
> -msgstr "Impossible de se connecter ? la machine virtuelle ?teinte %(name)s."
> +msgstr ""
> +"Impossible de se connecter ? la machine virtuelle hors tension %(name)s."
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"Le nom de la machine virtuelle doit ?tre une cha?ne sans barre oblique (/)"
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
>   msgstr ""
> +"URI du mod?le non valide %(value)s indiqu? pour la machine virtuelle"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
>   msgstr ""
> +"URI du pool de stockage non valide %(value)s indiqu? pour la machine virtuelle"
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
>   msgstr ""
> +"Graphiques de machine virtuelle pris en charge : Spice ou VNC"
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
> -msgstr "L'adresse d'?coute du graphics doit ?tre IPv4 ou IPv6"
> +msgstr ""
> +"L'adresse des graphiques pour l'?coute doit ?tre IPv4 ou IPv6"
>   
>   msgid "Specify a template to create a virtual machine from"
> -msgstr "Sp?cifier un mod?le ? partir duquel cr?er une machine virtuelle"
> +msgstr ""
> +"Indiquez un mod?le pour cr?er une machine virtuelle depuis"
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossible de d?marrer la machine virtuelle %(name)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible de d?marrer la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de mettre hors tension la machine virtuelle %(name)s. D?tails: "
> -"%(err)s"
> +"Impossible de mettre hors tension la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de supprimer la machine virtuelle %(name)s. D?tails: %(err)s"
> +"Impossible de supprimer la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de r?initrialiser la machine virtuelle %(name)s. D?tails: %(err)s"
> +"Impossible de r?initialiser la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   msgid "User name list must be an array"
>   msgstr ""
> +"La liste de noms d'utilisateur doit ?tre un tableau"
>   
>   msgid "User name must be a string"
> -msgstr "Le nom d'utilisateur doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Le nom d'utilisateur doit ?tre une cha?ne"
>   
>   msgid "Group name list must be an array"
>   msgstr ""
> +"La liste de noms de groupe doit ?tre un tableau"
>   
>   msgid "Group name must be a string"
> -msgstr "Le nom de groupe doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Le nom de groupe doit ?tre une cha?ne"
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "Le(s) utilisateur(s) '%(users)s' n'existe(nt) pas"
> +msgstr ""
> +"Le ou les utilisateurs '%(users)s' n'existent pas"
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "Le(s) groupe(s) '%(groups)s' n'existe(nt) pas"
> +msgstr ""
> +"Le ou les groupes '%(groups)s' n'existent pas"
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossible d'?teindre la machine virtuelle %(name)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible d'arr?ter la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible d'acc?der aux metadata de la machine virtuelle %(name)s. D?tails: "
> -"%(err)s"
> +"Impossible d'obtenir l'acc?s aux m?tadonn?es de la machine virtuelle %(name)s. D?tails : %(err)s"
>   
>   msgid "The guest console password must be a string."
> -msgstr "Le mot de passe de console invit?e doit ?tre une cha?ne de caract?res."
> +msgstr ""
> +"Le mot de passe de la console invit? doit ?tre une cha?ne."
>   
>   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"
> +msgstr ""
> +"La dur?e de vie du mot de passe de console invit? doit ?tre une valeur num?rique."
>   
>   #, python-format
>   msgid "Virtual machine '%(name)s' must be stopped before cloning it."
>   msgstr ""
> +"La machine virtuelle '%(name)s' doit ?tre arr?t?e avant d'?tre clon?e."
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
>   msgstr ""
> +"Espace disque insuffisant pour cloner la machine virtuelle '%(name)s'"
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Impossible de cloner la machine virtuelle '%(name)s'. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"Op?ration non valide pour la machine virtuelle non permanente %(name)s"
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"Impossible d'interrompre la machine virtuelle '%(name)s' car elle n'est pas en cours d'ex?cution."
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Impossible d'interrompre la machine virtuelle '%(name)s'. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"Impossible de reprendre la machine virtuelle '%(name)s' car elle n'est pas interrompue."
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Impossible de reprendre la machine virtuelle '%(name)s'. D?tails : %(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"La m?moire affect?e est sup?rieure ? la quantit? maximale autoris?e sur l'h?te."
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"La machine virtuelle '%(name)s' ne prend pas en charge la mise ? jour dynamique de la m?moire. Mettez ? jour la m?moire avec "
> +"la machine hors ligne pour activer cette fonction."
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"Seule une augmentation de la m?moire est autoris?e sur les machines virtuelles actives"
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"Pour la mise ? jour dynamique de la m?moire, la nouvelle valeur de m?moire doit ?tre ?gale ? l'ancienne valeur plus "
> +"des multiples de 1024 Mib"
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"Il n'existe pas assez d'emplacements disponibles de 1024 Mib sur l'invit?."
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"La version libvirt de l'h?te ne prend pas en charge les unit?s de m?moire. Libvirt doit ?tre >= "
> +"1.2.14"
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"Erreur d'attachement de l'unit? de m?moire. D?tails : %(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
>   msgstr ""
> -"La machine virtuelle %(vmid)s ne peut pas contenir le p?riph?rique h?te "
> -"directement assign? %(dev_name)s."
> +"La machine virtuelle VM %(vmid)s ne contient pas l'unit? h?te affect?e directement %(dev_name)s."
>   
>   #, 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"
> +"L'unit? h?te %(dev_name)s n'est pas autoris?e ? ?tre affect?e directement ? la machine virtuelle."
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -391,342 +445,384 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> +"Aucun groupe IOMMU trouv?. Le passe-syst?me PCI h?te a besoin d'un groupe IOMMU pour "
> +"fonctionner correctement. Activez Intel VT-d ou AMD IOMMU dans votre BIOS, puis v?rifiez "
> +"que le noyau est compil? avec le support IOMMU. Pour l'UC Intel, ajoutez intel_iommu=on "
> +"pour le param?tre de noyau dans /boot/grub2/grub.conf. Pour l'UC AMD, ajoutez iommu=pt "
> +"iommu=1."
>   
>   msgid "\"name\" should be a device name string"
> -msgstr "\"name\" doit ?tre un nom de p?riph?rique"
> +msgstr ""
> +"\"name\" doit ?tre une cha?ne de nom d'unit?"
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"L'unit? %(name)s est probablement utilis?e par l'h?te. Impossible de l'attacher ? "
> +"l'h?te."
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> -msgstr "L'interface %(iface)s n'existe pas dans la machine virtuelle %(name)s"
> +msgstr ""
> +"L'interface %(iface)s n'existe pas sur la machine virtuelle %(name)s"
>   
>   #, python-format
>   msgid ""
>   "Network %(network)s specified for virtual machine %(name)s does not exist"
>   msgstr ""
> -"Le r?seau %(network)s sp?cifi? pour la machine virtuelle %(name)s n'existe "
> -"pas"
> +"Le r?seau %(network)s indiqu? pour la machine virtuelle %(name)s n'existe pas"
>   
>   msgid "Supported virtual machine interfaces type is only network"
>   msgstr ""
> -"Le type d'interface de machine virtuelle support? est r?seau uniquement"
> +"Type d'interface de machine virtuelle pris en charge : r?seau uniquement"
>   
>   msgid "Network name for virtual machine interface must be a string"
>   msgstr ""
> -"Le nom de r?seau pour l'interface de la machine virtuelle doit ?tre une "
> -"cha?ne de caract?res"
> +"Le nom de r?seau pour l'interface de la machine virtuelle doit ?tre une cha?ne"
>   
>   msgid "Invalid network model card specified for virtual machine interface"
>   msgstr ""
> -"Mod?le de carte r?seau sp?cifi? invalide pour l'interface de machine "
> -"virtuelle"
> +"La carte de mod?le r?seau sp?cifi?e pour l'interface de la machine virtuelle n'est pas valide"
>   
>   msgid "Specify type and network to add a new virtual machine interface"
>   msgstr ""
> -"Sp?cifier le type et le r?seau ? ajouter ? la nouvelle interface de la "
> -"machine virtuelle"
> +"Sp?cifiez un type et un r?seau ? ajouter ? une nouvelle interface de machine virtuelle"
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"L'adresse MAC doit ?tre conforme au format FF:FF:FF:FF:FF:FF"
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"L'adresse MAC %(mac)s existe d?j? sur la machine virtuelle %(name)s"
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"Adresse MAC non valide"
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"Impossible de modifier l'adresse MAC d'une machine virtuelle en cours d'ex?cution"
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "Le mod?le %(name)s existe d?j?"
> +msgstr ""
> +"Le mod?le %(name)s existe d?j?"
>   
>   #, python-format
>   msgid ""
>   "Network '%(network)s' specified for template %(template)s does not exist"
>   msgstr ""
> -"Le r?seau '%(network)s' sp?cifi? pour le mod?le %(template)s n'existe pas"
> +"Le r?seau '%(network)s' indiqu? pour le mod?le %(template)s n'existe pas"
>   
>   #, python-format
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
>   msgstr ""
> -"Le pool de stockage sp?cifi? %(pool)s pour le mod?le %(template)s n'existe "
> -"pas"
> +"Le pool de stockage '%(pool)s' indiqu? pour le mod?le %(template)s n'existe pas"
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
>   msgstr ""
> -"Le pool de stockage sp?cifi? %(pool)s pour le mod?le %(template)s n'est pas "
> -"actif"
> +"Le pool de stockage '%(pool)s' indiqu? pour le mod?le %(template)s n'est pas actif"
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "Param?tres  '%(param)s' sp?cifi? invalide pour le CDROM"
> +msgstr ""
> +"Param?tre non valide '%(param)s' sp?cifi? pour le CD-ROM."
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
>   msgstr ""
> -"Le r?seau %(network)s sp?cifi? pour le mod?le %(template)s n'est pas actif"
> +"Le r?seau '%(network)s' indiqu? pour le mod?le %(template)s n'est pas actif"
>   
>   msgid "Template name must be a string"
> -msgstr "Le mod?le de nom doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Le nom du mod?le doit ?tre une cha?ne"
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "Le mod?le d'icone doit ?tre un chemin vers l'image"
> +msgstr ""
> +"L'ic?ne de mod?le doit ?tre un chemin d'acc?s ? l'image"
>   
>   msgid "Template distribution must be a string"
> -msgstr "Le mod?le de distribution doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"La distribution du mod?le doit ?tre une cha?ne"
>   
>   msgid "Template distribution version must be a string"
>   msgstr ""
> -"Le mod?le de version de distribution doit ?tre une cha?ne de caract?res"
> +"La version de distribution du mod?le doit ?tre une cha?ne"
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "Le nombre de CPU doit ?tre un nombre entier sup?rieur ? 0"
> +msgstr ""
> +"Le nombre d'UC doit ?tre un entier sup?rieur ? 0"
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
> -msgstr "La quantit? de m?moire (Mo) doit ?tre un nombre entier sup?rieur ? 512"
> +msgstr ""
> +"La quantit? de m?moire (Mo) doit ?tre un entier sup?rieur ? 512"
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "Le CDROM mod?le doit ?tre un fichier ISO local ou distant"
> +msgstr ""
> +"Le CD-ROM mod?le doit ?tre un fichier ISO local ou distant"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
> -msgstr "URI %(value)s du pool de stockage sp?cifi?e invalide pour le mod?le"
> +msgstr ""
> +"URI du pool de stockage non valide %(value)s indiqu? pour le mod?le"
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
>   msgstr ""
> -"Sp?cifiez une image ISO comme CDROM ou une image de base pour cr?er un mod?le"
> +"Indiquez une image ISO comme CD-ROM ou image de base pour cr?er un mod?le"
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "Tous les r?seaux pour le mod?le doivent ?tre sp?cifi?s dans une liste"
> +msgstr ""
> +"Tous les r?seaux du mod?le doivent ?tre sp?cifi?s dans une liste."
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
>   msgstr ""
> +"Sp?cifiez un volume sur un mod?le lorsque le pool de stockage est iSCSI ou SCSI"
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
> -msgstr "Le volume %(volume)s n'est pas dans le pool de stockage %(pool)s"
> +msgstr ""
> +"Le volume %(volume)s n'est pas dans le pool de stockage %(pool)s"
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> -msgstr "Impossible de cr?er le mod?le ? cause de l'erreur: %(err)s"
> +msgstr ""
> +"Impossible de cr?er le mod?le en raison de l'erreur suivante : %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete template due error: %(err)s"
> -msgstr "Impossilbe de supprimer le mod?le ? cause de l'erreur: %(err)s"
> +msgstr ""
> +"Impossible de supprimer le mod?le en raison de l'erreur suivante : %(err)s"
>   
>   msgid "Disk size must be an integer greater than 1GB."
> -msgstr "La taille de disque doit ?tre un entier sup?rieur ? 1Go."
> +msgstr ""
> +"La taille du disque doit ?tre un entier sup?rieur ? 1 Go."
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "L'image de base de mod?le doit petre un fichier image local valide"
> +msgstr ""
> +"L'image de base du mod?le doit ?tre un fichier image local valide"
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
> -msgstr "Ne peut identifier le format de l'image de base %(path)s"
> +msgstr ""
> +"Impossible d'identifier le format %(path)s de l'image de base"
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
>   msgstr ""
> +"Lors de la sp?cification de la topologie d'UC, les UC virtuelles doivent ?tre un produit des sockets, coeurs et "
> +"unit?s d'ex?cution."
>   
>   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."
> +"Lors de la sp?cification de la topologie d'UC, chaque ?l?ment doit ?tre un entier sup?rieur ? "
> +"z?ro."
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"Format d'image de disque non valide. Formats valides : bochs, cloop, cow, dmg, qcow, "
> +"qcow2, qed, raw, vmdk, vpc."
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "Le pool de stockage %(name)s existe d?j?"
> +msgstr ""
> +"Le pool de stockage %(name)s existe d?j?"
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "Le pool de stockage %(name)s n'existe pas"
> +msgstr ""
> +"Le pool de stockage %(name)s n'existe pas"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
> -msgstr "Sp?cifier %(item)s afin de cr?er le pool de stockage %(name)s"
> +msgstr ""
> +"Sp?cifiez %(item)s pour cr?er le pool de stockage %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "Impossible de supprimer le pool de stockage actif %(name)s"
> +msgstr ""
> +"Impossible de supprimer le pool de stockage actif %(name)s"
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "Impossible de lister les pools de stockage. D?tails: %(err)s"
> +msgstr ""
> +"Impossible de r?pertorier les pools de stockage. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> -msgstr "Impossilble de cr?er le pool de stockage %(name)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible de cr?er le pool de stockage %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"Impossible d'obtenir le nombre de volumes de stockage dans le pool de "
> -"stockage%(name)s. D?tails: %(err)s"
> +"Impossible d'obtenir le nombre de volumes de stockage dans le pool de stockage %(name)s. D?tails : "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
> -msgstr "Impossible d'activer le pool de stockage %(name)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible d'activer le pool de stockage %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de d?sactiver le pool de stockage %(name)s. D?tails: %(err)s"
> +"Impossible de d?sactiver le pool de stockage %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de supprimer le pool de stockage %(name)s. D?tails: %(err)s "
> +"Impossible de supprimer le pool de stockage %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
>   msgstr ""
> -"Impossible de cr?er le Pool NFS du fait que le chemin d'export %(path)s "
> -"pourrait se bloquer durant le montage"
> +"Impossible de cr?er le pool NFS car le chemin d'exportation %(path)s risque de bloquer lors du montage"
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
>   msgstr ""
> -"Impossible de cr?er le pool NFS du fait que le montage du chemin d'export  "
> -"%(path)s  a ?chou?"
> +"Impossible de cr?er le pool NFS car le montage du chemin d'exportation %(path)s a ?chou?"
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "Type de pool de stockage non support?: %(type)s"
> +msgstr ""
> +"Type de pool de stockage non pris en charge : %(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
>   msgstr ""
> +"Erreur d'extraction du fichier XML du pool de stockage dans %(pool)s"
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"Le nom du pool de stockage doit ?tre une cha?ne sans barre oblique (/)"
>   
>   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"
> +"Types de pool de stockage pris en charge : 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"
> +msgstr ""
> +"Le chemin du pool de stockage doit ?tre une cha?ne"
>   
>   msgid "Storage pool host must be a IP or hostname"
> -msgstr "L'h?te du pool de stockage doit ?tre une IP ou un nom d'h?te"
> +msgstr ""
> +"L'h?te du pool de stockage doit ?tre une adresse IP ou un nom d'h?te"
>   
>   msgid "Storage pool device must be the absolute path to the block device"
>   msgstr ""
> +"L'unit? du pool de stockage doit correspondre au chemin d'acc?s absolu ? l'unit? par bloc"
>   
>   msgid "Storage pool devices parameter must be a list"
> -msgstr "Le param?tre de p?riph?rique de pool de stockage doit ?tre une list"
> +msgstr ""
> +"Le param?tre des unit?s du pool de stockage doivent constituer une liste"
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "La cible IQN d'un pool iSCSI doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Le nom qualifi? iSCSI (IQN) cible d'un pool iSCSI doit ?tre une cha?ne"
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
>   msgstr ""
> -"Le port d'un serveur de stockage distant doit ?tre un nombre entier entre 1 "
> -"et 65535"
> +"Le port d'un serveur de stockage distant doit ?tre un entier compris entre 1 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"
> +"Le nom d'utilisateur cible iSCSI doit ?tre une cha?ne"
>   
>   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"
> +msgstr ""
> +"Le mot de passe cible iSCSI doit ?tre une cha?ne"
>   
>   msgid "Specify name and type to create a storage pool"
> -msgstr "Sp?cifier un nom et un type pour cr?er un pool de stockage"
> +msgstr ""
> +"Indiquez le nom et le type pour cr?er un pool de stockage"
>   
>   #, python-format
>   msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
>   msgstr ""
> -"%(disk)s n'est pas un(e) disque/partition valide. N'a pu l'ajouter au pool "
> +"%(disk)s n'est pas un disque/une partition valide. Impossible de l'ajouter au pool "
>   "%(pool)s."
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
> -msgstr "Impossible d'agrandir le pool logique %(pool)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible d'?tendre le pool logique %(pool)s. D?tails : %(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
>   msgstr ""
> -"Les disques en param?tre peuvent seulement ?tre mis ? jour pour un pool de "
> -"stockage logique."
> +"Les disques de param?tre peuvent ?tre mis ? jour uniquement pour le pool de stockage logique."
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "Le nom d'adaptateur de l'h?te SCSI doit ?tre une chapine de caract?res"
> +msgstr ""
> +"Le nom de l'adaptateur h?te SCSI doit ?tre une cha?ne."
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
> -msgstr "Le pool de stockage kimchi_isos est r?serv? ? un usage interne"
> +msgstr ""
> +"Le pool de stockage kimchi_isos est r?serv? ? un usage interne"
>   
>   #, python-format
>   msgid ""
>   "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"Impossible d'activer le pool de stockage NFS%(name)s. Le serveur NFS "
> -"%(server)s n'est pas joignable."
> +"Impossible d'activer le pool de stockage NFS %(name)s. Le serveur NFS %(server)s est "
> +"inaccessible."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"Impossible de d?sactiver le pool de stockage NFS%(name)s. Le serveur NFS "
> -"%(server)s n'est pas joignable."
> +"Impossible de d?sactiver le pool de stockage NFS %(name)s. Le serveur NFS %(server)s est "
> +"inaccessible."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate pool %(name)s as it is associated with some templates"
>   msgstr ""
> -"Impossible de d?sactiver le pool %(name)s du fait qu'il est associ? ? des "
> -"mod?les"
> +"Impossible de d?sactiver le pool %(name)s car il est associ? ? plusieurs mod?les"
>   
>   #, python-format
>   msgid "Unable to delete pool %(name)s as it is associated with some templates"
>   msgstr ""
> -"Impossible de supprimer le pool %(name)s du fait qu'il est associ? ? des "
> -"mod?les"
> +"Impossible de supprimer le pool %(name)s car il est associ? ? plusieurs mod?les"
>   
>   #, python-format
>   msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
>   msgstr ""
> -"Un groupe de volume appel? '%(name)s' existe d?j?. Veuillez choisir un autre "
> -"nom pour cr?er le pool logique."
> +"Un groupe de volumes nomm? '%(name)s' existe d?j?. Choisissez un autre nom "
> +"pour cr?er le pool logique."
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
>   msgstr ""
> -"Impossible de mettre ? jour la base de donn?es avec les informations de scan "
> -"profond ? cause de l'erreur: %(err)s"
> +"Impossible de mettre ? jour la base de donn?es avec des informations d'analyse approfondie en raison de l'erreur suivante : %(err)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "Le volume de stockage %(name)s existe d?j?"
> +msgstr ""
> +"Le volume de stockage %(name)s existe d?j?"
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
> @@ -738,86 +834,92 @@ 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"
> -msgstr "Sp?cifier %(item)s afin de cr?er le volume de stockage %(volume)s"
> +msgstr ""
> +"Sp?cifiez %(item)s afin de cr?er le volume de stockage %(volume)s"
>   
>   #, 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 "
> -"%(pool)s n'est pas actif"
> +"Impossible de r?pertorier les volumes de stockage car le pool de stockage %(pool)s n'est pas actif"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"Impossible de cr?er le volume de stockage %(name)s dans le pool de stockage "
> -"%(pool)s. D?tails: %(err)s"
> +"Impossible de cr?er le volume de stockage %(name)s dans le pool de stockage %(pool)s. D?tails : "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de lister les volumes de stockage dans le pool de stockage "
> -"%(pool)s. D?tails: %(err)s"
> +"Impossible de r?pertorier les volumes de stockage dans le pool de stockage %(pool)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
> -msgstr "Impossible de wiper les volumes de stockage %(name)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible d'effacer les volumes de stockage %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de supprimer le volume de stockage %(name)s. D?tails: %(err)s "
> +"Impossible de supprimer le volume de stockage %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de redimensionner le volume de stockage %(name)s. D?tails: %(err)s"
> +"Impossible de redimensionner le volume de stockage %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
>   msgstr ""
> -"Le type de stockage %(type)s ne supporte pas ni la cr?ation ni la "
> -"suppression de volume"
> +"Le type de stockage %(type)s ne prend pas en charge la cr?ation et la suppression de volume"
>   
>   msgid "Storage volume name must be a string"
> -msgstr "Le nom de volume de stockage doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Le nom du volume de stockage doit ?tre une cha?ne"
>   
>   msgid "Storage volume allocation must be an integer number"
> -msgstr "L'allocation de volume de stockage doit ?tre une nombre entier"
> +msgstr ""
> +"L'allocation de volume de stockage doit ?tre un nombre entier"
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"Format du volume de stockage non pris en charge. Formats valides : bochs, cloop, cow, dmg, "
> +"qcow, qcow2, qed, raw, vmdk, vpc."
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "Le volume de stockage requiert un nom de volume"
> +msgstr ""
> +"Le volume de stockage requiert un nom de volume"
>   
>   #, python-format
>   msgid ""
>   "Unable to update database with storage volume information due error: %(err)s"
>   msgstr ""
> -"Impossible de mettre ? jour la base de donn?es avec les informations du "
> -"volume de stockage ? cause de l'erreur: %(err)s"
> +"Impossible de mettre ? jour la base de donn?es avec des informations de volume de stockage en raison de l'erreur suivante : %(err)s"
>   
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
> -msgstr "Seulement un seul des param?tre %(param)s peut ?tre sp?cifi?"
> +msgstr ""
> +"Un seul param?tre %(param)s peut ?tre sp?cifi?"
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
> -msgstr "La cr?ation de volume avec %(param)s n'est pas support?e"
> +msgstr ""
> +"La cr?ation d'un volume ? partir de %(param)s n'est pas prise en charge"
>   
>   msgid "Storage volume capacity must be an integer number."
> -msgstr "La capacit? du volume de stockage doit ?tre un nombre entier."
> +msgstr ""
> +"La capacit? du volume de stockage doit correspondre ? un nombre entier."
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
>   msgstr ""
> @@ -825,1542 +927,1915 @@ msgstr ""
>   
>   #, 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."
> +msgstr ""
> +"Impossible d'acc?der au fichier %(url)s. V?rifiez ce dernier."
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossible de cloner le volume de stockage '%(name)s' dans le pool '%(pool)s'. D?tails : "
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"Sp?cifiez les donn?es de bloc et leur taille pour t?l?charger un fichier."
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"Pour t?l?charger un volume de stockage, sp?cifiez le param?tre 'upload'."
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"Impossible de t?l?charger les donn?es de bloc car elles ne correspondent pas ? la taille de bloc."
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"Le volume de stockage %(vol)s n'est pas soumis ? un processus de t?l?chargement."
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"Le t?l?chargement des donn?es de bloc d?passe la taille du volume de stockage."
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"Impossible de t?l?charger les donn?es de bloc dans le volume de stockage. D?tails : %(err)s."
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "L'interface %(name)s n'existe pas"
> +msgstr ""
> +"L'interface %(name)s n'existe pas"
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "Le r?seau %(name)s existe d?j?"
> +msgstr ""
> +"Le r?seau %(name)s existe d?j?"
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "Le r?seau %(name)s n'existe pas"
> +msgstr ""
> +"Le r?seau %(name)s n'existe pas"
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
>   msgstr ""
> -"Le sous-r?seau  %(subnet)s sp?cifi? pour le r?seau %(network)s n'est pas "
> -"valide"
> +"Le sous-r?seau %(subnet)s indiqu? pour le r?seau %(network)s n'est pas valide."
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
> -msgstr "Sp?cifier une interface r?seau pour cr?er le r?seau bridge %(name)s"
> +msgstr ""
> +"Indiquez une interface r?seau pour cr?er le r?seau rout? %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "Impossible de supprimer le r?seau actif %(name)s"
> +msgstr ""
> +"Impossible de supprimer le r?seau actif %(name)s"
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
>   msgstr ""
> -"L'interface %(iface)s sp?cifi?e pour le r?seau %(network)s est d?j? utilis?e"
> +"L'interface %(iface)s indiqu?e pour le r?seau %(network)s est d?j? utilis?e"
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
> -msgstr "L'interface doit ?tre un p?riph?rique NIC vide, bonding ou bridg?."
> +msgstr ""
> +"L'interface doit ?tre un contr?leur NIC nu, une unit? de pontage ou de liaison."
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "Impossible de cr?er le r?seau %(name)s. D?tails: %(err)s"
> +msgstr ""
> +"Impossible de cr?er le r?seau %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "Impossible de trouver une adresse IP libre pour le r?seau '%(name)s'"
> +msgstr ""
> +"Impossible de trouver une adresse IP disponible pour le r?seau '%(name)s'"
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
> -msgstr "L'interface %(iface)s existe d?j?"
> +msgstr ""
> +"L'interface %(iface)s existe d?j?."
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"Le nom du r?seau doit ?tre une cha?ne sans barre oblique (/) ni guillemet (\")"
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "Les types de r?seaux support?s sont isolated, NAT et bridge"
> +msgstr ""
> +"Les types de r?seau pris en charge sont isol?, NAT et rout?"
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
>   msgstr ""
> -"Le sous-r?seau doit ?tre une chaine de caract?res avec une adresse IP et un "
> -"pr?fixe ou un masque de r?seau"
> +"Le sous-r?seau du r?seau doit ?tre une cha?ne avec adresse IP et pr?fixe ou masque de r?seau"
>   
>   msgid "Network interface must be a string"
> -msgstr "L'interface de r?seau doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"L'interface r?seau doit ?tre une cha?ne"
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "L'ID de VLAN du r?seau doit ?tre un nombre entier entre 1 et 4094"
> +msgstr ""
> +"L'ID r?seau local virtuel du r?seau doit ?tre un entier compris entre 1 et 4094"
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "Sp?cifiez un nom et un type pour cr?er un r?seau"
> +msgstr ""
> +"Indiquez le nom et le type pour cr?er un r?seau"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
>   "and/or templates linked to this network."
>   msgstr ""
> -"Impossible de supprimer le r?seau %(name)s. Il y a des machines virtuelles "
> -"%(vms)s et/ou des mod?les li?s ? ce r?seau. "
> +"Impossible de supprimer le r?seau %(name)s. Il existe plusieurs machines virtuelles %(vms)s "
> +"et/ou mod?les li?s ? ce r?seau."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate network %(name)s. There are some virtual machines "
>   "%(vms)s and/or templates linked to this network."
>   msgstr ""
> -"Impossible de d?sactiver r?seau %(name)s. Il y a des machines virtuelles"
> -"%(vms)s et/ou des mod?les li?s ? ce r?seau. "
> +"Impossible de d?sactiver le r?seau %(name)s. Il existe plusieurs machines virtuelles "
> +"%(vms)s et/ou mod?les li?s ? ce r?seau."
>   
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
>   msgstr ""
> -"Le p?riph?rique bridge %(name)s ne peut ?tre le p?riph?rique tronc d'un VLAN."
> +"L'unit? de pontage %(name)s ne peut pas ?tre l'unit? de liaison d'un r?seau local virtuel."
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "?chec durant l'activation de l'interface %(iface)s: %(err)s."
> +msgstr ""
> +"Echec de l'activation de l'interface %(iface)s: %(err)s."
>   
>   #, python-format
>   msgid ""
>   "Failed to activate interface %(iface)s. Please check the physical link "
>   "status."
>   msgstr ""
> -"?chec durant l'activation de l'interface %(iface)s. Veuillez v?rifier le "
> -"statut du lien physique."
> +"Echec de l'activation de l'interface %(iface)s. V?rifiez l'?tat de "
> +"la liaison physique."
>   
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
>   msgstr ""
> +"Echec du d?marrage du r?seau %(name)s. D?tails : %(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "Le rapport de d?boggage %(name)s n'existe pas"
> +msgstr ""
> +"Le rapport de d?bogage %(name)s n'existe pas"
>   
>   msgid "Debug report tool not found in system"
> -msgstr "L'outil de rapport de d?boggage n'a pas ?t? trouv? dans le syst?me"
> +msgstr ""
> +"Outil de g?n?ration de rapports de d?bogage introuvable sur le syst?me"
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
>   msgstr ""
> -"Impossible de cr?er le rapport de d?boggage %(name)s. D?tails: %(err)s."
> +"Impossible de cr?er le rapport de d?bogage %(name)s. D?tails : %(err)s."
>   
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
>   msgstr ""
> -"Impossible de trouver un rapport de d?boggage avec le nom fourni %(name)s"
> +"Aucun rapport de d?bogage nomm? %(name)s n'a ?t? trouv?"
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossible de g?n?rer le rapport de d?boggage %(name)s. D?tails: %(err)s"
> +"Impossible de g?n?rer le rapport de d?bogage %(name)s. D?tails : %(err)s"
>   
>   msgid "You should give a name for the debug report file."
> -msgstr "Vous devriez donner un nom au fichier de rapport de d?boggage."
> +msgstr ""
> +"Vous devez indiquer un nom pour le fichier du rapport de d?bogage."
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> -"Le nom du rapport de d?boggage doit ?tre une cha?ne de caract?res. Seulement "
> -"les lettres, chiffres, blanc soulign? ('_') et tirets ('-') sont accept?s."
> +"Le nom du rapport de d?bogage doit ?tre une cha?ne. Seuls des lettres, chiffres, trait de soulignement ('_') "
> +"et tiret ('-') sont autoris?s."
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
>   msgstr ""
> -"Le rapport de d?boggage avec le nom sp?cifi? \"%(name)s\" existe d?j?. "
> -"Veuillez en utiliser un autre."
> +"Le rapport de d?bogage nomm? \"%(name)s\" existe d?j?. Veuillez utiliser "
> +"un autre nom."
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "Le server de stockage %(server)s n'?tait pas utilis? par Kimchi"
> +msgstr ""
> +"Le serveur de stockage %(server)s n'a pas ?t? utilis? par Kimchi"
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "La distro '%(name)s' n'existe pas"
> +msgstr ""
> +"La distribution '%(name)s' n'existe pas"
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "La partition %(name)s n'existe pas sur cet h?te"
> +msgstr ""
> +"La partition %(name)s n'existe pas sur l'h?te"
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
>   msgstr ""
> -"Impossible d'?teindre la machine h?te car des machines virtuelles en sont "
> -"cours d'ex?cution"
> +"Impossible d'arr?ter la machine h?te car des machines virtuelles sont en cours d'ex?cution"
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
>   msgstr ""
> -"Impossible de red?marrer la machine h?te car des machines virtuelles en sont "
> -"cours d'ex?cution"
> +"Impossible de r?amorcer la machine h?te car des machines virtuelles sont en cours d'ex?cution"
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "P?riph?rique de noeud '%(name)s' non trouv?"
> +msgstr ""
> +"Unit? de noeud '%(name)s' introuvable"
>   
>   msgid "Conflicting flag filters specified."
> -msgstr "Filtres incompatibles sp?cifi?s."
> +msgstr ""
> +"Filtres d'indicateur en conflit sp?cifi?s."
>   
>   msgid "No packages marked for update"
> -msgstr "Aucun paquet marqu? pour mise ? jour"
> +msgstr ""
> +"Aucun module marqu? pour mise ? jour"
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "Le paquet %(name)s n'est pas marqu? pour mise ? jour"
> +msgstr ""
> +"Le module %(name)s n'est pas marqu? pour mise ? jour."
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
>   msgstr ""
> -"Erreur durant la r?cup?ration des paquets marqu?s pour la mise? jour. "
> -"D?tails: %(err)s"
> +"Erreur lors de l'obtention des modules marqu?s pour mise ? jour. D?tails : %(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "Il n'y a pas de gestionnaire de paquets compatible avec ce syst?me."
> +msgstr ""
> +"Aucun gestionnaire de modules compatible pour ce syst?me."
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "Impossible de trouver %(item)s dans le magasin de donn?es"
> +msgstr ""
> +"%(item)s introuvable dans le magasin de donn?es"
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "URI %(uri)s invalide"
> +msgstr ""
> +"URI %(uri)s non valide"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
>   msgstr ""
> -"Timeout durant l'ex?cution de la commande '%(cmd)s' apr?s %(seconds)s "
> -"secondes"
> +"D?passement de d?lai lors de l'ex?cution de la commande '%(cmd)s' apr?s %(seconds)s secondes"
>   
>   msgid "Unable to choose a virtual machine name"
> -msgstr "Impossible de s?lectionner un nom de machine virtuelle"
> +msgstr ""
> +"Impossible de s?lectionner un nom de machine virtuelle"
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"Valeur de donn?es '%(value)s' non valide"
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"Unit? de donn?es '%(unit)s' non valide"
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "Type de stockage invalide. Les Types support?s sont: 'cdrom', 'disk'"
> +msgstr ""
> +"Type de stockage non valide. Types pris en charge : 'cdrom', 'disk'"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
>   msgstr ""
> +"Le chemin '%(value)s' n'est pas un chemin local/distant valide pour l'unit?"
>   
>   msgid "Only CDROM path can be update."
> -msgstr "Seulement le chemin d'un CDROM peut ?tre modifi?."
> +msgstr ""
> +"Seul le chemin du CD-ROM peut ?tre mis ? jour."
>   
>   #, python-format
>   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"
> +"L'unit? de stockage %(dev_name)s n'existe pas sur la machine virtuelle "
> +"%(vm_name)s"
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
>   msgstr ""
> -"Erreur durant la cr?ation du nouveau p?riph?rique de stockage: %(error)s"
> +"Erreur lors de la cr?ation de l'unit? de stockage : %(error)s"
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
> -msgstr "Erreur durant la mise ? jour du p?riph?rique de stockage: %(error)s"
> +msgstr ""
> +"Erreur lors de la mise ? jour de l'unit? de stockage : %(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
> -msgstr "Erreur durant le retrait du p?riph?rique de stockage: %(error)s"
> +msgstr ""
> +"Erreur lors du retrait de l'unit? de stockage : %(error)s"
>   
>   msgid "Do not support IDE device hot plug"
> -msgstr "Ne pas supporter le branchement ? chaud de p?riph?rique IDE"
> +msgstr ""
> +"Pas de prise en charge du remplacement ? chaud d'unit? IDE"
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
>   msgstr ""
> -"Sp?cifier le type et le chemin ou le type et le pool/volume pour ajouter un "
> -"nouveau disque de machine virtuelle."
> +"Sp?cifiez un type et un chemin pour ajouter un nouveau disque "
> +"de machine virtuelle"
>   
>   msgid "Specify path to update virtual machine disk"
> -msgstr "Sp?cifier un chemin pour mettre ? jour le disque de machine virtuelle"
> +msgstr ""
> +"Indiquez le chemin pour mettre ? jour le disque de machine virtuelle"
>   
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
>   msgstr ""
> -"La limitation de %(limit)s p?riph?riques a ?t? atteinte pour le contr?leur "
> -"de type %(type)s "
> +"Le type de contr?leur %(type)s a atteint sa limite de %(limit)s unit?s"
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
>   msgstr ""
> +"Impossible d'extraire les informations de chemin d'acc?s au disque pour le pool/volume donn? : %(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
>   msgstr ""
> +"Le volume est d?j? utilis? par une autre machine virtuelle."
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
>   msgstr ""
> -"Seul un chemin ou pool/volume peut ?tre sp?cifi? pour ajouter un nouveau "
> -"disque de machine virtuelle"
> +"Soit le chemin, soit le pool/volume peut ?tre sp?cifi? pour ajouter un nouveau disque "
> +"de machine virtuelle"
>   
>   #, python-format
>   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 choisi avec le format %(format)s n'est pas adapt? au type de stockage "
> +"%(type)s"
>   
>   msgid "YUM Repository ID must be one word only string."
>   msgstr ""
> -"L'ID du d?p?t YUM doit ?tre une cha?ne de caract?res ne comportant qu'un "
> -"seul mot"
> +"L'ID r?f?rentiel YUM doit ?tre une cha?ne d'un seul mot."
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "L'URL du d?p?t doit ?tre une URL en http://, ftp:// ou file://."
> +msgstr ""
> +"L'URL du r?f?rentiel doit ?tre de type http://, ftp:// ou file://."
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
>   "repository type."
>   msgstr ""
> -"La configuration du d?p?t est un dictionaire avec des valeurs sp?cifiques en "
> -"accord avec le type de d?p?t."
> +"La configuration de r?f?rentiel est un dictionnaire avec des valeurs sp?cifiques en fonction "
> +"du type de r?f?rentiel."
>   
>   msgid "Distribution to DEB repository must be a string"
>   msgstr ""
> -"La distribution dans le nom de d?p?t DEB doit ?tre une cha?ne de caract?res"
> +"La distribution sur le r?f?rentiel DEB doit ?tre une cha?ne"
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "Les composants dans le d?p?t DEB doivent ?tre list?s dans un tableau"
> +msgstr ""
> +"Les composants du r?f?rentiel DEB doivent ?tre r?pertori?s dans un tableau"
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "Les composants dans le d?p?t DEB doivent ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Les composants du r?f?rentiel DEB doivent ?tre une cha?ne"
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"La liste miroir du r?f?rentiel doit ?tre une cha?ne"
>   
>   msgid "YUM Repository name must be string."
> -msgstr "Le nom du d?p?t YUM doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Le nom de r?f?rentiel YUM doit ?tre une cha?ne."
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "La v?rification GPG doit ?tre une valeur bool?enne."
> +msgstr ""
> +"Le contr?le GPG doit ?tre une valeur bool?enne."
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
> -msgstr "La cl? GPG doit ?tre une URL pointant vers un fichier ASCII non arm?."
> +msgstr ""
> +"La cl? GPG doit ?tre une URL pointant sur le fichier ASCII."
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "Ne peut mettre ? jour le d?p?t %(repo_id)s."
> +msgstr ""
> +"Impossible de mettre ? jour le r?f?rentiel %(repo_id)s."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "Le d?p?t %(repo_id)s n'existe pas."
> +msgstr ""
> +"Le r?f?rentiel %(repo_id)s n'existe pas."
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"Indiquez l'URL de base du r?f?rentiel, la liste miroir ou le lien afin de cr?er ou "
> +"mettre ? jour un r?f?rentiel YUM."
>   
>   msgid "Repository management tool was not recognized for your system."
> -msgstr "L'outil de gestion de d?p?t n'a pas ?t? reconnu pour votre syst?me."
> +msgstr ""
> +"L'outil de gestion de r?f?rentiel n'a pas ?t? reconnu pour votre syst?me."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "Le d?p?t %(repo_id)s est d?j? activ?."
> +msgstr ""
> +"Le r?f?rentiel %(repo_id)s est d?j? activ?."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "Le d?p?t %(repo_id)s est d?j? d?sactiv?."
> +msgstr ""
> +"Le r?f?rentiel %(repo_id)s est d?j? d?sactiv?."
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "Ne peut supprimer le d?p?t %(repo_id)s. "
> +msgstr ""
> +"Impossible de supprimer le r?f?rentiel %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
> -msgstr "Ne peut ?crire le fichier de configuration du d?p?t %(repo_file)s"
> +msgstr ""
> +"Impossible d'?crire dans le fichier de configuration du r?f?rentiel %(repo_file)s"
>   
>   msgid "Specify repository distribution in order to create a DEB repository."
> -msgstr "Sp?cifier la distribution du d?p?t afin de cr?er un d?p?t DEB."
> +msgstr ""
> +"Indiquez une distribution de r?f?rentiel pour cr?er un r?f?rentiel DEB."
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "Ne peut activer le d?p?t %(repo_id)s."
> +msgstr ""
> +"Impossible d'activer le r?f?rentiel %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "Ne peut d?sactiver le d?p?t %(repo_id)s."
> +msgstr ""
> +"Impossible de d?sactiver le r?f?rentiel %(repo_id)s."
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "L'ID du d?p?t YUM existe d?j?"
> +msgstr ""
> +"L'ID r?f?rentiel YUM existe d?j?"
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "Le nom du d?p?t YUM doit ?tre une cha?ne de caract?res"
> +msgstr ""
> +"Le nom de r?f?rentiel YUM doit ?tre une cha?ne."
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "Impossible de lister les d?p?ts. D?tails: '%(err)s'"
> +msgstr ""
> +"Impossible de r?pertorier les r?f?rentiels. D?tails : '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> -msgstr "Impossible de r?cup?rer les informations du d?p?t. D?tails: '%(err)s'"
> +msgstr ""
> +"Impossible d'extraire les informations relatives au r?f?rentiel. D?tails : '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "Impossible d'ajouter un d?p?t. D?tails: '%(err)s'"
> +msgstr ""
> +"Impossible d'ajouter le r?f?rentiel. D?tails : '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "Impossible de supprimer un d?p?t. D?tails: '%(err)s'"
> +msgstr ""
> +"Impossible de supprimer le r?f?rentiel. 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"
> +"Les ?l?ments de configuration '%(items)s' ne sont pas pris en charge par le gestionnaire de r?f?rentiel"
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"Le lien du r?f?rentiel doit ?tre une URL http://, ftp:// ou file://."
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"Impossible de sp?cifier ? la fois la liste miroir et le lien."
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
>   msgstr ""
> +"La machine virtuelle '%(vm)s' doit ?tre arr?t?e avant la cr?ation d'une image instantan?e de celle-ci."
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossible de cr?er l'image instantan?e '%(name)s' sur la machine virtuelle '%(vm)s'. D?tails : "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
>   msgstr ""
> +"L'image instantan?e '%(name)s' n'existe pas sur la machine virtuelle '%(vm)s'."
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossible d'extraire l'image instantan?e '%(name)s' sur la machine virtuelle '%(vm)s'. D?tails : "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
>   msgstr ""
> +"Impossible de r?pertorier les images instantan?es sur la machine virtuelle '%(vm)s'. D?tails : %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossible de supprimer l'image instantan?e '%(name)s' sur la machine virtuelle '%(vm)s'. D?tails : "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossible d'extraire l'image instantan?e en cours de la machine virtuelle '%(vm)s'. D?tails : "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossible de r?tablir la machine virtuelle '%(vm)s' ? l'image instantan?e '%(name)s'. D?tails : "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> +"Impossible de cr?er l'image instantan?e de la machine virtuelle '%(vm)s' car elle contient un "
> +"disque au format '%(format)s' ; seul 'qcow2' est pris en charge."
>   
>   msgid "The number of vCPUs is too large for this system."
>   msgstr ""
> +"Le nombre d'UC virtuelles est trop ?lev? pour ce syst?me."
>   
>   msgid "Invalid vCPU/topology combination."
>   msgstr ""
> +"Combinaison d'UC virtuelle/topologie non valide."
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
>   msgstr ""
> +"Cet h?te (ou configuration actuelle) n'autorise pas la topologie d'UC."
>   
>   msgid "ERROR CODE"
> -msgstr "ERROR CODE"
> +msgstr ""
> +"CODE D'ERREUR"
>   
>   msgid "REASON"
> -msgstr "REASON"
> +msgstr ""
> +"MOTIF"
>   
>   msgid "STACK"
> -msgstr "STACK"
> +msgstr ""
> +"PILE"
>   
>   msgid "Go to Homepage"
> -msgstr "Aller ? la page d'accueil"
> +msgstr ""
> +"Acc?der ? la page d'accueil"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "Cr?er une nouvelle Machine Virtuelle"
> +msgstr ""
> +"Cr?er une machine virtuelle"
>   
>   msgid "Virtual Machine Name"
> -msgstr "Nom de Machine Virtuelle"
> +msgstr ""
> +"Nom de la machine virtuelle"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
>   msgstr ""
> -"Le nm est utilis? pour identifier une machine virtuelle. Si omis, un nom "
> -"sera choisi en se basant sur le mod?le utilis?."
> +"Nom utilis? pour identifier la machine virtuelle. S'il est omis, un nom sera "
> +"choisi en fonction du mod?le utilis?."
>   
>   msgid "Template"
> -msgstr "Mod?le"
> +msgstr ""
> +"Mod?le"
>   
>   msgid "Please create a template first."
> -msgstr "Veuillez d'abord cr?er un mod?le."
> +msgstr ""
> +"Commencez par cr?er un mod?le."
>   
>   msgid "Create a Template"
> -msgstr "Cr?er un mod?le"
> +msgstr ""
> +"Cr?er un mod?le"
>   
>   msgid "Please choose a template."
> -msgstr "Veuillez choisir un mod?le"
> +msgstr ""
> +"S?lectionnez un mod?le."
>   
>   msgid "OS"
> -msgstr "OS"
> +msgstr ""
> +"SE"
>   
>   msgid "OS Version"
> -msgstr "Version de l'OS"
> +msgstr ""
> +"Version SE"
>   
>   msgid "CPUS"
> -msgstr "CPUS"
> +msgstr ""
> +"Unit?s centrales"
>   
>   msgid "Memory"
> -msgstr "M?moire"
> +msgstr ""
> +"M?moire"
>   
>   msgid "Create"
> -msgstr "Cr?er"
> +msgstr ""
> +"Cr?er"
>   
>   msgid "Creating..."
> -msgstr "Cr?ation en cours..."
> +msgstr ""
> +"Cr?ation..."
>   
>   msgid "Edit Guest"
> -msgstr "?diter l'Invit?"
> +msgstr ""
> +"Editer l'invit?"
>   
>   msgid "General"
> -msgstr "G?n?ral"
> +msgstr ""
> +"G?n?ral"
>   
>   msgid "Storage"
> -msgstr "Stockage"
> +msgstr ""
> +"Stockage"
>   
>   msgid "Interface"
> -msgstr "Interface"
> +msgstr ""
> +"Interface"
>   
>   msgid "Permission"
> -msgstr "Permission"
> +msgstr ""
> +"Droits"
>   
>   msgid "Host PCI Device"
> -msgstr "P?riph?rique PCI H?te"
> +msgstr ""
> +"Unit? PCI h?te"
>   
>   msgid "Snapshot"
>   msgstr ""
> +"Image instantan?e"
>   
>   msgid "Name"
> -msgstr "Nom"
> +msgstr ""
> +"Nom"
>   
>   msgid "CPUs"
> -msgstr "CPUs"
> +msgstr ""
> +"UC"
>   
>   msgid "Memory (MB)"
> -msgstr "M?moire (Mo)"
> +msgstr ""
> +"M?moire (Mo)"
>   
>   msgid "Icon"
> -msgstr "Icone"
> +msgstr ""
> +"Ic?ne"
>   
>   msgid "Device"
> -msgstr "P?riph?rique"
> +msgstr ""
> +"Unit?"
>   
>   msgid "Path"
> -msgstr "Chemin"
> +msgstr ""
> +"Chemin"
>   
>   msgid "Network"
> -msgstr "R?seau"
> +msgstr ""
> +"R?seau"
>   
>   msgid "Type"
> -msgstr "Type"
> +msgstr ""
> +"Type"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"Adresse MAC"
>   
>   msgid "Available system users and groups"
> -msgstr "Utilisateurs et groupes syst?mes disponibles"
> +msgstr ""
> +"Groupes et utilisateurs syst?me disponibles"
>   
>   msgid "Selected system users and groups"
> -msgstr "Utilisateurs et groupes syst?mes s?lectionn?s"
> +msgstr ""
> +"Groupes et utilisateurs syst?me s?lectionn?s"
>   
>   msgid "User"
>   msgstr ""
> +"Utilisateur"
>   
>   msgid "All"
> -msgstr "Tous"
> +msgstr ""
> +"Tout"
>   
>   msgid "To Add"
> -msgstr "? Ajouter"
> +msgstr ""
> +"A ajouter"
>   
>   msgid "Added"
> -msgstr "Ajouter"
> +msgstr ""
> +"Ajout?"
>   
>   msgid "filter"
> -msgstr "Filtre"
> +msgstr ""
> +"filtre"
>   
>   msgid "Product"
> -msgstr "Produit"
> +msgstr ""
> +"Produit"
>   
>   msgid "Vendor"
> -msgstr "Vendeur"
> +msgstr ""
> +"Fournisseur"
>   
>   msgid "Created"
>   msgstr ""
> +"Cr??"
>   
>   msgid "Save"
> -msgstr "Enregistrer"
> +msgstr ""
> +"Sauvegarder"
>   
>   msgid "Replace"
> -msgstr "Remplacer"
> +msgstr ""
> +"Remplacer"
>   
>   msgid "Detach"
> -msgstr "D?tacher"
> +msgstr ""
> +"D?tacher"
>   
>   msgid "Cancel"
> -msgstr "Annuler"
> +msgstr ""
> +"Annuler"
>   
>   msgid "revert"
>   msgstr ""
> +"r?tablir"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "Ajouter un P?riph?rique de Stockage ? la VM"
> +msgstr ""
> +"Ajouter une unit? de stockage ? la machine virtuelle"
>   
>   msgid "Device Type"
> -msgstr "Type de P?riph?rique"
> +msgstr ""
> +"Type d'unit?"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
>   msgstr ""
> -"Le type de p?riph?rique. Actuellement, \"cdrom\" et \"disk\" sont support?s."
> +"Type d'unit?. Actuellement, \"cdrom\" et \"disk\" seulement sont pris en charge."
>   
>   msgid "Storage Pool"
> -msgstr "Pool de Stockage"
> +msgstr ""
> +"Pool de stockage"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "Pool de Stockage dans lequel le volume est situ?"
> +msgstr ""
> +"Pool de stockage dans lequel le volume est situ?"
>   
>   msgid "Storage Volume"
> -msgstr "Volume de Stockage"
> +msgstr ""
> +"Volume de stockage"
>   
>   msgid "Storage volume to be attached"
> -msgstr "Le volume de stockage ? attacher"
> +msgstr ""
> +"Volume de stockage ? attacher"
>   
>   msgid "File Path"
> -msgstr "Chemin de Fichier"
> +msgstr ""
> +"Chemin d'acc?s au fichier"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "Le chemin de fichier ISO sur le serveur comme CDROM."
> +msgstr ""
> +"Chemin d'acc?s au fichier ISO sur le serveur pour le CD-ROM."
>   
>   msgid "Attach"
> -msgstr "Attacher"
> +msgstr ""
> +"Attacher"
>   
>   msgid "Start"
> -msgstr "D?marrer"
> +msgstr ""
> +"D?marrer"
>   
>   msgid "Reset"
> -msgstr "R?initialiser"
> +msgstr ""
> +"R?initialiser"
>   
>   msgid "Pause"
>   msgstr ""
> +"Pause"
>   
>   msgid "Resume"
>   msgstr ""
> +"Reprendre"
>   
>   msgid "Power Off"
> -msgstr "Mettre hors tension"
> +msgstr ""
> +"Mettre hors tension"
>   
>   msgid "Actions"
> -msgstr "Actions"
> +msgstr ""
> +"Actions"
>   
>   msgid "Connect"
> -msgstr "Connecter"
> +msgstr ""
> +"Se connecter"
>   
>   msgid "Clone"
> -msgstr "Cloner"
> +msgstr ""
> +"Cloner"
>   
>   msgid "Edit"
> -msgstr "?diter"
> +msgstr ""
> +"Editer"
>   
>   msgid "Shut Down"
> -msgstr "?teindre"
> +msgstr ""
> +"Arr?ter"
>   
>   msgid "Delete"
> -msgstr "Supprimer"
> +msgstr ""
> +"Supprimer"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr ""
> -"Le nom d'utilisateur ou le mot de passe que vous avez entr? est incorrect. "
> -"Veuillez essayer ? nouveau."
> +"Le nom d'utilisateur ou le mot de passe entr? est incorrect. Veuillez recommencer."
>   
>   msgid "This field is required."
> -msgstr "Ce champ est requis."
> +msgstr ""
> +"Cette zone est obligatoire."
>   
>   msgid "Log in"
> -msgstr "Se connecter"
> +msgstr ""
> +"Connexion"
>   
>   msgid "Logging in..."
> -msgstr "En cours de connexion..."
> +msgstr ""
> +"Connexion en cours..."
>   
>   msgid "Host"
> -msgstr "H?te"
> +msgstr ""
> +"H?te"
>   
>   msgid "Guests"
> -msgstr "Invit?s"
> +msgstr ""
> +"Invit?s"
>   
>   msgid "Templates"
> -msgstr "Mod?les"
> +msgstr ""
> +"Mod?les"
>   
>   msgid "Failed to get application configuration"
> -msgstr "?chec lors de l'obtention de la configuration de l'application"
> +msgstr ""
> +"Echec d'obtention de la configuration d'application"
>   
>   msgid "This is not a valid Linux path"
> -msgstr "Ce n'est pas un chemin Linux valide"
> +msgstr ""
> +"Ce chemin Linux n'est pas valide"
>   
>   msgid "This is not a valid URL."
> -msgstr "Ce n'est pas une URL valide."
> +msgstr ""
> +"Cette URL n'est pas valide."
>   
>   msgid "No such data available."
> -msgstr "De telles donn?es ne sont pas disponibles."
> +msgstr ""
> +"Aucune donn?e de ce type disponible."
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"Ne peut contacter le syst?me h?te. V?rifiez que le syst?me h?te est allum? "
> -"et que vous avez une connectivit? r?seau avec lui. R?ponse de requ?te HTTP "
> -"%1."
> +"Impossible de contacter le syst?me h?te. V?rifiez que celui-ci est d?marr? et "
> +"que vous disposez d'une connectivit? au syst?me h?te. R?ponse ? la demande HTTP %1. "
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"Impossible de lire le fichier."
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"Erreur lors du t?l?chargement du fichier."
>   
>   msgid "Delete Confirmation"
> -msgstr "Confirmation de Suppression"
> +msgstr ""
> +"Confirmation de suppression"
>   
>   msgid "OK"
> -msgstr "OK"
> +msgstr ""
> +"OK"
>   
>   msgid "Confirm"
> -msgstr "Confirmer"
> +msgstr ""
> +"Confirmer"
>   
>   msgid "Warning"
> -msgstr "Avertissement"
> +msgstr ""
> +"Avertissement"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"Clonage en cours..."
>   
>   msgid "Loading..."
> -msgstr "Chargement en cours..."
> +msgstr ""
> +"Chargement en cours..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"Une erreur s'est produite lors de l'extraction des informations syst?me."
>   
>   msgid "Retry"
> -msgstr "Essayer ? nouveau"
> +msgstr ""
> +"Nouvelle tentative"
>   
>   msgid "Detailed message:"
> -msgstr "Message d?taill?:"
> +msgstr ""
> +"Message d?taill? :"
>   
>   msgid "No ISO found"
> -msgstr "Aucune ISO d?tect?e"
> +msgstr ""
> +"ISO introuvable"
>   
>   msgid "This is not a valid ISO file."
> -msgstr "Ce n'est pas un fichier ISO valide."
> +msgstr ""
> +"Ceci n'est pas un fichier ISO valide."
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "Cela va prendre un long moment. Voulez-vous continuer ?"
> +msgstr ""
> +"Cette op?ration peut ?tre assez longue. Voulez-vous continuer ?"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
>   msgstr ""
> -"Cela va supprimer de mani?re permanent le mod?le. Souhaites-vous continuer ?"
> +"Le mod?le va ?tre supprim? d?finitivement. Voulez-vous continuer ?"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
>   msgstr ""
> -"Impossible d'?teindre le syst?me du fait que certaines machines virtuelles "
> -"sont lanc?es !"
> +"Impossible d'arr?ter le syst?me car certaines machines virtuelles sont en cours d'ex?cution !"
>   
>   msgid "Max:"
> -msgstr "Max:"
> +msgstr ""
> +"Maximum :"
>   
>   msgid "Utilization"
> -msgstr "Utilisation"
> +msgstr ""
> +"Utilisation"
>   
>   msgid "Available"
> -msgstr "Disponible"
> +msgstr ""
> +"Disponible"
>   
>   msgid "Read Rate"
> -msgstr "Taux en Lecture"
> +msgstr ""
> +"Vitesse de lecture"
>   
>   msgid "Write Rate"
> -msgstr "Taux en ?criture"
> +msgstr ""
> +"Vitesse d'?criture"
>   
>   msgid "Received"
> -msgstr "Re?u"
> +msgstr ""
> +"Re?u"
>   
>   msgid "Sent"
> -msgstr "Envoy?"
> +msgstr ""
> +"Envoy?"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
>   msgstr ""
> -"?teindre ou red?marrer l'h?te causera la perte de tout travail non "
> -"enregistr?. Continuer ? ?teindre/red?marrer ?"
> +"L'arr?t ou le red?marrage de l'h?te va entra?ner la perte du travail non sauvegard?. Poursuivre "
> +"l'arr?t/le red?marrage ?"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"Le d?p?t sera retir? de fa?on permanente et ne pourra ?tre r?tabli. Voulez-"
> -"vous continuer ?"
> +"Le r?f?rentiel va ?tre retir? d?finitivement et ne pourra pas ?tre r?cup?r?. Voulez-vous "
> +"continuer ?"
>   
>   msgid "Repositories"
> -msgstr "D?p?ts"
> +msgstr ""
> +"R?f?rentiels"
>   
>   msgid "ID"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Base URL"
> -msgstr "URL de base"
> +msgstr ""
> +"URL de base"
>   
>   msgid "Is Mirror"
> -msgstr "Est un miroir"
> +msgstr ""
> +"Est un miroir"
>   
>   msgid "URL Args"
> -msgstr "Arguments d'URL"
> +msgstr ""
> +"Arguments d'URL"
>   
>   msgid "Enabled"
> -msgstr "Activ?"
> +msgstr ""
> +"Activ?"
>   
>   msgid "GPG Check"
> -msgstr "V?rification GPG"
> +msgstr ""
> +"Contr?le GPG"
>   
>   msgid "GPG Key"
> -msgstr "Cl? GPG"
> +msgstr ""
> +"Cl? GPG"
>   
>   msgid "Add"
> -msgstr "Ajouter"
> +msgstr ""
> +"Ajouter"
>   
>   msgid "Remove"
> -msgstr "Retirer"
> +msgstr ""
> +"Retirer"
>   
>   msgid "Enable"
> -msgstr "Activer"
> +msgstr ""
> +"Activer"
>   
>   msgid "Disable"
> -msgstr "D?sactiver"
> +msgstr ""
> +"D?sactiver"
>   
>   msgid "Software Updates"
> -msgstr "Mises ? jour Logiciel"
> +msgstr ""
> +"Mises ? jour logicielles"
>   
>   msgid "Package Name"
> -msgstr "Nom de paquet"
> +msgstr ""
> +"Nom du module"
>   
>   msgid "Version"
> -msgstr "Version"
> +msgstr ""
> +"Version"
>   
>   msgid "Architecture"
> -msgstr "Architecture"
> +msgstr ""
> +"Architecture"
>   
>   msgid "Repository"
> -msgstr "D?p?t"
> +msgstr ""
> +"R?f?rentiel"
>   
>   msgid "Update All"
> -msgstr "Tout mettre ? jour"
> +msgstr ""
> +"Tout mettre ? jour"
>   
>   msgid "Updating..."
> -msgstr "En cours de mise ? jour..."
> +msgstr ""
> +"Mise ? jour en cours..."
>   
>   msgid "Failed to retrieve packages update information."
> -msgstr "?chec de r?cup?ration des informations de mise-?-jour des paquets."
> +msgstr ""
> +"Echec de l'extraction des informations de mise ? jour des modules."
>   
>   msgid "Failed to update package(s)."
> -msgstr "?chec durant la mise ? jour du/des paquet(s)"
> +msgstr ""
> +"Echec de mise ? jour du ou des modules."
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"Le rapport de d?boggage sera enlev? de fa?on permanente et ne pourra ?tre "
> -"r?tabli. Voulez-vous continuer ?"
> +"Le rapport de d?bogage va ?tre retir? d?finitivement et ne pourra pas ?tre r?cup?r?. Voulez-vous "
> +"continuer ?"
>   
>   msgid "Debug Reports"
> -msgstr "Rapports de D?boggage"
> +msgstr ""
> +"Rapports de d?bogage"
>   
>   msgid "Generated Time"
> -msgstr "Horodatage de g?n?ration"
> +msgstr ""
> +"Heure g?n?ration"
>   
>   msgid "Generate"
> -msgstr "G?n?rer"
> +msgstr ""
> +"G?n?rer"
>   
>   msgid "Generating..."
> -msgstr "En cours de g?n?ration..."
> +msgstr ""
> +"G?n?ration en cours..."
>   
>   msgid "Rename"
> -msgstr "Renommer"
> +msgstr ""
> +"Renommer"
>   
>   msgid "Download"
> -msgstr "T?l?charger"
> +msgstr ""
> +"T?l?charger"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
>   msgstr ""
> -"Le nom de rapport devrait contenir uniquement des lettres, nombres, "
> -"soulignement ('_') et/ou tiret ('-')."
> +"Le nom du rapport doit comporter uniquement des lettres, chiffres, trait de soulignement ('_') et/ou "
> +"tiret ('-')."
>   
>   msgid "Pending..."
> -msgstr "En attente..."
> +msgstr ""
> +"En attente..."
>   
>   msgid "Report name is the same as the original one."
> -msgstr "Le nom du rapport est le m?me que celui d'origine."
> +msgstr ""
> +"Le nom du rapport est identique au nom d'origine."
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
>   msgstr ""
> -"Cela va supprimer la machine virtuelle et tous ses disques virtuels. Cette "
> -"op?ration est irr?versible. Voulez-vous continuer ?"
> +"Cette op?ration va supprimer la machine virtuelle et ses disques virtuels. L'op?ration "
> +"ne peut pas ?tre annul?e. Voulez-vous continuer ?"
>   
>   msgid "Power off Confirmation"
> -msgstr "Confirmation de mise hors tension"
> +msgstr ""
> +"Confirmation de mise hors tension"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
>   msgstr ""
> -"Cette action pourrait produire des r?sultats ind?sirables, par exemple un "
> -"cache disque non flush? dans l'invit?. Voulez-vous continuer ?"
> +"Cette action peut produire des r?sultats ind?sirables, par exemple, "
> +"un cache de disque non vid? sur le syst?me invit?. Voulez-vous continuer ?"
>   
>   msgid "Reset Confirmation"
> -msgstr "Confirmation de R?initialisation"
> +msgstr ""
> +"Confirmation de r?initialisation"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
>   msgstr ""
> -"Il y a un risque de perte de donn?es caus?es par une r?initialisation sans "
> -"extinction de l'OS invit?. Voulez-vous continuer ?"
> +"Risque de perte de donn?es suite ? une r?initialisation sans arr?t du syst?me d'exploitation invit?. "
> +"Voulez-vous continuer ?"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "Confirmation d'Extinction"
> +msgstr ""
> +"Confirmation d'arr?t"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
>   msgstr ""
> -"Noter que l'OS invit? pourrait ignorer cette requ?te. Voulez-vous continuer ?"
> +"Notez que le syst?me d'exploitation invit? peut ignorer cette demande. Voulez-vous continuer ?"
>   
>   msgid "Virtual Machine delete Confirmation"
> -msgstr "Confirmation de suppression de Machine Virtuelle"
> +msgstr ""
> +"Confirmation de la suppression de la machine virtuelle"
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
>   msgstr ""
> +"Cette machine virtuelle n'est pas permanente. Elle sera supprim?e lors de la mise hors tension. Continuer ?"
>   
>   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 ""
> +"Lorsque l'invit? cible comporte des volumes SCSI ou iSCSI, ces derniers sont clon?s dans le "
> +"pool de stockage par d?faut. Cela se produit ?galement lorsque le pool cible ne comporte "
> +"pas suffisamment d'espace pour cloner les volumes. Voulez-vous continuer ?"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
>   msgstr ""
> -"Ce CDROM sera d?tach? de fa?on permanente et vous pourrez le r?-attacher. "
> -"Continuer le d?tachement ?"
> +"Ce CD-ROM va ?tre d?tach? d?finitivement et ne pourra pas ?tre attach? ? nouveau. Continuer "
> +"le d?tachement ?"
>   
>   msgid "Attaching..."
> -msgstr "En cours d'attachement..."
> +msgstr ""
> +"Attachement en cours..."
>   
>   msgid "Replacing..."
> -msgstr "En cours de Remplacement..."
> +msgstr ""
> +"Remplacement en cours..."
>   
>   msgid "Successfully attached!"
> -msgstr "Attach? avec succ?s !"
> +msgstr ""
> +"L'attachement a abouti."
>   
>   msgid "Successfully replaced!"
> -msgstr "Remplac? avec succ?s !"
> +msgstr ""
> +"Le remplacement a abouti."
>   
>   msgid "Successfully detached!"
> -msgstr "D?tach? avec Succ?s !"
> +msgstr ""
> +"Le d?tachement a abouti."
>   
>   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 va ?tre d?tach? d?finitivement et ne pourra pas ?tre attach? ? nouveau. Continuer "
> +"le d?tachement ?"
>   
>   msgid "interface:"
>   msgstr ""
> +"interface :"
>   
>   msgid "address:"
>   msgstr ""
> +"adresse :"
>   
>   msgid "link_type:"
>   msgstr ""
> +"type_lien :"
>   
>   msgid "block:"
>   msgstr ""
> +"bloc :"
>   
>   msgid "drive_type:"
>   msgstr ""
> +"type_lecteur :"
>   
>   msgid "model:"
>   msgstr ""
> +"mod?le :"
>   
>   msgid "Affected devices:"
>   msgstr ""
> +"Unit?s concern?es :"
>   
>   msgid "The VLAN id must be between 1 and 4094."
> -msgstr "L'id du VLAN doit ?tre entre 1 et 4094."
> +msgstr ""
> +"L'ID r?seau local virtuel doit ?tre compris entre 1 et 4094."
>   
>   msgid "unavailable"
> -msgstr "non disponible"
> +msgstr ""
> +"non disponible"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
>   "depend on this network."
>   msgstr ""
> -"Cette action va interrompre la connectivit? r?seau pour tout machine "
> -"virtuelle qui d?pend de ce r?seau."
> +"Cette action va interrompre la connectivit? r?seau pour toute machine virtuelle "
> +"d?pendant de ce r?seau."
>   
>   msgid "Create a network"
> -msgstr "Cr?er un r?seau"
> +msgstr ""
> +"Cr?er un r?seau"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"Ce r?seau n'est pas persistant. Au lieu de s'arr?ter, cette actionva le "
> -"suppromer de mani?re permanente. Voulez-vous continuer ?"
> +"Il ne s'agit pas d'un r?seau permanent. Au lieu de l'arr?ter, cette action va "
> +"le supprimer de mani?re permanente. Voulez-vous continuer ?"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"Il se peut que l'?tiquette R?seau local virtuel local rout? ne fonctionne pas correctement lorsque NetworkManager est activ?. Vous "
> +"devez envisager de d?sactiver ce dernier."
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
>   msgstr ""
> -"Cela va effacer de mani?re permanente le pool de stockage. Voulez-vous "
> -"continuer ?"
> +"Le pool de stockage va ?tre supprim? d?finitivement. Voulez-vous continuer ?"
>   
>   msgid "This storage pool is empty."
> -msgstr "Ce pool de stockage est vide."
> +msgstr ""
> +"Ce pool de stockage est vide."
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
>   "to continue? "
>   msgstr ""
> -"Cela va formater votre disque et vous allez perdre toutes les donn?es qui "
> -"s'y trouvent, ?tes-vous s?r de continuer ?"
> +"Le disque va ?tre format? et vous perdrez toutes les donn?es qu'il contient. Voulez-vous vraiment "
> +"continuer ? "
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "Canal Fibre SCSI"
> +msgstr ""
> +"Fibre Channel SCSI"
>   
>   msgid "No SCSI adapters found."
> -msgstr "Aucun adaptateur SCSI trouv?."
> +msgstr ""
> +"Aucun adaptateur SCSI trouv?."
>   
>   msgid "Loading iSCSI targets..."
>   msgstr ""
> +"Chargement des cibles iSCSI..."
>   
>   msgid "No iSCSI found. Please input one."
>   msgstr ""
> +"iSCSI introuvable. Sp?cifiez-le."
>   
>   msgid "Failed to load iSCSI targets."
>   msgstr ""
> +"Echec du chargement des cibles iSCSI."
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "Le nom de pool de stockage ne peut ?tre vierge."
> +msgstr ""
> +"Le nom du pool de stockage ne peut pas ?tre vide."
>   
>   msgid "The storage pool path can not be blank."
> -msgstr "Le chemin de pool de stockage ne peut ?tre vierge."
> +msgstr ""
> +"Le chemin du pool de stockage ne peut pas ?tre vide."
>   
>   msgid "NFS server mount path can not be blank."
> -msgstr "Le chemin de montage du serveur NFS ne peut ?tre vierge."
> +msgstr ""
> +"Le chemin de montage du serveur NFS ne peut pas ?tre vide."
>   
>   msgid "Invalid NFS mount path."
> -msgstr "Chemin de montage NFS invalide."
> +msgstr ""
> +"Chemin de montage NFS non valide."
>   
>   msgid "No logical device selected."
> -msgstr "Aucun p?riph?rique logique s?lectionn?."
> +msgstr ""
> +"Aucune unit? logique s?lectionn?e."
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "La cible iSCSI ne peut ?tre vierge."
> +msgstr ""
> +"La cible iSCSI ne peut pas ?tre vide."
>   
>   msgid "Server name can not be blank."
> -msgstr "Le nom de serveur ne peut ?tre vierge."
> +msgstr ""
> +"Le nom du serveur ne peut pas ?tre vide."
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
>   msgstr ""
> +"Il ne s'agit pas d'un nom de serveur ou d'une adresse IP valide. Modifiez cet ?l?ment."
>   
>   msgid "Looking for available partitions ..."
> -msgstr "En cours de recherche de partitions disponibles..."
> +msgstr ""
> +"Recherche des partitions disponibles..."
>   
>   msgid "No available partitions found."
> -msgstr "Aucune partition disponible trouv?e."
> +msgstr ""
> +"Aucune partition disponible trouv?e."
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"Le pool de stockage n'est pas persistent. Au lieu de le d?sactiver, cette "
> -"action va le supprimer de mani?re permanente. Voulez-vous continuer ?"
> +"Il ne s'agit pas d'un pool de stockage permanent. Au lieu de le d?sactiver, cette action va "
> +"le supprimer de mani?re permanente. Voulez-vous continuer ?"
>   
>   msgid "Unable to retrieve partitions information."
> -msgstr "Impossible de r?cup?rer les informations des partitions."
> +msgstr ""
> +"Impossible d'extraire les informations relatives aux partitions. "
>   
>   msgid "In progress..."
> -msgstr "En cours..."
> +msgstr ""
> +"En cours..."
>   
>   msgid "Failed!"
> -msgstr "?chec!"
> +msgstr ""
> +"Echec !"
>   
>   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."
> +"Le chemin de CD-ROM doit ?tre un chemin local/distant et ne peut pas ?tre ? blanc."
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "Le pool de disque ou le volume ne peut ?tre vierge."
> +msgstr ""
> +"Le pool de stockage sur disque ou le volume ne peut pas ?tre ? blanc."
>   
>   msgid "Peers"
>   msgstr ""
> +"Homologues"
>   
>   msgid "Searching"
>   msgstr ""
> +"Recherche"
>   
>   msgid "No peers found."
>   msgstr ""
> +"Homologue introuvable."
>   
>   msgid "Help"
> -msgstr "Aide"
> +msgstr ""
> +"Aide"
>   
>   msgid "About"
> -msgstr "A propos..."
> +msgstr ""
> +"A propos de"
>   
>   msgid "Log out"
> -msgstr "Se d?connecter"
> +msgstr ""
> +"D?connexion"
>   
>   msgid "Version:"
> -msgstr "Version:"
> +msgstr ""
> +"Version :"
>   
>   msgid "Session timeout, please re-login."
> -msgstr "Session expir?e, veuillez vous reconnecter."
> +msgstr ""
> +"D?lai d'attente de session d?pass?, veuillez vous reconnecter."
>   
>   msgid "User Name"
> -msgstr "Nom d'Utilisateur"
> +msgstr ""
> +"Nom d'utilisateur"
>   
>   msgid "Password"
> -msgstr "Mot de Passe"
> +msgstr ""
> +"Mot de passe"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "G?n?rer un Nouveau Rapport de D?boggage"
> +msgstr ""
> +"G?n?rer un nouveau rapport de d?bogage"
>   
>   msgid "Report Name"
> -msgstr "Nom du Rapport"
> +msgstr ""
> +"Nom du rapport"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"Le nom utilis? pour identifier le rapport. Si omis, un nom sera choisi bas? "
> -"sur l'heure courante. Le nom peut contenir des lettres, des nombres, le "
> -"soulignement (\"_\") et le tiret (\"-\")."
> +"Nom utilis? pour identifier le rapport. S'il est omis, un nom sera choisi "
> +"en fonction de l'heure en cours. Le nom peut contenir : des lettres, chiffres, trait de soulignement (\"_\") "
> +"et tiret (\"-\")."
>   
>   msgid "Rename a Debug Report"
> -msgstr "Renommer un Rapport de D?boggage"
> +msgstr ""
> +"Renommer un rapport de d?bogage"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
>   msgstr ""
> -"Le nom utilis? pour identifer le rapport. Le nom peut contenir des lettres, "
> -"nombres et tirets (\"-\")."
> +"Nom utilis? pour identifier le rapport. Il peut contenir : des lettres, chiffres et "
> +"tiret (\"-\")."
>   
>   msgid "Submit"
> -msgstr "Soumettre"
> +msgstr ""
> +"Soumettre"
>   
>   msgid "Add a Repository"
> -msgstr "Ajouter un D?p?t"
> +msgstr ""
> +"Ajouter un r?f?rentiel"
>   
>   msgid "Identifier"
> -msgstr "Identificateur"
> +msgstr ""
> +"Identificateur"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "Mot unique, identifiant unique pour le d?p?t."
> +msgstr ""
> +"Mot unique, identificateur unique pour le r?f?rentiel."
>   
>   msgid "Textual name for the repository."
> -msgstr "Nom textuel pour le d?p?t."
> +msgstr ""
> +"Nom textuel pour le r?f?rentiel."
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "Champ requis"
> +msgstr ""
> +"Zone obligatoire"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "URL du d?p?t. Les protocoles support?s sont http, ftp et ficheir."
> +msgstr ""
> +"Adresse URL pour le r?f?rentiel. Les protocoles pris en charge sont http, ftp, et file."
>   
>   msgid "Repository is a mirror"
> -msgstr "Le d?p?t est un miroir"
> +msgstr ""
> +"Le r?f?rentiel est un miroir"
>   
>   msgid "Distribution"
> -msgstr "Distribution"
> +msgstr ""
> +"Distribution"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "Distribution du d?p?t DEB."
> +msgstr ""
> +"Distribution du r?f?rentiel DEB."
>   
>   msgid "Components"
> -msgstr "Composants"
> +msgstr ""
> +"Composants"
>   
>   msgid "List of components in DEB repository."
> -msgstr "Liste des composants dans le d?p?t DEB."
> +msgstr ""
> +"Liste des composants dans le r?f?rentiel DEB."
>   
>   msgid "Edit Repository"
> -msgstr "Editer le D?p?t"
> +msgstr ""
> +"Editer le r?f?rentiel"
>   
>   msgid "Mirror List URL"
> -msgstr "URL de Liste de Miroir"
> +msgstr ""
> +"URL liste miroir"
>   
>   msgid "Yes"
> -msgstr "Oui"
> +msgstr ""
> +"Oui"
>   
>   msgid "No"
> -msgstr "Non"
> +msgstr ""
> +"Non"
>   
>   msgid "Add a Volume to Storage Pool"
> -msgstr "iAjouter un Volume au Pool de Stockage"
> +msgstr ""
> +"Ajouter un volume au pool de stockage"
>   
>   msgid "Fetch from remote URL"
>   msgstr ""
> +"Extraire de l'URL distante"
>   
>   msgid "Enter the remote URL here."
> -msgstr "Saisir une URL distante ici"
> +msgstr ""
> +"Indiquez ici l'URL distante."
>   
>   msgid "Upload a file"
> -msgstr "Charger un fichier"
> +msgstr ""
> +"T?l?charger un fichier"
>   
>   msgid "Choose the file you want to upload."
>   msgstr ""
> +"S?lectionnez le fichier ? t?l?charger."
>   
>   msgid "Define a New Storage Pool"
> -msgstr "D?finir un Nouveau Pool de Stockage"
> +msgstr ""
> +"D?finir un nouveau pool de stockage"
>   
>   msgid "Storage Pool Name"
> -msgstr "Nom de Pool de Stockage"
> +msgstr ""
> +"Nom du pool de stockage"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
>   msgstr ""
> -"Le nom utilis? pour identifier les pools de stockage, et il ne doit pas ?tre "
> -"vide."
> +"Nom utilis? pour identifier les pools de stockage. Ne doit pas ?tre vide."
>   
>   msgid "Storage Pool Type"
> -msgstr "Type de Pool de Stockage"
> +msgstr ""
> +"Type de pool de stockage"
>   
>   msgid "Storage Path"
> -msgstr "Chemin de Stockage"
> +msgstr ""
> +"Chemin de stockage"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
>   msgstr ""
> -"Le chemin du Pool de Stockage. Chaque Pool de Stockage doit avoir un chemin "
> -"unique."
> +"Chemin du pool de stockage. Chaque pool de stockage doit avoir un chemin unique."
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
>   msgstr ""
> -"Kimchi va essayer de cr?er un r?pertoire quand il n'existe pas d?j? dans "
> -"votre syst?me."
> +"Kimchi va tenter de cr?er le r?pertoire s'il n'en existe pas d?j? un "
> +"sur votre syst?me."
>   
>   msgid "NFS Server IP"
> -msgstr "IP du Serveur NFS"
> +msgstr ""
> +"IP du serveur NFS"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
>   msgstr ""
> -"IP du Serveur NFS ou nom d'h?te. Il peut ?tre saisi ou entr? ? partir de "
> -"l'historique."
> +"IP ou nom d'h?te du serveur NFS. Peut ?tre entr? ou s?lectionn? depuis l'historique."
>   
>   msgid "NFS Path"
> -msgstr "Chemin NFS"
> +msgstr ""
> +"Chemin NFS"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "Le chemin NFS export? sur le serveur NFS."
> +msgstr ""
> +"Chemin NFS export? ou serveur NFS."
>   
>   msgid "Device path"
> -msgstr "Chemin du P?riph?rique"
> +msgstr ""
> +"Chemin d'unit?"
>   
>   msgid "iSCSI Server"
> -msgstr "Serveur iSCSI"
> +msgstr ""
> +"Serveur iSCSI"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
> -msgstr "IP du Serveur iSCSI ou nom d'h?te. Il ne devrait pas ?tre vide."
> +msgstr ""
> +"IP ou nom d'h?te du serveur iSCSI. Ne doit pas ?tre vide."
>   
>   msgid "Server"
> -msgstr "Serveur"
> +msgstr ""
> +"Serveur"
>   
>   msgid "Port"
> -msgstr "Port"
> +msgstr ""
> +"Port"
>   
>   msgid "Target"
> -msgstr "Cible"
> +msgstr ""
> +"Cible"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "La cible iSCSI sur le serveur iSCSI"
> +msgstr ""
> +"Cible iSCSI sur le serveur iSCSI"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "Ajouter l'Authentification iSCSI"
> +msgstr ""
> +"Ajouter l'authentification iSCSI"
>   
>   msgid "iSCSI Authentication"
> -msgstr "Authentification iSCSI"
> +msgstr ""
> +"Authentification iSCSI"
>   
>   msgid "SCSI Adapter"
> -msgstr "Adaptateur SCSI"
> +msgstr ""
> +"Adaptateur SCSI"
>   
>   msgid "Please, wait..."
> -msgstr "Veuillez patienter..."
> +msgstr ""
> +"Veuillez patienter..."
>   
>   msgid "Add Template"
> -msgstr "Ajouter un Mod?le"
> +msgstr ""
> +"Ajouter un mod?le"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "O? se trouve le media source pour le mod?le ?"
> +msgstr ""
> +"O? se trouve le support source pour ce mod?le ? "
>   
>   msgid "Local ISO Image"
> -msgstr "Image ISO Locale"
> +msgstr ""
> +"Image ISO locale"
>   
>   msgid "Local Image File"
> -msgstr "Fichier Image Local"
> +msgstr ""
> +"Fichier image local"
>   
>   msgid "Remote ISO Image"
> -msgstr "Image ISO Distante"
> +msgstr ""
> +"Image ISO distante"
>   
>   msgid "Search ISOs"
> -msgstr "Rechercher des ISOs"
> +msgstr ""
> +"Recherche d'ISO"
>   
>   msgid "The following ISOs are available:"
> -msgstr "Les ISOs suivants sont disponibles:"
> +msgstr ""
> +"Les images ISO suivantes sont disponibles :"
>   
>   msgid "OS: "
> -msgstr "OS: "
> +msgstr ""
> +"SE : "
>   
>   msgid "Version: "
> -msgstr "Version: "
> +msgstr ""
> +"Version : "
>   
>   msgid "Size: "
> -msgstr "Taille: "
> +msgstr ""
> +"Taille : "
>   
>   msgid "Search more ISOs"
> -msgstr "Chercher plus d'ISOs"
> +msgstr ""
> +"Rechercher d'autres images ISO"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "Cr?er des mod?les depuis l'ISO s?lectionn?"
> +msgstr ""
> +"Cr?er des mod?les ? partir de l'image ISO s?lectionn?e"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "Je veux utiliser un fichier ISO sp?cifique"
> +msgstr ""
> +"Je souhaite utiliser un fichier ISO sp?cifique"
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "Chargement des ISOs distants par d?faut en cours..."
> +msgstr ""
> +"Chargement d'ISO distants par d?faut..."
>   
>   msgid "Arch: "
> -msgstr "Arch: "
> +msgstr ""
> +"Arch : "
>   
>   msgid "I want to use a custom URL"
> -msgstr "Je veux utiliser une URL personnalis?e"
> +msgstr ""
> +"Je souhaite utiliser une URL personnalis?e"
>   
>   msgid "Edit Template"
> -msgstr "?diter un Mod?le"
> +msgstr ""
> +"Editer le mod?le"
>   
>   msgid "Processor"
> -msgstr "Processeur"
> +msgstr ""
> +"Processeur"
>   
>   msgid "CDROM"
> -msgstr "CDROM"
> +msgstr ""
> +"CD-ROM"
>   
>   msgid "Image File"
> -msgstr "Fichier Image"
> +msgstr ""
> +"Fichier image"
>   
>   msgid "Graphics"
> -msgstr "Graphiques"
> +msgstr ""
> +"Graphiques"
>   
>   msgid "Disk(GB)"
>   msgstr ""
> +"Disque (Go)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"Format de disque"
>   
>   msgid "CPU Number"
> -msgstr "Nombre de CPU"
> +msgstr ""
> +"Nombre d'UC"
>   
>   msgid "Manually set CPU topology"
>   msgstr ""
> +"D?finir manuellement la topologie d'UC"
>   
>   msgid "Cores"
>   msgstr ""
> +"Coeurs"
>   
>   msgid "Threads"
>   msgstr ""
> +"Unit?s d'ex?cution"
>   
>   msgid "CPU"
> -msgstr "CPU"
> +msgstr ""
> +"UC"
>   
>   msgid "Disk I/O"
> -msgstr "E/S Disque"
> +msgstr ""
> +"E-S disque"
>   
>   msgid "Network I/O"
> -msgstr "E/S R?seau"
> +msgstr ""
> +"E-S r?seau"
>   
>   msgid "Livetile"
> -msgstr "Livetile"
> +msgstr ""
> +"Livetile"
>   
>   msgid "No guests found."
> -msgstr "Aucun invit? trouv?."
> +msgstr ""
> +"Aucun invit? trouv?."
>   
>   msgid "Shut down"
> -msgstr "?teindre"
> +msgstr ""
> +"Arr?ter"
>   
>   msgid "Restart"
> -msgstr "Red?marrer"
> +msgstr ""
> +"Red?marrer"
>   
>   msgid "Basic Information"
> -msgstr "Informations de Base"
> +msgstr ""
> +"Informations de base"
>   
>   msgid "OS Distro"
> -msgstr "Distro de l'OS"
> +msgstr ""
> +"SE distribution"
>   
>   msgid "OS Code Name"
> -msgstr "Nom de code de l'OS"
> +msgstr ""
> +"Nom de code SE"
>   
>   msgid "CPU(s)"
>   msgstr ""
> +"UC"
>   
>   msgid "System Statistics"
> -msgstr "Statistiques Syst?me"
> +msgstr ""
> +"Statistiques syst?me"
>   
>   msgid "Update Progress"
> -msgstr "Progr?s de la Mise ? Jour"
> +msgstr ""
> +"Progression de la mise ? jour"
>   
>   msgid "Network Name"
> -msgstr "Nom de R?seau"
> +msgstr ""
> +"Nom du r?seau"
>   
>   msgid "State"
> -msgstr "?tat"
> +msgstr ""
> +"Etat"
>   
>   msgid "Network Type"
> -msgstr "Type de R?seau"
> +msgstr ""
> +"Type de r?seau"
>   
>   msgid "Address Space"
> -msgstr "Espace d'adressage"
> +msgstr ""
> +"Espace adresse"
>   
>   msgid "Name should not contain '/' and '\"'."
> -msgstr "Le nom ne devrait pas contenir '/' et '\"'."
> +msgstr ""
> +"Le nom ne doit pas contenir '/' et '\"'."
>   
>   msgid "Isolated: no external network connection"
> -msgstr "Isol?: pas de connexion ? un r?seau externe"
> +msgstr ""
> +"Isol? : aucune connexion r?seau externe"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT: connexion physique au r?seau sortant uniquement"
> +msgstr ""
> +"NAT : connexion r?seau physique sortante uniquement"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
>   msgstr ""
> -"Bridg?: Les macines virtuelles sont connect?es directement au r?seau physique"
> +"Rout? : machines virtuelles directement connect?es au r?seau physique"
>   
>   msgid "(No interfaces found)"
> -msgstr "(Aucune interface trouv?e)"
> +msgstr ""
> +"(Interface introuvable)"
>   
>   msgid "Destination"
> -msgstr "Destination"
> +msgstr ""
> +"Destination"
>   
>   msgid "Enable VLAN"
> -msgstr "Activer le VLAN"
> +msgstr ""
> +"Activer le r?seau local virtuel"
>   
>   msgid "VLAN ID"
> -msgstr "ID de VLAN"
> +msgstr ""
> +"ID r?seau local virtuel"
>   
>   msgid "Stop"
> -msgstr "Arr?ter"
> +msgstr ""
> +"Arr?ter"
>   
>   msgid "%Used"
>   msgstr ""
> +"%Util"
>   
>   msgid "Location"
> -msgstr "Emplacement"
> +msgstr ""
> +"Emplacement"
>   
>   msgid "Capacity"
> -msgstr "Capacit?"
> +msgstr ""
> +"Capacit?"
>   
>   msgid "Allocated"
> -msgstr "Allou?"
> +msgstr ""
> +"Allou?"
>   
>   msgid "active"
> -msgstr "actif"
> +msgstr ""
> +"actif"
>   
>   msgid "inactive"
> -msgstr "inactif"
> +msgstr ""
> +"inactif"
>   
>   msgid "Deactivate"
> -msgstr "D?sactiver"
> +msgstr ""
> +"D?sactiver"
>   
>   msgid "Activate"
> -msgstr "Activer"
> +msgstr ""
> +"Activer"
>   
>   msgid "Add Volume"
> -msgstr "Ajouter un Volume"
> +msgstr ""
> +"Ajouter un volume"
>   
>   msgid "Extend"
> -msgstr "?tendre"
> +msgstr ""
> +"Extension"
>   
>   msgid "Undefine"
> -msgstr "Supprimer"
> +msgstr ""
> +"Annuler d?finition"
>   
>   msgid "Format"
> -msgstr "Format"
> +msgstr ""
> +"Format"
>   
>   msgid "Allocation"
> -msgstr "Allocation"
> +msgstr ""
> +"Allocation"
>   
>   msgid "No templates found."
> -msgstr "Aucun mod?le trouv?."
> +msgstr ""
> +"Aucun mod?le trouv?."
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/po/it_IT.po b/po/it_IT.po
> index bfc1a84..50dc7c8 100644
> --- a/po/it_IT.po
> +++ b/po/it_IT.po
> @@ -1,5 +1,6 @@
>   # English translations for kimchi package.
>   # Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
> @@ -9,82 +10,99 @@ msgstr ""
>   "PO-Revision-Date: 2013-07-11 17:32-0400\n"
>   "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
>   "Language-Team: English\n"
> -"Language: it_IT\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
> +"Plural-Forms: nplurals=2; plural=n != 1;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
>   msgstr ""
> +"Parametro sconosciuto %(value)s"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "Eliminazione non consentita per %(resource)s"
> +msgstr ""
> +"Eliminazione non consentita per %(resource)s"
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "%(resource)s non implementa il metodo di aggiornamento"
> +msgstr ""
> +"%(resource)s non implementa il metodo di aggiornamento"
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "Creazione non consentita per %(resource)s"
> +msgstr ""
> +"Creazione non consentita per %(resource)s"
>   
>   msgid "Unable to parse JSON request"
> -msgstr "Impossibile analizzare la richiesta JSON"
> +msgstr ""
> +"Impossibile analizzare la richiesta JSON"
>   
>   msgid "This API only supports JSON"
> -msgstr "L'API supporta solo JSON"
> +msgstr ""
> +"L'API supporta solo JSON"
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
>   msgstr ""
> +"I parametri non corrispondono ai requisiti nello schema: %(err)s"
>   
>   msgid "You don't have permission to perform this operation."
>   msgstr ""
> +"Non si dispone dell'autorizzazione per eseguire questa operazione. "
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "Archivio dati non inizializzato nell'oggetto modello."
> +msgstr ""
> +"Archivio dati non inizializzato nell'oggetto modello."
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> -msgstr "Impossibile avviare l'attivit? a causa dell'errore: %(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 ""
> +"? stato raggiunto il timeout di %(seconds)s secondi durante l'esecuzione dell'attivit? '%(task)s."
>   
>   #, 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: "
> -"%(code)s]"
> +"Autenticazione non riuscita per l'utente '%(username)s'. [Codice di errore: %(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi"
> +msgstr ""
> +"Non si dispone dell'autorizzazione ad accedere a Kimchi"
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "Specificare %(item)s per accedere a Kimchi"
> +msgstr ""
> +"Specificare %(item)s per accedere a Kimchi"
>   
>   #, python-format
>   msgid "User %(user_id)s not found with given LDAP settings."
>   msgstr ""
> +"Utente %(user_id)s non trovato con le impostazioni LDAP fornite. "
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
>   msgstr ""
> +"Configurazione LDAP non valida: %(item)s : %(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
>   msgstr ""
> +"Specificato \"_cap\" sconosciuto"
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
>   msgstr ""
> +"\"_passthrough\" deve essere \"true\" o \"false\""
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
>   msgstr ""
> +"\"_passthrough_affected_by\" deve essere una stringa nome dispositivo"
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
> @@ -94,59 +112,63 @@ msgstr ""
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
>   msgstr ""
> -"Errore durante il richiamo delle informazioni sul dispositivo del blocco per "
> -"%(device)s."
> +"Errore durante il richiamo delle informazioni sul dispositivo del blocco per %(device)s."
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "Impossibile trovare il file distro: %(filename)s"
> +msgstr ""
> +"Impossibile trovare il file distro: %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
>   msgstr ""
> -"Impossibile analizzare il file distro: %(filename)s. Verificare che sia un "
> -"file JSON."
> +"Impossibile analizzare il file distro: %(filename)s. Verificare che sia un file JSON."
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
>   msgstr ""
> -"Impossibile accedere a %(portal)s di destinazione host iSCSI. Dettagli: "
> -"%(err)s"
> +"Impossibile accedere alla destinazione host iSCSI %(portal)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
> -msgstr "Impossibile accedere alla destinazione %(target)s host %(host)s iSCSI"
> +msgstr ""
> +"Impossibile accedere alla destinazione %(target)s host %(host)s iSCSI"
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
>   msgstr ""
> +"Impossibile trovare il file ISO %(filename)s"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "Il file ISO %(filename)s non ? avviabile"
> +msgstr ""
> +"Il file ISO %(filename)s non ? avviabile"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
> -msgstr "Il file ISO %(filename)s non ha un record di avvio El Torito valido"
> +msgstr ""
> +"Il file ISO %(filename)s non ha un record di avvio El Torito valido"
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> -msgstr "Voce di convalida El Torito non valida in ISO %(filename)s"
> +msgstr ""
> +"Voce di convalida El Torito non valida in ISO %(filename)s"
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "Indicatore di avvio El Torito non valido in ISO %(filename)s"
> +msgstr ""
> +"Indicatore di avvio El Torito non valido in ISO %(filename)s"
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
> -msgstr "Tipo di volume imprevisto per il volume primario in ISO %(filename)s"
> +msgstr ""
> +"Tipo di volume imprevisto per il volume primario in ISO %(filename)s"
>   
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
>   msgstr ""
> -"Formato non corretto durante la lettura del descrittore volume in ISO "
> -"%(filename)s"
> +"Formato non corretto durante la lettura del descrittore volume in ISO %(filename)s"
>   
>   #, python-format
>   msgid ""
> @@ -156,41 +178,50 @@ msgid ""
>   "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
>   "'path_to_iso'.Details: %(err)s"
>   msgstr ""
> -"L'hypervisor non dispone dell'autorizzazione per utilizzare questo ISO "
> -"%(filename)s. Spostarlo in /var/lib/libvirt o impostare l'autorizzazione di "
> -"ricerca per gli elenchi di controllo accesso ai file per l'utente "
> -"'%(user)s',  se possibile, o aggiungere '%(user)s' al gruppo percorso ISO o "
> -"(non consigliato) 'chmod -R o+x 'path_to_iso'. Dettagli: %(err)s"
> +"L'hypervisor non dispone dell'autorizzazione per utilizzare questo ISO %(filename)s. "
> +"Spostarlo in /var/lib/libvirt o impostare l'autorizzazione di ricerca "
> +"sugli elenchi di controllo di accesso file per l'utente '%(user)s' se possibile, oppure aggiungere "
> +"'%(user)s' al gruppo percorso ISO oppure (non consigliato) 'chmod -R o+x "
> +"'path_to_iso'. Dettagli: %(err)s"
>   
>   msgid "An error occurred when probing image OS information."
>   msgstr ""
> +"Si ? verificato un errore durante l'analisi delle informazioni SO immagine."
>   
>   msgid "No OS information found in given image."
>   msgstr ""
> +"Nessuna informazione SO trovata nell'immagine fornita."
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
>   msgstr ""
> +"Impossibile leggere il file immagine %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Image file must be an existing file on system. %(filename)s is not a valid "
>   "input."
>   msgstr ""
> +"Il file immagine deve essere un file esistente sul sistema. %(filename)s non ? un valido "
> +"input."
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "Macchina virtuale %(name)s gi? esistente"
> +msgstr ""
> +"Macchina virtuale %(name)s gi? esistente"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "La macchina virtuale %(name)s non esiste"
> +msgstr ""
> +"La macchina virtuale %(name)s non esiste"
>   
>   #, python-format
>   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 ""
> +"Impossibile ridenominare la macchina virtuale %(name)s. Il nome %(new_name)s ? gi? "
> +"in uso o la macchina virtuale non ? spenta."
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
> @@ -198,19 +229,23 @@ msgstr ""
>   "Impossibile richiamare l'immagine per la macchina virtuale arrestata %(name)s"
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "L'immagine ISO remota non ? supportata da questo server."
> +msgstr ""
> +"L'immagine ISO remota non ? supportata da questo server."
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
>   msgstr ""
> +"L'esecuzione di un'immagine non ? supportata sulla macchina virtuale %(name)s"
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossibile creare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile aggiornare la macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
> @@ -220,149 +255,188 @@ msgstr ""
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
>   msgstr ""
> +"Impossibile connettere la macchina virtuale %(name)s."
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"Il nome della macchina virtuale deve essere una stringa senza barre (/)"
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
>   msgstr ""
> +"URI modello non valido %(value)s specificato per la macchina virtuale"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
>   msgstr ""
> +"URI pool di memoria non valido %(value)s specificato per la macchina virtuale"
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
>   msgstr ""
> +"I grafici macchina virtuale supportati sono Spice o VNC"
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
>   msgstr ""
>   "L'indirizzo dei grafici su cui rimanere in ascolto deve essere IPv4 o IPv6"
>   
>   msgid "Specify a template to create a virtual machine from"
> -msgstr "Specificare un modello da cui creare una macchina virtuale"
> +msgstr ""
> +"Specificare un modello da cui creare una macchina virtuale"
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile spegnere la macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossibile eliminare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile eliminare la macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"Impossibile ridenominare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +"Impossibile reimpostare la macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   msgid "User name list must be an array"
>   msgstr ""
> +"L'elenco di nomi utente deve essere un array"
>   
>   msgid "User name must be a string"
> -msgstr "Il nome della rete deve essere una stringa"
> +msgstr ""
> +"Il nome utente deve essere una stringa"
>   
>   msgid "Group name list must be an array"
>   msgstr ""
> +"L'elenco di nomi gruppo deve essere un array"
>   
>   msgid "Group name must be a string"
> -msgstr "Il nome della rete deve essere una stringa"
> +msgstr ""
> +"Il nome gruppo deve essere una stringa"
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "L'utente '%(users)s' non esiste."
> +msgstr ""
> +"L'utente o gli utenti '%(users)s' non esistono"
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "L'utente '%(groups)s' non esiste."
> +msgstr ""
> +"Il gruppo o i gruppi '%(groups)s' non esistono"
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile arrestare la macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
> -msgstr "Impossibile avviare la macchina virtuale %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile ottenere i metadati di accesso della macchina virtuale %(name)s. Dettagli: %(err)s"
>   
>   msgid "The guest console password must be a string."
>   msgstr ""
> +"La password della console della macchina guest deve essere una stringa. "
>   
>   msgid "The life time for the guest console password must be a number."
>   msgstr ""
> +"La durata per la password della console della macchina guest deve essere un numero. "
>   
>   #, python-format
>   msgid "Virtual machine '%(name)s' must be stopped before cloning it."
>   msgstr ""
> +"La macchina virtuale '%(name)s' deve essere arrestata prima di poterla clonare. "
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
>   msgstr ""
> +"Spazio su disco insufficiente per clonare la macchina virtuale '%(name)s'"
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Impossibile clonare la VM '%(name)s'. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"Operazione non valida per la macchina virtuale non persistente %(name)s"
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"Impossibile sospendere la VM '%(name)s' perch? non ? in esecuzione. "
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Impossibile sospendere la VM '%(name)s'. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"Impossibile riprendere la VM '%(name)s' perch? non ? in pausa. "
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"Impossibile riprendere la VM '%(name)s'. Dettagli: %(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"La memoria assegnata ? superiore al massimo consentito nell'host. "
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"La VM '%(name)s' non supporta l'aggiornamento della memoria live. Aggiornare la memoria con"
> +"la macchina fuori linea per abilitare questa funzione. "
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"Nelle VM attive ? consentito solo aumentare la memoria. "
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"Per l'aggiornamento della memoria live, il nuovo valore di memoria deve essere uguale al vecchio pi?"
> +"multipli di 1024 Mib"
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"Non sono presenti sufficienti slot liberi di 1024 Mib nella macchina  guest."
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"La versione libvirt dell'host non supporta dispositivi di memoria. Libvirt deve essere >= "
> +"1.2.14"
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"Errore durante il collegamento del dispositivo di memoria. Dettagli: %(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
>   msgstr ""
> +"La VM %(vmid)s non contiene un dispositivo host assegnato direttamente %(dev_name)s."
>   
>   #, python-format
>   msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
>   msgstr ""
> +"Il dispositivo host %(dev_name)s non consente di assegnare direttamente al VM."
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -371,19 +445,28 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> +"Non ? stato trovato alcun gruppo IOMMU. Per funzionare correttamente il pass-through PCI host "
> +"ha bisogno del gruppo IOMMU. Abilitare Intel VT-d o AMD IOMMU nel BIOS e verificare quindi che "
> +"il Kernel sia compilato con il supporto IOMMU. per la CPU Intel, aggiungere intel_iommu=on "
> +"al parametro Kernel in /boot/grub2/grub.conf. Per la CPU AMD, aggiungere iommu=pt "
> +"iommu=1."
>   
>   msgid "\"name\" should be a device name string"
>   msgstr ""
> +"\"name\" deve essere una stringa nome dispositivo"
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"Il dispositivo %(name)s ? probabilmente utilizzato dall'host. Impossibile collegarlo"
> +"alla macchina guest."
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> -msgstr "L'interfaccia %(iface)s non esiste nella macchina virtuale %(name)s"
> +msgstr ""
> +"L'interfaccia %(iface)s non esiste nella macchina virtuale %(name)s"
>   
>   #, python-format
>   msgid ""
> @@ -397,8 +480,7 @@ msgstr ""
>   
>   msgid "Network name for virtual machine interface must be a string"
>   msgstr ""
> -"Il nome di rete per l'interfaccia della macchina virtuale deve essere una "
> -"stringa"
> +"Il nome di rete per l'interfaccia della macchina virtuale deve essere una stringa"
>   
>   msgid "Invalid network model card specified for virtual machine interface"
>   msgstr ""
> @@ -406,25 +488,29 @@ msgstr ""
>   
>   msgid "Specify type and network to add a new virtual machine interface"
>   msgstr ""
> -"Specificare il tipo e la rete per aggiungere una nuova interfaccia della "
> -"macchina virtuale"
> +"Specificare il tipo e la rete per aggiungere una nuova interfaccia della macchina virtuale"
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"L'indirizzo MAC deve rispettare il formato FF:FF:FF:FF:FF:FF"
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"L'indirizzo MAC %(mac)s esiste gi? nella macchina virtuale %(name)s"
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"Indirizzo MAC non valido"
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"Impossibile modificare l'indirizzo MAC di una macchina virtuale in esecuzione"
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "Modello %(name)s gi? esistente"
> +msgstr ""
> +"Modello %(name)s gi? esistente"
>   
>   #, python-format
>   msgid ""
> @@ -436,18 +522,17 @@ msgstr ""
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
>   msgstr ""
> -"Il pool di memoria %(pool)s specificato per il modello %(template)s non "
> -"esiste"
> +"Il pool di memoria %(pool)s specificato per il modello %(template)s non esiste"
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
>   msgstr ""
> -"Il pool di memoria %(pool)s specificato per il modello %(template)s non ? "
> -"attivo"
> +"Il pool di memoria %(pool)s specificato per il modello %(template)s non ? attivo"
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "Parametro non valido %(param)s' specificato per CDROM."
> +msgstr ""
> +"Parametro non valido '%(param)s' specificato per CDROM."
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
> @@ -455,216 +540,260 @@ msgstr ""
>   "La rete %(network)s specificata per il modello %(template)s non ? attiva"
>   
>   msgid "Template name must be a string"
> -msgstr "Il nome del modello deve essere una stringa"
> +msgstr ""
> +"Il nome del modello deve essere una stringa"
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "L'icona del modello deve essere un percorso all'immagine"
> +msgstr ""
> +"L'icona del modello deve essere un percorso all'immagine"
>   
>   msgid "Template distribution must be a string"
> -msgstr "La distribuzione del modello deve essere una stringa"
> +msgstr ""
> +"La distribuzione del modello deve essere una stringa"
>   
>   msgid "Template distribution version must be a string"
> -msgstr "La versione della distribuzione del modello deve essere una stringa"
> +msgstr ""
> +"La versione della distribuzione del modello deve essere una stringa"
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "Il numero di CPU deve essere un numero intero"
> +msgstr ""
> +"Il numero di CPU deve essere un numero intero maggiore di 0"
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
>   msgstr ""
>   "La quantit? di memoria (MB) deve essere un numero intero maggiore di  512"
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "Il CDROM del modello deve essere un file ISO locale o remoto"
> +msgstr ""
> +"Il CDROM del modello deve essere un file ISO locale o remoto"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
> -msgstr "URI pool di memoria non valido: %(value)s specificato per il modello"
> +msgstr ""
> +"URI pool di memoria non valido %(value)s specificato per il modello"
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
> -msgstr "Specificare un'immagine ISO come CDROM per creare un modello"
> +msgstr ""
> +"Specificare un'immagine ISO come CDROM o un'immagine di base per creare un modello"
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "Tutte le reti per il modello devono essere specificate in un elenco."
> +msgstr ""
> +"Tutte le reti per il modello devono essere specificate in un elenco."
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
>   msgstr ""
> +"Se il pool di memoria ? iSCSI o SCSI specificare un volume per un modello"
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
>   msgstr ""
> +"Il volume %(volume)s non ? nel pool di memoria %(pool)s"
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> -msgstr "Impossibile creare il modello a causa dell'errore: %(err)s"
> +msgstr ""
> +"Impossibile creare il modello a causa dell'errore: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete template due error: %(err)s"
> -msgstr "Impossibile eliminare il modello a causa dell'errore: %(err)s"
> +msgstr ""
> +"Impossibile eliminare il modello a causa dell'errore: %(err)s"
>   
>   msgid "Disk size must be an integer greater than 1GB."
>   msgstr ""
> +"La dimensione del disco deve essere un numero intero maggiore di 1GB."
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "Il CDROM del modello deve essere un file ISO locale o remoto"
> +msgstr ""
> +"L'immagine di base del modello deve essere un file immagine locale valido"
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
>   msgstr ""
> +"Impossibile identificare il formato %(path)s dell'immagine di base"
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
>   msgstr ""
> +"Quando si specifica la topologia CPU, le VCPU devono essere composte da socket, core e"
> +"thread."
>   
>   msgid ""
>   "When specifying CPU topology, each element must be an integer greater than "
>   "zero."
>   msgstr ""
> +"Quando si specifica la topologia CPU, ogni elemento deve essere un numero intero maggiore di"
> +"zero."
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"Formato immagine disco non valido. Formati validi: bochs, cloop, cow, dmg, qcow, "
> +"qcow2, qed, raw, vmdk, vpc."
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "Pool di memoria %(name)s gi? esistente"
> +msgstr ""
> +"Pool di memoria %(name)s gi? esistente"
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "Il pool di memoria %(name)s non esiste"
> +msgstr ""
> +"Il pool di memoria %(name)s non esiste"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
> -msgstr "Specificare %(item)s per poter creare il  pool di memoria %(name)s"
> +msgstr ""
> +"Specificare %(item)s per poter creare il  pool di memoria %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "Impossibile eliminare il pool di memoria attivo %(name)s"
> +msgstr ""
> +"Impossibile eliminare il pool di memoria attivo %(name)s"
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "Impossibile elencare i pool di memoria. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile elencare i pool di memoria. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> -msgstr "Impossibile creare il pool di memoria %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile creare il pool di memoria %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"Impossibile ottenere il numero di volumi di memoria nel pool di memoria "
> -"%(name)s. Dettagli: %(err)s"
> +"Impossibile ottenere il numero di volumi di memoria nel pool di memoria %(name)s. Dettagli: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
> -msgstr "Impossibile attivare il pool di memoria %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile attivare il pool di memoria %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
> -msgstr "Impossibile disattivare il pool di memoria %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile disattivare il pool di memoria %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
> -msgstr "Impossibile eliminare il pool di memoria %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile eliminare il pool di memoria %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
>   msgstr ""
> -"Impossibile creare il pool NFS poich? il percorso di esportazione %(path)s "
> -"potrebbe bloccarsi durante il montaggio"
> +"Impossibile creare il pool NFS poich? il percorso di esportazione %(path)s potrebbe bloccarsi durante il montaggio"
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
>   msgstr ""
> -"Impossibile creare il pool NFS poich? il montaggio del percorso di "
> -"esportazione %(path)s ha avuto esito negativo"
> +"Impossibile creare il pool NFS poich? il montaggio del percorso di esportazione %(path)s ha avuto esito negativo"
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "Tipo di pool di memoria non supportato: %(type)s"
> +msgstr ""
> +"Tipo di pool di memoria non supportato: %(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
>   msgstr ""
> +"Errore durante il richiamo dell'XML del pool di memoria per %(pool)s"
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"Il nome del pool di memoria deve essere una stringa senza barre (/)"
>   
>   msgid ""
>   "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
>   "iso"
>   msgstr ""
> +"I tipi di pool di memoria supportati sono dir, netfs, logico, iscsi, isci e kimchi-"
> +"iso"
>   
>   msgid "Storage pool path must be a string"
> -msgstr "Il percorso del pool di memoria deve essere una stringa"
> +msgstr ""
> +"Il percorso del pool di memoria deve essere una stringa"
>   
>   msgid "Storage pool host must be a IP or hostname"
> -msgstr "L'host del pool di memoria deve essere un nome host o IP"
> +msgstr ""
> +"L'host del pool di memoria deve essere un nome host o IP"
>   
>   msgid "Storage pool device must be the absolute path to the block device"
>   msgstr ""
> +"Il dispositivo pool di memoria deve essere il percorso assoluto al dispositivo del blocco"
>   
>   msgid "Storage pool devices parameter must be a list"
> -msgstr "Il parametro dispositivi pool di memoria deve essere un elenco"
> +msgstr ""
> +"Il parametro dispositivi pool di memoria deve essere un elenco"
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "L'IQN di destinazione di un pool iSCSI deve essere una stringa"
> +msgstr ""
> +"L'IQN di destinazione di un pool iSCSI deve essere una stringa"
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
>   msgstr ""
> -"La porta di un server di memoria remoto deve essere un numero intero tra 1 e "
> -"65535"
> +"La porta di un server di memoria remoto deve essere un numero intero tra 1 e 65535"
>   
>   msgid "iSCSI target username must be a string"
>   msgstr ""
> +"Il nome utente della destinazione iSCSI deve essere una stringa"
>   
>   msgid "iSCSI target password must be a string"
>   msgstr ""
> +"La password della destinazione iSCSI deve essere una stringa"
>   
>   msgid "Specify name and type to create a storage pool"
> -msgstr "Specificare nome e tipo per creare un pool di memoria"
> +msgstr ""
> +"Specificare nome e tipo per creare un pool di memoria"
>   
>   #, python-format
>   msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
>   msgstr ""
> -"%(disk)s non ? un disco/partizione valido. Impossibile aggiungerlo al pool "
> +"%(disk)s non ? un disco/partizione valido. Impossibile aggiungerlo al pool"
>   "%(pool)s."
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
>   msgstr ""
> +"Impossibile estendere il pool logico %(pool)s. Dettagli: %(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
>   msgstr ""
>   "Solo il parametro dischi pu? essere aggiornato per il pool di memoria logico."
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "Il nome adattatore host SCSI deve essere una stringa."
> +msgstr ""
> +"Il nome adattatore host SCSI deve essere una stringa."
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
> -msgstr "Il pool di memoria kimchi_isos ? riservato per uso interno"
> +msgstr ""
> +"Il pool di memoria kimchi_isos ? riservato per uso interno"
>   
>   #, python-format
>   msgid ""
>   "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"Impossibile attivare il pool di memoria NFS %(name)s. Il server NFS "
> -"%(server)s ? irraggiungibile."
> +"Impossibile attivare il pool di memoria NFS %(name)s. Il server NFS %(server)s ? "
> +"irraggiungibile."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"Impossibile disattivare il pool di memoria NFS %(name)s. Il server NFS "
> -"%(server)s ? irraggiungibile."
> +"Impossibile disattivare il pool di memoria NFS %(name)s. Il server NFS %(server)s ? "
> +"irraggiungibile."
>   
>   #, python-format
>   msgid ""
> @@ -682,62 +811,66 @@ msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
>   msgstr ""
> -"Un gruppo di volumi denominato '%(name)s' esiste gi?. Scegliere un altro "
> -"nome per creare il pool logico."
> +"Un gruppo di volumi denominato '%(name)s' esiste gi?. Scegliere un altro nome "
> +"per creare il pool logico."
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
>   msgstr ""
> -"Impossibile aggiornare il database con informazioni approfondite sulla "
> -"scansione a causa dell'errore: %(err)s"
> +"Impossibile aggiornare il database con informazioni approfondite sulla scansione a causa dell'errore: %(err)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "Volume di memoria %(name)s gi? esistente"
> +msgstr ""
> +"Volume di memoria %(name)s gi? esistente"
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
> -msgstr "Il volume di memoria %(name)s non esiste nel pool di memoria %(pool)s"
> +msgstr ""
> +"Il volume di memoria %(name)s non esiste nel pool di memoria %(pool)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
>   "not active"
>   msgstr ""
> +"Impossibile creare il volume di memoria %(volume)s perch? il pool di memoria %(pool)s "
> +"non ? attivo"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create storage volume %(volume)s"
> -msgstr "Specificare %(item)s per poter creare il volume di memoria %(volume)s"
> +msgstr ""
> +"Specificare %(item)s per poter creare il volume di memoria %(volume)s"
>   
>   #, 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 "
> -"non ? attivo"
> +"Impossibile elencare i volumi di memoria poich? il pool di memoria %(pool)s non ? attivo"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"Impossibile creare il volume di memoria %(name)s nel pool di memoria "
> -"%(pool)s. Dettagli: %(err)s"
> +"Impossibile creare il volume di memoria %(name)s nel pool di memoria %(pool)s. Dettagli: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
>   msgstr ""
> -"Impossibile elencare i volumi di memoria nel pool di memoria %(pool)s. "
> -"Dettagli: %(err)s"
> +"Impossibile elencare i volumi di memoria nel pool di memoria %(pool)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
> -msgstr "Impossibile ripulire i volumi di memoria %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile ripulire i volumi di memoria %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
> -msgstr "Impossibile eliminare il volume di memoria %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile eliminare il volume di memoria %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
> @@ -747,91 +880,110 @@ msgstr ""
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
>   msgstr ""
> -"Il tipo di memoria %(type)s non supporta la creazione ed eliminazione del "
> -"volume"
> +"Il tipo di memoria %(type)s non supporta la creazione ed eliminazione del volume"
>   
>   msgid "Storage volume name must be a string"
> -msgstr "Il nome del volume di memoria deve essere una stringa"
> +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"
> +msgstr ""
> +"L'assegnazione del volume di memoria deve essere un numero intero"
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"Formato del volume di memoria non supportato. Formati validi: bochs, cloop, cow, dmg, "
> +"qcow, qcow2, qed, raw, vmdk, vpc."
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "Il volume di memoria richiede un nome volume"
> +msgstr ""
> +"Il volume di memoria richiede un nome volume"
>   
>   #, python-format
>   msgid ""
>   "Unable to update database with storage volume information due error: %(err)s"
>   msgstr ""
> -"Impossibile aggiornare il database con informazioni sul volume di memoria a "
> -"causa dell'errore: %(err)s"
> +"Impossibile aggiornare il database con informazioni sul volume di memoria a causa dell'errore: %(err)s"
>   
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
>   msgstr ""
> +"? possibile specificare solo un parametro %(param)s"
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
>   msgstr ""
> +"La creazione del volume da %(param)s non ? supportata"
>   
>   msgid "Storage volume capacity must be an integer number."
>   msgstr ""
> +"La capacit? del volume di memoria deve essere un numero intero."
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
>   msgstr ""
> +"L'URL del volume di memoria deve essere http://, https://, ftp:// o ftps://."
>   
>   #, python-format
>   msgid "Unable to access file %(url)s. Please, check it."
>   msgstr ""
> +"Impossibile accedere al file %(url)s. Verificare."
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossibile clonare il volume di memoria '%(name)s' nel pool '%(pool)s'. Dettagli: "
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"Specificare dati sezione e dimensioni per caricare un file. "
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"Per caricare un volume di memoria, specificare il parametro 'upload'. "
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"Impossibile caricare i dati sezione perch? non corrispondono con la dimensione sezione richiesta. "
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"Il volume di memoria %(vol)s non ? sottoposto a un processo di caricamento. "
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"I dati sezione da caricare supereranno la dimensione del volume di memoria. "
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"Impossibile caricare i dati sezione nel volume di memoria. Dettagli: %(err)s. "
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "L'interfaccia %(name)s non esiste"
> +msgstr ""
> +"L'interfaccia %(name)s non esiste"
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "Rete %(name)s gi? esistente"
> +msgstr ""
> +"Rete %(name)s gi? esistente"
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "La rete %(name)s non esiste"
> +msgstr ""
> +"La rete %(name)s non esiste"
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
>   msgstr ""
> -"La sottorete %(subnet)s specificata per la rete %(network)s non ? valida ."
> +"La sottorete %(subnet)s specificata per la rete %(network)s non ? valida."
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
> @@ -840,7 +992,8 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "Impossibile eliminare la rete attiva %(name)s"
> +msgstr ""
> +"Impossibile eliminare la rete attiva %(name)s"
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
> @@ -849,66 +1002,72 @@ msgstr ""
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
>   msgstr ""
> -"L'interfaccia deve essere un dispositivo bridge o di collegamento NIC bare-"
> -"metal."
> +"L'interfaccia deve essere un dispositivo bridge o di collegamento NIC bare-metal."
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile creare la rete %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'"
> +msgstr ""
> +"Impossibile trovare un indirizzo IP libero per la rete '%(name)s'"
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
> -msgstr "L'interfaccia %(iface)s gi? esistente."
> +msgstr ""
> +"Interfaccia %(iface)s gi? esistente."
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"Il nome della rete deve essere una stringa senza barre (/) o virgolette (\")"
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "I tipi di rete supportati sono isolata, NAT e   bridge"
> +msgstr ""
> +"I tipi di rete supportati sono isolata, NAT e bridge"
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
>   msgstr ""
> -"La sottorete della rete deve essere una stringa con indirizzo IP e prefisso "
> -"o maschera di rete"
> +"La sottorete della rete deve essere una stringa con indirizzo IP e prefisso o maschera di rete"
>   
>   msgid "Network interface must be a string"
> -msgstr "L'interfaccia di rete deve essere una stringa"
> +msgstr ""
> +"L'interfaccia di rete deve essere una stringa"
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "L'ID VLAN di rete deve essere un numero intero tra 1 e 4094"
> +msgstr ""
> +"L'ID VLAN di rete deve essere un numero intero tra 1 e 4094"
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "Specificare nome e tipo per creare una rete"
> +msgstr ""
> +"Specificare nome e tipo per creare una rete"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
>   "and/or templates linked to this network."
>   msgstr ""
> -"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali "
> -"%(vms)s e/o modelli collegati a tale rete."
> +"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali %(vms)s "
> +"e/o modelli collegati a tale rete."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate network %(name)s. There are some virtual machines "
>   "%(vms)s and/or templates linked to this network."
>   msgstr ""
> -"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie "
> +"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtuali "
>   "%(vms)s e/o modelli collegati a tale rete."
>   
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
>   msgstr ""
> -"Il dispositivo bridge %(name)s non pu? essere il dispositivo trunk di una "
> -"VLAN."
> +"Il dispositivo bridge %(name)s non pu? essere il dispositivo trunk di una VLAN."
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "Impossibile attivare l'interfaccia %(iface)s: %(err)s."
> +msgstr ""
> +"Impossibile attivare l'interfaccia %(iface)s: %(err)s."
>   
>   #, python-format
>   msgid ""
> @@ -921,127 +1080,150 @@ msgstr ""
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
>   msgstr ""
> +"Impossibile avviare la rete %(name)s. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "Il report di debug %(name)s non esiste"
> +msgstr ""
> +"Il report di debug %(name)s non esiste"
>   
>   msgid "Debug report tool not found in system"
> -msgstr "Strumento report di debug non trovato nel sistema"
> +msgstr ""
> +"Strumento report di debug non trovato nel sistema"
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
> -msgstr "Impossibile creare il report di debug %(name)s. Dettagli: %(err)s."
> +msgstr ""
> +"Impossibile creare il report di debug %(name)s. Dettagli: %(err)s. "
>   
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
>   msgstr ""
> +"Impossibile trovare un report di debug con il nome fornito %(name)s"
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
> -msgstr "Impossibile generare il report di debug %(name)s. Dettagli: %(err)s"
> +msgstr ""
> +"Impossibile generare il report di debug %(name)s. Dettagli: %(err)s"
>   
>   msgid "You should give a name for the debug report file."
>   msgstr ""
> +"? necessario fornire un nome per il file report di debug. "
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> +"Il nome report di debug deve essere una stringa. Sono consentiti solo lettere, cifre, sottolineature ('_') "
> +"e trattini ('-')."
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
>   msgstr ""
> -"Un gruppo di volumi denominato '%(name)s' esiste gi?. Scegliere un altro "
> -"nome per creare il pool logico."
> +"Il report di debug con il nome specificato  \"%(name)s\" gi? esiste. Utilizzare "
> +"un altro."
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "Il server di memoria %(server)s non ? stato utilizzato da Kimchi"
> +msgstr ""
> +"Il server di memoria %(server)s non ? stato utilizzato da Kimchi"
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "Distro '%(name)s' non esistente"
> +msgstr ""
> +"Distro '%(name)s' non esistente"
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "La partizione %(name)s non esiste nell'host"
> +msgstr ""
> +"La partizione %(name)s non esiste nell'host"
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
>   msgstr ""
> -"Impossibile arrestare la macchina host poich? sono presenti macchine "
> -"virtuali in esecuzione"
> +"Impossibile arrestare la macchina host poich? sono presenti macchine virtuali in esecuzione"
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
>   msgstr ""
> -"Impossibile riavviare la macchina host poich? sono presenti macchine "
> -"virtuali in esecuzione"
> +"Impossibile riavviare la macchina host poich? sono presenti macchine virtuali in esecuzione"
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "Dispositivo nodo '%(name)s' non trovato"
> +msgstr ""
> +"Dispositivo nodo '%(name)s' non trovato"
>   
>   msgid "Conflicting flag filters specified."
>   msgstr ""
> +"Sono stati specificati dei filtri indicatore in conflitto."
>   
>   msgid "No packages marked for update"
> -msgstr "Nessun pacchetto contrassegnato per l'aggiornamento"
> +msgstr ""
> +"Nessun pacchetto contrassegnato per l'aggiornamento"
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "Il pacchetto %(name)s non ? contrassegnato per l'aggiornamento."
> +msgstr ""
> +"Il pacchetto %(name)s non ? contrassegnato per l'aggiornamento. "
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
>   msgstr ""
> -"Errore durante il richiamo dei pacchetti contrassegnati per l'aggiornamento. "
> -"Dettagli: %(err)s"
> +"Errore durante il richiamo dei pacchetti contrassegnati per l'aggiornamento. Dettagli: %(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "Non ? presente un gestore pacchetti compatibile per questo sistema."
> +msgstr ""
> +"Non ? presente un gestore pacchetti compatibile per questo sistema."
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "Impossibile trovare %(item)s nell'archivio dati"
> +msgstr ""
> +"Impossibile trovare %(item)s nell'archivio dati"
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "URI %(uri)s non valido"
> +msgstr ""
> +"URI non valido %(uri)s"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
>   msgstr ""
> -"? stato raggiunto il timeout durante l'esecuzione del comando '%(cmd)s' dopo "
> -"%(seconds)s secondi"
> +"Timeout durante l'esecuzione del comando '%(cmd)s' dopo %(seconds)s secondi"
>   
>   msgid "Unable to choose a virtual machine name"
>   msgstr ""
> +"Impossibile scegliere un nome di macchina virtuale"
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"Valore dati non valido '%(value)s'"
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"Unit? dati non valida '%(unit)s'"
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "Tipo di memoria non valido. I tipi supportati sono: 'cdrom'"
> +msgstr ""
> +"Tipo di memoria non valido. Tipi supportati: 'cdrom', 'disk'"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
>   msgstr ""
> +"Il percorso '%(value)s' non ? un percorso locale/remoto valido per il dispositivo"
>   
>   msgid "Only CDROM path can be update."
>   msgstr ""
> +"? possibile aggiornare solo il percorso CDROM."
>   
>   #, python-format
>   msgid ""
>   "The storage device %(dev_name)s does not exist in the virtual machine "
>   "%(vm_name)s"
>   msgstr ""
> +"Il dispositivo di memoria %(dev_name)s non esiste nella macchina virtuale"
> +"%(vm_name)s"
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
> @@ -1050,20 +1232,23 @@ msgstr ""
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
> -msgstr "Errore durante l'aggiornamento del dispositivo di memoria: %(error)s"
> +msgstr ""
> +"Errore durante l'aggiornamento del dispositivo di memoria: %(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
> -msgstr "Errore durante la rimozione del dispositivo di memoria: %(error)s"
> +msgstr ""
> +"Errore durante la rimozione del dispositivo di memoria: %(error)s"
>   
>   msgid "Do not support IDE device hot plug"
>   msgstr ""
> +"Non supportare hot plug dispositivo IDE"
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
>   msgstr ""
> -"Specificare tipo e percorso per aggiungere un nuovo disco della macchina "
> +"Specificare il tipo e il percorso oppure il tipo e il pool/volume per aggiungere un nuovo disco di macchina "
>   "virtuale"
>   
>   msgid "Specify path to update virtual machine disk"
> @@ -1073,90 +1258,110 @@ msgstr ""
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
>   msgstr ""
> +"Il tipo di controller %(type)s ha raggiunto il limite di %(limit)s dispositivi"
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
>   msgstr ""
> +"Impossibile richiamare le informazioni del percorso disco per il pool/volume fornito: %(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
>   msgstr ""
> +"Il volume ? gi? utilizzato da un'altra macchina virtuale."
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
>   msgstr ""
> -"Specificare tipo e percorso per aggiungere un nuovo disco della macchina "
> -"virtuale"
> +"? possibile specificare solo uno tra percorso o pool/volume per aggiungere un nuovo"
> +"disco di macchina virtuale"
>   
>   #, python-format
>   msgid ""
>   "Volume chosen with format %(format)s does not fit in the storage type "
>   "%(type)s"
>   msgstr ""
> +"Il volume scelto con il formato %(format)s non si adatta nel tipo di memoria "
> +"%(type)s"
>   
>   msgid "YUM Repository ID must be one word only string."
> -msgstr "L'ID repository YUM deve essere una stringa di una sola parola."
> +msgstr ""
> +"L'ID repository YUM deve essere una stringa di una sola parola."
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "L'URL del repository deve essere http://, ftp:// o file:// URL."
> +msgstr ""
> +"L'URL del repository deve essere http://, ftp:// o file:// URL."
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
>   "repository type."
>   msgstr ""
> -"La configurazione del repository ? un dizionario con valori specifici in "
> -"base al tipo di repository."
> +"La configurazione del repository ? un dizionario con valori specifici in base al "
> +"tipo di repository."
>   
>   msgid "Distribution to DEB repository must be a string"
> -msgstr "La distribuzione al repository DEB deve essere una stringa"
> +msgstr ""
> +"La distribuzione al repository DEB deve essere una stringa"
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "I componenti per il repository DEB devono essere elencati in un array"
> +msgstr ""
> +"I componenti per il repository DEB devono essere elencati in un array"
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "I componenti per il repository DEB devono essere una stringa"
> +msgstr ""
> +"I componenti per il repository DEB devono essere una stringa"
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"L'elenco di elementi speculari per il repository deve essere una stringa"
>   
>   msgid "YUM Repository name must be string."
> -msgstr "Il nome del repository YUM deve essere una stringa."
> +msgstr ""
> +"Il nome del repository YUM deve essere una stringa."
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "Il controllo GPG deve essere un valore booleano."
> +msgstr ""
> +"Il controllo GPG deve essere un valore booleano."
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
> -msgstr "La chiave GPG deve essere un URL che punta al file blindato ASCII."
> +msgstr ""
> +"La chiave GPG deve essere un URL che punta al file blindato ASCII."
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "Impossibile aggiornare il repository %(repo_id)s."
> +msgstr ""
> +"Impossibile aggiornare il repository %(repo_id)s."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "Il repository %(repo_id)s non esiste."
> +msgstr ""
> +"Il repository %(repo_id)s non esiste."
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"Specificare l'URL di base del repository, l'elenco di elementi speculari o metalink per poter creare o "
> +"aggiornare un repository YUM."
>   
>   msgid "Repository management tool was not recognized for your system."
>   msgstr ""
> -"Lo strumento di gestione del repository non ? stato riconosciuto per il "
> -"sistema."
> +"Lo strumento di gestione del repository non ? stato riconosciuto per il sistema."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "Il repository %(repo_id)s ? gi? abilitato."
> +msgstr ""
> +"Il repository %(repo_id)s ? gi? abilitato."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "Il repository %(repo_id)s ? gi? disabilitato."
> +msgstr ""
> +"Il repository %(repo_id)s ? gi? disabilitato."
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "Impossibile rimuovere il repository %(repo_id)s."
> +msgstr ""
> +"Impossibile rimuovere il repository %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
> @@ -1165,26 +1370,30 @@ msgstr ""
>   
>   msgid "Specify repository distribution in order to create a DEB repository."
>   msgstr ""
> -"Specificare la distribuzione del repository per poter creare un repository "
> -"DEB."
> +"Specificare la distribuzione del repository per poter creare un repository DEB."
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "Impossibile abilitare il repository %(repo_id)s."
> +msgstr ""
> +"Impossibile abilitare il repository %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "Impossibile disabilitare il repository %(repo_id)s."
> +msgstr ""
> +"Impossibile disabilitare il repository %(repo_id)s."
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "ID repository YUM gi? esistente"
> +msgstr ""
> +"ID repository YUM gi? esistente"
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "Il nome del repository YUM deve essere una stringa"
> +msgstr ""
> +"Il nome del repository YUM deve essere una stringa"
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "Impossibile elencare i repository. Dettagli: '%(err)s'"
> +msgstr ""
> +"Impossibile elencare i repository. Dettagli: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> @@ -1193,1062 +1402,1359 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "Impossibile aggiungere il repository. Dettagli: '%(err)s'"
> +msgstr ""
> +"Impossibile aggiungere il repository. Dettagli: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "Impossibile rimuovere il repository. Dettagli: '%(err)s'"
> +msgstr ""
> +"Impossibile rimuovere il repository. Dettagli: '%(err)s'"
>   
>   #, python-format
>   msgid ""
>   "Configuration items: '%(items)s' are not supported by repository manager"
>   msgstr ""
> +"Elementi di configurazione: '%(items)s' non supportati dal gestore repository "
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"Il metalink del repository deve essere http://, ftp:// o file:// URL."
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"Impossibile specificare contemporaneamente elenco di elementi speculari e metalink. "
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
>   msgstr ""
> +"La macchina virtuale '%(vm)s' deve essere arrestata prima di poterne creare l'istantanea. "
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossibile creare l'istantanea '%(name)s' sulla macchina virtuale '%(vm)s'. Dettagli: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
>   msgstr ""
> +"L'istantanea '%(name)s' non esiste sulla macchina virtuale '%(vm)s'."
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossibile richiamare l'istantanea '%(name)s' sulla macchina virtuale '%(vm)s'. Dettagli: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
>   msgstr ""
> +"Impossibile elencare le istantanee sulla macchina virtuale '%(vm)s'. Dettagli: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossibile eliminare l'istantanea '%(name)s' sulla macchina virtuale '%(vm)s'. Dettagli: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossibile richiamare l'istantanea corrente sulla macchina virtuale '%(vm)s'. Dettagli: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"Impossibile invertire la macchina virtuale '%(vm)s' alla istantanea '%(name)s'. Dettagli: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> +"Impossibile creare l'istantanea della macchina virtuale '%(vm)s' perch? contiene un "
> +"disco con formato '%(format)s'; solo 'qcow2' ? supportato."
>   
>   msgid "The number of vCPUs is too large for this system."
>   msgstr ""
> +"Il numero di vCPU ? troppo grande per questo sistema. "
>   
>   msgid "Invalid vCPU/topology combination."
>   msgstr ""
> +"Combinazione vCPU/topologia non valida. "
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
>   msgstr ""
> +"Questo host (o configurazione corrente) non consente la topologia CPU."
>   
>   msgid "ERROR CODE"
> -msgstr "CODICE DI ERRORE"
> +msgstr ""
> +"CODICE DI ERRORE"
>   
>   msgid "REASON"
> -msgstr "CAUSA"
> +msgstr ""
> +"CAUSA"
>   
>   msgid "STACK"
> -msgstr "STACK"
> +msgstr ""
> +"STACK"
>   
>   msgid "Go to Homepage"
> -msgstr "Vai alla home page"
> +msgstr ""
> +"Vai alla home page"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "Crea una nuova macchina virtuale"
> +msgstr ""
> +"Crea una nuova macchina virtuale"
>   
>   msgid "Virtual Machine Name"
> -msgstr "Nome macchina virtuale"
> +msgstr ""
> +"Nome macchina virtuale"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
>   msgstr ""
> -"Il nome utilizzato per identificare la macchina virtuale. Se il nome viene "
> -"omesso ne verr? scelto uno in base al modello utilizzato."
> +"Il nome utilizzato per identificare la macchina virtuale. Se il nome viene omesso "
> +"ne verr? scelto uno in base al modello utilizzato."
>   
>   msgid "Template"
> -msgstr "Modello"
> +msgstr ""
> +"Modello"
>   
>   msgid "Please create a template first."
> -msgstr "Creare prima un modello."
> +msgstr ""
> +"Creare prima un modello."
>   
>   msgid "Create a Template"
> -msgstr "Crea un modello"
> +msgstr ""
> +"Crea un modello"
>   
>   msgid "Please choose a template."
> -msgstr "Scegliere un modello."
> +msgstr ""
> +"Scegliere un modello."
>   
>   msgid "OS"
> -msgstr "SO"
> +msgstr ""
> +"SO"
>   
>   msgid "OS Version"
> -msgstr "Versione SO"
> +msgstr ""
> +"Versione SO"
>   
>   msgid "CPUS"
> -msgstr "CPUS"
> +msgstr ""
> +"CPUS"
>   
>   msgid "Memory"
> -msgstr "Memoria"
> +msgstr ""
> +"Memoria"
>   
>   msgid "Create"
> -msgstr "Crea"
> +msgstr ""
> +"Crea"
>   
>   msgid "Creating..."
>   msgstr ""
> +"Creazione..."
>   
>   msgid "Edit Guest"
> -msgstr "Modifica guest"
> +msgstr ""
> +"Modifica macchina guest"
>   
>   msgid "General"
> -msgstr "Generale"
> +msgstr ""
> +"Generale"
>   
>   msgid "Storage"
> -msgstr "Memoria"
> +msgstr ""
> +"Memoria"
>   
>   msgid "Interface"
> -msgstr "Interfaccia"
> +msgstr ""
> +"Interfaccia"
>   
>   msgid "Permission"
> -msgstr "Versione"
> +msgstr ""
> +"Autorizzazione"
>   
>   msgid "Host PCI Device"
>   msgstr ""
> +"Dispositivo PCI host"
>   
>   msgid "Snapshot"
>   msgstr ""
> +"Istantanea"
>   
>   msgid "Name"
> -msgstr "Nome"
> +msgstr ""
> +"Nome"
>   
>   msgid "CPUs"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Memory (MB)"
> -msgstr "Memoria"
> +msgstr ""
> +"Memoria (MB)"
>   
>   msgid "Icon"
> -msgstr "Icona"
> +msgstr ""
> +"Icona"
>   
>   msgid "Device"
> -msgstr "Nome dispositivo"
> +msgstr ""
> +"Unit?"
>   
>   msgid "Path"
> -msgstr "Percorso NFS"
> +msgstr ""
> +"Percorso"
>   
>   msgid "Network"
> -msgstr "Rete"
> +msgstr ""
> +"Rete"
>   
>   msgid "Type"
> -msgstr "Tipo"
> +msgstr ""
> +"Tipo"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"Indirizzo MAC"
>   
>   msgid "Available system users and groups"
>   msgstr ""
> +"Utenti e gruppi di sistema disponibili"
>   
>   msgid "Selected system users and groups"
>   msgstr ""
> +"Utenti e gruppi di sistema selezionati"
>   
>   msgid "User"
>   msgstr ""
> +"Utente "
>   
>   msgid "All"
> -msgstr "Tutti"
> +msgstr ""
> +"Tutti"
>   
>   msgid "To Add"
>   msgstr ""
> +"Da aggiungere"
>   
>   msgid "Added"
>   msgstr ""
> +"Aggiunto"
>   
>   msgid "filter"
>   msgstr ""
> +"filtro"
>   
>   msgid "Product"
>   msgstr ""
> +"Prodotto"
>   
>   msgid "Vendor"
> -msgstr "Fornitore"
> +msgstr ""
> +"Fornitore"
>   
>   msgid "Created"
>   msgstr ""
> +"Creato"
>   
>   msgid "Save"
> -msgstr "Salva"
> +msgstr ""
> +"Salva"
>   
>   msgid "Replace"
> -msgstr "Sostituisci"
> +msgstr ""
> +"Sostituisci"
>   
>   msgid "Detach"
> -msgstr "Scollega"
> +msgstr ""
> +"Scollega"
>   
>   msgid "Cancel"
> -msgstr "Annulla"
> +msgstr ""
> +"Annulla"
>   
>   msgid "revert"
>   msgstr ""
> +"Inverti"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "Aggiungi un dispositivo di memoria alla VM"
> +msgstr ""
> +"Aggiungi un dispositivo di memoria alla VM"
>   
>   msgid "Device Type"
> -msgstr "Tipo dispositivo"
> +msgstr ""
> +"Tipo dispositivo"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> -msgstr "Il tipo di dispositivo. Attualmente, ? supportato solo \"cdrom\"."
> +msgstr ""
> +"Il tipo di dispositivo. Attualmente, sono supportati \"cdrom\" e \"disk\"."
>   
>   msgid "Storage Pool"
> -msgstr "Pool di memoria"
> +msgstr ""
> +"Pool di memoria"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "Il percorso del pool di memoria deve essere una stringa"
> +msgstr ""
> +"Pool di memoria in cui si trova il volume"
>   
>   msgid "Storage Volume"
> -msgstr "Nome pool di memoria"
> +msgstr ""
> +"Volume di memoria"
>   
>   msgid "Storage volume to be attached"
> -msgstr "Il nome del volume di memoria deve essere una stringa"
> +msgstr ""
> +"Volume di memoria oggetto del collegamento"
>   
>   msgid "File Path"
> -msgstr "Percorso file"
> +msgstr ""
> +"Percorso file"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "Il percorso file ISO nel server per CDROM."
> +msgstr ""
> +"Il percorso file ISO nel server per CDROM."
>   
>   msgid "Attach"
> -msgstr "Allega"
> +msgstr ""
> +"Allega"
>   
>   msgid "Start"
> -msgstr "Avvia"
> +msgstr ""
> +"Avvia"
>   
>   msgid "Reset"
> -msgstr "Reimposta"
> +msgstr ""
> +"Reimposta"
>   
>   msgid "Pause"
>   msgstr ""
> +"In pausa"
>   
>   msgid "Resume"
>   msgstr ""
> +"Riprendi"
>   
>   msgid "Power Off"
>   msgstr ""
> +"Spegni"
>   
>   msgid "Actions"
> -msgstr "Azioni"
> +msgstr ""
> +"Azioni"
>   
>   msgid "Connect"
> -msgstr "Connetti"
> +msgstr ""
> +"Connetti"
>   
>   msgid "Clone"
>   msgstr ""
> +"Clona"
>   
>   msgid "Edit"
> -msgstr "Modifica"
> +msgstr ""
> +"Modifica"
>   
>   msgid "Shut Down"
> -msgstr "Arresta"
> +msgstr ""
> +"Arresta"
>   
>   msgid "Delete"
> -msgstr "Elimina"
> +msgstr ""
> +"Elimina"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr ""
> -"Il nome utente o la password immessi non sono corretti. Ripetere "
> -"l'operazione."
> +"Il nome utente o la password immessi non sono corretti. Ripetere l'operazione."
>   
>   msgid "This field is required."
> -msgstr "Questo campo ? obbligatorio."
> +msgstr ""
> +"Questo campo ? obbligatorio."
>   
>   msgid "Log in"
> -msgstr "Accedi"
> +msgstr ""
> +"Accedi"
>   
>   msgid "Logging in..."
> -msgstr "Accesso in corso..."
> +msgstr ""
> +"Accesso in corso..."
>   
>   msgid "Host"
> -msgstr "Host"
> +msgstr ""
> +"Host"
>   
>   msgid "Guests"
> -msgstr "Guest"
> +msgstr ""
> +"Guest"
>   
>   msgid "Templates"
> -msgstr "Modelli"
> +msgstr ""
> +"Modelli"
>   
>   msgid "Failed to get application configuration"
> -msgstr "Richiamo della configurazione dell'applicazione non riuscito"
> +msgstr ""
> +"Richiamo della configurazione dell'applicazione non riuscito"
>   
>   msgid "This is not a valid Linux path"
> -msgstr "Non ? un percorso Linux valido"
> +msgstr ""
> +"Non ? un percorso Linux valido"
>   
>   msgid "This is not a valid URL."
> -msgstr "Non ? un URL valido."
> +msgstr ""
> +"Non ? un URL valido."
>   
>   msgid "No such data available."
> -msgstr "Dati indicati non disponibili."
> +msgstr ""
> +"Dati indicati non disponibili."
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"Impossibile contattare il sistema host. Verificare che il sistema host sia "
> -"attivo e che si disponga della connettivit? di rete per tale sistema. "
> -"Risposta alla richiesta HTTP %1. "
> +"Impossibile contattare il sistema host. Verificare che il sistema host sia attivo e che "
> +"abbia la connettivit? di rete. Risposta alla richiesta HTTP %1. "
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"Impossibile leggere il file."
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"Errore durante il caricamento del file."
>   
>   msgid "Delete Confirmation"
> -msgstr "Conferma eliminazione"
> +msgstr ""
> +"Conferma eliminazione"
>   
>   msgid "OK"
> -msgstr "OK"
> +msgstr ""
> +"OK"
>   
>   msgid "Confirm"
> -msgstr "Conferma"
> +msgstr ""
> +"Conferma"
>   
>   msgid "Warning"
> -msgstr "Avvertenza"
> +msgstr ""
> +"Avvertenza"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"Clonazione..."
>   
>   msgid "Loading..."
> -msgstr "Caricamento in corso..."
> +msgstr ""
> +"Caricamento in corso..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"Si ? verificato un errore durante il richiamo delle informazioni di sistema. "
>   
>   msgid "Retry"
> -msgstr "Riprova"
> +msgstr ""
> +"Riprova"
>   
>   msgid "Detailed message:"
> -msgstr "Messaggio dettagliato:"
> +msgstr ""
> +"Messaggio dettagliato:"
>   
>   msgid "No ISO found"
>   msgstr ""
> +"Nessun file ISO trovato"
>   
>   msgid "This is not a valid ISO file."
> -msgstr "Non ? un file ISO valido."
> +msgstr ""
> +"Non ? un file ISO valido."
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "Richieder? molto tempo. Continuare?"
> +msgstr ""
> +"Questa operazione pu? richiedere del tempo. Si desidera continuare?"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
> -msgstr "L'azione eliminer? permanentemente il modello. Continuare?"
> +msgstr ""
> +"L'azione eliminer? permanentemente il modello. Si desidera continuare?"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
>   msgstr ""
> -"Impossibile arrestare il sistema poich? sono in esecuzione alcune macchine "
> -"virtuali."
> +"Impossibile arrestare il sistema poich? sono in esecuzione alcune macchine virtuali."
>   
>   msgid "Max:"
> -msgstr "Massimo:"
> +msgstr ""
> +"Massimo:"
>   
>   msgid "Utilization"
> -msgstr "Utilizzo"
> +msgstr ""
> +"Utilizzo"
>   
>   msgid "Available"
> -msgstr "Disponibile"
> +msgstr ""
> +"Disponibile"
>   
>   msgid "Read Rate"
> -msgstr "Velocit? di lettura"
> +msgstr ""
> +"Velocit? di lettura"
>   
>   msgid "Write Rate"
> -msgstr "Velocit? di scrittura"
> +msgstr ""
> +"Velocit? di scrittura"
>   
>   msgid "Received"
> -msgstr "Ricevuti"
> +msgstr ""
> +"Ricevuti"
>   
>   msgid "Sent"
> -msgstr "Inviati"
> +msgstr ""
> +"Inviati"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
>   msgstr ""
> -"L'arresto o il riavvio dell'host provocher? la perdita del lavoro non "
> -"salvato. Continuare con l'arresto o il riavvio?"
> +"L'arresto o il riavvio dell'host provocher? la perdita del lavoro non salvato. Continuare con "
> +"l'arresto o il riavvio?"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"Il repository verr? rimosso permanentemente e non potr? essere ripristinato. "
> -"Si desidera continuare?"
> +"Il repository verr? rimosso permanentemente e non potr? essere ripristinato. Si desidera "
> +"continuare?"
>   
>   msgid "Repositories"
> -msgstr "Repository"
> +msgstr ""
> +"Repository"
>   
>   msgid "ID"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Base URL"
> -msgstr "URL di base"
> +msgstr ""
> +"URL di base"
>   
>   msgid "Is Mirror"
> -msgstr "? speculare"
> +msgstr ""
> +"? speculare"
>   
>   msgid "URL Args"
> -msgstr "Argomenti URL"
> +msgstr ""
> +"Argomenti URL"
>   
>   msgid "Enabled"
> -msgstr "Abilitato"
> +msgstr ""
> +"Abilitato"
>   
>   msgid "GPG Check"
> -msgstr "Controllo GPG"
> +msgstr ""
> +"Controllo GPG"
>   
>   msgid "GPG Key"
> -msgstr "Chiave GPG"
> +msgstr ""
> +"Chiave GPG"
>   
>   msgid "Add"
> -msgstr "Aggiungi"
> +msgstr ""
> +"Aggiungi"
>   
>   msgid "Remove"
> -msgstr "Rimuovi"
> +msgstr ""
> +"Rimuovi"
>   
>   msgid "Enable"
> -msgstr "Abilita"
> +msgstr ""
> +"Abilita"
>   
>   msgid "Disable"
> -msgstr "Disabilita"
> +msgstr ""
> +"Disabilita"
>   
>   msgid "Software Updates"
> -msgstr "Aggiornamenti del software"
> +msgstr ""
> +"Aggiornamenti del software"
>   
>   msgid "Package Name"
> -msgstr "Nome pacchetto"
> +msgstr ""
> +"Nome pacchetto"
>   
>   msgid "Version"
> -msgstr "Versione"
> +msgstr ""
> +"Versione"
>   
>   msgid "Architecture"
> -msgstr "Architettura"
> +msgstr ""
> +"Architettura"
>   
>   msgid "Repository"
> -msgstr "Repository"
> +msgstr ""
> +"Repository"
>   
>   msgid "Update All"
> -msgstr "Aggiorna tutto"
> +msgstr ""
> +"Aggiorna tutto"
>   
>   msgid "Updating..."
> -msgstr "Aggiornamento in corso..."
> +msgstr ""
> +"Aggiornamento in corso..."
>   
>   msgid "Failed to retrieve packages update information."
>   msgstr ""
> +"Richiamo delle informazioni di aggiornamento dei pacchetti non riuscito."
>   
>   msgid "Failed to update package(s)."
> -msgstr "Aggiornamento dei pacchetti non riuscito."
> +msgstr ""
> +"Aggiornamento dei pacchetti non riuscito."
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"Il report del debug verr? rimosso permanentemente e non potr? essere "
> -"ripristinato. Si desidera continuare?"
> +"Il report del debug verr? rimosso permanentemente e non potr? essere ripristinato. Si desidera "
> +"continuare?"
>   
>   msgid "Debug Reports"
> -msgstr "Report di debug"
> +msgstr ""
> +"Report di debug"
>   
>   msgid "Generated Time"
> -msgstr "Ora di creazione"
> +msgstr ""
> +"Ora di creazione"
>   
>   msgid "Generate"
> -msgstr "Crea"
> +msgstr ""
> +"Crea"
>   
>   msgid "Generating..."
> -msgstr "Creazione in corso..."
> +msgstr ""
> +"Creazione in corso..."
>   
>   msgid "Rename"
> -msgstr "Ridenomina"
> +msgstr ""
> +"Ridenomina"
>   
>   msgid "Download"
> -msgstr "Scarica"
> +msgstr ""
> +"Scarica"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
>   msgstr ""
> -"Il nome del report pu? contenere solo lettere, cifre e/o trattini  ('-')."
> +"Il nome del report pu? contenere solo lettere, cifre, sottolineature ('_') e/o "
> +"trattini ('-')."
>   
>   msgid "Pending..."
> -msgstr "Caricamento in corso..."
> +msgstr ""
> +"In sospeso..."
>   
>   msgid "Report name is the same as the original one."
>   msgstr ""
> +"Il nome report ? uguale a quello originale. "
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
>   msgstr ""
>   "L'operazione eliminer? la macchina virtuale e i relativi dischi virtuali e "
> -"non ? reversibile. Continuare?"
> +"non ? reversibile. Si desidera continuare?"
>   
>   msgid "Power off Confirmation"
> -msgstr "Conferma eliminazione"
> +msgstr ""
> +"Conferma spegnimento"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
>   msgstr ""
> +"Questa azione pu? produrre dei risultati indesiderabili, ad esempio una cache di disco "
> +"non ripulita nella macchina guest. Si desidera continuare?"
>   
>   msgid "Reset Confirmation"
> -msgstr "Conferma eliminazione"
> +msgstr ""
> +"Conferma reimpostazione"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
>   msgstr ""
> +"C'? un rischio di perdita di dati causato dalla reimpostazione senza l'arresto del sistema operativo della macchina guest. "
> +"Si desidera continuare?"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "Conferma eliminazione"
> +msgstr ""
> +"Conferma dell'arresto"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
> -msgstr "L'azione eliminer? permanentemente il modello. Continuare?"
> +msgstr ""
> +"Notare che il sistema operativo della macchina guest pu? ignorare questa richiesta. Si desidera continuare?"
>   
>   msgid "Virtual Machine delete Confirmation"
>   msgstr ""
> +"Conferma di eliminazione della macchina virtuale"
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
>   msgstr ""
> +"Questa macchina virtuale non ? persistente. Lo spegnimento la eliminer?. Continuare?"
>   
>   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 ""
> +"Quando la macchina guest di destinazione ha volumi SCSI o iSCSI, essi verranno clonati sul"
> +"pool di memoria predefinito. Lo stesso accadr? se il pool di destinazione non"
> +"ha spazio sufficiente per clonare i volumi. Si desidera continuare?"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
>   msgstr ""
> -"Il CDROM verr? scollegato permanentemente e non sar? possibile ricollegarlo. "
> -"Continuare con lo scollegamento?"
> +"Il CDROM verr? scollegato permanentemente e non sar? possibile ricollegarlo. Continuare con "
> +"lo scollegamento?"
>   
>   msgid "Attaching..."
> -msgstr "Collegamento in corso..."
> +msgstr ""
> +"Collegamento in corso..."
>   
>   msgid "Replacing..."
> -msgstr "Sostituzione in corso..."
> +msgstr ""
> +"Sostituzione in corso..."
>   
>   msgid "Successfully attached!"
> -msgstr "Collegamento riuscito."
> +msgstr ""
> +"Collegamento riuscito."
>   
>   msgid "Successfully replaced!"
> -msgstr "Sostituzione riuscita."
> +msgstr ""
> +"Sostituzione riuscita."
>   
>   msgid "Successfully detached!"
> -msgstr "Scollegamento riuscito."
> +msgstr ""
> +"Scollegamento riuscito."
>   
>   msgid ""
>   "This disk will be detached permanently and you can re-attach it. Continue to "
>   "detach it?"
>   msgstr ""
> +"Il disco verr? scollegato permanentemente e sar? possibile ricollegarlo. Continuare con "
> +"lo scollegamento?"
>   
>   msgid "interface:"
>   msgstr ""
> +"interfaccia:"
>   
>   msgid "address:"
>   msgstr ""
> +"indirizzo:"
>   
>   msgid "link_type:"
>   msgstr ""
> +"tipo_link:"
>   
>   msgid "block:"
>   msgstr ""
> +"blocco:"
>   
>   msgid "drive_type:"
>   msgstr ""
> +"tipo_drive:"
>   
>   msgid "model:"
>   msgstr ""
> +"modello:"
>   
>   msgid "Affected devices:"
>   msgstr ""
> +"Dispositivi influenzati:"
>   
>   msgid "The VLAN id must be between 1 and 4094."
> -msgstr "L'ID VLAN deve essere compreso tra 1 e 4094."
> +msgstr ""
> +"L'ID VLAN deve essere compreso tra 1 e 4094."
>   
>   msgid "unavailable"
> -msgstr "non disponibile"
> +msgstr ""
> +"non disponibile"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
>   "depend on this network."
>   msgstr ""
> -"L'azione interromper? la connettivit? di rete per qualsiasi macchina "
> -"virtuale che dipende da questa rete."
> +"L'azione interromper? la connettivit? di rete per qualsiasi macchina virtuale che "
> +"dipende da questa rete."
>   
>   msgid "Create a network"
> -msgstr "Crea una rete"
> +msgstr ""
> +"Crea una rete"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"Il pool di memoria non ? permanente. Invece di disattivarlo, l'azione lo "
> -"eliminer? permanentemente. Continuare?"
> +"Questa rete non ? permanente. Invece di arrestarla, questa azione la "
> +"eliminer? permanentemente. Si desidera continuare?"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"La tag VLAN con bridge potrebbe non funzionare bene con NetworkManager abilitato. Si "
> +"dovrebbe prendere in considerazione la sua disabilitazione. "
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
> -msgstr "L'azione eliminer? permanentemente il pool di memoria. Continuare?"
> +msgstr ""
> +"L'azione eliminer? permanentemente il pool di memoria. Si desidera continuare?"
>   
>   msgid "This storage pool is empty."
> -msgstr "Il pool di memoria ? vuoto."
> +msgstr ""
> +"Il pool di memoria ? vuoto."
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
>   "to continue? "
>   msgstr ""
> -"Il disco verr? formattato e tutti i dati su di esso andranno persi, sicuri "
> -"di voler continuare? "
> +"Il disco verr? formattato e tutti i dati su di esso andranno persi, sicuri di voler "
> +"continuare? "
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "Canale a fibre ottiche SCSI"
> +msgstr ""
> +"Canale a fibre ottiche SCSI"
>   
>   msgid "No SCSI adapters found."
> -msgstr "Nessun adattatore SCSI trovato."
> +msgstr ""
> +"Nessun adattatore SCSI trovato."
>   
>   msgid "Loading iSCSI targets..."
>   msgstr ""
> +"Caricamento delle destinazioni iSCSI..."
>   
>   msgid "No iSCSI found. Please input one."
>   msgstr ""
> +"iSCSI non trovato. Immetterne uno."
>   
>   msgid "Failed to load iSCSI targets."
>   msgstr ""
> +"Impossibile caricare le destinazioni iSCSI."
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "Il campo per il nome del pool di memoria non pu? essere vuoto."
> +msgstr ""
> +"Il campo per il nome del pool di memoria non pu? essere vuoto."
>   
>   msgid "The storage pool path can not be blank."
> -msgstr "Il campo per il percorso del pool di memoria non pu? essere vuoto."
> +msgstr ""
> +"Il campo per il percorso del pool di memoria non pu? essere vuoto."
>   
>   msgid "NFS server mount path can not be blank."
>   msgstr ""
>   "Il campo per il percorso di montaggio del server NFS non pu? essere vuoto."
>   
>   msgid "Invalid NFS mount path."
> -msgstr "Percorso di montaggio NFS non valido."
> +msgstr ""
> +"Percorso di montaggio NFS non valido."
>   
>   msgid "No logical device selected."
> -msgstr "Nessun dispositivo logico selezionato."
> +msgstr ""
> +"Nessun dispositivo logico selezionato."
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "Il campo per la destinazione iSCSI non pu? essere vuoto."
> +msgstr ""
> +"Il campo per la destinazione iSCSI non pu? essere vuoto."
>   
>   msgid "Server name can not be blank."
> -msgstr "Il campo per il nome del server non pu? essere vuoto."
> +msgstr ""
> +"Il campo per il nome del server non pu? essere vuoto."
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
>   msgstr ""
> +"Nome server o IP non validi. Modificarli."
>   
>   msgid "Looking for available partitions ..."
> -msgstr "Ricerca di partizioni disponibili in corso..."
> +msgstr ""
> +"Ricerca di partizioni disponibili in corso..."
>   
>   msgid "No available partitions found."
> -msgstr "Nessuna partizione disponibile trovata."
> +msgstr ""
> +"Nessuna partizione disponibile trovata."
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
>   "Il pool di memoria non ? permanente. Invece di disattivarlo, l'azione lo "
> -"eliminer? permanentemente. Continuare?"
> +"eliminer? permanentemente. Si desidera continuare?"
>   
>   msgid "Unable to retrieve partitions information."
>   msgstr ""
> -"Impossibile richiamare le informazioni sul repository. Dettagli: '%(err)s'"
> +"Impossibile caricare le informazioni sulla partizione. "
>   
>   msgid "In progress..."
>   msgstr ""
> +"In corso..."
>   
>   msgid "Failed!"
>   msgstr ""
> +"Non riuscito."
>   
>   msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
>   msgstr ""
> +"Il percorso CDROM deve essere un percorso locale/remoto valido e non pu? essere vuoto."
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "Il campo per il nome del pool di memoria non pu? essere vuoto."
> +msgstr ""
> +"Il volume o il pool di dischi non pu? essere vuoto."
>   
>   msgid "Peers"
>   msgstr ""
> +"Peer"
>   
>   msgid "Searching"
>   msgstr ""
> +"Ricerca "
>   
>   msgid "No peers found."
>   msgstr ""
> +"Nessun peer trovato. "
>   
>   msgid "Help"
> -msgstr "Guida"
> +msgstr ""
> +"Guida"
>   
>   msgid "About"
> -msgstr "Info su"
> +msgstr ""
> +"Info su"
>   
>   msgid "Log out"
> -msgstr "Disconnetti"
> +msgstr ""
> +"Disconnetti"
>   
>   msgid "Version:"
> -msgstr "Versione:"
> +msgstr ""
> +"Versione:"
>   
>   msgid "Session timeout, please re-login."
>   msgstr ""
> +"Timeout della sessione; rieseguire l'accesso."
>   
>   msgid "User Name"
> -msgstr "Nome utente"
> +msgstr ""
> +"Nome utente"
>   
>   msgid "Password"
> -msgstr "Password"
> +msgstr ""
> +"Password"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "Crea un nuovo report di debug"
> +msgstr ""
> +"Crea un nuovo report di debug"
>   
>   msgid "Report Name"
> -msgstr "Nome report"
> +msgstr ""
> +"Nome report"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"Il nome utilizzato per identificare il report. Se il nome viene omesso, ne "
> -"viene scelto uno in base all'ora corrente. Il nome pu? contenere lettere, "
> -"cifre e trattini (\"-\")."
> +"Il nome utilizzato per identificare il report. Se il nome viene omesso, ne viene scelto uno "
> +"in base all'ora corrente. Il nome pu? contenere lettere, cifre, sottolineature (\"_\") "
> +"e trattini (\"-\")."
>   
>   msgid "Rename a Debug Report"
> -msgstr "Crea un nuovo report di debug"
> +msgstr ""
> +"Ridenomina un report di debug"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
>   msgstr ""
> -"Il nome utilizzato per identificare il report. Se il nome viene omesso, ne "
> -"viene scelto uno in base all'ora corrente. Il nome pu? contenere lettere, "
> -"cifre e trattini (\"-\")."
> +"Il nome utilizzato per identificare il report. Il nome pu? contenere lettere, cifre e"
> +"trattini (\"-\")."
>   
>   msgid "Submit"
>   msgstr ""
> +"Inoltra"
>   
>   msgid "Add a Repository"
> -msgstr "Aggiungi un repository"
> +msgstr ""
> +"Aggiungi un repository"
>   
>   msgid "Identifier"
> -msgstr "Identificativo"
> +msgstr ""
> +"Identificativo"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "Identificativo univoco di una sola parola per il  repository."
> +msgstr ""
> +"Identificativo univoco di una sola parola per il  repository."
>   
>   msgid "Textual name for the repository."
> -msgstr "Nome in formato testo per il repository."
> +msgstr ""
> +"Nome in formato testo per il repository."
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "Campo obbligatorio"
> +msgstr ""
> +"Campo obbligatorio"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "URL al repository. I protocolli supportati sono http, ftp e file."
> +msgstr ""
> +"URL al repository. I protocolli supportati sono http, ftp e file."
>   
>   msgid "Repository is a mirror"
> -msgstr "Il repository ? un elemento speculare."
> +msgstr ""
> +"Il repository ? un elemento speculare"
>   
>   msgid "Distribution"
> -msgstr "Distribuzione"
> +msgstr ""
> +"Distribuzione"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "Distribuzione del repository DEB."
> +msgstr ""
> +"Distribuzione del repository DEB."
>   
>   msgid "Components"
> -msgstr "Componenti"
> +msgstr ""
> +"Componenti"
>   
>   msgid "List of components in DEB repository."
> -msgstr "Elenco di componenti nel repository DEB."
> +msgstr ""
> +"Elenco di componenti nel repository DEB."
>   
>   msgid "Edit Repository"
> -msgstr "Modifica repository"
> +msgstr ""
> +"Modifica repository"
>   
>   msgid "Mirror List URL"
> -msgstr "URL elenco elementi speculari"
> +msgstr ""
> +"URL elenco elementi speculari"
>   
>   msgid "Yes"
> -msgstr "S?"
> +msgstr ""
> +"S?"
>   
>   msgid "No"
> -msgstr "No"
> +msgstr ""
> +"No"
>   
>   msgid "Add a Volume to Storage Pool"
>   msgstr ""
> +"Aggiungi un volume al pool di memoria"
>   
>   msgid "Fetch from remote URL"
>   msgstr ""
> +"Richiama da URL remoto"
>   
>   msgid "Enter the remote URL here."
>   msgstr ""
> +"Immettere qui l'URL remoto. "
>   
>   msgid "Upload a file"
>   msgstr ""
> +"Carica un file"
>   
>   msgid "Choose the file you want to upload."
>   msgstr ""
> +"Selezionare il file da caricare. "
>   
>   msgid "Define a New Storage Pool"
> -msgstr "Definisci un nuovo pool di memoria"
> +msgstr ""
> +"Definisci un nuovo pool di memoria"
>   
>   msgid "Storage Pool Name"
> -msgstr "Nome pool di memoria"
> +msgstr ""
> +"Nome pool di memoria"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
>   msgstr ""
> -"Il nome utilizzato per identificare i pool di memoria; il campo non deve "
> -"essere vuoto."
> +"Il nome utilizzato per identificare i pool di memoria; il campo non deve essere vuoto."
>   
>   msgid "Storage Pool Type"
> -msgstr "Tipo di pool di memoria"
> +msgstr ""
> +"Tipo di pool di memoria"
>   
>   msgid "Storage Path"
> -msgstr "Percorso di memoria"
> +msgstr ""
> +"Percorso di memoria"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
>   msgstr ""
> -"Il percorso del pool di memoria. Ogni pool di memoria deve avere un percorso "
> -"univoco."
> +"Il percorso del pool di memoria. Ogni pool di memoria deve avere un percorso univoco."
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
>   msgstr ""
> -"Kimchi tenter? di creare la directory nel caso non esista ancora sul sistema."
> +"Kimchi tenter? di creare la directory nel caso non esista ancora sul "
> +"sistema."
>   
>   msgid "NFS Server IP"
> -msgstr "IP server NFS"
> +msgstr ""
> +"IP server NFS"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
>   msgstr ""
> -"Il nome host o l'indirizzo IP del server NFS. ? possibile immetterlo o "
> -"sceglierlo dalla cronologia."
> +"Il nome host o l'indirizzo IP del server NFS. ? possibile immetterlo o sceglierlo dalla cronologia."
>   
>   msgid "NFS Path"
> -msgstr "Percorso NFS"
> +msgstr ""
> +"Percorso NFS"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "Il percorso esportato NFS sul server NFS."
> +msgstr ""
> +"Il percorso esportato NFS sul server NFS."
>   
>   msgid "Device path"
> -msgstr "Percorso dispositivo"
> +msgstr ""
> +"Percorso dispositivo"
>   
>   msgid "iSCSI Server"
> -msgstr "Server iSCSI"
> +msgstr ""
> +"Server iSCSI"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
>   msgstr ""
> -"Il nome host o l'indirizzo IP del server iSCSI. Il campo non deve essere "
> -"vuoto."
> +"Il nome host o l'indirizzo IP del server iSCSI. Il campo non deve essere vuoto."
>   
>   msgid "Server"
> -msgstr "Server"
> +msgstr ""
> +"Server"
>   
>   msgid "Port"
> -msgstr "Porta"
> +msgstr ""
> +"Porta"
>   
>   msgid "Target"
> -msgstr "Destinazione"
> +msgstr ""
> +"Destinazione"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "La destinazione iSCSI sul server iSCSI"
> +msgstr ""
> +"La destinazione iSCSI sul server iSCSI"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "Aggiungi autenticazione iSCSI"
> +msgstr ""
> +"Aggiungi autenticazione iSCSI"
>   
>   msgid "iSCSI Authentication"
> -msgstr "Autenticazione iSCSI"
> +msgstr ""
> +"Autenticazione iSCSI"
>   
>   msgid "SCSI Adapter"
> -msgstr "Adattatore SCSI"
> +msgstr ""
> +"Adattatore SCSI"
>   
>   msgid "Please, wait..."
> -msgstr "Attendere..."
> +msgstr ""
> +"Attendere..."
>   
>   msgid "Add Template"
> -msgstr "Aggiungi modello"
> +msgstr ""
> +"Aggiungi modello"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "Dov'? il supporto di origine per questo modello?"
> +msgstr ""
> +"Dov'? il supporto di origine per questo modello? "
>   
>   msgid "Local ISO Image"
> -msgstr "Immagine ISO locale"
> +msgstr ""
> +"Immagine ISO locale"
>   
>   msgid "Local Image File"
>   msgstr ""
> +"File immagine locale"
>   
>   msgid "Remote ISO Image"
> -msgstr "Immagine ISO remota"
> +msgstr ""
> +"Immagine ISO remota"
>   
>   msgid "Search ISOs"
> -msgstr "Ricerca ISO"
> +msgstr ""
> +"Ricerca ISO"
>   
>   msgid "The following ISOs are available:"
> -msgstr "Sono disponibili i seguenti file ISO:"
> +msgstr ""
> +"Sono disponibili i seguenti file ISO:"
>   
>   msgid "OS: "
> -msgstr "SO: "
> +msgstr ""
> +"SO: "
>   
>   msgid "Version: "
> -msgstr "Versione: "
> +msgstr ""
> +"Versione: "
>   
>   msgid "Size: "
> -msgstr "Dimensione: "
> +msgstr ""
> +"Dimensione: "
>   
>   msgid "Search more ISOs"
> -msgstr "Ricerca pi? ISO"
> +msgstr ""
> +"Ricerca pi? ISO"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "Crea modelli da ISO selezionato"
> +msgstr ""
> +"Crea modelli da ISO selezionato"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "Utilizzare un file ISO specifico"
> +msgstr ""
> +"Utilizzare un file ISO specifico"
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "Caricamento di ISO remoti predefiniti in corso..."
> +msgstr ""
> +"Caricamento di ISO remoti predefiniti in corso..."
>   
>   msgid "Arch: "
> -msgstr "Arch: "
> +msgstr ""
> +"Arch: "
>   
>   msgid "I want to use a custom URL"
> -msgstr "Utilizzare un URL personalizzato"
> +msgstr ""
> +"Utilizzare un URL personalizzato"
>   
>   msgid "Edit Template"
> -msgstr "Modifica modello"
> +msgstr ""
> +"Modifica modello"
>   
>   msgid "Processor"
> -msgstr "Processore"
> +msgstr ""
> +"Processore"
>   
>   msgid "CDROM"
> -msgstr "CDROM"
> +msgstr ""
> +"CDROM"
>   
>   msgid "Image File"
>   msgstr ""
> +"File immagine "
>   
>   msgid "Graphics"
> -msgstr "Grafici"
> +msgstr ""
> +"Grafici"
>   
>   msgid "Disk(GB)"
>   msgstr ""
> +"Disco (GB)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"Formato disco"
>   
>   msgid "CPU Number"
> -msgstr "Numero CPU"
> +msgstr ""
> +"Numero CPU"
>   
>   msgid "Manually set CPU topology"
>   msgstr ""
> +"Imposta manualmente la topologia CPU"
>   
>   msgid "Cores"
>   msgstr ""
> +"Core"
>   
>   msgid "Threads"
>   msgstr ""
> +"Thread"
>   
>   msgid "CPU"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Disk I/O"
> -msgstr "I/O disco"
> +msgstr ""
> +"I/O disco"
>   
>   msgid "Network I/O"
> -msgstr "I/O di rete"
> +msgstr ""
> +"I/O di rete"
>   
>   msgid "Livetile"
> -msgstr "Riquadro animato"
> +msgstr ""
> +"Riquadro animato"
>   
>   msgid "No guests found."
> -msgstr "Nessuna macchina guest trovata."
> +msgstr ""
> +"Nessuna macchina guest trovata."
>   
>   msgid "Shut down"
> -msgstr "Arresta"
> +msgstr ""
> +"Arresta"
>   
>   msgid "Restart"
> -msgstr "Riavvia"
> +msgstr ""
> +"Riavvia"
>   
>   msgid "Basic Information"
> -msgstr "Informazioni di base"
> +msgstr ""
> +"Informazioni di base"
>   
>   msgid "OS Distro"
> -msgstr "Distro SO"
> +msgstr ""
> +"Distro SO"
>   
>   msgid "OS Code Name"
> -msgstr "Nome codice SO"
> +msgstr ""
> +"Nome codice SO"
>   
>   msgid "CPU(s)"
>   msgstr ""
> +"CPU"
>   
>   msgid "System Statistics"
> -msgstr "Statistiche di sistema"
> +msgstr ""
> +"Statistiche di sistema"
>   
>   msgid "Update Progress"
> -msgstr "Avanzamento aggiornamento"
> +msgstr ""
> +"Avanzamento aggiornamento"
>   
>   msgid "Network Name"
> -msgstr "Nome rete"
> +msgstr ""
> +"Nome rete"
>   
>   msgid "State"
> -msgstr "Stato"
> +msgstr ""
> +"Stato"
>   
>   msgid "Network Type"
> -msgstr "Tipo di Rete"
> +msgstr ""
> +"Tipo di Rete"
>   
>   msgid "Address Space"
> -msgstr "Spazio indirizzo"
> +msgstr ""
> +"Spazio indirizzo"
>   
>   msgid "Name should not contain '/' and '\"'."
> -msgstr "Nome pool di memoria non valido. Non deve contenere '/'."
> +msgstr ""
> +"Il nome non deve contenere '/' e '\"'."
>   
>   msgid "Isolated: no external network connection"
> -msgstr "Isolata: nessuna connessione di rete fisica"
> +msgstr ""
> +"Isolata: nessuna connessione di rete esterna"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT: solo connessione di rete fisica in uscita"
> +msgstr ""
> +"NAT: solo connessione di rete fisica in uscita"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
>   msgstr ""
> @@ -2256,57 +2762,80 @@ msgstr ""
>   
>   msgid "(No interfaces found)"
>   msgstr ""
> +"(Nessuna interfaccia trovata)"
>   
>   msgid "Destination"
> -msgstr "Destinazione:"
> +msgstr ""
> +"Destinazione"
>   
>   msgid "Enable VLAN"
> -msgstr "Abilita VLAN:"
> +msgstr ""
> +"Abilita VLAN"
>   
>   msgid "VLAN ID"
> -msgstr "ID VLAN:"
> +msgstr ""
> +"ID VLAN"
>   
>   msgid "Stop"
> -msgstr "Arresta"
> +msgstr ""
> +"Arresta"
>   
>   msgid "%Used"
>   msgstr ""
> +"% utilizzata"
>   
>   msgid "Location"
> -msgstr "Ubicazione"
> +msgstr ""
> +"Ubicazione"
>   
>   msgid "Capacity"
> -msgstr "Capacit?"
> +msgstr ""
> +"Capacit?"
>   
>   msgid "Allocated"
> -msgstr "Assegnato"
> +msgstr ""
> +"Assegnato"
>   
>   msgid "active"
> -msgstr "attivo"
> +msgstr ""
> +"attivo"
>   
>   msgid "inactive"
> -msgstr "non attivo"
> +msgstr ""
> +"non attivo"
>   
>   msgid "Deactivate"
> -msgstr "Disattiva"
> +msgstr ""
> +"Disattiva"
>   
>   msgid "Activate"
> -msgstr "Attiva"
> +msgstr ""
> +"Attiva"
>   
>   msgid "Add Volume"
>   msgstr ""
> +"Aggiungi volume"
>   
>   msgid "Extend"
>   msgstr ""
> +"Estendi"
>   
>   msgid "Undefine"
> -msgstr "Rimuovi definizione"
> +msgstr ""
> +"Rimuovi definizione"
>   
>   msgid "Format"
> -msgstr "Formato:"
> +msgstr ""
> +"Formato"
>   
>   msgid "Allocation"
> -msgstr "Allocazione:"
> +msgstr ""
> +"Assegnazione"
>   
>   msgid "No templates found."
> -msgstr "Nessun modello trovato."
> +msgstr ""
> +"Nessun modello trovato."
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/po/ko_KR.po b/po/ko_KR.po
> index 5007684..bda3e57 100644
> --- a/po/ko_KR.po
> +++ b/po/ko_KR.po
> @@ -1,5 +1,6 @@
>   # English translations for kimchi package.
>   # Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
> @@ -9,119 +10,145 @@ msgstr ""
>   "PO-Revision-Date: 2013-07-11 17:32-0400\n"
>   "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
>   "Language-Team: English\n"
> -"Language: ko_KR\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
> +"Plural-Forms: nplurals=1; plural=0;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
>   msgstr ""
> +"? ? ?? ???? %(value)s"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "%(resource)s? ??? ???? ??"
> +msgstr ""
> +"%(resource)s? ??? ???? ????."
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "%(resource)s??? ???? ???? ???? ??"
> +msgstr ""
> +"%(resource)s??? ???? ???? ???? ????."
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "%(resource)s? ??? ???? ??"
> +msgstr ""
> +"%(resource)s? ??? ???? ????."
>   
>   msgid "Unable to parse JSON request"
> -msgstr "JSON ??? ?? ??? ? ????."
> +msgstr ""
> +"JSON ??? ?? ??? ? ????."
>   
>   msgid "This API only supports JSON"
> -msgstr "? API? JSON? ?????."
> +msgstr ""
> +"? API? JSON? ?????."
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
>   msgstr ""
> +"????? ???? ????? ???? ??: %(err)s"
>   
>   msgid "You don't have permission to perform this operation."
>   msgstr ""
> +"? ??? ??? ? ?? ??? ????."
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "??? ???? ?? ?????? ???? ?????."
> +msgstr ""
> +"??? ???? ?? ?????? ???? ?????."
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> -msgstr "?? ??? ??? ??? ? ??: %(err)s"
> +msgstr ""
> +"?? ??? ??? ??? ? ??: %(err)s"
>   
>   #, python-format
>   msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
>   msgstr ""
> +"'%(task)s ??? ?? ?? %(seconds)s?? ????? ???????."
>   
>   #, python-format
>   msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
> -msgstr "??? '%(username)s'? ??? ??????. [?? ??: %(code)s]"
> +msgstr ""
> +"'%(username)s' ??? ??? ??????. [?? ??: %(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "Kimchi? ???? ??? ????."
> +msgstr ""
> +"Kimchi? ???? ??? ????."
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "Kimchi? ?????? %(item)s?(?) ??????."
> +msgstr ""
> +"Kimchi? ?????? %(item)s?(?) ??????."
>   
>   #, python-format
>   msgid "User %(user_id)s not found with given LDAP settings."
>   msgstr ""
> +"??? LDAP ???? %(user_id)s ???? ?? ?????."
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
>   msgstr ""
> +"???? ?? LDAP ??: %(item)s : %(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
>   msgstr ""
> +"? ? ?? \"_cap\"? ???????."
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
>   msgstr ""
> +"\"_passthrough\"? \"true\" ?? \"false\"?? ???."
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
>   msgstr ""
> +"\"_passthrough_affected_by\"? ?? ?? ?????? ???."
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
> -msgstr "?? ??? ???? ?? ??? ??????. ????: %(err)s"
> +msgstr ""
> +"?? ??? ???? ?? ??? ??????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
> -msgstr "%(device)s? ?? ?? ?? ??? ???? ?? ??? ??????."
> +msgstr ""
> +"%(device)s? ?? ?? ?? ??? ???? ?? ??? ??????."
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "distro ??? ?? ? ??: %(filename)s"
> +msgstr ""
> +"distro ??? ?? ? ??: %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
>   msgstr ""
> -"distro ??(%(filename)s)? ?? ??? ? ????. JSON ???? ?????"
> -"?."
> +"distro ??? ?? ??? ? ??: %(filename)s. JSON ???? ??????."
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
> -msgstr "iSCSI ??? ?? %(portal)s? ???? ? ????. ????: %(err)s"
> +msgstr ""
> +"iSCSI ??? ?? %(portal)s? ???? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
> -msgstr "iSCSI host %(host)s ?? %(target)s? ???? ? ????."
> +msgstr ""
> +"iSCSI ??? %(host)s ?? %(target)s? ???? ? ????."
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
>   msgstr ""
> +"ISO ?? %(filename)s?(?) ?? ? ????."
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "ISO ?? %(filename)s?(?) ?? ???? ????."
> +msgstr ""
> +"ISO ?? %(filename)s?(?) ?? ???? ????."
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
> -msgstr "ISO ?? %(filename)s? ??? El Torito ?? ???? ????."
> +msgstr ""
> +"ISO ?? %(filename)s? ??? El Torito ?? ???? ????."
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> @@ -130,17 +157,18 @@ msgstr ""
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "ISO %(filename)s? ???? ?? El Torito ?? ???? ????."
> +msgstr ""
> +"ISO %(filename)s? ???? ?? El Torito ?? ???? ????."
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
> -msgstr "ISO %(filename)s?? ?? ??? ??? ?? ?? ?????."
> +msgstr ""
> +"ISO %(filename)s?? ?? ??? ??? ?? ?? ?????."
>   
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
>   msgstr ""
> -"ISO %(filename)s?? ?? ?????? ?? ?? ??? ??? ??????"
> -"?."
> +"ISO %(filename)s?? ?? ?????? ?? ?? ??? ??? ???????."
>   
>   #, python-format
>   msgid ""
> @@ -150,209 +178,265 @@ msgid ""
>   "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
>   "'path_to_iso'.Details: %(err)s"
>   msgstr ""
> -"??????? ? ISO %(filename)s?(?) ??? ??? ????. ?? /var/"
> -"lib/libvirt ??? ??????, (??? ??) ?? ??? '%(user)s' ???"
> -"? ?? ??? ?? ??? ?????, '%(user)s'?(?) ISO ?? ??? ??"
> -"???, 'chmod -R o+x 'path_to_iso'(???? ??)? ??????. ????: "
> -"%(err)s"
> +"??????? ? ISO %(filename)s?(?) ??? ??? ????. "
> +"?? /var/lib/libvirt ??? ?????? (??? ??) ?? ??? "
> +"'%(user)s' ???? ?? ??? ?? ??? ????? "
> +"'%(user)s'?(?) ISO ?? ?? ?? (???? ??) 'chmod -R o+x "
> +"'path_to_iso'? ??????. ????: %(err)s"
>   
>   msgid "An error occurred when probing image OS information."
>   msgstr ""
> +"??? OS ??? ????? ?? ??? ??????."
>   
>   msgid "No OS information found in given image."
>   msgstr ""
> +"??? ???? OS ??? ????."
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
>   msgstr ""
> +"??? ?? %(filename)s?(?) ?? ? ????."
>   
>   #, python-format
>   msgid ""
>   "Image file must be an existing file on system. %(filename)s is not a valid "
>   "input."
>   msgstr ""
> +"??? ??? ???? ?? ?? ????? ???. %(filename)s?(?) ???? ??"
> +"?????."
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "?? ?? %(name)s?(?) ?? ?????."
> +msgstr ""
> +"?? ?? %(name)s?(?) ?? ?????."
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "?? ?? %(name)s?(?) ????."
> +msgstr ""
> +"?? ?? %(name)s?(?) ????."
>   
>   #, python-format
>   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 ""
> +"?? ?? %(name)s? ??? ?? ? ????. %(new_name)s ??? ??"
> +"?? ???? ?? ??? ??? ?????."
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
> -msgstr "??? ?? ?? %(name)s? ?? ????? ??? ? ????."
> +msgstr ""
> +"??? ?? ?? %(name)s? ?? ????? ??? ? ????."
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "?? ISO ???? ? ???? ???? ????."
> +msgstr ""
> +"?? ISO ???? ? ???? ???? ????."
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
>   msgstr ""
> +"????? ?? ?? %(name)s?? ???? ????."
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s?(?) ????? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
>   msgstr ""
> +"??? ?? ?? ?? %(name)s? ??? ? ????."
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"?? ?? ??? ???(/)? ???? ?? ?????? ???."
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
>   msgstr ""
> +"?? ??? ?? ???? ?? ???? URI %(value)s?(?) ???????."
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
>   msgstr ""
> +"?? ??? ?? ???? ?? ???? URI %(value)s?(?) ???????."
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
>   msgstr ""
> +"???? ?? ?? ???? Spice ?? VNC???."
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
> -msgstr "?? ?? ??? ??? IPv4 ?? IPv6?? ???."
> +msgstr ""
> +"?? ?? ??? ??? IPv4 ?? IPv6?? ???."
>   
>   msgid "Specify a template to create a virtual machine from"
> -msgstr "?? ??? ???? ?? ????? ??????."
> +msgstr ""
> +"?? ??? ???? ?? ????? ??????."
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s? ??? ? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s? ??? ?? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s?(?) ?? ??? ? ????. ????: %(err)s"
>   
>   msgid "User name list must be an array"
>   msgstr ""
> +"??? ?? ??? ????? ???."
>   
>   msgid "User name must be a string"
> -msgstr "???? ??? ?????? ???."
> +msgstr ""
> +"??? ??? ?????? ???."
>   
>   msgid "Group name list must be an array"
>   msgstr ""
> +"?? ?? ??? ????? ???."
>   
>   msgid "Group name must be a string"
> -msgstr "???? ??? ?????? ???."
> +msgstr ""
> +"?? ??? ?????? ???."
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "'%(users)s' ???? ????."
> +msgstr ""
> +"??? '%(users)s'?(?) ????."
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "'%(groups)s' ???? ????."
> +msgstr ""
> +"?? '%(groups)s'?(?) ????."
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"?? ?? %(name)s? ??? ?? ?????? ??? ? ????. ????: %(err)s"
>   
>   msgid "The guest console password must be a string."
>   msgstr ""
> +"??? ?? ????? ?????? ???."
>   
>   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 ""
> +"?? ?? '%(name)s'?(?) ???? ?? ???? ???."
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
>   msgstr ""
> +"?? ?? '%(name)s'?(?) ?????? ??? ??? ???? ????."
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"VM '%(name)s'?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"???? ?? ?? %(name)s? ?? ???? ?? ?????."
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"VM '%(name)s'?(?) ?? ?? ???? ????? ? ????."
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"VM %(name)s?(?) ????? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"VM '%(name)s'?(?) ?????? ??? ??? ??? ? ????."
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"VM '%(name)s'?(?) ??? ? ????. ????: %(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"??? ???? ????? ???? ?? ???? ???."
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"VM '%(name)s'??? ??? ??? ????? ???? ????. ?? ???? ??? ???? ??????"
> +"? ??? ???? ??????."
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"?? VM??? ??? ???? ?????."
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"??? ??? ????? ?? ? ??? ?? ?? ??? ?? 1024 Mib? ??? ?? ??"
> +"??? ???."
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"???? 1024Mib? ?? ??? ????."
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"???? libvirt ????? ??? ??? ???? ????. Libvirt?"
> +"1.2.14????? ???."
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"??? ??? ???? ? ??? ??????. ????: %(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
>   msgstr ""
> +"VM %(vmid)s?(?) ?? ??? ??? ?? %(dev_name)s?(?) ???? ?? ????."
>   
>   #, python-format
>   msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
>   msgstr ""
> +"??? ?? %(dev_name)s?(?) ?? VM? ??? ? ????."
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -361,102 +445,127 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> +"IOMMU ??? ?? ? ????. ???? ????? ??? PCI pass through? "
> +"IOMMU ??? ??? ???. BIOS?? Intel VT-d ?? AMD IOMMU? ????? ??? ? "
> +"??? IOMMU ???? ??????? ??????. Intel CPU? ??, "
> +"/boot/grub2/grub.conf? ?? ?? ????? intel_iommu=on? ??????. AMD CPU? ??,"
> +"iommu=pt iommu=1? ??????."
>   
>   msgid "\"name\" should be a device name string"
>   msgstr ""
> +"\"name\"?(?) ?? ?? ?????? ???."
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"%(name)s ??? ????? ?? ?? ? ????. ???? ??? ?"
> +"????."
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> -msgstr "?? ?? %(name)s? %(iface)s ?????? ????."
> +msgstr ""
> +"?? ?? %(name)s? %(iface)s ?????? ????."
>   
>   #, python-format
>   msgid ""
>   "Network %(network)s specified for virtual machine %(name)s does not exist"
> -msgstr "?? ?? %(name)s? ?? ??? %(network)s ????? ????."
> +msgstr ""
> +"?? ?? %(name)s? ??? %(network)s ????? ????."
>   
>   msgid "Supported virtual machine interfaces type is only network"
> -msgstr "???? ?? ?? ????? ??? ????????."
> +msgstr ""
> +"???? ?? ?? ????? ??? ????????."
>   
>   msgid "Network name for virtual machine interface must be a string"
> -msgstr "?? ?? ?????? ???? ??? ?????? ???."
> +msgstr ""
> +"?? ?? ?????? ???? ??? ?????? ???."
>   
>   msgid "Invalid network model card specified for virtual machine interface"
>   msgstr ""
> -"?? ?? ?????? ?? ???? ?? ???? ?? ??? ??????"
> -"?."
> +"?? ?? ?????? ?? ???? ?? ???? ?? ??? ???????."
>   
>   msgid "Specify type and network to add a new virtual machine interface"
> -msgstr "? ?? ?? ?????? ??? ?? ? ????? ??????."
> +msgstr ""
> +"? ?? ?? ?????? ??? ?? ? ????? ??????."
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"MAC ??? FF:FF:FF:FF:FF:FF ??? ???? ???."
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"?? ?? %(name)s? MAC ?? %(mac)s?(?) ?? ?????."
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"???? ?? MAC ?????."
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"?? ?? ?? ??? MAC ??? ??? ? ????."
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "???? %(name)s?(?) ?? ?????."
> +msgstr ""
> +"???? %(name)s?(?) ?? ?????."
>   
>   #, python-format
>   msgid ""
>   "Network '%(network)s' specified for template %(template)s does not exist"
> -msgstr "???? %(template)s? ?? ??? '%(network)s' ????? ????."
> +msgstr ""
> +"%(template)s ????? ??? '%(network)s' ????? ????."
>   
>   #, python-format
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
>   msgstr ""
> -"???? %(template)s? ?? ??? ???? ? %(pool)s?(?) ????."
> +"%(template)s ????? ??? ???? ? %(pool)s?(?) ????."
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
>   msgstr ""
> -"???? %(template)s? ?? ??? ???? ? %(pool)s?(?) ??? ???"
> -"?."
> +"%(template)s ????? ??? ???? ? %(pool)s?(?) ??? ????."
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "CDROM? ?? ???? ?? ???? '%(param)s'?(?) ???????."
> +msgstr ""
> +"CDROM? ?? ???? ?? ???? '%(param)s' ?(?) ???????."
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
>   msgstr ""
> -"???? %(template)s? ?? ??? %(network)s ????? ??? ????."
> +"%(template)s ????? ??? %(network)s ????? ??? ????."
>   
>   msgid "Template name must be a string"
> -msgstr "???? ??? ?????? ???."
> +msgstr ""
> +"???? ??? ?????? ???."
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "???? ???? ???? ???? ???."
> +msgstr ""
> +"???? ???? ???? ???? ???."
>   
>   msgid "Template distribution must be a string"
> -msgstr "???? ??? ?????? ???."
> +msgstr ""
> +"???? ??? ?????? ???."
>   
>   msgid "Template distribution version must be a string"
> -msgstr "???? ?? ??? ?????? ???."
> +msgstr ""
> +"???? ?? ??? ?????? ???."
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "CPU ?? ???? ???."
> +msgstr ""
> +"CPU ?? 0?? ? ???? ???."
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
> -msgstr "??? ??(MB)? 512?? ? ???? ???."
> +msgstr ""
> +"??? ??(MB)? 512?? ? ???? ???."
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "???? CDROM? ?? ?? ?? ISO ????? ???."
> +msgstr ""
> +"???? CDROM? ?? ?? ?? ISO ????? ???."
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
> @@ -464,101 +573,124 @@ msgstr ""
>   "????? ?? ???? ?? ???? ? URI %(value)s?(?) ???????."
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
> -msgstr "????? ????? ISO ???? CDROM?? ??????."
> +msgstr ""
> +"????? ????? ISO ???? CDROM ?? ?? ???? ??????."
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "????? ?? ????? ??? ????? ???."
> +msgstr ""
> +"????? ?? ????? ??? ????? ???."
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
>   msgstr ""
> +"???? ?? iSCSI ?? SCSI? ?? ??? ????? ??????."
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
>   msgstr ""
> +"%(volume)s ??? ???? ? %(pool)s? ????."
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> -msgstr "?? ??? ????? ??? ? ??: %(err)s"
> +msgstr ""
> +"?? ??? ????? ??? ? ??: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete template due error: %(err)s"
> -msgstr "?? ??? ????? ??? ? ??: %(err)s"
> +msgstr ""
> +"?? ??? ????? ??? ? ??: %(err)s"
>   
>   msgid "Disk size must be an integer greater than 1GB."
>   msgstr ""
> +"??? ??? 1GB?? ? ???? ???."
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "???? CDROM? ?? ?? ?? ISO ????? ???."
> +msgstr ""
> +"???? ?? ???? ??? ?? ??? ????? ???."
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
>   msgstr ""
> +"?? ??? %(path)s ??? ??? ? ????."
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
>   msgstr ""
> +"CPU ????? ??? ? VCPU? ??, ?? ? ??? ?????"
> +"???."
>   
>   msgid ""
>   "When specifying CPU topology, each element must be an integer greater than "
>   "zero."
>   msgstr ""
> +"CPU ????? ??? ? ? ??? 0?? ? ????"
> +"???."
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"???? ?? ??? ??? ?????. ??? ??? bochs, cloop, cow, dmg, qcow, "
> +"qcow2, qed, raw, vmdk, vpc???."
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "???? ? %(name)s?(?) ?? ?????."
> +msgstr ""
> +"???? ? %(name)s?(?) ?? ?????."
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "???? ? %(name)s?(?) ????."
> +msgstr ""
> +"???? ? %(name)s?(?) ????."
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
> -msgstr "???? ? %(name)s?(?) ????? %(item)s?(?) ??????."
> +msgstr ""
> +"???? ? %(name)s?(?) ????? %(item)s?(?) ??????."
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "?? ???? ? %(name)s?(?) ??? ? ????."
> +msgstr ""
> +"?? ???? ? %(name)s?(?) ??? ? ????."
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "???? ?? ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ?? ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> -msgstr "???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"???? ? %(name)s? ?? ???? ??? ?? ??? ? ????. ???"
> -"?: %(err)s"
> +"???? ? %(name)s? ?? ???? ??? ?? ??? ? ????. ????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
> -msgstr "???? ? %(name)s?(?) ???? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ? %(name)s?(?) ???? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
> -msgstr "???? ? %(name)s?(?) ????? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ? %(name)s?(?) ????? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
> -msgstr "???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
>   msgstr ""
> -"???? ?? %(path)s?(?) ??? ?? ??? ? ???? NFS ?? ??? "
> -"? ????."
> +"???? ?? %(path)s?(?) ??? ?? ??? ? ???? NFS ?? ??? ? ????."
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
> @@ -567,82 +699,100 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "???? ?? ???? ? ??: %(type)s"
> +msgstr ""
> +"???? ?? ???? ? ??: %(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
>   msgstr ""
> +"%(pool)s? ?? ???? ? XML? ???? ?? ??? ??????."
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"???? ? ??? ???(/)? ???? ?? ?????? ???."
>   
>   msgid ""
>   "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
>   "iso"
>   msgstr ""
> +"???? ???? ? ??? dir, netfs, logical, iscsi, isci ? kimchi-"
> +"iso???."
>   
>   msgid "Storage pool path must be a string"
> -msgstr "???? ? ??? ?????? ???."
> +msgstr ""
> +"???? ? ??? ?????? ???."
>   
>   msgid "Storage pool host must be a IP or hostname"
> -msgstr "???? ? ???? IP ?? ??? ????? ???."
> +msgstr ""
> +"???? ? ???? IP ?? ??? ????? ???."
>   
>   msgid "Storage pool device must be the absolute path to the block device"
>   msgstr ""
> +"???? ? ??? ?? ??? ?? ?? ???? ???."
>   
>   msgid "Storage pool devices parameter must be a list"
> -msgstr "???? ? ??? ????? ???."
> +msgstr ""
> +"???? ? ??? ????? ???."
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "iSCSI ?? ?? IQN? ?????? ???."
> +msgstr ""
> +"iSCSI ?? ?? IQN? ?????? ???."
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
> -msgstr "?? ???? ??? ??? 1? 65535 ??? ???? ???."
> +msgstr ""
> +"?? ???? ??? ??? 1? 65535 ??? ???? ???."
>   
>   msgid "iSCSI target username must be a string"
>   msgstr ""
> +"iSCSI ?? ??? ??? ?????? ???."
>   
>   msgid "iSCSI target password must be a string"
>   msgstr ""
> +"iSCSI ?? ????? ?????? ???."
>   
>   msgid "Specify name and type to create a storage pool"
> -msgstr "???? ?? ????? ?? ? ??? ??????."
> +msgstr ""
> +"???? ?? ????? ?? ? ??? ??????."
>   
>   #, python-format
>   msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
>   msgstr ""
> -"%(disk)s?(?) ??? ???/???? ????. ?? %(pool)s ?? ??? ? "
> -"????."
> +"%(disk)s?(?) ??? ???/???? ????. ?? ?"
> +"%(pool)s? ??? ? ????."
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
>   msgstr ""
> +"?? ? %(pool)s?(?) ??? ? ????. ????: %(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
> -msgstr "?? ???? ?? ???? ???? ????? ? ????."
> +msgstr ""
> +"?? ???? ?? ???? ???? ????? ? ????."
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "SCSI ??? ??? ??? ?????? ???."
> +msgstr ""
> +"SCSI ??? ??? ??? ?????? ???."
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
> -msgstr "???? ? kimchi_isos? ?? ??? ???????."
> +msgstr ""
> +"???? ? kimchi_isos? ?? ??? ???????."
>   
>   #, python-format
>   msgid ""
>   "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"NFS ???? ? %(name)s?(?) ???? ? ????. NFS ?? %(server)s? ?"
> -"?? ? ????."
> +"NFS ???? ? %(name)s?(?) ???? ? ????. NFS ?? %(server)s?(?)"
> +"??? ? ????."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
>   msgstr ""
> -"NFS ???? ? %(name)s?(?) ????? ? ????. NFS ?? %(server)s? "
> +"NFS ???? ? %(name)s?(?) ????? ? ????. NFS ?? %(server)s?(?)"
>   "??? ? ????."
>   
>   #, python-format
> @@ -653,15 +803,16 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to delete pool %(name)s as it is associated with some templates"
> -msgstr "?? ????? ???? ???? %(name)s ?? ??? ? ????."
> +msgstr ""
> +"?? ????? ???? ???? %(name)s ?? ??? ? ????."
>   
>   #, python-format
>   msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
>   msgstr ""
> -"??? '%(name)s'? ?? ??? ?? ?????. ?? ?? ????? ?? ?"
> -"?? ??????."
> +"??? '%(name)s'? ?? ??? ?? ?????. ?? ?? ?????"
> +"?? ??? ??????."
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
> @@ -670,72 +821,85 @@ msgstr ""
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "???? ?? %(name)s?(?) ?? ?????."
> +msgstr ""
> +"???? ?? %(name)s?(?) ?? ?????."
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
> -msgstr "???? ?? %(name)s?(?) ???? ? %(pool)s? ????."
> +msgstr ""
> +"???? ?? %(name)s?(?) ???? ? %(pool)s? ????."
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
>   "not active"
>   msgstr ""
> +"???? ? %(pool)?(?) ??? ???? ???? ?? %(volume)s?(?)"
> +"??? ? ????."
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create storage volume %(volume)s"
> -msgstr "???? ?? %(volume)s?(?) ????? %(item)s?(?) ??????."
> +msgstr ""
> +"???? ?? %(name)s?(?) ????? %(item)s?(?) ??????."
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes because storage pool %(pool)s is not active"
>   msgstr ""
> -"???? ? %(pool)s?(?) ??? ???? ???? ??? ??? ? ???"
> -"?."
> +"???? ? %(pool)s?(?) ??? ???? ???? ??? ??? ? ????."
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"???? ?? %(name)s?(?) ???? ? %(pool)s? ??? ? ????. ??"
> -"??: %(err)s"
> +"???? ?? %(name)s?(?) ???? ? %(pool)s? ??? ? ????. ????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
>   msgstr ""
> -"???? ? %(pool)s? ???? ??? ??? ? ????. ????: %(err)s"
> +"???? ? %(pool)s? ?? ???? ??? ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
> -msgstr "???? ? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
> -msgstr "???? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ?? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
> -msgstr "???? ?? %(name)s? ??? ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"???? ?? %(name)s? ??? ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
> -msgstr "???? ?? %(type)s?(?) ?? ?? ? ??? ???? ????."
> +msgstr ""
> +"???? ?? %(type)s?(?) ?? ?? ? ??? ???? ????."
>   
>   msgid "Storage volume name must be a string"
> -msgstr "???? ?? ??? ?????? ???."
> +msgstr ""
> +"???? ?? ??? ?????? ???."
>   
>   msgid "Storage volume allocation must be an integer number"
> -msgstr "???? ?? ??? ???? ???."
> +msgstr ""
> +"???? ?? ??? ???? ???."
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"???? ?? ??? ???? ????. ??? ??? bochs, cloop, cow, dmg, "
> +"qcow, qcow2, qed, raw, vmdk, vpc???."
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "???? ??? ?? ??? ?????."
> +msgstr ""
> +"???? ??? ?? ??? ?????."
>   
>   #, python-format
>   msgid ""
> @@ -746,64 +910,80 @@ msgstr ""
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
>   msgstr ""
> +"??? ???? %(param)s? ??? ? ????."
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
>   msgstr ""
> +"%(param)s??? ?? ??? ???? ????."
>   
>   msgid "Storage volume capacity must be an integer number."
>   msgstr ""
> +"???? ?? ??? ???? ???."
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
>   msgstr ""
> +"???? ?? URL? http://, https://, ftp:// ?? ftps://?? ???."
>   
>   #, python-format
>   msgid "Unable to access file %(url)s. Please, check it."
>   msgstr ""
> +"?? %(url)s? ???? ? ????. ??????."
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"'%(pool)s' ?? ???? ?? '%(name)s'?(?) ??? ? ????. ????: "
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"??? ?????? ?? ??? ? ?? ??? ??????."
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"???? ??? ????? ?? '???' ????? ??????."
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"??? ?? ??? ???? ?? ??? ?? ???? ???? ? ????."
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"???? ?? %(vol)s?(?) ??? ????? ??? ?? ????."
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"??? ?? ???? ???? ?? ??? ?????."
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"???? ??? ?? ???? ???? ? ????. ????: %(err)s."
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "????? %(name)s?(?) ????."
> +msgstr ""
> +"%(name)s ?????? ????."
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "???? %(name)s?(?) ?? ?????."
> +msgstr ""
> +"%(name)s ????? ?? ?????."
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "???? %(name)s?(?) ????."
> +msgstr ""
> +"%(name)s ????? ????."
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
>   msgstr ""
> -"???? %(network)s? ?? ??? ??? %(subnet)s?(?) ???? ????."
> +"%(network)s ????? ??? %(subnet)s ???? ???? ????."
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
> @@ -812,1423 +992,1850 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "?? ???? %(name)s?(?) ??? ? ????."
> +msgstr ""
> +"?? ???? %(name)s?(?) ??? ? ????."
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
>   msgstr ""
> -"???? %(network)s? ?? ??? ????? %(iface)s?(?) ?? ?? ??"
> -"??."
> +"%(network)s ????? ??? %(iface)s ?????? ?? ?? ????."
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
> -msgstr "?????? ?? NIC, ?? ?? ??? ???? ???."
> +msgstr ""
> +"?????? ?? NIC, ?? ?? ??? ???? ???."
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "???? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"%(name)s ????? ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "???? '%(name)s'? ?? ?? IP ??? ?? ? ????."
> +msgstr ""
> +"???? '%(name)s'? ?? ?? IP ??? ?? ? ????."
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
>   msgstr ""
> +"%(iface)s ?????? ?? ?????."
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"???? ??? ???(/) ?? ???(\")? ???? ?? ?????? ???."
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "???? ???? ??? ??, NAT ? ??????."
> +msgstr ""
> +"???? ???? ??? ??, NAT ? ??????."
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
>   msgstr ""
>   "???? ???? IP ?? ? ??? ?? ????? ?? ?????? ???."
>   
>   msgid "Network interface must be a string"
> -msgstr "???? ?????? ?????? ???."
> +msgstr ""
> +"???? ?????? ?????? ???."
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "???? VLAN ID? 1? 4094 ??? ???? ???."
> +msgstr ""
> +"???? VLAN ID? 1? 4094 ??? ???? ???."
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "????? ????? ?? ? ??? ??????."
> +msgstr ""
> +"????? ????? ?? ? ??? ??????."
>   
>   #, python-format
>   msgid ""
>   "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
>   "and/or templates linked to this network."
>   msgstr ""
> +"%(name)s ????? ??? ? ????. ? ????? ??? ?? ?? ?? %(vms)s "
> +"?/?? ????? ????."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate network %(name)s. There are some virtual machines "
>   "%(vms)s and/or templates linked to this network."
>   msgstr ""
> +"%(name)s ????? ????? ? ????. ? ????? ??? ?? ?? ??"
> +"%(vms)s ?/?? ????? ????."
>   
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
> -msgstr "??? ?? %(name)s?(?) VLAN? ??? ??? ? ? ????."
> +msgstr ""
> +"??? ?? %(name)s?(?) VLAN? ??? ??? ? ? ????."
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "%(iface)s ?????? ????? ??: %(err)s."
> +msgstr ""
> +"%(iface)s ????? ??? ??: %(err)s."
>   
>   #, python-format
>   msgid ""
>   "Failed to activate interface %(iface)s. Please check the physical link "
>   "status."
>   msgstr ""
> -"%(iface)s ?????? ????? ?????. ??? ?? ??? ?????"
> -"?."
> +"%(iface)s ?????? ???? ? ????. ??? ?? ???"
> +"??????."
>   
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
>   msgstr ""
> +"%(name)s ????? ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "??? ??? %(name)s?(?) ????."
> +msgstr ""
> +"??? ??? %(name)s?(?) ????."
>   
>   msgid "Debug report tool not found in system"
> -msgstr "??? ??? ??? ???? ????."
> +msgstr ""
> +"??? ??? ??? ???? ????."
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
> -msgstr "??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s."
>   
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
>   msgstr ""
> +"??? ?? %(name)s? ??? ???? ?? ? ????."
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
> -msgstr "??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s"
> +msgstr ""
> +"??? ??? %(name)s?(?) ??? ? ????. ????: %(err)s"
>   
>   msgid "You should give a name for the debug report file."
>   msgstr ""
> +"??? ??? ??? ??? ???? ???."
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> +"??? ??? ??? ?????? ???. ??, ??, ??('_')"
> +"? ???('-')? ?????."
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
>   msgstr ""
> -"??? '%(name)s'? ?? ??? ?? ?????. ?? ?? ????? ?? ?"
> -"?? ??????."
> +"??? ?? \"%(name)s\"? ??? ???? ?? ????. ?? ???"
> +"??????."
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "???? ?? %(server)s?(?) Kimchi?? ???? ?????."
> +msgstr ""
> +"???? ?? %(server)s?(?) Kimchi?? ???? ?????."
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "Distro '%(name)s'?(?) ????."
> +msgstr ""
> +"Distro '%(name)s'?(?) ????."
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "??? %(name)s?(?) ???? ????."
> +msgstr ""
> +"??? %(name)s?(?) ???? ????."
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
> -msgstr "?? ??? ?? ?? ??? ??? ??? ? ????."
> +msgstr ""
> +"?? ??? ?? ?? ??? ??? ??? ? ????."
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
> -msgstr "?? ??? ?? ?? ??? ??? ?? ??? ? ????."
> +msgstr ""
> +"?? ??? ?? ?? ??? ??? ?? ??? ? ????."
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "?? ?? '%(name)s'?(?) ????."
> +msgstr ""
> +"?? ?? '%(name)s'?(?) ????."
>   
>   msgid "Conflicting flag filters specified."
>   msgstr ""
> +"???? ??? ??? ??????."
>   
>   msgid "No packages marked for update"
> -msgstr "???? ??? ???? ????."
> +msgstr ""
> +"???? ??? ???? ????."
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "??? %(name)s?(?) ??????? ???? ?????."
> +msgstr ""
> +"??? %(name)s?(?) ??????? ???? ?????."
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
>   msgstr ""
> -"??????? ??? ???? ???? ?? ??? ??????. ????: "
> -"%(err)s"
> +"??????? ??? ???? ???? ?? ??? ??????. ????: %(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "? ???? ?? ?? ??? ??? ???? ????."
> +msgstr ""
> +"? ???? ?? ?? ??? ??? ???? ????."
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "??? ????? %(item)s?(?) ?? ? ????."
> +msgstr ""
> +"??? ????? %(item)s?(?) ?? ? ????."
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "???? ?? URI %(uri)s"
> +msgstr ""
> +"???? ?? URI %(uri)s"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
> -msgstr "%(seconds)s? ?? '%(cmd)s' ?? ?? ? ????? ???????."
> +msgstr ""
> +"%(seconds)s? ? '%(cmd)s' ??? ???? ?? ????? ???????."
>   
>   msgid "Unable to choose a virtual machine name"
>   msgstr ""
> +"?? ?? ??? ??? ? ????."
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"???? ?? ??? ? '%(value)s'???."
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"???? ?? ??? ?? '%(unit)s'???."
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "???? ?? ???? ?????. ???? ??: 'cdrom'"
> +msgstr ""
> +"???? ?? ???? ?????. ???? ??: 'cdrom', 'disk'"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
>   msgstr ""
> +"'%(value)s' ??? ??? ??? ??/?? ??? ????."
>   
>   msgid "Only CDROM path can be update."
>   msgstr ""
> +"CDROM ??? ????? ? ????."
>   
>   #, python-format
>   msgid ""
>   "The storage device %(dev_name)s does not exist in the virtual machine "
>   "%(vm_name)s"
>   msgstr ""
> +"???? ?? %(dev_name)s?(?) ?? ??"
> +"%(vm_name)s? ????."
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
> -msgstr "? ???? ??? ???? ?? ?? ??: %(error)s"
> +msgstr ""
> +"? ???? ??? ???? ?? ?? ??: %(error)s"
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
> -msgstr "???? ??? ?????? ?? ?? ??: %(error)s"
> +msgstr ""
> +"???? ??? ?????? ?? ?? ??: %(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
> -msgstr "???? ??? ???? ?? ?? ??: %(error)s"
> +msgstr ""
> +"???? ??? ???? ?? ?? ??: %(error)s"
>   
>   msgid "Do not support IDE device hot plug"
>   msgstr ""
> +"IDE ?? ? ???? ???? ????."
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
> -msgstr "? ?? ?? ???? ??? ?? ? ??? ??????."
> +msgstr ""
> +"? ?? ?? ???? ??? ?? ? ?? ?? ?? ? ?/??? "
> +"??????."
>   
>   msgid "Specify path to update virtual machine disk"
> -msgstr "?? ?? ???? ????? ??? ??????."
> +msgstr ""
> +"?? ?? ???? ????? ??? ??????."
>   
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
>   msgstr ""
> +"??? ??? ?? %(type)s ?? %(limit)s? ??????."
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
>   msgstr ""
> +"??? ?/??? ?? ??? ??? ??? ? ??: %(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
>   msgstr ""
> +"??? ?? ?? ?? ???? ?? ????."
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
> -msgstr "? ?? ?? ???? ??? ?? ? ??? ??????."
> +msgstr ""
> +"?? ?? ?/?? ? ??? ??? ?? ?? ???? "
> +"??? ? ????."
>   
>   #, python-format
>   msgid ""
>   "Volume chosen with format %(format)s does not fit in the storage type "
>   "%(type)s"
>   msgstr ""
> +"%(format)s ???? ??? ??? ???? ??"
> +"%(type)s? ???? ????."
>   
>   msgid "YUM Repository ID must be one word only string."
> -msgstr "YUM ??? ID? ?? ??? ?????? ???."
> +msgstr ""
> +"YUM ??? ID? ?? ??? ?????? ???."
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "??? URL? http://, ftp:// ?? file:// URL??? ???."
> +msgstr ""
> +"??? URL? http://, ftp:// ?? file:// URL??? ???."
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
>   "repository type."
> -msgstr "??? ??? ??? ??? ?? ?? ?? ?? ?????."
> +msgstr ""
> +"??? ??? ??? ??? ?? ?? ?? ?? "
> +"?????."
>   
>   msgid "Distribution to DEB repository must be a string"
> -msgstr "DEB ???? ?? ??? ?????? ???."
> +msgstr ""
> +"DEB ???? ?? ??? ?????? ???."
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "DEB ???? ?? ????? ??? ????? ???."
> +msgstr ""
> +"DEB ???? ?? ????? ??? ????? ???."
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "DEB ???? ?? ????? ?????? ???."
> +msgstr ""
> +"DEB ???? ?? ????? ?????? ???."
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"???? ?? ?? ??? ?????? ???."
>   
>   msgid "YUM Repository name must be string."
> -msgstr "YUM ??? ??? ?????? ???."
> +msgstr ""
> +"YUM ??? ??? ?????? ???."
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "GPG ??? ?? ???? ???."
> +msgstr ""
> +"GPG ??? ?? ???? ???."
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
> -msgstr "GPG ?? ASCII ?? ??? ???? URL??? ???."
> +msgstr ""
> +"GPG ?? ASCII ?? ??? ???? URL??? ???."
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "%(repo_id)s ???? ????? ? ????."
> +msgstr ""
> +"'%(repo_id)s' ???? ?????? ?????."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "%(repo_id)s ???? ????."
> +msgstr ""
> +"%(repo_id)s ???? ????."
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"YUM ???? ?? ?? ??????? ??? ?? URL, ?? ?? ??  "
> +"metalink? ??????."
>   
>   msgid "Repository management tool was not recognized for your system."
> -msgstr "?? ???? ?? ??? ?? ??? ???? ?????."
> +msgstr ""
> +"?? ???? ?? ??? ?? ??? ???? ?????."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "%(repo_id)s ???? ?? ???? ???? ????."
> +msgstr ""
> +"%(repo_id)s ???? ?? ???? ???? ????."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "%(repo_id)s ???? ?? ?? ???? ???? ????."
> +msgstr ""
> +"%(repo_id)s ???? ?? ?? ???? ???? ????."
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "%(repo_id)s ???? ??? ? ????."
> +msgstr ""
> +"%(repo_id)s ???? ???? ?????."
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
> -msgstr "??? ?? ?? %(repo_file)s?(?) ??? ? ????."
> +msgstr ""
> +"??? ?? ?? %(repo_file)s?(?) ??? ? ????."
>   
>   msgid "Specify repository distribution in order to create a DEB repository."
> -msgstr "DEB ???? ????? ??? ??? ??????."
> +msgstr ""
> +"DEB ???? ????? ??? ??? ??????."
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "%(repo_id)s ???? ???? ??? ? ????."
> +msgstr ""
> +"%(repo_id)s ???? ???? ???? ?????."
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "%(repo_id)s ???? ?? ???? ??? ? ????."
> +msgstr ""
> +"%(repo_id)s ???? ?? ???? ???? ?????."
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "YUM ??? ID? ?? ?????."
> +msgstr ""
> +"YUM ??? ID? ?? ?????."
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "YUM ??? ??? ?????? ???."
> +msgstr ""
> +"YUM ??? ??? ?????? ???."
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "???? ??? ? ????. ????: '%(err)s'"
> +msgstr ""
> +"???? ??? ? ????. ????: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> -msgstr "??? ??? ??? ? ????. ????: '%(err)s'"
> +msgstr ""
> +"??? ??? ??? ? ????. ????: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "???? ??? ? ????. ????: '%(err)s'"
> +msgstr ""
> +"???? ??? ? ????. ????: '%(err)s'"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "???? ??? ? ????. ????: '%(err)s'"
> +msgstr ""
> +"???? ??? ? ????. ????: '%(err)s'"
>   
>   #, python-format
>   msgid ""
>   "Configuration items: '%(items)s' are not supported by repository manager"
>   msgstr ""
> +"?? ??: '%(items)s'?(?) ??? ???? ?? ???? ????."
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"??? metalink? http://, ftp:// ?? file:// URL??? ???."
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"mirrorlist ? metalink? ??? ??? ? ????."
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
>   msgstr ""
> +"?? ?? '%(vm)s'?(?) ???? ???? ?? ???? ???."
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ?? '%(vm)s'? '%(name)s' ???? ??? ? ????. ????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
>   msgstr ""
> +"?? ?? '%(vm)s'? '%(name)s' ???? ????."
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ?? '%(vm)s'?? '%(name)s' ???? ??? ? ????. ????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
>   msgstr ""
> +"?? ?? '%(vm)s'? ???? ??? ? ????. ????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ?? '%(vm)s'?? '%(name)s' ???? ??? ? ????. ????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ?? '%(vm)s'? ?? ???? ??? ? ????. ????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"'%(name)s' ???? ?? ?? ?? '%(vm)s'?(?) ??? ? ????. ????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> +"'%(format)s' ??? ???? ???? ?? ???"
> +"?? ?? '%(vm)s'? ???? ??? ? ????. 'qcow2'? ?????."
>   
>   msgid "The number of vCPUs is too large for this system."
>   msgstr ""
> +"? ???? vCPU ?? ?? ???."
>   
>   msgid "Invalid vCPU/topology combination."
>   msgstr ""
> +"???? ?? vCPU/???? ?????."
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
>   msgstr ""
> +"? ???(?? ?? ??)??? CPU ????? ???? ????."
>   
>   msgid "ERROR CODE"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "REASON"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "STACK"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Go to Homepage"
> -msgstr "? ???? ??"
> +msgstr ""
> +"? ???? ??"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "? ?? ?? ??"
> +msgstr ""
> +"? ?? ?? ??"
>   
>   msgid "Virtual Machine Name"
> -msgstr "?? ?? ??"
> +msgstr ""
> +"?? ?? ??"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
>   msgstr ""
> -"?? ??? ???? ? ???? ?????. ???? ??? ??? ????"
> -"? ???? ?????."
> +"?? ??? ???? ? ???? ?????. ???? ??? "
> +"??? ????? ???? ?????."
>   
>   msgid "Template"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Please create a template first."
> -msgstr "????? ?? ??????."
> +msgstr ""
> +"????? ?? ??????."
>   
>   msgid "Create a Template"
> -msgstr "???? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid "Please choose a template."
> -msgstr "????? ??????."
> +msgstr ""
> +"????? ??????."
>   
>   msgid "OS"
> -msgstr "OS"
> +msgstr ""
> +"OS"
>   
>   msgid "OS Version"
> -msgstr "OS ??"
> +msgstr ""
> +"OS ??"
>   
>   msgid "CPUS"
> -msgstr "CPUS"
> +msgstr ""
> +"CPUS"
>   
>   msgid "Memory"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Create"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Creating..."
>   msgstr ""
> +"?? ?..."
>   
>   msgid "Edit Guest"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid "General"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Storage"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Interface"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Permission"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Host PCI Device"
>   msgstr ""
> +"??? PCI ??"
>   
>   msgid "Snapshot"
>   msgstr ""
> +"???"
>   
>   msgid "Name"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "CPUs"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Memory (MB)"
> -msgstr "???"
> +msgstr ""
> +"???(MB)"
>   
>   msgid "Icon"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Device"
> -msgstr "?? ??"
> +msgstr ""
> +"??"
>   
>   msgid "Path"
> -msgstr "NFS ??"
> +msgstr ""
> +"??"
>   
>   msgid "Network"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Type"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"MAC ??"
>   
>   msgid "Available system users and groups"
>   msgstr ""
> +"?? ??? ??? ??? ? ??"
>   
>   msgid "Selected system users and groups"
>   msgstr ""
> +"??? ??? ??? ? ??"
>   
>   msgid "User"
>   msgstr ""
> +"???"
>   
>   msgid "All"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "To Add"
>   msgstr ""
> +"?? ??"
>   
>   msgid "Added"
>   msgstr ""
> +"???"
>   
>   msgid "filter"
>   msgstr ""
> +"??"
>   
>   msgid "Product"
>   msgstr ""
> +"??"
>   
>   msgid "Vendor"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Created"
>   msgstr ""
> +"???"
>   
>   msgid "Save"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Replace"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Detach"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Cancel"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "revert"
>   msgstr ""
> +"????"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "???? ??? VM? ??"
> +msgstr ""
> +"???? ??? VM? ??"
>   
>   msgid "Device Type"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> -msgstr "?? ?????. ?? \"cdrom\"? ?????."
> +msgstr ""
> +"?? ??. ?? \"cdrom\" ? \"disk\"? ?????."
>   
>   msgid "Storage Pool"
> -msgstr "???? ?"
> +msgstr ""
> +"???? ?"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "???? ? ??? ?????? ???."
> +msgstr ""
> +"??? ??? ???? ?"
>   
>   msgid "Storage Volume"
> -msgstr "???? ? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid "Storage volume to be attached"
> -msgstr "???? ?? ??? ?????? ???."
> +msgstr ""
> +"??? ???? ??"
>   
>   msgid "File Path"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "CDROM? ?? ??? ISO ?? ?????."
> +msgstr ""
> +"CDROM? ?? ??? ISO ?? ?????."
>   
>   msgid "Attach"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Start"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Reset"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Pause"
>   msgstr ""
> +"????"
>   
>   msgid "Resume"
>   msgstr ""
> +"??"
>   
>   msgid "Power Off"
>   msgstr ""
> +"?? ??"
>   
>   msgid "Actions"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Connect"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Clone"
>   msgstr ""
> +"??"
>   
>   msgid "Edit"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Shut Down"
> -msgstr "??? ??"
> +msgstr ""
> +"??"
>   
>   msgid "Delete"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
>   msgstr ""
>   "??? ??? ?? ?? ????? ???? ????. ?? ??????."
>   
>   msgid "This field is required."
> -msgstr "? ??? ?????."
> +msgstr ""
> +"? ??? ?????."
>   
>   msgid "Log in"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Logging in..."
> -msgstr "??? ?..."
> +msgstr ""
> +"??? ?..."
>   
>   msgid "Host"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Guests"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Templates"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Failed to get application configuration"
> -msgstr "?????? ??? ???? ?????."
> +msgstr ""
> +"?????? ??? ???? ?????."
>   
>   msgid "This is not a valid Linux path"
> -msgstr "??? Linux ??? ????."
> +msgstr ""
> +"??? Linux ??? ????."
>   
>   msgid "This is not a valid URL."
> -msgstr "??? URL? ????."
> +msgstr ""
> +"??? URL? ????."
>   
>   msgid "No such data available."
> -msgstr "?? ???? ????."
> +msgstr ""
> +"?? ???? ????."
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"??? ???? ??? ? ????. ??? ???? ????? ?? ?? ??"
> -"?? ??? ??? ??????. HTTP ?? ?? %1. "
> +"??? ???? ??? ? ????. ??? ???? ????? "
> +"?? ?? ???? ??? ??? ??????. HTTP ?? ?? %1???. "
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"??? ?? ? ????. "
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"??? ????? ?? ??? ??????."
>   
>   msgid "Delete Confirmation"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "OK"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Confirm"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Warning"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"?? ?..."
>   
>   msgid "Loading..."
> -msgstr "?? ?..."
> +msgstr ""
> +"?? ?..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"??? ??? ???? ?? ??? ??????."
>   
>   msgid "Retry"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Detailed message:"
> -msgstr "?? ???:"
> +msgstr ""
> +"?? ???:"
>   
>   msgid "No ISO found"
>   msgstr ""
> +"ISO? ????."
>   
>   msgid "This is not a valid ISO file."
> -msgstr "??? ISO ??? ????."
> +msgstr ""
> +"??? ISO ??? ????."
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "??? ?? ????. ?????????"
> +msgstr ""
> +"??? ?? ?? ? ????. ?????????"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
> -msgstr "????? ????? ?????. ?????????"
> +msgstr ""
> +"????? ????? ?????. ?????????"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
> -msgstr "?? ?? ??? ?? ???? ???? ??? ? ????."
> +msgstr ""
> +"?? ?? ??? ?? ???? ???? ??? ? ????."
>   
>   msgid "Max:"
> -msgstr "??:"
> +msgstr ""
> +"??:"
>   
>   msgid "Utilization"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Available"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Read Rate"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Write Rate"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Received"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Sent"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
>   msgstr ""
> -"???? ????? ?? ???? ???? ?? ??? ?????. ??? ?"
> -"?/?? ??? ?????????"
> +"???? ????? ?? ???? ???? ?? ??? ?????. ??? ??/?? ??? "
> +"?????????"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
> -msgstr "???? ????? ???? ??? ? ????. ?????????"
> +msgstr ""
> +"???? ????? ???? ??? ? ????. "
> +"?????????"
>   
>   msgid "Repositories"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "ID"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Base URL"
> -msgstr "?? URL"
> +msgstr ""
> +"?? URL"
>   
>   msgid "Is Mirror"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "URL Args"
> -msgstr "URL ??"
> +msgstr ""
> +"URL ??"
>   
>   msgid "Enabled"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "GPG Check"
> -msgstr "GPG ??"
> +msgstr ""
> +"GPG ??"
>   
>   msgid "GPG Key"
> -msgstr "GPG ?"
> +msgstr ""
> +"GPG ?"
>   
>   msgid "Add"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Remove"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Enable"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Disable"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Software Updates"
> -msgstr "????? ????"
> +msgstr ""
> +"????? ????"
>   
>   msgid "Package Name"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid "Version"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Architecture"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Repository"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Update All"
> -msgstr "?? ????"
> +msgstr ""
> +"?? ????"
>   
>   msgid "Updating..."
> -msgstr "???? ?..."
> +msgstr ""
> +"???? ?..."
>   
>   msgid "Failed to retrieve packages update information."
>   msgstr ""
> +"??? ???? ??? ???? ?????."
>   
>   msgid "Failed to update package(s)."
> -msgstr "???? ?????? ?????."
> +msgstr ""
> +"???? ?????? ?????."
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"??? ???? ????? ???? ??? ? ????. ?????????"
> +"??? ???? ????? ???? ??? ? ????. "
> +"?????????"
>   
>   msgid "Debug Reports"
> -msgstr "??? ???"
> +msgstr ""
> +"??? ???"
>   
>   msgid "Generated Time"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Generate"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Generating..."
> -msgstr "?? ?..."
> +msgstr ""
> +"?? ?..."
>   
>   msgid "Rename"
> -msgstr "?? ???"
> +msgstr ""
> +"?? ???"
>   
>   msgid "Download"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
> -msgstr "??? ???? ??, ?? ?/?? ???('-')? ????? ???."
> +msgstr ""
> +"??? ???? ??, ??, ??('_') ? ??"
> +"???('-')? ????? ???."
>   
>   msgid "Pending..."
> -msgstr "?? ?..."
> +msgstr ""
> +"?? ?..."
>   
>   msgid "Report name is the same as the original one."
>   msgstr ""
> +"??? ??? ??? ?????."
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
>   msgstr ""
> -"?? ?? ? ?? ?? ???? ?????. ? ??? ?? ??? ? ???"
> -"?. ?????????"
> +"?? ?? ? ?? ?? ???? ?????. ? ??? "
> +"?? ??? ? ????. ?????????"
>   
>   msgid "Power off Confirmation"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ?? ??"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
>   msgstr ""
> +"? ??? ??? ?? ??? ??? ? ????(?: ???? ???? ?? "
> +"??? ??? ??). ?????????"
>   
>   msgid "Reset Confirmation"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ?? ??"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
>   msgstr ""
> +"??? OS? ???? ?? ?? ????? ?? ??? ?? ??? ????. "
> +"?????????"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
> -msgstr "????? ????? ?????. ?????????"
> +msgstr ""
> +"??? OS? ? ??? ??? ? ??? ??????. ?????????"
>   
>   msgid "Virtual Machine delete Confirmation"
>   msgstr ""
> +"?? ?? ?? ??"
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
>   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 ""
> +"?? ???? SCSI ?? iSCSI ??? ??? ?? ???? ??"
> +"?????. ?? ?? ??? ??? ? ?? ??? ???? ?? ????"
> +"???????. ?????????"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
>   msgstr ""
> -"? CDROM? ????? ???? ?? ??? ? ????. ??? ???????"
> -"??"
> +"? CDROM? ????? ???? ?? ??? ? ????. ??? "
> +"?????????"
>   
>   msgid "Attaching..."
> -msgstr "?? ?..."
> +msgstr ""
> +"?? ?..."
>   
>   msgid "Replacing..."
> -msgstr "?? ?..."
> +msgstr ""
> +"?? ?..."
>   
>   msgid "Successfully attached!"
> -msgstr "???????."
> +msgstr ""
> +"???????."
>   
>   msgid "Successfully replaced!"
> -msgstr "???????."
> +msgstr ""
> +"???????."
>   
>   msgid "Successfully detached!"
> -msgstr "???????."
> +msgstr ""
> +"???????."
>   
>   msgid ""
>   "This disk will be detached permanently and you can re-attach it. Continue to "
>   "detach it?"
>   msgstr ""
> +"? ???? ????? ???? ?? ??? ? ????. ??? "
> +"?????????"
>   
>   msgid "interface:"
>   msgstr ""
> +"?????:"
>   
>   msgid "address:"
>   msgstr ""
> +"??:"
>   
>   msgid "link_type:"
>   msgstr ""
> +"link_type:"
>   
>   msgid "block:"
>   msgstr ""
> +"??:"
>   
>   msgid "drive_type:"
>   msgstr ""
> +"drive_type:"
>   
>   msgid "model:"
>   msgstr ""
> +"??:"
>   
>   msgid "Affected devices:"
>   msgstr ""
> +"?? ??:"
>   
>   msgid "The VLAN id must be between 1 and 4094."
> -msgstr "VLAN ID? 1? 4094 ???? ???."
> +msgstr ""
> +"VLAN ID? 1? 4094 ???? ???."
>   
>   msgid "unavailable"
> -msgstr "?? ???"
> +msgstr ""
> +"?? ???"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
>   "depend on this network."
>   msgstr ""
> -"? ??? ? ????? ???? ?? ??? ???? ??? ???????."
> +"? ??? ? ????? ???? ?? ??? ???? ??? "
> +"???????."
>   
>   msgid "Create a network"
> -msgstr "???? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"? ???? ?? ????? ????. ? ??? ?? ?????? ?? ???"
> -"?? ?????. ?????????"
> +"? ????? ????? ????. ? ??? ???? ?? "
> +"????? ?????. ?????????"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"NetworkManager? ???? ???? ???? VLAN ??? ? ???? ?? ? ????. ?? ????"
> +"???? ?? ????."
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
> -msgstr "???? ?? ????? ?????. ?????????"
> +msgstr ""
> +"???? ?? ????? ?????. ?????????"
>   
>   msgid "This storage pool is empty."
> -msgstr "? ???? ?? ?? ????."
> +msgstr ""
> +"? ???? ?? ?? ????."
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
>   "to continue? "
> -msgstr "???? ???? ???? ?????. ????????? "
> +msgstr ""
> +"???? ???? ???? ?????. "
> +"????????? "
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "SCSI ??? ??"
> +msgstr ""
> +"SCSI ??? ??"
>   
>   msgid "No SCSI adapters found."
> -msgstr "SCSI ???? ????."
> +msgstr ""
> +"SCSI ???? ????."
>   
>   msgid "Loading iSCSI targets..."
>   msgstr ""
> +"iSCSI ?? ?? ?..."
>   
>   msgid "No iSCSI found. Please input one."
>   msgstr ""
> +"iSCSI? ????. ??????."
>   
>   msgid "Failed to load iSCSI targets."
>   msgstr ""
> +"iSCSI ??? ???? ?????."
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "???? ? ??? ??? ? ????."
> +msgstr ""
> +"???? ? ??? ??? ? ????."
>   
>   msgid "The storage pool path can not be blank."
> -msgstr "???? ? ??? ??? ? ????."
> +msgstr ""
> +"???? ? ??? ??? ? ????."
>   
>   msgid "NFS server mount path can not be blank."
> -msgstr "NFS ?? ??? ??? ??? ? ????."
> +msgstr ""
> +"NFS ?? ??? ??? ??? ? ????."
>   
>   msgid "Invalid NFS mount path."
> -msgstr "???? ?? NFS ??? ?????."
> +msgstr ""
> +"???? ?? NFS ??? ?????."
>   
>   msgid "No logical device selected."
> -msgstr "?? ??? ???? ?????."
> +msgstr ""
> +"?? ??? ???? ?????."
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "iSCSI ??? ??? ? ????."
> +msgstr ""
> +"iSCSI ??? ??? ? ????."
>   
>   msgid "Server name can not be blank."
> -msgstr "?? ??? ??? ? ????."
> +msgstr ""
> +"?? ??? ??? ? ????."
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
>   msgstr ""
> +"??? ?? ?? ?? IP? ????.  ??????."
>   
>   msgid "Looking for available partitions ..."
> -msgstr "?? ??? ???? ?? ?..."
> +msgstr ""
> +"?? ??? ???? ?? ?..."
>   
>   msgid "No available partitions found."
> -msgstr "?? ??? ???? ????."
> +msgstr ""
> +"?? ??? ???? ????."
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"? ???? ?? ????? ????. ? ??? ?? ?????? ?? ???"
> -"?? ?????. ?????????"
> +"? ???? ?? ????? ????. ? ??? ?? ?????? ?? "
> +"????? ?????. ?????????"
>   
>   msgid "Unable to retrieve partitions information."
> -msgstr "??? ??? ??? ? ????. ????: '%(err)s'"
> +msgstr ""
> +"??? ??? ??? ? ????. "
>   
>   msgid "In progress..."
>   msgstr ""
> +"?? ?..."
>   
>   msgid "Failed!"
>   msgstr ""
> +"???!"
>   
>   msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
>   msgstr ""
> +"CDROM ??? ??? ??/?? ???? ?? ??? ? ????."
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "???? ? ??? ??? ? ????."
> +msgstr ""
> +"??? ? ?? ??? ??? ? ????."
>   
>   msgid "Peers"
>   msgstr ""
> +"??"
>   
>   msgid "Searching"
>   msgstr ""
> +"?? ?"
>   
>   msgid "No peers found."
>   msgstr ""
> +"??? ????."
>   
>   msgid "Help"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "About"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Log out"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Version:"
> -msgstr "??: "
> +msgstr ""
> +"??: "
>   
>   msgid "Session timeout, please re-login."
>   msgstr ""
> +"?? ????? ???????. ?? ???????."
>   
>   msgid "User Name"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid "Password"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "? ??? ??? ??"
> +msgstr ""
> +"? ??? ??? ??"
>   
>   msgid "Report Name"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"???? ???? ? ???? ?????. ???? ??? ?? ??? ???"
> -"? ?????. ??? ??, ?? ? ???(\"-\")? ??? ? ????."
> +"???? ???? ? ???? ?????. ???? ??? "
> +"?? ??? ???? ?????. ???? ??, ??, ??(\"_\")"
> +"? ???(\"-\")? ??? ? ????."
>   
>   msgid "Rename a Debug Report"
> -msgstr "? ??? ??? ??"
> +msgstr ""
> +"??? ??? ?? ???"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
>   msgstr ""
> -"???? ???? ? ???? ?????. ???? ??? ?? ??? ???"
> -"? ?????. ??? ??, ?? ? ???(\"-\")? ??? ? ????."
> +"???? ???? ? ???? ?????. ???? ??, ?? ?"
> +"???(\"-\")? ??? ? ????."
>   
>   msgid "Submit"
>   msgstr ""
> +"??"
>   
>   msgid "Add a Repository"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid "Identifier"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "???? ?? ?? ??? ?? ID???."
> +msgstr ""
> +"???? ?? ?? ??? ?? ID???."
>   
>   msgid "Textual name for the repository."
> -msgstr "???? ?? ??? ?????."
> +msgstr ""
> +"???? ?? ??? ?????."
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "???? ?? URL???. ???? ????? http, ftp ? file???."
> +msgstr ""
> +"???? ?? URL???. ???? ????? http, ftp ? file???."
>   
>   msgid "Repository is a mirror"
> -msgstr "???? ?????."
> +msgstr ""
> +"???? ?????."
>   
>   msgid "Distribution"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "DEB ???? ?????."
> +msgstr ""
> +"DEB ???? ?????."
>   
>   msgid "Components"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "List of components in DEB repository."
> -msgstr "DEB ???? ???? ?????."
> +msgstr ""
> +"DEB ???? ???? ?????."
>   
>   msgid "Edit Repository"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid "Mirror List URL"
> -msgstr "?? ?? URL"
> +msgstr ""
> +"?? ?? URL"
>   
>   msgid "Yes"
> -msgstr "?"
> +msgstr ""
> +"?"
>   
>   msgid "No"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Add a Volume to Storage Pool"
>   msgstr ""
> +"???? ?? ?? ??"
>   
>   msgid "Fetch from remote URL"
>   msgstr ""
> +"?? URL?? ??"
>   
>   msgid "Enter the remote URL here."
>   msgstr ""
> +"??? ?? URL? ??????."
>   
>   msgid "Upload a file"
>   msgstr ""
> +"?? ???"
>   
>   msgid "Choose the file you want to upload."
>   msgstr ""
> +"???? ??? ??????."
>   
>   msgid "Define a New Storage Pool"
> -msgstr "? ???? ? ??"
> +msgstr ""
> +"? ???? ? ??"
>   
>   msgid "Storage Pool Name"
> -msgstr "???? ? ??"
> +msgstr ""
> +"???? ? ??"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
> -msgstr "???? ?? ???? ? ???? ???? ?? ?? ??? ???."
> +msgstr ""
> +"???? ?? ???? ? ???? ???? ?? ?? ??? ???."
>   
>   msgid "Storage Pool Type"
> -msgstr "???? ? ??"
> +msgstr ""
> +"???? ? ??"
>   
>   msgid "Storage Path"
> -msgstr "???? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
> -msgstr "???? ?? ?????. ? ???? ?? ?? ??? ??? ???."
> +msgstr ""
> +"???? ?? ?????. ? ???? ?? ?? ??? ??? ???."
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
>   msgstr ""
> -"????? ???? ?? ???? ??? Kimchi? ???? ??? ?????."
> +"????? ???? ?? ???? ??? Kimchi? ???? ??? "
> +"?????."
>   
>   msgid "NFS Server IP"
> -msgstr "NFS ?? IP"
> +msgstr ""
> +"NFS ?? IP"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
>   msgstr ""
> -"NFS ?? IP ?? ??? ?????. ??? ????? ?????? ??? ? "
> -"????."
> +"NFS ?? IP ?? ??? ?????. ??? ????? ?????? ??? ? ????."
>   
>   msgid "NFS Path"
> -msgstr "NFS ??"
> +msgstr ""
> +"NFS ??"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "NFS ???? NFS? ??? ?????."
> +msgstr ""
> +"NFS ???? NFS? ??? ?????."
>   
>   msgid "Device path"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "iSCSI Server"
> -msgstr "iSCSI ??"
> +msgstr ""
> +"iSCSI ??"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
> -msgstr "iSCSI ?? IP ?? ??? ?????. ?? ?? ??? ???."
> +msgstr ""
> +"iSCSI ?? IP ?? ??? ?????. ?? ?? ??? ???."
>   
>   msgid "Server"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Port"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Target"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "iSCSI ??? iSCSI ??"
> +msgstr ""
> +"iSCSI ??? iSCSI ??"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "iSCSI ?? ??"
> +msgstr ""
> +"iSCSI ?? ??"
>   
>   msgid "iSCSI Authentication"
> -msgstr "iSCSI ??"
> +msgstr ""
> +"iSCSI ??"
>   
>   msgid "SCSI Adapter"
> -msgstr "SCSI ???"
> +msgstr ""
> +"SCSI ???"
>   
>   msgid "Please, wait..."
> -msgstr "?? ??? ????."
> +msgstr ""
> +"?? ??? ????."
>   
>   msgid "Add Template"
> -msgstr "???? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "? ????? ?? ??? ??? ?????"
> +msgstr ""
> +"? ????? ?? ??? ??? ?????"
>   
>   msgid "Local ISO Image"
> -msgstr "?? ISO ???"
> +msgstr ""
> +"?? ISO ???"
>   
>   msgid "Local Image File"
>   msgstr ""
> +"?? ??? ??"
>   
>   msgid "Remote ISO Image"
> -msgstr "?? ISO ???"
> +msgstr ""
> +"?? ISO ???"
>   
>   msgid "Search ISOs"
> -msgstr "ISO ??"
> +msgstr ""
> +"ISO ??"
>   
>   msgid "The following ISOs are available:"
> -msgstr "?? ISO? ?? ?????."
> +msgstr ""
> +"?? ISO? ?? ?????."
>   
>   msgid "OS: "
> -msgstr "OS: "
> +msgstr ""
> +"OS: "
>   
>   msgid "Version: "
> -msgstr "??: "
> +msgstr ""
> +"??: "
>   
>   msgid "Size: "
> -msgstr "??: "
> +msgstr ""
> +"??: "
>   
>   msgid "Search more ISOs"
> -msgstr "?? ISO ??"
> +msgstr ""
> +"?? ISO ??"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "??? ISO??? ???? ??"
> +msgstr ""
> +"??? ISO??? ???? ??"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "?? ISO ??? ????? ???."
> +msgstr ""
> +"?? ISO ??? ????? ???."
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "?? ?? ISO ?? ?..."
> +msgstr ""
> +"?? ?? ISO ?? ?..."
>   
>   msgid "Arch: "
> -msgstr "Arch: "
> +msgstr ""
> +"Arch: "
>   
>   msgid "I want to use a custom URL"
> -msgstr "??? ?? URL? ????? ???."
> +msgstr ""
> +"??? ?? URL? ????? ???."
>   
>   msgid "Edit Template"
> -msgstr "???? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid "Processor"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "CDROM"
> -msgstr "CDROM"
> +msgstr ""
> +"CDROM"
>   
>   msgid "Image File"
>   msgstr ""
> +"??? ??"
>   
>   msgid "Graphics"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Disk(GB)"
>   msgstr ""
> +"???(GB)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"??? ??"
>   
>   msgid "CPU Number"
> -msgstr "CPU ??"
> +msgstr ""
> +"CPU ??"
>   
>   msgid "Manually set CPU topology"
>   msgstr ""
> +"CPU ???? ?? ??"
>   
>   msgid "Cores"
>   msgstr ""
> +"??"
>   
>   msgid "Threads"
>   msgstr ""
> +"???"
>   
>   msgid "CPU"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Disk I/O"
> -msgstr "??? I/O"
> +msgstr ""
> +"??? I/O"
>   
>   msgid "Network I/O"
> -msgstr "???? I/O"
> +msgstr ""
> +"???? I/O"
>   
>   msgid "Livetile"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "No guests found."
> -msgstr "???? ????."
> +msgstr ""
> +"???? ????."
>   
>   msgid "Shut down"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid "Restart"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Basic Information"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "OS Distro"
> -msgstr "OS Distro"
> +msgstr ""
> +"OS Distro"
>   
>   msgid "OS Code Name"
> -msgstr "OS ?? ??"
> +msgstr ""
> +"OS ?? ??"
>   
>   msgid "CPU(s)"
>   msgstr ""
> +"CPU"
>   
>   msgid "System Statistics"
> -msgstr "??? ??"
> +msgstr ""
> +"??? ??"
>   
>   msgid "Update Progress"
> -msgstr "???? ????"
> +msgstr ""
> +"???? ????"
>   
>   msgid "Network Name"
> -msgstr "???? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid "State"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Network Type"
> -msgstr "???? ??"
> +msgstr ""
> +"???? ??"
>   
>   msgid "Address Space"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Name should not contain '/' and '\"'."
> -msgstr "???? ?? ???? ? ?????. '/'? ???? ??? ???."
> +msgstr ""
> +"???? '/' ? '\"'? ???? ??? ???."
>   
>   msgid "Isolated: no external network connection"
> -msgstr "???: ??? ???? ?? ??"
> +msgstr ""
> +"???: ?? ???? ?? ??"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT: ????? ??? ???? ???"
> +msgstr ""
> +"NAT: ????? ??? ???? ???"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
> -msgstr "????: ?? ??? ??? ????? ?? ???"
> +msgstr ""
> +"????: ?? ??? ??? ????? ?? ???"
>   
>   msgid "(No interfaces found)"
>   msgstr ""
> +"(?????? ?? ? ??)"
>   
>   msgid "Destination"
> -msgstr "??:"
> +msgstr ""
> +"???"
>   
>   msgid "Enable VLAN"
> -msgstr "VLAN ??:"
> +msgstr ""
> +"VLAN ??"
>   
>   msgid "VLAN ID"
> -msgstr "VLAN ID:"
> +msgstr ""
> +"VLAN ID"
>   
>   msgid "Stop"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "%Used"
>   msgstr ""
> +"%Used"
>   
>   msgid "Location"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Capacity"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Allocated"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "active"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "inactive"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Deactivate"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Activate"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Add Volume"
>   msgstr ""
> +"?? ??"
>   
>   msgid "Extend"
>   msgstr ""
> +"??"
>   
>   msgid "Undefine"
> -msgstr "?? ??"
> +msgstr ""
> +"?? ??"
>   
>   msgid "Format"
> -msgstr "??:"
> +msgstr ""
> +"??"
>   
>   msgid "Allocation"
> -msgstr "??:"
> +msgstr ""
> +"??"
>   
>   msgid "No templates found."
> -msgstr "????? ????."
> +msgstr ""
> +"????? ????."
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/po/ru_RU.po b/po/ru_RU.po
> index 5c17518..b2d4586 100644
> --- a/po/ru_RU.po
> +++ b/po/ru_RU.po
> @@ -1,123 +1,149 @@
>   # English translations for kimchi package.
>   # Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
>   "Project-Id-Version: kimchi 0.1\n"
>   "Report-Msgid-Bugs-To: \n"
>   "POT-Creation-Date: 2015-06-24 09:39-0300\n"
> -"PO-Revision-Date: 2014-08-28 17:32+0000\n"
> -"Last-Translator: Aline Manera <aline.manera at gmail.com>\n"
> -"Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/"
> -"ru/)\n"
> -"Language: ru_RU\n"
> +"PO-Revision-Date: 2013-07-11 17:32-0400\n"
> +"Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
> +"Language-Team: English\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
> +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
>   msgstr ""
> +"??????????? ???????? %(value)s"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "???????? ????????? ??? %(resource)s"
> +msgstr ""
> +"???????? ????????? ??? %(resource)s"
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "%(resource)s ?? ????????? ????? ??????????"
> +msgstr ""
> +"%(resource)s ?? ????? ?????????? ?????? ??????????"
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "???????? ????????? ??? %(resource)s"
> +msgstr ""
> +"???????? ????????? ??? %(resource)s"
>   
>   msgid "Unable to parse JSON request"
> -msgstr "?????? ??????? ??????? JSON"
> +msgstr ""
> +"?????? ??????? ??????? JSON"
>   
>   msgid "This API only supports JSON"
> -msgstr "??? ??????? API ???????????? ?????? JSON"
> +msgstr ""
> +"??? ??????? API ???????????? ?????? JSON"
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
>   msgstr ""
> +"????????? ?? ????????????? ??????????? ?????: %(err)s"
>   
>   msgid "You don't have permission to perform this operation."
>   msgstr ""
> +"???????????? ???? ??????? ??? ?????????? ???? ????????."
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "????????? ?????? ? ??????? ?????? ?? ????????????????."
> +msgstr ""
> +"????????? ?????? ? ??????? ?????? ?? ????????????????."
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> -msgstr "?? ??????? ????????? ?????? ??-?? ?????? %(err)s"
> +msgstr ""
> +"?? ??????? ????????? ?????? ??-?? ??????: %(err)s"
>   
>   #, python-format
>   msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
>   msgstr ""
> +"?? ????? ?????????? ?????? %(task)s ????? ????-??? (%(seconds)s ?)."
>   
>   #, python-format
>   msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
> -msgstr "???? ????????????? ???????????? %(username)s. [??? ??????: %(code)s]"
> +msgstr ""
> +"???? ????????????? ??? ???????????? %(username)s. [??? ??????: %(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "??? ???? ??????? ? Kimchi"
> +msgstr ""
> +"??? ???? ??????? ? Kimchi"
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "??????? %(item)s ??? ????? ? Kimchi"
> +msgstr ""
> +"??????? %(item)s ??? ????? ? Kimchi"
>   
>   #, python-format
>   msgid "User %(user_id)s not found with given LDAP settings."
>   msgstr ""
> +"???????????? %(user_id)s ?? ?????? ? ?????????? ??????????? LDAP."
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
>   msgstr ""
> +"???????????? ???????????? LDAP: %(item)s : %(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
>   msgstr ""
> +"??????? ??????????? ???????? \"_cap\""
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
>   msgstr ""
> +"???????? \"_passthrough\" ?????? ???? \"true\" ??? \"false\""
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
>   msgstr ""
> +"???????? \"_passthrough_affected_by\" ?????? ???? ??????? ? ?????? ??????????"
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
> -msgstr "?????? ????????? ??????? ?????????. ????????: %(err)s"
> +msgstr ""
> +"?????? ????????? ??????? ?????????. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
> -msgstr "?????? ????????? ?????????? ? ??????? ??????????? ??? %(device)s."
> +msgstr ""
> +"?????? ????????? ?????????? ? ??????? ??????????? ??? %(device)s."
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "?? ?????? ???? ???????? ??: %(filename)s"
> +msgstr ""
> +"?? ?????? ???? ???????? ??: %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
>   msgstr ""
> -"?????? ??????? ????? ???????? ?? %(filename)s. ?????????, ??? ??? ???? JSON."
> +"?????? ??????? ????? ???????? ??: %(filename)s. ?????????, ??? ??? ???? JSON."
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
> -msgstr "?? ??????? ????? ? ??????? %(portal)s ????? iSCSI. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ????? ? ??????? %(portal)s ????? iSCSI. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
> -msgstr "?? ??????? ????? ? ??????? %(target)s ????? iSCSI %(host)s"
> +msgstr ""
> +"?? ??????? ????? ? ??????? %(target)s ????? %(host)s iSCSI"
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
>   msgstr ""
> +"?? ?????? ???? ISO %(filename)s"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "???? ISO %(filename)s ?? ???????????"
> +msgstr ""
> +"???? ISO %(filename)s ?? ???????????"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
> @@ -126,19 +152,23 @@ msgstr ""
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> -msgstr "???????????? ?????? ???????? El Torito ? ?????? ISO %(filename)s"
> +msgstr ""
> +"???????????? ?????? ???????? El Torito ? ?????? ISO %(filename)s"
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "???????????? ????????? ???????? El Torito ? ?????? ISO %(filename)s"
> +msgstr ""
> +"???????????? ????????? ???????? El Torito ? ?????? ISO %(filename)s"
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
> -msgstr "??????????? ??? ???? ??? ???????? ???? ? ?????? ISO %(filename)s"
> +msgstr ""
> +"??????????? ??? ???????? ???? ? ?????? ISO %(filename)s"
>   
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
> -msgstr "???????? ?????? ??????????? ???? ? ?????? ISO %(filename)s"
> +msgstr ""
> +"???????? ?????? ??????????? ???? ? ?????? ISO %(filename)s"
>   
>   #, python-format
>   msgid ""
> @@ -148,214 +178,265 @@ msgid ""
>   "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
>   "'path_to_iso'.Details: %(err)s"
>   msgstr ""
> -"? ??????????? ??? ???? ??????? ??? ????????????? ????? ?????? ISO "
> -"%(filename)s. ??????????? ??? ? ??????? /var/lib/libvirt, ???????? "
> -"?????????? ?? ????? ? ?????? ???????? ??????? ??? ???????????? %(user)s, "
> -"???? ??? ????????, ???????? %(user)s ? ?????? ???? ? ?????? ISO ??? (?? "
> -"?????????????) ????????? ??????? 'chmod -R o+x 'path_to_iso'. ????????: "
> -"%(err)s"
> +"? ??????????? ??? ???? ??????? ??? ????????????? ????? ?????? ISO %(filename)s."
> +"??????????? ??? ? ??????? /var/lib/libvirt, ???????? ?????????? ?? ????? "
> +"? ?????? ???????? ??????? ??? ???????????? %(user)s, ???? ??? ????????, ???????? "
> +"%(user)s ? ?????? ???? ? ?????? ISO ??? (?? ?????????????) ????????? ??????? 'chmod -R o+x"
> +"????-?-iso'. ????????: %(err)s"
>   
>   msgid "An error occurred when probing image OS information."
>   msgstr ""
> +"?????? ???????? ?????????? ?? ?? ??????."
>   
>   msgid "No OS information found in given image."
>   msgstr ""
> +"? ?????? ?????? ?? ??????? ?????????? ?? ??."
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
>   msgstr ""
> +"?? ??????? ????????? ???? ?????? %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Image file must be an existing file on system. %(filename)s is not a valid "
>   "input."
>   msgstr ""
> +"???? ?????? ?????? ???????????? ? ???????. ??? ????? %(filename)s ?? ???????? ?????????? "
> +"??????."
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "??????????? ?????? %(name)s ??? ??????????"
> +msgstr ""
> +"??????????? ?????? %(name)s ??? ??????????"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "??????????? ?????? %(name)s ?? ??????????"
> +msgstr ""
> +"??????????? ?????? %(name)s ?? ??????????"
>   
>   #, python-format
>   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 ""
> +"?? ??????? ????????????? ??????????? ?????? %(name)s. ??? %(new_name)s ??? "
> +"??????, ??? ??????????? ?????? ?? ?????????."
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
>   msgstr ""
> -"?? ??????? ???????? ?????? ?????? ??? ????????????? ??????????? ?????? "
> -"%(name)s"
> +"?? ??????? ???????? ?????? ?????? ??? ????????????? ??????????? ?????? %(name)s"
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "????????? ????? ISO ?? ?????????????? ???? ????????."
> +msgstr ""
> +"????????? ????? ISO ?? ?????????????? ???? ????????."
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
>   msgstr ""
> +"?????? ?????? ?? ?????????????? ? ??????????? ?????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
>   msgstr ""
> +"?? ??????? ???????????? ? ??????????? ??????????? ?????? %(name)s."
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"??? ??????????? ?????? ?????? ???? ??????? ??? ???????? ????? ????? (/)"
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
>   msgstr ""
> +"??? ??????????? ?????? ?????? ???????????? URI ??????? %(value)s"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
>   msgstr ""
> +"??? ??????????? ?????? ?????? ???????????? URI ???? ?????? %(value)s"
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
>   msgstr ""
> +"?????????????? ??????????? ?????????? ??????????? ??????: Spice, VNC"
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
>   msgstr ""
>   "????? ?????? ???????? ??? ??????????? ?????????? ?????? ???? IPv4 ??? IPv6"
>   
>   msgid "Specify a template to create a virtual machine from"
> -msgstr "??????? ?????? ??? ???????? ??????????? ??????"
> +msgstr ""
> +"??????? ?????? ??? ???????? ??????????? ??????"
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ?????????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
>   msgstr ""
> -"?? ??????? ????????????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +"?? ??????? ???????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   msgid "User name list must be an array"
>   msgstr ""
> +"?????? ???? ????????????? ?????? ???? ????????"
>   
>   msgid "User name must be a string"
> -msgstr "??? ???? ?????? ???? ???????"
> +msgstr ""
> +"??? ???????????? ?????? ???? ???????"
>   
>   msgid "Group name list must be an array"
>   msgstr ""
> +"?????? ???? ????? ?????? ???? ????????"
>   
>   msgid "Group name must be a string"
> -msgstr "??? ???? ?????? ???? ???????"
> +msgstr ""
> +"??? ?????? ?????? ???? ???????"
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "???????????? %(users)s ?? ??????????."
> +msgstr ""
> +"????????? ???????????? ?? ??????????: %(users)s"
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "???????????? %(groups)s ?? ??????????."
> +msgstr ""
> +"????????? ?????? ?? ??????????: %(groups)s"
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ?????????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ????????? ?????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ????????? ??????????? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????? ?????? ? ?????????? ??????????? ?????? %(name)s. ????????: %(err)s"
>   
>   msgid "The guest console password must be a string."
>   msgstr ""
> +"?????? ??????? ???????? ??????? ?????? ???? ???????."
>   
>   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 ""
> +"??????????? ?????? '%(name)s' ?????????? ?????????? ????? ????????? ?? ?????."
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
>   msgstr ""
> +"???????????? ???????? ?????? ??? ???????????? ??????????? ?????? '%(name)s'"
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"?? ??????? ??????????? ??????????? ?????? '%(name)s'. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"???????????? ???????? ??? ???????????? ??????????? ?????? %(name)s"
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"?????????? ????????????? ??????????? ?????? '%(name)s', ????????? ??? ?? ????????."
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"?? ??????? ????????????? ??????????? ?????? '%(name)s'. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"?????????? ??????????? ?????????? ??????????? ?????? '%(name)s', ????????? ??? ?? ??????????????."
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"?? ??????? ??????????? ?????????? ??????????? ?????? '%(name)s'. ????????: %(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"??????????? ????? ?????? ????????? ??????????? ??????????? ????? ?? ?????."
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"??????????? ?????? '%(name)s' ?? ???????????? ??????????? ????????? ?????? ??????. ???????? ????? ??????, "
> +"????? ?????? ?????????, ????? ???????? ??? ???????."
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"? ???????? ??????????? ??????? ????? ?????? ????? ?????? ???????????"
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"??? ???????????? ????????? ?????? ?????? ????? ???????? ?????? ?????? ?????? ???? ????? ???????? ?????? ?????? ???? "
> +"????????, ??????? 1024 ???"
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"???????????? ????????? ???????? ???????? 1024 ??? ? ???????? ???????."
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"?????? ?????????? libvirt ????? ?? ???????????? ?????????? ??????. ?????? ?????????? libvirt ?????? ???? >= "
> +"1.2.14"
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"?????? ??????????? ?????????? ??????. ????????: %(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
>   msgstr ""
> +"??????????? ?????? %(vmid)s ?? ???????? ??????????????? ???????????? ?????????? ????? %(dev_name)s."
>   
>   #, python-format
>   msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
>   msgstr ""
> +"?????? ?????????? ??????????? ?????? ??????????? ??? ????? %(dev_name)s."
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -364,19 +445,28 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> +"?? ??????? ?????? IOMMU. ??? ??????????? ???????????????? ???????? ???????? PCI ????? ????????? ?????? IOMMU. "
> +"? BIOS ???????? ????????? Intel VT-d ??? AMD IOMMU ? ?????????, "
> +"?????????????? ?? ???? ?? ? ?????????? IOMMU. ??? ?????????? Intel ???????? intel_iommu=on "
> +"? ????????? ???? ? ????? /boot/grub2/grub.conf. ??? ?????????? AMD ???????? iommu=pt "
> +"iommu=1."
>   
>   msgid "\"name\" should be a device name string"
>   msgstr ""
> +"???????? \"name\" ?????? ???? ??????? ? ?????? ??????????"
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"????????, ?????????? %(name)s ???????????? ??????. ??? ?????????? ?????????? ? "
> +"???????? ???????."
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> -msgstr "????????? %(iface)s ?? ?????????? ? ??????????? ?????? %(name)s"
> +msgstr ""
> +"????????? %(iface)s ?? ?????????? ? ??????????? ?????? %(name)s"
>   
>   #, python-format
>   msgid ""
> @@ -385,247 +475,309 @@ msgstr ""
>   "???? %(network)s, ????????? ??? ??????????? ?????? %(name)s, ?? ??????????"
>   
>   msgid "Supported virtual machine interfaces type is only network"
> -msgstr "?????????????? ?????? ???? ??? ??????????? ??????????? ?????? - ????"
> +msgstr ""
> +"?????????????? ?????? ???? ??? ??????????? ??????????? ?????? - ????"
>   
>   msgid "Network name for virtual machine interface must be a string"
> -msgstr "??? ???? ??? ?????????? ??????????? ?????? ?????? ???? ???????"
> +msgstr ""
> +"??? ???? ??? ?????????? ??????????? ?????? ?????? ???? ???????"
>   
>   msgid "Invalid network model card specified for virtual machine interface"
>   msgstr ""
>   "??????? ???????????? ????? ?????? ???? ??? ?????????? ??????????? ??????"
>   
>   msgid "Specify type and network to add a new virtual machine interface"
> -msgstr "??????? ??? ? ???? ??? ?????????? ?????? ?????????? ??????????? ??????"
> +msgstr ""
> +"??????? ??? ? ???? ??? ?????????? ?????? ?????????? ??????????? ??????"
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"MAC-????? ?????? ????? ?????? FF:FF:FF:FF:FF:FF"
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"MAC-????? %(mac)s ??? ?????????? ? ??????????? ?????? %(name)s"
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"???????????? MAC-?????"
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"?????? ???????? MAC-????? ?????????? ??????????? ??????"
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "?????? %(name)s ??? ??????????"
> +msgstr ""
> +"?????? %(name)s ??? ??????????"
>   
>   #, python-format
>   msgid ""
>   "Network '%(network)s' specified for template %(template)s does not exist"
> -msgstr "???? %(network)s, ????????? ??? ??????? %(template)s, ?? ??????????"
> +msgstr ""
> +"???? '%(network)s', ????????? ??? ??????? %(template)s, ?? ??????????"
>   
>   #, python-format
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
> -msgstr "??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?? ??????????"
> +msgstr ""
> +"??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?? ??????????"
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
> -msgstr "??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?? ???????"
> +msgstr ""
> +"??? ?????? %(pool)s, ????????? ??? ??????? %(template)s, ?????????"
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "?????? ???????????? ???????? %(param)s ??? CDROM."
> +msgstr ""
> +"?????? ???????????? ???????? %(param)s ??? CDROM."
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
> -msgstr "???? %(network)s, ????????? ??? ??????? %(template)s, ?? ???????"
> +msgstr ""
> +"???? %(network)s, ????????? ??? ??????? %(template)s, ?????????"
>   
>   msgid "Template name must be a string"
> -msgstr "??? ??????? ?????? ???? ???????"
> +msgstr ""
> +"??? ??????? ?????? ???? ???????"
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "?????? ??????? ?????? ???? ????? ? ??????"
> +msgstr ""
> +"?????? ??????? ?????? ???? ????? ? ??????"
>   
>   msgid "Template distribution must be a string"
> -msgstr "??????? ??????? ?????? ???? ???????"
> +msgstr ""
> +"??????? ??????? ?????? ???? ???????"
>   
>   msgid "Template distribution version must be a string"
> -msgstr "?????? ???????? ??????? ?????? ???? ???????"
> +msgstr ""
> +"?????? ???????? ??????? ?????? ???? ???????"
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "????? ??????????? ?????? ???? ????? ??????"
> +msgstr ""
> +"????? ??????????? ?????? ???? ????? ??????, ??????? 0"
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
> -msgstr "????? ?????? (??) ?????? ???? ????? ?????? ?????? 512"
> +msgstr ""
> +"????? ?????? (??) ?????? ???? ????? ?????? ?????? 512"
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "CDROM ??????? ?????? ???? ????????? ??? ????????? ?????? ISO"
> +msgstr ""
> +"CDROM ??????? ?????? ???? ????????? ??? ????????? ?????? ISO"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
> -msgstr "??? ??????? ?????? ???????????? URI ???? ?????? %(value)s"
> +msgstr ""
> +"??? ??????? ?????? ???????????? URI ???? ?????? %(value)s"
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
> -msgstr "??????? ????? ISO ? ???????? CDROM ??? ???????? ???????"
> +msgstr ""
> +"??????? ????? ISO ? ???????? CDROM ??? ???????? ?????? ??? ???????? ???????"
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "??? ???? ??? ??????? ?????? ???? ??????? ? ??????."
> +msgstr ""
> +"??? ???? ??? ??????? ?????? ???? ??????? ? ??????."
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
>   msgstr ""
> +"??????? ??? ??? ???????, ????? ??? ?????? - iSCSI ??? SCSI"
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
>   msgstr ""
> +"??? %(volume)s ??????????? ? ???? ?????? %(pool)s"
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> -msgstr "?? ??????? ??????? ?????? ??-?? ?????? %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ?????? ??-?? ????????? ??????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete template due error: %(err)s"
> -msgstr "?? ??????? ??????? ?????? ??-?? ?????? %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ?????? ??-?? ????????? ??????: %(err)s"
>   
>   msgid "Disk size must be an integer greater than 1GB."
>   msgstr ""
> +"?????? ????? ?????? ???? ????? ?????? ?????? 1 ??."
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "CDROM ??????? ?????? ???? ????????? ??? ????????? ?????? ISO"
> +msgstr ""
> +"??????? ????? ??????? ?????? ???? ?????????? ????????? ?????? ??????"
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
>   msgstr ""
> +"?? ??????? ???????????????? ?????? %(path)s ???????? ??????"
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
>   msgstr ""
> +"??? ???????? ????????? ??????????? ?????????? ??????????? ??????????? ?????? ???? ????????????? ????? ???????, ???? ? "
> +"?????."
>   
>   msgid ""
>   "When specifying CPU topology, each element must be an integer greater than "
>   "zero."
>   msgstr ""
> +"??? ???????? ????????? ??????????? ?????? ??????? ?????? ???? ????? ?????? ?????? "
> +"????."
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"???????????? ?????? ?????? ?????. ?????????? ???????: bochs, cloop, cow, dmg, qcow, "
> +"qcow2, qed, raw, vmdk, vpc."
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "??? ?????? %(name)s ??? ??????????"
> +msgstr ""
> +"??? ?????? %(name)s ??? ??????????"
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "??? ?????? %(name)s ?? ??????????"
> +msgstr ""
> +"??? ?????? %(name)s ?? ??????????"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
> -msgstr "??????? %(item)s ??? ???????? ???? ?????? %(name)s"
> +msgstr ""
> +"??????? %(item)s, ????? ??????? ??? ?????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "?? ??????? ??????? ???????? ??? ?????? %(name)s"
> +msgstr ""
> +"?? ??????? ??????? ??? ?????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "?? ??????? ??????? ?????? ????? ??????. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ?????? ????? ??????. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"?? ??????? ???????? ????? ????? ? ???? ?????? %(name)s. ????????: %(err)s"
> +"?? ??????? ???????? ????? ????? ? ???? ?????? %(name)s. ????????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ???????????? ??? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????????? ??? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ?????????????? ??? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ?????????????? ??? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
>   msgstr ""
> -"?? ??????? ??????? ??? NFS: ???????????????? ???? %(path)s ??? ???? "
> -"???????????? ?? ????? ????????????"
> +"?? ??????? ??????? ??? NFS: ???????????????? ???? %(path)s ??? ???? ???????????? ?? ????? ????????????"
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
>   msgstr ""
> -"?? ??????? ??????? ??? NFS: ?? ??????? ???????????? ???????????????? ???? "
> -"%(path)s"
> +"?? ??????? ??????? ??? NFS: ?? ??????? ???????????? ???????????????? ???? %(path)s"
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "???????????????? ??? ???? ??????: %(type)s"
> +msgstr ""
> +"???????????????? ??? ???? ??????: %(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
>   msgstr ""
> +"?????? ????????? XML ???? ?????? ??? %(pool)s"
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"??? ???? ?????? ?????? ???? ??????? ??? ???????? ????? ????? (/)"
>   
>   msgid ""
>   "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
>   "iso"
>   msgstr ""
> +"?????????????? ???? ????? ??????: dir, netfs, logical, iscsi, isci ? kimchi-"
> +"iso"
>   
>   msgid "Storage pool path must be a string"
> -msgstr "???? ? ???? ?????? ?????? ???? ???????"
> +msgstr ""
> +"???? ? ???? ?????? ?????? ???? ???????"
>   
>   msgid "Storage pool host must be a IP or hostname"
> -msgstr "???? ???? ?????? ?????? ???? IP-??????? ??? ?????? ?????"
> +msgstr ""
> +"???? ???? ?????? ?????? ???? IP-??????? ??? ?????? ?????"
>   
>   msgid "Storage pool device must be the absolute path to the block device"
>   msgstr ""
> +"?????????? ???? ?????? ?????? ???? ?????????? ????? ? ???????? ??????????"
>   
>   msgid "Storage pool devices parameter must be a list"
> -msgstr "???????? ????????? ???? ?????? ?????? ???? ???????"
> +msgstr ""
> +"???????? ????????? ???? ?????? ?????? ???? ???????"
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "??????? IQN ???? iSCSI ?????? ???? ???????"
> +msgstr ""
> +"??????? IQN ???? iSCSI ?????? ???? ???????"
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
> -msgstr "???? ?????????? ??????? ?????? ?????? ???? ????? ?????? ?? 1 ?? 65535"
> +msgstr ""
> +"???? ?????????? ??????? ?????? ?????? ???? ????? ?????? ?? 1 ?? 65535"
>   
>   msgid "iSCSI target username must be a string"
>   msgstr ""
> +"??? ???????????? ???????? ??????? iSCSI ?????? ???? ???????"
>   
>   msgid "iSCSI target password must be a string"
>   msgstr ""
> +"?????? ???????? ??????? iSCSI ?????? ???? ???????"
>   
>   msgid "Specify name and type to create a storage pool"
> -msgstr "??????? ??? ? ??? ??? ???????? ???? ??????"
> +msgstr ""
> +"??????? ??? ? ??? ??? ???????? ???? ??????"
>   
>   #, python-format
>   msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
>   msgstr ""
> -"%(disk)s ?? ???????? ?????????? ??????/????????. ?? ??????? ???????? ??? ? "
> -"??? %(pool)s."
> +"%(disk)s ?? ???????? ?????????? ??????/????????. ??? ?? ??????? ???????? ? ??? "
> +"%(pool)s."
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
>   msgstr ""
> +"?? ??????? ????????? ?????????? ??? %(pool)s. ????????: %(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
> -msgstr "????? ?????????? ????? ????????? ?????? ??? ??????????? ???? ??????."
> +msgstr ""
> +"????? ?????????? ????? ????????? ?????? ??? ??????????? ???? ??????."
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "??? ???????? ????? SCSI ?????? ???? ???????."
> +msgstr ""
> +"??? ???????? ????? SCSI ?????? ???? ???????."
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
> -msgstr "kimchi_isos ???? ?????? ?????????????? ??? ??????????? ?????????????"
> +msgstr ""
> +"kimchi_isos ???? ?????? ?????????????? ??? ??????????? ?????????????"
>   
>   #, python-format
>   msgid ""
> @@ -647,158 +799,191 @@ msgstr ""
>   msgid ""
>   "Unable to deactivate pool %(name)s as it is associated with some templates"
>   msgstr ""
> -"?? ??????? ?????????????? ??? %(name)s: ??? ?????? ? ?????????? ?????????"
> +"?? ??????? ?????????????? ??? %(name)s: ??? ?????? ? ?????????"
>   
>   #, python-format
>   msgid "Unable to delete pool %(name)s as it is associated with some templates"
> -msgstr "?? ??????? ??????? ??? %(name)s: ??? ?????? ? ?????????? ?????????"
> +msgstr ""
> +"?? ??????? ??????? ??? %(name)s: ??? ?????? ? ?????????"
>   
>   #, python-format
>   msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
>   msgstr ""
> -"?????? ????? ? ?????? %(name)s ??? ??????????. ???????? ?????? ??? ??? "
> -"???????? ??????????? ????."
> +"?????? ????? ? ?????? '%(name)s' ??? ??????????. ???????? ?????? ??? "
> +"??? ???????? ??????????? ????."
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
>   msgstr ""
> -"?? ??????? ???????? ???? ?????? ? ??????????? ????????? ???????????? ??-?? "
> -"?????? %(err)s"
> +"?? ??????? ???????? ???? ?????? ??????????? ????????? ???????????? ??-?? ????????? ??????: %(err)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "??? %(name)s ??? ??????????"
> +msgstr ""
> +"??? ?????? %(name)s ??? ??????????"
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
> -msgstr "??? %(name)s ?? ?????????? ? ???? ?????? %(pool)s"
> +msgstr ""
> +"??? ?????? %(name)s ?? ?????????? ? ???? ?????? %(pool)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
>   "not active"
>   msgstr ""
> +"?? ??????? ??????? ??? ?????? %(volume)s, ????????? ??? ?????? %(pool)s "
> +"?????????"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create storage volume %(volume)s"
> -msgstr "??????? %(item)s ??? ???????? ???? %(volume)s"
> +msgstr ""
> +"??????? %(item)s, ????? ??????? ??? ?????? %(volume)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes because storage pool %(pool)s is not active"
> -msgstr "?? ??????? ??????? ?????? ?????: ??? ?????? %(pool)s ?? ???????"
> +msgstr ""
> +"?? ??????? ??????? ?????? ?????: ??? ?????? %(pool)s ?????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
>   msgstr ""
> -"?? ??????? ??????? ??? %(name)s ? ???? ?????? %(pool)s. ????????: %(err)s"
> +"?? ??????? ??????? ??? ?????? %(name)s ? ???? ?????? %(pool)s. ????????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
>   msgstr ""
> -"?? ??????? ??????? ?????? ????? ? ???? ?????? %(pool)s. ????????: %(err)s"
> +"?? ??????? ??????? ?????? ????? ?????? ? ???? ?????? %(pool)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ???? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ???? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ??? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ??? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ???????? ?????? ???? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????? ?????? ???? ?????? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
> -msgstr "??? ?????? %(type)s ?? ???????????? ???????? ? ???????? ?????"
> +msgstr ""
> +"??? ?????? %(type)s ?? ???????????? ???????? ? ???????? ?????"
>   
>   msgid "Storage volume name must be a string"
> -msgstr "??? ???? ?????? ???? ???????"
> +msgstr ""
> +"??? ???? ?????? ???? ???????"
>   
>   msgid "Storage volume allocation must be an integer number"
> -msgstr "????????? ???? ?????? ???? ????? ??????"
> +msgstr ""
> +"????????? ???? ?????? ???? ????? ??????"
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"?????? ???? ?????? ?? ??????????????. ?????????? ???????: bochs, cloop, cow, dmg, "
> +"qcow, qcow2, qed, raw, vmdk, vpc."
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "???? ????????? ???"
> +msgstr ""
> +"???? ????????? ???"
>   
>   #, python-format
>   msgid ""
>   "Unable to update database with storage volume information due error: %(err)s"
>   msgstr ""
> -"?? ??????? ???????? ???? ?????? ? ??????????? ? ????? ??-?? ?????? %(err)s"
> +"?? ??????? ???????? ???? ?????? ??????????? ? ????? ?????? ??-?? ????????? ??????: %(err)s"
>   
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
>   msgstr ""
> +"????? ??????? ?????? ???? ???????? %(param)s"
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
>   msgstr ""
> +"???????? ???? ?? %(param)s ?? ??????????????"
>   
>   msgid "Storage volume capacity must be an integer number."
>   msgstr ""
> +"??????? ???? ?????? ?????? ???? ????? ??????."
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
>   msgstr ""
> +"URL ???? ?????? ?????? ???? http://, https://, ftp:// ??? ftps://."
>   
>   #, python-format
>   msgid "Unable to access file %(url)s. Please, check it."
>   msgstr ""
> +"??? ??????? ? ????? %(url)s. ????????? ???."
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ??????? ??????????? ??? ?????? '%(name)s' ? ???? '%(pool)s'. ????????: "
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"??????? ?????? ????? ? ??? ?????? ??? ???????? ?????."
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"??? ???????? ???? ?????? ??????? ???????? upload."
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"?? ??????? ???????? ?????? ?????, ????????? ??? ?? ????????????? ???????????? ??????? ?????."
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"??? ?????? %(vol)s ?? ????????? ? ???????? ????????."
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"?????? ????? ???????? ???????? ?????? ???? ??????."
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"?? ??????? ???????? ?????? ????? ???????? ? ??? ??????. ????????: %(err)s."
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "????????? %(name)s ?? ??????????"
> +msgstr ""
> +"????????? %(name)s ?? ??????????"
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "???? %(name)s ??? ??????????"
> +msgstr ""
> +"???? %(name)s ??? ??????????"
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "???? %(name)s ?? ??????????"
> +msgstr ""
> +"???? %(name)s ?? ??????????"
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
> -msgstr "??????? %(subnet)s, ????????? ??? ???? %(network)s, ???????????."
> +msgstr ""
> +"??????? %(subnet)s, ????????? ??? ???? %(network)s, ???????????."
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
> @@ -807,59 +992,72 @@ msgstr ""
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "?? ??????? ??????? ???????? ???? %(name)s"
> +msgstr ""
> +"?? ??????? ??????? ???????? ???? %(name)s"
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
> -msgstr "????????? %(iface)s, ????????? ??? ???? %(network)s, ??? ????????????"
> +msgstr ""
> +"????????? %(iface)s, ????????? ??? ???? %(network)s, ??? ????????????"
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
>   msgstr ""
> -"????????? ?????? ???? ??????? ??????, ??????????? ????? ??? ????????? "
> -"???????????."
> +"????????? ?????? ???? ??????? ??????, ??????????? ????? ??? ????????? ???????????."
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ???? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ???? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "?? ?????? ????????? IP-????? ??? ???? %(name)s"
> +msgstr ""
> +"?? ?????? ????????? IP-????? ??? ???? %(name)s"
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
>   msgstr ""
> +"????????? %(iface)s ??? ??????????."
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"??? ???? ?????? ???? ??????? ??? ???????? ????? ????? (/) ? ??????? (\")"
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "?????????????? ???? ?????: isolated, NAT ? bridge"
> +msgstr ""
> +"?????????????? ???? ?????: isolated, NAT ? bridge"
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
>   msgstr ""
>   "??????? ???? ?????? ???? ???????, ?????????? IP-?????, ??????? ??? ????? ????"
>   
>   msgid "Network interface must be a string"
> -msgstr "??????? ????????? ?????? ???? ???????"
> +msgstr ""
> +"??????? ????????? ?????? ???? ???????"
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "??????? ?? VLAN ?????? ???? ????? ?????? ?? 1 ?? 4094"
> +msgstr ""
> +"??????? ?? VLAN ?????? ???? ????? ?????? ?? 1 ?? 4094"
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "??????? ??? ? ??? ??? ???????? ????"
> +msgstr ""
> +"??????? ??? ? ??? ??? ???????? ????"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
>   "and/or templates linked to this network."
>   msgstr ""
> +"?? ??????? ??????? ???? %(name)s. ???? ??????????? ?????? %(vms)s "
> +"??? ???????, ????????? ? ?????? ?????."
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate network %(name)s. There are some virtual machines "
>   "%(vms)s and/or templates linked to this network."
>   msgstr ""
> +"?? ??????? ?????????????? ???? %(name)s. ???? ??????????? ?????? "
> +"%(vms)s ??? ???????, ????????? ? ?????? ?????."
>   
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
> @@ -868,185 +1066,231 @@ msgstr ""
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "?? ??????? ???????????? ????????? %(iface)s: %(err)s."
> +msgstr ""
> +"?? ??????? ???????????? ????????? %(iface)s: %(err)s."
>   
>   #, python-format
>   msgid ""
>   "Failed to activate interface %(iface)s. Please check the physical link "
>   "status."
>   msgstr ""
> -"?? ?????? ???????????? ????????? %(iface)s. ????????? ????????? ?????????? "
> -"????? ?????. "
> +"?? ??????? ???????????? ????????? %(iface)s. ????????? ?????????? ????? ????? "
> +""
>   
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
>   msgstr ""
> +"?? ??????? ????????? ???? %(name)s. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "?????????? ????? %(name)s ?? ??????????"
> +msgstr ""
> +"?????????? ????? %(name)s ?? ??????????"
>   
>   msgid "Debug report tool not found in system"
> -msgstr "?????????? ??????????? ?????? ?? ?????? ? ???????"
> +msgstr ""
> +"?????????? ??????????? ?????? ?? ?????? ? ???????"
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
> -msgstr "?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s."
> +msgstr ""
> +"?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s."
>   
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
>   msgstr ""
> +"?? ?????? ?????????? ????? ? ?????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
> -msgstr "?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ?????????? ????? %(name)s. ????????: %(err)s"
>   
>   msgid "You should give a name for the debug report file."
>   msgstr ""
> +"?????????? ????????? ??? ????? ??????????? ??????."
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> +"??? ??????????? ?????? ?????? ???? ???????. ?????? ?????, ?????, ????????????? ('_') "
> +"? ????? ('-') ?????????."
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
>   msgstr ""
> -"?????? ????? ? ?????? %(name)s ??? ??????????. ???????? ?????? ??? ??? "
> -"???????? ??????????? ????."
> +"?????????? ????? ? ?????? \"%(name)s\" ??? ??????????. ??????? "
> +"?????? ???."
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "?????? ?????? %(server)s ?? ????????????? Kimchi"
> +msgstr ""
> +"?????? ?????? %(server)s ?? ????????????? Kimchi"
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "??????? ?? %(name)s ?? ??????????"
> +msgstr ""
> +"??????? ?? '%(name)s' ?? ??????????"
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "?????? %(name)s ?? ?????????? ?? ?????"
> +msgstr ""
> +"?????? %(name)s ?? ?????????? ?? ?????"
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
>   msgstr ""
>   "?? ??????? ????????? ?????? ??????? ?????: ??????????? ??????????? ??????"
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
> -msgstr "?? ??????? ????????????? ??????? ?????: ??????????? ??????????? ??????"
> +msgstr ""
> +"?? ??????? ????????????? ??????? ?????: ??????????? ??????????? ??????"
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "?????????? %(name)s ???? ?? ???????"
> +msgstr ""
> +"?????????? ???? '%(name)s' ?? ???????"
>   
>   msgid "Conflicting flag filters specified."
>   msgstr ""
> +"??????? ????????????? ????? ???????."
>   
>   msgid "No packages marked for update"
> -msgstr "??? ???????, ?????????? ??? ??????????"
> +msgstr ""
> +"??? ???????, ?????????? ??? ??????????"
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "????? %(name)s ?? ??????? ??? ??????????."
> +msgstr ""
> +"????? %(name)s ?? ??????? ??? ??????????."
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
> -msgstr "?????? ????????? ???????, ?????????? ??? ??????????. ????????: %(err)s"
> +msgstr ""
> +"?????? ????????? ???????, ?????????? ??? ??????????. ????????: %(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "??? ???????????? ?????????????? ??????? ??? ???? ???????."
> +msgstr ""
> +"??? ???????????? ?????????????? ??????? ??? ???? ???????."
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "?? ?????? %(item)s ? ????????? ??????"
> +msgstr ""
> +"?? ?????? %(item)s ? ????????? ??????"
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "???????????? URI %(uri)s"
> +msgstr ""
> +"???????????? URI %(uri)s"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
> -msgstr "????? ????-??? ?????????? ??????? %(cmd)s (%(seconds)s ?)"
> +msgstr ""
> +"????? ????-??? ?? ????? ?????????? ??????? '%(cmd)s' ????? %(seconds)s ?"
>   
>   msgid "Unable to choose a virtual machine name"
>   msgstr ""
> +"?? ??????? ??????? ??? ??????????? ??????"
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"???????????? ???????? ?????? '%(value)s'"
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"???????????? ??????? ????????? ?????? '%(unit)s'"
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "???????????? ??? ??????. ?????????????? ????: cdrom"
> +msgstr ""
> +"???????????? ??? ??????. ?????????????? ????: 'cdrom', 'disk'"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
>   msgstr ""
> +"???? '%(value)s' ?? ???????? ?????????? ?????????/????????? ????? ??? ??????????"
>   
>   msgid "Only CDROM path can be update."
>   msgstr ""
> +"????? ???????? ?????? ???? ? CDROM."
>   
>   #, python-format
>   msgid ""
>   "The storage device %(dev_name)s does not exist in the virtual machine "
>   "%(vm_name)s"
>   msgstr ""
> +"?????????? ???????? %(dev_name)s ?? ?????????? ? ??????????? ?????? "
> +"%(vm_name)s"
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
> -msgstr "?????? ???????? ?????????? ????????: %(error)s"
> +msgstr ""
> +"?????? ???????? ?????????? ????????: %(error)s"
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
> -msgstr "?????? ?????????? ?????????? ????????: %(error)s"
> +msgstr ""
> +"?????? ?????????? ?????????? ????????: %(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
> -msgstr "?????? ???????? ?????????? ????????: %(error)s"
> +msgstr ""
> +"?????? ???????? ?????????? ????????: %(error)s"
>   
>   msgid "Do not support IDE device hot plug"
>   msgstr ""
> +"?? ?????????????? ??????????? ??????????? ????????? IDE"
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
> -msgstr "??????? ??? ? ???? ??? ?????????? ?????? ????? ??????????? ??????"
> +msgstr ""
> +"??????? ??? ? ????, ???? ??? ? ???/??? ??? ?????????? ?????? ????? ??????????? "
> +"??????"
>   
>   msgid "Specify path to update virtual machine disk"
> -msgstr "??????? ???? ??? ?????????? ????? ??????????? ??????"
> +msgstr ""
> +"??????? ???? ??? ?????????? ????? ??????????? ??????"
>   
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
>   msgstr ""
> +"?????????? ??????????? ?? ????? ????????? (%(limit)s) ??? ???? ??????????? %(type)s"
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
>   msgstr ""
> +"?? ??????? ???????? ?????????? ? ???? ? ????? ??? ??????? ????/????: %(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
>   msgstr ""
> +"??? ??? ???????????? ?????? ??????????? ???????."
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
> -msgstr "??????? ??? ? ???? ??? ?????????? ?????? ????? ??????????? ??????"
> +msgstr ""
> +"??? ?????????? ?????? ????? ??????????? ?????? ??????? ???? ????, "
> +"???? ??? ? ???"
>   
>   #, python-format
>   msgid ""
>   "Volume chosen with format %(format)s does not fit in the storage type "
>   "%(type)s"
>   msgstr ""
> +"????????? ??? ? ???????? %(format)s ?? ???????? ??? ???? ?????? "
> +"%(type)s"
>   
>   msgid "YUM Repository ID must be one word only string."
>   msgstr ""
>   "?? ????????? YUM ?????? ???? ???????, ????????? ?????? ?? ?????? ?????."
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "URL ????????? ?????? ???? http://, ftp:// ??? file:// ."
> +msgstr ""
> +"URL ????????? ?????? ???? http://, ftp:// ??? file:// ."
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
> @@ -1056,688 +1300,896 @@ msgstr ""
>   "????? ?????????."
>   
>   msgid "Distribution to DEB repository must be a string"
> -msgstr "??????? ??? ????????? DEB ?????? ???? ???????"
> +msgstr ""
> +"??????? ??? ????????? DEB ?????? ???? ???????"
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "?????????? ??? ????????? DEB ?????? ???? ??????????? ? ???????"
> +msgstr ""
> +"?????????? ??? ????????? DEB ?????? ???? ??????????? ? ???????"
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "?????????? ??? ????????? DEB ?????? ???? ???????"
> +msgstr ""
> +"?????????? ??? ????????? DEB ?????? ???? ???????"
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"?????? ?????????? ????? ??? ????????? ?????? ???? ???????"
>   
>   msgid "YUM Repository name must be string."
> -msgstr "??? ????????? YUM ?????? ???? ???????."
> +msgstr ""
> +"??? ????????? YUM ?????? ???? ???????."
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "???????? GPG ?????? ???? ????????? ?????????."
> +msgstr ""
> +"???????? GPG ?????? ???? ????????? ?????????."
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
>   msgstr ""
> -"???? GPG ?????? ???? URL, ??????????? ?? ?????????? ???? ? ???????????? "
> -"ASCII."
> +"???? GPG ?????? ???? URL, ??????????? ?? ?????????? ???? ? ???????????? ASCII."
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "?? ??????? ???????? ????????? %(repo_id)s."
> +msgstr ""
> +"?? ??????? ???????? ????????? %(repo_id)s."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "????????? %(repo_id)s ?? ??????????."
> +msgstr ""
> +"????????? %(repo_id)s ?? ??????????."
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"??????? ??????? URL ?????????, ?????? ?????? ? ?????????? ??? ???????? ??? "
> +"????????? ????????? YUM."
>   
>   msgid "Repository management tool was not recognized for your system."
> -msgstr "?? ????????? ?????????? ?????????? ?????????? ??? ???????."
> +msgstr ""
> +"?? ????????? ?????????? ?????????? ?????????? ??? ???????."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "????????? %(repo_id)s ??? ????????."
> +msgstr ""
> +"????????? %(repo_id)s ??? ????????."
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "????????? %(repo_id)s ??? ?????????."
> +msgstr ""
> +"????????? %(repo_id)s ??? ?????????."
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "?? ??????? ??????? ????????? %(repo_id)s."
> +msgstr ""
> +"?? ??????? ??????? ????????? %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
> -msgstr "?? ??????? ???????? ? ???? ???????????? ????????? %(repo_file)s"
> +msgstr ""
> +"?? ??????? ???????? ? ???? ???????????? ????????? %(repo_file)s"
>   
>   msgid "Specify repository distribution in order to create a DEB repository."
> -msgstr "??????? ??????? ????????? ??? ???????? ????????? DEB."
> +msgstr ""
> +"??????? ??????? ????????? ??? ???????? ????????? DEB."
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "?? ??????? ???????? ????????? %(repo_id)s."
> +msgstr ""
> +"?? ??????? ???????? ????????? %(repo_id)s."
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "?? ??????? ????????? ????????? %(repo_id)s."
> +msgstr ""
> +"?? ??????? ????????? ????????? %(repo_id)s."
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "?? ????????? YUM ??? ??????????"
> +msgstr ""
> +"?? ????????? YUM ??? ??????????"
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "??? ????????? YUM ?????? ???? ???????"
> +msgstr ""
> +"??? ????????? YUM ?????? ???? ???????"
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "?? ??????? ??????? ?????? ????????. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ?????? ????????. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> -msgstr "?? ??????? ???????? ?????????? ? ?????????. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????? ?????????? ?????????. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "?? ??????? ???????? ?????????. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????? ?????????. ????????: %(err)s"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "?? ??????? ??????? ?????????. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ??????? ?????????. ????????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Configuration items: '%(items)s' are not supported by repository manager"
>   msgstr ""
> +"???????? ???????????? '%(items)s' ?? ?????????????? ??????????????? ?????????"
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"?????????? ????????? ?????? ???? URL http://, ftp:// ??? file://."
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"?????? ?????? ? ?????????? ?????? ????????? ????????????."
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
>   msgstr ""
> +"??????????? ?????? '%(vm)s' ?????? ???? ??????????? ????? ????????? ?? ???????????? ?????."
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ??????? ??????? ???????????? ????? '%(name)s' ??????????? ?????? '%(vm)s'. ????????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
>   msgstr ""
> +"???????????? ????? '%(name)s' ?? ?????????? ? ??????????? ?????? '%(vm)s'."
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ??????? ???????? ???????????? ????? '%(name)s' ??????????? ?????? '%(vm)s'. ????????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
>   msgstr ""
> +"?? ??????? ??????? ?????? ???????????? ????? ??????????? ?????? '%(vm)s'. ????????: %(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ??????? ??????? ???????????? ????? '%(name)s' ??????????? ?????? '%(vm)s'. ????????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ??????? ???????? ??????? ???????????? ????? ??????????? ?????? '%(vm)s'. ????????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"?? ??????? ???????????? ????????? ??????????? ?????? '%(vm)s' ?? ???????????? ????? '%(name)s'. ????????: "
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> +"?? ??????? ??????? ???????????? ????? ??????????? ?????? '%(vm)s', ????????? ??? ???????? "
> +"???? ? ??????? %(format)s. ?????????????? ?????? ?????? qcow2."
>   
>   msgid "The number of vCPUs is too large for this system."
>   msgstr ""
> +"????? ??????????? ??????????? ??????? ?????? ??? ???? ???????."
>   
>   msgid "Invalid vCPU/topology combination."
>   msgstr ""
> +"???????????? ????????? ??????????? ??????????? ? ?????????."
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
>   msgstr ""
> +"?? ???? ????? (??? ? ??????? ????????????) ?? ????????? ????????? ???????????."
>   
>   msgid "ERROR CODE"
> -msgstr "??? ??????"
> +msgstr ""
> +"??? ??????"
>   
>   msgid "REASON"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "STACK"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Go to Homepage"
> -msgstr "??????? ?? ??????? ????????"
> +msgstr ""
> +"??????? ?? ???????? ????????"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "??????? ????? ??????????? ??????"
> +msgstr ""
> +"??????? ????? ??????????? ??????"
>   
>   msgid "Virtual Machine Name"
> -msgstr "??? ??????????? ??????"
> +msgstr ""
> +"??? ??????????? ??????"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
>   msgstr ""
> -"??? ??? ????????????? ??????????? ??????. ???? ?? ???????, ??? ????? ??????? "
> -"? ??????????? ?? ????????????? ???????."
> +"??? ??? ????????????? ??????????? ??????. ???? ?? ???????, ??? ????? "
> +"??????? ? ??????????? ?? ????????????? ???????."
>   
>   msgid "Template"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Please create a template first."
> -msgstr "??????????, ???????? ?????? ? ?????? ???????."
> +msgstr ""
> +"??????? ???????? ??????."
>   
>   msgid "Create a Template"
> -msgstr "??????? ??????"
> +msgstr ""
> +"??????? ??????"
>   
>   msgid "Please choose a template."
> -msgstr "??????????, ???????? ??????."
> +msgstr ""
> +"???????? ??????."
>   
>   msgid "OS"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "OS Version"
> -msgstr "?????? ??"
> +msgstr ""
> +"?????? ??"
>   
>   msgid "CPUS"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Memory"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Create"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Creating..."
>   msgstr ""
> +"????????..."
>   
>   msgid "Edit Guest"
> -msgstr "???????? ???????? ???????"
> +msgstr ""
> +"???????? ???????? ???????"
>   
>   msgid "General"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Storage"
> -msgstr "?????????"
> +msgstr ""
> +"???????? ??????"
>   
>   msgid "Interface"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Permission"
> -msgstr "??????"
> +msgstr ""
> +"????? ???????"
>   
>   msgid "Host PCI Device"
>   msgstr ""
> +"?????????? PCI ?????"
>   
>   msgid "Snapshot"
>   msgstr ""
> +"???????????? ?????"
>   
>   msgid "Name"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "CPUs"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Memory (MB)"
> -msgstr "?????? (??)"
> +msgstr ""
> +"????? ?????? (??)"
>   
>   msgid "Icon"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Device"
> -msgstr "??? ??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Path"
> -msgstr "???? NFS"
> +msgstr ""
> +"????"
>   
>   msgid "Network"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Type"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"MAC-?????"
>   
>   msgid "Available system users and groups"
>   msgstr ""
> +"????????? ????????? ???????????? ? ??????"
>   
>   msgid "Selected system users and groups"
>   msgstr ""
> +"????????? ????????? ???????????? ? ??????"
>   
>   msgid "User"
>   msgstr ""
> +"????????????"
>   
>   msgid "All"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "To Add"
>   msgstr ""
> +"????????"
>   
>   msgid "Added"
>   msgstr ""
> +"?????????"
>   
>   msgid "filter"
>   msgstr ""
> +"??????"
>   
>   msgid "Product"
>   msgstr ""
> +"???????"
>   
>   msgid "Vendor"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Created"
>   msgstr ""
> +"???? ????????"
>   
>   msgid "Save"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Replace"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Detach"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Cancel"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "revert"
>   msgstr ""
> +"????????????"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "???????? ?????????? ???????? ? VM"
> +msgstr ""
> +"???????? ?????????? ???????? ? VM"
>   
>   msgid "Device Type"
> -msgstr "??? ??????????"
> +msgstr ""
> +"??? ??????????"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> -msgstr "??? ??????????. ? ?????? ?????? ?????????????? ?????? \"cdrom\"."
> +msgstr ""
> +"??? ??????????. ? ?????? ?????? ?????????????? \"cdrom\" ? \"disk\"."
>   
>   msgid "Storage Pool"
> -msgstr "??? ??????"
> +msgstr ""
> +"??? ??????"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "???? ? ???? ?????? ?????? ???? ???????"
> +msgstr ""
> +"??? ???? ?????? ????????? ?"
>   
>   msgid "Storage Volume"
> -msgstr "??? ???? ??????"
> +msgstr ""
> +"??? ??????"
>   
>   msgid "Storage volume to be attached"
> -msgstr "??? ???? ?????? ???? ???????"
> +msgstr ""
> +"??? ?????????"
>   
>   msgid "File Path"
> -msgstr "???? ? ?????"
> +msgstr ""
> +"???? ? ?????"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "???? ? ????? ISO ??? CDROM ?? ???????."
> +msgstr ""
> +"???? ? ????? ISO ??? CDROM ?? ???????."
>   
>   msgid "Attach"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Start"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Reset"
> -msgstr "????????"
> +msgstr ""
> +"?????"
>   
>   msgid "Pause"
>   msgstr ""
> +"?????????????"
>   
>   msgid "Resume"
>   msgstr ""
> +"???????????"
>   
>   msgid "Power Off"
> -msgstr "?????????"
> +msgstr ""
> +"????????? ???????"
>   
>   msgid "Actions"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Connect"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Clone"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Edit"
> -msgstr "?????????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Shut Down"
> -msgstr "????????? ??????"
> +msgstr ""
> +"????????? ??????"
>   
>   msgid "Delete"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
> -msgstr "??????? ???????? ??? ???????????? ??? ??????. ??????? ??? ???."
> +msgstr ""
> +"??????? ???????? ??? ???????????? ??? ??????. ??????? ??? ???."
>   
>   msgid "This field is required."
> -msgstr "??? ???????????? ????."
> +msgstr ""
> +"??? ???????????? ????."
>   
>   msgid "Log in"
> -msgstr "?????"
> +msgstr ""
> +"???? ? ???????"
>   
>   msgid "Logging in..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Host"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Guests"
> -msgstr "???????? ???????"
> +msgstr ""
> +"???????? ???????"
>   
>   msgid "Templates"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Failed to get application configuration"
> -msgstr "?? ??????? ???????? ???????????? ??????????"
> +msgstr ""
> +"?? ??????? ???????? ???????????? ??????????"
>   
>   msgid "This is not a valid Linux path"
> -msgstr "???? ???????????? ???? ? Linux"
> +msgstr ""
> +"???? ???????????? ???? ? Linux"
>   
>   msgid "This is not a valid URL."
> -msgstr "??? ???????????? URL."
> +msgstr ""
> +"??? ???????????? URL."
>   
>   msgid "No such data available."
> -msgstr "??? ????? ??????."
> +msgstr ""
> +"??? ????? ??????."
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"??? ????? ? ???????? ?????. ?????????, ??? ??????? ????? ???????? ? ???????? "
> -"??? ???????????. ????? ?? ?????? HTTP: %1. "
> +"??? ????? ? ???????? ?????. ?????????, ??? ??????? ????? ???????? ? "
> +"???????? ??? ???????????. ????? ?? ?????? HTTP: %1. "
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"?? ??????? ????????? ????."
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"?????? ???????? ?????."
>   
>   msgid "Delete Confirmation"
> -msgstr "????????????? ????????"
> +msgstr ""
> +"????????????? ????????"
>   
>   msgid "OK"
> -msgstr "OK"
> +msgstr ""
> +"OK"
>   
>   msgid "Confirm"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Warning"
> -msgstr "??????????????"
> +msgstr ""
> +"??????????????"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"????????????..."
>   
>   msgid "Loading..."
> -msgstr "???????????..."
> +msgstr ""
> +"???????????..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"?????? ????????? ????????? ??????????."
>   
>   msgid "Retry"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Detailed message:"
> -msgstr "????????? ?????????:"
> +msgstr ""
> +"????????? ?????????:"
>   
>   msgid "No ISO found"
>   msgstr ""
> +"?? ?????? ????? ISO"
>   
>   msgid "This is not a valid ISO file."
> -msgstr "???? ???? ?? ???????? ?????????? ??????? ISO."
> +msgstr ""
> +"???? ???? ?? ???????? ?????????? ??????? ISO."
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "??? ?????? ????? ???????. ???????????"
> +msgstr ""
> +"??? ????? ?????? ????? ???????. ???????????"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
> -msgstr "?????? ????? ???????????? ??????. ???????????"
> +msgstr ""
> +"?????? ????? ???????????? ??????. ???????????"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
>   msgstr ""
> -"?????????? ????????? ?????? ???????, ????????? ? ??? ???????? ??????????? "
> -"??????!"
> +"?????????? ????????? ?????? ???????, ????????? ? ??? ???????? ??????????? ??????!"
>   
>   msgid "Max:"
> -msgstr "????.:"
> +msgstr ""
> +"????.:"
>   
>   msgid "Utilization"
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "Available"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Read Rate"
> -msgstr "???????? ??????"
> +msgstr ""
> +"???????? ??????"
>   
>   msgid "Write Rate"
> -msgstr "???????? ??????"
> +msgstr ""
> +"???????? ??????"
>   
>   msgid "Received"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Sent"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
>   msgstr ""
> -"?????????? ?????? ? ?????????? ????? ???????? ? ?????? ????????????? ??????. "
> -"?????????? ?????????? ??????/???????????"
> +"?????????? ?????? ? ?????????? ????? ???????? ? ?????? ????????????? ??????. ?????????? "
> +"?????????? ??????/???????????"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
> -msgstr "????????? ????? ??????? ??? ??????????? ??????????????. ???????????"
> +msgstr ""
> +"????????? ????? ??????? ??? ??????????? ??????????????. "
> +"???????????"
>   
>   msgid "Repositories"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "ID"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Base URL"
> -msgstr "??????? URL"
> +msgstr ""
> +"??????? URL"
>   
>   msgid "Is Mirror"
> -msgstr "?????????? ?????"
> +msgstr ""
> +"?????????? ?????"
>   
>   msgid "URL Args"
> -msgstr "????????? URL"
> +msgstr ""
> +"????????? URL"
>   
>   msgid "Enabled"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "GPG Check"
> -msgstr "???????? GPG"
> +msgstr ""
> +"???????? GPG"
>   
>   msgid "GPG Key"
> -msgstr "???? GPG"
> +msgstr ""
> +"???? GPG"
>   
>   msgid "Add"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Remove"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Enable"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Disable"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Software Updates"
> -msgstr "?????????? ???????????? ???????????"
> +msgstr ""
> +"?????????? ???????????? ???????????"
>   
>   msgid "Package Name"
> -msgstr "??? ??????"
> +msgstr ""
> +"??? ??????"
>   
>   msgid "Version"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Architecture"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Repository"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Update All"
> -msgstr "???????? ???"
> +msgstr ""
> +"???????? ???"
>   
>   msgid "Updating..."
> -msgstr "??????????..."
> +msgstr ""
> +"??????????..."
>   
>   msgid "Failed to retrieve packages update information."
>   msgstr ""
> +"?????? ????????? ?????????? ??? ?????????? ???????."
>   
>   msgid "Failed to update package(s)."
> -msgstr "?? ??????? ???????? ??????."
> +msgstr ""
> +"?? ??????? ???????? ??????."
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
>   msgstr ""
> -"?????????? ????? ????? ?????? ??? ??????????? ??????????????. ???????????"
> +"?????????? ????? ????? ?????? ??? ??????????? ??????????????. "
> +"???????????"
>   
>   msgid "Debug Reports"
> -msgstr "?????????? ??????"
> +msgstr ""
> +"?????????? ??????"
>   
>   msgid "Generated Time"
> -msgstr "????? ????????"
> +msgstr ""
> +"????? ????????"
>   
>   msgid "Generate"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Generating..."
> -msgstr "????????..."
> +msgstr ""
> +"????????..."
>   
>   msgid "Rename"
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "Download"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
> -msgstr "??? ?????? ?????? ????????? ?????? ?????, ????? ? ?????? ('-')."
> +msgstr ""
> +"??? ?????? ?????? ????????? ?????? ?????, ?????, ????????????? ('_') ? "
> +"?????? ('-')."
>   
>   msgid "Pending..."
> -msgstr "???????????..."
> +msgstr ""
> +"????????..."
>   
>   msgid "Report name is the same as the original one."
>   msgstr ""
> +"??? ?????? ????????? ? ????????."
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
>   msgstr ""
> -"????? ??????? ??????????? ?????? ?????? ?? ?????? ???????????? ???????. ??? "
> -"??????????? ????????. ???????????"
> +"??????????? ?????? ????? ??????? ?????? ?? ?????? ???????????? ???????. ??? ???????? "
> +"??????????. ???????????"
>   
>   msgid "Power off Confirmation"
> -msgstr "????????????? ????????"
> +msgstr ""
> +"????????????? ?????????? ???????"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
>   msgstr ""
> +"??? ???????? ????? ???????? ? ????????????? ????????????. ????????, ???????????? ???????? "
> +"??? ? ???????? ???????. ???????????"
>   
>   msgid "Reset Confirmation"
> -msgstr "????????????? ????????"
> +msgstr ""
> +"????????????? ??????"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
>   msgstr ""
> +"?????? ?????? ?????? ??? ?????? ??? ??????????? ?????? ???????? ??. "
> +"???????????"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "????????????? ????????"
> +msgstr ""
> +"????????????? ?????????? ??????"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
> -msgstr "?????? ????? ???????????? ??????. ???????????"
> +msgstr ""
> +"???????? ????????, ??? ???????? ?? ????? ??????????????? ???? ??????. ???????????"
>   
>   msgid "Virtual Machine delete Confirmation"
>   msgstr ""
> +"????????????? ???????? ??????????? ??????"
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
>   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 ""
> +"???? ? ??????? ???????? ??????? ???? ???? SCSI ??? iSCSI, ??? ????? ??????????? "
> +"? ??? ?????? ?? ?????????. ?? ?? ????? ??????????, ???? ? ??????? ???? "
> +"???????????? ?????????? ????? ??? ???????????? ?????. ???????????"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
>   msgstr ""
> -"???? CDROM ????? ????????. ??? ????? ????? ????? ??????????. ??????????"
> +"???? CDROM ????? ????????. ??? ????? ????? ????? ??????????. "
> +"??????????"
>   
>   msgid "Attaching..."
> -msgstr "???????????..."
> +msgstr ""
> +"???????????..."
>   
>   msgid "Replacing..."
> -msgstr "??????..."
> +msgstr ""
> +"??????..."
>   
>   msgid "Successfully attached!"
> -msgstr "??????? ?????????!"
> +msgstr ""
> +"??????? ?????????!"
>   
>   msgid "Successfully replaced!"
> -msgstr "??????? ???????!"
> +msgstr ""
> +"??????? ???????!"
>   
>   msgid "Successfully detached!"
> -msgstr "??????? ????????!"
> +msgstr ""
> +"??????? ????????!"
>   
>   msgid ""
>   "This disk will be detached permanently and you can re-attach it. Continue to "
>   "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."
> +msgstr ""
> +"?? VLAN ?????? ???? ?? 1 ?? 4094."
>   
>   msgid "unavailable"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
> @@ -1747,490 +2199,643 @@ msgstr ""
>   "??????? ?? ???? ????."
>   
>   msgid "Create a network"
> -msgstr "??????? ????"
> +msgstr ""
> +"??????? ????"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"???? ??? ?????? ?? ??????????. ?????? ???????????, ??? ???????? ???????????? "
> -"??? ??????. ???????????"
> +"??? ???? ?? ??????????. ?????? ?????????, ??? ???????? "
> +"???????????? ?????? ??. ???????????"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"??? ??????????? VLAN ????? ???????? ??????????? ? ?????????? NetworkManager.  "
> +"??? ????????????? ?????????."
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
> -msgstr "??? ?????? ????? ???????????? ??????. ???????????"
> +msgstr ""
> +"??? ?????? ????? ???????????? ??????. ???????????"
>   
>   msgid "This storage pool is empty."
> -msgstr "???? ??? ?????? ??????."
> +msgstr ""
> +"???? ??? ?????? ??????."
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
>   "to continue? "
>   msgstr ""
> -"???? ????? ??????????????, ? ??? ?????? ?? ??? ????? ????????. ?? "
> -"????????????? ?????? ??????????? "
> +"???? ????? ??????????????, ? ??? ?????? ?? ??? ????? ????????. ?? ????????????? ?????? "
> +"??????????? "
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "SCSI Fibre Channel"
> +msgstr ""
> +"SCSI Fibre Channel"
>   
>   msgid "No SCSI adapters found."
> -msgstr "?? ??????? ???????? SCSI."
> +msgstr ""
> +"?? ??????? ???????? SCSI."
>   
>   msgid "Loading iSCSI targets..."
>   msgstr ""
> +"???????? ??????? ???????? iSCSI..."
>   
>   msgid "No iSCSI found. Please input one."
>   msgstr ""
> +"?? ?????? iSCSI. ???????."
>   
>   msgid "Failed to load iSCSI targets."
>   msgstr ""
> +"?? ??????? ????????? ??????? ??????? iSCSI."
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "?? ??????? ??? ???? ??????."
> +msgstr ""
> +"?? ??????? ??? ???? ??????."
>   
>   msgid "The storage pool path can not be blank."
> -msgstr "?? ?????? ???? ? ???? ??????."
> +msgstr ""
> +"?? ?????? ???? ? ???? ??????."
>   
>   msgid "NFS server mount path can not be blank."
> -msgstr "?? ?????? ???? ???????????? ??????? NFS."
> +msgstr ""
> +"?? ?????? ???? ???????????? ??????? NFS."
>   
>   msgid "Invalid NFS mount path."
> -msgstr "???????????? ???? ???????????? NFS."
> +msgstr ""
> +"???????????? ???? ???????????? NFS."
>   
>   msgid "No logical device selected."
> -msgstr "?? ??????? ?????????? ??????????."
> +msgstr ""
> +"?? ??????? ?????????? ??????????."
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "?? ?????? ??????? ?????? iSCSI."
> +msgstr ""
> +"?? ?????? ??????? ?????? iSCSI."
>   
>   msgid "Server name can not be blank."
> -msgstr "?? ??????? ??? ???????."
> +msgstr ""
> +"?? ??????? ??? ???????."
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
>   msgstr ""
> +"??? ?? ?????????? ??? ??? IP-????? ???????. ???????? ???."
>   
>   msgid "Looking for available partitions ..."
> -msgstr "????? ????????? ????????..."
> +msgstr ""
> +"????? ????????? ????????..."
>   
>   msgid "No available partitions found."
> -msgstr "?? ??????? ????????? ???????."
> +msgstr ""
> +"?? ??????? ????????? ???????."
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"???? ??? ?????? ?? ??????????. ?????? ???????????, ??? ???????? ???????????? "
> -"??? ??????. ???????????"
> +"???? ??? ?????? ?? ??????????. ?????? ???????????, ??? ???????? "
> +"???????????? ?????? ???. ???????????"
>   
>   msgid "Unable to retrieve partitions information."
> -msgstr "?? ??????? ???????? ?????????? ? ?????????. ????????: %(err)s"
> +msgstr ""
> +"?? ??????? ???????? ?????????? ? ????????."
>   
>   msgid "In progress..."
>   msgstr ""
> +"??????????..."
>   
>   msgid "Failed!"
>   msgstr ""
> +"????!"
>   
>   msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
>   msgstr ""
> +"???? ? CDROM ?????? ???? ?????????? ????????? ??? ????????? ????? ? ?? ????? ???? ??????."
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "?? ??????? ??? ???? ??????."
> +msgstr ""
> +"?? ?????? ??? ??? ??? ?????."
>   
>   msgid "Peers"
>   msgstr ""
> +"???????????? ????"
>   
>   msgid "Searching"
>   msgstr ""
> +"?????"
>   
>   msgid "No peers found."
>   msgstr ""
> +"?? ??????? ???????????? ????."
>   
>   msgid "Help"
> -msgstr "??????"
> +msgstr ""
> +"???????"
>   
>   msgid "About"
> -msgstr "? ?????????"
> +msgstr ""
> +"? ?????????"
>   
>   msgid "Log out"
> -msgstr "?????"
> +msgstr ""
> +"??????? ?????"
>   
>   msgid "Version:"
> -msgstr "??????:"
> +msgstr ""
> +"??????:"
>   
>   msgid "Session timeout, please re-login."
>   msgstr ""
> +"????-??? ??????. ??????????, ??????? ??????."
>   
>   msgid "User Name"
> -msgstr "??? ????????????"
> +msgstr ""
> +"??? ????????????"
>   
>   msgid "Password"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "??????? ????? ?????????? ?????"
> +msgstr ""
> +"??????? ????? ?????????? ?????"
>   
>   msgid "Report Name"
> -msgstr "??? ??????"
> +msgstr ""
> +"??? ??????"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"??? ??? ????????????? ??????. ???? ?? ???????, ??? ????? ???????????? ?? "
> -"?????? ???????? ???????. ??? ????? ?????????: ?????, ????? ? ?????? (\"-\")."
> +"??? ??? ????????????? ??????. ???? ?? ???????, ??? ????? "
> +"???????????? ?? ?????? ???????? ???????. ??? ????? ???????? ?????, ?????, ????????????? (\"_\") "
> +"? ?????? (\"-\")."
>   
>   msgid "Rename a Debug Report"
> -msgstr "??????? ????? ?????????? ?????"
> +msgstr ""
> +"????????????? ?????????? ?????"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
>   msgstr ""
> -"??? ??? ????????????? ??????. ???? ?? ???????, ??? ????? ???????????? ?? "
> -"?????? ???????? ???????. ??? ????? ?????????: ?????, ????? ? ?????? (\"-\")."
> +"???, ???????????? ??? ????????????? ??????. ??? ????? ???????? ?????, ????? ? "
> +"????????????? (\"-\")."
>   
>   msgid "Submit"
> -msgstr "???????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Add a Repository"
> -msgstr "???????? ?????????"
> +msgstr ""
> +"???????? ?????????"
>   
>   msgid "Identifier"
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "????????? ????? - ?????????? ????????????? ?????????."
> +msgstr ""
> +"????????? ????? - ?????????? ????????????? ?????????."
>   
>   msgid "Textual name for the repository."
> -msgstr "????????? ??? ?????????."
> +msgstr ""
> +"????????? ??? ?????????."
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "???????????? ????"
> +msgstr ""
> +"???????????? ????"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "URL ?????????. ?????????????? ?????????: http, ftp, file."
> +msgstr ""
> +"URL ?????????. ?????????????? ?????????: http, ftp, file."
>   
>   msgid "Repository is a mirror"
> -msgstr "????????? ???????? ?????????? ??????."
> +msgstr ""
> +"????????? ???????? ?????????? ??????"
>   
>   msgid "Distribution"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "??????? ????????? DEB."
> +msgstr ""
> +"??????? ????????? DEB."
>   
>   msgid "Components"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "List of components in DEB repository."
> -msgstr "?????? ??????????? ? ????????? DEB."
> +msgstr ""
> +"?????? ??????????? ? ????????? DEB."
>   
>   msgid "Edit Repository"
> -msgstr "???????? ?????????"
> +msgstr ""
> +"???????? ?????????"
>   
>   msgid "Mirror List URL"
> -msgstr "URL ?????? ?????????? ?????"
> +msgstr ""
> +"URL ?????? ?????????? ?????"
>   
>   msgid "Yes"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "No"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Add a Volume to Storage Pool"
>   msgstr ""
> +"???????? ??? ? ??? ??????"
>   
>   msgid "Fetch from remote URL"
>   msgstr ""
> +"????????? ? ?????????? URL"
>   
>   msgid "Enter the remote URL here."
>   msgstr ""
> +"??????? ???? ????????? URL."
>   
>   msgid "Upload a file"
>   msgstr ""
> +"???????? ????"
>   
>   msgid "Choose the file you want to upload."
>   msgstr ""
> +"???????? ???? ??? ????????."
>   
>   msgid "Define a New Storage Pool"
> -msgstr "??????? ??? ??????"
> +msgstr ""
> +"??????? ??? ??????"
>   
>   msgid "Storage Pool Name"
> -msgstr "??? ???? ??????"
> +msgstr ""
> +"??? ???? ??????"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
> -msgstr "??? ??? ????????????? ????? ??????. ?? ????? ???? ??????."
> +msgstr ""
> +"??? ??? ????????????? ????? ??????. ?? ????? ???? ??????."
>   
>   msgid "Storage Pool Type"
> -msgstr "??? ???? ??????"
> +msgstr ""
> +"??? ???? ??????"
>   
>   msgid "Storage Path"
> -msgstr "???? ? ?????"
> +msgstr ""
> +"???? ? ?????"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
> -msgstr "???? ? ???? ??????. ?????? ??? ?????? ?????? ????? ?????????? ????."
> +msgstr ""
> +"???? ? ???? ??????. ?????? ??? ?????? ?????? ????? ?????????? ????."
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
> -msgstr "Kimchi ?????????? ??????? ???????, ???? ?? ?? ?????????? ? ???????."
> +msgstr ""
> +"Kimchi ?????????? ??????? ???????, ???? ?? ?? ?????????? "
> +"? ???????."
>   
>   msgid "NFS Server IP"
> -msgstr "IP-????? ??????? NFS"
> +msgstr ""
> +"IP-????? ??????? NFS"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
>   msgstr ""
> -"IP-????? ??? ??? ????? ??????? NFS. ??? ????? ?????? ??? ??????? ? "
> -"??????????."
> +"IP-????? ??? ??? ????? ??????? NFS. ??? ????? ?????? ??? ??????? ? ??????????."
>   
>   msgid "NFS Path"
> -msgstr "???? NFS"
> +msgstr ""
> +"???? NFS"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "???????????????? ???? NFS ?? ??????? NFS."
> +msgstr ""
> +"???????????????? ???? NFS ?? ??????? NFS."
>   
>   msgid "Device path"
> -msgstr "???? ? ??????????"
> +msgstr ""
> +"???? ? ??????????"
>   
>   msgid "iSCSI Server"
> -msgstr "?????? iSCSI"
> +msgstr ""
> +"?????? iSCSI"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
> -msgstr "IP-????? ??? ??? ????? ??????? iSCSI. ?? ????? ???? ??????."
> +msgstr ""
> +"IP-????? ??? ??? ????? ??????? iSCSI. ?? ????? ???? ??????."
>   
>   msgid "Server"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Port"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Target"
> -msgstr "??????? ??????"
> +msgstr ""
> +"??????? ??????"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "??????? ?????? iSCSI ?? ??????? iSCSI"
> +msgstr ""
> +"??????? ?????? iSCSI ?? ??????? iSCSI"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "???????? ????????????? iSCSI"
> +msgstr ""
> +"???????? ????????????? iSCSI"
>   
>   msgid "iSCSI Authentication"
> -msgstr "????????????? iSCSI"
> +msgstr ""
> +"????????????? iSCSI"
>   
>   msgid "SCSI Adapter"
> -msgstr "??????? SCSI"
> +msgstr ""
> +"??????? SCSI"
>   
>   msgid "Please, wait..."
> -msgstr "?????????..."
> +msgstr ""
> +"?????????..."
>   
>   msgid "Add Template"
> -msgstr "???????? ??????"
> +msgstr ""
> +"???????? ??????"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "??? ????????? ???????? ???????? ??? ????? ????????"
> +msgstr ""
> +"??? ????????? ???????? ???????? ??? ????? ???????? "
>   
>   msgid "Local ISO Image"
> -msgstr "????????? ????? ISO"
> +msgstr ""
> +"????????? ????? ISO"
>   
>   msgid "Local Image File"
>   msgstr ""
> +"????????? ???? ??????"
>   
>   msgid "Remote ISO Image"
> -msgstr "????????? ????? ISO"
> +msgstr ""
> +"????????? ????? ISO"
>   
>   msgid "Search ISOs"
> -msgstr "????? ??????? ISO"
> +msgstr ""
> +"????? ??????? ISO"
>   
>   msgid "The following ISOs are available:"
> -msgstr "????????? ?????? ISO:"
> +msgstr ""
> +"????????? ?????? ISO:"
>   
>   msgid "OS: "
> -msgstr "??: "
> +msgstr ""
> +"??: "
>   
>   msgid "Version: "
> -msgstr "??????: "
> +msgstr ""
> +"??????: "
>   
>   msgid "Size: "
> -msgstr "??????: "
> +msgstr ""
> +"??????: "
>   
>   msgid "Search more ISOs"
> -msgstr "????? ?????????????? ??????? ISO"
> +msgstr ""
> +"????? ?????????????? ??????? ISO"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "??????? ??????? ?? ????????? ??????? ISO"
> +msgstr ""
> +"??????? ??????? ?? ????????? ??????? ISO"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "???????????? ?????????? ???? ISO"
> +msgstr ""
> +"???????????? ?????????? ???? ISO"
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "???????? ????????? ISO ?? ?????????..."
> +msgstr ""
> +"???????? ????????? ISO ?? ?????????..."
>   
>   msgid "Arch: "
> -msgstr "???????????: "
> +msgstr ""
> +"???????????: "
>   
>   msgid "I want to use a custom URL"
> -msgstr "???????????? ?????? URL"
> +msgstr ""
> +"???????????? ?????? URL"
>   
>   msgid "Edit Template"
> -msgstr "???????? ??????"
> +msgstr ""
> +"???????? ??????"
>   
>   msgid "Processor"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "CDROM"
> -msgstr "CDROM"
> +msgstr ""
> +"CDROM"
>   
>   msgid "Image File"
>   msgstr ""
> +"???? ??????"
>   
>   msgid "Graphics"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Disk(GB)"
>   msgstr ""
> +"???? (??)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"?????? ?????"
>   
>   msgid "CPU Number"
> -msgstr "?????????? ???????????"
> +msgstr ""
> +"?????????? ???????????"
>   
>   msgid "Manually set CPU topology"
>   msgstr ""
> +"??????? ????????? ????????? ???????????"
>   
>   msgid "Cores"
>   msgstr ""
> +"????"
>   
>   msgid "Threads"
>   msgstr ""
> +"????"
>   
>   msgid "CPU"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Disk I/O"
> -msgstr "???????? ????-?????"
> +msgstr ""
> +"???????? ????-?????"
>   
>   msgid "Network I/O"
> -msgstr "??????? ????-?????"
> +msgstr ""
> +"??????? ????-?????"
>   
>   msgid "Livetile"
> -msgstr "Livetile"
> +msgstr ""
> +"Livetile"
>   
>   msgid "No guests found."
> -msgstr "?? ??????? ???????? ???????."
> +msgstr ""
> +"?? ??????? ???????? ???????."
>   
>   msgid "Shut down"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Restart"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Basic Information"
> -msgstr "??????? ??????????"
> +msgstr ""
> +"??????? ??????????"
>   
>   msgid "OS Distro"
> -msgstr "??????? ??"
> +msgstr ""
> +"??????? ??"
>   
>   msgid "OS Code Name"
> -msgstr "??????? ??? ??"
> +msgstr ""
> +"??????? ??? ??"
>   
>   msgid "CPU(s)"
>   msgstr ""
> +"??????????"
>   
>   msgid "System Statistics"
> -msgstr "????????? ??????????"
> +msgstr ""
> +"????????? ??????????"
>   
>   msgid "Update Progress"
> -msgstr "??? ??????????"
> +msgstr ""
> +"??? ??????????"
>   
>   msgid "Network Name"
> -msgstr "??? ????"
> +msgstr ""
> +"??? ????"
>   
>   msgid "State"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Network Type"
> -msgstr "??? ????"
> +msgstr ""
> +"??? ????"
>   
>   msgid "Address Space"
> -msgstr "???????? ????????????"
> +msgstr ""
> +"???????? ????????????"
>   
>   msgid "Name should not contain '/' and '\"'."
> -msgstr "???????????? ??? ???? ??????. ? ????? ?? ?????? ???? ???????? '/'."
> +msgstr ""
> +"??? ?? ?????? ????????? '/' ? '\"'."
>   
>   msgid "Isolated: no external network connection"
> -msgstr "????????????? (??? ?????????? ??????? ??????????)"
> +msgstr ""
> +"?????????????: ??? ??????? ??????? ??????????"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT (?????? ????????? ?????????? ??????? ??????????)"
> +msgstr ""
> +"NAT (?????? ????????? ?????????? ??????? ??????????)"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
> -msgstr "????? ???? (?????? ??????????? ??????????? ????? ? ?????????? ????)"
> +msgstr ""
> +"????? ???? (?????? ??????????? ??????????? ????? ? ?????????? ????)"
>   
>   msgid "(No interfaces found)"
>   msgstr ""
> +"(?????????? ?? ???????)"
>   
>   msgid "Destination"
> -msgstr "??????? ????????????:"
> +msgstr ""
> +"??????? ????????????"
>   
>   msgid "Enable VLAN"
> -msgstr "???????? VLAN:"
> +msgstr ""
> +"???????? VLAN"
>   
>   msgid "VLAN ID"
>   msgstr ""
> +"????????????? VLAN"
>   
>   msgid "Stop"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "%Used"
>   msgstr ""
> +"%????????????"
>   
>   msgid "Location"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid "Capacity"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Allocated"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "active"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "inactive"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Deactivate"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Activate"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid "Add Volume"
>   msgstr ""
> +"???????? ???"
>   
>   msgid "Extend"
>   msgstr ""
> +"?????????"
>   
>   msgid "Undefine"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Format"
> -msgstr "??????:"
> +msgstr ""
> +"??????"
>   
>   msgid "Allocation"
> -msgstr "????????? ????????:"
> +msgstr ""
> +"?????????"
>   
>   msgid "No templates found."
> -msgstr "?? ??????? ???????."
> +msgstr ""
> +"?? ??????? ???????."
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/po/zh_CN.po b/po/zh_CN.po
> index bb31f03..f7d2787 100644
> --- a/po/zh_CN.po
> +++ b/po/zh_CN.po
> @@ -1,158 +1,174 @@
> -# i18n portable object for kimchi.
> -# Copyright (C) IBM, Corp. 2013-2014
> -# ShaoHe Feng <shaohef at linux.vnet.ibm.com>, 2013-04-18.
> -#
> -# 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
> +# English translations for kimchi package.
> +# Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
>   "Project-Id-Version: kimchi 0.1\n"
>   "Report-Msgid-Bugs-To: \n"
>   "POT-Creation-Date: 2015-06-24 09:39-0300\n"
> -"PO-Revision-Date: 2013-06-27 10:48+0000\n"
> -"Last-Translator: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
> -"Language-Team: ShaoHe Feng <shaohef at linux.vnet.ibm.com>\n"
> -"Language: zh_CN\n"
> +"PO-Revision-Date: 2013-07-11 17:32-0400\n"
> +"Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
> +"Language-Team: English\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"X-Poedit-Country: CHINA\n"
> -"X-Poedit-Language: Chinese\n"
> -"X-Poedit-SourceCharset: utf-8\n"
> +"Plural-Forms: nplurals=1; plural=0;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
> -msgstr "???? %(value)s"
> +msgstr ""
> +"???? %(value)s"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "?????%(resource)s"
> +msgstr ""
> +"????? %(resource)s"
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "?????%(resource)s"
> +msgstr ""
> +"%(resource)s ???????"
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "?????%(resource)s"
> +msgstr ""
> +"????? %(resource)s"
>   
>   msgid "Unable to parse JSON request"
> -msgstr "????JSON??"
> +msgstr ""
> +"???? JSON ??"
>   
>   msgid "This API only supports JSON"
> -msgstr "??API???JSON"
> +msgstr ""
> +"? API ??? JSON"
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
> -msgstr "???????????%(err)s"
> +msgstr ""
> +"?????????????%(err)s"
>   
>   msgid "You don't have permission to perform this operation."
> -msgstr "????????????"
> +msgstr ""
> +"??????????????"
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "???model??????????"
> +msgstr ""
> +"???????????????"
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> -msgstr "????%(err)s??????"
> +msgstr ""
> +"???????????????%(err)s"
>   
>   #, python-format
>   msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
> -msgstr "??'%(task)s??%(seconds)s??"
> +msgstr ""
> +"????????%(seconds)s ????????%(task)s?"
>   
>   #, python-format
>   msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
> -msgstr "??'%(username)s'??????.[?????%(code)s]"
> +msgstr ""
> +"????%(username)s???????[?????%(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "????????Kimchi"
> +msgstr ""
> +"????? Kimchi"
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "????Kimchi?%(item)s"
> +msgstr ""
> +"?? %(item)s ??? Kimchi"
>   
>   #, python-format
>   msgid "User %(user_id)s not found with given LDAP settings."
> -msgstr "?????LDAP?????%(user_id)s??"
> +msgstr ""
> +"??????? LDAP ????? %(user_id)s?"
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
> -msgstr "???LDAP???%(item)s : %(value)s"
> +msgstr ""
> +"?? LDAP ???%(item)s : %(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
> -msgstr "????\"_cap\""
> +msgstr ""
> +"??????_cap?"
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
> -msgstr "\"_passthrough\"???\"true\"??\"false\""
> +msgstr ""
> +"?_passthrough?????true???false?"
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
> -msgstr "\"_passthrough_affected_by\"???????????"
> +msgstr ""
> +"?_passthrough_affected_by??????????"
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
> -msgstr "????????????%(err)s"
> +msgstr ""
> +"??????????????%(err)s"
>   
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
> -msgstr "????? %(device)s ??????"
> +msgstr ""
> +"?? %(device)s ??????????"
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "?????????%(filename)s"
> +msgstr ""
> +"??? Distro ???%(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
> -msgstr "??????????%(filename)s????????JSON??????"
> +msgstr ""
> +"???? Distro ???%(filename)s???????? JSON ???"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
> -msgstr "???? %(portal)s ??iSCSI?????????%(err)s"
> +msgstr ""
> +"???? iSCSI ???? %(portal)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
> -msgstr "????iSCSI??%(host)s????%(target)s?"
> +msgstr ""
> +"???? iSCSI ?? %(host)s ?? %(target)s"
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
> -msgstr "????ISO?? %(filename)s"
> +msgstr ""
> +"??? ISO ?? %(filename)s"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "ISO??%(filename)s?????"
> +msgstr ""
> +"ISO ?? %(filename)s ????"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
> -msgstr "ISO??%(filename)s?????El Torito?????"
> +msgstr ""
> +"ISO ?? %(filename)s ????? EI Torito ????"
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> -msgstr "?ISO??%(filename)s??????El Torito??????"
> +msgstr ""
> +"ISO %(filename)s ?? El Torito ??????"
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "ISO??%(filename)s?El Torito????????"
> +msgstr ""
> +"ISO %(filename)s ?? El Torito ???????"
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
> -msgstr "????ISO??%(filename)s?????"
> +msgstr ""
> +"ISO %(filename)s ????????????"
>   
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
> -msgstr "ISO??%(filename)s?????????"
> +msgstr ""
> +"? ISO %(filename)s ?????????????"
>   
>   #, python-format
>   msgid ""
> @@ -162,209 +178,265 @@ msgid ""
>   "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
>   "'path_to_iso'.Details: %(err)s"
>   msgstr ""
> -"hypervisor????ISO??%(filename)s???????ISO??/var/lib/libvirt?"
> -"?????'%(user)s'???????????'%(user)s'?????ISO??????"
> -"?????????????? 'chmod -R o+x '?????????%(err)s"
> +"????????? ISO %(filename)s ?????"
> +"??????? /var/lib/libvirt ????"
> +"??%(user)s????????????????????????????"
> +"????%(user)s???? ISO ??????????????chmod -R o+x "
> +"path_to_iso???????%(err)s"
>   
>   msgid "An error occurred when probing image OS information."
> -msgstr "????????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "No OS information found in given image."
> -msgstr "???????????????????"
> +msgstr ""
> +"????????????????"
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
> -msgstr "???????? %(filename)s"
> +msgstr ""
> +"???????? %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Image file must be an existing file on system. %(filename)s is not a valid "
>   "input."
> -msgstr "?????????????%(filename)s???????"
> +msgstr ""
> +"????????????????%(filename)s ????"
> +"???"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "???%(name)s????"
> +msgstr ""
> +"??? %(name)s ???"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "???%(name)s???"
> +msgstr ""
> +"??? %(name)s ???"
>   
>   #, python-format
>   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 ""
> -"??????? %(name)s ?????? %(new_name)s ????????????"
> -"??"
> +"?????? %(name)s ???????? %(new_name)s ?"
> +"?????????????????"
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
> -msgstr "????????????%(name)s???"
> +msgstr ""
> +"?????????? %(name)s ?????"
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "?????????ISO???"
> +msgstr ""
> +"?? ISO ???????????"
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
> -msgstr "??? %(name)s ?????"
> +msgstr ""
> +"???????? %(name)s ?????"
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
> -msgstr "???%(name)s?????????"
> +msgstr ""
> +"?????????????? %(name)s?"
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"???????????? (/) ????"
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
> -msgstr "????????URI %(value)s"
> +msgstr ""
> +"????????? URI %(value)s ??"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
> -msgstr "?????????URI %(value)s"
> +msgstr ""
> +"?????????? URI %(value)s ??"
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
> -msgstr "??????????Spice??VNC"
> +msgstr ""
> +"?????????? Spice ? VNC"
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
> -msgstr "??????????????IPv4?IPv6???"
> +msgstr ""
> +"??????????? IPv4 ? IPv6"
>   
>   msgid "Specify a template to create a virtual machine from"
> -msgstr "????????????"
> +msgstr ""
> +"?????????????"
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> -msgstr "??????? %(name)s. ???%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s ?????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
> -msgstr "??????? %(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   msgid "User name list must be an array"
> -msgstr "????????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "User name must be a string"
> -msgstr "???????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Group name list must be an array"
> -msgstr "????????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Group name must be a string"
> -msgstr "?????????????"
> +msgstr ""
> +"????????"
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "??'%(users)s'???"
> +msgstr ""
> +"???%(users)s????"
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "???'%(groups)s'???"
> +msgstr ""
> +"??%(groups)s????"
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
> -msgstr "??????? %(name)s????????%(err)s"
> +msgstr ""
> +"??????? %(name)s ??????????%(err)s"
>   
>   msgid "The guest console password must be a string."
> -msgstr "?????????????????"
> +msgstr ""
> +"??????????????"
>   
>   msgid "The life time for the guest console password must be a number."
> -msgstr "????????????????????"
> +msgstr ""
> +"?????????????????"
>   
>   #, python-format
>   msgid "Virtual machine '%(name)s' must be stopped before cloning it."
> -msgstr "???'%(name)s'???????????"
> +msgstr ""
> +"??????%(name)s???????????????"
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
> -msgstr "?????'%(name)s'???????????"
> +msgstr ""
> +"?????????????????%(name)s?????"
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
> -msgstr "?????????'%(name)s'??????%(err)s"
> +msgstr ""
> +"??? VM?%(name)s???????????%(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"???????? %(name)s ?????"
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"???? VM?%(name)s??????????"
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"???? VM?%(name)s???????%(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"???? VM?%(name)s?????????"
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"???? VM?%(name)s???????%(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"???????????????????"
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"VM?%(name)s?????????????????????"
> +"???????????"
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"?????? VM ?????"
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"??????????????????????? "
> +"1024 Mib ???"
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"???????????????? 1024 Mib??"
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"??? Libvirt ??????????Libvirt ?? >= "
> +"1.2.14"
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"???????????????%(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
> -msgstr "???%(vmid)s???????????%(dev_name)s?"
> +msgstr ""
> +"VM %(vmid)s ???????????? %(dev_name)s?"
>   
>   #, python-format
>   msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
> -msgstr "????%(dev_name)s????????????"
> +msgstr ""
> +"???????? %(dev_name)s ????? VM?"
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -373,1830 +445,2397 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> -"???IOMMU groups???PCI pass through??IOMMU group??????????"
> -"BIOS????Intel VT-d ?? AMD IOMMU ?????????????IOMMU???"
> -"Intel CPU????/boot/grub2/grub.conf???????intel_iommu=on???AMD "
> -"CPU????iommu=pt iommu=1?"
> +"????? IOMMU ???? PCI ???? IOMMU ???"
> +"??????? BIOS ??? Intel VT-d ? AMD IOMMU?"
> +"????????????? IOMMU ??????? Intel CPU??? intel_iommu=on "
> +"??? /boot/grub2/grub.conf ????????? AMD CPU???? iommu=pt "
> +"iommu=1?"
>   
>   msgid "\"name\" should be a device name string"
> -msgstr "\"name\"?????????????"
> +msgstr ""
> +"?name??????????"
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"?????????? %(name)s??????????"
> +"???"
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> -msgstr "??? %(name)s ????? %(iface)s"
> +msgstr ""
> +"?? %(iface)s ???? %(name)s ????"
>   
>   #, python-format
>   msgid ""
>   "Network %(network)s specified for virtual machine %(name)s does not exist"
> -msgstr "????%(name)s?????%(network)s???"
> +msgstr ""
> +"??????????? %(network)s ????%(name)"
>   
>   msgid "Supported virtual machine interfaces type is only network"
> -msgstr "?????????????"
> +msgstr ""
> +"???????????????"
>   
>   msgid "Network name for virtual machine interface must be a string"
> -msgstr "????????????????"
> +msgstr ""
> +"???????????????"
>   
>   msgid "Invalid network model card specified for virtual machine interface"
> -msgstr "???????????????"
> +msgstr ""
> +"?????????????????"
>   
>   msgid "Specify type and network to add a new virtual machine interface"
> -msgstr "???????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"MAC ???????? FF:FF:FF:FF:FF:FF"
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"MAC ?? %(mac)s ????? %(name)s ???"
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"?? MAC ??"
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"????????????? MAC ??"
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "?? %(name)s ????"
> +msgstr ""
> +"?? %(name)s ???"
>   
>   #, python-format
>   msgid ""
>   "Network '%(network)s' specified for template %(template)s does not exist"
> -msgstr "??? %(template)s ????? '%(network)s' ???"
> +msgstr ""
> +"???????????%(network)s?????%(template)s"
>   
>   #, python-format
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
> -msgstr "??? %(template)s ?????? '%(pool)s' ???"
> +msgstr ""
> +"??????????? %(pool)s ????%(template)s"
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
> -msgstr "??? %(template)s ?????? '%(pool)s' ????"
> +msgstr ""
> +"??????????? %(pool)s ????????%(template)s"
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "?CDROM????? '%(param)s' ??"
> +msgstr ""
> +"? CDROM ??????%(param)s????"
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
> -msgstr "??? %(template)s ????? '%(network)s' ????"
> +msgstr ""
> +"?????????? %(network)s ????????%(template)s"
>   
>   msgid "Template name must be a string"
> -msgstr "?????????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "?????????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid "Template distribution must be a string"
> -msgstr "??????????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Template distribution version must be a string"
> -msgstr "?????????????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "CPU?????????0???"
> +msgstr ""
> +"CPU ?????????? 0 ???"
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
> -msgstr "?????MB???????????512???"
> +msgstr ""
> +"??? (MB) ??????? 512 ???"
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "???CDROM????????????ISO??"
> +msgstr ""
> +"?? CDROM ?????????? ISO ??"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
> -msgstr "????????????URI %(value)s"
> +msgstr ""
> +"????????? URI %(value)s ??"
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
> -msgstr "????ISO?????????CDROM??????"
> +msgstr ""
> +"?? ISO ???? CDROM ??????????"
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "????????????????"
> +msgstr ""
> +"???????????????"
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
> -msgstr "???????iSCSI??SCSI????????????"
> +msgstr ""
> +"????? iSCSI ? SCSI ??????????"
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
> -msgstr "?%(volume)s?????%(pool)s?"
> +msgstr ""
> +"? %(volume)s ????? %(pool)s ?"
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> -msgstr "??????????%(err)s"
> +msgstr ""
> +"???????????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete template due error: %(err)s"
> -msgstr "?????%(err)s???????"
> +msgstr ""
> +"???????????????%(err)s"
>   
>   msgid "Disk size must be an integer greater than 1GB."
> -msgstr "????????1GB?"
> +msgstr ""
> +"????????? 1 GB ????"
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "????????????????????"
> +msgstr ""
> +"??????????????????"
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
> -msgstr "????????%(path)s??"
> +msgstr ""
> +"???????? %(path)s ??"
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
> -msgstr "CPU????VCPUs????sockets, cores ??threads?"
> +msgstr ""
> +"?? CPU ????vCPU ?????????????"
> +"???????"
>   
>   msgid ""
>   "When specifying CPU topology, each element must be an integer greater than "
>   "zero."
> -msgstr "CPU???????????????????"
> +msgstr ""
> +"?? CPU ??????????????"
> +"?????"
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> -"?????????????????bochs, cloop, cow, dmg, qcow, qcow2, qed, "
> -"raw, vmdk, vpc?"
> +"??????????????bochs?cloop?cow?dmg?qcow?"
> +"qcow2?qed?raw?vmdk ? vpc?"
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "???%(name)s????"
> +msgstr ""
> +"??? %(name)s ???"
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "???%(name)s???"
> +msgstr ""
> +"??? %(name)s ???"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
> -msgstr "?????%(name)s??%(item)s"
> +msgstr ""
> +"?? %(item)s ?????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "?????????? %(name)s"
> +msgstr ""
> +"????????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "???????? ??? %(err)s"
> +msgstr ""
> +"?????????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> -msgstr "??????? %(name)s???? %(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
> -msgstr "???????%(name)s????????? %(err)s"
> +msgstr ""
> +"??????? %(name)s ?????????????"
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s???? %(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s???? %(err)s"
> +msgstr ""
> +"????????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s???? %(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
> -msgstr "????NFS??????????%(path)s????????"
> +msgstr ""
> +"???? NFS ???????? %(path)s ??????????"
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
> -msgstr "????NFS??????????%(path)s??"
> +msgstr ""
> +"???? NFS ?????????? %(path)s ??"
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "??????????%(type)s"
> +msgstr ""
> +"???????????%(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
> -msgstr "?????XML?%(pool)s?????"
> +msgstr ""
> +"???? XML ??? %(pool)s ???"
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"???????????? (/) ????"
>   
>   msgid ""
>   "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
>   "iso"
> -msgstr "????????dir?netfs?logical?iscsi?isci??kimchi-iso"
> +msgstr ""
> +"?????????? dir?netfs?logical?iscsi?isci ? kimchi-"
> +"iso"
>   
>   msgid "Storage pool path must be a string"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Storage pool host must be a IP or hostname"
> -msgstr "??????????IP?????"
> +msgstr ""
> +"?????????? IP ????"
>   
>   msgid "Storage pool device must be the absolute path to the block device"
> -msgstr "??????????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "Storage pool devices parameter must be a list"
> -msgstr "??????????????"
> +msgstr ""
> +"??????????????"
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "iSCSI??????IQN??????"
> +msgstr ""
> +"iSCSI ???? IQN ??????"
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
> -msgstr "?????????????1?65535?????"
> +msgstr ""
> +"????????????????? 1 ? 65535 ?????"
>   
>   msgid "iSCSI target username must be a string"
> -msgstr "iSCSI?????????????"
> +msgstr ""
> +"iSCSI ???????????"
>   
>   msgid "iSCSI target password must be a string"
> -msgstr "iSCSI????????????"
> +msgstr ""
> +"iSCSI ??????????"
>   
>   msgid "Specify name and type to create a storage pool"
> -msgstr "????????????"
> +msgstr ""
> +"?????????????"
>   
>   #, python-format
>   msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
> -msgstr "%(disk)s ???????/????????????%(pool)s?"
> +msgstr ""
> +"%(disk)s ??????/???????????"
> +"%(pool)s?"
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
> -msgstr "???????%(pool)s???????%(err)s"
> +msgstr ""
> +"??????? %(pool)s??????%(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
> -msgstr "????????????????"
> +msgstr ""
> +"???????????????"
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "SCSI?????????????"
> +msgstr ""
> +"SCSI ??????????????"
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
> -msgstr "???kimchi_isos??????"
> +msgstr ""
> +"??? kimchi_isos ????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
> -msgstr "????NFS???%(name)s?NFS???%(server)s?????"
> +msgstr ""
> +"???? NFS ??? %(name)s?NFS ??? %(server)s"
> +"?????"
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
> -msgstr "????NFS???%(name)s?NFS???%(server)s?????"
> +msgstr ""
> +"?????? NFS ??? %(name)s?NFS ??? %(server)s"
> +"?????"
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate pool %(name)s as it is associated with some templates"
> -msgstr "???????%(name)s????????????"
> +msgstr ""
> +"??????? %(name)s????????????"
>   
>   #, python-format
>   msgid "Unable to delete pool %(name)s as it is associated with some templates"
> -msgstr "???????%(name)s????????????"
> +msgstr ""
> +"????? %(name)s????????????"
>   
>   #, python-format
>   msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
> -msgstr "??'%(name)s'??????????????????????"
> +msgstr ""
> +"???%(name)s???????????????"
> +"???????"
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
> -msgstr "??????????????%(err)s?"
> +msgstr ""
> +"????????????????????????%(err)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "???%(name)s????"
> +msgstr ""
> +"??? %(name)s ???"
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
> -msgstr "???%(pool)s??????%(name)s"
> +msgstr ""
> +"??? %(name)s ???? %(pool)s ????"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
>   "not active"
> -msgstr "???????%(volume)s??????%(pool)s ????"
> +msgstr ""
> +"??????? %(volume)s?????? %(pool)s"
> +"???????"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create storage volume %(volume)s"
> -msgstr "?????%(volume)s????%(item)s"
> +msgstr ""
> +"?? %(item)s ?????? %(volume)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes because storage pool %(pool)s is not active"
> -msgstr "?????????????%(pool)s????"
> +msgstr ""
> +"????????????? %(pool)s ???????"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
> -msgstr "??????%(pool)s??????%(name)s????%(err)s"
> +msgstr ""
> +"?????????????? %(name)s?%(pool)s??????"
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
> -msgstr "??????%(pool)s??????????%(err)s"
> +msgstr ""
> +"??????? %(pool)s ???????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
> -msgstr "???????%(name)s???????%(err)s"
> +msgstr ""
> +"??????? %(name)s ?????????%(err)s"
>   
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
> -msgstr "????%(type)s??????????"
> +msgstr ""
> +"???? %(type)s ?????????"
>   
>   msgid "Storage volume name must be a string"
> -msgstr "????????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Storage volume allocation must be an integer number"
> -msgstr "???????????"
> +msgstr ""
> +"??????????????"
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> -"????????????????bochs, cloop, cow, dmg, qcow, qcow2, qed, "
> -"raw, vmdk, vpc?"
> +"???????????????bochs?cloop?cow?dmg?"
> +"qcow?qcow2?qed?raw?vmdk ? vpc?"
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "???????"
> +msgstr ""
> +"?????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to update database with storage volume information due error: %(err)s"
> -msgstr "?????????????%(err)s"
> +msgstr ""
> +"???????????????????????%(err)s"
>   
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
> -msgstr "?????%(param)s????????"
> +msgstr ""
> +"?????? %(param)s ??"
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
> -msgstr "????%(param)s?????"
> +msgstr ""
> +"????? %(param)s ???"
>   
>   msgid "Storage volume capacity must be an integer number."
> -msgstr "????????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
> -msgstr "???URL???http://?https://?ftp://?ftps://"
> +msgstr ""
> +"??? URL ??? http://?https://?ftp:// ? ftps://?"
>   
>   #, python-format
>   msgid "Unable to access file %(url)s. Please, check it."
> -msgstr "??????%(url)s????????????"
> +msgstr ""
> +"?????? %(url)s????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
> -msgstr "??????'%(pool)s'?????'%(name)s'???????%(err)s"
> +msgstr ""
> +"????????????%(name)s???????%(pool)s???????"
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"????????????????"
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"???????????upload????"
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"?????????????????????????"
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"??? %(vol)s ??????????"
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"???????????????"
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"???????????????????%(err)s?"
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "??%(name)s???"
> +msgstr ""
> +"?? %(name)s ???"
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "??%(name)s????"
> +msgstr ""
> +"?? %(name)s ???"
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "??%(name)s???"
> +msgstr ""
> +"?? %(name)s ???"
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
> -msgstr "???%(network)s?????%(subnet)s??"
> +msgstr ""
> +"?????????? %(subnet)s ???%(network)s?"
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
> -msgstr "??????????????????%(name)s"
> +msgstr ""
> +"????????????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "?????????%(name)s"
> +msgstr ""
> +"???????? %(name)s"
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
> -msgstr "???%(network)s?????%(iface)s????"
> +msgstr ""
> +"?????????? %(iface)s ??????%(network)s"
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
> -msgstr "???????????????bonding???????"
> +msgstr ""
> +"??????? NIC?????????"
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "??????%(name)s????%(err)s"
> +msgstr ""
> +"?????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "?????'%(name)s'????????IP?????"
> +msgstr ""
> +"??????%(name)s???? IP ??"
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
>   msgstr ""
> +"?? %(iface)s ????"
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"?????????? (/) ??? (\") ????"
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "???????????NAT???"
> +msgstr ""
> +"????????????NAT ???"
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
> -msgstr "?????????IP????????????????"
> +msgstr ""
> +"????????? IP ???????????????"
>   
>   msgid "Network interface must be a string"
> -msgstr "????????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "??VLAN????1?4094?????"
> +msgstr ""
> +"?? VLAN ????????? 1 ? 4094 ?????"
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "???????????"
> +msgstr ""
> +"????????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
>   "and/or templates linked to this network."
>   msgstr ""
> +"?????? %(name)s?????? %(vms)s "
> +"?/???????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate network %(name)s. There are some virtual machines "
>   "%(vms)s and/or templates linked to this network."
>   msgstr ""
> +"???????? %(name)s?????? "
> +"%(vms)s ?/???????????"
>   
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
> -msgstr "??????%(name)s??VLAN?trunk???"
> +msgstr ""
> +"???? %(name)s ??? VLAN ??????"
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "???????? %(iface)s?%(err)s?"
> +msgstr ""
> +"?????? %(iface)s?%(err)s?"
>   
>   #, python-format
>   msgid ""
>   "Failed to activate interface %(iface)s. Please check the physical link "
>   "status."
> -msgstr "????%(iface)s???????????????"
> +msgstr ""
> +"?????? %(iface)s????????"
> +"???"
>   
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
> -msgstr "????%(name)s??????%(err)s"
> +msgstr ""
> +"?????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "????%(name)s???"
> +msgstr ""
> +"???? %(name)s ???"
>   
>   msgid "Debug report tool not found in system"
> -msgstr "???????????"
> +msgstr ""
> +"????????????"
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
> -msgstr "????????%(name)s????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s?"
>   
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
> -msgstr "????????%(name)s?????"
> +msgstr ""
> +"????????? %(name)s ???????"
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
> -msgstr "????????%(name)s????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   msgid "You should give a name for the debug report file."
> -msgstr "????????%(name)s????%(err)s"
> +msgstr ""
> +"???????????????"
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> -"????????????????????????????('_')?????('-')"
> -"??????"
> +"?????????????????????????????_??"
> +"??????-???"
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
> -msgstr "???\"'%(name)s\"???????????????????"
> +msgstr ""
> +"???????%(name)s?????????????"
> +"??????"
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "?????%(server)s??Kimchi??"
> +msgstr ""
> +"Kimchi ???????? %(server)s"
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "????'%(name)s'???"
> +msgstr ""
> +"Distro?%(name)s????"
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "????????%(name)s"
> +msgstr ""
> +"?? %(name)s ???????"
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
> -msgstr "??????????????"
> +msgstr ""
> +"???????????????????"
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
> -msgstr "??????????????"
> +msgstr ""
> +"?????????????????????"
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "????????'%(name)s'"
> +msgstr ""
> +"????????%(name)s?"
>   
>   msgid "Conflicting flag filters specified."
> -msgstr "flag filters???"
> +msgstr ""
> +"????????????"
>   
>   msgid "No packages marked for update"
> -msgstr "??????????"
> +msgstr ""
> +"????????????"
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "???%(name)s????????"
> +msgstr ""
> +"??? %(name)s ??????????"
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
> -msgstr "???????????????????%(err)s"
> +msgstr ""
> +"????????????????????????%(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "??????????????"
> +msgstr ""
> +"??????????????????"
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "?????????%(item)s"
> +msgstr ""
> +"?????????? %(item)s"
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "???URI %(uri)s"
> +msgstr ""
> +"?? URI %(uri)s"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
> -msgstr "??'%(cmd)s'??%(seconds)s?????"
> +msgstr ""
> +"?????%(cmd)s???? %(seconds)s ????"
>   
>   msgid "Unable to choose a virtual machine name"
> -msgstr "???????????"
> +msgstr ""
> +"?????????"
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"??????%(value)s?"
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"???????%(unit)s?"
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "??????????????'cdrom'?'disk'"
> +msgstr ""
> +"???????????????cdrom???disk?"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
> -msgstr "??'%(value)s'?????????/????"
> +msgstr ""
> +"???%(value)s??????????/????"
>   
>   msgid "Only CDROM path can be update."
> -msgstr "???CDROM?????"
> +msgstr ""
> +"???? CDROM ???"
>   
>   #, python-format
>   msgid ""
>   "The storage device %(dev_name)s does not exist in the virtual machine "
>   "%(vm_name)s"
> -msgstr "????%(dev_name)s????%(vm_name)s????"
> +msgstr ""
> +"???? %(dev_name)s ???? "
> +"%(vm_name)s ????"
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
> -msgstr "????????????%(error)s"
> +msgstr ""
> +"???????????%(error)s"
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
> -msgstr "??????????%(error)s"
> +msgstr ""
> +"??????????%(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
> -msgstr "??????????%(error)s"
> +msgstr ""
> +"??????????%(error)s"
>   
>   msgid "Do not support IDE device hot plug"
> -msgstr "???IDE??????"
> +msgstr ""
> +"??? IDE ?????"
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
> -msgstr "?????????????????????????/???"
> +msgstr ""
> +"???????????/?????????"
> +"??"
>   
>   msgid "Specify path to update virtual machine disk"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
> -msgstr "??????%(type)s???????%(limit)s"
> +msgstr ""
> +"???????? %(type)s ?? %(limit)s"
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
> -msgstr "?????????/??????????????%(error)s"
> +msgstr ""
> +"???????/?????????%(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
> -msgstr "?????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
> -msgstr "???????????????????/???????"
> +msgstr ""
> +"??????????/????? "
> +"?????"
>   
>   #, python-format
>   msgid ""
>   "Volume chosen with format %(format)s does not fit in the storage type "
>   "%(type)s"
> -msgstr "???%(format)s?????????%(type)s"
> +msgstr ""
> +"?????? %(format)s ?????????? "
> +"%(type)s"
>   
>   msgid "YUM Repository ID must be one word only string."
> -msgstr "YUM????ID??????????????"
> +msgstr ""
> +"Yum ???????????????????"
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "????URL???http://? ftp:// ? file://"
> +msgstr ""
> +"??? URL ??? http://?ftp:// ? file:// URL?"
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
>   "repository type."
> -msgstr "??????????????????????"
> +msgstr ""
> +"????????????????????"
> +"???"
>   
>   msgid "Distribution to DEB repository must be a string"
> -msgstr "DEB???????????????"
> +msgstr ""
> +"DEB ?????????????"
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "DEB??????????????"
> +msgstr ""
> +"DEB ??????????????"
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "DEB?????????????"
> +msgstr ""
> +"DEB ????????????"
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"??????????????"
>   
>   msgid "YUM Repository name must be string."
> -msgstr "YUM?????????????"
> +msgstr ""
> +"Yum ????????????"
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "GPG??????????"
> +msgstr ""
> +"GPG ???????????"
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
> -msgstr "GPG????????ASCII?????.asc????URL"
> +msgstr ""
> +"GPG ??????? ASCII ????? URL?"
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "????????%(repo_id)s"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "????%(repo_id)s????"
> +msgstr ""
> +"??? %(repo_id)s ????"
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"??????? URL?????????????"
> +"?? Yum ????"
>   
>   msgid "Repository management tool was not recognized for your system."
> -msgstr "??????????????"
> +msgstr ""
> +"????????????????"
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "????%(repo_id)s?????"
> +msgstr ""
> +"?????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "????%(repo_id)s?????"
> +msgstr ""
> +"?????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "????????%(repo_id)s"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
> -msgstr "????????????%(repo_file)s"
> +msgstr ""
> +"??????????? %(repo_file)s"
>   
>   msgid "Specify repository distribution in order to create a DEB repository."
> -msgstr "???????????????DEB???"
> +msgstr ""
> +"??????????? DEB ????"
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "????????%(repo_id)s"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "????????%(repo_id)s"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "YUM??ID????"
> +msgstr ""
> +"Yum ????????"
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "YUM????????????"
> +msgstr ""
> +"Yum ???????????"
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "????????????'%(err)s'"
> +msgstr ""
> +"??????????????%(err)s?"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> -msgstr "???????????????'%(err)s'"
> +msgstr ""
> +"????????????????%(err)s?"
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "????????????'%(err)s'"
> +msgstr ""
> +"??????????????%(err)s?"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "????????????'%(err)s'"
> +msgstr ""
> +"??????????????%(err)s?"
>   
>   #, python-format
>   msgid ""
>   "Configuration items: '%(items)s' are not supported by repository manager"
> -msgstr "???????????: %(items)s"
> +msgstr ""
> +"?????%(items)s???????????"
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"????????? http://?ftp:// ? file:// URL?"
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"???????????????"
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
> -msgstr "???'%(vm)s'???????????"
> +msgstr ""
> +"???????%(vm)s??????????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
> -msgstr "??????'%(vm)s'????'%(name)s'????%(err)s"
> +msgstr ""
> +"??????????????%(name)s???%(vm)s???????"
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
> -msgstr "??'%(name)s'??????'%(vm)s'??"
> +msgstr ""
> +"???%(name)s??????%(vm)s??????"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
> -msgstr "??????'%(vm)s'????'%(name)s'????%(err)s"
> +msgstr ""
> +"??????????????%(name)s???%(vm)s???????"
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
> -msgstr "???????'%(vm)s'???????%(err)s"
> +msgstr ""
> +"????????%(vm)s???????????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
> -msgstr "???????'%(vm)s'??'%(name)s'????%(err)s"
> -
> +msgstr ""
> +"??????????????%(name)s???%(vm)s???????"
> +"%(err)s"
> +
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
> -msgstr "???????'%(vm)s'????????%(err)s"
> +msgstr ""
> +"????????%(vm)s????????????"
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
> -msgstr "???????'%(vm)s'???'%(name)s'????%(err)s"
> +msgstr ""
> +"???????%(vm)s???????%(name)s???????"
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> -"??????'%(vm)s'?????????????'%(format)s'????????"
> -"?'qcow2'???"
> +"????????%(vm)s??????????"
> +"????%(format)s???????qcow2?????"
>   
>   msgid "The number of vCPUs is too large for this system."
> -msgstr "vCPUs????????????"
> +msgstr ""
> +"vCPU ?????????"
>   
>   msgid "Invalid vCPU/topology combination."
> -msgstr "???vCPU/topology???"
> +msgstr ""
> +"?? vCPU/?????"
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
> -msgstr "??????????????CPU???"
> +msgstr ""
> +"??????????????? CPU ???"
>   
>   msgid "ERROR CODE"
> -msgstr "???"
> +msgstr ""
> +"????"
>   
>   msgid "REASON"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "STACK"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Go to Homepage"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "?????????"
> +msgstr ""
> +"??????"
>   
>   msgid "Virtual Machine Name"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
> -msgstr "???????????????????????????????"
> +msgstr ""
> +"?????????????????????????????"
> +"?????"
>   
>   msgid "Template"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Please create a template first."
> -msgstr "????????"
> +msgstr ""
> +"???????"
>   
>   msgid "Create a Template"
> -msgstr "??????"
> +msgstr ""
> +"????"
>   
>   msgid "Please choose a template."
> -msgstr "??????"
> +msgstr ""
> +"????????"
>   
>   msgid "OS"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "OS Version"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "CPUS"
> -msgstr "?????"
> +msgstr ""
> +"CPUS"
>   
>   msgid "Memory"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Create"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Creating..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Edit Guest"
> -msgstr "?????"
> +msgstr ""
> +"????"
>   
>   msgid "General"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Storage"
> -msgstr "??"
> +msgstr ""
> +"???"
>   
>   msgid "Interface"
> -msgstr "????"
> +msgstr ""
> +"??"
>   
>   msgid "Permission"
> -msgstr "??"
> +msgstr ""
> +"???"
>   
>   msgid "Host PCI Device"
> -msgstr "??PCI??"
> +msgstr ""
> +"?? PCI ??"
>   
>   msgid "Snapshot"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Name"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "CPUs"
> -msgstr "?????"
> +msgstr ""
> +"CPU ?"
>   
>   msgid "Memory (MB)"
> -msgstr "??(MB)"
> +msgstr ""
> +"???MB?"
>   
>   msgid "Icon"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Device"
> -msgstr "????"
> +msgstr ""
> +"??"
>   
>   msgid "Path"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Network"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Type"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"MAC ??"
>   
>   msgid "Available system users and groups"
> -msgstr "???????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Selected system users and groups"
> -msgstr "???????????"
> +msgstr ""
> +"????????"
>   
>   msgid "User"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "All"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "To Add"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Added"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "filter"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Product"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Vendor"
> -msgstr "??"
> +msgstr ""
> +"???"
>   
>   msgid "Created"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Save"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Replace"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Detach"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Cancel"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "revert"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "????????????"
> +msgstr ""
> +"???????? VM"
>   
>   msgid "Device Type"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> -msgstr "??????????????\"cdrom\"?\"disk\"? "
> +msgstr ""
> +"??????????cdrom???disk??"
>   
>   msgid "Storage Pool"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "?????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Storage Volume"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Storage volume to be attached"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "File Path"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "????CDROM????ISO????"
> +msgstr ""
> +"CDROM ????? ISO ???"
>   
>   msgid "Attach"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Start"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Reset"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Pause"
>   msgstr ""
> +"??"
>   
>   msgid "Resume"
>   msgstr ""
> +"??"
>   
>   msgid "Power Off"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Actions"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Connect"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Clone"
> -msgstr "????"
> +msgstr ""
> +"??"
>   
>   msgid "Edit"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Shut Down"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Delete"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
> -msgstr "???????????????"
> +msgstr ""
> +"???????????????????"
>   
>   msgid "This field is required."
> -msgstr "??????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Log in"
> -msgstr "??"
> +msgstr ""
> +"???"
>   
>   msgid "Logging in..."
> -msgstr "???..."
> +msgstr ""
> +"????..."
>   
>   msgid "Host"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Guests"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Templates"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Failed to get application configuration"
> -msgstr "????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "This is not a valid Linux path"
> -msgstr "????????Linux??"
> +msgstr ""
> +"?????? Linux ??"
>   
>   msgid "This is not a valid URL."
> -msgstr "????????URL"
> +msgstr ""
> +"?????? URL?"
>   
>   msgid "No such data available."
> -msgstr "???????"
> +msgstr ""
> +"?????????"
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"??????????????????????????????HTTP?????%1"
> +"???????????????????????"
> +"????????????HTTP ???? %1?"
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"???????"
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"????????"
>   
>   msgid "Delete Confirmation"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "OK"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Confirm"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Warning"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"????..."
>   
>   msgid "Loading..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"????????????"
>   
>   msgid "Retry"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Detailed message:"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "No ISO found"
> -msgstr "????ISO??"
> +msgstr ""
> +"??? ISO"
>   
>   msgid "This is not a valid ISO file."
> -msgstr "????????ISO??"
> +msgstr ""
> +"?????? ISO ???"
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "?????????????"
> +msgstr ""
> +"???????????????"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
> -msgstr "??????????????"
> +msgstr ""
> +"???????????????"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
> -msgstr "???????????????"
> +msgstr ""
> +"??????????????????????"
>   
>   msgid "Max:"
> -msgstr "???"
> +msgstr ""
> +"????"
>   
>   msgid "Utilization"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Available"
> -msgstr "????"
> +msgstr ""
> +"??"
>   
>   msgid "Read Rate"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Write Rate"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Received"
> -msgstr "??"
> +msgstr ""
> +"???"
>   
>   msgid "Sent"
> -msgstr "??"
> +msgstr ""
> +"???"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
> -msgstr "?????????????????????????/???"
> +msgstr ""
> +"????????????????????????"
> +"??/??????"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
> -msgstr "?????????????????????"
> +msgstr ""
> +"?????????????????"
> +"????"
>   
>   msgid "Repositories"
> -msgstr "????"
> +msgstr ""
> +"???"
>   
>   msgid "ID"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Base URL"
> -msgstr "??URL"
> +msgstr ""
> +"?? URL"
>   
>   msgid "Is Mirror"
> -msgstr "?????"
> +msgstr ""
> +"???"
>   
>   msgid "URL Args"
> -msgstr "URL??"
> +msgstr ""
> +"URL ??"
>   
>   msgid "Enabled"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "GPG Check"
> -msgstr "GPG??"
> +msgstr ""
> +"GPG ??"
>   
>   msgid "GPG Key"
> -msgstr "GPG?"
> +msgstr ""
> +"GPG ??"
>   
>   msgid "Add"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Remove"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Enable"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Disable"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Software Updates"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Package Name"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Version"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Architecture"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Repository"
> -msgstr "????"
> +msgstr ""
> +"???"
>   
>   msgid "Update All"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Updating..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Failed to retrieve packages update information."
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid "Failed to update package(s)."
> -msgstr "???????"
> +msgstr ""
> +"????????"
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
> -msgstr "???????????????????????"
> +msgstr ""
> +"??????????????????"
> +"????"
>   
>   msgid "Debug Reports"
> -msgstr "??????"
> +msgstr ""
> +"????"
>   
>   msgid "Generated Time"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Generate"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Generating..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Rename"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Download"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
> -msgstr "??????????????????('_')????('-')"
> +msgstr ""
> +"????????????????????_???/?"
> +"?????-???"
>   
>   msgid "Pending..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Report name is the same as the original one."
> -msgstr "????????????"
> +msgstr ""
> +"??????????????"
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
> -msgstr "???????????????????????????"
> +msgstr ""
> +"????????????????"
> +"??????????"
>   
>   msgid "Power off Confirmation"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
> -msgstr "????????????????????????????????"
> +msgstr ""
> +"??????????????????"
> +"????????????????????"
>   
>   msgid "Reset Confirmation"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
> -msgstr "??????????????????????????????????"
> +msgstr ""
> +"????????????????????????"
> +"?????"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
> -msgstr "???????????????????????????"
> +msgstr ""
> +"???????????????????????"
>   
>   msgid "Virtual Machine delete Confirmation"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
> -msgstr "????????????????????????????"
> +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 ""
> -"????????SCSI??iSCSI???????????????????????"
> -"??????????????????????????????????"
> +"??????? SCSI ? iSCSI ???????????"
> +"?????????????????????????"
> +"????????????????????"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
> -msgstr "CDROM?????????????????????"
> +msgstr ""
> +"? CDROM ????????????????????"
> +"??????"
>   
>   msgid "Attaching..."
> -msgstr "????"
> +msgstr ""
> +"????..."
>   
>   msgid "Replacing..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Successfully attached!"
> -msgstr "????"
> +msgstr ""
> +"??????"
>   
>   msgid "Successfully replaced!"
> -msgstr "????"
> +msgstr ""
> +"??????"
>   
>   msgid "Successfully detached!"
> -msgstr "????"
> +msgstr ""
> +"??????"
>   
>   msgid ""
>   "This disk will be detached permanently and you can re-attach it. Continue to "
>   "detach it?"
> -msgstr "??????????????????????????????"
> +msgstr ""
> +"??????????????????????"
> +"???????"
>   
>   msgid "interface:"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "address:"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "link_type:"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "block:"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "drive_type:"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "model:"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Affected devices:"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "The VLAN id must be between 1 and 4094."
> -msgstr "VLAN ??????1?4094??"
> +msgstr ""
> +"VLAN ?????? 1 ? 4094 ???"
>   
>   msgid "unavailable"
> -msgstr "????"
> +msgstr ""
> +"???"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
>   "depend on this network."
> -msgstr "??????????????????????"
> +msgstr ""
> +"??????????????????"
> +"??????"
>   
>   msgid "Create a network"
> -msgstr "??????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"??????????????????????????????????????"
> -"???"
> +"?????????????????"
> +"????????????????"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"???????????????? VLAN ?????????????"
> +"????????????"
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
> -msgstr "???????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "This storage pool is empty."
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
>   "to continue? "
> -msgstr "????????????????????????????"
> +msgstr ""
> +"???????????????????????????"
> +"????"
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "SCSI????"
> +msgstr ""
> +"SCSI ????"
>   
>   msgid "No SCSI adapters found."
> -msgstr "????SCSI???"
> +msgstr ""
> +"????? SCSI ????"
>   
>   msgid "Loading iSCSI targets..."
> -msgstr "??iSCSI??..."
> +msgstr ""
> +"???? iSCSI ??..."
>   
>   msgid "No iSCSI found. Please input one."
> -msgstr "????iSCSI,??????"
> +msgstr ""
> +"??? iSCSI?????? iSCSI?"
>   
>   msgid "Failed to load iSCSI targets."
> -msgstr "??iSCSI?????"
> +msgstr ""
> +"???? iSCSI ???"
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "The storage pool path can not be blank."
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "NFS server mount path can not be blank."
> -msgstr "NFS????????????"
> +msgstr ""
> +"NFS ?????????????"
>   
>   msgid "Invalid NFS mount path."
> -msgstr "???NFS?????"
> +msgstr ""
> +"NFS ???????"
>   
>   msgid "No logical device selected."
> -msgstr "?????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "iSCSI???????"
> +msgstr ""
> +"? iscsi ????????"
>   
>   msgid "Server name can not be blank."
> -msgstr "????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
> -msgstr "??????????????IP???????????"
> +msgstr ""
> +"???????????? IP?????????"
>   
>   msgid "Looking for available partitions ..."
> -msgstr "??????? ..."
> +msgstr ""
> +"????????..."
>   
>   msgid "No available partitions found."
> -msgstr "???????"
> +msgstr ""
> +"??????????"
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
> -msgstr "?????????????????????????????????"
> +msgstr ""
> +"???????????????????????"
> +"???????????????"
>   
>   msgid "Unable to retrieve partitions information."
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "In progress..."
> -msgstr "????..."
> +msgstr ""
> +"?????..."
>   
>   msgid "Failed!"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
> -msgstr "CDROM???????????/??????????"
> +msgstr ""
> +"CDROM ??????????/?????????????"
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "?????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Peers"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Searching"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "No peers found."
> -msgstr "????????"
> +msgstr ""
> +"??????"
>   
>   msgid "Help"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "About"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Log out"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Version:"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Session timeout, please re-login."
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "User Name"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Password"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "??????????"
> +msgstr ""
> +"???????"
>   
>   msgid "Report Name"
> -msgstr "?????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"??????????????????????????????????????"
> -"?????????? ('_') ?????'-'?"
> +"????????????????????????"
> +"???????????????????????_??"
> +"??????-???"
>   
>   msgid "Rename a Debug Report"
> -msgstr "?????????"
> +msgstr ""
> +"???????"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
> -msgstr "????????????????????????????(\"-\")?"
> +msgstr ""
> +"???????????????????????"
> +"?????-???"
>   
>   msgid "Submit"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Add a Repository"
> -msgstr "????????"
> +msgstr ""
> +"?????"
>   
>   msgid "Identifier"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "Textual name for the repository."
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "?????"
> +msgstr ""
> +"????"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "?????URL???????http?ftp??file"
> +msgstr ""
> +"???? URL???????? http?ftp ? file?"
>   
>   msgid "Repository is a mirror"
> -msgstr "?????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Distribution"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "DEB??????"
> +msgstr ""
> +"DEB ????????"
>   
>   msgid "Components"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "List of components in DEB repository."
> -msgstr "DEB????????"
> +msgstr ""
> +"DEB ??????????"
>   
>   msgid "Edit Repository"
> -msgstr "??????"
> +msgstr ""
> +"?????"
>   
>   msgid "Mirror List URL"
> -msgstr "????URL"
> +msgstr ""
> +"???? URL"
>   
>   msgid "Yes"
> -msgstr "?"
> +msgstr ""
> +"?"
>   
>   msgid "No"
> -msgstr "?"
> +msgstr ""
> +"?"
>   
>   msgid "Add a Volume to Storage Pool"
> -msgstr "?????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Fetch from remote URL"
> -msgstr "???URL??"
> +msgstr ""
> +"??? URL ???"
>   
>   msgid "Enter the remote URL here."
> -msgstr "???????URL?"
> +msgstr ""
> +"??????? URL?"
>   
>   msgid "Upload a file"
> -msgstr "??????"
> +msgstr ""
> +"????"
>   
>   msgid "Choose the file you want to upload."
> -msgstr "??????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Define a New Storage Pool"
> -msgstr "?????????"
> +msgstr ""
> +"??????"
>   
>   msgid "Storage Pool Name"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
> -msgstr "?????????????????????"
> +msgstr ""
> +"????????????????????"
>   
>   msgid "Storage Pool Type"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Storage Path"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
> -msgstr "??????.?????????????"
> +msgstr ""
> +"??????????????????????"
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
> -msgstr "????????KIMCHI???????????????"
> +msgstr ""
> +"Kimchi ???????????????"
> +"???????"
>   
>   msgid "NFS Server IP"
> -msgstr "NFS???IP"
> +msgstr ""
> +"NFS ??? IP"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
> -msgstr "NFS???IP???????????????????????"
> +msgstr ""
> +"NFS ??? IP ????????????????????????"
>   
>   msgid "NFS Path"
> -msgstr "NFS ??"
> +msgstr ""
> +"NFS ??"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "NFS???????NFS??"
> +msgstr ""
> +"NFS ???? NFS ??????"
>   
>   msgid "Device path"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "iSCSI Server"
> -msgstr "iSCSI???"
> +msgstr ""
> +"iSCSI ???"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
> -msgstr "iSCSI???IP?????? ?????"
> +msgstr ""
> +"iSCSI ??? IP ???????????"
>   
>   msgid "Server"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Port"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Target"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "iSCSI??"
> +msgstr ""
> +"iSCSI ????? iSCSI ??"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "??ISCSI??"
> +msgstr ""
> +"?? iSCSI ??"
>   
>   msgid "iSCSI Authentication"
> -msgstr "iSCSI??"
> +msgstr ""
> +"iSCSI ??"
>   
>   msgid "SCSI Adapter"
> -msgstr "SCSI???"
> +msgstr ""
> +"SCSI ???"
>   
>   msgid "Please, wait..."
> -msgstr "???..."
> +msgstr ""
> +"???..."
>   
>   msgid "Add Template"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "??????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Local ISO Image"
> -msgstr "??ISO??"
> +msgstr ""
> +"?? ISO ??"
>   
>   msgid "Local Image File"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Remote ISO Image"
> -msgstr "??ISO??"
> +msgstr ""
> +"?? ISO ??"
>   
>   msgid "Search ISOs"
> -msgstr "??ISO"
> +msgstr ""
> +"?? ISO"
>   
>   msgid "The following ISOs are available:"
> -msgstr "??ISO????"
> +msgstr ""
> +"?? ISO ???"
>   
>   msgid "OS: "
> -msgstr "????? "
> +msgstr ""
> +"?????"
>   
>   msgid "Version: "
> -msgstr "??? "
> +msgstr ""
> +"???"
>   
>   msgid "Size: "
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Search more ISOs"
> -msgstr "????ISO"
> +msgstr ""
> +"???? ISO"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "????ISO?????"
> +msgstr ""
> +"??? ISO ????"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "????ISO??"
> +msgstr ""
> +"?????? ISO ??"
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "???????ISOs ..."
> +msgstr ""
> +"???????? ISO..."
>   
>   msgid "Arch: "
> -msgstr "?????"
> +msgstr ""
> +"???"
>   
>   msgid "I want to use a custom URL"
> -msgstr "?????????URL"
> +msgstr ""
> +"?????? URL"
>   
>   msgid "Edit Template"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Processor"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "CDROM"
> -msgstr "??"
> +msgstr ""
> +"CDROM"
>   
>   msgid "Image File"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Graphics"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Disk(GB)"
> -msgstr "??(GB)"
> +msgstr ""
> +"?? (GB)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"????"
>   
>   msgid "CPU Number"
> -msgstr "CPU??"
> +msgstr ""
> +"CPU ?"
>   
>   msgid "Manually set CPU topology"
> -msgstr "????CPU??"
> +msgstr ""
> +"???? CPU ??"
>   
>   msgid "Cores"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Threads"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "CPU"
> -msgstr "???"
> +msgstr ""
> +"CPU"
>   
>   msgid "Disk I/O"
> -msgstr "??I/O"
> +msgstr ""
> +"?? I/O"
>   
>   msgid "Network I/O"
> -msgstr "??I/O"
> +msgstr ""
> +"?? I/O"
>   
>   msgid "Livetile"
> -msgstr "??"
> +msgstr ""
> +"Livetile"
>   
>   msgid "No guests found."
> -msgstr "???????"
> +msgstr ""
> +"??????"
>   
>   msgid "Shut down"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Restart"
> -msgstr "??"
> +msgstr ""
> +"????"
>   
>   msgid "Basic Information"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "OS Distro"
> -msgstr "???????"
> +msgstr ""
> +"???? Distro"
>   
>   msgid "OS Code Name"
> -msgstr "??????"
> +msgstr ""
> +"????????"
>   
>   msgid "CPU(s)"
> -msgstr "CPU(s)"
> +msgstr ""
> +"CPU"
>   
>   msgid "System Statistics"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Update Progress"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Network Name"
> -msgstr "????"
> +msgstr ""
> +"???"
>   
>   msgid "State"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Network Type"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Address Space"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Name should not contain '/' and '\"'."
> -msgstr "????????/??'\"'?"
> +msgstr ""
> +"???????/???\"??"
>   
>   msgid "Isolated: no external network connection"
> -msgstr "??: ????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT: ?????????????"
> +msgstr ""
> +"NAT?????????????"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
> -msgstr "???????????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "(No interfaces found)"
> -msgstr "(????????)"
> +msgstr ""
> +"?????????"
>   
>   msgid "Destination"
> -msgstr "????"
> +msgstr ""
> +"???"
>   
>   msgid "Enable VLAN"
> -msgstr "??VLAN"
> +msgstr ""
> +"?? VLAN"
>   
>   msgid "VLAN ID"
> -msgstr "VLAN?"
> +msgstr ""
> +"VLAN ??"
>   
>   msgid "Stop"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "%Used"
>   msgstr ""
> +"?????"
>   
>   msgid "Location"
> -msgstr "??"
> +msgstr ""
> +"?? "
>   
>   msgid "Capacity"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Allocated"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "active"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "inactive"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Deactivate"
> -msgstr "??"
> +msgstr ""
> +"????"
>   
>   msgid "Activate"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Add Volume"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Extend"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Undefine"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Format"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Allocation"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "No templates found."
> -msgstr "??????"
> +msgstr ""
> +"????????"
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/po/zh_TW.po b/po/zh_TW.po
> index 342142a..33755d7 100644
> --- a/po/zh_TW.po
> +++ b/po/zh_TW.po
> @@ -1,5 +1,6 @@
>   # English translations for kimchi package.
>   # Copyright (C) 2013 ORGANIZATION
> +# Adam Litke <agl at us.ibm.com>, 2013.
>   #
>   msgid ""
>   msgstr ""
> @@ -9,133 +10,165 @@ msgstr ""
>   "PO-Revision-Date: 2013-07-11 17:32-0400\n"
>   "Last-Translator: Cr?stian Viana <vianac at linux.vnet.ibm.com>\n"
>   "Language-Team: English\n"
> -"Language: zh_TW\n"
> +"Language: en_US\n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Generated-By: pygettext.py 1.5\n"
> -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
> +"Plural-Forms: nplurals=1; plural=0;"
>   
>   #, python-format
>   msgid "Unknown parameter %(value)s"
>   msgstr ""
> +"???? %(value)s"
>   
>   #, python-format
>   msgid "Delete is not allowed for %(resource)s"
> -msgstr "????? %(resource)s ????"
> +msgstr ""
> +"????? %(resource)s ??????"
>   
>   #, python-format
>   msgid "%(resource)s does not implement update method"
> -msgstr "%(resource)s ???????"
> +msgstr ""
> +"%(resource)s ???????"
>   
>   #, python-format
>   msgid "Create is not allowed for %(resource)s"
> -msgstr "????? %(resource)s ????"
> +msgstr ""
> +"????? %(resource)s ??????"
>   
>   msgid "Unable to parse JSON request"
> -msgstr "???? JSON ??"
> +msgstr ""
> +"???? JSON ??"
>   
>   msgid "This API only supports JSON"
> -msgstr "? API ??? JSON"
> +msgstr ""
> +"? API ??? JSON"
>   
>   #, python-format
>   msgid "Parameters does not match requirement in schema: %(err)s"
>   msgstr ""
> +"????????????%(err)s"
>   
>   msgid "You don't have permission to perform this operation."
>   msgstr ""
> +"??????????"
>   
>   msgid "Datastore is not initiated in the model object."
> -msgstr "???????????????"
> +msgstr ""
> +"???????????????"
>   
>   #, python-format
>   msgid "Unable to start task due error: %(err)s"
> -msgstr "??????????????%(err)s"
> +msgstr ""
> +"??????????????%(err)s"
>   
>   #, python-format
>   msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s."
>   msgstr ""
> +"???? '%(task)s' ??????? %(seconds)s ??"
>   
>   #, python-format
>   msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]"
> -msgstr "??? '%(username)s' ??????[????%(code)s]"
> +msgstr ""
> +"????? '%(username)s' ??????[????%(code)s]"
>   
>   msgid "You are not authorized to access Kimchi"
> -msgstr "???????? Kimchi"
> +msgstr ""
> +"???????? Kimchi"
>   
>   #, python-format
>   msgid "Specify %(item)s to login into Kimchi"
> -msgstr "?? %(item)s ??? Kimchi"
> +msgstr ""
> +"?? %(item)s ??? Kimchi"
>   
>   #, python-format
>   msgid "User %(user_id)s not found with given LDAP settings."
>   msgstr ""
> +"??????? LDAP ?????? %(user_id)s?"
>   
>   #, python-format
>   msgid "Invalid LDAP configuration: %(item)s : %(value)s"
>   msgstr ""
> +"LDAP ?????%(item)s?%(value)s"
>   
>   msgid "Unknown \"_cap\" specified"
>   msgstr ""
> +"??? \"_cap\" ??"
>   
>   msgid "\"_passthrough\" should be \"true\" or \"false\""
>   msgstr ""
> +"\"_passthrough\" ??? \"true\" ? \"false\""
>   
>   msgid "\"_passthrough_affected_by\" should be a device name string"
>   msgstr ""
> +"\"_passthrough_affected_by\" ?????????"
>   
>   #, python-format
>   msgid "Error while getting block devices. Details: %(err)s"
> -msgstr "?????????????????%(err)s"
> +msgstr ""
> +"?????????????????%(err)s"
>   
>   #, python-format
>   msgid "Error while getting block device information for %(device)s."
> -msgstr "?? %(device)s ?????????????"
> +msgstr ""
> +"?? %(device)s ?????????????"
>   
>   #, python-format
>   msgid "Unable to find distro file: %(filename)s"
> -msgstr "??? distro ???%(filename)s"
> +msgstr ""
> +"??? distro ??%(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file."
> -msgstr "???? distro ???%(filename)s?????? JSON ???"
> +msgstr ""
> +"???? distro ??%(filename)s???????? JSON ??"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s"
> -msgstr "???? iSCSI ???? %(portal)s??????%(err)s"
> +msgstr ""
> +"???? iSCSI ???? %(portal)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to login to iSCSI host %(host)s target %(target)s"
> -msgstr "???? iSCSI ?? %(host)s ?? %(target)s"
> +msgstr ""
> +"???? iSCSI ?? %(host)s ?? %(target)s"
>   
>   #, python-format
>   msgid "Unable to find ISO file %(filename)s"
>   msgstr ""
> +"??? ISO ? %(filename)s"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s is not bootable"
> -msgstr "ISO ?? %(filename)s ????"
> +msgstr ""
> +"ISO ? %(filename)s ????"
>   
>   #, python-format
>   msgid "The ISO file %(filename)s does not have a valid El Torito boot record"
> -msgstr "ISO ?? %(filename)s ????? El Torito ????"
> +msgstr ""
> +"ISO ? %(filename)s ????? El Torito ????"
>   
>   #, python-format
>   msgid "Invalid El Torito validation entry in ISO %(filename)s"
> -msgstr "ISO %(filename)s ????? El Torito ????"
> +msgstr ""
> +"ISO %(filename)s ????? El Torito ????"
>   
>   #, python-format
>   msgid "Invalid El Torito boot indicator in ISO %(filename)s"
> -msgstr "ISO %(filename)s ????? El Torito ?????"
> +msgstr ""
> +"ISO %(filename)s ????? El Torito ?????"
>   
>   #, python-format
>   msgid "Unexpected volume type for primary volume in ISO %(filename)s"
> -msgstr "ISO %(filename)s ???????????????"
> +msgstr ""
> +"ISO %(filename)s ???????????????"
>   
>   #, python-format
>   msgid "Bad format while reading volume descriptor in ISO %(filename)s"
> -msgstr "?? ISO %(filename)s ???????????????"
> +msgstr ""
> +"?? ISO %(filename)s ???????????????"
>   
>   #, python-format
>   msgid ""
> @@ -145,208 +178,265 @@ msgid ""
>   "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
>   "'path_to_iso'.Details: %(err)s"
>   msgstr ""
> -"Hypervisor ????? ISO %(filename)s ????????????? /var/lib/"
> -"libvirt ??????????'%(user)s' ???????????????????"
> -"? '%(user)s' ??? ISO ?????????????????? 'chmod -R o+x "
> -"'path_to_iso'??????%(err)s"
> +"Hypervisor ????? ISO %(filename)s?"
> +"???????? /var/lib/libvirt ??????????"
> +"'%(user)s' ???????????????????"
> +"? '%(user)s' ??? ISO ????????????????"
> +"'chmod -R o+x 'path_to_iso'??????%(err)s"
>   
>   msgid "An error occurred when probing image OS information."
>   msgstr ""
> +"????? OS ????????"
>   
>   msgid "No OS information found in given image."
>   msgstr ""
> +"???????????? OS ???"
>   
>   #, python-format
>   msgid "Unable to read image file %(filename)s"
>   msgstr ""
> +"??????? %(filename)s"
>   
>   #, python-format
>   msgid ""
>   "Image file must be an existing file on system. %(filename)s is not a valid "
>   "input."
>   msgstr ""
> +"???????????????%(filename)s ?????"
> +"???"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s already exists"
> -msgstr "???? %(name)s ???"
> +msgstr ""
> +"???? %(name)s ????"
>   
>   #, python-format
>   msgid "Virtual machine %(name)s does not exist"
> -msgstr "???? %(name)s ???"
> +msgstr ""
> +"???? %(name)s ???"
>   
>   #, python-format
>   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 ""
> +"?????????? %(name)s??? %(new_name)s ??"
> +"???????????????????"
>   
>   #, python-format
>   msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s"
> -msgstr "??????????? %(name)s ???"
> +msgstr ""
> +"??????????? %(name)s ???"
>   
>   msgid "Remote ISO image is not supported by this server."
> -msgstr "????????? ISO ????"
> +msgstr ""
> +"????????? ISO ????"
>   
>   #, python-format
>   msgid "Screenshot is not supported on virtual machine %(name)s"
>   msgstr ""
> +"????????? %(name)s ?????"
>   
>   #, python-format
>   msgid "Unable to create virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to update virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to connect to powered off virtual machine %(name)s."
>   msgstr ""
> +"??????????????? %(name)s?"
>   
>   msgid "Virtual machine name must be a string without slashes (/)"
>   msgstr ""
> +"????????????? (/) ???"
>   
>   #, python-format
>   msgid "Invalid template URI %(value)s specified for virtual machine"
>   msgstr ""
> +"?????????? URI %(value)s ??"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for virtual machine"
>   msgstr ""
> +"??????????? URI %(value)s ??"
>   
>   msgid "Supported virtual machine graphics are Spice or VNC"
>   msgstr ""
> +"??????????? Spice ? VNC"
>   
>   msgid "Graphics address to listen on must be IPv4 or IPv6"
> -msgstr "???????????? IPv4 ? IPv6"
> +msgstr ""
> +"???????????? IPv4 ? IPv6"
>   
>   msgid "Specify a template to create a virtual machine from"
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   #, python-format
>   msgid "Unable to start virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to power off virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s ?????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to reset virtual machine %(name)s. Details: %(err)s"
> -msgstr "?????????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   msgid "User name list must be an array"
>   msgstr ""
> +"????????????"
>   
>   msgid "User name must be a string"
> -msgstr "?????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Group name list must be an array"
>   msgstr ""
> +"???????????"
>   
>   msgid "Group name must be a string"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   #, python-format
>   msgid "User(s) '%(users)s' do not exist"
> -msgstr "??? '%(users)s' ????"
> +msgstr ""
> +"??? '%(users)s' ???"
>   
>   #, python-format
>   msgid "Group(s) '%(groups)s' do not exist"
> -msgstr "??? '%(groups)s' ????"
> +msgstr ""
> +"?? '%(groups)s' ???"
>   
>   #, python-format
>   msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s ??? meta ????????%(err)s"
>   
>   msgid "The guest console password must be a string."
>   msgstr ""
> +"?????????????"
>   
>   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 ""
> +"????????? '%(name)s'????????????"
>   
>   #, python-format
>   msgid "Insufficient disk space to clone virtual machine '%(name)s'"
>   msgstr ""
> +"??????????????? '%(name)s'"
>   
>   #, python-format
>   msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"???? VM '%(name)s'??????%(err)s"
>   
>   #, python-format
>   msgid "Invalid operation for non-persistent virtual machine %(name)s"
>   msgstr ""
> +"?????????? %(name)s ?????"
>   
>   #, python-format
>   msgid "Cannot suspend VM '%(name)s' because it is not running."
>   msgstr ""
> +"???? VM '%(name)s'???? VM ?????????"
>   
>   #, python-format
>   msgid "Unable to suspend VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"???? VM '%(name)s'??????%(err)s"
>   
>   #, python-format
>   msgid "Cannot resume VM '%(name)s' because it is not paused."
>   msgstr ""
> +"???? VM '%(name)s'???? VM ????????"
>   
>   #, python-format
>   msgid "Unable to resume VM '%(name)s'. Details: %(err)s"
>   msgstr ""
> +"???? VM '%(name)s'??????%(err)s"
>   
>   msgid "Memory assigned is higher then the maximum allowed in the host."
>   msgstr ""
> +"?????????????????????"
>   
>   #, python-format
>   msgid ""
>   "VM '%(name)s' does not support live memory update. Update the memory with "
>   "the machine offline to enable this feature."
>   msgstr ""
> +"VM '%(name)s' ??????????????????????"
> +"?????????????"
>   
>   msgid "Only increase memory is allowed in active VMs"
>   msgstr ""
> +"???? VM ????????"
>   
>   msgid ""
>   "For live memory update, new memory value must be equal old memory value plus "
>   "multiples of 1024 Mib"
>   msgstr ""
> +"???????????????????????????"
> +"1024 Mib ???"
>   
>   msgid "There are not enough free slots of 1024 Mib in the guest."
>   msgstr ""
> +"?????? 1024 Mib ?????"
>   
>   msgid ""
>   "Host's libvirt version does not support memory devices. Libvirt must be >= "
>   "1.2.14"
>   msgstr ""
> +"??? libvirt ???????????Libvirt ??????"
> +"1.2.14"
>   
>   #, python-format
>   msgid "Error attaching memory device. Details: %(error)s"
>   msgstr ""
> +"??????????????????%(error)s"
>   
>   #, python-format
>   msgid ""
>   "VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
>   msgstr ""
> +"VM %(vmid)s ???????????? %(dev_name)s?"
>   
>   #, python-format
>   msgid "The host device %(dev_name)s is not allowed to directly assign to VM."
>   msgstr ""
> +"???????? %(dev_name)s ????? VM?"
>   
>   msgid ""
>   "No IOMMU groups found. Host PCI pass through needs IOMMU group to function "
> @@ -355,1822 +445,2397 @@ msgid ""
>   "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt "
>   "iommu=1."
>   msgstr ""
> +"??? IOMMU ????? PCI ???? IOMMU ????"
> +"??????? BIOS ??? Intel VT-d ? AMD IOMMU?????"
> +"???? IOMMU ?????????? Intel CPU??? intel_iommu=on "
> +"??? /boot/grub2/grub.conf ????????? AMD CPU???? iommu=pt "
> +"iommu=1?"
>   
>   msgid "\"name\" should be a device name string"
>   msgstr ""
> +"\"name\" ?????????"
>   
>   #, python-format
>   msgid ""
>   "The device %(name)s is probably in use by the host. Unable to attach it to "
>   "the guest."
>   msgstr ""
> +"?????????? %(name)s??????????"
> +"???"
>   
>   #, python-format
>   msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
> -msgstr "?? %(iface)s ???????? %(name)s ?"
> +msgstr ""
> +"?? %(iface)s ?????? %(name)s ?"
>   
>   #, python-format
>   msgid ""
>   "Network %(network)s specified for virtual machine %(name)s does not exist"
> -msgstr "????? %(name)s ????? %(network)s ???"
> +msgstr ""
> +"????? %(name)s ????? %(network)s ???"
>   
>   msgid "Supported virtual machine interfaces type is only network"
> -msgstr "?????????????????"
> +msgstr ""
> +"?????????????????"
>   
>   msgid "Network name for virtual machine interface must be a string"
> -msgstr "????????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "Invalid network model card specified for virtual machine interface"
> -msgstr "?????????????????"
> +msgstr ""
> +"?????????????????"
>   
>   msgid "Specify type and network to add a new virtual machine interface"
> -msgstr "????????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "MAC Address must respect this format FF:FF:FF:FF:FF:FF"
>   msgstr ""
> +"?MAC ????????????FF:FF:FF:FF:FF:FF"
>   
>   #, python-format
>   msgid "MAC Address %(mac)s already exists in virtual machine %(name)s"
>   msgstr ""
> +"?MAC ???%(mac)s ????????? %(name)s ?"
>   
>   msgid "Invalid MAC Address"
>   msgstr ""
> +"MAC ????"
>   
>   msgid "Cannot change MAC address of a running virtual machine"
>   msgstr ""
> +"???????????? MAC ??"
>   
>   #, python-format
>   msgid "Template %(name)s already exists"
> -msgstr "?? %(name)s ???"
> +msgstr ""
> +"?? %(name)s ????"
>   
>   #, python-format
>   msgid ""
>   "Network '%(network)s' specified for template %(template)s does not exist"
> -msgstr "??? %(template)s ????? '%(network)s' ???"
> +msgstr ""
> +"??? %(template)s ????? '%(network)s' ???"
>   
>   #, python-format
>   msgid ""
>   "Storage pool %(pool)s specified for template %(template)s does not exist"
> -msgstr "??? %(template)s ?????? '%(pool)s' ???"
> +msgstr ""
> +"??? %(template)s ?????? %(pool)s ???"
>   
>   #, python-format
>   msgid "Storage pool %(pool)s specified for template %(template)s is not active"
> -msgstr "??? %(template)s ?????? '%(pool)s' ????????"
> +msgstr ""
> +"??? %(template)s ?????? %(pool)s ????????"
>   
>   #, python-format
>   msgid "Invalid parameter '%(param)s' specified for CDROM."
> -msgstr "? CDROM ????? '%(param)s' ???"
> +msgstr ""
> +"? CDROM ????? '%(param)s' ???"
>   
>   #, python-format
>   msgid "Network %(network)s specified for template %(template)s is not active"
> -msgstr "??? %(template)s ????? %(network)s ????????"
> +msgstr ""
> +"??? %(template)s ????? %(network)s ????????"
>   
>   msgid "Template name must be a string"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Template icon must be a path to the image"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid "Template distribution must be a string"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Template distribution version must be a string"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "The number of CPUs must be an integer greater than 0"
> -msgstr "CPU ???????"
> +msgstr ""
> +"CPU ??????? 0 ???"
>   
>   msgid "Amount of memory (MB) must be an integer greater than 512"
> -msgstr "????? (MB) ????? 512 ???"
> +msgstr ""
> +"????? (MB) ????? 512 ???"
>   
>   msgid "Template CDROM must be a local or remote ISO file"
> -msgstr "?? CDROM ???????? ISO ??"
> +msgstr ""
> +"?? CDROM ???????? ISO ??"
>   
>   #, python-format
>   msgid "Invalid storage pool URI %(value)s specified for template"
> -msgstr "????????? URI %(value)s ??"
> +msgstr ""
> +"????????? URI %(value)s ??"
>   
>   msgid "Specify an ISO image as CDROM or a base image to create a template"
> -msgstr "?? ISO ????? CDROM ?????"
> +msgstr ""
> +"?? ISO ????? CDROM ????????????"
>   
>   msgid "All networks for the template must be specified in a list."
> -msgstr "?????????????????"
> +msgstr ""
> +"?????????????????"
>   
>   msgid "Specify a volume to a template when storage pool is iSCSI or SCSI"
>   msgstr ""
> +"????? iSCSI ? SCSI ???????????"
>   
>   #, python-format
>   msgid "The volume %(volume)s is not in storage pool %(pool)s"
>   msgstr ""
> +"?? %(volume)s ????? %(pool)s ?"
>   
>   #, python-format
>   msgid "Unable to create template due error: %(err)s"
> -msgstr "??????????????%(err)s"
> +msgstr ""
> +"??????????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete template due error: %(err)s"
> -msgstr "??????????????%(err)s"
> +msgstr ""
> +"??????????????%(err)s"
>   
>   msgid "Disk size must be an integer greater than 1GB."
>   msgstr ""
> +"????????? 1 GB ????"
>   
>   msgid "Template base image must be a valid local image file"
> -msgstr "?? CDROM ???????? ISO ??"
> +msgstr ""
> +"??????????????????"
>   
>   #, python-format
>   msgid "Cannot identify base image %(path)s format"
>   msgstr ""
> +"????????? %(path)s ??"
>   
>   msgid ""
>   "When specifying CPU topology, VCPUs must be a product of sockets, cores, and "
>   "threads."
>   msgstr ""
> +"?? CPU ????VCPU ??? Socket????"
> +"???????"
>   
>   msgid ""
>   "When specifying CPU topology, each element must be an integer greater than "
>   "zero."
>   msgstr ""
> +"?? CPU ??????????????? 0 ?"
> +"???"
>   
>   msgid ""
>   "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, "
>   "qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"????????????????bochs?cloop?cow?dmg?qcow?"
> +"qcow2?qed?raw?vmdk ? vpc?"
>   
>   #, python-format
>   msgid "Storage pool %(name)s already exists"
> -msgstr "??? %(name)s ???"
> +msgstr ""
> +"??? %(name)s ????"
>   
>   #, python-format
>   msgid "Storage pool %(name)s does not exist"
> -msgstr "??? %(name)s ???"
> +msgstr ""
> +"??? %(name)s ???"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create the storage pool %(name)s"
> -msgstr "?? %(item)s ?????? %(name)s"
> +msgstr ""
> +"?? %(item)s ?????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active storage pool %(name)s"
> -msgstr "??????????? %(name)s"
> +msgstr ""
> +"??????????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to list storage pools. Details: %(err)s"
> -msgstr "?????????????%(err)s"
> +msgstr ""
> +"?????????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to create storage pool %(name)s. Details: %(err)s"
> -msgstr "??????? %(name)s??????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to get number of storage volumes in storage pool %(name)s. Details: "
>   "%(err)s"
> -msgstr "??????? %(name)s ??????????????%(err)s"
> +msgstr ""
> +"??????? %(name)s ??????????????"
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to activate storage pool %(name)s. Details: %(err)s"
> -msgstr "??????? %(name)s??????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s"
> -msgstr "????????? %(name)s??????%(err)s"
> +msgstr ""
> +"????????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage pool %(name)s. Details: %(err)s"
> -msgstr "??????? %(name)s??????%(err)s"
> +msgstr ""
> +"??????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create NFS Pool as export path %(path)s may block during mount"
> -msgstr "???? NFS ???????????????? %(path)s ?????"
> +msgstr ""
> +"???? NFS ???????????????? %(path)s ?????"
>   
>   #, python-format
>   msgid "Unable to create NFS Pool as export path %(path)s mount failed"
> -msgstr "???? NFS ?????????? %(path)s ????"
> +msgstr ""
> +"???? NFS ?????????? %(path)s ????"
>   
>   #, python-format
>   msgid "Unsupported storage pool type: %(type)s"
> -msgstr "???????????%(type)s"
> +msgstr ""
> +"???????????%(type)s"
>   
>   #, python-format
>   msgid "Error while retrieving storage pool XML to %(pool)s"
>   msgstr ""
> +"????? XML ? %(pool)s ?????"
>   
>   msgid "Storage pool name must be a string without slashes (/)"
>   msgstr ""
> +"???????????? (/) ???"
>   
>   msgid ""
>   "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-"
>   "iso"
>   msgstr ""
> +"?????????? dir?netfs????iscsi?isci ? kimchi-"
> +"iso"
>   
>   msgid "Storage pool path must be a string"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "Storage pool host must be a IP or hostname"
> -msgstr "???????? IP ?????"
> +msgstr ""
> +"???????? IP ?????"
>   
>   msgid "Storage pool device must be the absolute path to the block device"
>   msgstr ""
> +"?????????????????"
>   
>   msgid "Storage pool devices parameter must be a list"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid "Target IQN of an iSCSI pool must be a string"
> -msgstr "iSCSI ?????? IQN ?????"
> +msgstr ""
> +"iSCSI ?????? IQN ?????"
>   
>   msgid "Port of a remote storage server must be an integer between 1 and 65535"
> -msgstr "??????????????? 1 ? 65535 ?????"
> +msgstr ""
> +"??????????????? 1 ? 65535 ?????"
>   
>   msgid "iSCSI target username must be a string"
>   msgstr ""
> +"iSCSI ????????????"
>   
>   msgid "iSCSI target password must be a string"
>   msgstr ""
> +"iSCSI ?????????"
>   
>   msgid "Specify name and type to create a storage pool"
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   #, python-format
>   msgid ""
>   "%(disk)s is not a valid disk/partition. Could not add it to the pool "
>   "%(pool)s."
> -msgstr "%(disk)s ???????/??????????????%(pool)s?"
> +msgstr ""
> +"%(disk)s ???????/??????????????"
> +"%(pool)s?"
>   
>   #, python-format
>   msgid "Unable to extend logical pool %(pool)s. Details: %(err)s"
>   msgstr ""
> +"????????? %(pool)s??????%(err)s"
>   
>   msgid "The parameter disks only can be updated for logical storage pool."
> -msgstr "????????????????????"
> +msgstr ""
> +"????????????????????"
>   
>   msgid "The SCSI host adapter name must be a string."
> -msgstr "SCSI ?????????????"
> +msgstr ""
> +"SCSI ?????????????"
>   
>   msgid "The storage pool kimchi_isos is reserved for internal use"
> -msgstr "??? kimchi_isos ???????"
> +msgstr ""
> +"??? kimchi_isos ???????"
>   
>   #, python-format
>   msgid ""
>   "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
> -msgstr "???? NFS ??? %(name)s?NFS ??? %(server)s?????"
> +msgstr ""
> +"???? NFS ??? %(name)s?NFS ??? %(server)s"
> +"?????"
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is "
>   "unreachable."
> -msgstr "?????? NFS ??? %(name)s?NFS ??? %(server)s?????"
> +msgstr ""
> +"?????? NFS ??? %(name)s?NFS ??? %(server)s"
> +"?????"
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate pool %(name)s as it is associated with some templates"
> -msgstr "????????? %(name)s????????????"
> +msgstr ""
> +"????????? %(name)s????????????"
>   
>   #, python-format
>   msgid "Unable to delete pool %(name)s as it is associated with some templates"
> -msgstr "??????? %(name)s????????????"
> +msgstr ""
> +"??????? %(name)s????????????"
>   
>   #, python-format
>   msgid ""
>   "A volume group named '%(name)s' already exists. Please, choose another name "
>   "to create the logical pool."
> -msgstr "?? '%(name)s' ??????????????????????????"
> +msgstr ""
> +"?? '%(name)s' ?????????????????"
> +"?????????"
>   
>   #, python-format
>   msgid "Unable to update database with deep scan information due error: %(err)s"
> -msgstr "????????????????????????%(err)s"
> +msgstr ""
> +"????????????????????????%(err)s"
>   
>   #, python-format
>   msgid "Storage volume %(name)s already exists"
> -msgstr "???? %(name)s ???"
> +msgstr ""
> +"???? %(name)s ????"
>   
>   #, python-format
>   msgid "Storage volume %(name)s does not exist in storage pool %(pool)s"
> -msgstr "???? %(name)s ??????? %(pool)s ?"
> +msgstr ""
> +"???? %(name)s ????? %(pool)s ?"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(volume)s because storage pool %(pool)s is "
>   "not active"
>   msgstr ""
> +"???????? %(volume)s?????? %(pool)s"
> +"????????"
>   
>   #, python-format
>   msgid "Specify %(item)s in order to create storage volume %(volume)s"
> -msgstr "?? %(item)s ??????? %(volume)s"
> +msgstr ""
> +"?? %(item)s ??????? %(volume)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes because storage pool %(pool)s is not active"
> -msgstr "?????????????? %(pool)s ????????"
> +msgstr ""
> +"?????????????? %(pool)s ????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: "
>   "%(err)s"
> -msgstr "?????? %(pool)s ??????? %(name)s??????%(err)s"
> +msgstr ""
> +"?????? %(pool)s ??????? %(name)s??????"
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s"
> -msgstr "??????? %(pool)s ????????????%(err)s"
> +msgstr ""
> +"??????? %(pool)s ????????????%(err)s"
>   
>   #, python-format
>   msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to delete storage volume %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to resize storage volume %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s ?????????%(err)s"
> +msgstr ""
> +"???????? %(name)s ?????????%(err)s"
>   
>   #, python-format
>   msgid "Storage type %(type)s does not support volume create and delete"
> -msgstr "????? %(type)s ??????????"
> +msgstr ""
> +"????? %(type)s ??????????"
>   
>   msgid "Storage volume name must be a string"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid "Storage volume allocation must be an integer number"
> -msgstr "???????????"
> +msgstr ""
> +"???????????"
>   
>   msgid ""
>   "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, "
>   "qcow, qcow2, qed, raw, vmdk, vpc."
>   msgstr ""
> +"?????????????????bochs?cloop?cow?dmg?"
> +"qcow?qcow2?qed?raw?vmdk ? vpc?"
>   
>   msgid "Storage volume requires a volume name"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to update database with storage volume information due error: %(err)s"
> -msgstr "????????????????????????%(err)s"
> +msgstr ""
> +"????????????????????????%(err)s"
>   
>   #, python-format
>   msgid "Only one of parameter %(param)s can be specified"
>   msgstr ""
> +"?????????? %(param)s"
>   
>   #, python-format
>   msgid "Create volume from %(param)s is not supported"
>   msgstr ""
> +"???? %(param)s ????"
>   
>   msgid "Storage volume capacity must be an integer number."
>   msgstr ""
> +"????????????"
>   
>   msgid "Storage volume URL must be http://, https://, ftp:// or ftps://."
>   msgstr ""
> +"???? URL ??? http://?https://?ftp:// ? ftps://?"
>   
>   #, python-format
>   msgid "Unable to access file %(url)s. Please, check it."
>   msgstr ""
> +"?????? %(url)s????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"??????? '%(pool)s' ?????? '%(name)s'??????"
> +"%(err)s"
>   
>   msgid "Specify chunk data and its size to upload a file."
>   msgstr ""
> +"????????????????"
>   
>   msgid "In order to upload a storage volume, specify the 'upload' parameter."
>   msgstr ""
> +"???????????? 'upload' ???"
>   
>   msgid ""
>   "Unable to upload chunk data as it does not match with requested chunk size."
>   msgstr ""
> +"????????????????????????????"
>   
>   #, python-format
>   msgid "The storage volume %(vol)s is not under an upload process."
>   msgstr ""
> +"???? %(vol)s ????????"
>   
>   msgid "The upload chunk data will exceed the storage volume size."
>   msgstr ""
> +"????????????????"
>   
>   #, python-format
>   msgid "Unable to upload chunk data to storage volume. Details: %(err)s."
>   msgstr ""
> +"????????????????????%(err)s?"
>   
>   #, python-format
>   msgid "Interface %(name)s does not exist"
> -msgstr "?? %(name)s ???"
> +msgstr ""
> +"?? %(name)s ???"
>   
>   #, python-format
>   msgid "Network %(name)s already exists"
> -msgstr "?? %(name)s ???"
> +msgstr ""
> +"?? %(name)s ????"
>   
>   #, python-format
>   msgid "Network %(name)s does not exist"
> -msgstr "?? %(name)s ???"
> +msgstr ""
> +"?? %(name)s ???"
>   
>   #, python-format
>   msgid "Subnet %(subnet)s specified for network %(network)s  is not valid."
> -msgstr "??? %(network)s ?????? %(subnet)s ???"
> +msgstr ""
> +"??? %(network)s ?????? %(subnet)s ???"
>   
>   #, python-format
>   msgid "Specify a network interface to create bridged network %(name)s"
> -msgstr "?????????????? %(name)s"
> +msgstr ""
> +"?????????????? %(name)s"
>   
>   #, python-format
>   msgid "Unable to delete active network %(name)s"
> -msgstr "?????????? %(name)s"
> +msgstr ""
> +"?????????? %(name)s"
>   
>   #, python-format
>   msgid "Interface %(iface)s specified for network %(network)s is already in use"
> -msgstr "??? %(network)s ????? %(iface)s ?????"
> +msgstr ""
> +"??? %(network)s ????? %(iface)s ??????"
>   
>   msgid "Interface should be bare NIC, bonding or bridge device."
> -msgstr "??????? NIC????????????"
> +msgstr ""
> +"??????? NIC????????????"
>   
>   #, python-format
>   msgid "Unable to create network %(name)s. Details: %(err)s"
> -msgstr "?????? %(name)s??????%(err)s"
> +msgstr ""
> +"?????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Unable to find a free IP address for network '%(name)s'"
> -msgstr "????? '%(name)s' ??? IP ??"
> +msgstr ""
> +"????? '%(name)s' ??? IP ??"
>   
>   #, python-format
>   msgid "The interface %(iface)s already exists."
>   msgstr ""
> +"?? %(iface)s ?????"
>   
>   msgid "Network name must be a string without slashes (/) or quotes (\")"
>   msgstr ""
> +"??????????? (/) ??? (\") ???"
>   
>   msgid "Supported network types are isolated, NAT and bridge"
> -msgstr "?????????????NAT ????"
> +msgstr ""
> +"?????????????NAT ????"
>   
>   msgid "Network subnet must be a string with IP address and prefix or netmask"
> -msgstr "??????????? IP ?????????????"
> +msgstr ""
> +"??????????? IP ?????????????"
>   
>   msgid "Network interface must be a string"
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "Network VLAN ID must be an integer between 1 and 4094"
> -msgstr "?? VLAN ID ????? 1 ? 4094 ?????"
> +msgstr ""
> +"?? VLAN ID ????? 1 ? 4094 ?????"
>   
>   msgid "Specify name and type to create a Network"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete network %(name)s. There are some virtual machines %(vms)s "
>   "and/or templates linked to this network."
>   msgstr ""
> +"?????? %(name)s???????? %(vms)s "
> +"?/???????????"
>   
>   #, python-format
>   msgid ""
>   "Unable to deactivate network %(name)s. There are some virtual machines "
>   "%(vms)s and/or templates linked to this network."
>   msgstr ""
> +"???????? %(name)s????????"
> +"%(vms)s ?/???????????"
>   
>   #, python-format
>   msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
> -msgstr "????? %(name)s ??? VLAN ??????"
> +msgstr ""
> +"????? %(name)s ??? VLAN ??????"
>   
>   #, python-format
>   msgid "Failed to activate interface %(iface)s: %(err)s."
> -msgstr "?????? %(iface)s?%(err)s?"
> +msgstr ""
> +"?????? %(iface)s?%(err)s?"
>   
>   #, python-format
>   msgid ""
>   "Failed to activate interface %(iface)s. Please check the physical link "
>   "status."
> -msgstr "?????? %(iface)s???????????"
> +msgstr ""
> +"?????? %(iface)s????????"
> +"???"
>   
>   #, python-format
>   msgid "Failed to start network %(name)s. Details: %(err)s"
>   msgstr ""
> +"?????? %(name)s??????%(err)s"
>   
>   #, python-format
>   msgid "Debug report %(name)s does not exist"
> -msgstr "???? %(name)s ???"
> +msgstr ""
> +"???? %(name)s ???"
>   
>   msgid "Debug report tool not found in system"
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   #, python-format
>   msgid "Unable to create debug report %(name)s. Details: %(err)s."
> -msgstr "???????? %(name)s??????%(err)s?"
> +msgstr ""
> +"???????? %(name)s??????%(err)s?"
>   
>   #, python-format
>   msgid "Can not find any debug report with the given name %(name)s"
>   msgstr ""
> +"????????? %(name)s ???????"
>   
>   #, python-format
>   msgid "Unable to generate debug report %(name)s. Details: %(err)s"
> -msgstr "???????? %(name)s??????%(err)s"
> +msgstr ""
> +"???????? %(name)s??????%(err)s"
>   
>   msgid "You should give a name for the debug report file."
>   msgstr ""
> +"??????????"
>   
>   msgid ""
>   "Debug report name must be a string. Only letters, digits, underscore ('_') "
>   "and hyphen ('-') are allowed."
>   msgstr ""
> +"????????????????????????? ('_') "
> +"???? ('-')?"
>   
>   #, python-format
>   msgid ""
>   "The debug report with specified name \"%(name)s\" already exists. Please use "
>   "another one."
> -msgstr "?? '%(name)s' ??????????????????????????"
> +msgstr ""
> +"?????? \"%(name)s\" ?????????????"
> +"??????"
>   
>   #, python-format
>   msgid "Storage server %(server)s was not used by Kimchi"
> -msgstr "Kimchi ????????? %(server)s"
> +msgstr ""
> +"Kimchi ????????? %(server)s"
>   
>   #, python-format
>   msgid "Distro '%(name)s' does not exist"
> -msgstr "Distro '%(name)s' ???"
> +msgstr ""
> +"Distro '%(name)s' ???"
>   
>   #, python-format
>   msgid "Partition %(name)s does not exist in the host"
> -msgstr "??? %(name)s ???????"
> +msgstr ""
> +"??? %(name)s ?????"
>   
>   msgid "Unable to shutdown host machine as there are running virtual machines"
> -msgstr "?????????????????????"
> +msgstr ""
> +"?????????????????????"
>   
>   msgid "Unable to reboot host machine as there are running virtual machines"
> -msgstr "????????????????????????"
> +msgstr ""
> +"????????????????????????"
>   
>   #, python-format
>   msgid "Node device '%(name)s' not found"
> -msgstr "??????? '%(name)s'"
> +msgstr ""
> +"??????? '%(name)s'"
>   
>   msgid "Conflicting flag filters specified."
>   msgstr ""
> +"????????????"
>   
>   msgid "No packages marked for update"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   #, python-format
>   msgid "Package %(name)s is not marked to be updated."
> -msgstr "?? %(name)s ??????????"
> +msgstr ""
> +"?? %(name)s ??????????"
>   
>   #, python-format
>   msgid "Error while getting packages marked to be updated. Details: %(err)s"
> -msgstr "????????????????????????%(err)s"
> +msgstr ""
> +"????????????????????????%(err)s"
>   
>   msgid "There is no compatible package manager for this system."
> -msgstr "???????????????"
> +msgstr ""
> +"???????????????"
>   
>   #, python-format
>   msgid "Unable to find %(item)s in datastore"
> -msgstr "?????????? %(item)s"
> +msgstr ""
> +"?????????? %(item)s"
>   
>   #, python-format
>   msgid "Invalid URI %(uri)s"
> -msgstr "URI %(uri)s ??"
> +msgstr ""
> +"??? URI %(uri)s"
>   
>   #, python-format
>   msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds"
> -msgstr "???? '%(cmd)s' %(seconds)s ?????"
> +msgstr ""
> +"???? '%(cmd)s' ??? %(seconds)s ?????"
>   
>   msgid "Unable to choose a virtual machine name"
>   msgstr ""
> +"??????????"
>   
>   #, python-format
>   msgid "Invalid data value '%(value)s'"
>   msgstr ""
> +"?????? '%(value)s'"
>   
>   #, python-format
>   msgid "Invalid data unit '%(unit)s'"
>   msgstr ""
> +"??????? '%(unit)s'"
>   
>   msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
> -msgstr "???????????????'cdrom'"
> +msgstr ""
> +"??????????????'cdrom' ? 'disk'"
>   
>   #, python-format
>   msgid "The path '%(value)s' is not a valid local/remote path for the device"
>   msgstr ""
> +"?? '%(value)s' ??????????/????"
>   
>   msgid "Only CDROM path can be update."
>   msgstr ""
> +"???? CDROM ???"
>   
>   #, python-format
>   msgid ""
>   "The storage device %(dev_name)s does not exist in the virtual machine "
>   "%(vm_name)s"
>   msgstr ""
> +"???? %(dev_name)s ??????????"
> +"%(vm_name)s"
>   
>   #, python-format
>   msgid "Error while creating new storage device: %(error)s"
> -msgstr "??????????????%(error)s"
> +msgstr ""
> +"??????????????%(error)s"
>   
>   #, python-format
>   msgid "Error while updating storage device: %(error)s"
> -msgstr "????????????%(error)s"
> +msgstr ""
> +"????????????%(error)s"
>   
>   #, python-format
>   msgid "Error while removing storage device: %(error)s"
> -msgstr "????????????%(error)s"
> +msgstr ""
> +"????????????%(error)s"
>   
>   msgid "Do not support IDE device hot plug"
>   msgstr ""
> +"???? IDE ?????"
>   
>   msgid ""
>   "Specify type and path or type and pool/volume to add a new virtual machine "
>   "disk"
> -msgstr "????????????????"
> +msgstr ""
> +"???????????????/??????????"
> +"??"
>   
>   msgid "Specify path to update virtual machine disk"
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   #, python-format
>   msgid "Controller type %(type)s limitation of %(limit)s devices reached"
>   msgstr ""
> +"???????? %(type)s ???%(limit)s ???"
>   
>   #, python-format
>   msgid "Cannot retrieve disk path information for given pool/volume: %(error)s"
>   msgstr ""
> +"?????????/??????????%(error)s"
>   
>   msgid "Volume already in use by other virtual machine."
>   msgstr ""
> +"??????????????"
>   
>   msgid ""
>   "Only one of path or pool/volume can be specified to add a new virtual "
>   "machine disk"
> -msgstr "????????????????"
> +msgstr ""
> +"????????????/??????"
> +"??????"
>   
>   #, python-format
>   msgid ""
>   "Volume chosen with format %(format)s does not fit in the storage type "
>   "%(type)s"
>   msgstr ""
> +"????? %(format)s ???????????"
> +"%(type)s"
>   
>   msgid "YUM Repository ID must be one word only string."
> -msgstr "YUM ??? ID ?????????????"
> +msgstr ""
> +"YUM ??? ID ?????????????"
>   
>   msgid "Repository URL must be an http://, ftp:// or file:// URL."
> -msgstr "??? URL ??? http://?ftp:// ? file:// URL?"
> +msgstr ""
> +"??? URL ??? http://?ftp:// ? file:// URL?"
>   
>   msgid ""
>   "Repository configuration is a dictionary with specific values according to "
>   "repository type."
> -msgstr "??????????????????????????"
> +msgstr ""
> +"??????????????"
> +"????????????"
>   
>   msgid "Distribution to DEB repository must be a string"
> -msgstr "DEB ?????????????"
> +msgstr ""
> +"DEB ?????????????"
>   
>   msgid "Components to DEB repository must be listed in a array"
> -msgstr "DEB ????????????????"
> +msgstr ""
> +"DEB ????????????????"
>   
>   msgid "Components to DEB repository must be a string"
> -msgstr "DEB ???????????"
> +msgstr ""
> +"DEB ???????????"
>   
>   msgid "Mirror list to repository must be a string"
>   msgstr ""
> +"?????????????"
>   
>   msgid "YUM Repository name must be string."
> -msgstr "YUM ???????????"
> +msgstr ""
> +"YUM ???????????"
>   
>   msgid "GPG check must be a boolean value."
> -msgstr "GPG ?????????"
> +msgstr ""
> +"GPG ?????????"
>   
>   msgid "GPG key must be a URL pointing to the ASCII-armored file."
> -msgstr "GPG ??????? ASCII ????? URL?"
> +msgstr ""
> +"GPG ??????? ASCII ????? URL?"
>   
>   #, python-format
>   msgid "Could not update repository %(repo_id)s."
> -msgstr "??????? %(repo_id)s?"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Repository %(repo_id)s does not exist."
> -msgstr "??? %(repo_id)s ????"
> +msgstr ""
> +"??? %(repo_id)s ????"
>   
>   msgid ""
>   "Specify repository base URL,  mirror list or metalink in order to create or "
>   "update a YUM repository."
>   msgstr ""
> +"??????? URL?????? meta ??????"
> +"?? Yum ????"
>   
>   msgid "Repository management tool was not recognized for your system."
> -msgstr "???????????????"
> +msgstr ""
> +"???????????????"
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already enabled."
> -msgstr "?????? %(repo_id)s?"
> +msgstr ""
> +"?????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Repository %(repo_id)s is already disabled."
> -msgstr "?????? %(repo_id)s?"
> +msgstr ""
> +"?????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Could not remove repository %(repo_id)s."
> -msgstr "??????? %(repo_id)s?"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Could not write repository configuration file %(repo_file)s"
> -msgstr "?????????? %(repo_file)s"
> +msgstr ""
> +"?????????? %(repo_file)s"
>   
>   msgid "Specify repository distribution in order to create a DEB repository."
> -msgstr "???????????? DEB ????"
> +msgstr ""
> +"???????????? DEB ????"
>   
>   #, python-format
>   msgid "Could not enable repository %(repo_id)s."
> -msgstr "??????? %(repo_id)s?"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   #, python-format
>   msgid "Could not disable repository %(repo_id)s."
> -msgstr "??????? %(repo_id)s?"
> +msgstr ""
> +"??????? %(repo_id)s?"
>   
>   msgid "YUM Repository ID already exists"
> -msgstr "YUM ??? ID ???"
> +msgstr ""
> +"YUM ??? ID ???"
>   
>   msgid "YUM Repository name must be a string"
> -msgstr "YUM ??????????"
> +msgstr ""
> +"YUM ??????????"
>   
>   #, python-format
>   msgid "Unable to list repositories. Details: '%(err)s'"
> -msgstr "?????????????'%(err)s'"
> +msgstr ""
> +"?????????????'%(err)s'"
>   
>   #, python-format
>   msgid "Unable to retrieve repository information. Details: '%(err)s'"
> -msgstr "???????????????'%(err)s'"
> +msgstr ""
> +"???????????????'%(err)s'"
>   
>   #, python-format
>   msgid "Unable to add repository. Details: '%(err)s'"
> -msgstr "?????????????'%(err)s'"
> +msgstr ""
> +"?????????????'%(err)s'"
>   
>   #, python-format
>   msgid "Unable to remove repository. Details: '%(err)s'"
> -msgstr "?????????????'%(err)s'"
> +msgstr ""
> +"?????????????'%(err)s'"
>   
>   #, python-format
>   msgid ""
>   "Configuration items: '%(items)s' are not supported by repository manager"
>   msgstr ""
> +"???????????????'%(items)s'"
>   
>   msgid "Repository metalink must be an http://, ftp:// or file:// URL."
>   msgstr ""
> +"??? meta ????? http://?ftp:// ? file:// URL?"
>   
>   msgid "Cannot specify mirrorlist and metalink at the same time."
>   msgstr ""
> +"??????????? meta ???"
>   
>   #, python-format
>   msgid ""
>   "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."
>   msgstr ""
> +"????????? '%(vm)s'???????????? Snapshot?"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"??????? '%(vm)s' ??? Snapshot '%(name)s'??????"
> +"%(err)s"
>   
>   #, python-format
>   msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."
>   msgstr ""
> +"Snapshot '%(name)s' ?????? '%(vm)s' ??"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"???????? '%(vm)s' ?? Snapshot '%(name)s'??????"
> +"%(err)s"
>   
>   #, python-format
>   msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"
>   msgstr ""
> +"???????? '%(vm)s' ?? Snapshot??????%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"???????? '%(vm)s' ?? Snapshot '%(name)s'??????"
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"???????? '%(vm)s' ??? Snapshot??????"
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: "
>   "%(err)s"
>   msgstr ""
> +"??????? '%(vm)s' ??? Snapshot '%(name)s'??????"
> +"%(err)s"
>   
>   #, python-format
>   msgid ""
>   "Unable to create snapshot of virtual machine '%(vm)s' because it contains a "
>   "disk with format '%(format)s'; only 'qcow2' is supported."
>   msgstr ""
> +"???????? '%(vm)s' ? Snapshot??????????"
> +"??? '%(format)s' ??????? 'qcow2'?"
>   
>   msgid "The number of vCPUs is too large for this system."
>   msgstr ""
> +"????? vCPU ?????"
>   
>   msgid "Invalid vCPU/topology combination."
>   msgstr ""
> +"vCPU/???????"
>   
>   msgid "This host (or current configuration) does not allow CPU topology."
>   msgstr ""
> +"??????????????? CPU ???"
>   
>   msgid "ERROR CODE"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "REASON"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "STACK"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Go to Homepage"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Create a New Virtual Machine"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Virtual Machine Name"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid ""
>   "The name used to identify the virtual machine. If omitted, a name will be "
>   "chosen based on the template used."
> -msgstr "???????????????????????????????"
> +msgstr ""
> +"???????????????????"
> +"????????????"
>   
>   msgid "Template"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Please create a template first."
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Create a Template"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Please choose a template."
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "OS"
> -msgstr "OS"
> +msgstr ""
> +"OS"
>   
>   msgid "OS Version"
> -msgstr "OS ??"
> +msgstr ""
> +"OS ??"
>   
>   msgid "CPUS"
> -msgstr "CPUS"
> +msgstr ""
> +"CPUS"
>   
>   msgid "Memory"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Create"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Creating..."
>   msgstr ""
> +"????..."
>   
>   msgid "Edit Guest"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "General"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Storage"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Interface"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Permission"
> -msgstr "??"
> +msgstr ""
> +"???"
>   
>   msgid "Host PCI Device"
>   msgstr ""
> +"?? PCI ??"
>   
>   msgid "Snapshot"
>   msgstr ""
> +"Snapshot"
>   
>   msgid "Name"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "CPUs"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Memory (MB)"
> -msgstr "???"
> +msgstr ""
> +"??? (MB)"
>   
>   msgid "Icon"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Device"
> -msgstr "????"
> +msgstr ""
> +"??"
>   
>   msgid "Path"
> -msgstr "NFS ??"
> +msgstr ""
> +"??"
>   
>   msgid "Network"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Type"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "MAC Address"
>   msgstr ""
> +"MAC ??"
>   
>   msgid "Available system users and groups"
>   msgstr ""
> +"???????????"
>   
>   msgid "Selected system users and groups"
>   msgstr ""
> +"???????????"
>   
>   msgid "User"
>   msgstr ""
> +"???"
>   
>   msgid "All"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "To Add"
>   msgstr ""
> +"???"
>   
>   msgid "Added"
>   msgstr ""
> +"???"
>   
>   msgid "filter"
>   msgstr ""
> +"???"
>   
>   msgid "Product"
>   msgstr ""
> +"??"
>   
>   msgid "Vendor"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Created"
>   msgstr ""
> +"???"
>   
>   msgid "Save"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Replace"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Detach"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Cancel"
> -msgstr "?? "
> +msgstr ""
> +"?? "
>   
>   msgid "revert"
>   msgstr ""
> +"??"
>   
>   msgid "Add a Storage Device to VM"
> -msgstr "???????? VM"
> +msgstr ""
> +"???????? VM"
>   
>   msgid "Device Type"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "The device type. Currently,  \"cdrom\" and \"disk\" are supported."
> -msgstr "?????????? \"cdrom\"?"
> +msgstr ""
> +"????????? \"cdrom\" ? \"disk\"?"
>   
>   msgid "Storage Pool"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Storage pool which volume located in"
> -msgstr "??????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Storage Volume"
> -msgstr "?????"
> +msgstr ""
> +"????"
>   
>   msgid "Storage volume to be attached"
> -msgstr "???????????"
> +msgstr ""
> +"????????"
>   
>   msgid "File Path"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "The ISO file path in the server for CDROM."
> -msgstr "CDROM ? ISO ??????????"
> +msgstr ""
> +"CDROM ? ISO ??????????"
>   
>   msgid "Attach"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Start"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Reset"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Pause"
>   msgstr ""
> +"??"
>   
>   msgid "Resume"
>   msgstr ""
> +"??"
>   
>   msgid "Power Off"
>   msgstr ""
> +"????"
>   
>   msgid "Actions"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Connect"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Clone"
>   msgstr ""
> +"??"
>   
>   msgid "Edit"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Shut Down"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Delete"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "The username or password you entered is incorrect. Please try again."
> -msgstr "????????????????????"
> +msgstr ""
> +"????????????????????"
>   
>   msgid "This field is required."
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Log in"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Logging in..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Host"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Guests"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Templates"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Failed to get application configuration"
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "This is not a valid Linux path"
> -msgstr "????? Linux ??"
> +msgstr ""
> +"????? Linux ??"
>   
>   msgid "This is not a valid URL."
> -msgstr "????? URL?"
> +msgstr ""
> +"????? URL?"
>   
>   msgid "No such data available."
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid ""
>   "Can not contact the host system. Verify the host system is up and that you "
>   "have network connectivity to it. HTTP request response %1. "
>   msgstr ""
> -"????????????????????????????????????HTTP "
> -"????? %1?"
> +"?????????????????????????"
> +"???????????HTTP ????? %1? "
>   
>   msgid "Unable to read file."
>   msgstr ""
> +"???????"
>   
>   msgid "Error while uploading file."
>   msgstr ""
> +"??????????"
>   
>   msgid "Delete Confirmation"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "OK"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Confirm"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Warning"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Cloning..."
>   msgstr ""
> +"????..."
>   
>   msgid "Loading..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "An error occurred while retrieving system information."
>   msgstr ""
> +"????????????"
>   
>   msgid "Retry"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Detailed message:"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "No ISO found"
>   msgstr ""
> +"??? ISO"
>   
>   msgid "This is not a valid ISO file."
> -msgstr "????? ISO ???"
> +msgstr ""
> +"????? ISO ???"
>   
>   msgid "This may take a long time. Do you want to continue?"
> -msgstr "??????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "This will permanently delete the template. Would you like to continue?"
> -msgstr "?????????????????"
> +msgstr ""
> +"???????????????"
>   
>   msgid "Unable to shut down system as there are some virtual machines running!"
> -msgstr "??????????????????????"
> +msgstr ""
> +"??????????????????????"
>   
>   msgid "Max:"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Utilization"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Available"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Read Rate"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Write Rate"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Received"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Sent"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid ""
>   "Shutting down or restarting host will cause unsaved work lost. Continue to "
>   "shut down/restarting?"
> -msgstr "??????????????????????????/??????"
> +msgstr ""
> +"????????????????????????"
> +"??/??????"
>   
>   msgid ""
>   "Repository will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
> -msgstr "??????????????????????"
> +msgstr ""
> +"?????????????????"
> +"?????"
>   
>   msgid "Repositories"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "ID"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Base URL"
> -msgstr "?? URL"
> +msgstr ""
> +"?? URL"
>   
>   msgid "Is Mirror"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "URL Args"
> -msgstr "URL ??"
> +msgstr ""
> +"URL ??"
>   
>   msgid "Enabled"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "GPG Check"
> -msgstr "GPG ??"
> +msgstr ""
> +"GPG ??"
>   
>   msgid "GPG Key"
> -msgstr "GPG ??"
> +msgstr ""
> +"GPG ??"
>   
>   msgid "Add"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Remove"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Enable"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Disable"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Software Updates"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Package Name"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Version"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Architecture"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Repository"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Update All"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Updating..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Failed to retrieve packages update information."
>   msgstr ""
> +"???????????"
>   
>   msgid "Failed to update package(s)."
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid ""
>   "Debug report will be removed permanently and can't be recovered. Do you want "
>   "to continue?"
> -msgstr "???????????????????????"
> +msgstr ""
> +"??????????????????"
> +"?????"
>   
>   msgid "Debug Reports"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Generated Time"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Generate"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Generating..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Rename"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Download"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid ""
>   "Report name should contain only letters, digits, underscore ('_') and/or "
>   "hyphen ('-')."
> -msgstr "???????????????/???? ('-')?"
> +msgstr ""
> +"????????????????? ('_') ?/?"
> +"??? ('-')?"
>   
>   msgid "Pending..."
> -msgstr "????..."
> +msgstr ""
> +"???..."
>   
>   msgid "Report name is the same as the original one."
>   msgstr ""
> +"????????????"
>   
>   msgid ""
>   "This will delete the virtual machine and its virtual disks. This operation "
>   "cannot be undone. Would you like to continue?"
> -msgstr "???????????????????????????????"
> +msgstr ""
> +"?????????????????????"
> +"???????????"
>   
>   msgid "Power off Confirmation"
> -msgstr "????"
> +msgstr ""
> +"??????"
>   
>   msgid ""
>   "This action may produce undesirable results, for example unflushed disk "
>   "cache in the guest. Would you like to continue?"
>   msgstr ""
> +"??????????????????????????"
> +"?????????"
>   
>   msgid "Reset Confirmation"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "There is a risk of data loss caused by reset without the guest OS shutdown. "
>   "Would you like to continue?"
>   msgstr ""
> +"???????? OS ????????????????????"
> +"??????"
>   
>   msgid "Shut Down Confirmation"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Note the guest OS may ignore this request. Would you like to continue?"
> -msgstr "?????????????????"
> +msgstr ""
> +"?????? OS ???????????????"
>   
>   msgid "Virtual Machine delete Confirmation"
>   msgstr ""
> +"????????"
>   
>   msgid ""
>   "This virtual machine is not persistent. Power Off will delete it. Continue?"
>   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 ""
> +"??????? SCSI ? iSCSI ????????????"
> +"???????????????????????????"
> +"????????????????"
>   
>   msgid ""
>   "This CDROM will be detached permanently and you can re-attach it. Continue "
>   "to detach it?"
>   msgstr ""
> -"???????? CDROM??????????????????? CDROM ??"
> +"???????? CDROM????????????????"
> +"??? CDROM ??"
>   
>   msgid "Attaching..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Replacing..."
> -msgstr "????..."
> +msgstr ""
> +"????..."
>   
>   msgid "Successfully attached!"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Successfully replaced!"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Successfully detached!"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid ""
>   "This disk will be detached permanently and you can re-attach it. Continue to "
>   "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 ???"
> +msgstr ""
> +"VLAN ID ???? 1 ? 4094 ???"
>   
>   msgid "unavailable"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "This action will interrupt network connectivity for any virtual machine that "
>   "depend on this network."
> -msgstr "????????????????????????????"
> +msgstr ""
> +"?????????????????????"
> +"???????"
>   
>   msgid "Create a network"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "This network is not persistent. Instead of stop, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"??????????????????????????????????????"
> -"??"
> +"??????????????????????"
> +"?????????????"
>   
>   msgid ""
>   "The bridged VLAN tag may not work well with NetworkManager enabled. You "
>   "should consider disabling it."
>   msgstr ""
> +"?? NetworkManager ???? VLAN ???????????"
> +"?????????"
>   
>   msgid ""
>   "This will permanently delete the storage pool. Would you like to continue?"
> -msgstr "??????????????????"
> +msgstr ""
> +"????????????????"
>   
>   msgid "This storage pool is empty."
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid ""
>   "It will format your disk and you will loose any data in there, are you sure "
>   "to continue? "
> -msgstr "??????????????????????????????????"
> +msgstr ""
> +"?????????????????????????????"
> +"?????"
>   
>   msgid "SCSI Fibre Channel"
> -msgstr "SCSI ????"
> +msgstr ""
> +"SCSI ????"
>   
>   msgid "No SCSI adapters found."
> -msgstr "??? SCSI ????"
> +msgstr ""
> +"??? SCSI ????"
>   
>   msgid "Loading iSCSI targets..."
>   msgstr ""
> +"???? iSCSI ??..."
>   
>   msgid "No iSCSI found. Please input one."
>   msgstr ""
> +"??? iSCSI???????"
>   
>   msgid "Failed to load iSCSI targets."
>   msgstr ""
> +"???? iSCSI ???"
>   
>   msgid "The storage pool name can not be blank."
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "The storage pool path can not be blank."
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "NFS server mount path can not be blank."
> -msgstr "NFS ????????????"
> +msgstr ""
> +"NFS ????????????"
>   
>   msgid "Invalid NFS mount path."
> -msgstr "NFS ???????"
> +msgstr ""
> +"NFS ???????"
>   
>   msgid "No logical device selected."
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "The iSCSI target can not be blank."
> -msgstr "iSCSI ???????"
> +msgstr ""
> +"iSCSI ???????"
>   
>   msgid "Server name can not be blank."
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid "This is not a valid Server Name or IP. Please, modify it."
>   msgstr ""
> +"?????????????? IP???????"
>   
>   msgid "Looking for available partitions ..."
> -msgstr "?????????? ..."
> +msgstr ""
> +"?????????? ..."
>   
>   msgid "No available partitions found."
> -msgstr "??????????"
> +msgstr ""
> +"??????????"
>   
>   msgid ""
>   "This storage pool is not persistent. Instead of deactivate, this action will "
>   "permanently delete it. Would you like to continue?"
>   msgstr ""
> -"??????????????????????????????????????"
> -"??"
> +"???????????????????????????"
> +"?????????????"
>   
>   msgid "Unable to retrieve partitions information."
> -msgstr "???????????????'%(err)s'"
> +msgstr ""
> +"??????????"
>   
>   msgid "In progress..."
>   msgstr ""
> +"???..."
>   
>   msgid "Failed!"
>   msgstr ""
> +"???"
>   
>   msgid "CDROM path needs to be a valid local/remote path and cannot be blank."
>   msgstr ""
> +"CDROM ??????????/????????????"
>   
>   msgid "Disk pool or volume cannot be blank."
> -msgstr "??????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "Peers"
>   msgstr ""
> +"???"
>   
>   msgid "Searching"
>   msgstr ""
> +"????"
>   
>   msgid "No peers found."
>   msgstr ""
> +"???????"
>   
>   msgid "Help"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "About"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Log out"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Version:"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Session timeout, please re-login."
>   msgstr ""
> +"?????????????"
>   
>   msgid "User Name"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Password"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Generate a New Debug Report"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid "Report Name"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid ""
>   "The name used to identify the report. If omitted, a name will be chosen "
>   "based on current time. Name can contain: letters, digits, underscore (\"_\") "
>   "and hyphen (\"-\")."
>   msgstr ""
> -"??????????????????????????????????????"
> -"?????? (\"-\")?"
> +"?????????????????"
> +"??????????????????????????? (\"_\")"
> +"???? (\"-\")?"
>   
>   msgid "Rename a Debug Report"
> -msgstr "????????"
> +msgstr ""
> +"????????"
>   
>   msgid ""
>   "The name used to identify the report. Name can contain: letters, digits and "
>   "hyphen (\"-\")."
>   msgstr ""
> -"??????????????????????????????????????"
> -"?????? (\"-\")?"
> +"???????????????????????"
> +"??? (\"-\")?"
>   
>   msgid "Submit"
>   msgstr ""
> +"??"
>   
>   msgid "Add a Repository"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Identifier"
> -msgstr "ID"
> +msgstr ""
> +"ID"
>   
>   msgid "Single word, unique identifier for the repository."
> -msgstr "????????? ID?"
> +msgstr ""
> +"????????? ID?"
>   
>   msgid "Textual name for the repository."
> -msgstr "?????????"
> +msgstr ""
> +"?????????"
>   
>   msgid "URL"
> -msgstr "URL"
> +msgstr ""
> +"URL"
>   
>   msgid "Required Field"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "URL to the repository. Supported protocols are http, ftp, and file."
> -msgstr "???? URL??????????? http?ftp ? file?"
> +msgstr ""
> +"???? URL??????????? http?ftp ? file?"
>   
>   msgid "Repository is a mirror"
> -msgstr "???????"
> +msgstr ""
> +"??????"
>   
>   msgid "Distribution"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Distribution of the DEB repository."
> -msgstr "DEB ?????????"
> +msgstr ""
> +"DEB ?????????"
>   
>   msgid "Components"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "List of components in DEB repository."
> -msgstr "DEB ??????????"
> +msgstr ""
> +"DEB ??????????"
>   
>   msgid "Edit Repository"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Mirror List URL"
> -msgstr "???? URL"
> +msgstr ""
> +"???? URL"
>   
>   msgid "Yes"
> -msgstr "?"
> +msgstr ""
> +"?"
>   
>   msgid "No"
> -msgstr "?"
> +msgstr ""
> +"?"
>   
>   msgid "Add a Volume to Storage Pool"
>   msgstr ""
> +"?????????"
>   
>   msgid "Fetch from remote URL"
>   msgstr ""
> +"??? URL ??"
>   
>   msgid "Enter the remote URL here."
>   msgstr ""
> +"??????? URL?"
>   
>   msgid "Upload a file"
>   msgstr ""
> +"????"
>   
>   msgid "Choose the file you want to upload."
>   msgstr ""
> +"?????????"
>   
>   msgid "Define a New Storage Pool"
> -msgstr "???????"
> +msgstr ""
> +"???????"
>   
>   msgid "Storage Pool Name"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid ""
>   "The name used to identify the storage pools, and it should not be empty."
> -msgstr "??????????????????"
> +msgstr ""
> +"??????????????????"
>   
>   msgid "Storage Pool Type"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid "Storage Path"
> -msgstr "?????"
> +msgstr ""
> +"?????"
>   
>   msgid ""
>   "The path of the Storage Pool. Each Storage Pool must have a unique path."
> -msgstr "?????????????????????????"
> +msgstr ""
> +"?????????????????????????"
>   
>   msgid ""
>   "Kimchi will try to create the directory when it does not already exist in "
>   "your system."
> -msgstr "Kimchi ????????????????????????"
> +msgstr ""
> +"Kimchi ?????????????????"
> +"???????"
>   
>   msgid "NFS Server IP"
> -msgstr "NFS ??? IP"
> +msgstr ""
> +"NFS ??? IP"
>   
>   msgid "NFS server IP or hostname. It can be input or chosen from history."
> -msgstr "NFS ??? IP ???????????????????????"
> +msgstr ""
> +"NFS ??? IP ???????????????????????"
>   
>   msgid "NFS Path"
> -msgstr "NFS ??"
> +msgstr ""
> +"NFS ??"
>   
>   msgid "The NFS exported path on NFS server."
> -msgstr "NFS ???? NFS ??????"
> +msgstr ""
> +"NFS ???? NFS ??????"
>   
>   msgid "Device path"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "iSCSI Server"
> -msgstr "iSCSI ???"
> +msgstr ""
> +"iSCSI ???"
>   
>   msgid "iSCSI server IP or hostname. It should not be empty."
> -msgstr "iSCSI ??? IP ??????????????"
> +msgstr ""
> +"iSCSI ??? IP ??????????????"
>   
>   msgid "Server"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Port"
> -msgstr "?"
> +msgstr ""
> +"?"
>   
>   msgid "Target"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "The iSCSI target on iSCSI server"
> -msgstr "iSCSI ????? iSCSI ??"
> +msgstr ""
> +"iSCSI ????? iSCSI ??"
>   
>   msgid "Add iSCSI Authentication"
> -msgstr "?? iSCSI ??"
> +msgstr ""
> +"?? iSCSI ??"
>   
>   msgid "iSCSI Authentication"
> -msgstr "iSCSI ??"
> +msgstr ""
> +"iSCSI ??"
>   
>   msgid "SCSI Adapter"
> -msgstr "SCSI ???"
> +msgstr ""
> +"SCSI ???"
>   
>   msgid "Please, wait..."
> -msgstr "???..."
> +msgstr ""
> +"???..."
>   
>   msgid "Add Template"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Where is the source media for this template? "
> -msgstr "?????????????"
> +msgstr ""
> +"?????????????"
>   
>   msgid "Local ISO Image"
> -msgstr "?? ISO ???"
> +msgstr ""
> +"?? ISO ???"
>   
>   msgid "Local Image File"
>   msgstr ""
> +"?????"
>   
>   msgid "Remote ISO Image"
> -msgstr "?? ISO ???"
> +msgstr ""
> +"?? ISO ???"
>   
>   msgid "Search ISOs"
> -msgstr "?? ISO"
> +msgstr ""
> +"?? ISO"
>   
>   msgid "The following ISOs are available:"
> -msgstr "?? ISO ???"
> +msgstr ""
> +"?? ISO ???"
>   
>   msgid "OS: "
> -msgstr "OS?"
> +msgstr ""
> +"OS?"
>   
>   msgid "Version: "
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Size: "
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Search more ISOs"
> -msgstr "???? ISO"
> +msgstr ""
> +"???? ISO"
>   
>   msgid "Create Templates from Selected ISO"
> -msgstr "??? ISO ????"
> +msgstr ""
> +"??? ISO ????"
>   
>   msgid "I want to use a specific ISO file"
> -msgstr "??????? ISO ??"
> +msgstr ""
> +"??????? ISO ??"
>   
>   msgid "Loading default remote ISOs ..."
> -msgstr "???????? ISO ..."
> +msgstr ""
> +"???????? ISO ..."
>   
>   msgid "Arch: "
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "I want to use a custom URL"
> -msgstr "?????? URL"
> +msgstr ""
> +"?????? URL"
>   
>   msgid "Edit Template"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Processor"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "CDROM"
> -msgstr "CDROM"
> +msgstr ""
> +"CDROM"
>   
>   msgid "Image File"
>   msgstr ""
> +"???"
>   
>   msgid "Graphics"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "Disk(GB)"
>   msgstr ""
> +"?? (GB)"
>   
>   msgid "Disk Format"
>   msgstr ""
> +"????"
>   
>   msgid "CPU Number"
> -msgstr "CPU ??"
> +msgstr ""
> +"CPU ??"
>   
>   msgid "Manually set CPU topology"
>   msgstr ""
> +"???? CPU ??"
>   
>   msgid "Cores"
>   msgstr ""
> +"??"
>   
>   msgid "Threads"
>   msgstr ""
> +"???"
>   
>   msgid "CPU"
> -msgstr "CPU"
> +msgstr ""
> +"CPU"
>   
>   msgid "Disk I/O"
> -msgstr "?? I/O"
> +msgstr ""
> +"?? I/O"
>   
>   msgid "Network I/O"
> -msgstr "?? I/O"
> +msgstr ""
> +"?? I/O"
>   
>   msgid "Livetile"
> -msgstr "Livetile"
> +msgstr ""
> +"Livetile"
>   
>   msgid "No guests found."
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Shut down"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Restart"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Basic Information"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "OS Distro"
> -msgstr "OS Distro"
> +msgstr ""
> +"OS Distro"
>   
>   msgid "OS Code Name"
> -msgstr "OS ?????"
> +msgstr ""
> +"OS ?????"
>   
>   msgid "CPU(s)"
>   msgstr ""
> +"CPU"
>   
>   msgid "System Statistics"
> -msgstr "??????"
> +msgstr ""
> +"??????"
>   
>   msgid "Update Progress"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Network Name"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "State"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Network Type"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Address Space"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Name should not contain '/' and '\"'."
> -msgstr "?????????????? '/'?"
> +msgstr ""
> +"?????? '/' ? '\"'?"
>   
>   msgid "Isolated: no external network connection"
> -msgstr "????????????"
> +msgstr ""
> +"????????????"
>   
>   msgid "NAT: outbound physical network connection only"
> -msgstr "NAT???????????"
> +msgstr ""
> +"NAT???????????"
>   
>   msgid "Bridged: Virtual machines are connected to physical network directly"
> -msgstr "??????????????????"
> +msgstr ""
> +"??????????????????"
>   
>   msgid "(No interfaces found)"
>   msgstr ""
> +"???????"
>   
>   msgid "Destination"
> -msgstr "????"
> +msgstr ""
> +"???"
>   
>   msgid "Enable VLAN"
> -msgstr "?? VLAN?"
> +msgstr ""
> +"?? VLAN"
>   
>   msgid "VLAN ID"
> -msgstr "VLAN ID?"
> +msgstr ""
> +"VLAN ID"
>   
>   msgid "Stop"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "%Used"
>   msgstr ""
> +"???????"
>   
>   msgid "Location"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Capacity"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Allocated"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "active"
> -msgstr "???"
> +msgstr ""
> +"???"
>   
>   msgid "inactive"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Deactivate"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Activate"
> -msgstr "??"
> +msgstr ""
> +"??"
>   
>   msgid "Add Volume"
>   msgstr ""
> +"????"
>   
>   msgid "Extend"
>   msgstr ""
> +"??"
>   
>   msgid "Undefine"
> -msgstr "????"
> +msgstr ""
> +"????"
>   
>   msgid "Format"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "Allocation"
> -msgstr "???"
> +msgstr ""
> +"??"
>   
>   msgid "No templates found."
> -msgstr "??????"
> +msgstr ""
> +"??????"
> +
> +# ENGL1SH_VERS10N 28617_40 DO NOT REMOVE OR CHANGE THIS LINE
> +# T9N_SRC_ID 92
> +# T9N_SH1P_STR1NG KV310AAP001 1
> diff --git a/ui/pages/help/de_DE/guests.dita b/ui/pages/help/de_DE/guests.dita
> index 1d64469..7ec80f3 100644
> --- a/ui/pages/help/de_DE/guests.dita
> +++ b/ui/pages/help/de_DE/guests.dita
> @@ -9,22 +9,21 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="de-de">
>   <title>G?ste</title>
> -<shortdesc>Auf der Seite <wintitle>G?ste</wintitle> sind die definierten virtuellen
> -Maschinen von KVM aufgelistet.</shortdesc>
> +<shortdesc>Auf der Seite <wintitle>G?ste</wintitle> sind die definierten G?ste Ihres Servers aufgelistet. </shortdesc>
>   <csbody>
>   <p>F?r jeden Gast werden die folgenden Informationen angezeigt:<dl><dlentry>
>   <dt>Name</dt>
> -<dd>Name der virtuellen Maschine.</dd>
> +<dd>Name des Gastes. </dd>
>   </dlentry><dlentry>
>   <dt>CPU</dt>
> -<dd>Prozentsatz der Prozessorauslastung in der virtuellen Maschine.</dd>
> -</dlentry><dlentry>
> -<dt>Netz-E/A</dt>
> -<dd>Netz-E/A-?bertragungsrate in KB pro Sekunde.</dd>
> +<dd>Prozentsatz der Prozessorauslastung auf dem Gastsystem. </dd>
>   </dlentry><dlentry>
>   <dt>Platten-E/A</dt>
>   <dd>Platten-E/A-?bertragungsrate in KB pro Sekunde.</dd>
>   </dlentry><dlentry>
> +<dt>Netz-E/A</dt>
> +<dd>Netz-E/A-?bertragungsrate in KB pro Sekunde.</dd>
> +</dlentry><dlentry>
>   <dt>Live Tile</dt>
>   <dd>Status der Konsole f?r das Gastbetriebssystem oder ein Symbol, das die
>   <tm tmtype="tm" trademark="Linux">Linux</tm>-Verteilung darstellt, wenn
> @@ -42,86 +41,79 @@ ist er ausgeschaltet. Wenn das Symbol gr?n ist, ist er eingeschaltet.</dd>
>   <p>Die folgenden Aktionen k?nnen f?r jeden Gast ausgew?hlt werden:<ul>
>   <li>W?hlen Sie <uicontrol>Verbinden</uicontrol> aus, um eine Verbindung zur fernen Konsole
>   f?r das Gastbetriebssystem herzustellen.</li>
> -<li>W?hlen Sie <uicontrol>Medien verwalten</uicontrol> aus, um den Pfad zu den
> -Installationsmedien zu ?ndern.</li>
> -<li>W?hlen Sie <uicontrol>Zur?cksetzen</uicontrol> aus, um den Gast zur?ckzusetzen.</li>
> +<li>W?hlen Sie <uicontrol>Klonen</uicontrol> aus, um eine vorhandene Gastdefinition zur Erstellung eines Gastes zu kopieren. </li>
> +<li>W?hlen Sie <uicontrol>Zur?cksetzen</uicontrol> aus, um den Gast zur?ckzusetzen. Sie k?nnen nur G?ste zur?cksetzen, die bereits gestartet
> +wurden. </li>
>   <li>W?hlen Sie <uicontrol>Bearbeiten</uicontrol> aus, um die Eigenschaften eines
>   bestehenden Gastes zu bearbeiten. G?ste k?nnen nur bearbeitet werden, wenn sie gestoppt sind.</li>
> +<li>W?hlen Sie <uicontrol>Starten</uicontrol> aus, um einen Gast zu starten. </li>
> +<li>W?hlen Sie <uicontrol>Herunterfahren</uicontrol> aus, um einen Gast ordnungsgem?? zu beenden. </li>
> +<li>W?hlen Sie <uicontrol>Ausschalten</uicontrol> aus, um eine sofortige Beendigung des Gastes zu erzwingen. </li>
>   <li>W?hlen Sie <uicontrol>L?schen</uicontrol> aus, um den Gast zu l?schen.</li>
> -</ul>Um einen Gast bzw. eine virtuelle Maschine zu erstellen, klicken Sie auf das <uicontrol>Plus (+)</uicontrol>-Symbol oben rechts auf der Seite.</p>
> +</ul>Um einen Gast zu erstellen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> auf der Seite. </p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="de-de">
> -<title>Virtuelle Maschine erstellen</title>
> -<shortdesc>Erstellen Sie eine virtuelle Maschine mithilfe einer bestehenden Vorlage.</shortdesc>
> +<title>Gast erstellen</title>
> +<shortdesc>Erstellen Sie einen Gast mithilfe einer bestehenden Vorlage. </shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>Geben Sie den Namen ein, mit dem die virtuelle Maschine gekennzeichnet wird.</li>
> -<li rev="rev1">W?hlen Sie eine Vorlage aus. <ul>
> +<li>Geben Sie den Namen ein, mit dem der Gast gekennzeichnet wird. </li>
> +<li>W?hlen Sie eine Vorlage aus. <ul>
>   <li>Wenn Vorlagen vorhanden sind, w?hlen Sie eine aus den angezeigten Vorlagen aus.</li>
>   <li>Wenn keine Vorlagen vorhanden sind, klicken Sie auf <uicontrol>Vorlage erstellen</uicontrol>, um eine Vorlage zu erstellen.</li>
> -</ul></li>
> +</ul>Sie k?nnen Informationen zu einer Vorlage anzeigen, wenn Sie den Mauszeiger ?ber das entsprechende Element bewegen. </li>
>   <li>Klicken Sie auf <uicontrol>Erstellen</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="de-de">
>   <title>Gast bearbeiten</title>
> -<shortdesc>Bearbeiten Sie die Eigenschaften einer bestehenden virtuellen Maschine. Einige Eigenschaften k?nnen nur bearbeitet werden, solange der Gast gestoppt ist. Andere Eigenschaften treten beim n?chsten Booten in Kraft. </shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
> +<shortdesc>Bearbeiten Sie die Eigenschaften eines vorhandenen Gastes. Einige Eigenschaften k?nnen nur bearbeitet werden, solange der Gast gestoppt ist. Andere Eigenschaften treten beim n?chsten Booten in Kraft. </shortdesc>
>   <csbody>
> -<p>F?r jeden Gast werden die folgenden Informationen auf der Registerkarte <wintitle>Allgemein</wintitle> angezeigt:<dl>
> -<dlentry>
> -<dt>Name</dt>
> -<dd>Name der virtuellen Maschine. (Kann nur bearbeitet werden, solange der Gast gestoppt ist.)</dd>
> -</dlentry><dlentry>
> -<dt>CPUs</dt>
> -<dd>Anzahl der Prozessoren. (Wenn der Gast aktiv ist, tritt die neue Menge beim n?chsten Booten in Kraft.)
> -</dd>
> +<dl><dlentry>
> +<dt>Allgemein</dt>
> +<dd>Zeigt Informationen zu Ihrem Gast (einschlie?lich Name, CPUs, Speicher) und ein Symbol an, das f?r Ihren Gast verwendet werden kann. Sie k?nnen den Namen eines gestoppten Gastes bearbeiten. ?nderungen der CPUs und des Speichers werden nach dem n?chsten Bootvorgang wirksam. </dd>
>   </dlentry><dlentry>
>   <dt>Speicher</dt>
> -<dd>Speicherkapazit?t in MB. (Wenn der Gast aktiv ist, tritt die neue Menge beim n?chsten Booten in Kraft.)
> -</dd>
> -</dlentry><dlentry>
> -<dt>Symbol</dt>
> -<dd>Grafikbild, das die Linux-Verteilung darstellt und anstelle des aktuellen Status (Live Tile) angezeigt werden soll, wenn der Gast nicht aktiv ist.</dd>
> -</dlentry></dl></p>
> -<p>Die folgenden Informationen werden auf der Registerkarte <wintitle>Speicher</wintitle> angezeigt.</p>
> +<dd>Zeigt die Einheit und den Speicherpfad f?r den ausgew?hlten Gast an.
> +Sie k?nnen Speichereinheiten f?r Ihren Gast hinzuf?gen, bearbeiten und entfernen. </dd>
> +</dlentry></dl>
>   <dl><dlentry>
> -<dt>Speicher</dt>
> -<dd>Zeigt die Position der ISO-Datei an, die f?r die Installation verwendet wird.</dd>
> +<dt>Schnittstelle</dt>
> +<dd>Zeigt Netzinformationen f?r den Gast (einschlie?lich Name, Typ und MAC-Adresse) an. Sie k?nnen Schnittstellen f?r Ihren Gast hinzuf?gen, bearbeiten und entfernen. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Berechtigung</dt>
> +<dd>Zeigt die Benutzer und Gruppen an, die ?ber eine Berechtigung f?r den Gast verf?gen. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>PCI-Einheit f?r Host</dt>
> +<dd>Zeigt eine Liste aller PCI-Einheiten an, die auf dem Host verf?gbar sind. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Snapshot</dt>
> +<dd>Zeigt Snapshots des Gastes an. Sie k?nnen einen Snapshot erstellen, bearbeiten oder l?schen. Durch Auswahl eines Snapshots und der Option zum Zur?cksetzen wird der Gast auf den zu einem bestimmten Zeitpunkt in der Vergangenheit bestehenden Status zur?ckgesetzt, der anhand der Snapshotdaten ermittelt wird. Alle ?nderungen, die nach diesem Zeitpunkt durchgef?hrt wurden, werden verworfen. </dd>
>   </dlentry></dl>
>   <p> Felder, die nicht inaktiviert sind, k?nnen bearbeitet werden. Nachdem Sie ein Feld bearbeitet haben, klicken Sie auf <uicontrol>Speichern</uicontrol>. </p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="de-de">
> -<title>Speichereinheit hinzuf?gen, ersetzen oder abh?ngen</title>
> -<shortdesc rev="rev1">Sie k?nnen eine Speichereinheit zu Ihrer virtuellen Maschine hinzuf?gen oder diese ersetzen oder abh?ngen. Die einzige unterst?tzte Einheit ist CD-ROM. F?hren Sie die folgenden Schritte aus, um Ihre Speichereinheiten zu bearbeiten:</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="de-de">
> +<title>Gast klonen</title>
> +<shortdesc>Durch das Klonen eines Gastes kann eine Kopie des Gastes erstellt werden. </shortdesc>
>   <csbody>
> +<p>Gehen Sie wie folgt vor, um einen Gast zu klonen: </p>
>   <ol>
> -<li>W?hlen Sie im Fenster <wintitle>Gast bearbeiten</wintitle> die Option <wintitle>Speicher</wintitle> aus.</li>
> -<li>Um eine Speichereinheit zu ersetzen, klicken Sie auf das erste Symbol mit dem <uicontrol>orangefarbenen Schr?gstrich (/)</uicontrol>. Geben Sie den ISO-Dateipfad ein und klicken Sie auf <uicontrol>Ersetzen</uicontrol>.</li>
> -<li>Um eine Speichereinheit abzuh?ngen, klicken Sie auf das zweite Symbol mit dem <uicontrol>roten Gedankenstrich (-)</uicontrol>. Best?tigen Sie den L?schvorgang und klicken Sie auf <uicontrol>OK</uicontrol>.</li>
> -<li>Um eine Speichereinheit hinzuzuf?gen, klicken Sie auf das dritte Symbol mit dem gr?nen <uicontrol>Pluszeichen (+)</uicontrol>. Geben Sie einen Einheitennamen und einen ISO-Dateipfad ein und klicken Sie auf <uicontrol>Anh?ngen</uicontrol>.</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="de-de">
> -<title>CD-ROM f?r VM ersetzen</title>
> -<shortdesc rev="rev1">Sie k?nnen den Inhalt der CD-ROM f?r eine virtuelle Maschine nach Abschluss der Installation ersetzen.</shortdesc>
> -<csbody>
> -<ol>
> -<li>Stellen Sie sicher, dass die virtuelle Maschine gestartet ist.</li>
> -<li>W?hlen Sie aus dem Aktionsmen? die Option <uicontrol>Medien verwalten</uicontrol> aus.</li>
> -<li>Um das zu ?ndern, was aktuell in der CD-ROM geladen ist, klicken Sie auf das Symbol mit dem <uicontrol>orangefarbenen Schr?gstrich (/)</uicontrol> neben dem hdc-Feld.</li>
> -<li>Geben Sie auf der Seite <wintitle>CD-ROM f?r VM ersetzen</wintitle> den ISO-Dateipfad ein. Die anderen beiden Felder sind schreibgesch?tzt.</li>
> -<li>Klicken Sie auf <uicontrol>Ersetzen</uicontrol>.</li>
> +<li>W?hlen Sie im Aktionsmen? eines Gastes <uicontrol>Klonen</uicontrol> aus. </li>
> +<li>Akzeptieren Sie die Warnung. <note>Wenn ein Zielgast mit SCSI- oder iSCSI-Datentr?gern arbeitet oder wenn der Zielpool nicht ?ber gen?gend Speicherplatz verf?gt, dann wird der Klon in einem Standardspeicherpool erstellt. </note></li>
>   </ol>
> +<p>Ein Gast wird in Ihrer Liste mit der Bezeichnung <uicontrol>Wird geklont...</uicontrol> angezeigt. Nach Abschluss des Prozesses steht der geklonte Gast zur Benutzung zur Verf?gung. </p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/de_DE/host.dita b/ui/pages/help/de_DE/host.dita
> index 33a40e3..9f676df 100644
> --- a/ui/pages/help/de_DE/host.dita
> +++ b/ui/pages/help/de_DE/host.dita
> @@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li>W?hlen Sie <uicontrol>Erneut starten</uicontrol> aus, um das Hostsystem erneut zu starten.</li>
>   <li>W?hlen Sie <uicontrol>Verbinden</uicontrol> aus, um eine VNC-Verbindung zum Hostsystem herzustellen, wenn noch keine Verbindung besteht.</li>
>   </ul></p>
> -<p>Klicken Sie auf die folgenden Abschnitte, um Informationen zum Host anzuzeigen:<dl>
> -<dlentry>
> +<p>Klicken Sie auf die folgenden Abschnitte, um Informationen zum Host anzuzeigen:</p>
> +<dl><dlentry>
>   <dt>Basisinformationen</dt>
> -<dd>Dieser Abschnitt zeigt die Verteilung, die Version und den Codenamen des Hostbetriebssystems sowie den Prozessortyp und die Speicherkapazit?t in GB an.</dd>
> +<dd>Dieser Abschnitt zeigt die Verteilung, die Version und den Codenamen des Hostbetriebssystems sowie den Prozessortyp, die Anzahl der Online-CPUs und die Speicherkapazit?t in GB an. </dd>
>   </dlentry><dlentry>
>   <dt>Systemstatistik</dt>
> -<dd>Dieser Abschnitt zeigt mithilfe von Grafiken Statistiken f?r CPU, Speicher, Platten-E/A und Netz-E/A f?r den Host an. W?hlen Sie <uicontrol>Daten werden nach dem Verlassen dieser Seite gesammelt</uicontrol> aus, um mit der Sammlung von Daten fortzufahren, wenn die Host-Registerkarte nicht angezeigt wird.</dd>
> +<dd>Dieser Abschnitt zeigt mithilfe von Grafiken Statistiken f?r CPU, Speicher, Platten-E/A und Netz-E/A f?r den Host an. </dd>
>   </dlentry><dlentry>
>   <dt>Software-Updates</dt>
>   <dd>Dieser Abschnitt zeigt Informationen f?r alle Pakete an, bei denen Aktualisierungen verf?gbar sind, einschlie?lich Paketname, Version, Architektur und Repository. Sie k?nnen alle aufgelisteten Pakete aktualisieren, indem Sie <uicontrol>Alle aktualisieren</uicontrol> ausw?hlen. Sie k?nnen nicht einzelne Pakete zur Aktualisierung ausw?hlen.</dd>
> @@ -31,19 +31,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dd>Dieser Abschnitt zeigt Repositorys an, die dem Hostsystem zugeordnet sind. Sie k?nnen Repositorys hinzuf?gen, aktivieren, bearbeiten oder entfernen. Beim Hinzuf?gen wird ein Repository dem Hostsystem zugeordnet. Das Aktivieren eines Repositorys dagegen erm?glicht dem Host den Zugriff auf das Repository. Wenn Ihr System Red Hat Enterprise
>   Linux oder Fedora ist, k?nnen Sie <filepath>yum</filepath>-Repositorys hinzuf?gen.
>   Wenn Ihr System Ubuntu oder Debian ist, f?gen Sie <filepath>deb</filepath>-Repositorys hinzu.<p>Wenn Sie mit yum-Repositorys arbeiten, k?nnen Sie eine GPG-Pr?fung hinzuf?gen, um sicherzustellen, dass ein Paket aus diesem Repository nicht besch?digt wurde.
> -W?hlen Sie ein Repository und dann <uicontrol>Bearbeiten</uicontrol> aus. W?hlen Sie <uicontrol>Ja</uicontrol> aus, um die GPG-Pr?fung zu aktivieren, und geben Sie dann ein URL zur GPG-Schl?sseldatei f?r das Repository ein.</p></dd>
> +W?hlen Sie ein Repository und dann <uicontrol>Bearbeiten</uicontrol> aus. W?hlen Sie <uicontrol>Ja</uicontrol> aus, um <uicontrol>GPG-Pr?fung</uicontrol> zu aktivieren, und geben Sie dann eine URL zur GPG-Schl?sseldatei f?r das Repository ein. </p></dd>
>   </dlentry><dlentry>
>   <dt>Debugberichte</dt>
>   <dd>Dieser Abschnitt zeigt Debugberichte, einschlie?lich Name und Dateipfad, an.
>   Sie haben die M?glichkeit, einen neuen Bericht zu erstellen oder einen bestehenden Bericht umzubenennen, zu entfernen oder herunterzuladen.<p>Der Debugbericht wird w?hrend des Befehls <cmdname>sosreport</cmdname> generiert. Er ist verf?gbar f?r Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>-, Fedora-
>   und Ubuntu-Verteilungen. Der Befehl generiert eine .tar-Datei, die Konfigurations- und Diagnoseinformationen enth?lt, wie zum Beispiel Kernelversion, geladene Module sowie System- und Servicekonfigurationdateien.
>   Der Befehl f?hrt zudem externe Programme aus, um weitere Informationen zu sammeln, und speichert diese Ausgabe im resultierenden Archiv.</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/de_DE/network.dita b/ui/pages/help/de_DE/network.dita
> index 49a2935..830715c 100644
> --- a/ui/pages/help/de_DE/network.dita
> +++ b/ui/pages/help/de_DE/network.dita
> @@ -32,7 +32,7 @@ Address Translation, Netzadressumsetzung).</dd>
>   <li rev="rev1">W?hlen Sie <uicontrol>Starten</uicontrol> aus, um die Netzverbindung herzustellen.</li>
>   <li>W?hlen Sie <uicontrol>Stoppen</uicontrol> aus, um die Netzverbindung zu beenden.</li>
>   <li>W?hlen Sie <uicontrol>L?schen</uicontrol> aus, um die Verbindungsinformationen zu l?schen.</li>
> -</ul>Um ein Netz zu erstellen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> oben rechts in der Anzeige.</p>
> +</ul>Um ein Netz zu erstellen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol>. </p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="de-de">
>   <title>Netz erstellen</title>
> @@ -57,6 +57,6 @@ Address Translation, Netzadressumsetzung).</dd>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/de_DE/storage.dita b/ui/pages/help/de_DE/storage.dita
> index 7f89603..18c199d 100644
> --- a/ui/pages/help/de_DE/storage.dita
> +++ b/ui/pages/help/de_DE/storage.dita
> @@ -14,7 +14,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>F?r jeden Speicherpool werden die folgenden Informationen angezeigt:<dl>
>   <dlentry>
>   <dt>Name</dt>
> -<dd>Name des Speicherpools und genutzter Prozentsatz.</dd>
> +<dd>Name des Speicherpools. </dd>
> +</dlentry><dlentry>
> +<dt>% belegt</dt>
> +<dd>Prozentsatz des Speicherpools, der momentan belegt ist. </dd>
>   </dlentry><dlentry>
>   <dt>Status</dt>
>   <dd>Status des Speicherpools, aktiv (gr?n) oder inaktiv (rot). </dd>
> @@ -34,21 +37,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>Die folgenden Aktionen k?nnen f?r jeden Speicherpool ausgew?hlt werden:<ul>
>   <li>W?hlen Sie <uicontrol>Aktivieren</uicontrol> aus, um den Speicherpool zu aktivieren, damit er genutzt werden kann.</li>
>   <li>W?hlen Sie <uicontrol>Inaktivieren</uicontrol> aus, um einen aktiven Speicherpool zu inaktivieren.</li>
> -<li>W?hlen Sie <uicontrol>Definition aufheben</uicontrol>, um einen inaktiven Speicherpool  zu entfernen.</li>
> +<li>W?hlen Sie <uicontrol>Datentr?ger hinzuf?gen</uicontrol> aus, um einem aktiven Speicherpool weitere Datentr?ger hinzuzuf?gen. </li>
> +<li>W?hlen Sie <uicontrol>Definition aufheben</uicontrol>, um einen inaktiven Speicherpool zu entfernen.</li>
>   </ul></p>
> -<p>Um Details zum Speicherdatentr?ger anzuzeigen, klicken Sie auf den Pfeil auf der rechten Seite der Speicherpoolzeile.  Zu den Details geh?ren folgende Informationen:<dl><dlentry>
> -<dt>Typ</dt>
> -<dd>Typ des Datentr?gers, zum Beispiel <uicontrol>file</uicontrol>.</dd>
> -</dlentry><dlentry>
> -<dt>Format</dt>
> -<dd>Das Format, variiert abh?ngig vom Typ.</dd>
> -</dlentry><dlentry>
> -<dt>Kapazit?t</dt>
> -<dd>Gr??e des Speicherdatentr?gers.</dd>
> -</dlentry><dlentry>
> -<dt>Zuordnung</dt>
> -<dd>Speicherplatz, der bereits im Speicherpool zugeordnet ist.</dd>
> -</dlentry></dl>Um einen Speicherpool zu definieren, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> oben rechts in der Anzeige.</p>
> +<p>Um Details zum Speicherdatentr?ger anzuzeigen, klicken Sie auf den Pfeil auf der rechten Seite der Speicherpoolzeile. Um einen Speicherpool zu definieren, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol>. </p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="de-de">
>   <title>Speicherpool definieren</title>
> @@ -74,13 +66,28 @@ Wenn Sie <uicontrol>iSCSI</uicontrol> ausw?hlen, geben Sie die IP-Adresse vom <
>   <dt><uicontrol>SCSI-Fibre Channel</uicontrol></dt>
>   <dd>Gibt einen Pool an, der auf einem SCSI-Fibre Channel basiert. W?hlen Sie aus, welcher Adapter verwendet werden soll.</dd>
>   </dlentry></dl></li>
> +<li>Geben Sie einen Speicherpfad f?r den Speicherpool an. Der Speicherpfad gibt die Position im lokalen Dateisystem an, der der Pool zugeordnet ist.
> +Der Pfad muss eindeutig sein. Wenn das Verzeichnis bei der Poolerstellung noch nicht vorhanden ist, dann wird es vom System f?r Sie erstellt. </li>
>   <li>Klicken Sie auf <uicontrol>Erstellen</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="de-de">
> +<title>Datentr?ger hinzuf?gen</title>
> +<shortdesc>F?gt einen Datentr?ger zu einem Speicherpool hinzu. </shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>?ber Remote URL abrufen</dt>
> +<dd>Gibt eine Position an, von der der Datentr?ger heruntergeladen werden soll. Beispiel: <filepath>https://my-server/fedora22.img</filepath>.</dd>
> +</dlentry><dlentry>
> +<dt>Datei hochladen</dt>
> +<dd>Gibt eine Position auf Ihrem lokalen System an. </dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/de_DE/templates.dita b/ui/pages/help/de_DE/templates.dita
> index 5063930..efe145a 100644
> --- a/ui/pages/help/de_DE/templates.dita
> +++ b/ui/pages/help/de_DE/templates.dita
> @@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <title>Vorlagen</title>
>   <shortdesc>Die Seite <wintitle>Vorlagen</wintitle> zeigt die definierten Vorlagen der virtuellen Maschine an, die zum Erstellen von KVM-G?sten verwendet werden k?nnen.</shortdesc>
>   <csbody>
> -<p>F?r jede Vorlage werden die folgenden Informationen angezeigt:<dl>
> -<dlentry>
> +<p>F?r jede Vorlage werden die folgenden Informationen angezeigt:</p>
> +<dl><dlentry>
>   <dt>BS</dt>
>   <dd>Name des Betriebssystems oder der Verteilung.</dd>
>   </dlentry><dlentry>
> @@ -24,66 +24,60 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>Speicher</dt>
>   <dd>Gr??e des zuzuordnenden Arbeitsspeichers in MB.</dd>
> -</dlentry></dl></p>
> -<p>Die folgenden Aktionen k?nnen f?r jede Vorlage ausgew?hlt werden:<ul>
> +</dlentry></dl>
> +<p>Die folgenden Aktionen k?nnen f?r jede Vorlage ausgew?hlt werden:</p>
> +<ul>
>   <li>W?hlen Sie <uicontrol>Bearbeiten</uicontrol> aus, um die Vorlage zu bearbeiten.</li>
> +<li>W?hlen Sie <uicontrol>Klonen</uicontrol> aus, um eine Vorlage zu kopieren. </li>
>   <li>W?hlen Sie <uicontrol>L?schen</uicontrol> aus, um die Vorlage zu l?schen.</li>
> -</ul>Um eine Vorlage hinzuzuf?gen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol> oben rechts in der Anzeige.</p>
> +</ul>
> +<p>Um eine Vorlage hinzuzuf?gen, klicken Sie auf das Symbol <uicontrol>Plus (+)</uicontrol>. </p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="de-de">
>   <title>Vorlage bearbeiten</title>
>   <shortdesc>Bearbeiten Sie eine bestehende Vorlage.</shortdesc>
>   <csbody>
> -<p>F?r jede Vorlage werden die folgenden Informationen angezeigt: <dl>
> -<dlentry>
> -<dt>Name</dt>
> -<dd>Name der Vorlage.</dd>
> -</dlentry><dlentry>
> -<dt>Anbieter</dt>
> -<dd>Der Name des Unternehmens, das das Betriebssystem oder die Verteilung erstellt hat, f?r die die Vorlage konfiguriert ist.</dd>
> -</dlentry><dlentry>
> -<dt>Version</dt>
> -<dd>Die Version des Betriebssystems oder der Verteilung, f?r die die Vorlage konfiguriert ist.</dd>
> -</dlentry><dlentry>
> -<dt>CPU-Anzahl</dt>
> -<dd>Anzahl der Prozessoren, die f?r die Vorlage definiert sind.</dd>
> +<p>F?r jede Vorlage werden die folgenden Informationen angezeigt: </p>
> +<dl><dlentry>
> +<dt>Allgemein</dt>
> +<dd>Zeigt den Namen, die Anbieterverteilung, die Version, den Speicher sowie den Dateipfad zur ISO-Datei und die Grafikvorgaben an. </dd>
>   </dlentry><dlentry>
>   <dt>Speicher</dt>
> -<dd>Speicherkapazit?t in MB, die der virtuellen Maschine zugeordnet werden soll.</dd>
> -</dlentry><dlentry>
> -<dt>Platte</dt>
> -<dd>Plattengr??e in GB.</dd>
> +<dd>Geben Sie die Speicherpoolinformationen f?r die Vorlage an. </dd>
>   </dlentry><dlentry>
> -<dt>CD-ROM</dt>
> -<dd>Dateipfad zur Position der ISO-Datei an, die f?r die Installation des KVM-Gastes verwendet wird.</dd>
> +<dt>Schnittstelle</dt>
> +<dd>Zeigt die Standardnetzschnittstellen an, die f?r den KVM-Gast verf?gbar sind.
> +Sie k?nnen mehrere Netze ausw?hlen.</dd>
>   </dlentry><dlentry>
> -<dt>Speicherpool</dt>
> -<dd>Bestimmter Speicherpool oder der Standardspeicherpool.</dd>
> -</dlentry><dlentry>
> -<dt>Netz</dt>
> -<dd>Standardnetzschnittstelle, die f?r den KVM-Gast verf?gbar ist. Sie k?nnen mehrere Netze ausw?hlen.</dd>
> -</dlentry></dl> Felder, die nicht inaktiviert sind, k?nnen bearbeitet werden. Nachdem Sie ein Feld bearbeitet haben, klicken Sie auf <uicontrol>Speichern</uicontrol>. </p>
> +<dt>Prozessor</dt>
> +<dd>Geben Sie im Feld <uicontrol>CPU-Anzahl</uicontrol> die Anzahl der Prozessoren an, die f?r die Vorlage definiert sind. </dd>
> +<dd>W?hlen Sie aus, dass die CPU-Topologie f?r jeden Gast manuell definiert werden soll. </dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>Vorlage hinzuf?gen</title>
>   <shortdesc>F?gen Sie eine Vorlage vom Quellendatentr?ger hinzu. Sie k?nnen f?r eine nachfolgende Erkennung Ihr eigenes ISO-Image zum Speicherpool 'ISO' hinzuf?gen.</shortdesc>
>   <csbody>
> -<p>W?hlen Sie die Position des Quellendatentr?gers aus den folgenden Optionen aus:<dl>
> -<dlentry>
> +<p>W?hlen Sie die Position des Quellendatentr?gers aus den folgenden Optionen aus:</p>
> +<dl><dlentry>
>   <dt>Lokales ISO-Image</dt>
>   <dd>W?hlen Sie diese Option aus, um Speicherpools nach Installations-ISO-Images zu durchsuchen, die im System verf?gbar sind.</dd>
>   </dlentry><dlentry>
> +<dt>Lokale Imagedatei</dt>
> +<dd>W?hlen Sie aus, dass ein Pfad zur lokalen Imagedatei angegeben werden soll. </dd>
> +</dlentry><dlentry>
>   <dt>Fernes ISO-Image</dt>
>   <dd>W?hlen Sie diese Option aus, um eine ferne Position f?r ein Installations-ISO-Image anzugeben.</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>Vorlage hinzuf?gen - lokales ISO-Image</title>
> -<shortdesc>F?gen Sie eine Vorlage aus einem lokalen ISO-Image hinzu.</shortdesc>
> +<title>Vorlage hinzuf?gen - ISO-Image</title>
> +<shortdesc>F?gen Sie eine Vorlage aus einem ISO-Image hinzu. </shortdesc>
>   <csbody>
> -<p>Die im System verf?gbaren ISO-Images werden angezeigt.<dl><dlentry>
> +<p>Die im System verf?gbaren fernen ISO-Images werden angezeigt. </p>
> +<dl><dlentry>
>   <dt>BS</dt>
>   <dd>Name des Betriebssystems oder der Verteilung.</dd>
>   </dlentry><dlentry>
> @@ -92,21 +86,22 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>Gr??e</dt>
>   <dd>Gr??e des ISO-Image.</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   <p>Um eine Vorlage aus einem ISO-Image zu erstellen, w?hlen Sie aus den folgenden
> -Optionen aus:<ul>
> +Optionen aus:</p>
> +<ul>
>   <li>W?hlen Sie ein ISO-Image aus, aus dem Sie eine Vorlage erstellen m?chten, und klicken Sie dann auf <uicontrol>Vorlagen aus ausgew?hltem ISO erstellen</uicontrol>.</li>
>   <li>W?hlen Sie <uicontrol>Alle</uicontrol> aus, um eine Vorlage aus jedem aufgelisteten ISO-Image zu erstellen, und klicken Sie dann auf <uicontrol>Vorlagen aus ausgew?hltem ISO erstellen</uicontrol>.</li>
>   <li>Wenn das ISO-Image, das Sie verwenden m?chten, nicht in den Suchergebnissen angezeigt wird, k?nnen Sie aus den folgenden Optionen ausw?hlen:<ul>
>   <li>W?hlen Sie <uicontrol>Ich m?chte eine bestimmte ISO-Datei verwenden</uicontrol> aus, um einen Pfad zum ISO-Image anzugeben.</li>
>   <li>Klicken Sie auf <uicontrol>Weitere ISOs suchen</uicontrol>, um weitere ISO-Images zu suchen.</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/es_ES/guests.dita b/ui/pages/help/es_ES/guests.dita
> index 88e77e0..5d84c8c 100644
> --- a/ui/pages/help/es_ES/guests.dita
> +++ b/ui/pages/help/es_ES/guests.dita
> @@ -9,21 +9,21 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="es-es">
>   <title>Invitados</title>
> -<shortdesc>La p?gina <wintitle>Invitados</wintitle> lista las m?quinas virtuales KVM definidas.</shortdesc>
> +<shortdesc>En la p?gina <wintitle>Invitados</wintitle> se listan los invitados definidos para su servidor. </shortdesc>
>   <csbody>
>   <p>Se visualiza la siguiente informaci?n para cada invitado:<dl><dlentry>
>   <dt>Nombre</dt>
> -<dd>Nombre de la m?quina virtual.</dd>
> +<dd>Nombre del invitado. </dd>
>   </dlentry><dlentry>
>   <dt>CPU</dt>
> -<dd>Porcentaje de utilizaci?n de procesador en la m?quina virtual.</dd>
> -</dlentry><dlentry>
> -<dt>E/S de red</dt>
> -<dd>Velocidad de transmisi?n de entrada/salida de red en KB por segundos.</dd>
> +<dd>Porcentaje de utilizaci?n del procesador en el invitado. </dd>
>   </dlentry><dlentry>
>   <dt>E/S de disco</dt>
>   <dd>Velocidad de transmisi?n de entrada/salida de disco en KB por segundos.</dd>
>   </dlentry><dlentry>
> +<dt>E/S de red</dt>
> +<dd>Velocidad de transmisi?n de entrada/salida de red en KB por segundos.</dd>
> +</dlentry><dlentry>
>   <dt>Livetile</dt>
>   <dd>Estado de la consola del sistema operativo invitado, o un icono que representa la distribuci?n de <tm tmtype="tm" trademark="Linux">Linux</tm> si el invitado no est? activo.</dd>
>   </dlentry></dl></p>
> @@ -37,84 +37,77 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry></dl> </p>
>   <p>Se pueden seleccionar las siguientes acciones para cada invitado:<ul>
>   <li>Seleccione <uicontrol>Conectar</uicontrol> para conectarse a la consola remota para el sistema operativo invitado.</li>
> -<li>Seleccione <uicontrol>Gestionar soporte</uicontrol> para cambiar la v?a de acceso al soporte de instalaci?n.</li>
> -<li>Seleccione <uicontrol>Restablecer</uicontrol> para restablecer el invitado.</li>
> +<li>Seleccione <uicontrol>Clonar</uicontrol> para copiar una definici?n de invitado existente con el fin de crear un invitado. </li>
> +<li>Seleccione <uicontrol>Restablecer</uicontrol> para restablecer el invitado. Solamente puede restablecer un invitado que se haya iniciado. </li>
>   <li>Seleccione <uicontrol>Editar</uicontrol> para editar las propiedades de un invitado existente. Los invitados s?lo pueden editarse mientras est?n detenidos.</li>
> +<li>Seleccione <uicontrol>Iniciar</uicontrol> para iniciar un invitado</li>
> +<li>Seleccione <uicontrol>Concluir</uicontrol> para concluir un invitado con elegancia.</li>
> +<li>Seleccione <uicontrol>Apagar</uicontrol> para forzar una conclusi?n inmediata del invitado. </li>
>   <li>Seleccione <uicontrol>Suprimir</uicontrol> para suprimir el invitado.</li>
> -</ul>Para crear un invitado o m?quina virtual, pulse el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la p?gina.</p>
> +</ul>Para crear un invitado, pulse el icono <uicontrol>m?s (+)</uicontrol> en la p?gina.</p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="es-es">
> -<title>Crear m?quina virtual</title>
> -<shortdesc>Crear una m?quina virtual utilizando una plantilla existente.</shortdesc>
> +<title>Creaci?n de un invitado</title>
> +<shortdesc>Cree un invitado utilizando una plantilla existente. </shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>Escriba el nombre a utilizar para identificar la m?quina virtual.</li>
> -<li rev="rev1">Seleccione una plantilla. <ul>
> +<li>Escriba el nombre que se va a utilizar para identificar al invitado. </li>
> +<li>Seleccione una plantilla. <ul>
>   <li>Si existen plantillas, seleccione entre las plantillas mostradas.</li>
>   <li>Si no existen plantillas, pulse <uicontrol>Crear una plantilla</uicontrol> para crear una plantilla.</li>
> -</ul></li>
> +</ul>Puede ver informaci?n sobre una plantilla pasando el cursor por encima. </li>
>   <li>Pulse <uicontrol>Crear</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="es-es">
>   <title>Editar invitado</title>
> -<shortdesc>Editar las propiedades de una m?quina virtual existente. Algunas propiedades pueden editarse s?lo cuando el invitado se ha detenido. Otras surtir?n efecto en el arranque siguiente.</shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
> +<shortdesc>Edite las propiedades de un invitado existente. Algunas propiedades pueden editarse s?lo cuando el invitado se ha detenido. Otras surtir?n efecto en el arranque siguiente.</shortdesc>
>   <csbody>
> -<p>Se visualiza la siguiente informaci?n para cada invitado en la pesta?a <wintitle>General</wintitle>:<dl>
> -<dlentry>
> -<dt>Nombre</dt>
> -<dd>Nombre de la m?quina virtual.(s?lo puede editarse cuando el invitado se ha detenido)</dd>
> -</dlentry><dlentry>
> -<dt>CPUs</dt>
> -<dd>N?mero de procesadores.(si el invitado est? en ejecuci?n, la nueva cantidad surtir? efecto en el siguiente arranque)
> -</dd>
> -</dlentry><dlentry>
> -<dt>Memoria</dt>
> -<dd>Cantidad de memoria en MB.(si el invitado est? en ejecuci?n, la nueva cantidad surtir? efecto en el siguiente arranque)
> -</dd>
> -</dlentry><dlentry>
> -<dt>Icono</dt>
> -<dd>Imagen gr?fica que representa la distribuci?n de Linux a visualizar en lugar del estado actual (Livetile) cuando el invitado no est? activo.</dd>
> -</dlentry></dl></p>
> -<p>Se visualiza la siguiente informaci?n en la pesta?a <wintitle>Almacenamiento</wintitle>.</p>
>   <dl><dlentry>
> +<dt>General</dt>
> +<dd>Muestra informaci?n sobre el invitado, incluyendo el nombre, las CPU, la memoria y el icono para utilizarlo con su invitado. Puede editar el nombre de un invitado detenido. El cambio de CPU y de memoria entra en vigor tras el siguiente arranque. </dd>
> +</dlentry><dlentry>
>   <dt>Almacenamiento</dt>
> -<dd>Muestra la ubicaci?n del archivo ISO utilizado para la instalaci?n.</dd>
> +<dd>Muestra el dispositivo y la v?a de acceso para el almacenamiento del invitado seleccionado.
> +Puede a?adir, editar y eliminar dispositivos de almacenamiento para su invitado. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Interfaz</dt>
> +<dd>Muestra informaci?n de red del invitado, incluyendo el nombre, el tipo y la direcci?n MAC. Puede a?adir, editar y eliminar interfaces para su invitado. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Permiso</dt>
> +<dd>Muestra los usuarios y grupos que est?n autorizados para el invitado. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Dispositivo PCI de host</dt>
> +<dd>Muestra una lista de todos los dispositivos PCI disponibles en el host. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Instant?nea</dt>
> +<dd>Muestra las instant?neas del invitado. Puede crear, editar o suprimir una instant?nea. Al seleccionar una instant?nea y seleccionar revertir, se restaura el invitado en un punto del pasado, que viene determinado por los datos de la instant?nea y se descartan los cambios realizados pasado ese punto del tiempo. </dd>
>   </dlentry></dl>
>   <p> Los campos que no est?n inhabilitados pueden editarse. Despu?s de editar un campo, pulse <uicontrol>Guardar</uicontrol>. </p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="es-es">
> -<title>A?adir, sustituir o desconectar un dispositivo de almacenamiento</title>
> -<shortdesc rev="rev1">Puede a?adir, sustituir o desconectar un dispositivo de almacenamiento a la m?quina virtual. El ?nico dispositivo soportado es CDROM. Para editar los dispositivos de almacenamiento, siga estos pasos:</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="es-es">
> +<title>Clonaci?n de un invitado </title>
> +<shortdesc>La clonaci?n de un invitado le permite crear una copia de un invitado. </shortdesc>
>   <csbody>
> +<p>Para clonar un invitado: </p>
>   <ol>
> -<li>En la ventana <wintitle>Editar invitado</wintitle>, seleccione <wintitle>Almacenamiento</wintitle>.</li>
> -<li>Para sustituir un dispositivo de almacenamiento, pulse el primer icono con la <uicontrol>barra inclinada naranja (/)</uicontrol>. Especifique la v?a de acceso del archivo ISO y pulse <uicontrol>Sustituir</uicontrol>.</li>
> -<li>Para desconectar un dispositivo de almacenamiento, pulse el segundo icono con el <uicontrol>gui?n rojo (-)</uicontrol>. Confirme la supresi?n y pulse <uicontrol>Aceptar</uicontrol>.</li>
> -<li>Para a?adir un dispositivo de almacenamiento, pulse el tercer icono con el <uicontrol>signo m?s (+)</uicontrol> verde. Especifique un nombre de dispositivo y la v?a de acceso del archivo ISO y pulse <uicontrol>Conectar</uicontrol>.</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="es-es">
> -<title>Sustituir un CDROM de m?quina virtual</title>
> -<shortdesc rev="rev1">Puede sustituir el contenido del CDROM para una m?quina virtual despu?s de completarse la instalaci?n.</shortdesc>
> -<csbody>
> -<ol>
> -<li>Aseg?rese de que la m?quina virtual se ha iniciado.</li>
> -<li>En el men? Acciones, seleccione <uicontrol>Gestionar soporte</uicontrol>.</li>
> -<li>Para cambiar lo que est? cargado actualmente en el CDROM, pulse el icono <uicontrol>barra inclinada naranja (/)</uicontrol> junto al campo hdc.</li>
> -<li>En la p?gina <wintitle>Sustituir un CDROM de m?quina virtual</wintitle>, especifique la v?a de acceso del archivo ISO. Los otros dos campos son de s?lo lectura.</li>
> -<li>Pulse <uicontrol>Sustituir</uicontrol>.</li>
> +<li>Seleccione <uicontrol>Clonar</uicontrol> del men? Acci?n de un invitado. </li>
> +<li>Acepte el aviso. <note>Cuando un invitado de destino est? utilizando vol?menes SCSI o iSCSI o si la agrupaci?n de destino no tiene suficiente espacio, el clon se crear? en una agrupaci?n de almacenamiento predeterminada. </note></li>
>   </ol>
> +<p>Un invitado aparece en su lista con la etiqueta <uicontrol>Clonando...</uicontrol> Cuando el proceso se ha completado, el invitado clonado est? disponible para utilizarlo. </p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/es_ES/host.dita b/ui/pages/help/es_ES/host.dita
> index 7734244..90f60f8 100644
> --- a/ui/pages/help/es_ES/host.dita
> +++ b/ui/pages/help/es_ES/host.dita
> @@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li>Seleccione <uicontrol>Reiniciar</uicontrol> para reiniciar el sistema host.</li>
>   <li>Seleccione <uicontrol>Conectar</uicontrol> para abrir una conexi?n VNC al sistema host, si no est? conectado a?n.</li>
>   </ul></p>
> -<p>Pulse en las secciones siguientes para visualizar informaci?n acerca del host:<dl>
> -<dlentry>
> +<p>Pulse en las secciones siguientes para visualizar informaci?n acerca del host:</p>
> +<dl><dlentry>
>   <dt>Informaci?n b?sica</dt>
> -<dd>Esta secci?n muestra la distribuci?n del sistema operativo de host, la versi?n y el nombre de c?digo, as? como el tipo de procesador y la cantidad de memoria en GB.</dd>
> +<dd>Esta secci?n muestra la distribuci?n del sistema operativo de host, la versi?n, el nombre de c?digo, as? como el tipo de procesador, el n?mero de CPU en l?nea y la cantidad de memoria en GB.</dd>
>   </dlentry><dlentry>
>   <dt>Estad?sticas del sistema</dt>
> -<dd>Esta secci?n muestra gr?ficos para mostrar estad?sticas para CPU, memoria, E/S de disco y E/S de red para el host. Seleccione <uicontrol>Recoger datos despu?s de salir de esta p?gina</uicontrol> para continuar la recogida de datos cuando la pesta?a principal ya no est? a la vista.</dd>
> +<dd>Esta secci?n muestra gr?ficos para mostrar estad?sticas para CPU, memoria, E/S de disco y E/S de red para el host. </dd>
>   </dlentry><dlentry>
>   <dt>Actualizaciones de software</dt>
>   <dd>En esta secci?n se muestra informaci?n para todos los paquetes que tienen actualizaciones disponibles, incluido el nombre de paquete, versi?n, arquitectura y repositorio. Puede actualizar todos los paquetes listados seleccionando <uicontrol>Actualizar todo</uicontrol>. No puede seleccionar paquetes individuales para las actualizaciones.</dd>
> @@ -31,19 +31,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dd>En esta secci?n se muestran los repositorios que est?n asociados con el sistema host. Puede a?adir, habilitar, editar o eliminar repositorios. A?adir un repositorio lo asocia con el sistema host mientras que habilitar un repositorio permite que el host acceda a ?l. Si el sistema es Red Hat Enterprise
>   Linux o Fedora, puede a?adir repositorios <filepath>yum</filepath>.
>   Si el sistema es Ubuntu o Debian, a?ada repositorios <filepath>deb</filepath>.<p>Si est? trabajando con repositorios yum, puede a?adir una comprobaci?n GPG para verificar que un paquete de este repositorio no ha resultado da?ado.
> -Seleccione un repositorio y, a continuaci?n, <uicontrol>Editar</uicontrol>. Seleccione <uicontrol>S?</uicontrol> para habilitar la comprobaci?n GPG y, a continuaci?n, especifique un URL al archivo de claves GPG para el repositorio.</p></dd>
> +Seleccione un repositorio y, a continuaci?n, <uicontrol>Editar</uicontrol>. Seleccione <uicontrol>S?</uicontrol> para habilitar <uicontrol>Comprobaci?n GPG</uicontrol> y, a continuaci?n, especifique un URL al archivo de claves GPG para el repositorio. </p></dd>
>   </dlentry><dlentry>
>   <dt>Informes de depuraci?n</dt>
>   <dd>En esta secci?n se muestran informes de depuraci?n, incluido el nombre y la ruta de archivo.
>   Puede seleccionar entre opciones para generar un informe nuevo, o bien redenominar, eliminar o descargar un informe existente.<p>El informe de depuraci?n se genera utilizando el mandato <cmdname>sosreport</cmdname>. Est? disponible para distribuciones de Red
>   Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora y Ubuntu. El mandato genera un archivo .tar que contiene la informaci?n de configuraci?n y de diagn?stico, como la versi?n de kernel en ejecuci?n, los m?dulos de carga y los archivos de configuraci?n del sistema y servicio.
>   El mandato tambi?n ejecuta programas externos para recopilar informaci?n adicional y almacena esta salida en el archivo resultante.</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/es_ES/network.dita b/ui/pages/help/es_ES/network.dita
> index 3654531..0cda3c0 100644
> --- a/ui/pages/help/es_ES/network.dita
> +++ b/ui/pages/help/es_ES/network.dita
> @@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li rev="rev1">Seleccione <uicontrol>Iniciar</uicontrol> para iniciar la conexi?n de red.</li>
>   <li>Seleccione <uicontrol>Detener</uicontrol> para finalizar la conexi?n de red.</li>
>   <li>Seleccione <uicontrol>Suprimir</uicontrol> para suprimir la informaci?n de conexi?n.</li>
> -</ul>Para crear una red, pulse en el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la pantalla.</p>
> +</ul>Para crear una red, pulse el icono <uicontrol>m?s (+)</uicontrol>. </p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="es-es">
>   <title>Crear una red</title>
> @@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/es_ES/storage.dita b/ui/pages/help/es_ES/storage.dita
> index 0c68951..ee2083d 100644
> --- a/ui/pages/help/es_ES/storage.dita
> +++ b/ui/pages/help/es_ES/storage.dita
> @@ -15,7 +15,10 @@ Si desea utilizar su propia ISO, a??dala a la v?a de acceso de la agrupaci?n
>   <p>Se visualiza la siguiente informaci?n para cada agrupaci?n de almacenamiento:<dl>
>   <dlentry>
>   <dt>Nombre</dt>
> -<dd>Nombre de la agrupaci?n de almacenamiento y el porcentaje utilizado.</dd>
> +<dd>El nombre de la agrupaci?n de almacenamiento. </dd>
> +</dlentry><dlentry>
> +<dt>% utilizado</dt>
> +<dd>Porcentaje de la agrupaci?n de almacenamiento que se est? utilizando. </dd>
>   </dlentry><dlentry>
>   <dt>Estado</dt>
>   <dd>Estado de la agrupaci?n de almacenamiento, activa (verde) o inactiva (rojo). </dd>
> @@ -35,21 +38,10 @@ Si desea utilizar su propia ISO, a??dala a la v?a de acceso de la agrupaci?n
>   <p>Se pueden seleccionar las siguientes acciones para cada agrupaci?n de almacenamiento:<ul>
>   <li>Seleccione <uicontrol>Activar</uicontrol> para activar la agrupaci?n de almacenamiento para que pueda utilizarse.</li>
>   <li>Seleccione <uicontrol>Desactivar</uicontrol> para desactivar una agrupaci?n de almacenamiento activa.</li>
> +<li>Seleccione <uicontrol>A?adir volumen</uicontrol> para a?adir m?s volumen a una agrupaci?n de almacenamiento activa. </li>
>   <li>Seleccione <uicontrol>No definir</uicontrol> para eliminar una agrupaci?n de almacenamiento inactiva.</li>
>   </ul></p>
> -<p>Para visualizar detalles de volumen de almacenamiento para una agrupaci?n de almacenamiento, pulse la flecha situada en el lado derecho de la fila de agrupaci?n de almacenamiento. Los detalles incluyen lo siguiente:<dl><dlentry>
> -<dt>Tipo</dt>
> -<dd>El tipo de volumen, por ejemplo, <uicontrol>archivo</uicontrol>.</dd>
> -</dlentry><dlentry>
> -<dt>Formato</dt>
> -<dd>El formato, variable dependiendo del tipo.</dd>
> -</dlentry><dlentry>
> -<dt>Capacidad</dt>
> -<dd>Tama?o del volumen de almacenamiento.</dd>
> -</dlentry><dlentry>
> -<dt>Asignaci?n</dt>
> -<dd>Cantidad de espacio que ya est? asignado en la agrupaci?n de almacenamiento.</dd>
> -</dlentry></dl>Para definir una agrupaci?n de almacenamiento, pulse en el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la pantalla.</p>
> +<p>Para visualizar detalles de volumen de almacenamiento para una agrupaci?n de almacenamiento, pulse la flecha situada en el lado derecho de la fila de agrupaci?n de almacenamiento. Para definir una agrupaci?n de almacenamiento, pulse el icono <uicontrol>m?s (+)</uicontrol>. </p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="es-es">
>   <title>Definir una agrupaci?n de almacenamiento</title>
> @@ -74,13 +66,28 @@ Al seleccionar <uicontrol>iSCSI</uicontrol>, escriba la direcci?n IP del <uicon
>   <dt><uicontrol>Canal de fibra de SCSI</uicontrol></dt>
>   <dd>Especifica una agrupaci?n basada en un Canal de fibra SCSI. Seleccione qu? adaptador SCSI se utilizar?.</dd>
>   </dlentry></dl></li>
> +<li>Especifique una v?a de acceso de almacenamiento para la agrupaci?n de almacenamiento. La v?a de acceso de almacenamiento es la ubicaci?n en el sistema de archivos local al que se correlaciona la agrupaci?n.
> +La v?a de acceso debe ser exclusiva. Si el directorio no existe cuando se crea la agrupaci?n, se crear? para el usuario. </li>
>   <li>Pulse <uicontrol>Crear</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="es-es">
> +<title>A?adir volumen</title>
> +<shortdesc>A?ade volumen a una agrupaci?n de almacenamiento. </shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>Captar de URL remoto</dt>
> +<dd>Especifica una ubicaci?n de donde descargar el volumen. Por ejemplo: <filepath>https://my-server/fedora22.img</filepath>.</dd>
> +</dlentry><dlentry>
> +<dt>Cargar un archivo</dt>
> +<dd>Especifica una ubicaci?n en su sistema local. </dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/es_ES/templates.dita b/ui/pages/help/es_ES/templates.dita
> index 8cceee7..9c0ef97 100644
> --- a/ui/pages/help/es_ES/templates.dita
> +++ b/ui/pages/help/es_ES/templates.dita
> @@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <title>Plantillas</title>
>   <shortdesc>La p?gina <wintitle>Plantillas</wintitle> muestra las plantillas de m?quina virtual definidas que se pueden utilizar para crear invitados KVM.</shortdesc>
>   <csbody>
> -<p>Se visualiza la siguiente informaci?n para cada plantilla:<dl>
> -<dlentry>
> +<p>Se visualiza la siguiente informaci?n para cada plantilla:</p>
> +<dl><dlentry>
>   <dt>SO</dt>
>   <dd>Nombre del sistema operativo o distribuci?n.</dd>
>   </dlentry><dlentry>
> @@ -24,66 +24,60 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>Memoria</dt>
>   <dd>Cantidad de memoria de acceso aleatorio a asignar, en MB.</dd>
> -</dlentry></dl></p>
> -<p>Se pueden seleccionar las siguientes acciones para cada plantilla:<ul>
> +</dlentry></dl>
> +<p>Se pueden seleccionar las siguientes acciones para cada plantilla:</p>
> +<ul>
>   <li>Seleccione <uicontrol>Editar</uicontrol> para editar la plantilla.</li>
> +<li>Seleccione <uicontrol>Clonar</uicontrol> para copiar una plantilla. </li>
>   <li>Seleccione <uicontrol>Suprimir</uicontrol> para suprimir la plantilla.</li>
> -</ul>Para a?adir una plantilla, pulse en el icono <uicontrol>m?s (+)</uicontrol> en la esquina superior derecha de la pantalla.</p>
> +</ul>
> +<p>Para a?adir una plantilla, pulse el icono <uicontrol>m?s (+)</uicontrol>. </p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="es-es">
>   <title>Editar plantilla</title>
>   <shortdesc>Editar una plantilla existente.</shortdesc>
>   <csbody>
> -<p>Se visualiza la siguiente informaci?n para cada plantilla: <dl>
> -<dlentry>
> -<dt>Nombre</dt>
> -<dd>Nombre de la plantilla.</dd>
> +<p>Se visualiza la siguiente informaci?n para cada plantilla: </p>
> +<dl><dlentry>
> +<dt>General</dt>
> +<dd>Muestra el nombre, la distribuci?n de proveedor, la versi?n, la memoria, la v?a de acceso del archivo al archivo ISO y las preferencias de gr?ficos. </dd>
>   </dlentry><dlentry>
> -<dt>Proveedor</dt>
> -<dd>El nombre de la empresa que cre? el sistema operativo o distribuci?n que la plantilla est? configurada para utilizar.</dd>
> +<dt>Almacenamiento</dt>
> +<dd>Especifica informaci?n de la agrupaci?n de almacenamiento para la plantilla. </dd>
>   </dlentry><dlentry>
> -<dt>Versi?n</dt>
> -<dd>La versi?n del sistema operativo o distribuci?n que la plantilla est? configurada para utilizar.</dd>
> -</dlentry><dlentry>
> -<dt>N?mero de CPU</dt>
> -<dd>N?mero de procesadores que est?n definidos para la plantilla.</dd>
> -</dlentry><dlentry>
> -<dt>Memoria</dt>
> -<dd>Cantidad de memoria en MB a asignar a la m?quina virtual.</dd>
> +<dt>Interfaz</dt>
> +<dd>Muestra las interfaces de red predeterminadas que hay disponibles para el invitado KVM.
> +Puede seleccionar varias redes.</dd>
>   </dlentry><dlentry>
> -<dt>Disco</dt>
> -<dd>Tama?o de disco en GB.</dd>
> -</dlentry><dlentry>
> -<dt>CDROM</dt>
> -<dd>V?a de acceso de archivo a la ubicaci?n del archivo ISO utilizado para instalar el invitado KVM.</dd>
> -</dlentry><dlentry>
> -<dt>Agrupaci?n de almacenamiento</dt>
> -<dd>Agrupaci?n de almacenamiento espec?fica o la agrupaci?n de almacenamiento predeterminada.</dd>
> -</dlentry><dlentry>
> -<dt>Red</dt>
> -<dd>Interfaces de red predeterminadas disponibles para el invitado KVM. Puede seleccionar varias redes.</dd>
> -</dlentry></dl> Los campos que no est?n inhabilitados pueden editarse. Despu?s de editar un campo, pulse <uicontrol>Guardar</uicontrol>. </p>
> +<dt>Procesador</dt>
> +<dd>En el campo <uicontrol>N?mero de CPU</uicontrol>, especifique el n?mero de procesadores que se han definido para la plantilla. </dd>
> +<dd>Seleccione Establecer manualmente la topolog?a de la CPU para cada invitado. </dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>A?adir plantilla</title>
>   <shortdesc>A?adir una plantilla desde el soporte de origen. Puede a?adir su propia imagen ISO a la agrupaci?n de almacenamiento 'ISO' para el siguiente descubrimiento.</shortdesc>
>   <csbody>
> -<p>Seleccione la ubicaci?n del soporte de origen entre una de las opciones siguientes:<dl>
> -<dlentry>
> +<p>Seleccione la ubicaci?n del soporte de origen entre una de las opciones siguientes:</p>
> +<dl><dlentry>
>   <dt>Imagen ISO local</dt>
>   <dd>Seleccione esta opci?n para explorar las agrupaciones de almacenamiento en busca de im?genes ISO de instalaci?n disponibles en el sistema.</dd>
>   </dlentry><dlentry>
> +<dt>Archivo de imagen local</dt>
> +<dd>Seleccione esta opci?n para especificar una v?a de acceso al archivo de imagen local. </dd>
> +</dlentry><dlentry>
>   <dt>Imagen ISO remota</dt>
>   <dd>Seleccione esta opci?n para especificar una ubicaci?n remota para una imagen ISO de instalaci?n.</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>A?adir plantilla ? imagen ISO local</title>
> -<shortdesc>A?adir una plantilla desde una imagen ISO local.</shortdesc>
> +<title>A?adir plantilla - imagen ISO</title>
> +<shortdesc>A?ade una plantilla desde una imagen ISO. </shortdesc>
>   <csbody>
> -<p>Se visualizan las im?genes ISO disponibles en el sistema.<dl><dlentry>
> +<p>Las im?genes ISO disponibles en el sistema se visualizan de forma remota. </p>
> +<dl><dlentry>
>   <dt>SO</dt>
>   <dd>Nombre del sistema operativo o distribuci?n.</dd>
>   </dlentry><dlentry>
> @@ -92,20 +86,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>Tama?o</dt>
>   <dd>Tama?o de la imagen ISO.</dd>
> -</dlentry></dl></p>
> -<p>Para crear una plantilla a partir de una imagen ISO, elija entre las opciones siguientes:<ul>
> +</dlentry></dl>
> +<p>Para crear una plantilla a partir de una imagen ISO, elija entre las opciones siguientes:</p>
> +<ul>
>   <li>Seleccione una imagen ISO desde la que desea crear una plantilla y, a continuaci?n, pulse <uicontrol>Crear plantillas desde ISO seleccionada</uicontrol>.</li>
>   <li>Seleccione <uicontrol>Todo</uicontrol> para crear una plantilla desde cada imagen ISO en la lista y, a continuaci?n, pulse <uicontrol>Crear plantillas desde ISO seleccionada</uicontrol>.</li>
>   <li>Si la imagen ISO que desea utilizar no aparece en los resultados de la exploraci?n, puede seleccionar entre las opciones siguientes:<ul>
>   <li>Seleccione <uicontrol>Deseo utilizar un archivo ISO espec?fico</uicontrol> para especificar una v?a de acceso a la imagen ISO.</li>
>   <li>Pulse <uicontrol>Buscar m?s ISO</uicontrol> para buscar m?s im?genes ISO.</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/fr_FR/guests.dita b/ui/pages/help/fr_FR/guests.dita
> index ad5b4e4..f86d3ed 100644
> --- a/ui/pages/help/fr_FR/guests.dita
> +++ b/ui/pages/help/fr_FR/guests.dita
> @@ -9,21 +9,21 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="fr-fr">
>   <title>Invit?s</title>
> -<shortdesc>La page <wintitle>Invit?s</wintitle> r?pertorie les machines virtuelles KVM d?finies.</shortdesc>
> +<shortdesc>La page <wintitle>Invit?s</wintitle> r?pertorie les invit?s d?finis pour le serveur.</shortdesc>
>   <csbody>
>   <p>Pour chaque invit?, les informations suivantes sont affich?es :<dl><dlentry>
>   <dt>Nom</dt>
> -<dd>Nom de la machine virtuelle.</dd>
> +<dd>Nom de l'invit?.</dd>
>   </dlentry><dlentry>
>   <dt>UC</dt>
> -<dd>Pourcentage d'utilisation du processeur sur la machine virtuelle.</dd>
> -</dlentry><dlentry>
> -<dt>E-S r?seau</dt>
> -<dd>Vitesse de transmission d'entr?e-sortie du r?seau, exprim?e en ko par seconde.</dd>
> +<dd>Pourcentage d'utilisation du processeur sur l'invit?.</dd>
>   </dlentry><dlentry>
>   <dt>E-S disque</dt>
>   <dd>Vitesse de transmission d'entr?e-sortie du disque, exprim?e en ko par seconde.</dd>
>   </dlentry><dlentry>
> +<dt>E-S r?seau</dt>
> +<dd>Vitesse de transmission d'entr?e-sortie du r?seau, exprim?e en ko par seconde.</dd>
> +</dlentry><dlentry>
>   <dt>Livetile</dt>
>   <dd>Etat de la console du syst?me d'exploitation de l'h?te, ou
>   ic?ne repr?sentant la distribution <tm tmtype="tm" trademark="Linux">Linux</tm>
> @@ -41,90 +41,78 @@ l'alimentation est d?marr?e ; si l'ic?ne est verte, l'alimentation est arr?t
>   <p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque invit? :<ul>
>   <li>S?lectionnez <uicontrol>Connexion</uicontrol> pour vous connecter ? la console
>   distante du syst?me d'exploitation invit?.</li>
> -<li>S?lectionnez <uicontrol>G?rer le support</uicontrol> pour modifier le chemin
> -d'acc?s au support d'installation.</li>
> -<li>S?lectionnez <uicontrol>R?initialiser</uicontrol> pour r?initialiser l'invit?.</li>
> +<li>S?lectionnez <uicontrol>Cloner</uicontrol> pour copier une d?finition d'invit? existante afin de cr?er un invit?.</li>
> +<li>S?lectionnez <uicontrol>R?initialiser</uicontrol> pour r?initialiser l'invit?. Seul un h?te d?marr? peut ?tre r?initialis?.</li>
>   <li>S?lectionnez <uicontrol>Editer</uicontrol> pour ?diter les propri?t?s d'un invit? existant. Les invit?s peuvent ?tre ?dit?s uniquement lorsqu'ils sont ? l'arr?t.</li>
> +<li>S?lectionnez <uicontrol>D?marrer</uicontrol> pour d?marrer un invit?</li>
> +<li>S?lectionnez <uicontrol>Arr?ter</uicontrol> pour arr?ter un invit?.</li>
> +<li>S?lectionnez <uicontrol>Mettre hors tension</uicontrol> pour forcer un arr?t imm?diat de l'invit?.</li>
>   <li>S?lectionnez <uicontrol>Supprimer</uicontrol> pour supprimer l'invit?.</li>
> -</ul>Pour cr?er un invit?, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
> -dans le coin sup?rieur droit de la page.</p>
> +</ul>Pour cr?er un invit?, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol> sur la page.</p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="fr-fr">
> -<title>Cr?er une machine virtuelle</title>
> -<shortdesc>Cr?ez une machine virtuelle en utilisant un mod?le existant.</shortdesc>
> +<title>Cr?er un invit?</title>
> +<shortdesc>Cr?ation d'un invit? ? l'aide d'un mod?le existant.</shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>Entrez le nom ? utiliser pour identifier la machine virtuelle.</li>
> -<li rev="rev1">S?lectionnez un mod?le. <ul>
> +<li>Entrez le nom ? utiliser pour identifier l'invit?.</li>
> +<li>S?lectionnez un mod?le. <ul>
>   <li>Si des mod?les existent, faites un choix parmi les mod?les affich?s.</li>
>   <li>Si aucun mod?le n'existe, cliquez sur <uicontrol>Cr?er un mod?le</uicontrol> pour cr?er un mod?le.</li>
> -</ul></li>
> +</ul>Vous pouvez afficher des informations sur un mod?le en le survolant avec la souris.</li>
>   <li>Cliquez sur <uicontrol>Cr?er</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="fr-fr">
>   <title>Editer l'invit?</title>
> -<shortdesc>Editez les propri?t?s d'une machine virtuelle existante. Certaines propri?t?s
> +<shortdesc>Edition des propri?t?s d'un invit? existant. Certaines propri?t?s
>   peuvent ?tre ?dit?es uniquement lorsque l'invit? est arr?t?. D'autres seront appliqu?es ? l'amor?age suivant.</shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
>   <csbody>
> -<p>Pour chaque invit?, les informations suivantes sont affich?es dans l'onglet <wintitle>G?n?ral</wintitle> :<dl>
> -<dlentry>
> -<dt>Nom</dt>
> -<dd>Nom de la machine virtuelle. (Ne peut ?tre ?dit? que lorsque l'invit? est arr?t?)</dd>
> -</dlentry><dlentry>
> -<dt>UC</dt>
> -<dd>Nombre de processeurs. (Si l'invit? est en cours d'ex?cution, la nouvelle quantit? sera appliqu?e ? l'amor?age suivant)</dd>
> -</dlentry><dlentry>
> -<dt>M?moire</dt>
> -<dd>Quantit? de m?moire en Mo. (Si l'invit? est en cours d'ex?cution, la nouvelle quantit? sera appliqu?e ? l'amor?age suivant)</dd>
> -</dlentry><dlentry>
> -<dt>Ic?ne</dt>
> -<dd>Image graphique repr?sentant la distribution Linux ? afficher ? la place
> -du statut en cours (Livetile) lorsque l'invit? n'est pas actif.</dd>
> -</dlentry></dl></p>
> -<p>Les informations suivantes sont affich?es dans l'onglet <wintitle>Stockage</wintitle>.</p>
>   <dl><dlentry>
> +<dt>G?n?ral</dt>
> +<dd>Affiche des informations sur l'invit?, parmi lesquelles le nom, les UC, la m?moire et l'ic?ne ? utiliser pour l'invit?. Vous pouvez modifier le nom d'un invit? arr?t?. La modification des UC et de la m?moire prend effet ? l'amor?age suivant.</dd>
> +</dlentry><dlentry>
>   <dt>Stockage</dt>
> -<dd>Affiche l'emplacement du fichier ISO utilis? pour l'installation.</dd>
> +<dd>Affiche l'unit? et le chemin pour le stockage de l'invit? s?lectionn?.
> +Vous pouvez ajouter, modifier et supprimer les unit?s de stockage de l'invit?.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Interface</dt>
> +<dd>Affiche les informations de r?seau pour l'invit?, parmi lesquelles le nom, le type et l'adresse MAC. Vous pouvez ajouter, modifier et supprimer les interfaces de l'invit?.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Droits</dt>
> +<dd>Affiche les utilisateurs et les groupes autoris?s pour l'invit?. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Unit? PCI h?te</dt>
> +<dd>Affiche une liste de toutes les unit?s PCI disponibles sur l'h?te. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Image instantan?e</dt>
> +<dd>Affiche les images instantan?es de l'invit?. Vous pouvez cr?er, modifier ou supprimer une image instantan?e. En s?lectionnant une image instantan?e et en choisissant l'option de r?tablissement, l'invit? est restaur? ? un point dans le pass?, d?termin? par les donn?es d'image instantan?e et annule les modifications apport?es au-del? de ce point dans le temps.</dd>
>   </dlentry></dl>
>   <p> Les zones qui ne sont pas d?sactiv?es peuvent ?tre ?dit?es. Apr?s que vous avez ?dit? une zone, cliquez sur <uicontrol>Sauvegarder</uicontrol>. </p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="fr-fr">
> -<title>Ajoutez, remplacez ou d?tachez une unit? de stockage</title>
> -<shortdesc rev="rev1">Vous pouvez ajouter, remplacer ou d?tacher une unit? de stockage
> -pour votre machine virtuelle. Seule une unit? CD-ROM est prise en charge. Pour ?diter vos unit?s de stockage, proc?dez comme suit :</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="fr-fr">
> +<title>Clonage d'un invit?</title>
> +<shortdesc>Le clonage d'un invit? permet de cr?er une copie d'un invit?.</shortdesc>
>   <csbody>
> +<p>Pour cloner un invit? :</p>
>   <ol>
> -<li>Dans la fen?tre <wintitle>Editer l'invit?</wintitle>, s?lectionnez <wintitle>Stockage</wintitle>.</li>
> -<li>Pour remplacer une unit? de stockage, cliquez sur la premi?re ic?ne avec la <uicontrol>barre oblique (/) orange</uicontrol>. Entrez le chemin d'acc?s au fichier ISO et cliquez sur <uicontrol>Remplacer</uicontrol>.</li>
> -<li>Pour d?tacher une unit? de stockage, cliquez sur la deuxi?me ic?ne avec le <uicontrol>tiret (-) rouge</uicontrol>. Confirmer la suppression et cliquez sur <uicontrol>OK</uicontrol>.</li>
> -<li>Pour ajouter une unit? de stockage, cliquez sur la troisi?me ic?ne avec le <uicontrol>signe plus (+) vert</uicontrol>. Entrez un nom d'unit? et un chemin d'acc?s au fichier ISO puis cliquez sur <uicontrol>Attacher</uicontrol>.</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="fr-fr">
> -<title>Remplacer l'unit? CD-ROM d'une machine virtuelle</title>
> -<shortdesc rev="rev1">Vous pouvez remplacer le contenu du CD-ROM pour
> -une machine virtuelle une fois l'installation termin?e.</shortdesc>
> -<csbody>
> -<ol>
> -<li>V?rifiez que la machine virtuelle est d?marr?e.</li>
> -<li>Dans le menu Actions, s?lectionnez <uicontrol>G?rer le support</uicontrol>.</li>
> -<li>Pour modifier les donn?es actuellement charg?es dans l'unit? de CD-ROM, cliquez sur l'ic?ne
> -<uicontrol>barre oblique (/) orange</uicontrol> en regard de la zone hdc.</li>
> -<li>Sur la page <wintitle>Remplacer une unit? CD-ROM d'une machine virtuelle</wintitle>,
> -entrez le chemin d'acc?s au fichier ISO. Les deux autres zones sont en lecture seule.</li>
> -<li>Cliquez sur <uicontrol>Remplacer</uicontrol>.</li>
> +<li>S?lectionnez <uicontrol>Cloner</uicontrol> dans le menu Action d'un invit?.</li>
> +<li>Acceptez l'avertissement. <note>Lorsqu'un invit? cible utilise des volumes SCSI ou iSCSI ou si le pool cible ne dispose pas de suffisamment d'espace, le clone est cr?? dans un pool de stockage par d?faut. </note></li>
>   </ol>
> +<p>Un invit? appara?t dans la liste avec le libell? <uicontrol>Clonage en cours...</uicontrol> Une fois le processus termin?, l'invit? clon? est disponible.</p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/fr_FR/host.dita b/ui/pages/help/fr_FR/host.dita
> index f4c330b..099d342 100644
> --- a/ui/pages/help/fr_FR/host.dita
> +++ b/ui/pages/help/fr_FR/host.dita
> @@ -19,17 +19,15 @@ connecter ? l'h?te.</shortdesc>
>   <li>S?lectionnez <uicontrol>Connexion</uicontrol> pour ouvrir une connexion VNC
>   au syst?me h?te, si celui-ci n'est pas d?j? connect?.</li>
>   </ul></p>
> -<p>Cliquez sur les sections suivantes pour afficher des informations sur l'h?te :<dl>
> -<dlentry>
> +<p>Cliquez sur les sections suivantes pour afficher des informations sur l'h?te :</p>
> +<dl><dlentry>
>   <dt>Informations de base</dt>
>   <dd>Cette section affiche la distribution, la version et le nom de code
> -du syst?me d'exploitation h?te, ainsi que le type de processeur et la quantit?
> -de m?moire en Go.</dd>
> +du syst?me d'exploitation h?te, ainsi que le type de processeur, le nombre d'UC en ligne et la quantit? de m?moire en Go.</dd>
>   </dlentry><dlentry>
>   <dt>Statistiques syst?me</dt>
>   <dd>Cette section affiche les graphiques des statistiques pour l'UC, m?moire, ainsi que
> -les E-S disque et E-S r?seau pour l'h?te. S?lectionnez <uicontrol>Collecte des donn?es une fois la page quitt?e</uicontrol>
> -pour continuer la collecte de donn?es lorsque l'onglet h?te n'est plus visible.</dd>
> +les E-S disque et E-S r?seau pour l'h?te. </dd>
>   </dlentry><dlentry>
>   <dt>Mises ? jour logicielles</dt>
>   <dd>Cette section affiche des informations pour tous les modules qui
> @@ -44,8 +42,7 @@ vous pouvez ajouter des r?f?rentiels <filepath>yum</filepath>.
>   Si votre syst?me est de type Ubuntu ou Debian, ajoutez des r?f?rentiels
>   <filepath>deb</filepath>.<p>Si vous travaillez avec des r?f?rentiels yum, vous pouvez ajouter un contr?le GPG
>   afin de v?rifier qu'un module provenant de ce r?f?rentiel n'a pas ?t? endommag?.
> -S?lectionnez un r?f?rentiel puis cliquez sur <uicontrol>Editer</uicontrol>. S?lectionnez <uicontrol>Oui</uicontrol> pour activer le contr?le GPG,
> -puis entrez une URL pour le fichier de cl?s GPG du r?f?rentiel.</p></dd>
> +S?lectionnez un r?f?rentiel puis cliquez sur <uicontrol>Editer</uicontrol>. S?lectionnez <uicontrol>Oui</uicontrol> pour activer <uicontrol>Contr?le GPG</uicontrol>, puis entrez une URL pour le fichier de cl?s GPG du r?f?rentiel.</p></dd>
>   </dlentry><dlentry>
>   <dt>Rapports de d?bogage</dt>
>   <dd>Cette section affiche les rapports de d?bogage, y compris le nom et le chemin du fichier.
> @@ -57,12 +54,12 @@ telles que la version du noyau d'ex?cution, les modules charg?s, ainsi que les
>   du syst?me et de la maintenance.
>   La commande ex?cute ?galement des programmes externes pour collecter des informations
>   suppl?mentaires et stocke cette sortie dans l'archive r?sultante.</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/fr_FR/network.dita b/ui/pages/help/fr_FR/network.dita
> index 5c2e9dd..f27e01f 100644
> --- a/ui/pages/help/fr_FR/network.dita
> +++ b/ui/pages/help/fr_FR/network.dita
> @@ -31,8 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li rev="rev1">S?lectionnez <uicontrol>D?marrer</uicontrol> pour d?marrer la connexion au r?seau.</li>
>   <li>S?lectionnez <uicontrol>Arr?ter</uicontrol> pour mettre fin ? la connexion au r?seau.</li>
>   <li>S?lectionnez <uicontrol>Supprimer</uicontrol> pour supprimer les informations de connexion.</li>
> -</ul>Pour cr?er un r?seau, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
> -dans le coin sup?rieur droit de l'?cran.</p>
> +</ul>Pour cr?er un r?seau, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="fr-fr">
>   <title>Cr?er un r?seau</title>
> @@ -62,6 +61,6 @@ sur la destination et le r?seau local virtuel.</dd>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/fr_FR/storage.dita b/ui/pages/help/fr_FR/storage.dita
> index eebf2bb..fd0e7ca 100644
> --- a/ui/pages/help/fr_FR/storage.dita
> +++ b/ui/pages/help/fr_FR/storage.dita
> @@ -10,13 +10,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhstor" xml:lang="fr-fr">
>   <title>Stockage</title>
>   <shortdesc>La page <wintitle>Stockage</wintitle> r?pertorie les pools de stockage disponibles,
> -y compris les pools de stockage 'default' et 'ISO' pr?ts ? l'emploi.
> -Si vous souhaitez utiliser votre propre pool de stockage ISO, ajoutez-le dans le chemin du pool de stockage 'ISO'.</shortdesc>
> +y compris les pools de stockage 'default' et 'ISO' pr?ts ? l'emploi. Si vous souhaitez utiliser votre propre pool de stockage ISO, ajoutez-le dans le chemin du pool de stockage 'ISO'.</shortdesc>
>   <csbody>
>   <p>Pour chaque pool de stockage, les informations suivantes sont affich?es :<dl>
>   <dlentry>
>   <dt>Nom</dt>
> -<dd>Nom du pool de stockage et pourcentage d'utilisation.</dd>
> +<dd>Nom du pool de stockage.</dd>
> +</dlentry><dlentry>
> +<dt>% utilis?</dt>
> +<dd>Pourcentage du pool de stockage utilis?.</dd>
>   </dlentry><dlentry>
>   <dt>Etat</dt>
>   <dd>Etat du pool de stockage, actif (vert) ou inactif (rouge). </dd>
> @@ -36,23 +38,11 @@ Si vous souhaitez utiliser votre propre pool de stockage ISO, ajoutez-le dans le
>   <p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque pool de stockage :<ul>
>   <li>S?lectionnez <uicontrol>Activer</uicontrol> pour activer le pool de stockage pour utilisation.</li>
>   <li>S?lectionnez <uicontrol>D?sactiver</uicontrol> pour d?sactiver un pool de stockage actif.</li>
> +<li>S?lectionnez <uicontrol>Ajouter un volume</uicontrol> pour ajouter un volume suppl?mentaire ? un pool de stockage actif.</li>
>   <li>S?lectionnez <uicontrol>Annuler d?finition</uicontrol> pour retirer un pool de stockage inactif.</li>
>   </ul></p>
>   <p>Pour afficher les d?tails de volume de stockage pour un pool de stockage, cliquez sur la
> -fl?che situ?e ? droite de la ligne du pool de stockage.  D?tails inclus :<dl><dlentry>
> -<dt>Type</dt>
> -<dd>Type de volume, par exemple <uicontrol>file</uicontrol>.</dd>
> -</dlentry><dlentry>
> -<dt>Format</dt>
> -<dd>Format, variable selon le type.</dd>
> -</dlentry><dlentry>
> -<dt>Capacit?</dt>
> -<dd>Taille du volume de stockage.</dd>
> -</dlentry><dlentry>
> -<dt>Allocation</dt>
> -<dd>Quantit? d'espace d?j? allou?e dans le pool de stockage.</dd>
> -</dlentry></dl>Pour d?finir un pool de stockage, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
> -dans le coin sup?rieur droit de l'?cran.</p>
> +fl?che situ?e ? droite de la ligne du pool de stockage.  Pour d?finir un pool de stockage, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="fr-fr">
>   <title>D?finir un pool de stockage</title>
> @@ -81,13 +71,28 @@ et la <uicontrol>Cible</uicontrol> sur le serveur iSCSI. Vous avez la possibilit
>   <dt><uicontrol>Fibre Channel SCSI</uicontrol></dt>
>   <dd>Indique un pool bas?e sur une connexion Fibre Channel SCSI. S?lectionnez l'adaptateur SCSI ? utiliser.</dd>
>   </dlentry></dl></li>
> +<li>Indiquez un chemin de stockage pour le pool de stockage. Le chemin de stockage est l'emplacement sur le syst?me de fichiers local vers lequel le pool est mapp?.
> +Le chemin doit ?tre unique. Si le r?pertoire n'existe pas lorsque le pool est cr??, il est cr??.</li>
>   <li>Cliquez sur <uicontrol>Cr?er</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="fr-fr">
> +<title>Ajouter un volume</title>
> +<shortdesc>Ajoute un volume ? un pool de stockage.</shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>Extraire de l'URL distante</dt>
> +<dd>Indiquez l'emplacement ? partir duquel le volume est t?l?charg?. Exemple : <filepath>https://my-server/fedora22.img</filepath>.</dd>
> +</dlentry><dlentry>
> +<dt>T?l?charger un fichier</dt>
> +<dd>Indique un emplacement sur le syst?me local.</dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/fr_FR/templates.dita b/ui/pages/help/fr_FR/templates.dita
> index a517e33..abf08bc 100644
> --- a/ui/pages/help/fr_FR/templates.dita
> +++ b/ui/pages/help/fr_FR/templates.dita
> @@ -12,8 +12,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <shortdesc>La page <wintitle>Mod?les</wintitle> affiche les mod?les de machine virtuelle d?finis
>   pouvant ?tre utilis?s pour cr?er des h?tes KVM.</shortdesc>
>   <csbody>
> -<p>Pour chaque mod?le, les informations suivantes sont affich?es :<dl>
> -<dlentry>
> +<p>Pour chaque mod?le, les informations suivantes sont affich?es :</p>
> +<dl><dlentry>
>   <dt>SE</dt>
>   <dd>Nom du syst?me d'exploitation ou de la distribution.</dd>
>   </dlentry><dlentry>
> @@ -25,71 +25,61 @@ pouvant ?tre utilis?s pour cr?er des h?tes KVM.</shortdesc>
>   </dlentry><dlentry>
>   <dt>M?moire</dt>
>   <dd>Quantit? de m?moire vive ? allouer, en Mo.</dd>
> -</dlentry></dl></p>
> -<p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque mod?le :<ul>
> +</dlentry></dl>
> +<p>Les actions suivantes peuvent ?tre s?lectionn?es  pour chaque mod?le :</p>
> +<ul>
>   <li>S?lectionnez <uicontrol>Editer</uicontrol> pour ?diter le mod?le.</li>
> +<li>S?lectionnez <uicontrol>Cloner</uicontrol> pour copier un mod?le.</li>
>   <li>S?lectionnez <uicontrol>Supprimer</uicontrol> pour supprimer le mod?le.</li>
> -</ul>Pour ajouter un mod?le, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>
> -dans le coin sup?rieur droit de l'?cran.</p>
> +</ul>
> +<p>Pour ajouter un mod?le, cliquez sur l'ic?ne <uicontrol>plus (+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="fr-fr">
>   <title>Editer un mod?le</title>
> -<shortdesc>Editez un mod?le existant.</shortdesc>
> +<shortdesc>Modifie un mod?le existant.</shortdesc>
>   <csbody>
> -<p>Pour chaque mod?le, les informations suivantes sont affich?es : <dl>
> -<dlentry>
> -<dt>Nom</dt>
> -<dd>Nom du mod?le.</dd>
> +<p>Pour chaque mod?le, les informations suivantes sont affich?es : </p>
> +<dl><dlentry>
> +<dt>G?n?ral</dt>
> +<dd>Affiche le nom, la distribution de fournisseur, la version, la m?moire, le chemin d'acc?s au fichier ISO et les pr?f?rences graphiques.</dd>
>   </dlentry><dlentry>
> -<dt>Fournisseur</dt>
> -<dd>Nom de la soci?t? qui a cr?? le syst?me d'exploitation ou la distribution
> -pour lequel/laquelle le mod?le est configur?.</dd>
> +<dt>Stockage</dt>
> +<dd>Indique les informations de pool de stockage pour le mod?le.</dd>
>   </dlentry><dlentry>
> -<dt>Version</dt>
> -<dd>Version du syst?me d'exploitation ou de la distribution
> -pour lequel/laquelle le mod?le est configur?.</dd>
> -</dlentry><dlentry>
> -<dt>Nombre d'UC</dt>
> -<dd>Nombre de processeurs d?finis pour le mod?le.</dd>
> -</dlentry><dlentry>
> -<dt>M?moire</dt>
> -<dd>Quantit? de m?moire en Mo ? allouer ? la machine virtuelle.</dd>
> -</dlentry><dlentry>
> -<dt>Disque</dt>
> -<dd>Taille du disque en Go.</dd>
> -</dlentry><dlentry>
> -<dt>CD-ROM</dt>
> -<dd>chemin d'acc?s au fichier pour l'emplacement du fichier ISO utilis? pour l'installation de l'invit? KVM.</dd>
> -</dlentry><dlentry>
> -<dt>Pool de stockage</dt>
> -<dd>Pool de stockage sp?cifique ou pool de stockage par d?faut.</dd>
> -</dlentry><dlentry>
> -<dt>R?seau</dt>
> -<dd>Interfaces r?seau par d?faut disponibles pour l'invit? KVM. Vous pouvez
> +<dt>Interface</dt>
> +<dd>Affiche les interfaces r?seau par d?faut disponibles pour l'invit? KVM.
> +Vous pouvez
>   s?lectionner plusieurs r?seaux.</dd>
> -</dlentry></dl> Les zones qui ne sont pas d?sactiv?es peuvent ?tre ?dit?es. Apr?s que vous avez ?dit? une zone, cliquez sur <uicontrol>Sauvegarder</uicontrol>. </p>
> +</dlentry><dlentry>
> +<dt>Processeur</dt>
> +<dd>Dans la zone <uicontrol>Nombre d'UC</uicontrol>, indiquez le nombre de processus d?finis pour le mod?le.</dd>
> +<dd>Choisissez de d?finir manuellement la topologie d'UC pour chaque invit?.</dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>Ajouter un mod?le</title>
> -<shortdesc>Ajoutez un mod?le ? partir du support source.
> -Vous pouvez ajouter votre propre image ISO au pool de stockage 'ISO' pour la reconnaissance suivante.</shortdesc>
> +<shortdesc>Ajoute un mod?le ? partir du support source. Vous pouvez ajouter votre propre image ISO au pool de stockage 'ISO' pour la reconnaissance suivante.</shortdesc>
>   <csbody>
> -<p>S?lectionnez l'emplacement du support source ? partir des options suivantes :<dl>
> -<dlentry>
> +<p>S?lectionnez l'emplacement du support source ? partir des options suivantes :</p>
> +<dl><dlentry>
>   <dt>Image ISO locale</dt>
>   <dd>S?lectionnez cette option pour rechercher dans les pools de stockage l'image d'installation ISO disponible sur le syst?me.</dd>
>   </dlentry><dlentry>
> +<dt>Fichier image local</dt>
> +<dd>Choisissez de s?lectionner un chemin d'acc?s au fichier image local.</dd>
> +</dlentry><dlentry>
>   <dt>Image ISO distante</dt>
>   <dd>S?lectionnez cette option pour indiquer un emplacement distant pour une image d'installation ISO.</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>Ajouter un mod?le - Image ISO locale</title>
> -<shortdesc>Ajoutez un mod?le ? partir d'une image ISO locale.</shortdesc>
> +<title>Ajouter un mod?le - image ISO</title>
> +<shortdesc>Ajoute un mod?le ? partir d'une image ISO.</shortdesc>
>   <csbody>
> -<p>Les images ISO disponibles sur le syst?me sont affich?es.<dl><dlentry>
> +<p>Les images ISO disponibles sur le syst?me s'affichent ? distance.</p>
> +<dl><dlentry>
>   <dt>SE</dt>
>   <dd>Nom du syst?me d'exploitation ou de la distribution.</dd>
>   </dlentry><dlentry>
> @@ -98,8 +88,9 @@ Vous pouvez ajouter votre propre image ISO au pool de stockage 'ISO' pour la rec
>   </dlentry><dlentry>
>   <dt>Taille</dt>
>   <dd>Taille de l'image ISO.</dd>
> -</dlentry></dl></p>
> -<p>Pour cr?er un mod?le ? partir d'une image ISO, choisissez parmi les options suivantes :<ul>
> +</dlentry></dl>
> +<p>Pour cr?er un mod?le ? partir d'une image ISO, choisissez parmi les options suivantes :</p>
> +<ul>
>   <li>S?lectionnez une image ISO ? partir de laquelle cr?er un mod?le, puis cliquez sur <uicontrol>Cr?er des mod?les ? partir de l'ISO s?lectionn? </uicontrol>.</li>
>   <li>S?lectionnez <uicontrol>Tout</uicontrol> pour cr?er un mod?le ? partir de chaque
>   image ISO r?pertori?e, puis cliquez sur <uicontrol>Cr?er des mod?les ? partir de l'ISO s?lectionn?</uicontrol>.</li>
> @@ -109,12 +100,12 @@ d'analyse, vous pouvez faire un choix parmi les options suivantes :<ul>
>   sp?cifier un chemin d'acc?s ? l'image ISO.</li>
>   <li>Cliquez sur <uicontrol>Rechercher d'autres images ISO</uicontrol> pour rechercher des images ISO suppl?mentaires.</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/it_IT/guests.dita b/ui/pages/help/it_IT/guests.dita
> index e05db7e..26a5fbd 100644
> --- a/ui/pages/help/it_IT/guests.dita
> +++ b/ui/pages/help/it_IT/guests.dita
> @@ -9,22 +9,22 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="it-it">
>   <title>Guest</title>
> -<shortdesc>La pagina <wintitle>Guest</wintitle> elenca le macchine virtuali
> -KVM definite.</shortdesc>
> +<shortdesc>La pagina <wintitle>Guest</wintitle> elenca le macchine guest
> +definite per il server.</shortdesc>
>   <csbody>
>   <p>Per ciascuna macchina guest vengono visualizzate le seguenti informazioni:<dl><dlentry>
>   <dt>Nome</dt>
> -<dd>Il nome della macchina virtuale.</dd>
> +<dd>Il nome della macchina guest.</dd>
>   </dlentry><dlentry>
>   <dt>CPU</dt>
> -<dd>La percentuale di utilizzo del processore nella macchina virtuale.</dd>
> -</dlentry><dlentry>
> -<dt>I/O di rete</dt>
> -<dd>La velocit? di trasmissione dell'input/output di rete in KB al  secondo.</dd>
> +<dd>La percentuale di utilizzo del processore nella macchina guest.</dd>
>   </dlentry><dlentry>
>   <dt>I/O disco</dt>
>   <dd>La velocit? di trasmissione dell'input/output disco in KB al  secondo.</dd>
>   </dlentry><dlentry>
> +<dt>I/O di rete</dt>
> +<dd>La velocit? di trasmissione dell'input/output di rete in KB al  secondo.</dd>
> +</dlentry><dlentry>
>   <dt>Riquadro animato</dt>
>   <dd>Lo stato della console del sistema operativo della macchina guest o un'icona che rappresenta la distribuzione <tm tmtype="tm" trademark="Linux">Linux</tm> se la macchina guest non ? attiva.</dd>
>   </dlentry></dl></p>
> @@ -38,86 +38,79 @@ KVM definite.</shortdesc>
>   </dlentry></dl> </p>
>   <p>Per ciascuna macchina guest ? possibile selezionare le azioni indicate di seguito:<ul>
>   <li>Selezionare <uicontrol>Connetti</uicontrol> per effettuare la connessione alla console remota per il sistema operativo della macchina guest.</li>
> -<li>Selezionare <uicontrol>Gestisci supporti</uicontrol> per modificare il percorso al supporto di installazione.</li>
> -<li>Selezionare <uicontrol>Reimposta</uicontrol> per reimpostare la macchina guest.</li>
> +<li>Selezionare <uicontrol>Clona</uicontrol> per copiare una definizione di macchina guest esistente e creare una macchina guest.</li>
> +<li>Selezionare <uicontrol>Reimposta</uicontrol> per reimpostare la macchina guest. ? possibile reimpostare solo una macchina guest che ? stata avviata. </li>
>   <li>Selezionare <uicontrol>Modifica</uicontrol> per modificare le propriet? di una macchina guest esistente. ? possibile modificare le macchine guest solo se sono arrestate.</li>
> +<li>Selezionare <uicontrol>Avvia</uicontrol> per avviare una macchina guest. </li>
> +<li>Selezionare <uicontrol>Arresta</uicontrol> per arrestare una macchina guest con il periodo di grazia. </li>
> +<li>Selezionare <uicontrol>Spegni</uicontrol> per forzare un arresto immediato della macchina guest. </li>
>   <li>Selezionare <uicontrol>Elimina</uicontrol> per eliminare la macchina guest.</li>
> -</ul>Per creare una macchina guest, o macchina virtuale, fare clic sull'icona <uicontrol>pi?
> -(+)</uicontrol> nella parte in alto a destra della pagina.</p>
> +</ul>Per creare una macchina guest fare clic sull'icona <uicontrol>pi?
> +(+)</uicontrol> sulla pagina. </p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="it-it">
> -<title>Creare una macchina virtuale</title>
> -<shortdesc>Creare una macchina virtuale utilizzando un modello esistente.</shortdesc>
> +<title>Creare una macchina guest</title>
> +<shortdesc>Creare una macchina guest utilizzando un modello esistente.</shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>Immettere il nome da utilizzare per identificare la macchina virtuale.</li>
> -<li rev="rev1">Selezionare un modello. <ul>
> +<li>Immettere il nome da utilizzare per identificare la macchina guest.</li>
> +<li>Selezionare un modello. <ul>
>   <li>Se il modello esiste, selezionarlo dai modelli visualizzati.</li>
>   <li>Se non esiste alcun modello, fare clic su <uicontrol>Crea un modello</uicontrol> per crearne uno.</li>
> -</ul></li>
> +</ul>? possibile visualizzare le informazioni su un modello passando con il cursore del mouse su esso. </li>
>   <li>Fare clic su <uicontrol>Crea</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="it-it">
>   <title>Modifica macchina guest</title>
> -<shortdesc>Modificare le propriet? di una macchina virtuale esistente. Alcune propriet? possono essere
> +<shortdesc>Modificare le propriet? di una macchina guest esistente. Alcune propriet? possono essere
>   modificate solo mentre la macchina guest ? arrestata. Altre diventeranno effettive al prossimo avvio.</shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
>   <csbody>
> -<p>Per ciascuna macchina guest vengono visualizzate le seguenti informazioni sulla scheda <wintitle>Generale</wintitle>:<dl>
> -<dlentry>
> -<dt>Nome</dt>
> -<dd>Il nome della macchina virtuale. (Pu? essere modificato solo mentre la macchina guest ? arrestata)</dd>
> -</dlentry><dlentry>
> -<dt>CPU</dt>
> -<dd>Il numero di processori. (Se la macchina guest ? in esecuzione, la nuova quantit? diventer? effettiva
> -al prossimo avvio)</dd>
> +<dl><dlentry>
> +<dt>Generale</dt>
> +<dd>Visualizza informazioni sulla macchina guest, incluso il nome, le CPU, la memoria e l'icona per utilizzare la macchina guest. ? possibile modificare il nome di una macchina guest arrestata. La modifica delle CPU e della memoria ha effetto al successivo avvio. </dd>
>   </dlentry><dlentry>
>   <dt>Memoria</dt>
> -<dd>La quantit? di memoria in MB. (Se la macchina guest ? in esecuzione, la nuova quantit? diventer? effettiva
> -al prossimo avvio)</dd>
> -</dlentry><dlentry>
> -<dt>Icona</dt>
> -<dd>L'immagine grafica che rappresenta la distribuzione Linux da visualizzare al posto dello stato corrente (Riquadro animato) quando la macchina guest non ? attiva.</dd>
> -</dlentry></dl></p>
> -<p>Sulla scheda <wintitle>Memoria</wintitle> vengono visualizzate le seguenti informazioni.</p>
> +<dd>Visualizza il dispositivo e il percorso per la memoria della macchina guest selezionata.
> +? possibile aggiungere, modificare e rimuovere i dispositivi di memoria per la macchina guest. </dd>
> +</dlentry></dl>
>   <dl><dlentry>
> -<dt>Memoria</dt>
> -<dd>Visualizza l'ubicazione del file ISO utilizzato per  l'installazione.</dd>
> +<dt>Interfaccia</dt>
> +<dd>Visualizza le informazioni di rete per la macchina guest, incluso il nome, il tipo e l'indirizzo MAC. ? possibile aggiungere, modificare e rimuovere le interfacce per la macchina guest. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Autorizzazione</dt>
> +<dd>Visualizza gli utenti e i gruppi autorizzati per la macchina guest. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Dispositivo PCI host</dt>
> +<dd>Visualizza un elenco di tutti i dispositivi PCI disponibili sull'host. </dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Istantanea</dt>
> +<dd>Visualizza le istantanee della macchina guest. ? possibile creare, modificare o eliminare un'istantanea. Selezionando un'istantanea e scegliendo l'opzione Inverti, la macchina guest viene ripristinata a un punto nel passato, determinato dai dati dell'istantanea, ed elimina le modifiche effettuate dopo tale punto nel tempo. </dd>
>   </dlentry></dl>
>   <p> I campi non disabilitati possono essere modificati. Dopo aver modificato un campo, fare clic su <uicontrol>Salva</uicontrol>. </p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="it-it">
> -<title>Aggiungere, sostituire o scollegare un dispositivo di memoria.</title>
> -<shortdesc rev="rev1">? possibile aggiungere, sostituire o scollegare un dispositivo di memoria per la macchina virtuale. L'unico dispositivo supportato ? CDROM. Per modificare i dispositivi di memoria, attenersi alla seguente procedura:</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="it-it">
> +<title>Clonazione di una macchina guest</title>
> +<shortdesc>La clonazione di una macchina guest consente all'utente di creare una copia di una macchina guest. </shortdesc>
>   <csbody>
> +<p>Per clonare una macchina guest:</p>
>   <ol>
> -<li>Nella finestra <wintitle>Modifica macchina guest</wintitle>, selezionare <wintitle>Memoria</wintitle>.</li>
> -<li>Per sostituire un dispositivo di memoria, fare clic sulla prima icona con la <uicontrol>barra (/) arancione</uicontrol>. Immettere il percorso del file ISO e fare clic su <uicontrol>Sostituisci</uicontrol>.</li>
> -<li>Per scollegare un dispositivo di memoria, fare clic sulla seconda  icona con il <uicontrol>trattino (-) rosso</uicontrol>. Confermare l'eliminazione facendo clic su <uicontrol>OK</uicontrol>.</li>
> -<li>Per aggiungere un dispositivo di memoria, fare clic sulla terza icona con il <uicontrol>segno pi? (+)</uicontrol> verde. Immettere un nome dispositivo e percorso file ISO e fare clic su <uicontrol>Collega</uicontrol>.</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="it-it">
> -<title>Sostituisci un CDROM della macchina virtuale</title>
> -<shortdesc rev="rev1">? possibile sostituire il contenuto del CDROM per una macchina virtuale dopo il completamento dell'installazione.</shortdesc>
> -<csbody>
> -<ol>
> -<li>Assicurarsi che la macchina virtuale sia avviata.</li>
> -<li>Dal menu Azioni, selezionare <uicontrol>Gestisci supporti</uicontrol>.</li>
> -<li>Per modificare il contenuto correntemente caricato sul CDROM, fare clic sull'icona della <uicontrol>barra (/) arancione</uicontrol> accanto al campo hdc.</li>
> -<li>Sulla pagina <wintitle>Sostituisci un CDROM della macchina virtuale</wintitle>, immettere il percorso del file ISO. Gli altri due campi sono di sola lettura.</li>
> -<li>Fare clic su <uicontrol>Sostituisci</uicontrol>.</li>
> +<li>Selezionare <uicontrol>Clona</uicontrol> dal menu Azione di una macchina guest. </li>
> +<li>Accettare l'avvertenza. <note>Se una macchina guest di destinazione utilizza volumi SCSI o iSCSI o se un pool di destinazione non dispone di spazio sufficiente, il clone verr? creato su un pool di memoria predefinito. </note></li>
>   </ol>
> +<p>Una macchina guest viene visualizzata nell'elenco con l'etichetta <uicontrol>Clonazione...</uicontrol>. Quando il processo ? completo, la macchina guest clonata ? disponibile per l'uso. </p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/it_IT/host.dita b/ui/pages/help/it_IT/host.dita
> index 63d3367..c2783bf 100644
> --- a/ui/pages/help/it_IT/host.dita
> +++ b/ui/pages/help/it_IT/host.dita
> @@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li>Selezionare <uicontrol>Riavvia</uicontrol> per riavviare il sistema host.</li>
>   <li>Selezionare <uicontrol>Connetti</uicontrol> per aprire una connessione VNC al sistema host, se non ? gi? connesso.</li>
>   </ul></p>
> -<p>Fare clic sulle seguenti sezioni per visualizzare le informazioni sull'host:<dl>
> -<dlentry>
> +<p>Fare clic sulle seguenti sezioni per visualizzare le informazioni sull'host:</p>
> +<dl><dlentry>
>   <dt>Informazioni di base</dt>
> -<dd>Questa sezione visualizza il nome codice, la versione e la distribuzione del sistema operativo, come pure il tipo di processore e la quantit? di memoria in GB.</dd>
> +<dd>Questa sezione visualizza il nome codice, la versione e la distribuzione del sistema operativo, come pure il tipo di processore, il numero di CPU in linea e la quantit? di memoria in GB.</dd>
>   </dlentry><dlentry>
>   <dt>Statistiche di sistema</dt>
> -<dd>Questa sezione visualizza i grafici che mostrano le statistiche per la CPU, la memoria, l'I/O disco e di rete per l'host. Selezionare <uicontrol>Raccolta dati all'uscita dalla pagina</uicontrol> per continuare la raccolta dei dati quando la scheda host non ? pi? visibile.</dd>
> +<dd>Questa sezione visualizza i grafici che mostrano le statistiche per la CPU, la memoria, l'I/O disco e di rete per l'host. </dd>
>   </dlentry><dlentry>
>   <dt>Aggiornamenti del software</dt>
>   <dd>Questa sezione visualizza le informazioni per tutti i pacchetti per cui sono disponibili gli aggiornamenti, incluso il nome, la versione, l'architettura e il repository del pacchetto. ? possibile aggiornare tutti i pacchetti elencati, selezionando <uicontrol>Aggiorna tutto</uicontrol>. Non ? possibile selezionare singoli pacchetti per gli aggiornamenti.</dd>
> @@ -32,7 +32,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   consente all'host di accedervi. Se il sistema ? Red Hat Enterprise
>   Linux o Fedora, ? possibile aggiungere i repository <filepath>yum</filepath>.
>   Se il sistema ? Ubuntu o Debian, aggiungere i repository <filepath>deb</filepath>.<p>Se si stanno utilizzando i repository yum,  ? possibile aggiungere un controllo GPG per verificare che un pacchetto da questo repository non sia stato corrotto.
> -Selezionare un repository, quindi <uicontrol>Modifica</uicontrol>. Selezionare <uicontrol>S?</uicontrol> per abilitare il controllo GPG, quindi immettere un URL al file di chiavi GPG per il
> +Selezionare un repository, quindi <uicontrol>Modifica</uicontrol>. Selezionare <uicontrol>S?</uicontrol> per abilitare il <uicontrol>controllo GPG</uicontrol>, quindi immettere un URL al file di chiavi GPG per il
>   repository.</p></dd>
>   </dlentry><dlentry>
>   <dt>Report di debug</dt>
> @@ -40,12 +40,12 @@ repository.</p></dd>
>   Le opzioni disponibili consentono di generare un nuovo report oppure ridenominare, rimuovere o scaricare un report esistente.<p>Il report di debug viene generato utilizzando il comando <cmdname>sosreport</cmdname>. ? disponibile per le distribuzioni Red
>   Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora e Ubuntu. Il comando genera un file .tar che contiene informazioni di diagnostica e configurazione, come la versione del kernel in esecuzione, i moduli caricati e i file di configurazione del servizio e del sistema.
>   Il comando esegue anche programmi esterni per raccogliere ulteriori informazioni e memorizza l'output nell'archivio risultante.</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/it_IT/network.dita b/ui/pages/help/it_IT/network.dita
> index a396d58..2cdec19 100644
> --- a/ui/pages/help/it_IT/network.dita
> +++ b/ui/pages/help/it_IT/network.dita
> @@ -33,7 +33,7 @@ address translation).</dd>
>   <li>Selezionare <uicontrol>Arresta</uicontrol> per terminare la connessione di rete.</li>
>   <li>Selezionare <uicontrol>Elimina</uicontrol> per eliminare le informazioni di connessione.</li>
>   </ul>Per creare una rete fare clic sull'icona <uicontrol>pi?
> -(+)</uicontrol> nella parte in alto a destra del pannello.</p>
> +(+)</uicontrol>. </p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="it-it">
>   <title>Crea una rete</title>
> @@ -58,6 +58,6 @@ address translation).</dd>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/it_IT/storage.dita b/ui/pages/help/it_IT/storage.dita
> index 5a9bc25..becf007 100644
> --- a/ui/pages/help/it_IT/storage.dita
> +++ b/ui/pages/help/it_IT/storage.dita
> @@ -10,13 +10,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhstor" xml:lang="it-it">
>   <title>Memoria</title>
>   <shortdesc>La pagina <wintitle>Memoria</wintitle> elenca i pool di memoria
> -disponibili, compresi i pool di memoria pronti per l'uso 'default' e 'ISO'.
> -Se si desidera utilizzare un proprio ISO, aggiungerlo al percorso del pool di memoria 'ISO'.</shortdesc>
> +disponibili, compresi i pool di memoria pronti per l'uso 'default' e 'ISO'. Se si desidera utilizzare un proprio ISO, aggiungerlo al percorso del pool di memoria 'ISO'.</shortdesc>
>   <csbody>
>   <p>Per ciascun pool di memoria vengono visualizzate le seguenti informazioni:<dl>
>   <dlentry>
>   <dt>Nome</dt>
> -<dd>Il nome del pool di memoria e la percentuale utilizzata.</dd>
> +<dd>Il nome del pool di memoria.</dd>
> +</dlentry><dlentry>
> +<dt>% utilizzata</dt>
> +<dd>La percentuale del pool di memoria utilizzata. </dd>
>   </dlentry><dlentry>
>   <dt>Stato</dt>
>   <dd>Lo stato del pool di memoria, attivo (verde) o non attivo (rosso). </dd>
> @@ -36,22 +38,11 @@ Se si desidera utilizzare un proprio ISO, aggiungerlo al percorso del pool di me
>   <p>Per ciascun pool di memoria ? possibile selezionare le azioni indicate di seguito:<ul>
>   <li>Selezionare <uicontrol>Attiva</uicontrol> per attivare il pool di memoria in modo da poterlo utilizzare.</li>
>   <li>Selezionare <uicontrol>Disattiva</uicontrol> per disattivare un pool di memoria attivo.</li>
> +<li>Selezionare <uicontrol>Aggiungi volume</uicontrol> per aggiungere altri volumi a un pool di memoria attivo.</li>
>   <li>Selezionare <uicontrol>Rimuovi definizione</uicontrol> per rimuovere un pool di memoria non attivo.</li>
>   </ul></p>
> -<p>Per visualizzare i dettagli del volume di memoria per un pool di memoria, fare clic sulla freccia sul lato destro della riga del pool di memoria.  I dettagli includono:<dl><dlentry>
> -<dt>Tipo</dt>
> -<dd>Il tipo di volume, ad esempio, <uicontrol>file</uicontrol>.</dd>
> -</dlentry><dlentry>
> -<dt>Formato</dt>
> -<dd>Il formato, che varia in base al tipo.</dd>
> -</dlentry><dlentry>
> -<dt>Capacit?</dt>
> -<dd>La dimensione del volume di memoria.</dd>
> -</dlentry><dlentry>
> -<dt>Assegnazione</dt>
> -<dd>La quantit? di spazio gi? assegnato nel pool di memoria.</dd>
> -</dlentry></dl>Per definire un pool di memoria fare clic sull'icona <uicontrol>pi?
> -(+)</uicontrol> nella parte in alto a destra del pannello.</p>
> +<p>Per visualizzare i dettagli del volume di memoria per un pool di memoria, fare clic sulla freccia sul lato destro della riga del pool di memoria.  Per definire un pool di memoria fare clic sull'icona <uicontrol>pi?
> +(+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="it-it">
>   <title>Definire un pool di memoria</title>
> @@ -79,13 +70,29 @@ Quando si seleziona <uicontrol>iSCSI</uicontrol>, immettere l'indirizzo IP del <
>   <dd>Specifica un pool basato su un canale a fibre ottiche SCSI. Selezionare quale adattatore
>   SCSI utilizzare.</dd>
>   </dlentry></dl></li>
> +<li>Specificare un percorso di memoria per il pool di memoria. Il percorso di memoria ? l'ubicazione nel file system locale con cui il pool ? associato.
> +Il percorso deve essere univoco. Se la directory non esiste al momento della creazione del
> +pool, verr? creata per l'utente. </li>
>   <li>Fare clic su <uicontrol>Crea</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="it-it">
> +<title>Aggiungi volume</title>
> +<shortdesc>Aggiunge volumi a un pool di memoria.</shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>Richiama da URL remoto</dt>
> +<dd>Specifica un'ubicazione da cui scaricare il volume. Ad esempio: <filepath>https://my-server/fedora22.img</filepath>.</dd>
> +</dlentry><dlentry>
> +<dt>Carica un file</dt>
> +<dd>Specifica un'ubicazione sul sistema locale. </dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/it_IT/templates.dita b/ui/pages/help/it_IT/templates.dita
> index 9b84b16..5b992c1 100644
> --- a/ui/pages/help/it_IT/templates.dita
> +++ b/ui/pages/help/it_IT/templates.dita
> @@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <title>Modelli</title>
>   <shortdesc>La pagina <wintitle>Modelli</wintitle> visualizza i modelli di macchina virtuale definiti che ? possibile utilizzare per creare macchine guest KVM.</shortdesc>
>   <csbody>
> -<p>Per ciascun modello vengono visualizzate le seguenti informazioni:<dl>
> -<dlentry>
> +<p>Per ciascun modello vengono visualizzate le seguenti informazioni:</p>
> +<dl><dlentry>
>   <dt>SO</dt>
>   <dd>Il nome del sistema operativo o della distribuzione.</dd>
>   </dlentry><dlentry>
> @@ -24,69 +24,61 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>Memoria</dt>
>   <dd>La quantit? di memoria ad accesso casuale da assegnare, in MB.</dd>
> -</dlentry></dl></p>
> -<p>Per ciascun modello ? possibile selezionare le azioni indicate di seguito:<ul>
> +</dlentry></dl>
> +<p>Per ciascun modello ? possibile selezionare le azioni indicate di seguito:</p>
> +<ul>
>   <li>Selezionare <uicontrol>Modifica</uicontrol> per modificare il modello.</li>
> +<li>Selezionare <uicontrol>Clona</uicontrol> per copiare un modello. </li>
>   <li>Selezionare <uicontrol>Elimina</uicontrol> per eliminare il modello.</li>
> -</ul>Per aggiungere un modello fare clic sull'icona <uicontrol>pi?
> -(+)</uicontrol> nella parte in alto a destra del pannello.</p>
> +</ul>
> +<p>Per aggiungere un modello fare clic sull'icona <uicontrol>pi?
> +(+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="it-it">
>   <title>Modifica modello</title>
>   <shortdesc>Modificare un modello esistente.</shortdesc>
>   <csbody>
> -<p>Per ciascun modello vengono visualizzate le seguenti informazioni: <dl>
> -<dlentry>
> -<dt>Nome</dt>
> -<dd>Il nome del modello.</dd>
> -</dlentry><dlentry>
> -<dt>Fornitore</dt>
> -<dd>Il nome della societ? che ha creato il sistema operativo o la distribuzione per il cui utilizzo ? configurato il modello.</dd>
> -</dlentry><dlentry>
> -<dt>Versione</dt>
> -<dd>La versione del sistema operativo o della distribuzione per il cui utilizzo ? configurato il modello.</dd>
> -</dlentry><dlentry>
> -<dt>Numero CPU</dt>
> -<dd>Il numero di processori definiti per il modello.</dd>
> +<p>Per ciascun modello vengono visualizzate le seguenti informazioni: </p>
> +<dl><dlentry>
> +<dt>Generale</dt>
> +<dd>Visualizza il nome, la distribuzione fornitore, la versione, la memoria, il percorso file al file ISO e le preferenze grafiche. </dd>
>   </dlentry><dlentry>
>   <dt>Memoria</dt>
> -<dd>La quantit? di memoria in MB da assegnare alla macchina virtuale.</dd>
> -</dlentry><dlentry>
> -<dt>Disco</dt>
> -<dd>La dimensione del disco in GB.</dd>
> +<dd>Specificare le informazioni pool di memoria per il modello. </dd>
>   </dlentry><dlentry>
> -<dt>CDROM</dt>
> -<dd>Il percorso file all'ubicazione del file ISO utilizzato per installare la macchina guest
> -KVM.</dd>
> +<dt>Interfaccia</dt>
> +<dd>Visualizza le interfacce di rete predefinite disponibili per la macchina guest KVM.
> +? possibile selezionare pi? reti.</dd>
>   </dlentry><dlentry>
> -<dt>Pool di memoria</dt>
> -<dd>Un pool di memoria specifico o quello predefinito.</dd>
> -</dlentry><dlentry>
> -<dt>Rete</dt>
> -<dd>Le interfacce di rete predefinite disponibili per la macchina guest KVM. ? possibile selezionare pi? reti.</dd>
> -</dlentry></dl> I campi non disabilitati possono essere modificati. Dopo aver modificato un campo, fare clic su <uicontrol>Salva</uicontrol>. </p>
> +<dt>Processore</dt>
> +<dd>Il campo <uicontrol>Numero CPU</uicontrol>, specifica il numero di processori definiti per il modello. </dd>
> +<dd>Selezionare l'impostazione manuale della topologia della CPU per ogni macchina  guest.</dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>Aggiungi modello</title>
> -<shortdesc>Aggiungere un modello dal supporto di origine.
> -? possibile aggiungere una propria immagine ISO al pool di memoria 'ISO' per la seguente individuazione.</shortdesc>
> +<shortdesc>Aggiungere un modello dal supporto di origine. ? possibile aggiungere una propria immagine ISO al pool di memoria 'ISO' per la seguente individuazione.</shortdesc>
>   <csbody>
> -<p>Selezionare l'ubicazione del supporto di origine dalle seguenti opzioni:<dl>
> -<dlentry>
> +<p>Selezionare l'ubicazione del supporto di origine dalle seguenti opzioni:</p>
> +<dl><dlentry>
>   <dt>Immagine ISO locale</dt>
>   <dd>Selezionare questa opzione per eseguire la scansione dei pool di memoria alla ricerca di immagini ISO di installazione disponibili sul sistema.</dd>
>   </dlentry><dlentry>
> +<dt>File immagine locale</dt>
> +<dd>Selezionare per specificare un percorso al file immagine locale. </dd>
> +</dlentry><dlentry>
>   <dt>Immagine ISO remota</dt>
>   <dd>Selezionare questa opzione per specificare un'ubicazione remota per un'immagine ISO di installazione.</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>Aggiungi modello - Immagine ISO locale</title>
> -<shortdesc>Aggiungere un modello da un'immagine ISO locale.</shortdesc>
> +<title>Aggiungi modello - Immagine ISO</title>
> +<shortdesc>Aggiungere un modello da un'immagine ISO.</shortdesc>
>   <csbody>
> -<p>Vengono visualizzate le immagini ISO disponibili sul sistema.<dl><dlentry>
> +<p>Vengono visualizzate in remoto le immagini ISO disponibili sul sistema.</p>
> +<dl><dlentry>
>   <dt>SO</dt>
>   <dd>Il nome del sistema operativo o della distribuzione.</dd>
>   </dlentry><dlentry>
> @@ -95,8 +87,9 @@ KVM.</dd>
>   </dlentry><dlentry>
>   <dt>Dimensione</dt>
>   <dd>La dimensione dell'immagine ISO.</dd>
> -</dlentry></dl></p>
> -<p>Per creare un modello da un'immagine ISO scegliere tra le seguenti opzioni:<ul>
> +</dlentry></dl>
> +<p>Per creare un modello da un'immagine ISO scegliere tra le seguenti opzioni:</p>
> +<ul>
>   <li>Selezionare un'immagine ISO da cui creare un modello, quindi fare clic su <uicontrol>Crea modelli da ISO selezionato</uicontrol>.</li>
>   <li>Selezionare <uicontrol>Tutti</uicontrol> per creare un modello da ciascuna immagine ISO elencata, quindi fare clic su <uicontrol>Crea modelli da ISO selezionato</uicontrol>.</li>
>   <li>Se nei risultati della scansione non viene visualizzata l'immagine ISO che si desidera utilizzare, ? possibile selezionare dalle seguenti opzioni:<ul>
> @@ -104,12 +97,12 @@ KVM.</dd>
>   <li>Fare clic su <uicontrol>Ricerca pi? ISO</uicontrol> per ricercare pi? immagini
>   ISO.</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ko_KR/guests.dita b/ui/pages/help/ko_KR/guests.dita
> index 2d9f32b..b0df5b9 100644
> --- a/ui/pages/help/ko_KR/guests.dita
> +++ b/ui/pages/help/ko_KR/guests.dita
> @@ -9,21 +9,22 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="ko-kr">
>   <title>???</title>
> -<shortdesc><wintitle>???</wintitle> ????? ??? KVM ?? ??? ?????.</shortdesc>
> +<shortdesc><wintitle>???</wintitle> ????? ??? ???
> +???? ?????.</shortdesc>
>   <csbody>
>   <p>? ???? ?? ?? ??? ?????.<dl><dlentry>
>   <dt>??</dt>
> -<dd>?? ??? ?????.</dd>
> +<dd>???? ?????.</dd>
>   </dlentry><dlentry>
>   <dt>CPU</dt>
> -<dd>?? ??? ???? ??????.</dd>
> -</dlentry><dlentry>
> -<dt>???? I/O</dt>
> -<dd>?? ???? ?/??(I/O) ?? ??(KB)???.</dd>
> +<dd>???? ???? ??????.</dd>
>   </dlentry><dlentry>
>   <dt>??? I/O</dt>
>   <dd>?? ??? ?/??(I/O) ?? ??(KB)???.</dd>
>   </dlentry><dlentry>
> +<dt>???? I/O</dt>
> +<dd>?? ???? ?/??(I/O) ?? ??(KB)???.</dd>
> +</dlentry><dlentry>
>   <dt>?????</dt>
>   <dd>??? ?? ??? ?????, ???? ??? ?? ?? <tm tmtype="tm" trademark="Linux">Linux</tm> ??? ???? ??????.</dd>
>   </dlentry></dl></p>
> @@ -37,83 +38,93 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry></dl> </p>
>   <p>? ????? ?? ??? ??? ? ????.<ul>
>   <li>??? ?? ??? ?? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
> -<li>??? ?? ??? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
> -<li>???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
> +<li>???? ????? <uicontrol>??</uicontrol>? ???? ?? ??? ???
> +?????.</li>
> +<li>???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????. ??? ????
> +?? ??? ? ????.</li>
>   <li>?? ???? ??? ????? <uicontrol>??</uicontrol>? ?????. ???? ?? ??? ?? ??? ? ????.</li>
> +<li>???? ????? <uicontrol>??</uicontrol>? ?????.</li>
> +<li>???? ????? <uicontrol>??? ??</uicontrol>? ?????.</li>
> +<li>???? ?? ??? ?? ????? <uicontrol>?? ??</uicontrol>?
> +?????.</li>
>   <li>???? ????? <uicontrol>??</uicontrol>? ?????.</li>
> -</ul>??? ?? ?? ??? ????? ??? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
> +</ul>???? ????? ???? ?? <uicontrol>???(+)</uicontrol> ????
> +?????.</p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="ko-kr">
> -<title>?? ?? ??</title>
> -<shortdesc>?? ????? ???? ?? ??? ?????.</shortdesc>
> +<title>??? ??</title>
> +<shortdesc>?? ????? ???? ???? ?????.</shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>?? ??? ???? ? ??? ??? ??????.</li>
> -<li rev="rev1">????? ??????. <ul>
> +<li>???? ???? ? ??? ??? ??????.</li>
> +<li>????? ??????. <ul>
>   <li>????? ???? ??, ??? ???? ??? ??????.</li>
>   <li>????? ?? ??, <uicontrol>???? ??</uicontrol>? ???? ????? ??????.</li>
> -</ul></li>
> +</ul>???? ?? ??? ???? ??? ? ? ????.</li>
>   <li><uicontrol>??</uicontrol>? ??????.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="ko-kr">
>   <title>??? ??</title>
> -<shortdesc>?? ?? ??? ??? ?????. ?? ??? ???? ??? ???? ??? ? ????.
> +<shortdesc>?? ???? ??? ?????. ?? ??? ???? ??? ???? ??? ? ????.
>   ?? ??? ?? ???? ?????. </shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
>   <csbody>
> -<p>? ???? ?? ?? ??? <wintitle>??</wintitle> ?? ?????.<dl>
> -<dlentry>
> -<dt>??</dt>
> -<dd>?? ??? ?????(???? ??? ???? ??? ? ??).</dd>
> -</dlentry><dlentry>
> -<dt>CPU</dt>
> -<dd>???? ????(???? ?? ?? ?? ? ??? ?? ???? ???).</dd>
> -</dlentry><dlentry>
> -<dt>???</dt>
> -<dd>??? ??(MB)???(???? ?? ?? ?? ? ??? ?? ???? ???).</dd>
> -</dlentry><dlentry>
> -<dt>???</dt>
> -<dd>???? ??? ?? ? ?? ??(?????) ??? ??? Linux ??? ???? ??? ??????.</dd>
> -</dlentry></dl></p>
> -<p>?? ??? <wintitle>????</wintitle> ?? ?????.</p>
>   <dl><dlentry>
> +<dt>??</dt>
> +<dd>???? ??? ??, CPU, ??? ? ???? ????
> +???? ?? ??? ?????. ??? ???? ??? ??? ?
> +????. CPU? ???? ???? ?? ?? ? ?????.</dd>
> +</dlentry><dlentry>
>   <dt>????</dt>
> -<dd>??? ??? ISO ??? ??? ?????.</dd>
> +<dd>??? ???? ?? ????? ?? ? ??? ?????.
> +???? ???? ??? ??, ?? ? ??? ? ????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>?????</dt>
> +<dd>??, ?? ? MAC ??? ???? ???? ?? ???? ???
> +?????. ???? ?????? ??, ?? ? ??? ?
> +????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>??</dt>
> +<dd>???? ?? ??? ??? ??? ? ??? ?????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>??? PCI ??</dt>
> +<dd>????? ?? ??? ?? PCI ?? ??? ?????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>???</dt>
> +<dd>???? ???? ?????. ???? ??, ?? ?? ??? ?
> +????. ???? ???? ????? ?????? ????
> +??? ???? ?? ???? ??? ???? ????
> +?? ??? ?? ??? ????? ?????.</dd>
>   </dlentry></dl>
>   <p> ?? ???? ???? ?? ??? ??? ? ????. ??? ??? ?? <uicontrol>??</uicontrol>? ?????. </p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="ko-kr">
> -<title>???? ?? ??, ?? ?? ??</title>
> -<shortdesc rev="rev1">?? ??? ?? ???? ??? ??, ?? ?? ??? ? ????. ???? ??? CDROM????. ???? ??? ????? ?? ??? ??????.</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="ko-kr">
> +<title>??? ??</title>
> +<shortdesc>???? ???? ??? ??? ??? ? ????.</shortdesc>
>   <csbody>
> +<p>???? ????? ??? ??????.</p>
>   <ol>
> -<li><wintitle>??? ??</wintitle> ??? <wintitle>????</wintitle>? ??????.</li>
> -<li>???? ??? ????? <uicontrol>??? ???(/)</uicontrol>? ?? ? ?? ???? ??????. ISO ?? ??? ???? <uicontrol>??</uicontrol>? ??????.</li>
> -<li>???? ??? ????? <uicontrol>??? ??(-)</uicontrol>? ?? ? ?? ???? ??????. ?? ??? ???? <uicontrol>??</uicontrol>? ??????.</li>
> -<li>???? ??? ????? ?? <uicontrol>??? ??(+)</uicontrol>? ?? ? ?? ???? ??????. ?? ?? ? ISO ?? ??? ???? <uicontrol>??</uicontrol>? ??????.</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="ko-kr">
> -<title>VM? CDROM ??</title>
> -<shortdesc rev="rev1">??? ??? ?? ?? ??? ?? CDROM? ???? ?? ? ????.</shortdesc>
> -<csbody>
> -<ol>
> -<li>?? ??? ?????? ??????.</li>
> -<li>?? ???? <uicontrol>?? ??</uicontrol>? ??????.</li>
> -<li>CDROM? ?? ??? ??? ???? ?? hdc ?? ?? ?? <uicontrol>??? ???(/)</uicontrol> ???? ??????.</li>
> -<li><wintitle>VM? CDROM ??</wintitle> ????? ISO ?? ??? ??????. ?? ? ??? ?? ?????.</li>
> -<li><uicontrol>??</uicontrol>? ??????.</li>
> +<li>???? ?? ???? <uicontrol>??</uicontrol>?
> +?????.</li>
> +<li>??? ?????. <note>?? ???? SCSI ??
> +iSCSI ??? ????? ?? ?? ??? ??? ?? ??
> +??? ?? ???? ?? ?????.</note></li>
>   </ol>
> +<p>????? ???? <uicontrol>?? ?...</uicontrol> ??? ??? ???? ????
> +??? ???? ??? ? ????.</p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ko_KR/host.dita b/ui/pages/help/ko_KR/host.dita
> index ee4a9c3..220e166 100644
> --- a/ui/pages/help/ko_KR/host.dita
> +++ b/ui/pages/help/ko_KR/host.dita
> @@ -16,13 +16,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li>??? ???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
>   <li>?? ???? ?? ?? ??, ??? ???? ?? VNC ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
>   </ul></p>
> -<p>???? ?? ??? ????? ?? ??? ??????.<dl>
> -<dlentry>
> +<p>???? ?? ??? ????? ?? ??? ??????.</p>
> +<dl><dlentry>
>   <dt>?? ??</dt>
> -<dd>? ???? ??? ?? ?? ??, ??, ?? ??, ???? ??, ??? ??(GB) ?? ?????.</dd>
> +<dd>? ???? ??? ?? ?? ??,
> +??, ?? ??, ???? ??, ??? CPU ?,
> +??? ??(GB) ?? ?????.</dd>
>   </dlentry><dlentry>
>   <dt>??? ??</dt>
> -<dd>? ???? ???? CPU, ???, ??? I/O, ???? I/O? ?? ??? ???? ???? ?????. ??? ?? ??? ? ??? ??? ????? <uicontrol>? ???? ?? ?? ??? ??</uicontrol>? ?????.</dd>
> +<dd>? ???? ???? CPU, ???, ??? I/O, ???? I/O? ?? ??? ???? ???? ?????. </dd>
>   </dlentry><dlentry>
>   <dt>????? ????</dt>
>   <dd>? ???? ??? ??, ??, ????, ???? ???? ?? ??? ????? ?? ?? ???? ?? ??? ?????. <uicontrol>?? ????</uicontrol>? ???? ??? ?? ???? ????? ? ????. ????? ?? ?? ???? ??? ?? ????.</dd>
> @@ -30,18 +32,20 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dt>???</dt>
>   <dd>? ???? ??? ???? ??? ???? ?????. ???? ?????, ???? ?????, ?????, ??? ? ????. ???? ???? ???? ??? ???? ????, ???? ???? ???? ???? ???? ???? ? ????. ?? ???? Red Hat Enterprise Linux ?? Fedora? ??, <filepath>yum</filepath> ???? ??? ? ????.
>   ?? ???? Ubuntu ?? Debian? ??, <filepath>deb</filepath> ???? ??????.<p>yum ???? ???? ??, GPG ??? ???? ? ???? ???? ???? ???? ??? ? ????.
> -???? ??? ? <uicontrol>??</uicontrol>? ??????. <uicontrol>?</uicontrol>? ???? GPG ??? ???? ??? ? ???? ?? GPG ? ??? URL? ??????.</p></dd>
> +???? ??? ? <uicontrol>??</uicontrol>? ??????. <uicontrol>?</uicontrol>? ????
> +<uicontrol>GPG ??</uicontrol>? ???? ??? ?
> +???? ?? GPG ? ??? URL? ??????.</p></dd>
>   </dlentry><dlentry>
>   <dt>??? ???</dt>
>   <dd>? ???? ?? ? ?? ??? ??? ??? ???? ?????.
>   ? ??? ??, ?? ??? ?? ???, ??, ???? ?? ?? ??? ??? ? ????.<p>??? ???? <cmdname>sosreport</cmdname> ??? ???? ?????. ?? Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora ? Ubuntu ???? ?? ?????. ? ??? ?? ? ?? ??(?: ?? ?? ?? ??, ??? ??, ??? ? ??? ?? ??)? ???? .tar ??? ?????.
>   ?? ? ??? ?? ????? ???? ?? ??? ???? ?? ????? ? ??? ?????.</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ko_KR/network.dita b/ui/pages/help/ko_KR/network.dita
> index 451510f..d907abc 100644
> --- a/ui/pages/help/ko_KR/network.dita
> +++ b/ui/pages/help/ko_KR/network.dita
> @@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li rev="rev1">???? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
>   <li>???? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
>   <li>?? ??? ????? <uicontrol>??</uicontrol>? ?????.</li>
> -</ul>????? ????? ?? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
> +</ul>????? ????? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="ko-kr">
>   <title>???? ??</title>
> @@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ko_KR/storage.dita b/ui/pages/help/ko_KR/storage.dita
> index 2e6f5e8..da01678 100644
> --- a/ui/pages/help/ko_KR/storage.dita
> +++ b/ui/pages/help/ko_KR/storage.dita
> @@ -15,7 +15,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>? ???? ?? ?? ?? ??? ?????.<dl>
>   <dlentry>
>   <dt>??</dt>
> -<dd>???? ?? ?? ? ??????.</dd>
> +<dd>???? ?? ?????.</dd>
> +</dlentry><dlentry>
> +<dt>% Used</dt>
> +<dd>?? ?? ???? ?? ??????.</dd>
>   </dlentry><dlentry>
>   <dt>??</dt>
>   <dd>???? ?? ??(??? ?? ??, ???? ?? ???)???. </dd>
> @@ -35,21 +38,12 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>? ???? ??? ?? ??? ??? ? ????.<ul>
>   <li>?? ????? ???? ?? ?????? <uicontrol>???</uicontrol>? ?????.</li>
>   <li>???? ?? ??????? <uicontrol>????</uicontrol>? ?????.</li>
> +<li>?? ???? ?? ??? ????? <uicontrol>?? ??</uicontrol>?
> +?????.</li>
>   <li>??? ???? ?? ????? <uicontrol>?? ??</uicontrol>? ?????.</li>
>   </ul></p>
> -<p>???? ?? ?? ???? ?? ????? ????? ???? ? ?? ???? ?? ???? ??????. ?????? ??? ?????.<dl><dlentry>
> -<dt>??</dt>
> -<dd>??? ?????. ?: <uicontrol>??</uicontrol></dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>??? ??? ?? ?????.</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>???? ??? ?????.</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>???? ?? ?? ??? ??? ????.</dd>
> -</dlentry></dl>???? ?? ????? ?? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
> +<p>???? ?? ?? ???? ?? ????? ????? ???? ? ?? ???? ?? ???? ??????. ???? ?? ?????
> +<uicontrol>???(+)</uicontrol> ???? ?????.</p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="ko-kr">
>   <title>???? ? ??</title>
> @@ -74,13 +68,30 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dt><uicontrol>SCSI ??? ??</uicontrol></dt>
>   <dd>SCSI ??? ??? ???? ?? ?????. ??? SCSI ???? ?????.</dd>
>   </dlentry></dl></li>
> +<li>???? ?? ???? ??? ?????. ???? ???
> +?? ???? ?? ?? ???? ?????.
> +??? ???? ???. ?? ??? ? ????? ?? ??
> +???? ?? ?????.</li>
>   <li><uicontrol>??</uicontrol>? ??????.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="ko-kr">
> +<title>?? ??</title>
> +<shortdesc>???? ?? ??? ?????.</shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>?? URL?? ??</dt>
> +<dd>??? ????? ??? ?????. ?? ??, <filepath>https://my-server/fedora22.img</filepath>???.</dd>
> +</dlentry><dlentry>
> +<dt>?? ???</dt>
> +<dd>?? ???? ??? ?????.</dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ko_KR/templates.dita b/ui/pages/help/ko_KR/templates.dita
> index de16d6e..8aa4286 100644
> --- a/ui/pages/help/ko_KR/templates.dita
> +++ b/ui/pages/help/ko_KR/templates.dita
> @@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <title>????</title>
>   <shortdesc><wintitle>????</wintitle> ????? KVM ???? ???? ? ??? ? ?? ??? ?? ?? ????? ?????.</shortdesc>
>   <csbody>
> -<p>? ????? ?? ?? ??? ?????.<dl>
> -<dlentry>
> +<p>? ????? ?? ?? ??? ?????.</p>
> +<dl><dlentry>
>   <dt>OS</dt>
>   <dd>?? ?? ?? ??? ?????.</dd>
>   </dlentry><dlentry>
> @@ -24,66 +24,62 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>???</dt>
>   <dd>??? RAM(Random Access Memory)? ?(MB)???.</dd>
> -</dlentry></dl></p>
> -<p>? ?????? ?? ??? ??? ? ????.<ul>
> +</dlentry></dl>
> +<p>? ?????? ?? ??? ??? ? ????.</p>
> +<ul>
>   <li>????? ????? <uicontrol>??</uicontrol>? ?????.</li>
> +<li>????? ????? <uicontrol>??</uicontrol>? ?????.</li>
>   <li>????? ????? <uicontrol>??</uicontrol>? ?????.</li>
> -</ul>????? ????? ?? ??? ??? ?? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
> +</ul>
> +<p>????? ????? <uicontrol>???(+)</uicontrol> ???? ?????.</p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="ko-kr">
>   <title>???? ??</title>
>   <shortdesc>?? ????? ?????.</shortdesc>
>   <csbody>
> -<p>? ????? ?? ?? ??? ?????. <dl>
> -<dlentry>
> -<dt>??</dt>
> -<dd>????? ?????.</dd>
> +<p>? ????? ?? ?? ??? ?????. </p>
> +<dl><dlentry>
> +<dt>??</dt>
> +<dd>??, ?? ??, ??, ???,
> +ISO ??? ?? ?? ?? ? ??? ?? ??? ?????.</dd>
>   </dlentry><dlentry>
> -<dt>????</dt>
> -<dd>????? ????? ??? ?? ?? ?? ??? ??? ??? ?????.</dd>
> +<dt>????</dt>
> +<dd>????? ?? ???? ? ??? ?????.</dd>
>   </dlentry><dlentry>
> -<dt>??</dt>
> -<dd>????? ????? ??? ?? ?? ?? ??? ?????.</dd>
> -</dlentry><dlentry>
> -<dt>CPU ?</dt>
> -<dd>????? ?? ??? ????? ????.</dd>
> -</dlentry><dlentry>
> -<dt>???</dt>
> -<dd>?? ??? ??? ??? ??(MB)???.</dd>
> +<dt>?????</dt>
> +<dd>KVM ???? ?? ??? ?? ???? ?????? ?????.
> +?? ????? ??? ? ????.</dd>
>   </dlentry><dlentry>
> -<dt>???</dt>
> -<dd>??? ??(GB)???.</dd>
> -</dlentry><dlentry>
> -<dt>CDROM</dt>
> -<dd>KVM ???? ???? ? ??? ISO ??? ??? ?? ?? ?????.</dd>
> -</dlentry><dlentry>
> -<dt>???? ?</dt>
> -<dd>?? ???? ? ?? ?? ???? ????.</dd>
> -</dlentry><dlentry>
> -<dt>????</dt>
> -<dd>KVM ???? ?? ??? ?? ???? ????????. ?? ????? ??? ? ????.</dd>
> -</dlentry></dl> ?? ???? ???? ?? ??? ??? ? ????. ??? ??? ?? <uicontrol>??</uicontrol>? ?????. </p>
> +<dt>????</dt>
> +<dd><uicontrol>CPU ??</uicontrol> ???? ????? ?? ???
> +????? ?? ?????.</dd>
> +<dd>? ???? ?? CPU ????? ???? ????? ?????.</dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>???? ??</title>
>   <shortdesc>?? ????? ????? ?????. ?? ??? ?? 'ISO' ???? ?? ??? ?? ISO ???? ??? ? ????. </shortdesc>
>   <csbody>
> -<p>?? ?? ??? ?? ??? ??? ??????.<dl>
> -<dlentry>
> +<p>?? ?? ??? ?? ??? ??? ??????.</p>
> +<dl><dlentry>
>   <dt>?? ISO ???</dt>
>   <dd>????? ?? ??? ?? ISO ???? ???? ?? ????? ?????.</dd>
>   </dlentry><dlentry>
> +<dt>?? ??? ??</dt>
> +<dd>?? ??? ?? ??? ????? ?????.</dd>
> +</dlentry><dlentry>
>   <dt>?? ISO ???</dt>
>   <dd>?? ISO ???? ?? ??? ????? ?????.</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>???? ?? - ?? ISO ???</title>
> -<shortdesc>?? ISO ?????? ????? ?????.</shortdesc>
> +<title>???? ?? - ISO ???</title>
> +<shortdesc>ISO ?????? ????? ?????.</shortdesc>
>   <csbody>
> -<p>????? ?? ??? ISO ???? ?????.<dl><dlentry>
> +<p>????? ?? ??? ISO ???? ???? ?????.</p>
> +<dl><dlentry>
>   <dt>OS</dt>
>   <dd>?? ?? ?? ??? ?????.</dd>
>   </dlentry><dlentry>
> @@ -92,20 +88,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>??</dt>
>   <dd>ISO ???? ?????.</dd>
> -</dlentry></dl></p>
> -<p>ISO ?????? ????? ????? ?? ?? ??? ??????.<ul>
> +</dlentry></dl>
> +<p>ISO ?????? ????? ????? ?? ?? ??? ??????.</p>
> +<ul>
>   <li>????? ???? ?? ISO ???? ??? ? <uicontrol>??? ISO??? ???? ??</uicontrol>? ?????.</li>
>   <li>??? ? ISO ?????? ????? ????? <uicontrol>??</uicontrol>? ??? ? <uicontrol>??? ISO??? ???? ??</uicontrol>? ?????.</li>
>   <li>????? ISO ???? ?? ??? ???? ?? ??, ?? ?? ??? ??? ? ????.<ul>
>   <li>ISO ???? ??? ????? <uicontrol>?? ISO ??? ????? ???.</uicontrol>? ?????.</li>
>   <li>?? ISO ???? ????? <uicontrol>?? ISO ??</uicontrol>? ?????.</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ru_RU/guests.dita b/ui/pages/help/ru_RU/guests.dita
> index 701dd7e..893b9cd 100644
> --- a/ui/pages/help/ru_RU/guests.dita
> +++ b/ui/pages/help/ru_RU/guests.dita
> @@ -9,21 +9,21 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="ru-ru">
>   <title>???????? ???????</title>
> -<shortdesc>?? ???????? <wintitle>???????? ???????</wintitle> ???????????? ?????? ????????? ??????????? ????? KVM.</shortdesc>
> +<shortdesc>???????? <wintitle>???????? ???????</wintitle> ???????? ?????? ???????? ?????? ???????.</shortdesc>
>   <csbody>
>   <p>??? ?????? ???????? ??????? ???????????? ????????? ??????????:<dl><dlentry>
>   <dt>???</dt>
> -<dd>??? ??????????? ??????.</dd>
> +<dd>??? ???????? ???????.</dd>
>   </dlentry><dlentry>
>   <dt>?????????</dt>
> -<dd>??????? ????????????? ?????????? ? ??????????? ??????.</dd>
> -</dlentry><dlentry>
> -<dt>??????? ????-?????</dt>
> -<dd>???????? ???????? ?????-?????? ? ??/?.</dd>
> +<dd>??????? ????????????? ?????????? ? ???????? ???????.</dd>
>   </dlentry><dlentry>
>   <dt>???????? ????-?????</dt>
>   <dd>???????? ????????? ?????-?????? ? ??/?.</dd>
>   </dlentry><dlentry>
> +<dt>??????? ????-?????</dt>
> +<dd>???????? ???????? ?????-?????? ? ??/?.</dd>
> +</dlentry><dlentry>
>   <dt>Livetile</dt>
>   <dd>????????? ??????? ???????? ???????????? ??????? ??? ??????, ?????????????? ??????? ?? <tm tmtype="tm" trademark="Linux">Linux</tm>, ???? ???????? ??????? ?? ???????.</dd>
>   </dlentry></dl></p>
> @@ -37,86 +37,81 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry></dl> </p>
>   <p>??? ?????? ???????? ??????? ???????? ????????? ????????:<ul>
>   <li><uicontrol>????????????</uicontrol> - ???????????? ? ????????? ??????? ???????? ???????????? ???????.</li>
> -<li><uicontrol>?????????? ??????????</uicontrol> - ????????? ???? ? ????????????? ????????.</li>
> -<li><uicontrol>?????</uicontrol> - ????? ???????? ???????.</li>
> +<li>???????? <uicontrol>???????????</uicontrol>, ????? ??????????? ???????????? ??????????? ???????? ??????? ? ??????? ?????.</li>
> +<li><uicontrol>?????</uicontrol> - ????? ???????? ???????. ???????? ????? ?????? ?????????? ???????? ???????.</li>
>   <li><uicontrol>????????</uicontrol> - ????????? ??????? ???????? ???????. ???????? ???????? ??????? ????? ????????, ?????? ????? ??????? ???????????.</li>
> -<li><uicontrol>???????</uicontrol> - ??????? ???????? ???????.</li>
> -</ul>??? ???????? ???????? ??????? (??????????? ??????) ???????? ?? ?????? <uicontrol>????
> -(+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
> +<li>???????? <uicontrol>????</uicontrol>, ????? ????????? ???????? ???????</li>
> +<li>???????? <uicontrol>????????? ??????</uicontrol>, ????? ?????? ????????? ?????? ???????? ???????.</li>
> +<li>???????? <uicontrol>?????????</uicontrol>, ????? ????????????? ????????? ?????? ???????? ???????.</li>
> +<li>???????? <uicontrol>???????</uicontrol>, ????? ??????? ???????? ???????.</li>
> +</ul>??? ???????? ???????? ??????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ?? ????????.</p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="ru-ru">
> -<title>???????? ??????????? ??????</title>
> -<shortdesc>???????? ??????????? ?????? ? ??????? ???????.</shortdesc>
> +<title>???????? ???????? ???????</title>
> +<shortdesc>???????? ???????? ??????? ?? ???????? ???????.</shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>??????? ??? ??? ????????????? ??????????? ??????.</li>
> -<li rev="rev1">???????? ??????. <ul>
> +<li>??????? ???, ? ??????? ???????? ????? ?????????????????? ???????? ???????.</li>
> +<li>???????? ??????. <ul>
>   <li>???? ???? ???????, ???????? ?????? ? ??????.</li>
>   <li>???? ???????? ???, ???????? ?? <uicontrol>??????? ??????</uicontrol>, ????? ??????? ??????.</li>
> -</ul></li>
> +</ul>??? ????????? ?????????? ? ??????? ???????? ?????? ???? ?? ????.</li>
>   <li>???????? ?? <uicontrol>???????</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="ru-ru">
>   <title>????????? ???????? ???????</title>
> -<shortdesc>????????? ??????? ???????????? ??????????? ??????. ????????? ???????? ????? ???????? ?????? ???? ??????????? ???????? ?????. ?????? ???????? ? ???? ????? ????????? ????????????.</shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
> +<shortdesc>????????? ??????? ???????????? ???????? ???????. ????????? ???????? ????? ???????? ?????? ???? ??????????? ???????? ?????. ?????? ???????? ? ???? ????? ????????????.</shortdesc>
>   <csbody>
> -<p>??? ?????? ???????? ??????? ???????????? ????????? ?????????? ?? ??????? <wintitle>?????</wintitle>:<dl>
> -<dlentry>
> -<dt>???</dt>
> -<dd>??? ??????????? ??????. (????? ????????????? ???? ??????????? ???????? ?????)</dd>
> -</dlentry><dlentry>
> -<dt>??????????</dt>
> -<dd>????? ???????????. (???? ???????? ????? ????????, ????? ????? ??????? ? ???? ????? ????????????)</dd>
> -</dlentry><dlentry>
> -<dt>??????</dt>
> -<dd>????? ?????? ? ??. (???? ???????? ????? ????????, ????? ????? ??????? ? ???? ????? ????????????)</dd>
> -</dlentry><dlentry>
> -<dt>??????</dt>
> -<dd>??????????? ???????????, ?????????????? ??????? ?? Linux. ??? ???????????? ?????? ???????? ?????????
> -(Livetile), ????? ???????? ??????? ?? ???????.</dd>
> -</dlentry></dl></p>
> -<p>?? ??????? <wintitle>???????? ??????</wintitle> ???????????? ????????? ??????????.</p>
>   <dl><dlentry>
> +<dt>?????</dt>
> +<dd>?????????? ? ???????? ???????, ??????? ???, ????? ???????????, ????? ?????? ? ??????. ??? ????????????? ???????? ??????? ????? ????????. ????????? ????? ??????????? ? ?????? ?????? ???????? ? ???? ????? ????????????.</dd>
> +</dlentry><dlentry>
>   <dt>???????? ??????</dt>
> -<dd>?????????? ???????????? ????? ISO ??? ?????????.</dd>
> +<dd>?????????? ?? ?????????? ? ???? ? ???????? ?????? ????????? ???????? ???????.
> +????? ?????????, ???????? ? ??????? ?????????? ???????? ???????? ???????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>?????????</dt>
> +<dd>??????? ?????????? ??? ???????? ???????, ??????? ???, ??? ? MAC-?????.
> +????? ?????????, ???????? ? ??????? ?????????? ???????? ???????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>????? ???????</dt>
> +<dd>?????????? ? ????????????? ? ???????, ??????? ???????? ?????? ? ???????? ???????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>?????????? PCI ?????</dt>
> +<dd>?????? ???? ????????? PCI, ????????? ?? ?????.</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>???????????? ?????</dt>
> +<dd>?????????? ? ???????????? ?????? ???????? ???????. ????? ?????????, ???????? ? ??????? ???????????? ?????. ???????? ???????????? ????? ? ???????? ?? ???????????? - ????????????? ???? ?? ??????? ????????? ???????? ???????, ??????????? ? ???????????? ?????; ??? ?????????, ????????? ???????, ????? ????????.
> +</dd>
>   </dlentry></dl>
>   <p> ???????? ???? ????? ????????. ????? ????????? ???? ???????? ?? <uicontrol>?????????</uicontrol>. </p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="ru-ru">
> -<title>??????????, ?????? ? ?????????? ????????? ????????</title>
> -<shortdesc rev="rev1">? ??????????? ?????? ????? ?????????, ???????? ? ????????? ?????????? ????????. ???????????? ?????????????? ?????????? - CDROM. ??? ????????? ????????? ???????? ????????? ????????? ????????:</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="ru-ru">
> +<title>???????????? ???????? ??????</title>
> +<shortdesc>???????????? ???????? ?????? ????????? ????????? ????? ???????? ??????.</shortdesc>
>   <csbody>
> +<p>??? ???????????? ???????? ??????? ????????? ????????? ????????:</p>
>   <ol>
> -<li>? ???? <wintitle>???????? ???????? ???????</wintitle> ???????? <wintitle>???????? ??????</wintitle>.</li>
> -<li>??? ?????? ?????????? ???????? ???????? ?? ?????? ?????? ? <uicontrol>????????? ????? ?????? (/)</uicontrol>. ??????? ???? ? ????? ISO ? ???????? ?? <uicontrol>????????</uicontrol>.</li>
> -<li>??? ?????????? ?????????? ???????? ???????? ?? ?????? ?????? ? <uicontrol>??????? ?????????????? ?????? (-)</uicontrol>. ??????????? ???????? ? ??????? ?????? <uicontrol>OK</uicontrol>.</li>
> -<li>??? ?????????? ?????????? ???????? ???????? ?? ??????? ?????? ? <uicontrol>??????? ??????
> -(+)</uicontrol>. ??????? ??? ?????????? ? ???? ? ????? ISO ? ???????? ?? <uicontrol>??????????</uicontrol>.</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="ru-ru">
> -<title>?????? CDROM ??????????? ??????</title>
> -<shortdesc rev="rev1">?? ????????? ????????? ????? ???????? ?????????? CDROM ??? ??????????? ??????.</shortdesc>
> -<csbody>
> -<ol>
> -<li>????????? ??????????? ??????.</li>
> -<li>? ???? ???????? ???????? <uicontrol>?????????? ??????????</uicontrol>.</li>
> -<li>??? ?????? ????????, ???????????? ? CDROM, ???????? ?? ?????? ? <uicontrol>????????? ????? ??????
> -(/)</uicontrol> ????? ? ????? hdc.</li>
> -<li>?? ???????? <wintitle>?????? CDROM ??????????? ??????</wintitle> ??????? ???? ? ????? ISO. ??? ?????? ???? ???????? ?????? ??? ??????.</li>
> -<li>???????? ????? <uicontrol>????????</uicontrol>.</li>
> +<li>???????? <uicontrol>???????????</uicontrol> ? ???? ???????? ???????? ???????.</li>
> +<li>??????? ??????????????.<note>???? ? ??????? ???????? ??????? ???????????? ???? SCSI ??? iSCSI ??? ???? ? ??????? ???? ???????????? ?????????? ?????, ???????? ????? ?????? ? ???? ?????? ?? ?????????.
> +</note></li>
>   </ol>
> +<p>???????? ???????? ??????? ? ?????? ? ???????? <uicontrol>????????...</uicontrol>. ?? ????????? ???????? ????? ???????? ??????? ?????? ???????? ??? ?????????????.
> +</p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ru_RU/host.dita b/ui/pages/help/ru_RU/host.dita
> index fb72c21..54a78f5 100644
> --- a/ui/pages/help/ru_RU/host.dita
> +++ b/ui/pages/help/ru_RU/host.dita
> @@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li><uicontrol>?????????????</uicontrol> - ????????????? ??????? ?????.</li>
>   <li><uicontrol>????????????</uicontrol> - ??????? ?????????? VNC ? ???????? ?????, ???? ??? ??? ?? ???????????.</li>
>   </ul></p>
> -<p>???????? ?? ????????? ???????? ??? ????????? ?????????? ? ?????:<dl>
> -<dlentry>
> +<p>???????? ?? ????????? ???????? ??? ????????? ?????????? ? ?????:</p>
> +<dl><dlentry>
>   <dt>??????? ??????????</dt>
> -<dd>? ???? ??????? ???????????? ??????? ???????????? ???????, ??? ?????? ? ??????? ???, ? ????? ??? ?????????? ? ????? ?????? ? ??.</dd>
> +<dd>? ???? ??????? ???????????? ??????? ???????????? ???????, ??? ?????? ? ??????? ???, ? ????? ??? ??????????, ????? ???????????? ??????????? ? ????? ?????? ? ??.</dd>
>   </dlentry><dlentry>
>   <dt>????????? ??????????</dt>
> -<dd>? ???? ??????? ???????????? ???????, ?????????? ?????????????? ?????????? ? ??????????, ??????, ???????? ?????-?????? ? ??????? ?????-?????? ??? ?????. ???????? <uicontrol>???? ?????? ????? ???????? ???? ????????</uicontrol>, ????? ???? ?????? ??????????? ????? ???????? ??????? ????.</dd>
> +<dd>? ???? ??????? ???????????? ???????, ?????????? ?????????????? ?????????? ? ??????????, ??????, ???????? ?????-?????? ? ??????? ?????-?????? ??? ?????. </dd>
>   </dlentry><dlentry>
>   <dt>?????????? ???????????? ???????????</dt>
>   <dd>? ???? ??????? ???????????? ?????????? ??? ???? ???????, ??? ??????? ???????? ??????????, ??????? ??? ??????, ??????, ??????????? ? ?????????. ????? ???????? ??? ?????? ? ?????? ??????? ?? <uicontrol>???????? ???</uicontrol>. ????????? ?????? ??? ?????????? ??????? ??????.</dd>
> @@ -30,19 +30,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dt>?????????</dt>
>   <dd>? ???? ??????? ???????????? ?????????, ????????? ? ???????? ?????. ????????? ????? ?????????, ????????????, ???????? ? ???????. ??? ?????????? ????????? ??????????? ? ???????? ?????, ??? ????????? ????????? ?????????? ????????? ??? ?????. ???? ??????? - Red Hat Enterprise Linux ??? Fedora, ????? ???????? ????????? <filepath>yum</filepath>.
>   ???? ??????? - Ubuntu ??? Debian, ???????? ????????? <filepath>deb</filepath>.<p>??? ?????? ? ??????????? yum ????? ???????? ???????? GPG ??? ???????? ??????????? ??????? ?? ??????? ?????????.
> -???????? ????????? ? ???????? ?? <uicontrol>????????</uicontrol>. ???????? <uicontrol>??</uicontrol>, ????? ???????? ???????? GPG, ? ??????? URL ????? ?????? GPG ??? ?????????.</p></dd>
> +???????? ????????? ? ???????? ?? <uicontrol>????????</uicontrol>. ???????? <uicontrol>??</uicontrol>, ????? ???????? <uicontrol>???????? GPG</uicontrol>, ? ??????? URL ????? ?????? GPG ??? ?????????.</p></dd>
>   </dlentry><dlentry>
>   <dt>?????????? ??????</dt>
>   <dd>? ???? ??????? ???????????? ?????????? ??????, ??????? ??? ? ????.
>   ???????? ??????? ??? ????????, ??????????????, ???????? ? ???????? ???????.<p>?????????? ????? ????????? ???????? <cmdname>sosreport</cmdname>. ?? ???????? ??? Red
>   Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora ? Ubuntu. ??????? ??????? ???? .tar ? ???????????????? ? ??????????????? ???????????, ????? ??? ?????? ????, ??????????? ?????? ? ????? ???????????? ??????? ? ?????.
>   ??????? ????? ????????? ??????? ????????? ??? ????? ?????????????? ?????????? ? ????????? ?? ????? ? ?????????????? ??????.</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ru_RU/network.dita b/ui/pages/help/ru_RU/network.dita
> index 9cdcdd1..b92ecd2 100644
> --- a/ui/pages/help/ru_RU/network.dita
> +++ b/ui/pages/help/ru_RU/network.dita
> @@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li rev="rev1"><uicontrol>?????????</uicontrol> - ??????? ??????? ??????????.</li>
>   <li><uicontrol>??????????</uicontrol> - ??????? ??????? ??????????.</li>
>   <li><uicontrol>???????</uicontrol> - ??????? ?????????? ? ??????????.</li>
> -</ul>??? ???????? ???? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
> +</ul>??? ???????? ???? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="ru-ru">
>   <title>???????? ????</title>
> @@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ru_RU/storage.dita b/ui/pages/help/ru_RU/storage.dita
> index fa37edc..1e3dee1 100644
> --- a/ui/pages/help/ru_RU/storage.dita
> +++ b/ui/pages/help/ru_RU/storage.dita
> @@ -9,13 +9,15 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhstor" xml:lang="ru-ru">
>   <title>???????? ??????</title>
> -<shortdesc>?? ???????? <wintitle>???????? ??????</wintitle> ???????????? ?????? ????????? ????? ??????, ??????? ???? ?????? '?? ?????????' ? 'ISO'.
> -???? ?? ?????? ???????????? ??????????? ISO, ???????? ??? ? ???? ???????? ?????? 'ISO'.</shortdesc>
> +<shortdesc>?? ???????? <wintitle>???????? ??????</wintitle> ???????????? ?????? ????????? ????? ??????, ??????? ???? ?????? '?? ?????????' ? 'ISO'. ??? ????????????? ???????????? ISO ???????? ??? ? ???? ? ???? ?????? 'ISO'.</shortdesc>
>   <csbody>
>   <p>??? ??????? ???? ?????? ???????????? ????????? ??????????:<dl>
>   <dlentry>
>   <dt>???</dt>
> -<dd>??? ???? ?????? ? ??????? ?????????????.</dd>
> +<dd>??? ???? ??????.</dd>
> +</dlentry><dlentry>
> +<dt>% ??????</dt>
> +<dd>??????? ???????? ????? ? ???? ??????.</dd>
>   </dlentry><dlentry>
>   <dt>?????????</dt>
>   <dd>????????? ???? ?????? - ???????? (???????) ??? ?????????? (???????). </dd>
> @@ -30,26 +32,15 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dd>????? ???? ??????.</dd>
>   </dlentry><dlentry>
>   <dt>????????</dt>
> -<dd>????? ?????????? ?????? ? ????.</dd>
> +<dd>????? ?????????? ?????? ? ???? ??????.</dd>
>   </dlentry></dl></p>
>   <p>??? ??????? ???? ?????? ????? ???????? ????????? ????????:<ul>
>   <li><uicontrol>????????????</uicontrol> - ???????????? ??? ??????, ????? ??? ????? ???? ????????????.</li>
>   <li><uicontrol>??????????????</uicontrol> - ?????????????? ???????? ??? ??????.</li>
> +<li>???????? <uicontrol>???????? ???</uicontrol>, ????? ???????? ?????????????? ??? ? ???????? ??? ??????. </li>
>   <li><uicontrol>???????</uicontrol> - ??????? ?????????? ??? ??????.</li>
>   </ul></p>
> -<p>??? ????????? ???????? ? ????? ???? ?????? ???????? ?? ??????? ? ?????? ????? ?????? ???? ??????.  ???????? ????????:<dl><dlentry>
> -<dt>???</dt>
> -<dd>??? ????, ???????? <uicontrol>????</uicontrol>.</dd>
> -</dlentry><dlentry>
> -<dt>??????</dt>
> -<dd>?????? (??????? ?? ????).</dd>
> -</dlentry><dlentry>
> -<dt>???????</dt>
> -<dd>?????? ????.</dd>
> -</dlentry><dlentry>
> -<dt>?????????</dt>
> -<dd>????? ?????????? ?????? ? ????.</dd>
> -</dlentry></dl>??? ???????? ???? ?????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
> +<p>??? ????????? ???????? ? ????? ???? ?????? ???????? ?? ??????? ? ?????? ????? ?????? ???? ??????. ??? ???? ????? ??????? ??? ??????, ???????? ?? ?????? <uicontrol>????? (+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="ru-ru">
>   <title>???????? ???? ??????</title>
> @@ -76,13 +67,27 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dt><uicontrol>SCSI Fibre Channel</uicontrol></dt>
>   <dd>?????? ??? ?? ?????? SCSI Fibre Channel. ???????? ??????? SCSI.</dd>
>   </dlentry></dl></li>
> +<li>??????? ???? ? ???? ??????. ???? ? ???? ?????? ????????? ?? ????? ? ???????? ???????, ???? ????????? ??? ??????. ???? ?????? ???? ??????????. ???? ??????? ?? ?????????? ? ?????? ???????? ????, ?? ????? ?????? ?????????????.</li>
>   <li>???????? ?? <uicontrol>???????</uicontrol>.</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="ru-ru">
> +<title>?????????? ????</title>
> +<shortdesc>?????????? ???? ? ??? ??????.</shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>????????? ? ?????????? URL</dt>
> +<dd>?????????, ?????? ??????? ????????? ???. ??????: <filepath>https://my-server/fedora22.img</filepath>.</dd>
> +</dlentry><dlentry>
> +<dt>???????? ????</dt>
> +<dd>?????? ????? ? ????????? ???????.</dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/ru_RU/templates.dita b/ui/pages/help/ru_RU/templates.dita
> index 27ce4ae..36bc90b 100644
> --- a/ui/pages/help/ru_RU/templates.dita
> +++ b/ui/pages/help/ru_RU/templates.dita
> @@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <title>???????</title>
>   <shortdesc>?? ???????? <wintitle>???????</wintitle> ???????????? ????????? ??????? ??????????? ?????, ??????? ????? ???????????? ??? ???????? ???????? ?????? KVM.</shortdesc>
>   <csbody>
> -<p>??? ??????? ??????? ???????????? ????????? ??????????:<dl>
> -<dlentry>
> +<p>??? ??????? ??????? ???????????? ????????? ??????????:</p>
> +<dl><dlentry>
>   <dt>??</dt>
>   <dd>??? ???????????? ??????? ??? ???????? ???????????? ???????.</dd>
>   </dlentry><dlentry>
> @@ -24,66 +24,59 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>??????</dt>
>   <dd>?????????? ????? ??????????? ?????? ? ??.</dd>
> -</dlentry></dl></p>
> -<p>??? ??????? ??????? ????? ???????? ????????? ????????:<ul>
> +</dlentry></dl>
> +<p>??? ??????? ??????? ????? ???????? ????????? ????????:</p>
> +<ul>
>   <li><uicontrol>????????</uicontrol> - ???????? ??????.</li>
> +<li>???????? <uicontrol>???????????</uicontrol>, ????? ??????????? ??????.</li>
>   <li><uicontrol>???????</uicontrol> - ??????? ??????.</li>
> -</ul>??? ?????????? ??????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol> ? ?????? ??????? ???? ????????.</p>
> +</ul>
> +<p>??? ???????? ??????? ???????? ?? ?????? <uicontrol>????? (+)</uicontrol>.</p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="ru-ru">
>   <title>???????? ??????</title>
>   <shortdesc>???????? ???????????? ??????.</shortdesc>
>   <csbody>
> -<p>??? ??????? ??????? ???????????? ????????? ??????????: <dl>
> -<dlentry>
> -<dt>???</dt>
> -<dd>??? ???????.</dd>
> +<p>??? ??????? ??????? ???????????? ????????? ??????????: </p>
> +<dl><dlentry>
> +<dt>?????</dt>
> +<dd>?????????? ?? ?????, ???????? ?? ?? ???????, ??????, ??????, ???? ? ????? ISO ? ??????????? ??????????.</dd>
>   </dlentry><dlentry>
> -<dt>??????</dt>
> -<dd>??? ????????, ????????? ???????????? ??????? ??? ??????? ???????????? ???????, ??? ????????????? ??????? ????????????? ??????.</dd>
> +<dt>???????? ??????</dt>
> +<dd>????????? ???? ?????? ??? ???????.</dd>
>   </dlentry><dlentry>
> -<dt>??????</dt>
> -<dd>?????? ???????????? ??????? ??? ???????? ???????????? ???????, ??? ????????????? ??????? ????????????? ??????.</dd>
> -</dlentry><dlentry>
> -<dt>?????????? ???????????</dt>
> -<dd>?????????? ??????????? ??? ???????.</dd>
> -</dlentry><dlentry>
> -<dt>??????</dt>
> -<dd>????? ?????? ? ??, ?????????? ??????????? ??????.</dd>
> +<dt>?????????</dt>
> +<dd>??????? ?????????? ?? ?????????, ????????? ???????? ??????? KVM. ????? ??????? ????????? ?????.</dd>
>   </dlentry><dlentry>
> -<dt>????</dt>
> -<dd>?????? ????? ? ??.</dd>
> -</dlentry><dlentry>
> -<dt>CDROM</dt>
> -<dd>???? ? ????? ISO ??? ????????? ???????? ??????? KVM.</dd>
> -</dlentry><dlentry>
> -<dt>??? ??????</dt>
> -<dd>???????????? ??? ?????? ??? ??? ?????? ?? ?????????.</dd>
> -</dlentry><dlentry>
> -<dt>????</dt>
> -<dd>??????? ?????????? ?? ?????????, ????????? ??? ???????? ??????? KVM. ????? ??????? ????????? ?????.</dd>
> -</dlentry></dl> ???????? ???? ????? ????????. ????? ????????? ???? ???????? ?? <uicontrol>?????????</uicontrol>. </p>
> +<dt>?????????</dt>
> +<dd>? ???? <uicontrol>?????????? ???????????</uicontrol> ??????? ????? ??????????? ??? ???????.</dd>
> +<dd>????? ????? ??????? ????????? ????????? ??????????? ??? ?????? ???????? ???????.</dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>?????????? ???????</title>
> -<shortdesc>?????????? ??????? ? ????????? ????????. ???????? ??????????? ????? ISO ? ???????? ?????? ISO ??? ??????????? ??????.</shortdesc>
> +<shortdesc>?????????? ??????? ? ????????? ????????. ???????? ??????????? ????? ISO ? ??? ?????? ISO ??? ??????????? ??????.</shortdesc>
>   <csbody>
> -<p>???????? ???? ?? ????????? ????????? ???????????? ????????? ????????:<dl>
> -<dlentry>
> +<p>???????? ???? ?? ????????? ????????? ???????????? ????????? ????????:</p>
> +<dl><dlentry>
>   <dt>????????? ????? ISO</dt>
>   <dd>???????? ???? ??????? ??? ?????? ???????????? ??????? ISO ? ????????? ????? ?????? ???????.</dd>
>   </dlentry><dlentry>
> +<dt>????????? ???? ??????</dt>
> +<dd>????? ????? ??????? ???? ? ?????????? ????? ??????.</dd>
> +</dlentry><dlentry>
>   <dt>????????? ????? ISO</dt>
>   <dd>???????? ???? ???????, ????? ??????? ????????? ???????????? ????????????? ?????? ISO.</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>?????????? ??????? (????????? ????? ISO)</title>
> -<shortdesc>?????????? ??????? ?? ?????????? ?????? ISO.</shortdesc>
> +<title>?????????? ??????? (????? ISO)</title>
> +<shortdesc>?????????? ??????? ?? ?????? ISO.</shortdesc>
>   <csbody>
> -<p>????? ???????? ?????? ISO, ????????? ? ???????.<dl><dlentry>
> +<p>????? ???????? ?????? ISO, ????????? ? ??????? ????????.</p>
> +<dl><dlentry>
>   <dt>??</dt>
>   <dd>??? ???????????? ??????? ??? ???????? ???????????? ???????.</dd>
>   </dlentry><dlentry>
> @@ -92,20 +85,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>??????</dt>
>   <dd>?????? ?????? ISO.</dd>
> -</dlentry></dl></p>
> -<p>??? ???????? ??????? ?? ?????? ISO ???????? ???? ?? ????????? ?????????:<ul>
> +</dlentry></dl>
> +<p>??? ???????? ??????? ?? ?????? ISO ???????? ???? ?? ????????? ?????????:</p>
> +<ul>
>   <li>???????? ????? ISO, ?? ???????? ????? ??????? ??????, ????? ???????? ?? <uicontrol>??????? ??????? ?? ????????? ??????? ISO</uicontrol>.</li>
>   <li>???????? <uicontrol>???</uicontrol>, ????? ??????? ?????? ?? ??????? ?????? ISO ? ??????, ????? ???????? ?? <uicontrol>??????? ??????? ?? ????????? ??????? ISO</uicontrol>.</li>
>   <li>???? ????????? ????? ISO ??????????? ? ??????????? ??????, ???????? ???? ?? ????????? ?????????:<ul>
>   <li>???????? <uicontrol>???????????? ?????????? ???? ISO</uicontrol>, ????? ??????? ???? ? ?????? ISO.</li>
>   <li>???????? ?? <uicontrol>????? ?????????????? ??????? ISO</uicontrol> ??? ?????? ?????????????? ??????? ISO.</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_CN/guests.dita b/ui/pages/help/zh_CN/guests.dita
> index d684af2..ee33e47 100644
> --- a/ui/pages/help/zh_CN/guests.dita
> +++ b/ui/pages/help/zh_CN/guests.dita
> @@ -9,21 +9,21 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="zh-cn">
>   <title>??</title>
> -<shortdesc>?<wintitle>??</wintitle>????????? KVM ????</shortdesc>
> +<shortdesc>?<wintitle>??</wintitle>????????????????</shortdesc>
>   <csbody>
>   <p>???????????????<dl><dlentry>
>   <dt>??</dt>
> -<dd>???????</dd>
> +<dd>??????</dd>
>   </dlentry><dlentry>
>   <dt>CPU</dt>
> -<dd>?????????????</dd>
> -</dlentry><dlentry>
> -<dt>?? I/O</dt>
> -<dd>????/???????? KB/????</dd>
> +<dd>?????????????</dd>
>   </dlentry><dlentry>
>   <dt>?? I/O</dt>
>   <dd>????/???????? KB/????</dd>
>   </dlentry><dlentry>
> +<dt>?? I/O</dt>
> +<dd>????/???????? KB/????</dd>
> +</dlentry><dlentry>
>   <dt>Livetile</dt>
>   <dd>???????????????????????????? <tm tmtype="tm" trademark="Linux">Linux</tm> ???????</dd>
>   </dlentry></dl></p>
> @@ -37,82 +37,78 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry></dl> </p>
>   <p>?????????????<ul>
>   <li>??<uicontrol>??</uicontrol>?????????????????</li>
> -<li>??<uicontrol>????</uicontrol>???????????</li>
> -<li>??<uicontrol>??</uicontrol>??????</li>
> +<li>??<uicontrol>??</uicontrol>???????????????</li>
> +<li>??<uicontrol>??</uicontrol>??????????????????</li>
>   <li>??<uicontrol>??</uicontrol>???????????????????????</li>
> +<li>??<uicontrol>??</uicontrol>??????</li>
> +<li>??<uicontrol>??</uicontrol>????????</li>
> +<li>??<uicontrol>????</uicontrol>??????????</li>
>   <li>??<uicontrol>??</uicontrol>??????</li>
> -</ul>???????????????????<uicontrol>??? (+) </uicontrol> ???</p>
> +</ul>?????????????<uicontrol>?? (+)</uicontrol> ???</p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="zh-cn">
> -<title>?????</title>
> -<shortdesc>??????????????</shortdesc>
> +<title>????</title>
> +<shortdesc>??????????????</shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>?????????????</li>
> -<li rev="rev1">?????<ul>
> -<li>?????????????????????</li>
> +<li>????????????</li>
> +<li>?????<ul>
> +<li>????????????????????</li>
>   <li>?????????????<uicontrol>????</uicontrol>??????</li>
> -</ul></li>
> +</ul>???????????????????????????</li>
>   <li>??<uicontrol>??</uicontrol>?</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="zh-cn">
>   <title>????</title>
> -<shortdesc>?????????????????????????????????????????????</shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
> +<shortdesc>????????????????????????????????????????????</shortdesc>
>   <csbody>
> -<p>??????????<wintitle>??</wintitle>????????????<dl>
> -<dlentry>
> -<dt>??</dt>
> -<dd>???????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>CPU ?</dt>
> -<dd>???????????????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>????? MB ???????????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>????????????????? Linux ?????????? (Livetile) ??????</dd>
> -</dlentry></dl></p>
> -<p>???<wintitle>???</wintitle>????????????</p>
>   <dl><dlentry>
> +<dt>??</dt>
> +<dd>???????????????????????CPU?????????????????????? CPU
> +????????????????</dd>
> +</dlentry><dlentry>
>   <dt>???</dt>
> -<dd>??????? ISO ????????</dd>
> +<dd>????????????????????????????????????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>??</dt>
> +<dd>???????????????????? MAC ????????????????????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>???</dt>
> +<dd>??????????????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>?? PCI ??</dt>
> +<dd>????????? PCI ??????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>??</dt>
> +<dd>??????????????????????????????????????????????????????????????????????????????</dd>
>   </dlentry></dl>
>   <p> ???????????????????????<uicontrol>??</uicontrol>?</p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="zh-cn">
> -<title>????????????</title>
> -<shortdesc rev="rev1">????????????????????????????? CDROM?????????????????</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="zh-cn">
> +<title>???????</title>
> +<shortdesc>????????????????????</shortdesc>
>   <csbody>
> +<p>?????????????????</p>
>   <ol>
> -<li>??<wintitle>????</wintitle>????????<wintitle>???</wintitle>??</li>
> -<li>???????????????????<uicontrol>???? (/)</uicontrol>??? ISO ???????<uicontrol>??</uicontrol>?</li>
> -<li>???????????????????<uicontrol>????? (-)</uicontrol>????????????<uicontrol>??</uicontrol>?</li>
> -<li>???????????????????<uicontrol>????? (+)</uicontrol>??????? ISO ???????<uicontrol>??</uicontrol>?</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="zh-cn">
> -<title>?? VM ? CDROM</title>
> -<shortdesc rev="rev1">???????????????? CDROM ????</shortdesc>
> -<csbody>
> -<ol>
> -<li>??????????</li>
> -<li>???????????<uicontrol>????</uicontrol>?</li>
> -<li>???????? CDROM ???????? hdc ?????<uicontrol>???? (/)</uicontrol> ???</li>
> -<li>??<wintitle>?? VM ? CDROM</wintitle>??????? ISO ???????????????</li>
> -<li>??<uicontrol>??</uicontrol>?</li>
> +<li>?????????????<uicontrol>??</uicontrol>?</li>
> +<li>?????<note>?????????? SCSI ?
> +iSCSI ???????????????????????????????</note></li>
>   </ol>
> +<p>??????????????<uicontrol>????...</uicontrol>??????????????????</p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_CN/host.dita b/ui/pages/help/zh_CN/host.dita
> index 78a89c3..a8622a2 100644
> --- a/ui/pages/help/zh_CN/host.dita
> +++ b/ui/pages/help/zh_CN/host.dita
> @@ -16,30 +16,30 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li>??<uicontrol>????</uicontrol>??????????</li>
>   <li>??<uicontrol>??</uicontrol>????????? VNC ???????????</li>
>   </ul></p>
> -<p>?????????????????<dl>
> -<dlentry>
> +<p>?????????????????</p>
> +<dl><dlentry>
>   <dt>????</dt>
> -<dd>??????????????????????????????????? GB ???</dd>
> +<dd>???????????????????????????????? CPU ????????? GB ???</dd>
>   </dlentry><dlentry>
>   <dt>??????</dt>
> -<dd>??????????????? CPU?????? I/O ??? I/O ????????<uicontrol>???????????</uicontrol>????????????????????</dd>
> +<dd>??????????????? CPU?????? I/O ??? I/O ??????</dd>
>   </dlentry><dlentry>
>   <dt>????</dt>
>   <dd>???????????????????????????????????????????????<uicontrol>????</uicontrol>???????????????????????????</dd>
>   </dlentry><dlentry>
>   <dt>???</dt>
> -<dd>????????????????????????????????????????????????????????????????????????????? Red Hat Enterprise Linux ? Fedora?????? <filepath>yum</filepath> ??????????? Ubuntu ? Debian?????? <filepath>deb</filepath> ????<p>????? Yum ????????? GPG ????????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>??? GPG ??????????? GPG ????? URL?</p></dd>
> +<dd>????????????????????????????????????????????????????????????????????????????? Red Hat Enterprise Linux ? Fedora?????? <filepath>yum</filepath> ??????????? Ubuntu ? Debian?????? <filepath>deb</filepath> ????<p>????? Yum ????????? GPG ????????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>??? <uicontrol>GPG ??</uicontrol>????????? GPG ????? URL?</p></dd>
>   </dlentry><dlentry>
>   <dt>????</dt>
>   <dd>???????????????????????????????????????????????????????????<p>???????
>   <cmdname>sosreport</cmdname> ??????????? Red
>   Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>?Fedora ? Ubuntu ???????????????????? .tar ???????????????????????????????????????????????????????????????????</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_CN/network.dita b/ui/pages/help/zh_CN/network.dita
> index f6aa532..aa99988 100644
> --- a/ui/pages/help/zh_CN/network.dita
> +++ b/ui/pages/help/zh_CN/network.dita
> @@ -31,7 +31,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li rev="rev1">??<uicontrol>??</uicontrol>????????</li>
>   <li>??<uicontrol>??</uicontrol>????????</li>
>   <li>??<uicontrol>??</uicontrol>????????</li>
> -</ul>????????????????<uicontrol>??? (+)</uicontrol> ???</p>
> +</ul>?????????<uicontrol>?? (+)</uicontrol> ???</p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="zh-cn">
>   <title>????</title>
> @@ -56,6 +56,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_CN/storage.dita b/ui/pages/help/zh_CN/storage.dita
> index cfb09f5..e49dac4 100644
> --- a/ui/pages/help/zh_CN/storage.dita
> +++ b/ui/pages/help/zh_CN/storage.dita
> @@ -14,7 +14,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>????????????????<dl>
>   <dlentry>
>   <dt>??</dt>
> -<dd>??????????????</dd>
> +<dd>???????</dd>
> +</dlentry><dlentry>
> +<dt>?????</dt>
> +<dd>?????????????</dd>
>   </dlentry><dlentry>
>   <dt>??</dt>
>   <dd>??????????????????????</dd>
> @@ -34,21 +37,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>??????????????<ul>
>   <li>??<uicontrol>??</uicontrol>?????????????</li>
>   <li>??<uicontrol>????</uicontrol>???????????</li>
> +<li>??<uicontrol>???</uicontrol>??????????????</li>
>   <li>??<uicontrol>????</uicontrol>??????????</li>
>   </ul></p>
> -<p>???????????????????????????????????????<dl><dlentry>
> -<dt>??</dt>
> -<dd>????????<uicontrol>??</uicontrol>?</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>???????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>???????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>????????????</dd>
> -</dlentry></dl>?????????????????<uicontrol>??? (+)</uicontrol> ???</p>
> +<p>??????????????????????????????????????<uicontrol>?? (+)</uicontrol> ???</p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="zh-cn">
>   <title>?????</title>
> @@ -72,13 +64,28 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dt><uicontrol>SCSI ????</uicontrol></dt>
>   <dd>?? SCSI ?????????????? SCSI ????</dd>
>   </dlentry></dl></li>
> +<li>????????????????????????????????????????????????????????????????????
> +</li>
>   <li>??<uicontrol>??</uicontrol>?</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="zh-cn">
> +<title>???</title>
> +<shortdesc>?????????</shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>??? URL ???</dt>
> +<dd>???????????????<filepath>https://my-server/fedora22.img</filepath>?</dd>
> +</dlentry><dlentry>
> +<dt>????</dt>
> +<dd>???????????</dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_CN/templates.dita b/ui/pages/help/zh_CN/templates.dita
> index ca50119..919cd5b 100644
> --- a/ui/pages/help/zh_CN/templates.dita
> +++ b/ui/pages/help/zh_CN/templates.dita
> @@ -11,8 +11,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <title>??</title>
>   <shortdesc>?<wintitle>??</wintitle>?????????? KVM ????????????</shortdesc>
>   <csbody>
> -<p>???????????????<dl>
> -<dlentry>
> +<p>???????????????</p>
> +<dl><dlentry>
>   <dt>????</dt>
>   <dd>????????????</dd>
>   </dlentry><dlentry>
> @@ -24,66 +24,59 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>??</dt>
>   <dd>????????????? MB ???</dd>
> -</dlentry></dl></p>
> -<p>?????????????<ul>
> +</dlentry></dl>
> +<p>?????????????</p>
> +<ul>
>   <li>??<uicontrol>??</uicontrol>??????</li>
> +<li>??<uicontrol>??</uicontrol>??????</li>
>   <li>??<uicontrol>??</uicontrol>??????</li>
> -</ul>????????????????<uicontrol>??? (+)</uicontrol> ???</p>
> +</ul>
> +<p>?????????<uicontrol>?? (+)</uicontrol> ???</p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="zh-cn">
>   <title>????</title>
>   <shortdesc>???????</shortdesc>
>   <csbody>
> -<p>???????????????<dl>
> -<dlentry>
> -<dt>??</dt>
> -<dd>??????</dd>
> +<p>???????????????</p>
> +<dl><dlentry>
> +<dt>??</dt>
> +<dd>??????????????????ISO ???????????????</dd>
>   </dlentry><dlentry>
> -<dt>???</dt>
> -<dd>????????????????????????????</dd>
> +<dt>???</dt>
> +<dd>???????????</dd>
>   </dlentry><dlentry>
> -<dt>??</dt>
> -<dd>????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>CPU ??</dt>
> -<dd>???????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>????????????? MB ???</dd>
> +<dt>??</dt>
> +<dd>???? KVM ??????????????????????</dd>
>   </dlentry><dlentry>
> -<dt>??</dt>
> -<dd>?????? GB ???</dd>
> -</dlentry><dlentry>
> -<dt>CDROM</dt>
> -<dd>???? KVM ??? ISO ????????????</dd>
> -</dlentry><dlentry>
> -<dt>???</dt>
> -<dd>????????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>?? KVM ??????????????????????</dd>
> -</dlentry></dl> ???????????????????????<uicontrol>??</uicontrol>?</p>
> +<dt>???</dt>
> +<dd>? <uicontrol>CPU ?</uicontrol>??????????????????</dd>
> +<dd>?????????????? CPU ???</dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>????</title>
>   <shortdesc>?????????????????? ISO ??????ISO????????????</shortdesc>
>   <csbody>
> -<p>????????????????<dl>
> -<dlentry>
> +<p>????????????????</p>
> +<dl><dlentry>
>   <dt>?? ISO ??</dt>
> -<dd>?????????????? ISO ???????????</dd>
> +<dd>?????????????????????????? ISO ???</dd>
> +</dlentry><dlentry>
> +<dt>??????</dt>
> +<dd>?????????????????</dd>
>   </dlentry><dlentry>
>   <dt>?? ISO ??</dt>
>   <dd>????????? ISO ????????</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>???? - ?? ISO ??</title>
> -<shortdesc>??? ISO ???????</shortdesc>
> +<title>???? - ISO ??</title>
> +<shortdesc>? ISO ????????</shortdesc>
>   <csbody>
> -<p>????????? ISO ???<dl><dlentry>
> +<p>????????????? ISO ???</p>
> +<dl><dlentry>
>   <dt>????</dt>
>   <dd>????????????</dd>
>   </dlentry><dlentry>
> @@ -92,20 +85,21 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry><dlentry>
>   <dt>??</dt>
>   <dd>ISO ??????</dd>
> -</dlentry></dl></p>
> -<p>?? ISO ?????????????????<ul>
> +</dlentry></dl>
> +<p>?? ISO ?????????????????</p>
> +<ul>
>   <li>?????????? ISO ???????<uicontrol>??? ISO ????</uicontrol>?</li>
>   <li>??<uicontrol>??</uicontrol>???????? ISO ???????????<uicontrol>??? ISO ????</uicontrol>?</li>
> -<li>??????? ISO ????????????????????????<ul>
> +<li>?????? ISO ????????????????????????<ul>
>   <li>??<uicontrol>?????? ISO ??</uicontrol>??? ISO ??????</li>
>   <li>??<uicontrol>???? ISO</uicontrol> ????? ISO ???</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_TW/guests.dita b/ui/pages/help/zh_TW/guests.dita
> index cf73785..7807ecc 100644
> --- a/ui/pages/help/zh_TW/guests.dita
> +++ b/ui/pages/help/zh_TW/guests.dita
> @@ -9,21 +9,21 @@ For support please see:
>   https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <cshelp id="kimhvirtm" xml:lang="zh-tw">
>   <title>??</title>
> -<shortdesc>?<wintitle>??</wintitle>?????????? KVM ?????</shortdesc>
> +<shortdesc>?<wintitle>??</wintitle>????????????????</shortdesc>
>   <csbody>
>   <p>?????????????????<dl><dlentry>
>   <dt>??</dt>
> -<dd>????????</dd>
> +<dd>??????</dd>
>   </dlentry><dlentry>
>   <dt>CPU</dt>
> -<dd>????????????????</dd>
> -</dlentry><dlentry>
> -<dt>?? I/O</dt>
> -<dd>????/?????? (KB/s)?</dd>
> +<dd>??????????????</dd>
>   </dlentry><dlentry>
>   <dt>?? I/O</dt>
>   <dd>????/?????? (KB/s)?</dd>
>   </dlentry><dlentry>
> +<dt>?? I/O</dt>
> +<dd>????/?????? (KB/s)?</dd>
> +</dlentry><dlentry>
>   <dt>Livetile</dt>
>   <dd>????????????????? <tm tmtype="tm" trademark="Linux">Linux</tm> ??????????????????????</dd>
>   </dlentry></dl></p>
> @@ -37,84 +37,89 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </dlentry></dl> </p>
>   <p>???????????????<ul>
>   <li>??<uicontrol>??</uicontrol>?????????????????</li>
> -<li>??<uicontrol>????</uicontrol>???????????</li>
> -<li>??<uicontrol>??</uicontrol>??????</li>
> +<li>??<uicontrol>??</uicontrol>????????????????
> +</li>
> +<li>??<uicontrol>??</uicontrol>???????????????????
> +</li>
>   <li>??<uicontrol>??</uicontrol>????????????????????????</li>
> +<li>??<uicontrol>??</uicontrol>?????</li>
> +<li>??<uicontrol>??</uicontrol>????????</li>
> +<li>??<uicontrol>????</uicontrol>??????????
> +</li>
>   <li>??<uicontrol>??</uicontrol>??????</li>
> -</ul>????????????????????????<uicontrol>?? (+)</uicontrol> ???</p>
> +</ul>????????????????<uicontrol>?? (+)</uicontrol> ???
> +</p>
>   </csbody>
>   <cshelp id="kimhvirtmcrt" xml:lang="zh-tw">
> -<title>??????</title>
> -<shortdesc>?????????????</shortdesc>
> +<title>????</title>
> +<shortdesc>????????????</shortdesc>
>   <csbody>
>   <p> <ol>
> -<li>??????????????</li>
> -<li rev="rev1">?????<ul>
> +<li>?????????????</li>
> +<li>?????<ul>
>   <li>??????????????????</li>
>   <li>???????????<uicontrol>????</uicontrol>??????</li>
> -</ul></li>
> +</ul>????????????????????????</li>
>   <li>???<uicontrol>??</uicontrol>?</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhvirtmedit" xml:lang="zh-tw">
>   <title>????</title>
> -<shortdesc>????????????????????????????????????????????</shortdesc>
> -<csprolog><csmetadata></csmetadata></csprolog>
> +<shortdesc>??????????????????????????????????????????</shortdesc>
>   <csbody>
> -<p>????????????<wintitle>??</wintitle>???????????<dl>
> -<dlentry>
> -<dt>??</dt>
> -<dd>??????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>CPU</dt>
> -<dd>???????????????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>???</dt>
> -<dd>????? (MB)??????????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>???????????????????? (Livetile) ????? Linux ??????????</dd>
> -</dlentry></dl></p>
> -<p>?????????<wintitle>??</wintitle>?????</p>
>   <dl><dlentry>
> +<dt>??</dt>
> +<dd>??????????????????????CPU????????
> +??????????????
> +?? CPU ????????????????</dd>
> +</dlentry><dlentry>
>   <dt>???</dt>
> -<dd>??????? ISO ??????</dd>
> +<dd>???????????????
> +???????????????????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>??</dt>
> +<dd>???????????????????? MAC ???
> +?????????????????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>???</dt>
> +<dd>?????????????????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>?? PCI ??</dt>
> +<dd>?????????? PCI ?????</dd>
> +</dlentry></dl>
> +<dl><dlentry>
> +<dt>Snapshot</dt>
> +<dd>????? Snapshot???????????? Snapshot?
> +???? Snapshot ?????????????????????? Snapshot ???????????????????????
> +</dd>
>   </dlentry></dl>
>   <p> ?????????????????????<uicontrol>??</uicontrol>?</p>
>   </csbody>
>   </cshelp>
> -<cshelp id="kimstoragedevice" xml:lang="zh-tw">
> -<title>????????????</title>
> -<shortdesc rev="rev1">?????????????????????????????? CDROM??????????????????</shortdesc>
> +<cshelp id="kimhvirtmclone" xml:lang="zh-tw">
> +<title>????</title>
> +<shortdesc>???????????????</shortdesc>
>   <csbody>
> +<p>????????????????</p>
>   <ol>
> -<li>??<wintitle>????</wintitle>????????<wintitle>???</wintitle>??</li>
> -<li>???????????????<uicontrol>???? (/)</uicontrol> ?????????
> -ISO ??????????<uicontrol>??</uicontrol>?</li>
> -<li>???????????????<uicontrol>???? (/)</uicontrol> ?????????????????<uicontrol>??</uicontrol>?</li>
> -<li>?????????????????<uicontrol>?? (+)</uicontrol> ??????????????
> -ISO ??????????<uicontrol>??</uicontrol>?</li>
> -</ol>
> -</csbody>
> -</cshelp>
> -<cshelp id="kimreplacemedia" xml:lang="zh-tw">
> -<title>??????? CDROM</title>
> -<shortdesc rev="rev1">????????????????? CDROM ????</shortdesc>
> -<csbody>
> -<ol>
> -<li>??????????</li>
> -<li>????????????<uicontrol>????</uicontrol>?</li>
> -<li>??????? CDROM ??????????? hdc ?????<uicontrol>???? (/)</uicontrol> ???</li>
> -<li>??<wintitle>??????? CDROM</wintitle>??????? ISO ????????????????</li>
> -<li>???<uicontrol>??</uicontrol>?</li>
> +<li>???????????????<uicontrol>??</uicontrol>?
> +</li>
> +<li>?????<note>????????? SCSI ? iSCSI ???????????????????????????????????
> +</note></li>
>   </ol>
> +<p>?????????????????<uicontrol>????...</uicontrol>?????????????????????
> +</p>
> +
>   </csbody>
>   </cshelp>
>   <?tm 1391540919 3?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 45645_6 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 04963_6 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 231 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_TW/host.dita b/ui/pages/help/zh_TW/host.dita
> index a55aae4..550945e 100644
> --- a/ui/pages/help/zh_TW/host.dita
> +++ b/ui/pages/help/zh_TW/host.dita
> @@ -16,13 +16,13 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li>??<uicontrol>????</uicontrol>??????????</li>
>   <li>??<uicontrol>??</uicontrol>????????? VNC ????????????????</li>
>   </ul></p>
> -<p>??????????????????<dl>
> -<dlentry>
> +<p>??????????????????</p>
> +<dl><dlentry>
>   <dt>????</dt>
> -<dd>?????????????????????????????????????? (GB)?</dd>
> +<dd>??????????????????????????????????? CPU ???????? (GB)?</dd>
>   </dlentry><dlentry>
>   <dt>??????</dt>
> -<dd>????????????????? CPU??????? I/O ??? I/O ????????<uicontrol>???????????</uicontrol>?????????????????????</dd>
> +<dd>????????????????? CPU??????? I/O ??? I/O ??????</dd>
>   </dlentry><dlentry>
>   <dt>????</dt>
>   <dd>???????????????????????????????????????????????<uicontrol>????</uicontrol>?????????????????????????</dd>
> @@ -31,20 +31,19 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dd>??????????????????????????????????????????????????????????????????????????????
>   Red Hat Enterprise Linux ? Fedora?????? <filepath>yum</filepath> ???????????
>   Ubuntu ? Debian?????? <filepath>deb</filepath> ????<p>???????
> -yum ????????? GPG ???????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>???
> -GPG ??????????? GPG ???? URL?</p></dd>
> +yum ????????? GPG ???????????????????????????????<uicontrol>??</uicontrol>???<uicontrol>?</uicontrol>??? <uicontrol>GPG ??</uicontrol>????????? GPG ???? URL?</p></dd>
>   </dlentry><dlentry>
>   <dt>????</dt>
>   <dd>???????????????????????????????????????????????????<p>???????
>   <cmdname>sosreport</cmdname> ???????????? Red
>   Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>?Fedora
>   ? Ubuntu ??????????? .tar ????????????????????????????????????????????????????????????????????????????</p> </dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   <?tm 1392659967 1?>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47930_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42248_4 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 232 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_TW/network.dita b/ui/pages/help/zh_TW/network.dita
> index f392060..7c2926b 100644
> --- a/ui/pages/help/zh_TW/network.dita
> +++ b/ui/pages/help/zh_TW/network.dita
> @@ -31,7 +31,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <li rev="rev1">??<uicontrol>??</uicontrol>????????</li>
>   <li>??<uicontrol>??</uicontrol>????????</li>
>   <li>??<uicontrol>??</uicontrol>????????</li>
> -</ul>???????????????????<uicontrol>?? (+)</uicontrol> ???</p>
> +</ul>????????????<uicontrol>?? (+)</uicontrol> ???
> +</p>
>   </csbody>
>   <cshelp id="kimhnetwcrt" xml:lang="zh-tw">
>   <title>????</title>
> @@ -56,6 +57,6 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 47050_3 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 42005_3 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 230 -->
> -<!-- T9N_SH1P_STR1NG KVM21AAP001 3 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_TW/storage.dita b/ui/pages/help/zh_TW/storage.dita
> index 971619c..ff3ab95 100644
> --- a/ui/pages/help/zh_TW/storage.dita
> +++ b/ui/pages/help/zh_TW/storage.dita
> @@ -14,7 +14,10 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>??????????????????<dl>
>   <dlentry>
>   <dt>??</dt>
> -<dd>??????????????</dd>
> +<dd>???????</dd>
> +</dlentry><dlentry>
> +<dt>??????</dt>
> +<dd>???????????</dd>
>   </dlentry><dlentry>
>   <dt>??</dt>
>   <dd>????????????????????????</dd>
> @@ -34,21 +37,12 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <p>????????????????<ul>
>   <li>??<uicontrol>??</uicontrol>??????????????</li>
>   <li>??<uicontrol>????</uicontrol>?????????????</li>
> +<li>??<uicontrol>????</uicontrol>?????????????????
> +</li>
>   <li>??<uicontrol>????</uicontrol>????????????</li>
>   </ul></p>
> -<p>??????????????????????????????????????????<dl><dlentry>
> -<dt>??</dt>
> -<dd>?????????<uicontrol>??</uicontrol>?</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>?????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>?????????????</dd>
> -</dlentry></dl>????????????????????<uicontrol>?? (+)</uicontrol> ???</p>
> +<p>????????????????????????????????????????????<uicontrol>?? (+)</uicontrol> ???
> +</p>
>   </csbody>
>   <cshelp id="kimhdefstor" xml:lang="zh-tw">
>   <title>?????</title>
> @@ -76,13 +70,29 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <dt><uicontrol>SCSI ????</uicontrol></dt>
>   <dd>?? SCSI ???????????????? SCSI ????</dd>
>   </dlentry></dl></li>
> +<li>????????????????????????????????????
> +????????????????????????????????????
> +</li>
>   <li>???<uicontrol>??</uicontrol>?</li>
>   </ol> </p>
>   </csbody>
>   </cshelp>
> +<cshelp id="kimhdefstor" xml:lang="zh-tw">
> +<title>????</title>
> +<shortdesc>??????????</shortdesc>
> +<csbody>
> +<dl><dlentry>
> +<dt>??? URL ??</dt>
> +<dd>???????????????<filepath>https://my-server/fedora22.img</filepath>?</dd>
> +</dlentry><dlentry>
> +<dt>????</dt>
> +<dd>?????????????</dd>
> +</dlentry></dl>
> +</csbody>
> +</cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 22336_4 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 52145_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 233 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->
> diff --git a/ui/pages/help/zh_TW/templates.dita b/ui/pages/help/zh_TW/templates.dita
> index 4b3a6a6..38617a8 100644
> --- a/ui/pages/help/zh_TW/templates.dita
> +++ b/ui/pages/help/zh_TW/templates.dita
> @@ -12,8 +12,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>   <shortdesc>?<wintitle>??</wintitle>???????????
>   KVM ?????????????</shortdesc>
>   <csbody>
> -<p>?????????????????<dl>
> -<dlentry>
> +<p>?????????????????</p>
> +<dl><dlentry>
>   <dt>OS</dt>
>   <dd>????????????????</dd>
>   </dlentry><dlentry>
> @@ -25,66 +25,63 @@ KVM ?????????????</shortdesc>
>   </dlentry><dlentry>
>   <dt>???</dt>
>   <dd>????????????? (MB)?</dd>
> -</dlentry></dl></p>
> -<p>???????????????<ul>
> +</dlentry></dl>
> +<p>???????????????</p>
> +<ul>
>   <li>??<uicontrol>??</uicontrol>??????</li>
> +<li>??<uicontrol>??</uicontrol>??????</li>
>   <li>??<uicontrol>??</uicontrol>??????</li>
> -</ul>???????????????????<uicontrol>?? (+)</uicontrol> ???</p>
> +</ul>
> +<p>????????????<uicontrol>?? (+)</uicontrol> ???
> +</p>
>   </csbody>
>   <cshelp id="kimhedittempl" xml:lang="zh-tw">
>   <title>????</title>
>   <shortdesc>???????</shortdesc>
>   <csbody>
> -<p>?????????????????<dl>
> -<dlentry>
> -<dt>??</dt>
> -<dd>??????</dd>
> +<p>?????????????????</p>
> +<dl><dlentry>
> +<dt>??</dt>
> +<dd>??????????????????ISO ??????????????
> +</dd>
>   </dlentry><dlentry>
> -<dt>???</dt>
> -<dd>??????????????????????????</dd>
> +<dt>???</dt>
> +<dd>???????????</dd>
>   </dlentry><dlentry>
> -<dt>??</dt>
> -<dd>?????????????????????</dd>
> -</dlentry><dlentry>
> -<dt>CPU ??</dt>
> -<dd>????????????</dd>
> -</dlentry><dlentry>
> -<dt>???</dt>
> -<dd>?????????????? (MB)?</dd>
> +<dt>??</dt>
> +<dd>????? KVM ??????????
> +??????????</dd>
>   </dlentry><dlentry>
> -<dt>??</dt>
> -<dd>???? (GB)?</dd>
> -</dlentry><dlentry>
> -<dt>CDROM</dt>
> -<dd>???? KVM ??? ISO ??????????</dd>
> -</dlentry><dlentry>
> -<dt>???</dt>
> -<dd>????????????</dd>
> -</dlentry><dlentry>
> -<dt>??</dt>
> -<dd>KVM ???????????????????????</dd>
> -</dlentry></dl> ?????????????????????<uicontrol>??</uicontrol>?</p>
> +<dt>???</dt>
> +<dd>? <uicontrol>CPU ??</uicontrol>??????????????????
> +</dd>
> +<dd>??????????????? CPU ???</dd>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddtempl">
>   <title>????</title>
>   <shortdesc>?????????????????? ISO ?????? 'ISO' ????????????</shortdesc>
>   <csbody>
> -<p>????????????????<dl>
> -<dlentry>
> +<p>????????????????</p>
> +<dl><dlentry>
>   <dt>?? ISO ???</dt>
>   <dd>????????????????????? ISO ????</dd>
>   </dlentry><dlentry>
> +<dt>?????</dt>
> +<dd>????????????????</dd>
> +</dlentry><dlentry>
>   <dt>?? ISO ???</dt>
>   <dd>????????? ISO ?????????</dd>
> -</dlentry></dl></p>
> +</dlentry></dl>
>   </csbody>
>   </cshelp>
>   <cshelp id="kimhaddloct">
> -<title>???? - ?? ISO ???</title>
> -<shortdesc>??? ISO ????????</shortdesc>
> +<title>???? - ISO ???</title>
> +<shortdesc>? ISO ????????</shortdesc>
>   <csbody>
> -<p>?????????? ISO ????<dl><dlentry>
> +<p>???????????? ISO ????</p>
> +<dl><dlentry>
>   <dt>OS</dt>
>   <dd>????????????????</dd>
>   </dlentry><dlentry>
> @@ -93,20 +90,21 @@ KVM ?????????????</shortdesc>
>   </dlentry><dlentry>
>   <dt>??</dt>
>   <dd>ISO ???????</dd>
> -</dlentry></dl></p>
> -<p>??? ISO ??????????????????<ul>
> +</dlentry></dl>
> +<p>??? ISO ??????????????????</p>
> +<ul>
>   <li>?????????? ISO ?????????<uicontrol>??? ISO ????</uicontrol>?</li>
>   <li>??<uicontrol>??</uicontrol>???????? ISO ?????????????<uicontrol>??? ISO ????</uicontrol>?</li>
>   <li>?????? ISO ?????????????????????????<ul>
>   <li>??<uicontrol>??????? ISO ??</uicontrol>??? ISO ???????</li>
>   <li>???<uicontrol>???? ISO</uicontrol> ????? ISO ????</li>
>   </ul></li>
> -</ul></p>
> +</ul>
>   </csbody>
>   </cshelp>
>   </cshelp>
>   
>   
> -<!-- ENGL1SH_VERS10N 61085_5 DO NOT REMOVE OR CHANGE THIS LINE -->
> +<!-- ENGL1SH_VERS10N 24458_5 DO NOT REMOVE OR CHANGE THIS LINE -->
>   <!-- T9N_SRC_ID 229 -->
> -<!-- T9N_SH1P_STR1NG KV211AAP001 1 -->
> +<!-- T9N_SH1P_STR1NG KV310AAP001 1 -->