[PATCH] Issue #587: Man page submission for kimchid
by frediz＠linux.vnet.ibm.com
From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com>
Adding a manpage and handling it in Makefile.am
---
Makefile.am | 2 ++
docs/kimchid.8 | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+)
create mode 100644 docs/kimchid.8
diff --git a/Makefile.am b/Makefile.am
index 36e12d0..0720277 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,8 @@
SUBDIRS = src ui docs contrib tests po config plugins
+man_MANS = docs/kimchid.8
+
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = --install -I m4
diff --git a/docs/kimchid.8 b/docs/kimchid.8
new file mode 100644
index 0000000..9591b29
--- /dev/null
+++ b/docs/kimchid.8
@@ -0,0 +1,100 @@
+.TH KIMCHI 1 "February 05, 2015" "Version 1.4.0" "Kimchi Manual"
+.SH NAME Kimchi \- HTML5 based management tool for KVM
+.SH SYNOPSIS
+.B kimchid
+[\fB-h\fP|\fB--help\fP] [\fB--host\fP \fIhost\fP] [\fB--port\fP \fIport\fP]
+[\fB--ssl-port\fP \fIssl_port\fP] [\fB--cherrypy_port\fP \fIcherrypy_port\fP]
+[\fB--log-level\fP \fIlog_level\fP] [\fB--access-log\fP \fIaccess_log\fP]
+[\fB--error-log\fP \fIerror_log\fP] [\fB--environment\fP \fIenvironment\fP]
+[\fB--federation\fP \fIfederation\fP] [\fB--test\fP]
+.SH DESCRIPTION
+\fBKimchi\fP is an HTML5 based management tool for KVM. It is designed to make
+it as easy as possible to get started with KVM and create your first guest.
+\fBkimchid\fP launches the daemon on the hypervisor host which manages KVM guests through
+libvirt. The management interface is accessed over the web using a browser that
+supports HTML5.
+.SH OPTIONS
+The following options are supported:
+.TP
+\fB-h\fP , \fB--help\fP
+Show the help message and exit
+.TP
+\fB--host\fP
+Specify the hostname to listen on
+.TP
+\fB--port\fP
+Specify the port to listen on (default \fI8000\fP)
+.TP
+\fB--ssl-port\fP
+Specify the port to enable SSL (default \fI8001\fP)
+.TP
+\fB--cherrypy_port\fP
+Specify the Cherrypy server port (default \fI8010\fP)
+.TP
+\fB--log-level\fP
+Specify the log level
+.TP
+\fB--access-log\fP
+Specify the access log file
+.TP
+\fB--environment\fP
+Specify the running environment of kimchi server
+.TP
+\fB--federation\fP
+Register and discover Kimchi peers in the same network using openSLP. Check
+README-federation for more details.
+.TP
+\fB--test\fP
+Run server in mock model
+.SH LICENCE
+.br
+Kimchi is distributed pursuant to the terms of two different licenses.
+The user interface (located in ui/ in this distribution) is governed by
+the Apache License version 2.0.
+
+Except the code under ui/spice-html5 which is imported from spice-html5 project
+(http://cgit.freedesktop.org/spice/spice-html5) and under ui/libs which is
+imported from JQuery UI (http://jqueryui.com)
+
+The rest of this distribution is governed by the GNU Lesser General Public
+License version 3.
+
+See COPYING.LGPL and COPYING.ASL2.
+.SH BUGS
+Current bugs can be found here : https://github.com/kimchi-project/kimchi/issues
+.br
+If you find any, please open an issue : https://github.com/kimchi-project/kimchi/issues/new
+.SH AUTHOR
+\fBAdam King\fP <rak(a)linux.vnet.ibm.com>,
+\fBAdam Litke\fP <agl(a)linux.vnet.ibm.com>,
+\fBAdriano Botega\fP <abotega(a)linux.vnet.ibm.com>,
+\fBAlexandre Tanaka Hirata\fP <hirata(a)linux.vnet.ibm.com>,
+\fBAline Manera\fP <alinefm(a)br.ibm.com>,
+\fBapporc\fP <appleorchard2000(a)gmail.com>,
+\fBAnthony Liguori\fP <aliguori(a)us.ibm.com>,
+\fBBing Bu Cao\fP <mars(a)linux.vnet.ibm.com>,
+\fBChristy Perez\fP <christy(a)linux.vnet.ibm.com>,
+\fBCole Robinson\fP <crobinso(a)redhat.com>,
+\fBCr��stian Viana\fP <vianac(a)linux.vnet.ibm.com>,
+\fBDaniel H Barboza\fP <danielhb(a)linux.vnet.ibm.com>,
+\fBEduardo Elias Ferreira\fP <edusf(a)linux.vnet.ibm.com>,
+\fBEli Qiao(Li Yong Qiao)\fP <taget(a)linux.vnet.ibm.com>,
+\fBHongliang Wang\fP <hlwang(a)linux.vnet.ibm.com>,
+\fBLeonardo Garcia\fP <lagarcia(a)br.ibm.com>,
+\fBLise Noble\fP <lwnoble(a)us.ibm.com>,
+\fBMalcolm Yu\fP <minghaoyusombie(a)gmail.com>,
+\fBMark Wu\fP <wudxw(a)linux.vnet.ibm.com>,
+\fBMei Na Zhou\fP <zhoumein(a)linux.vnet.ibm.com>,
+\fBPaulo Vital\fP <pvital(a)linux.vnet.ibm.com>,
+\fBPradeep K Surisetty\fP <psuriset(a)linux.vnet.ibm.com>,
+\fBRamon Medeiros\fP <ramonn(a)linux.vnet.ibm.com>,
+\fBRodrigo Trujilo\fP <rodrigo.trujillo(a)linux.vnet.ibm.com>,
+\fBRoyce Lv\fP <lvroyce(a)linux.vnet.ibm.com>,
+\fBShaoHe Feng\fP <shaohef(a)linux.vnet.ibm.com>,
+\fBShu Ming\fP <shuming(a)linux.vnet.ibm.com>,
+\fBToby Allsopp\fP <toby(a)MI6.GEN.NZ>,
+\fBTony Breeds\fP <tonyb(a)au1.ibm.com>,
+\fBXin BJ Ding\fP <xinding(a)cn.ibm.com>,
+\fBYu Xin Huo\fP <huoyuxin(a)linux.vnet.ibm.com>,
+\fBZhou Zheng Sheng\fP <zhshzhou(a)linux.vnet.ibm.com>,
+.SH SEE ALSO
--
1.9.1
9 years, 7 months
- 4
- 5
[PATCH 0/5] Create VMs Asynchronously
by Christy Perez
If a guest has a large disk, and uses a filesystem that requires
preallocation, it can take several minutes to create a VM. During that
time, kimchi is tied up by the VM creation.
This patch changes the VMs Collection to be an AsyncCollection.
Another change required for this was to create a more granular way to
query tasks. Currently it is not possible (using the API) to query tasks
for the same collection or resource type that may have different operations.
For example, VM cloning is also an asynchronous operation. For the guests tab,
the UI was querying all running tasks and displaying them with the Cloning
label. This picked up VMs that were being created as well. For more information
about how the tasks can be queried, see the updated API doc and the UI change.
Christy Perez (5):
Granular Task Queries: Backend
Granular task queries test updates
More Granular Task Queries: UI
Create guests asynchronously: Backend
Async vm creation test updates
docs/API.md | 14 +++++++
src/kimchi/asynctask.py | 6 ++-
src/kimchi/control/vms.py | 4 +-
src/kimchi/mockmodel.py | 7 ++--
src/kimchi/model/debugreports.py | 4 +-
src/kimchi/model/host.py | 4 +-
src/kimchi/model/storagepools.py | 2 +-
src/kimchi/model/storagevolumes.py | 7 ++--
src/kimchi/model/tasks.py | 1 -
src/kimchi/model/vms.py | 33 ++++++++++++---
src/kimchi/model/vmsnapshots.py | 3 +-
src/kimchi/utils.py | 4 +-
tests/test_authorization.py | 23 ++++++-----
tests/test_mockmodel.py | 15 +++++--
tests/test_model.py | 62 ++++++++++++++++++----------
tests/test_rest.py | 82 ++++++++++++++++++++++++++++----------
ui/js/src/kimchi.guest_main.js | 2 +-
17 files changed, 192 insertions(+), 81 deletions(-)
--
2.1.0
9 years, 7 months
- 1
- 6
[PATCH v4] Fix grammar for selected messages
by Christy Perez
There were two things I saw that needed to be fixed:
- The ISO scan warning, "It may take long time," and
- The interface error for an exsiting interface, "The
interface already exist."
Fixed these and corrected all the translation strings for other
changes.
Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com>
---
po/de_DE.po | 123 ++++++++++++++++++++++++----------------------
po/en_US.po | 94 +++++++++++++++++++-----------------
po/es_ES.po | 124 ++++++++++++++++++++++++-----------------------
po/fr_FR.po | 126 +++++++++++++++++++++++++-----------------------
po/it_IT.po | 124 ++++++++++++++++++++++++-----------------------
po/ja_JP.po | 121 +++++++++++++++++++++++-----------------------
po/kimchi.pot | 95 ++++++++++++++++++------------------
po/ko_KR.po | 120 ++++++++++++++++++++++-----------------------
po/pt_BR.po | 124 ++++++++++++++++++++++++-----------------------
po/ru_RU.po | 120 ++++++++++++++++++++++-----------------------
po/zh_CN.po | 30 +++++++-----
po/zh_TW.po | 120 +++++++++++++++++++++++----------------------
ui/pages/i18n.json.tmpl | 2 +-
13 files changed, 690 insertions(+), 633 deletions(-)
diff --git a/po/de_DE.po b/po/de_DE.po
index 5116d1f..6c4a089 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s implementiert keine Aktualisierungsmethode"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Erstellen ist nicht zulässig für %(resource)s"
@@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -801,6 +801,9 @@ msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Es konnte keine freie IP-Adresse für Netz '%(name)s' gefunden werden"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "Netzname muss eine Zeichenfolge sein"
@@ -823,19 +826,19 @@ msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Netz %(name)s konnte nicht gelöscht werden. Es sind einige virtuellen "
-"Maschinen und/oder Vorlagen mit diesem Netz verknüpft."
+"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
+"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
-"Maschinen und/oder Vorlagen mit diesem Netz verknüpft."
+"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1334,36 +1337,6 @@ msgstr "Abbrechen"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Speichereinheit zur virtuellen Maschine hinzufügen"
-
-msgid "Device Type"
-msgstr "Einheitentyp"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt."
-
-msgid "Storage Pool"
-msgstr "Speicherpool"
-
-msgid "Storage pool which volume located in"
-msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
-
-msgid "Storage Volume"
-msgstr "Speicherpoolname"
-
-msgid "Storage volume to be attached"
-msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein"
-
-msgid "File Path"
-msgstr "Dateipfad"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM."
-
-msgid "Attach"
-msgstr "Anhängen"
-
msgid "Cloning"
msgstr ""
@@ -1394,6 +1367,36 @@ msgstr "Herunterfahren"
msgid "Delete"
msgstr "Löschen"
+msgid "Add a Storage Device to VM"
+msgstr "Speichereinheit zur virtuellen Maschine hinzufügen"
+
+msgid "Device Type"
+msgstr "Einheitentyp"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt."
+
+msgid "Storage Pool"
+msgstr "Speicherpool"
+
+msgid "Storage pool which volume located in"
+msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
+
+msgid "Storage Volume"
+msgstr "Speicherpoolname"
+
+msgid "Storage volume to be attached"
+msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein"
+
+msgid "File Path"
+msgstr "Dateipfad"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM."
+
+msgid "Attach"
+msgstr "Anhängen"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist "
@@ -1466,7 +1469,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Dies ist keine gültige ISO-Datei."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Dies wird einige Zeit dauern. Möchten Sie fortfahren?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1920,21 +1923,6 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Neuen Speicherpool definieren"
@@ -2013,6 +2001,21 @@ msgstr "SCSI-Adapter"
msgid "Please, wait..."
msgstr "Bitte warten..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Vorlage hinzufügen"
@@ -2208,3 +2211,7 @@ msgstr "Zuordnung:"
msgid "No templates found."
msgstr "Keine Vorlagen gefunden."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr ""
+#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s"
diff --git a/po/en_US.po b/po/en_US.po
index 05ca48a..5e66487 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method"
msgstr ""
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr ""
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr ""
@@ -292,6 +288,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -711,6 +711,10 @@ msgstr ""
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr ""
+#, python-format
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr ""
@@ -731,14 +735,14 @@ msgstr ""
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
#, python-format
@@ -1210,64 +1214,64 @@ msgstr ""
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
+msgid "Cloning"
msgstr ""
-msgid "Device Type"
+msgid "Start"
msgstr ""
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgid "Reset"
msgstr ""
-msgid "Storage Pool"
+msgid "Power Off"
msgstr ""
-msgid "Storage pool which volume located in"
+msgid "Actions"
msgstr ""
-msgid "Storage Volume"
+msgid "Connect"
msgstr ""
-msgid "Storage volume to be attached"
+msgid "Clone"
msgstr ""
-msgid "File Path"
+msgid "Edit"
msgstr ""
-msgid "The ISO file path in the server for CDROM."
+msgid "Shut Down"
msgstr ""
-msgid "Attach"
+msgid "Delete"
msgstr ""
-msgid "Cloning"
+msgid "Add a Storage Device to VM"
msgstr ""
-msgid "Start"
+msgid "Device Type"
msgstr ""
-msgid "Reset"
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Power Off"
+msgid "Storage Pool"
msgstr ""
-msgid "Actions"
+msgid "Storage pool which volume located in"
msgstr ""
-msgid "Connect"
+msgid "Storage Volume"
msgstr ""
-msgid "Clone"
+msgid "Storage volume to be attached"
msgstr ""
-msgid "Edit"
+msgid "File Path"
msgstr ""
-msgid "Shut Down"
+msgid "The ISO file path in the server for CDROM."
msgstr ""
-msgid "Delete"
+msgid "Attach"
msgstr ""
msgid "The username or password you entered is incorrect. Please try again."
@@ -1338,7 +1342,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr ""
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr ""
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1761,21 +1765,6 @@ msgstr ""
msgid "No"
msgstr ""
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr ""
@@ -1846,6 +1835,21 @@ msgstr ""
msgid "Please, wait..."
msgstr ""
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 573dc03..4816918 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s no implementa método de actualización"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Crear no está permitido para %(resource)s"
@@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -810,6 +810,9 @@ msgstr "No se puede crear la red %(name)s. Detalles: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "No se puede encontrar una dirección IP libre para la red '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "La interfaz %(iface)s ya existe"
+
msgid "Network name must be a string"
msgstr "El nombre de red debe ser una serie"
@@ -832,19 +835,19 @@ msgstr "Especifique el nombre y el tipo para crear una red"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales y/o "
-"plantillas enlazadas a esta red."
+"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales %(vms)s "
+"y/o plantillas enlazadas a esta red."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales y/o "
-"plantillas enlazadas a esta red."
+"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales "
+"%(vms)s y/o plantillas enlazadas a esta red."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1352,36 +1355,6 @@ msgstr "Cancelar"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Añadir un dispositivo de almacenamiento a VM"
-
-msgid "Device Type"
-msgstr "Tipo de dispositivo"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"."
-
-msgid "Storage Pool"
-msgstr "Agrupación de almacenamiento"
-
-msgid "Storage pool which volume located in"
-msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie"
-
-msgid "Storage Volume"
-msgstr "Nombre de agrupación de almacenamiento"
-
-msgid "Storage volume to be attached"
-msgstr "El nombre de volumen de almacenamiento debe ser una serie"
-
-msgid "File Path"
-msgstr "Vía de acceso de archivo"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM."
-
-msgid "Attach"
-msgstr "Conectar"
-
msgid "Cloning"
msgstr ""
@@ -1412,6 +1385,36 @@ msgstr "Concluir"
msgid "Delete"
msgstr "Suprimir"
+msgid "Add a Storage Device to VM"
+msgstr "Añadir un dispositivo de almacenamiento a VM"
+
+msgid "Device Type"
+msgstr "Tipo de dispositivo"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"."
+
+msgid "Storage Pool"
+msgstr "Agrupación de almacenamiento"
+
+msgid "Storage pool which volume located in"
+msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie"
+
+msgid "Storage Volume"
+msgstr "Nombre de agrupación de almacenamiento"
+
+msgid "Storage volume to be attached"
+msgstr "El nombre de volumen de almacenamiento debe ser una serie"
+
+msgid "File Path"
+msgstr "Vía de acceso de archivo"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM."
+
+msgid "Attach"
+msgstr "Conectar"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"El nombre de usuario o contraseña que ha especificado es incorrecto. Por "
@@ -1485,7 +1488,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "No es un archivo ISO válido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Tardará mucho tiempo. ¿Desea continuar?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1939,21 +1942,6 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Definir una agrupación de almacenamiento nueva"
@@ -2030,6 +2018,21 @@ msgstr "Adaptador SCSI"
msgid "Please, wait..."
msgstr "Por favor, espere..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Añadir plantilla"
@@ -2227,3 +2230,6 @@ msgstr "Asignado:"
msgid "No templates found."
msgstr "No se han encontrado plantillas."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 715d612..3d49ca3 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2014-08-27 21:30+0000\n"
"Last-Translator: BobSynfig\n"
"Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/"
@@ -30,12 +30,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s n'implémente pas de méthode de mise à jour"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr ""
-"Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans "
-"%(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "La création n'est pas autorisée pour %(resource)s"
@@ -329,6 +323,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -821,6 +819,9 @@ msgstr "Impossible de créer le réseau %(name)s. Détails: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Impossible de trouver une adresse IP libre pour le réseau '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "L'interface %(iface)s existe déjà"
+
msgid "Network name must be a string"
msgstr "Le nom de réseau doit être une chaîne de caractères"
@@ -843,19 +844,19 @@ msgstr "Spécifiez un nom et un type pour créer un réseau"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
"Impossible de supprimer le réseau %(name)s. Il y a des machines virtuelles "
-"et/ou des modèles liés à ce réseau. "
+"%(vms)s et/ou des modèles liés à ce réseau. "
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles et/"
-"ou des modèles liés à ce réseau. "
+"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles"
+"%(vms)s et/ou des modèles liés à ce réseau. "
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1367,6 +1368,36 @@ msgstr "Annuler"
msgid "revert"
msgstr ""
+msgid "Cloning"
+msgstr ""
+
+msgid "Start"
+msgstr "Démarrer"
+
+msgid "Reset"
+msgstr "Réinitialiser"
+
+msgid "Power Off"
+msgstr "Mettre hors tension"
+
+msgid "Actions"
+msgstr "Actions"
+
+msgid "Connect"
+msgstr "Connecter"
+
+msgid "Clone"
+msgstr "Cloner"
+
+msgid "Edit"
+msgstr "Éditer"
+
+msgid "Shut Down"
+msgstr "Éteindre"
+
+msgid "Delete"
+msgstr "Supprimer"
+
msgid "Add a Storage Device to VM"
msgstr "Ajouter un Périphérique de Stockage à la VM"
@@ -1398,36 +1429,6 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM."
msgid "Attach"
msgstr "Attacher"
-msgid "Cloning"
-msgstr ""
-
-msgid "Start"
-msgstr "Démarrer"
-
-msgid "Reset"
-msgstr "Réinitialiser"
-
-msgid "Power Off"
-msgstr "Mettre hors tension"
-
-msgid "Actions"
-msgstr "Actions"
-
-msgid "Connect"
-msgstr "Connecter"
-
-msgid "Clone"
-msgstr "Cloner"
-
-msgid "Edit"
-msgstr "Éditer"
-
-msgid "Shut Down"
-msgstr "Éteindre"
-
-msgid "Delete"
-msgstr "Supprimer"
-
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. "
@@ -1502,7 +1503,7 @@ msgstr "Aucune ISO détectée"
msgid "This is not a valid ISO file."
msgstr "Ce n'est pas un fichier ISO valide."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Cela va prendre un long moment. Voulez-vous continuer ?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1964,21 +1965,6 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-msgid "Add a Volume to Storage Pool"
-msgstr "iAjouter un Volume au Pool de Stockage"
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr "Saisir une URL distante ici"
-
-msgid "Upload a file"
-msgstr "Charger un fichier"
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Définir un Nouveau Pool de Stockage"
@@ -2057,6 +2043,21 @@ msgstr "Adaptateur SCSI"
msgid "Please, wait..."
msgstr "Veuillez patienter..."
+msgid "Add a Volume to Storage Pool"
+msgstr "iAjouter un Volume au Pool de Stockage"
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr "Saisir une URL distante ici"
+
+msgid "Upload a file"
+msgstr "Charger un fichier"
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Ajouter un Modèle"
@@ -2252,3 +2253,8 @@ msgstr "Allocation"
msgid "No templates found."
msgstr "Aucun modèle trouvé."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr ""
+#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans "
+#~ "%(resource)s"
diff --git a/po/it_IT.po b/po/it_IT.po
index 1746bed..1b810db 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s non implementa il metodo di aggiornamento"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Creazione non consentita per %(resource)s"
@@ -311,6 +307,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -783,6 +783,9 @@ msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "L'interfaccia %(iface)s già esistente."
+
msgid "Network name must be a string"
msgstr "Il nome della rete deve essere una stringa"
@@ -805,19 +808,19 @@ msgstr "Specificare nome e tipo per creare una rete"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali e/o "
-"modelli collegati a tale rete."
+"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali "
+"%(vms)s e/o modelli collegati a tale rete."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie/"
-"o modelli collegati a tale rete."
+"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie "
+"%(vms)s e/o modelli collegati a tale rete."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1321,36 +1324,6 @@ msgstr "Annulla"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Aggiungi un dispositivo di memoria alla VM"
-
-msgid "Device Type"
-msgstr "Tipo dispositivo"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"."
-
-msgid "Storage Pool"
-msgstr "Pool di memoria"
-
-msgid "Storage pool which volume located in"
-msgstr "Il percorso del pool di memoria deve essere una stringa"
-
-msgid "Storage Volume"
-msgstr "Nome pool di memoria"
-
-msgid "Storage volume to be attached"
-msgstr "Il nome del volume di memoria deve essere una stringa"
-
-msgid "File Path"
-msgstr "Percorso file"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Il percorso file ISO nel server per CDROM."
-
-msgid "Attach"
-msgstr "Allega"
-
msgid "Cloning"
msgstr ""
@@ -1381,6 +1354,36 @@ msgstr "Arresta"
msgid "Delete"
msgstr "Elimina"
+msgid "Add a Storage Device to VM"
+msgstr "Aggiungi un dispositivo di memoria alla VM"
+
+msgid "Device Type"
+msgstr "Tipo dispositivo"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"."
+
+msgid "Storage Pool"
+msgstr "Pool di memoria"
+
+msgid "Storage pool which volume located in"
+msgstr "Il percorso del pool di memoria deve essere una stringa"
+
+msgid "Storage Volume"
+msgstr "Nome pool di memoria"
+
+msgid "Storage volume to be attached"
+msgstr "Il nome del volume di memoria deve essere una stringa"
+
+msgid "File Path"
+msgstr "Percorso file"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Il percorso file ISO nel server per CDROM."
+
+msgid "Attach"
+msgstr "Allega"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Il nome utente o la password immessi non sono corretti. Ripetere "
@@ -1454,7 +1457,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Non è un file ISO valido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Richiederà molto tempo. Continuare?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1906,21 +1909,6 @@ msgstr "Sì"
msgid "No"
msgstr "No"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Definisci un nuovo pool di memoria"
@@ -2000,6 +1988,21 @@ msgstr "Adattatore SCSI"
msgid "Please, wait..."
msgstr "Attendere..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Aggiungi modello"
@@ -2195,3 +2198,6 @@ msgstr "Allocazione:"
msgid "No templates found."
msgstr "Nessun modello trovato."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s"
diff --git a/po/ja_JP.po b/po/ja_JP.po
index f9fe5ee..c04ea0c 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s は更新メソッドを実装していません"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "パラメーター %(params)s を %(resource)s で更新することは許可されません"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "%(resource)s の作成は許可されません"
@@ -308,6 +304,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -799,6 +799,9 @@ msgstr "ネットワーク %(name)s を作成できません。詳細: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "ネットワーク「%(name)s」のフリー IP アドレスが見つかりません。"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "ネットワーク名はストリングでなければなりません"
@@ -821,19 +824,15 @@ msgstr "ネットワークを作成するには、名前とタイプを指定し
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"ネットワーク %(name)s を削除できません。いくつかの仮想マシン/テンプレートが、"
-"このネットワークにリンクしています。"
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"ネットワーク %(name)s を非アクティブにできません。いくつかの仮想マシン/テンプ"
-"レートが、このネットワークにリンクしています。"
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1333,36 +1332,6 @@ msgstr "取消"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "VM にストレージ・デバイスを追加"
-
-msgid "Device Type"
-msgstr "デバイス・タイプ"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。"
-
-msgid "Storage Pool"
-msgstr "ストレージ・プール"
-
-msgid "Storage pool which volume located in"
-msgstr "ストレージ・プール・パスはストリングでなければなりません"
-
-msgid "Storage Volume"
-msgstr "ストレージ・プール名"
-
-msgid "Storage volume to be attached"
-msgstr "ストレージ・ボリューム名はストリングでなければなりません"
-
-msgid "File Path"
-msgstr "ファイル・パス"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "サーバー内での CDROM の ISO ファイル・パス。"
-
-msgid "Attach"
-msgstr "接続"
-
msgid "Cloning"
msgstr ""
@@ -1393,6 +1362,36 @@ msgstr "シャットダウン"
msgid "Delete"
msgstr "削除"
+msgid "Add a Storage Device to VM"
+msgstr "VM にストレージ・デバイスを追加"
+
+msgid "Device Type"
+msgstr "デバイス・タイプ"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。"
+
+msgid "Storage Pool"
+msgstr "ストレージ・プール"
+
+msgid "Storage pool which volume located in"
+msgstr "ストレージ・プール・パスはストリングでなければなりません"
+
+msgid "Storage Volume"
+msgstr "ストレージ・プール名"
+
+msgid "Storage volume to be attached"
+msgstr "ストレージ・ボリューム名はストリングでなければなりません"
+
+msgid "File Path"
+msgstr "ファイル・パス"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "サーバー内での CDROM の ISO ファイル・パス。"
+
+msgid "Attach"
+msgstr "接続"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。"
@@ -1463,7 +1462,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "有効な ISO ファイルではありません。"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "しばらく時間がかかることがあります。続行しますか?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1907,21 +1906,6 @@ msgstr " はい"
msgid "No"
msgstr " いいえ"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "新規ストレージ・プールの定義"
@@ -1999,6 +1983,21 @@ msgstr "SCSI アダプター"
msgid "Please, wait..."
msgstr "お待ちください..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "テンプレートの追加"
@@ -2193,3 +2192,7 @@ msgstr "割り振り:"
msgid "No templates found."
msgstr "テンプレートが見つかりません。"
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr ""
+#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません"
diff --git a/po/kimchi.pot b/po/kimchi.pot
index 1923fad..f98fc7f 100755
--- a/po/kimchi.pot
+++ b/po/kimchi.pot
@@ -3,12 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -30,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr ""
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr ""
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr ""
@@ -292,6 +287,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -711,6 +710,10 @@ msgstr ""
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr ""
+#, python-format
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr ""
@@ -731,14 +734,14 @@ msgstr ""
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
#, python-format
@@ -1210,64 +1213,64 @@ msgstr ""
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
+msgid "Cloning"
msgstr ""
-msgid "Device Type"
+msgid "Start"
msgstr ""
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgid "Reset"
msgstr ""
-msgid "Storage Pool"
+msgid "Power Off"
msgstr ""
-msgid "Storage pool which volume located in"
+msgid "Actions"
msgstr ""
-msgid "Storage Volume"
+msgid "Connect"
msgstr ""
-msgid "Storage volume to be attached"
+msgid "Clone"
msgstr ""
-msgid "File Path"
+msgid "Edit"
msgstr ""
-msgid "The ISO file path in the server for CDROM."
+msgid "Shut Down"
msgstr ""
-msgid "Attach"
+msgid "Delete"
msgstr ""
-msgid "Cloning"
+msgid "Add a Storage Device to VM"
msgstr ""
-msgid "Start"
+msgid "Device Type"
msgstr ""
-msgid "Reset"
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Power Off"
+msgid "Storage Pool"
msgstr ""
-msgid "Actions"
+msgid "Storage pool which volume located in"
msgstr ""
-msgid "Connect"
+msgid "Storage Volume"
msgstr ""
-msgid "Clone"
+msgid "Storage volume to be attached"
msgstr ""
-msgid "Edit"
+msgid "File Path"
msgstr ""
-msgid "Shut Down"
+msgid "The ISO file path in the server for CDROM."
msgstr ""
-msgid "Delete"
+msgid "Attach"
msgstr ""
msgid "The username or password you entered is incorrect. Please try again."
@@ -1338,7 +1341,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr ""
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr ""
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1761,21 +1764,6 @@ msgstr ""
msgid "No"
msgstr ""
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr ""
@@ -1846,6 +1834,21 @@ msgstr ""
msgid "Please, wait..."
msgstr ""
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr ""
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 0f6f530..0394efe 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s에서는 업데이트 메소드를 구현하지 않음"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "%(resource)s의 작성은 허용되지 않음"
@@ -301,6 +297,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -752,6 +752,9 @@ msgstr "네트워크 %(name)s을(를) 작성할 수 없습니다. 세부사항:
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "네트워크 '%(name)s'에 대한 여유 IP 주소를 찾을 수 없습니다."
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "네트워크 이름은 문자열이어야 합니다."
@@ -773,19 +776,15 @@ msgstr "네트워크를 작성하려면 이름 및 유형을 지정하십시오.
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"%(name)s 네트워크를 삭제할 수 없습니다. 이 네트워크에 일부 가상 머신 및/또는 "
-"템플리트가 링크되어 있습니다."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"%(name)s 네트워크를 비활성화할 수 없습니다. 이 네트워크에 일부 가상 머신 및/"
-"또는템플리트가 링크되어 있습니다."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1264,36 +1263,6 @@ msgstr "취소"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "스토리지 장치를 VM에 추가"
-
-msgid "Device Type"
-msgstr "장치 유형"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다."
-
-msgid "Storage Pool"
-msgstr "스토리지 풀"
-
-msgid "Storage pool which volume located in"
-msgstr "스토리지 풀 경로는 문자열이어야 합니다."
-
-msgid "Storage Volume"
-msgstr "스토리지 풀 이름"
-
-msgid "Storage volume to be attached"
-msgstr "스토리지 볼륨 이름은 문자열이어야 합니다."
-
-msgid "File Path"
-msgstr "파일 경로"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다."
-
-msgid "Attach"
-msgstr "연결"
-
msgid "Cloning"
msgstr ""
@@ -1324,6 +1293,36 @@ msgstr "시스템 종료"
msgid "Delete"
msgstr "삭제"
+msgid "Add a Storage Device to VM"
+msgstr "스토리지 장치를 VM에 추가"
+
+msgid "Device Type"
+msgstr "장치 유형"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다."
+
+msgid "Storage Pool"
+msgstr "스토리지 풀"
+
+msgid "Storage pool which volume located in"
+msgstr "스토리지 풀 경로는 문자열이어야 합니다."
+
+msgid "Storage Volume"
+msgstr "스토리지 풀 이름"
+
+msgid "Storage volume to be attached"
+msgstr "스토리지 볼륨 이름은 문자열이어야 합니다."
+
+msgid "File Path"
+msgstr "파일 경로"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다."
+
+msgid "Attach"
+msgstr "연결"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오."
@@ -1395,7 +1394,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "올바른 ISO 파일이 아닙니다."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "시간이 오래 걸립니다. 계속하시겠습니까?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1834,21 +1833,6 @@ msgstr "예"
msgid "No"
msgstr "아니오"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "새 스토리지 풀 정의"
@@ -1922,6 +1906,21 @@ msgstr "SCSI 어댑터"
msgid "Please, wait..."
msgstr "잠시 기다려 주십시오."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "템플리트 추가"
@@ -2116,3 +2115,6 @@ msgstr "할당:"
msgid "No templates found."
msgstr "템플리트가 없습니다."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 898ee5d..92e2440 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2014-12-02 12:15+0000\n"
"Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail."
"com>\n"
@@ -48,10 +48,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s não implementa método de atualização"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Método de criação não é permitido em %(resource)s"
@@ -338,6 +334,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr "Não foi possível clonar a VM '%(name)s'. Detalhes: %(err)s"
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -821,6 +821,9 @@ msgstr "Não foi possível criar a rede %(name)s. Detalhes: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Não foi possível encontrar um endereço IP livre para a rede '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "A interface %(iface)s já existe"
+
msgid "Network name must be a string"
msgstr "Nome da rede deve ser um texto"
@@ -842,19 +845,19 @@ msgstr "Especifique o nome e o tipo para criar uma rede"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Não foi possível remover a rede %(name)s. Há alguma máquina virtual e/ou "
-"modelo associados a esta rede."
+"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual "
+"%(vms)s e/ou modelo associados a esta rede."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual e/ou "
-"modelo associados a esta rede."
+"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual "
+"%(vms)s e/ou modelo associados a esta rede."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1380,6 +1383,36 @@ msgstr "Cancelar"
msgid "revert"
msgstr "Reverter"
+msgid "Cloning"
+msgstr "Clonando"
+
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Reset"
+msgstr "Reiniciar"
+
+msgid "Power Off"
+msgstr "Forçar desligamento"
+
+msgid "Actions"
+msgstr "Ações"
+
+msgid "Connect"
+msgstr "Conectar"
+
+msgid "Clone"
+msgstr "Clonar"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Shut Down"
+msgstr "Desligar"
+
+msgid "Delete"
+msgstr "Remover"
+
msgid "Add a Storage Device to VM"
msgstr "Adicionar um dispositivo de storage à VM"
@@ -1411,36 +1444,6 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor."
msgid "Attach"
msgstr "Adicionar"
-msgid "Cloning"
-msgstr "Clonando"
-
-msgid "Start"
-msgstr "Iniciar"
-
-msgid "Reset"
-msgstr "Reiniciar"
-
-msgid "Power Off"
-msgstr "Forçar desligamento"
-
-msgid "Actions"
-msgstr "Ações"
-
-msgid "Connect"
-msgstr "Conectar"
-
-msgid "Clone"
-msgstr "Clonar"
-
-msgid "Edit"
-msgstr "Editar"
-
-msgid "Shut Down"
-msgstr "Desligar"
-
-msgid "Delete"
-msgstr "Remover"
-
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"O usuário ou senha inseridos estão incorretos. Por favor, tente novamente."
@@ -1513,7 +1516,7 @@ msgstr "Nenhuma ISO encontrada"
msgid "This is not a valid ISO file."
msgstr "Esse não é um arquivo ISO válido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Isso vai levar um longo tempo. Deseja continuar?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1977,21 +1980,6 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-msgid "Add a Volume to Storage Pool"
-msgstr "Adicionar um volume ao Storage Pool"
-
-msgid "Fetch from remote URL"
-msgstr "Fazer download de uma URL remota"
-
-msgid "Enter the remote URL here."
-msgstr "Digite a URL remota aqui."
-
-msgid "Upload a file"
-msgstr "Fazer upload de um arquivo"
-
-msgid "Choose the file you want to upload."
-msgstr "Escolha o arquivo que você quer fazer upload."
-
msgid "Define a New Storage Pool"
msgstr "Definir novo Storage Pool"
@@ -2065,6 +2053,21 @@ msgstr "Adaptador SCSI"
msgid "Please, wait..."
msgstr "Por favor, aguarde..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Adicionar um volume ao Storage Pool"
+
+msgid "Fetch from remote URL"
+msgstr "Fazer download de uma URL remota"
+
+msgid "Enter the remote URL here."
+msgstr "Digite a URL remota aqui."
+
+msgid "Upload a file"
+msgstr "Fazer upload de um arquivo"
+
+msgid "Choose the file you want to upload."
+msgstr "Escolha o arquivo que você quer fazer upload."
+
msgid "Add Template"
msgstr "Adicionar Modelo"
@@ -2260,3 +2263,6 @@ msgstr "Alocação"
msgid "No templates found."
msgstr "Nenhum modelo encontrado."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index fa8d121..2b18fda 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2014-08-28 17:32+0000\n"
"Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/"
@@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s не реализуют метод обновления"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Обновление параметров %(params)s запрещено в %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Создание запрещено для %(resource)s"
@@ -304,6 +300,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -747,6 +747,9 @@ msgstr "Не удалось создать сеть %(name)s. Сведения:
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Не найден свободный IP-адрес для сети %(name)s"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "Имя сети должно быть строкой"
@@ -768,19 +771,15 @@ msgstr "Укажите имя и тип для создания сети"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Не удалось удалить сеть %(name)s. Есть виртуальные машины или шаблоны, "
-"связанные с этой сетью."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Не удалось деактивировать сеть %(name)s. Есть виртуальные машины илишаблоны, "
-"связанные с этой сетью."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1266,36 +1265,6 @@ msgstr "Отмена"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Добавить устройство хранения в VM"
-
-msgid "Device Type"
-msgstr "Тип устройства"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"."
-
-msgid "Storage Pool"
-msgstr "Пул памяти"
-
-msgid "Storage pool which volume located in"
-msgstr "Путь к пулу памяти должен быть строкой"
-
-msgid "Storage Volume"
-msgstr "Имя пула памяти"
-
-msgid "Storage volume to be attached"
-msgstr "Имя тома должно быть строкой"
-
-msgid "File Path"
-msgstr "Путь к файлу"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Путь к файлу ISO для CDROM на сервере."
-
-msgid "Attach"
-msgstr "Подключить"
-
msgid "Cloning"
msgstr ""
@@ -1326,6 +1295,36 @@ msgstr "Завершить работу"
msgid "Delete"
msgstr "Удалить"
+msgid "Add a Storage Device to VM"
+msgstr "Добавить устройство хранения в VM"
+
+msgid "Device Type"
+msgstr "Тип устройства"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"."
+
+msgid "Storage Pool"
+msgstr "Пул памяти"
+
+msgid "Storage pool which volume located in"
+msgstr "Путь к пулу памяти должен быть строкой"
+
+msgid "Storage Volume"
+msgstr "Имя пула памяти"
+
+msgid "Storage volume to be attached"
+msgstr "Имя тома должно быть строкой"
+
+msgid "File Path"
+msgstr "Путь к файлу"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Путь к файлу ISO для CDROM на сервере."
+
+msgid "Attach"
+msgstr "Подключить"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "Указано неверное имя пользователя или пароль. Введите еще раз."
@@ -1396,7 +1395,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Этот файл не является допустимым образом ISO."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Это займет много времени. Продолжить?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1839,21 +1838,6 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Создать пул памяти"
@@ -1926,6 +1910,21 @@ msgstr "Адаптер SCSI"
msgid "Please, wait..."
msgstr "Подождите..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Добавить шаблон"
@@ -2120,3 +2119,6 @@ msgstr "Выделение ресурсов:"
msgid "No templates found."
msgstr "Не найдены шаблоны."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 82d2980..c11d410 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-12 10:43+0800\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
"Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
"Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
@@ -46,10 +46,6 @@ msgid "%(resource)s does not implement update method"
msgstr "不支持更新%(resource)s"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "不允许更新%(resource)s的%(params)s参数。"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "不允许创建%(resource)s"
@@ -313,6 +309,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s"
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。"
@@ -740,6 +740,9 @@ msgstr "不能创建网络%(name)s。详情：%(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "不能为网络'%(name)s'找到一个未使用的IP网络地址。"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "网络名称必须是字符串"
@@ -760,15 +763,15 @@ msgstr "为新网络指定名字和类型"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
-msgstr "不能删除网络%(name)s。有虚拟机或者模板与这个网络关联"
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
+msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
-msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关联"
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
+msgstr ""
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1372,7 +1375,7 @@ msgstr "没有发现ISO文件"
msgid "This is not a valid ISO file."
msgstr "这不是一个有效的ISO文件"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "这需要一段时间。是否继续？"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -2080,3 +2083,6 @@ msgstr "分配"
msgid "No templates found."
msgstr "没有发现模板"
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "不允许更新%(resource)s的%(params)s参数。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a12a56e..70ad038 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s 未實作更新方法"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "不容許更新 %(resource)s 中的參數 %(params)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "不容許針對 %(resource)s 執行建立"
@@ -295,6 +291,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -714,6 +714,9 @@ msgstr "無法建立網路 %(name)s。詳細資料：%(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "找不到網路 '%(name)s' 的可用 IP 位址"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "網路名稱必須是字串"
@@ -734,15 +737,15 @@ msgstr "指定名稱和類型以建立網路"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
-msgstr "無法刪除網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。"
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
+msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
-msgstr "無法取消啟動網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。"
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
+msgstr ""
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1213,36 +1216,6 @@ msgstr "取消 "
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "將儲存裝置新增至 VM"
-
-msgid "Device Type"
-msgstr "裝置類型"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "裝置類型。目前僅支援 \"cdrom\"。"
-
-msgid "Storage Pool"
-msgstr "儲存區"
-
-msgid "Storage pool which volume located in"
-msgstr "儲存區路徑必須是字串"
-
-msgid "Storage Volume"
-msgstr "儲存區名稱"
-
-msgid "Storage volume to be attached"
-msgstr "儲存磁區名稱必須是字串"
-
-msgid "File Path"
-msgstr "檔案路徑"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM 的 ISO 檔案路徑在伺服器中。"
-
-msgid "Attach"
-msgstr "連接"
-
msgid "Cloning"
msgstr ""
@@ -1273,6 +1246,36 @@ msgstr "關閉"
msgid "Delete"
msgstr "刪除"
+msgid "Add a Storage Device to VM"
+msgstr "將儲存裝置新增至 VM"
+
+msgid "Device Type"
+msgstr "裝置類型"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "裝置類型。目前僅支援 \"cdrom\"。"
+
+msgid "Storage Pool"
+msgstr "儲存區"
+
+msgid "Storage pool which volume located in"
+msgstr "儲存區路徑必須是字串"
+
+msgid "Storage Volume"
+msgstr "儲存區名稱"
+
+msgid "Storage volume to be attached"
+msgstr "儲存磁區名稱必須是字串"
+
+msgid "File Path"
+msgstr "檔案路徑"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "CDROM 的 ISO 檔案路徑在伺服器中。"
+
+msgid "Attach"
+msgstr "連接"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "您輸入的使用者名稱或密碼不正確。請重試。"
@@ -1343,7 +1346,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "這是無效的 ISO 檔案。"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "它將需要很長時間。要繼續嗎？"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1775,21 +1778,6 @@ msgstr "是"
msgid "No"
msgstr "否"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "定義新的儲存區"
@@ -1860,6 +1848,21 @@ msgstr "SCSI 配接卡"
msgid "Please, wait..."
msgstr "請稍候..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "新增範本"
@@ -2054,3 +2057,6 @@ msgstr "配置："
msgid "No templates found."
msgstr "找不到範本。"
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "不容許更新 %(resource)s 中的參數 %(params)s"
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
index a4a6dd5..b170d26 100644
--- a/ui/pages/i18n.json.tmpl
+++ b/ui/pages/i18n.json.tmpl
@@ -58,7 +58,7 @@
"KCHTMPL6002E": "$_("This is not a valid ISO file.")",
- "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")",
+ "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")",
"KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")",
"KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")",
--
2.1.0
9 years, 7 months
- 2
- 1
[PATCH] Stop collecting background stats
by Christy Perez
Kimchi was taking up CPU cycles when no one was using it. In order
to reduce CPU overhead, only collect information when someone has
called the get_list function.
Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com>
---
src/kimchi/model/vms.py | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py
index b5fdb12..0117fb0 100644
--- a/src/kimchi/model/vms.py
+++ b/src/kimchi/model/vms.py
@@ -81,16 +81,12 @@ def __init__(self, **kargs):
self.conn = kargs['conn']
self.objstore = kargs['objstore']
self.caps = CapabilitiesModel(**kargs)
- self.guests_stats_thread = BackgroundTask(GUESTS_STATS_INTERVAL,
- self._update_guests_stats)
- self.guests_stats_thread.start()
-
- def _update_guests_stats(self):
- vm_list = self.get_list()
-
- for name in vm_list:
+
+ @staticmethod
+ def _update_guests_stats(names, conn):
+ for name in names:
try:
- dom = VMModel.get_vm(name, self.conn)
+ dom = VMModel.get_vm(name, conn)
vm_uuid = dom.UUIDString()
info = dom.info()
@@ -108,16 +104,17 @@ def _update_guests_stats(self):
seconds = timestamp - prevStats.get('timestamp', 0)
stats[vm_uuid].update({'timestamp': timestamp})
- self._get_percentage_cpu_usage(vm_uuid, info, seconds)
- self._get_network_io_rate(vm_uuid, dom, seconds)
- self._get_disk_io_rate(vm_uuid, dom, seconds)
+ VMsModel._get_percentage_cpu_usage(vm_uuid, info, seconds)
+ VMsModel._get_network_io_rate(vm_uuid, dom, seconds)
+ VMsModel._get_disk_io_rate(vm_uuid, dom, seconds)
except Exception as e:
# VM might be deleted just after we get the list.
# This is OK, just skip.
kimchi_log.debug('Error processing VM stats: %s', e.message)
continue
- def _get_percentage_cpu_usage(self, vm_uuid, info, seconds):
+ @staticmethod
+ def _get_percentage_cpu_usage(vm_uuid, info, seconds):
prevCpuTime = stats[vm_uuid].get('cputime', 0)
cpus = info[3]
@@ -128,7 +125,8 @@ def _get_percentage_cpu_usage(self, vm_uuid, info, seconds):
stats[vm_uuid].update({'cputime': info[4], 'cpu': percentage})
- def _get_network_io_rate(self, vm_uuid, dom, seconds):
+ @staticmethod
+ def _get_network_io_rate(vm_uuid, dom, seconds):
prevNetRxKB = stats[vm_uuid].get('netRxKB', 0)
prevNetTxKB = stats[vm_uuid].get('netTxKB', 0)
currentMaxNetRate = stats[vm_uuid].get('max_net_io', 100)
@@ -155,7 +153,8 @@ def _get_network_io_rate(self, vm_uuid, dom, seconds):
stats[vm_uuid].update({'net_io': rate, 'max_net_io': max_net_io,
'netRxKB': netRxKB, 'netTxKB': netTxKB})
- def _get_disk_io_rate(self, vm_uuid, dom, seconds):
+ @staticmethod
+ def _get_disk_io_rate(vm_uuid, dom, seconds):
prevDiskRdKB = stats[vm_uuid].get('diskRdKB', 0)
prevDiskWrKB = stats[vm_uuid].get('diskWrKB', 0)
currentMaxDiskRate = stats[vm_uuid].get('max_disk_io', 100)
@@ -249,13 +248,15 @@ def create(self, params):
return name
def get_list(self):
- return self.get_vms(self.conn)
+ return VMsModel.get_vms(self.conn)
@staticmethod
def get_vms(conn):
- conn = conn.get()
- names = [dom.name().decode('utf-8') for dom in conn.listAllDomains(0)]
- return sorted(names, key=unicode.lower)
+ conn_ = conn.get()
+ names = [dom.name().decode('utf-8') for dom in conn_.listAllDomains(0)]
+ names = sorted(names, key=unicode.lower)
+ VMsModel._update_guests_stats(names, conn)
+ return names
class VMModel(object):
--
2.1.0
9 years, 7 months
- 2
- 1
[PATCH v3] Fix grammar for selected messages
by Christy Perez
There were two things I saw that needed to be fixed:
- The ISO scan warning, "It may take long time," and
- The interface error for an exsiting interface, "The
interface already exist."
Fixed these and corrected all the translation strings for other
changes.
Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com>
---
po/de_DE.po | 123 +++++++++++++++++++++++----------------------
po/en_US.po | 94 ++++++++++++++++++-----------------
po/es_ES.po | 124 ++++++++++++++++++++++++----------------------
po/fr_FR.po | 126 +++++++++++++++++++++++++----------------------
po/it_IT.po | 124 ++++++++++++++++++++++++----------------------
po/ja_JP.po | 121 +++++++++++++++++++++++----------------------
po/kimchi.pot | 95 ++++++++++++++++++-----------------
po/ko_KR.po | 120 ++++++++++++++++++++++----------------------
po/pt_BR.po | 124 ++++++++++++++++++++++++----------------------
po/ru_RU.po | 120 ++++++++++++++++++++++----------------------
po/zh_CN.po | 30 ++++++-----
po/zh_TW.po | 120 +++++++++++++++++++++++---------------------
src/kimchi/isoinfo.py | 1 +
src/kimchi/osinfo.py | 2 +-
src/kimchi/vmtemplate.py | 8 ++-
src/nginx.conf.in | 1 +
ui/pages/i18n.json.tmpl | 2 +-
17 files changed, 699 insertions(+), 636 deletions(-)
diff --git a/po/de_DE.po b/po/de_DE.po
index 5116d1f..6c4a089 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s implementiert keine Aktualisierungsmethode"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Erstellen ist nicht zulässig für %(resource)s"
@@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -801,6 +801,9 @@ msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Es konnte keine freie IP-Adresse für Netz '%(name)s' gefunden werden"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "Netzname muss eine Zeichenfolge sein"
@@ -823,19 +826,19 @@ msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Netz %(name)s konnte nicht gelöscht werden. Es sind einige virtuellen "
-"Maschinen und/oder Vorlagen mit diesem Netz verknüpft."
+"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
+"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen "
-"Maschinen und/oder Vorlagen mit diesem Netz verknüpft."
+"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1334,36 +1337,6 @@ msgstr "Abbrechen"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Speichereinheit zur virtuellen Maschine hinzufügen"
-
-msgid "Device Type"
-msgstr "Einheitentyp"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt."
-
-msgid "Storage Pool"
-msgstr "Speicherpool"
-
-msgid "Storage pool which volume located in"
-msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
-
-msgid "Storage Volume"
-msgstr "Speicherpoolname"
-
-msgid "Storage volume to be attached"
-msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein"
-
-msgid "File Path"
-msgstr "Dateipfad"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM."
-
-msgid "Attach"
-msgstr "Anhängen"
-
msgid "Cloning"
msgstr ""
@@ -1394,6 +1367,36 @@ msgstr "Herunterfahren"
msgid "Delete"
msgstr "Löschen"
+msgid "Add a Storage Device to VM"
+msgstr "Speichereinheit zur virtuellen Maschine hinzufügen"
+
+msgid "Device Type"
+msgstr "Einheitentyp"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt."
+
+msgid "Storage Pool"
+msgstr "Speicherpool"
+
+msgid "Storage pool which volume located in"
+msgstr "Speicherpoolpfad muss eine Zeichenfolge sein"
+
+msgid "Storage Volume"
+msgstr "Speicherpoolname"
+
+msgid "Storage volume to be attached"
+msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein"
+
+msgid "File Path"
+msgstr "Dateipfad"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM."
+
+msgid "Attach"
+msgstr "Anhängen"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist "
@@ -1466,7 +1469,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Dies ist keine gültige ISO-Datei."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Dies wird einige Zeit dauern. Möchten Sie fortfahren?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1920,21 +1923,6 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Neuen Speicherpool definieren"
@@ -2013,6 +2001,21 @@ msgstr "SCSI-Adapter"
msgid "Please, wait..."
msgstr "Bitte warten..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Vorlage hinzufügen"
@@ -2208,3 +2211,7 @@ msgstr "Zuordnung:"
msgid "No templates found."
msgstr "Keine Vorlagen gefunden."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr ""
+#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s"
diff --git a/po/en_US.po b/po/en_US.po
index 05ca48a..5e66487 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method"
msgstr ""
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr ""
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr ""
@@ -292,6 +288,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -711,6 +711,10 @@ msgstr ""
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr ""
+#, python-format
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr ""
@@ -731,14 +735,14 @@ msgstr ""
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
#, python-format
@@ -1210,64 +1214,64 @@ msgstr ""
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
+msgid "Cloning"
msgstr ""
-msgid "Device Type"
+msgid "Start"
msgstr ""
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgid "Reset"
msgstr ""
-msgid "Storage Pool"
+msgid "Power Off"
msgstr ""
-msgid "Storage pool which volume located in"
+msgid "Actions"
msgstr ""
-msgid "Storage Volume"
+msgid "Connect"
msgstr ""
-msgid "Storage volume to be attached"
+msgid "Clone"
msgstr ""
-msgid "File Path"
+msgid "Edit"
msgstr ""
-msgid "The ISO file path in the server for CDROM."
+msgid "Shut Down"
msgstr ""
-msgid "Attach"
+msgid "Delete"
msgstr ""
-msgid "Cloning"
+msgid "Add a Storage Device to VM"
msgstr ""
-msgid "Start"
+msgid "Device Type"
msgstr ""
-msgid "Reset"
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Power Off"
+msgid "Storage Pool"
msgstr ""
-msgid "Actions"
+msgid "Storage pool which volume located in"
msgstr ""
-msgid "Connect"
+msgid "Storage Volume"
msgstr ""
-msgid "Clone"
+msgid "Storage volume to be attached"
msgstr ""
-msgid "Edit"
+msgid "File Path"
msgstr ""
-msgid "Shut Down"
+msgid "The ISO file path in the server for CDROM."
msgstr ""
-msgid "Delete"
+msgid "Attach"
msgstr ""
msgid "The username or password you entered is incorrect. Please try again."
@@ -1338,7 +1342,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr ""
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr ""
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1761,21 +1765,6 @@ msgstr ""
msgid "No"
msgstr ""
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr ""
@@ -1846,6 +1835,21 @@ msgstr ""
msgid "Please, wait..."
msgstr ""
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 573dc03..4816918 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s no implementa método de actualización"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Crear no está permitido para %(resource)s"
@@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -810,6 +810,9 @@ msgstr "No se puede crear la red %(name)s. Detalles: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "No se puede encontrar una dirección IP libre para la red '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "La interfaz %(iface)s ya existe"
+
msgid "Network name must be a string"
msgstr "El nombre de red debe ser una serie"
@@ -832,19 +835,19 @@ msgstr "Especifique el nombre y el tipo para crear una red"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales y/o "
-"plantillas enlazadas a esta red."
+"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales %(vms)s "
+"y/o plantillas enlazadas a esta red."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales y/o "
-"plantillas enlazadas a esta red."
+"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales "
+"%(vms)s y/o plantillas enlazadas a esta red."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1352,36 +1355,6 @@ msgstr "Cancelar"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Añadir un dispositivo de almacenamiento a VM"
-
-msgid "Device Type"
-msgstr "Tipo de dispositivo"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"."
-
-msgid "Storage Pool"
-msgstr "Agrupación de almacenamiento"
-
-msgid "Storage pool which volume located in"
-msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie"
-
-msgid "Storage Volume"
-msgstr "Nombre de agrupación de almacenamiento"
-
-msgid "Storage volume to be attached"
-msgstr "El nombre de volumen de almacenamiento debe ser una serie"
-
-msgid "File Path"
-msgstr "Vía de acceso de archivo"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM."
-
-msgid "Attach"
-msgstr "Conectar"
-
msgid "Cloning"
msgstr ""
@@ -1412,6 +1385,36 @@ msgstr "Concluir"
msgid "Delete"
msgstr "Suprimir"
+msgid "Add a Storage Device to VM"
+msgstr "Añadir un dispositivo de almacenamiento a VM"
+
+msgid "Device Type"
+msgstr "Tipo de dispositivo"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"."
+
+msgid "Storage Pool"
+msgstr "Agrupación de almacenamiento"
+
+msgid "Storage pool which volume located in"
+msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie"
+
+msgid "Storage Volume"
+msgstr "Nombre de agrupación de almacenamiento"
+
+msgid "Storage volume to be attached"
+msgstr "El nombre de volumen de almacenamiento debe ser una serie"
+
+msgid "File Path"
+msgstr "Vía de acceso de archivo"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM."
+
+msgid "Attach"
+msgstr "Conectar"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"El nombre de usuario o contraseña que ha especificado es incorrecto. Por "
@@ -1485,7 +1488,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "No es un archivo ISO válido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Tardará mucho tiempo. ¿Desea continuar?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1939,21 +1942,6 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Definir una agrupación de almacenamiento nueva"
@@ -2030,6 +2018,21 @@ msgstr "Adaptador SCSI"
msgid "Please, wait..."
msgstr "Por favor, espere..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Añadir plantilla"
@@ -2227,3 +2230,6 @@ msgstr "Asignado:"
msgid "No templates found."
msgstr "No se han encontrado plantillas."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 715d612..3d49ca3 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2014-08-27 21:30+0000\n"
"Last-Translator: BobSynfig\n"
"Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/"
@@ -30,12 +30,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s n'implémente pas de méthode de mise à jour"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr ""
-"Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans "
-"%(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "La création n'est pas autorisée pour %(resource)s"
@@ -329,6 +323,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -821,6 +819,9 @@ msgstr "Impossible de créer le réseau %(name)s. Détails: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Impossible de trouver une adresse IP libre pour le réseau '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "L'interface %(iface)s existe déjà"
+
msgid "Network name must be a string"
msgstr "Le nom de réseau doit être une chaîne de caractères"
@@ -843,19 +844,19 @@ msgstr "Spécifiez un nom et un type pour créer un réseau"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
"Impossible de supprimer le réseau %(name)s. Il y a des machines virtuelles "
-"et/ou des modèles liés à ce réseau. "
+"%(vms)s et/ou des modèles liés à ce réseau. "
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles et/"
-"ou des modèles liés à ce réseau. "
+"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles"
+"%(vms)s et/ou des modèles liés à ce réseau. "
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1367,6 +1368,36 @@ msgstr "Annuler"
msgid "revert"
msgstr ""
+msgid "Cloning"
+msgstr ""
+
+msgid "Start"
+msgstr "Démarrer"
+
+msgid "Reset"
+msgstr "Réinitialiser"
+
+msgid "Power Off"
+msgstr "Mettre hors tension"
+
+msgid "Actions"
+msgstr "Actions"
+
+msgid "Connect"
+msgstr "Connecter"
+
+msgid "Clone"
+msgstr "Cloner"
+
+msgid "Edit"
+msgstr "Éditer"
+
+msgid "Shut Down"
+msgstr "Éteindre"
+
+msgid "Delete"
+msgstr "Supprimer"
+
msgid "Add a Storage Device to VM"
msgstr "Ajouter un Périphérique de Stockage à la VM"
@@ -1398,36 +1429,6 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM."
msgid "Attach"
msgstr "Attacher"
-msgid "Cloning"
-msgstr ""
-
-msgid "Start"
-msgstr "Démarrer"
-
-msgid "Reset"
-msgstr "Réinitialiser"
-
-msgid "Power Off"
-msgstr "Mettre hors tension"
-
-msgid "Actions"
-msgstr "Actions"
-
-msgid "Connect"
-msgstr "Connecter"
-
-msgid "Clone"
-msgstr "Cloner"
-
-msgid "Edit"
-msgstr "Éditer"
-
-msgid "Shut Down"
-msgstr "Éteindre"
-
-msgid "Delete"
-msgstr "Supprimer"
-
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. "
@@ -1502,7 +1503,7 @@ msgstr "Aucune ISO détectée"
msgid "This is not a valid ISO file."
msgstr "Ce n'est pas un fichier ISO valide."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Cela va prendre un long moment. Voulez-vous continuer ?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1964,21 +1965,6 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-msgid "Add a Volume to Storage Pool"
-msgstr "iAjouter un Volume au Pool de Stockage"
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr "Saisir une URL distante ici"
-
-msgid "Upload a file"
-msgstr "Charger un fichier"
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Définir un Nouveau Pool de Stockage"
@@ -2057,6 +2043,21 @@ msgstr "Adaptateur SCSI"
msgid "Please, wait..."
msgstr "Veuillez patienter..."
+msgid "Add a Volume to Storage Pool"
+msgstr "iAjouter un Volume au Pool de Stockage"
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr "Saisir une URL distante ici"
+
+msgid "Upload a file"
+msgstr "Charger un fichier"
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Ajouter un Modèle"
@@ -2252,3 +2253,8 @@ msgstr "Allocation"
msgid "No templates found."
msgstr "Aucun modèle trouvé."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr ""
+#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans "
+#~ "%(resource)s"
diff --git a/po/it_IT.po b/po/it_IT.po
index 1746bed..1b810db 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s non implementa il metodo di aggiornamento"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Creazione non consentita per %(resource)s"
@@ -311,6 +307,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -783,6 +783,9 @@ msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "L'interfaccia %(iface)s già esistente."
+
msgid "Network name must be a string"
msgstr "Il nome della rete deve essere una stringa"
@@ -805,19 +808,19 @@ msgstr "Specificare nome e tipo per creare una rete"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali e/o "
-"modelli collegati a tale rete."
+"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali "
+"%(vms)s e/o modelli collegati a tale rete."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie/"
-"o modelli collegati a tale rete."
+"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie "
+"%(vms)s e/o modelli collegati a tale rete."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1321,36 +1324,6 @@ msgstr "Annulla"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Aggiungi un dispositivo di memoria alla VM"
-
-msgid "Device Type"
-msgstr "Tipo dispositivo"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"."
-
-msgid "Storage Pool"
-msgstr "Pool di memoria"
-
-msgid "Storage pool which volume located in"
-msgstr "Il percorso del pool di memoria deve essere una stringa"
-
-msgid "Storage Volume"
-msgstr "Nome pool di memoria"
-
-msgid "Storage volume to be attached"
-msgstr "Il nome del volume di memoria deve essere una stringa"
-
-msgid "File Path"
-msgstr "Percorso file"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Il percorso file ISO nel server per CDROM."
-
-msgid "Attach"
-msgstr "Allega"
-
msgid "Cloning"
msgstr ""
@@ -1381,6 +1354,36 @@ msgstr "Arresta"
msgid "Delete"
msgstr "Elimina"
+msgid "Add a Storage Device to VM"
+msgstr "Aggiungi un dispositivo di memoria alla VM"
+
+msgid "Device Type"
+msgstr "Tipo dispositivo"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"."
+
+msgid "Storage Pool"
+msgstr "Pool di memoria"
+
+msgid "Storage pool which volume located in"
+msgstr "Il percorso del pool di memoria deve essere una stringa"
+
+msgid "Storage Volume"
+msgstr "Nome pool di memoria"
+
+msgid "Storage volume to be attached"
+msgstr "Il nome del volume di memoria deve essere una stringa"
+
+msgid "File Path"
+msgstr "Percorso file"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Il percorso file ISO nel server per CDROM."
+
+msgid "Attach"
+msgstr "Allega"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"Il nome utente o la password immessi non sono corretti. Ripetere "
@@ -1454,7 +1457,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Non è un file ISO valido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Richiederà molto tempo. Continuare?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1906,21 +1909,6 @@ msgstr "Sì"
msgid "No"
msgstr "No"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Definisci un nuovo pool di memoria"
@@ -2000,6 +1988,21 @@ msgstr "Adattatore SCSI"
msgid "Please, wait..."
msgstr "Attendere..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Aggiungi modello"
@@ -2195,3 +2198,6 @@ msgstr "Allocazione:"
msgid "No templates found."
msgstr "Nessun modello trovato."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s"
diff --git a/po/ja_JP.po b/po/ja_JP.po
index f9fe5ee..c04ea0c 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s は更新メソッドを実装していません"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "パラメーター %(params)s を %(resource)s で更新することは許可されません"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "%(resource)s の作成は許可されません"
@@ -308,6 +304,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -799,6 +799,9 @@ msgstr "ネットワーク %(name)s を作成できません。詳細: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "ネットワーク「%(name)s」のフリー IP アドレスが見つかりません。"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "ネットワーク名はストリングでなければなりません"
@@ -821,19 +824,15 @@ msgstr "ネットワークを作成するには、名前とタイプを指定し
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"ネットワーク %(name)s を削除できません。いくつかの仮想マシン/テンプレートが、"
-"このネットワークにリンクしています。"
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"ネットワーク %(name)s を非アクティブにできません。いくつかの仮想マシン/テンプ"
-"レートが、このネットワークにリンクしています。"
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1333,36 +1332,6 @@ msgstr "取消"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "VM にストレージ・デバイスを追加"
-
-msgid "Device Type"
-msgstr "デバイス・タイプ"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。"
-
-msgid "Storage Pool"
-msgstr "ストレージ・プール"
-
-msgid "Storage pool which volume located in"
-msgstr "ストレージ・プール・パスはストリングでなければなりません"
-
-msgid "Storage Volume"
-msgstr "ストレージ・プール名"
-
-msgid "Storage volume to be attached"
-msgstr "ストレージ・ボリューム名はストリングでなければなりません"
-
-msgid "File Path"
-msgstr "ファイル・パス"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "サーバー内での CDROM の ISO ファイル・パス。"
-
-msgid "Attach"
-msgstr "接続"
-
msgid "Cloning"
msgstr ""
@@ -1393,6 +1362,36 @@ msgstr "シャットダウン"
msgid "Delete"
msgstr "削除"
+msgid "Add a Storage Device to VM"
+msgstr "VM にストレージ・デバイスを追加"
+
+msgid "Device Type"
+msgstr "デバイス・タイプ"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。"
+
+msgid "Storage Pool"
+msgstr "ストレージ・プール"
+
+msgid "Storage pool which volume located in"
+msgstr "ストレージ・プール・パスはストリングでなければなりません"
+
+msgid "Storage Volume"
+msgstr "ストレージ・プール名"
+
+msgid "Storage volume to be attached"
+msgstr "ストレージ・ボリューム名はストリングでなければなりません"
+
+msgid "File Path"
+msgstr "ファイル・パス"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "サーバー内での CDROM の ISO ファイル・パス。"
+
+msgid "Attach"
+msgstr "接続"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。"
@@ -1463,7 +1462,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "有効な ISO ファイルではありません。"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "しばらく時間がかかることがあります。続行しますか?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1907,21 +1906,6 @@ msgstr " はい"
msgid "No"
msgstr " いいえ"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "新規ストレージ・プールの定義"
@@ -1999,6 +1983,21 @@ msgstr "SCSI アダプター"
msgid "Please, wait..."
msgstr "お待ちください..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "テンプレートの追加"
@@ -2193,3 +2192,7 @@ msgstr "割り振り:"
msgid "No templates found."
msgstr "テンプレートが見つかりません。"
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr ""
+#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません"
diff --git a/po/kimchi.pot b/po/kimchi.pot
index 1923fad..f98fc7f 100755
--- a/po/kimchi.pot
+++ b/po/kimchi.pot
@@ -3,12 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -30,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr ""
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr ""
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr ""
@@ -292,6 +287,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -711,6 +710,10 @@ msgstr ""
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr ""
+#, python-format
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr ""
@@ -731,14 +734,14 @@ msgstr ""
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
#, python-format
@@ -1210,64 +1213,64 @@ msgstr ""
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
+msgid "Cloning"
msgstr ""
-msgid "Device Type"
+msgid "Start"
msgstr ""
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgid "Reset"
msgstr ""
-msgid "Storage Pool"
+msgid "Power Off"
msgstr ""
-msgid "Storage pool which volume located in"
+msgid "Actions"
msgstr ""
-msgid "Storage Volume"
+msgid "Connect"
msgstr ""
-msgid "Storage volume to be attached"
+msgid "Clone"
msgstr ""
-msgid "File Path"
+msgid "Edit"
msgstr ""
-msgid "The ISO file path in the server for CDROM."
+msgid "Shut Down"
msgstr ""
-msgid "Attach"
+msgid "Delete"
msgstr ""
-msgid "Cloning"
+msgid "Add a Storage Device to VM"
msgstr ""
-msgid "Start"
+msgid "Device Type"
msgstr ""
-msgid "Reset"
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Power Off"
+msgid "Storage Pool"
msgstr ""
-msgid "Actions"
+msgid "Storage pool which volume located in"
msgstr ""
-msgid "Connect"
+msgid "Storage Volume"
msgstr ""
-msgid "Clone"
+msgid "Storage volume to be attached"
msgstr ""
-msgid "Edit"
+msgid "File Path"
msgstr ""
-msgid "Shut Down"
+msgid "The ISO file path in the server for CDROM."
msgstr ""
-msgid "Delete"
+msgid "Attach"
msgstr ""
msgid "The username or password you entered is incorrect. Please try again."
@@ -1338,7 +1341,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr ""
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr ""
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1761,21 +1764,6 @@ msgstr ""
msgid "No"
msgstr ""
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr ""
@@ -1846,6 +1834,21 @@ msgstr ""
msgid "Please, wait..."
msgstr ""
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr ""
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 0f6f530..0394efe 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s에서는 업데이트 메소드를 구현하지 않음"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "%(resource)s의 작성은 허용되지 않음"
@@ -301,6 +297,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -752,6 +752,9 @@ msgstr "네트워크 %(name)s을(를) 작성할 수 없습니다. 세부사항:
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "네트워크 '%(name)s'에 대한 여유 IP 주소를 찾을 수 없습니다."
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "네트워크 이름은 문자열이어야 합니다."
@@ -773,19 +776,15 @@ msgstr "네트워크를 작성하려면 이름 및 유형을 지정하십시오.
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"%(name)s 네트워크를 삭제할 수 없습니다. 이 네트워크에 일부 가상 머신 및/또는 "
-"템플리트가 링크되어 있습니다."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"%(name)s 네트워크를 비활성화할 수 없습니다. 이 네트워크에 일부 가상 머신 및/"
-"또는템플리트가 링크되어 있습니다."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1264,36 +1263,6 @@ msgstr "취소"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "스토리지 장치를 VM에 추가"
-
-msgid "Device Type"
-msgstr "장치 유형"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다."
-
-msgid "Storage Pool"
-msgstr "스토리지 풀"
-
-msgid "Storage pool which volume located in"
-msgstr "스토리지 풀 경로는 문자열이어야 합니다."
-
-msgid "Storage Volume"
-msgstr "스토리지 풀 이름"
-
-msgid "Storage volume to be attached"
-msgstr "스토리지 볼륨 이름은 문자열이어야 합니다."
-
-msgid "File Path"
-msgstr "파일 경로"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다."
-
-msgid "Attach"
-msgstr "연결"
-
msgid "Cloning"
msgstr ""
@@ -1324,6 +1293,36 @@ msgstr "시스템 종료"
msgid "Delete"
msgstr "삭제"
+msgid "Add a Storage Device to VM"
+msgstr "스토리지 장치를 VM에 추가"
+
+msgid "Device Type"
+msgstr "장치 유형"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다."
+
+msgid "Storage Pool"
+msgstr "스토리지 풀"
+
+msgid "Storage pool which volume located in"
+msgstr "스토리지 풀 경로는 문자열이어야 합니다."
+
+msgid "Storage Volume"
+msgstr "스토리지 풀 이름"
+
+msgid "Storage volume to be attached"
+msgstr "스토리지 볼륨 이름은 문자열이어야 합니다."
+
+msgid "File Path"
+msgstr "파일 경로"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다."
+
+msgid "Attach"
+msgstr "연결"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오."
@@ -1395,7 +1394,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "올바른 ISO 파일이 아닙니다."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "시간이 오래 걸립니다. 계속하시겠습니까?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1834,21 +1833,6 @@ msgstr "예"
msgid "No"
msgstr "아니오"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "새 스토리지 풀 정의"
@@ -1922,6 +1906,21 @@ msgstr "SCSI 어댑터"
msgid "Please, wait..."
msgstr "잠시 기다려 주십시오."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "템플리트 추가"
@@ -2116,3 +2115,6 @@ msgstr "할당:"
msgid "No templates found."
msgstr "템플리트가 없습니다."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 898ee5d..92e2440 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2014-12-02 12:15+0000\n"
"Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail."
"com>\n"
@@ -48,10 +48,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s não implementa método de atualização"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Método de criação não é permitido em %(resource)s"
@@ -338,6 +334,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr "Não foi possível clonar a VM '%(name)s'. Detalhes: %(err)s"
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -821,6 +821,9 @@ msgstr "Não foi possível criar a rede %(name)s. Detalhes: %(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Não foi possível encontrar um endereço IP livre para a rede '%(name)s'"
+msgid "The interface %(iface)s already exists."
+msgstr "A interface %(iface)s já existe"
+
msgid "Network name must be a string"
msgstr "Nome da rede deve ser um texto"
@@ -842,19 +845,19 @@ msgstr "Especifique o nome e o tipo para criar uma rede"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Não foi possível remover a rede %(name)s. Há alguma máquina virtual e/ou "
-"modelo associados a esta rede."
+"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual "
+"%(vms)s e/ou modelo associados a esta rede."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual e/ou "
-"modelo associados a esta rede."
+"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual "
+"%(vms)s e/ou modelo associados a esta rede."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1380,6 +1383,36 @@ msgstr "Cancelar"
msgid "revert"
msgstr "Reverter"
+msgid "Cloning"
+msgstr "Clonando"
+
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Reset"
+msgstr "Reiniciar"
+
+msgid "Power Off"
+msgstr "Forçar desligamento"
+
+msgid "Actions"
+msgstr "Ações"
+
+msgid "Connect"
+msgstr "Conectar"
+
+msgid "Clone"
+msgstr "Clonar"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Shut Down"
+msgstr "Desligar"
+
+msgid "Delete"
+msgstr "Remover"
+
msgid "Add a Storage Device to VM"
msgstr "Adicionar um dispositivo de storage à VM"
@@ -1411,36 +1444,6 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor."
msgid "Attach"
msgstr "Adicionar"
-msgid "Cloning"
-msgstr "Clonando"
-
-msgid "Start"
-msgstr "Iniciar"
-
-msgid "Reset"
-msgstr "Reiniciar"
-
-msgid "Power Off"
-msgstr "Forçar desligamento"
-
-msgid "Actions"
-msgstr "Ações"
-
-msgid "Connect"
-msgstr "Conectar"
-
-msgid "Clone"
-msgstr "Clonar"
-
-msgid "Edit"
-msgstr "Editar"
-
-msgid "Shut Down"
-msgstr "Desligar"
-
-msgid "Delete"
-msgstr "Remover"
-
msgid "The username or password you entered is incorrect. Please try again."
msgstr ""
"O usuário ou senha inseridos estão incorretos. Por favor, tente novamente."
@@ -1513,7 +1516,7 @@ msgstr "Nenhuma ISO encontrada"
msgid "This is not a valid ISO file."
msgstr "Esse não é um arquivo ISO válido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Isso vai levar um longo tempo. Deseja continuar?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1977,21 +1980,6 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-msgid "Add a Volume to Storage Pool"
-msgstr "Adicionar um volume ao Storage Pool"
-
-msgid "Fetch from remote URL"
-msgstr "Fazer download de uma URL remota"
-
-msgid "Enter the remote URL here."
-msgstr "Digite a URL remota aqui."
-
-msgid "Upload a file"
-msgstr "Fazer upload de um arquivo"
-
-msgid "Choose the file you want to upload."
-msgstr "Escolha o arquivo que você quer fazer upload."
-
msgid "Define a New Storage Pool"
msgstr "Definir novo Storage Pool"
@@ -2065,6 +2053,21 @@ msgstr "Adaptador SCSI"
msgid "Please, wait..."
msgstr "Por favor, aguarde..."
+msgid "Add a Volume to Storage Pool"
+msgstr "Adicionar um volume ao Storage Pool"
+
+msgid "Fetch from remote URL"
+msgstr "Fazer download de uma URL remota"
+
+msgid "Enter the remote URL here."
+msgstr "Digite a URL remota aqui."
+
+msgid "Upload a file"
+msgstr "Fazer upload de um arquivo"
+
+msgid "Choose the file you want to upload."
+msgstr "Escolha o arquivo que você quer fazer upload."
+
msgid "Add Template"
msgstr "Adicionar Modelo"
@@ -2260,3 +2263,6 @@ msgstr "Alocação"
msgid "No templates found."
msgstr "Nenhum modelo encontrado."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index fa8d121..2b18fda 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2014-08-28 17:32+0000\n"
"Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/"
@@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s не реализуют метод обновления"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "Обновление параметров %(params)s запрещено в %(resource)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "Создание запрещено для %(resource)s"
@@ -304,6 +300,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -747,6 +747,9 @@ msgstr "Не удалось создать сеть %(name)s. Сведения:
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "Не найден свободный IP-адрес для сети %(name)s"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "Имя сети должно быть строкой"
@@ -768,19 +771,15 @@ msgstr "Укажите имя и тип для создания сети"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
msgstr ""
-"Не удалось удалить сеть %(name)s. Есть виртуальные машины или шаблоны, "
-"связанные с этой сетью."
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
msgstr ""
-"Не удалось деактивировать сеть %(name)s. Есть виртуальные машины илишаблоны, "
-"связанные с этой сетью."
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1266,36 +1265,6 @@ msgstr "Отмена"
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "Добавить устройство хранения в VM"
-
-msgid "Device Type"
-msgstr "Тип устройства"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"."
-
-msgid "Storage Pool"
-msgstr "Пул памяти"
-
-msgid "Storage pool which volume located in"
-msgstr "Путь к пулу памяти должен быть строкой"
-
-msgid "Storage Volume"
-msgstr "Имя пула памяти"
-
-msgid "Storage volume to be attached"
-msgstr "Имя тома должно быть строкой"
-
-msgid "File Path"
-msgstr "Путь к файлу"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "Путь к файлу ISO для CDROM на сервере."
-
-msgid "Attach"
-msgstr "Подключить"
-
msgid "Cloning"
msgstr ""
@@ -1326,6 +1295,36 @@ msgstr "Завершить работу"
msgid "Delete"
msgstr "Удалить"
+msgid "Add a Storage Device to VM"
+msgstr "Добавить устройство хранения в VM"
+
+msgid "Device Type"
+msgstr "Тип устройства"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"."
+
+msgid "Storage Pool"
+msgstr "Пул памяти"
+
+msgid "Storage pool which volume located in"
+msgstr "Путь к пулу памяти должен быть строкой"
+
+msgid "Storage Volume"
+msgstr "Имя пула памяти"
+
+msgid "Storage volume to be attached"
+msgstr "Имя тома должно быть строкой"
+
+msgid "File Path"
+msgstr "Путь к файлу"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "Путь к файлу ISO для CDROM на сервере."
+
+msgid "Attach"
+msgstr "Подключить"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "Указано неверное имя пользователя или пароль. Введите еще раз."
@@ -1396,7 +1395,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Этот файл не является допустимым образом ISO."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Это займет много времени. Продолжить?"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1839,21 +1838,6 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "Создать пул памяти"
@@ -1926,6 +1910,21 @@ msgstr "Адаптер SCSI"
msgid "Please, wait..."
msgstr "Подождите..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "Добавить шаблон"
@@ -2120,3 +2119,6 @@ msgstr "Выделение ресурсов:"
msgid "No templates found."
msgstr "Не найдены шаблоны."
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 82d2980..c11d410 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-12 10:43+0800\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
"Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
"Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
@@ -46,10 +46,6 @@ msgid "%(resource)s does not implement update method"
msgstr "不支持更新%(resource)s"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "不允许更新%(resource)s的%(params)s参数。"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "不允许创建%(resource)s"
@@ -313,6 +309,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s"
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。"
@@ -740,6 +740,9 @@ msgstr "不能创建网络%(name)s。详情：%(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "不能为网络'%(name)s'找到一个未使用的IP网络地址。"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "网络名称必须是字符串"
@@ -760,15 +763,15 @@ msgstr "为新网络指定名字和类型"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
-msgstr "不能删除网络%(name)s。有虚拟机或者模板与这个网络关联"
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
+msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
-msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关联"
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
+msgstr ""
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1372,7 +1375,7 @@ msgstr "没有发现ISO文件"
msgid "This is not a valid ISO file."
msgstr "这不是一个有效的ISO文件"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "这需要一段时间。是否继续？"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -2080,3 +2083,6 @@ msgstr "分配"
msgid "No templates found."
msgstr "没有发现模板"
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "不允许更新%(resource)s的%(params)s参数。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a12a56e..70ad038 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-17 13:48-0200\n"
+"POT-Creation-Date: 2015-02-24 11:52-0600\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method"
msgstr "%(resource)s 未實作更新方法"
#, python-format
-msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
-msgstr "不容許更新 %(resource)s 中的參數 %(params)s"
-
-#, python-format
msgid "Create is not allowed for %(resource)s"
msgstr "不容許針對 %(resource)s 執行建立"
@@ -295,6 +291,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s"
msgstr ""
#, python-format
+msgid "Invalid operation for non-persistent virtual machine %(name)s"
+msgstr ""
+
+#, python-format
msgid ""
"VM %(vmid)s does not contain directly assigned host device %(dev_name)s."
msgstr ""
@@ -714,6 +714,9 @@ msgstr "無法建立網路 %(name)s。詳細資料：%(err)s"
msgid "Unable to find a free IP address for network '%(name)s'"
msgstr "找不到網路 '%(name)s' 的可用 IP 位址"
+msgid "The interface %(iface)s already exists."
+msgstr ""
+
msgid "Network name must be a string"
msgstr "網路名稱必須是字串"
@@ -734,15 +737,15 @@ msgstr "指定名稱和類型以建立網路"
#, python-format
msgid ""
-"Unable to delete network %(name)s. There are some virtual machines and/or "
-"templates linked to this network."
-msgstr "無法刪除網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。"
+"Unable to delete network %(name)s. There are some virtual machines %(vms)s "
+"and/or templates linked to this network."
+msgstr ""
#, python-format
msgid ""
-"Unable to deactivate network %(name)s. There are some virtual machines and/"
-"or templates linked to this network."
-msgstr "無法取消啟動網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。"
+"Unable to deactivate network %(name)s. There are some virtual machines "
+"%(vms)s and/or templates linked to this network."
+msgstr ""
#, python-format
msgid "Bridge device %(name)s can not be the trunk device of a VLAN."
@@ -1213,36 +1216,6 @@ msgstr "取消 "
msgid "revert"
msgstr ""
-msgid "Add a Storage Device to VM"
-msgstr "將儲存裝置新增至 VM"
-
-msgid "Device Type"
-msgstr "裝置類型"
-
-msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgstr "裝置類型。目前僅支援 \"cdrom\"。"
-
-msgid "Storage Pool"
-msgstr "儲存區"
-
-msgid "Storage pool which volume located in"
-msgstr "儲存區路徑必須是字串"
-
-msgid "Storage Volume"
-msgstr "儲存區名稱"
-
-msgid "Storage volume to be attached"
-msgstr "儲存磁區名稱必須是字串"
-
-msgid "File Path"
-msgstr "檔案路徑"
-
-msgid "The ISO file path in the server for CDROM."
-msgstr "CDROM 的 ISO 檔案路徑在伺服器中。"
-
-msgid "Attach"
-msgstr "連接"
-
msgid "Cloning"
msgstr ""
@@ -1273,6 +1246,36 @@ msgstr "關閉"
msgid "Delete"
msgstr "刪除"
+msgid "Add a Storage Device to VM"
+msgstr "將儲存裝置新增至 VM"
+
+msgid "Device Type"
+msgstr "裝置類型"
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr "裝置類型。目前僅支援 \"cdrom\"。"
+
+msgid "Storage Pool"
+msgstr "儲存區"
+
+msgid "Storage pool which volume located in"
+msgstr "儲存區路徑必須是字串"
+
+msgid "Storage Volume"
+msgstr "儲存區名稱"
+
+msgid "Storage volume to be attached"
+msgstr "儲存磁區名稱必須是字串"
+
+msgid "File Path"
+msgstr "檔案路徑"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr "CDROM 的 ISO 檔案路徑在伺服器中。"
+
+msgid "Attach"
+msgstr "連接"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "您輸入的使用者名稱或密碼不正確。請重試。"
@@ -1343,7 +1346,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "這是無效的 ISO 檔案。"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "它將需要很長時間。要繼續嗎？"
msgid "This will permanently delete the template. Would you like to continue?"
@@ -1775,21 +1778,6 @@ msgstr "是"
msgid "No"
msgstr "否"
-msgid "Add a Volume to Storage Pool"
-msgstr ""
-
-msgid "Fetch from remote URL"
-msgstr ""
-
-msgid "Enter the remote URL here."
-msgstr ""
-
-msgid "Upload a file"
-msgstr ""
-
-msgid "Choose the file you want to upload."
-msgstr ""
-
msgid "Define a New Storage Pool"
msgstr "定義新的儲存區"
@@ -1860,6 +1848,21 @@ msgstr "SCSI 配接卡"
msgid "Please, wait..."
msgstr "請稍候..."
+msgid "Add a Volume to Storage Pool"
+msgstr ""
+
+msgid "Fetch from remote URL"
+msgstr ""
+
+msgid "Enter the remote URL here."
+msgstr ""
+
+msgid "Upload a file"
+msgstr ""
+
+msgid "Choose the file you want to upload."
+msgstr ""
+
msgid "Add Template"
msgstr "新增範本"
@@ -2054,3 +2057,6 @@ msgstr "配置："
msgid "No templates found."
msgstr "找不到範本。"
+
+#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s"
+#~ msgstr "不容許更新 %(resource)s 中的參數 %(params)s"
diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py
index 1e36a6d..b5a1769 100644
--- a/src/kimchi/isoinfo.py
+++ b/src/kimchi/isoinfo.py
@@ -117,6 +117,7 @@
('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'),
('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'),
('powerkvm', 'live_cd', 'POWERKVM_LIVECD'),
+ ('arch', lambda m: m.group(1), 'ARCH_(\d+)'),
]
diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
index 149f059..2496e03 100644
--- a/src/kimchi/osinfo.py
+++ b/src/kimchi/osinfo.py
@@ -77,7 +77,7 @@
modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10',
'opensuse': '10.3', 'centos': '5.3',
'rhel': '6.0', 'fedora': '16', 'gentoo': '0',
- 'sles': '11'},
+ 'sles': '11', 'arch': '0'},
'power': {'rhel': '6.5', 'fedora': '19',
'ubuntu': '14.04',
'opensuse': '13.1',
diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index d4fbe8b..ef41d0a 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -202,8 +202,12 @@ def to_volume_list(self, vm_uuid):
'capacity': d['size'],
'format': fmt,
'path': '%s/%s' % (storage_path, volume)}
- info['allocation'] = 0 if fmt in ['qcow2', 'raw'] \
- else info['capacity']
+
+ if 'logical' == self._get_storage_type() or \
+ fmt not in ['qcow2', 'raw']:
+ info['allocation'] = info['capacity']
+ else:
+ info['allocation'] = 0
if 'base' in d:
info['base'] = dict()
diff --git a/src/nginx.conf.in b/src/nginx.conf.in
index b5d207f..ed926a3 100644
--- a/src/nginx.conf.in
+++ b/src/nginx.conf.in
@@ -52,6 +52,7 @@ http {
ssl_certificate ${cert_pem};
ssl_certificate_key ${cert_key};
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;";
add_header X-Frame-Options DENY;
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
index a4a6dd5..b170d26 100644
--- a/ui/pages/i18n.json.tmpl
+++ b/ui/pages/i18n.json.tmpl
@@ -58,7 +58,7 @@
"KCHTMPL6002E": "$_("This is not a valid ISO file.")",
- "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")",
+ "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")",
"KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")",
"KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")",
--
2.1.0
9 years, 7 months
- 2
- 1
[PATCH] issue #512: Attach the function "showMessage" to the UI grid class
by Crístian Viana
The JavaScript "class" kimchi.widget.Grid (which renders the packages
and repositories list) lacks the function "showMessage" (which
displays a message inside the grid). The function itself is already
declared but it isn't attached to the class, so it cannot be used. When
an error happens while reading the update packages or repositories list,
that function is supposed to be executed, however it doesn't exist in the
class and nothing is displayed.
Attach the function "showMessage" to its corresponding class so it can
be used correctly. In order to test this patch, create a failing
scenario to get the update packages list and open the tab "Hosts".
Without this patch, the update grid will be empty; with this patch, an
error message will be displayed in the update grid. On Fedora, the failing
scenario can be created by running "sudo yum update" (when there are
packages to be updated) and not confirming the update, so Yum leaves a
lock preventing other simultaneous operations to be executed.
Fix issue #512 ("Software updates" doesn't show available updates).
Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.grid.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js
index 26e05d5..6365d5c 100644
--- a/ui/js/src/kimchi.grid.js
+++ b/ui/js/src/kimchi.grid.js
@@ -522,6 +522,7 @@ kimchi.widget.Grid.prototype = (function() {
setData: setData,
getSelected: getSelected,
reload: reload,
- destroy: destroy
+ destroy: destroy,
+ showMessage: showMessage
};
})();
--
2.1.0
9 years, 7 months
- 2
- 1
[PATCH v2 0/2] ISO Scan grammar fix
by Christy Perez
Change "It will take long time" to "This may take a long time."
Christy Perez (2):
Fix iso scan warning's EN grammar
Cleaning up fuzzy translation strings after make
po/de_DE.po | 117 ++++++++++++++++++++++++----------------------
po/en_US.po | 94 +++++++++++++++++++------------------
po/es_ES.po | 117 ++++++++++++++++++++++++----------------------
po/fr_FR.po | 121 +++++++++++++++++++++++++-----------------------
po/it_IT.po | 117 ++++++++++++++++++++++++----------------------
po/ja_JP.po | 118 ++++++++++++++++++++++++----------------------
po/kimchi.pot | 97 +++++++++++++++++++-------------------
po/ko_KR.po | 117 ++++++++++++++++++++++++----------------------
po/pt_BR.po | 117 ++++++++++++++++++++++++----------------------
po/ru_RU.po | 117 ++++++++++++++++++++++++----------------------
po/zh_CN.po | 31 ++++++++-----
po/zh_TW.po | 121 +++++++++++++++++++++++++-----------------------
ui/pages/i18n.json.tmpl | 2 +-
13 files changed, 681 insertions(+), 605 deletions(-)
--
2.1.0
9 years, 7 months
- 2
- 3
[PATCH] Fix iso scan warning's EN grammar
by Christy Perez
The patch is the manual changes only, without running the make
commands. There are a lot of other translation changes that will
be pulled in after a make, so I'm leaving that step out for
simplicity when reviewing this patch.
If needed, I can run make and re-submit after review.
Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com>
---
po/de_DE.po | 2 +-
po/en_US.po | 2 +-
po/es_ES.po | 2 +-
po/fr_FR.po | 2 +-
po/it_IT.po | 2 +-
po/ja_JP.po | 2 +-
po/kimchi.pot | 2 +-
po/ko_KR.po | 2 +-
po/pt_BR.po | 2 +-
po/ru_RU.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
ui/pages/i18n.json.tmpl | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/po/de_DE.po b/po/de_DE.po
index 5116d1f..a730040 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1466,7 +1466,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Dies ist keine g��ltige ISO-Datei."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Dies wird einige Zeit dauern. M��chten Sie fortfahren?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/en_US.po b/po/en_US.po
index 05ca48a..8c3aeda 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -1338,7 +1338,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr ""
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr ""
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/es_ES.po b/po/es_ES.po
index 573dc03..f9c26fe 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1485,7 +1485,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "No es un archivo ISO v��lido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Tardar�� mucho tiempo. ��Desea continuar?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 715d612..ad3abb2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1502,7 +1502,7 @@ msgstr "Aucune ISO d��tect��e"
msgid "This is not a valid ISO file."
msgstr "Ce n'est pas un fichier ISO valide."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Cela va prendre un long moment. Voulez-vous continuer ?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/it_IT.po b/po/it_IT.po
index 1746bed..759f4a2 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1454,7 +1454,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "Non �� un file ISO valido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Richieder�� molto tempo. Continuare?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/ja_JP.po b/po/ja_JP.po
index f9fe5ee..c28d764 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -1463,7 +1463,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "��������� ISO ������������������������������������"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "������������������������������������������������������������������������?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/kimchi.pot b/po/kimchi.pot
index 1923fad..f2456f3 100755
--- a/po/kimchi.pot
+++ b/po/kimchi.pot
@@ -1338,7 +1338,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr ""
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr ""
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 0f6f530..2d01193 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -1395,7 +1395,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "��������� ISO ��������� ������������."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "��������� ������ ������������. ������������������������?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 898ee5d..10ac33e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1513,7 +1513,7 @@ msgstr "Nenhuma ISO encontrada"
msgid "This is not a valid ISO file."
msgstr "Esse n��o �� um arquivo ISO v��lido."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "Isso vai levar um longo tempo. Deseja continuar?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index fa8d121..8233e99 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1396,7 +1396,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "�������� �������� ���� ���������������� �������������������� �������������� ISO."
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "������ ������������ ���������� ��������������. ��������������������?"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 82d2980..a307e3b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1372,7 +1372,7 @@ msgstr "������������ISO������"
msgid "This is not a valid ISO file."
msgstr "������������������������ISO������"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "���������������������������������������"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a12a56e..776bd52 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1343,7 +1343,7 @@ msgstr ""
msgid "This is not a valid ISO file."
msgstr "��������������� ISO ���������"
-msgid "It will take long time. Do you want to continue?"
+msgid "This may take a long time. Do you want to continue?"
msgstr "������������������������������������������"
msgid "This will permanently delete the template. Would you like to continue?"
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
index a4a6dd5..b170d26 100644
--- a/ui/pages/i18n.json.tmpl
+++ b/ui/pages/i18n.json.tmpl
@@ -58,7 +58,7 @@
"KCHTMPL6002E": "$_("This is not a valid ISO file.")",
- "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")",
+ "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")",
"KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")",
"KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")",
--
2.1.0
9 years, 7 months
- 2
- 4
[PATCH 0/3] *** Improved support for Arch Linux ***
by Alan Jenkins
Hey guys,
These patches improve support for Arch Linux within Kimchi. They add support for detecting the Arch Linux distribution's releases and mark it as a modern distribution
to enable Kimchi to automatically turn on support for virtio-net with Arch Linux virtual machines.
I however still have yet to find the code that is able to identify a distribution from a disk image, could someone point me in the direction of that code?
Thanks,
Alan Jenkins
Alan Jenkins (3):
Add Arch Linux entry to isoinfo.
Add modern entry for Arch Linux.
Added Arch Icon.
src/kimchi/isoinfo.py | 1 +
src/kimchi/osinfo.py | 2 +-
ui/images/icon-arch.png | Bin 0 -> 3868 bytes
3 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 ui/images/icon-arch.png
--
2.2.2
9 years, 7 months
- 4
- 18
[PATCH] Set allocation=capacity when creating images in logical pools
by Christy Perez
If allocation is set to 0 for images in logical storage, they cannot
be used. You may see an error similar to:
/dev/VMs_Storage_R5/ed229d7b-5248-4499-8758-43069dd79fe7-0.img: \
read failed after 0 of 65536 at 21474770944: Input/output error
When attempting to access the image.
When using the image, the guest may report that it is unable to write
to the disk (I/O error).
Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com>
---
src/kimchi/vmtemplate.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index d4fbe8b..ef41d0a 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -202,8 +202,12 @@ def to_volume_list(self, vm_uuid):
'capacity': d['size'],
'format': fmt,
'path': '%s/%s' % (storage_path, volume)}
- info['allocation'] = 0 if fmt in ['qcow2', 'raw'] \
- else info['capacity']
+
+ if 'logical' == self._get_storage_type() or \
+ fmt not in ['qcow2', 'raw']:
+ info['allocation'] = info['capacity']
+ else:
+ info['allocation'] = 0
if 'base' in d:
info['base'] = dict()
--
2.1.0
9 years, 7 months
- 3
- 2