[PATCH] Show remote Ubuntu 14.04 x86_64 in new Template window
by shaohef＠linux.vnet.ibm.com
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
This patch changes ubuntu.json, adding iso entry for ubuntu 14.04 x86_64.
Then users are able to install a virtual machine using this iso.
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
src/distros.d/ubuntu.json | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/distros.d/ubuntu.json b/src/distros.d/ubuntu.json
index 7c9fbc1..b0b5f45 100644
--- a/src/distros.d/ubuntu.json
+++ b/src/distros.d/ubuntu.json
@@ -19,5 +19,12 @@
"os_arch": "ppc64",
"os_version": "14.04",
"path": "http://cdimages.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-ppc..."
+ },
+ {
+ "name": "Ubuntu Server 14.04 LE (Trusty Tahr)",
+ "os_distro": "ubuntu",
+ "os_arch": "x86_64",
+ "os_version": "14.04",
+ "path": "http://releases.ubuntu.com/14.04/ubuntu-14.04-desktop-amd64.iso"
}
]
--
1.9.3
10 years, 6 months
[PATCH 0/2] Update translation entries (en_US, pt_BR)
by Crístian Viana
Crístian Viana (2):
Add empty translation entries in English
Add missing translation entries in pt_BR
po/en_US.po | 750 +++++++++++++++++++++++++++++++++-------------------------
po/kimchi.pot | 139 +++++++----
po/pt_BR.po | 243 ++++++++++++-------
3 files changed, 685 insertions(+), 447 deletions(-)
--
1.9.3
10 years, 6 months
[PATCH 0/2] Help translation to Kimchi 1.2.1.
by Paulo Vital
Help files translated to Portuguese (Brazil) and Chinese to included
in Kimchi 1.2.1.
Paulo Vital (2):
Help translation to pt_BR.
Help translation to zh_CN.
ui/pages/help/pt_BR/guests.dita | 168 +++++++++++++++++++------------------
ui/pages/help/pt_BR/host.dita | 106 ++++++++++++-----------
ui/pages/help/pt_BR/network.dita | 88 +++++++++----------
ui/pages/help/pt_BR/storage.dita | 132 +++++++++++++++--------------
ui/pages/help/pt_BR/templates.dita | 160 ++++++++++++++++++-----------------
ui/pages/help/zh_CN/guests.dita | 158 ++++++++++++++++------------------
ui/pages/help/zh_CN/host.dita | 79 ++++++-----------
ui/pages/help/zh_CN/network.dita | 81 ++++++++----------
ui/pages/help/zh_CN/storage.dita | 116 +++++++++++--------------
ui/pages/help/zh_CN/templates.dita | 147 +++++++++++++++-----------------
10 files changed, 591 insertions(+), 644 deletions(-)
--
1.8.3.1
10 years, 6 months
[PATCH] UI changes to allow understore in debug report name.
by Christy Perez
New message on the debug report creation screen now says that
underscore ('_') characters are allowed, as well as hyphens
characters ('-').
Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com>
---
po/en_US.po | 206 ++++++++++++++++++++++-----------
po/kimchi.pot | 163 +++++++++++++++++---------
po/pt_BR.po | 223 +++++++++++++++++++++++++-----------
po/zh_CN.po | 219 ++++++++++++++++++++++++-----------
src/kimchi/i18n.py | 2 +-
ui/js/src/kimchi.report_add_main.js | 2 +-
ui/pages/i18n.json.tmpl | 4 +-
ui/pages/report-add.html.tmpl | 2 +-
8 files changed, 558 insertions(+), 263 deletions(-)
diff --git a/po/en_US.po b/po/en_US.po
index 1f274dc..1b2aa7a 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-04-24 13:01-0300\n"
+"POT-Creation-Date: 2014-06-24 11:38-0500\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"
@@ -43,6 +43,10 @@ msgstr ""
msgid "This API only supports JSON"
msgstr ""
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
msgid "Datastore is not initiated in the model object."
msgstr ""
@@ -225,6 +229,11 @@ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr ""
#, python-format
+msgid ""
+"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
msgstr ""
@@ -248,6 +257,9 @@ msgstr ""
msgid "Specify type and network to add a new virtual machine interface"
msgstr ""
+msgid "Specify type and network to update a virtual machine interface"
+msgstr ""
+
#, python-format
msgid "Template %(name)s already exists"
msgstr ""
@@ -324,6 +336,9 @@ msgstr ""
msgid "Unable to delete template due error: %(err)s"
msgstr ""
+msgid "Disk size must be greater than 1GB."
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr ""
@@ -645,7 +660,14 @@ msgid "You should give a name for the debug file report."
msgstr ""
msgid ""
-"Name should be a string. Only letters, digits and hyphen ('-') are allowed."
+"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
+"('-') are allowed."
+msgstr ""
+
+#, python-format
+msgid ""
+"The debug report with specified name \"%(name)s\" already exists. Please use "
+"another one."
msgstr ""
#, python-format
@@ -699,10 +721,10 @@ msgstr ""
msgid "Unable to choose a virutal machine name"
msgstr ""
-msgid "Invalid CDROM device name"
+msgid "Invalid vm storage device name"
msgstr ""
-msgid "Invalid storage type. Types supported: 'cdrom'"
+msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
msgstr ""
#, python-format
@@ -713,6 +735,12 @@ msgstr ""
msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr ""
+msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+msgstr ""
+
+msgid "Just support cdrom path update"
+msgstr ""
+
#, python-format
msgid "The storage device %(dev_name)s does not exist in the guest %(vm_name)s"
msgstr ""
@@ -729,10 +757,12 @@ msgstr ""
msgid "Error while removing storage device: %(error)s"
msgstr ""
-msgid "Do not support guest CDROM hot plug attachment"
+msgid "Do not support ide device hot plug"
msgstr ""
-msgid "Specify type and path to add a new virtual machine disk"
+msgid ""
+"Specify type and path or type and pool/volume to add a new virtual machine "
+"disk"
msgstr ""
msgid "Specify path to update virtual machine disk"
@@ -742,6 +772,13 @@ msgstr ""
msgid "Controller type %(type)s limitation of %(limit)s devices reached"
msgstr ""
+#, python-format
+msgid "Cannot lookup disk path information by given pool/volume: %(error)s"
+msgstr ""
+
+msgid "Volume already been used by other vm"
+msgstr ""
+
msgid "YUM Repository ID must be one word only string."
msgstr ""
@@ -889,30 +926,6 @@ msgstr "Memory"
msgid "Create"
msgstr "Create"
-msgid "Replace a CDROM of VM"
-msgstr ""
-
-msgid "Device Name"
-msgstr ""
-
-msgid "The name used to identify the CDROM. Read-only."
-msgstr "The name used to identify the CDROM. Read-only."
-
-msgid "Device Type"
-msgstr ""
-
-msgid "The device type. Currently, only \"cdrom\" is supported."
-msgstr ""
-
-msgid "ISO File Path"
-msgstr "ISO File Path"
-
-msgid "The ISO file path in the server."
-msgstr ""
-
-msgid "Replace"
-msgstr ""
-
msgid "Edit Guest"
msgstr "Edit Guest"
@@ -937,9 +950,13 @@ msgstr "Memory (MB)"
msgid "Icon"
msgstr "Icon"
-msgid "Attach"
+msgid "Device"
msgstr ""
+#, fuzzy
+msgid "Path"
+msgstr "NFS Path"
+
msgid "Network"
msgstr "Network"
@@ -949,27 +966,14 @@ msgstr "Type"
msgid "Save"
msgstr "Save"
-msgid "Detach"
-msgstr ""
-
-msgid "Manage Media"
-msgstr ""
-
-msgid "Add a Storage Device to VM"
+msgid "Replace"
msgstr ""
-msgid ""
-"The name used to identify the device. If omitted, a name will be chosen "
-"automatically."
+msgid "Detach"
msgstr ""
-"The name used to identify the device. If omitted, a name will be chosen "
-"automatically."
-
-msgid "File Path"
-msgstr "File Path"
-msgid "The ISO file path in the server for CDROM."
-msgstr ""
+msgid "Cancel"
+msgstr "Cancel"
msgid "Start"
msgstr "Start"
@@ -986,6 +990,9 @@ msgstr "Actions"
msgid "Connect"
msgstr "Connect"
+msgid "Manage Media"
+msgstr ""
+
msgid "Edit"
msgstr "Edit"
@@ -995,6 +1002,50 @@ msgstr "Shut Down"
msgid "Delete"
msgstr "Delete"
+msgid "Add a Storage Device to VM"
+msgstr ""
+
+msgid "Device Name"
+msgstr ""
+
+msgid ""
+"The name used to identify the device. If omitted, a name will be chosen "
+"automatically."
+msgstr ""
+"The name used to identify the device. If omitted, a name will be chosen "
+"automatically."
+
+msgid "Device Type"
+msgstr ""
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+
+msgid "Device Bus"
+msgstr ""
+
+msgid "Storage Pool"
+msgstr "Storage Pool"
+
+msgid "Storage pool which volume located in"
+msgstr ""
+
+#, fuzzy
+msgid "Storage Volume"
+msgstr "Storage Pool Name"
+
+msgid "Storage volume to be attached"
+msgstr ""
+
+msgid "File Path"
+msgstr "File Path"
+
+msgid "The ISO file path in the server for CDROM."
+msgstr ""
+
+msgid "Attach"
+msgstr ""
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "The username or password you entered is incorrect. Please try again."
@@ -1045,9 +1096,6 @@ msgstr "Delete Confirmation"
msgid "OK"
msgstr "OK"
-msgid "Cancel"
-msgstr "Cancel"
-
msgid "Confirm"
msgstr "Confirm"
@@ -1205,9 +1253,15 @@ msgstr "Rename"
msgid "Download"
msgstr "Download"
-msgid "Report name should contain only letters, digits and/or hyphen ('-')."
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
msgstr ""
+#, fuzzy
+msgid "Pending..."
+msgstr "Generating..."
+
msgid ""
"This will delete the virtual machine and its virtual disks. This operation "
"cannot be undone. Would you like to continue?"
@@ -1235,6 +1289,10 @@ msgstr "Shut Down Confirmation"
msgid "Note the guest OS may ignore this request. Would you like to continue?"
msgstr ""
+#, fuzzy
+msgid "VM Delete Confirmation"
+msgstr "Delete Confirmation"
+
msgid ""
"This CDROM will be detached permanently and you can re-attach it. Continue "
"to detach it?"
@@ -1346,8 +1404,8 @@ msgstr "Log out"
msgid "Version:"
msgstr "Version:"
-msgid "Log In"
-msgstr "Log In"
+msgid "Session timeout, please re-login."
+msgstr ""
msgid "User Name"
msgstr "User Name"
@@ -1355,16 +1413,23 @@ msgstr "User Name"
msgid "Password"
msgstr "Password"
+msgid "Log In"
+msgstr "Log In"
+
msgid "Generate a New Debug Report"
msgstr "Generate a New Debug Report"
msgid "Report Name"
msgstr "Report Name"
+#, fuzzy
msgid ""
"The name used to identify the report. If omitted, a name will be chosen "
-"based on current time. Name can contain: letters, digits and hyphen (\"-\")."
+"based on current time. Name can contain: letters, digits, underscore (\"_\") "
+"and hyphen (\"-\")."
msgstr ""
+"The name used to identify the device. If omitted, a name will be chosen "
+"automatically."
msgid "Add a Repository"
msgstr ""
@@ -1485,6 +1550,9 @@ msgstr "iSCSI Authentication"
msgid "SCSI Adapter"
msgstr ""
+msgid "Please, wait..."
+msgstr "Please, wait..."
+
msgid "Add Template"
msgstr "Add Template"
@@ -1500,9 +1568,6 @@ msgstr "Remote ISO Image"
msgid "Search ISOs"
msgstr "Search ISOs"
-msgid "Please, wait..."
-msgstr "Please, wait..."
-
msgid "The following ISOs are available:"
msgstr "The following ISOs are available:"
@@ -1554,9 +1619,6 @@ msgstr "CDROM"
msgid "Graphics"
msgstr ""
-msgid "Storage Pool"
-msgstr "Storage Pool"
-
msgid "CPU"
msgstr "CPU"
@@ -1593,9 +1655,6 @@ msgstr "Processor"
msgid "System Statistics"
msgstr "System Statistics"
-msgid "Collecting data after leaving this page"
-msgstr "Collecting data after leaving this page"
-
msgid "Update Progress"
msgstr ""
@@ -1611,8 +1670,8 @@ msgstr "Network Type"
msgid "Address Space"
msgstr "Address Space"
-msgid "Alphanumeric and '_' characters only."
-msgstr "Alphanumeric and '_' characters only."
+msgid "Name should not contain '/' and '\"'."
+msgstr ""
msgid "Isolated: no external network connection"
msgstr "Isolated: no external network connection"
@@ -1656,6 +1715,9 @@ msgstr "Deactivate"
msgid "Activate"
msgstr "Activate"
+msgid "Extend"
+msgstr ""
+
msgid "Undefine"
msgstr "Undefine"
@@ -1670,3 +1732,15 @@ msgstr "No templates found."
msgid "Clone"
msgstr ""
+
+#~ msgid "The name used to identify the CDROM. Read-only."
+#~ msgstr "The name used to identify the CDROM. Read-only."
+
+#~ msgid "ISO File Path"
+#~ msgstr "ISO File Path"
+
+#~ msgid "Collecting data after leaving this page"
+#~ msgstr "Collecting data after leaving this page"
+
+#~ msgid "Alphanumeric and '_' characters only."
+#~ msgstr "Alphanumeric and '_' characters only."
diff --git a/po/kimchi.pot b/po/kimchi.pot
index 45aab9a..80cf2b8 100755
--- a/po/kimchi.pot
+++ b/po/kimchi.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-24 13:01-0300\n"
+"POT-Creation-Date: 2014-06-24 11:38-0500\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"
@@ -43,6 +43,10 @@ msgstr ""
msgid "This API only supports JSON"
msgstr ""
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
msgid "Datastore is not initiated in the model object."
msgstr ""
@@ -225,6 +229,11 @@ msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr ""
#, python-format
+msgid ""
+"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
+msgstr ""
+
+#, python-format
msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
msgstr ""
@@ -248,6 +257,9 @@ msgstr ""
msgid "Specify type and network to add a new virtual machine interface"
msgstr ""
+msgid "Specify type and network to update a virtual machine interface"
+msgstr ""
+
#, python-format
msgid "Template %(name)s already exists"
msgstr ""
@@ -324,6 +336,9 @@ msgstr ""
msgid "Unable to delete template due error: %(err)s"
msgstr ""
+msgid "Disk size must be greater than 1GB."
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr ""
@@ -645,7 +660,14 @@ msgid "You should give a name for the debug file report."
msgstr ""
msgid ""
-"Name should be a string. Only letters, digits and hyphen ('-') are allowed."
+"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
+"('-') are allowed."
+msgstr ""
+
+#, python-format
+msgid ""
+"The debug report with specified name \"%(name)s\" already exists. Please use "
+"another one."
msgstr ""
#, python-format
@@ -699,10 +721,10 @@ msgstr ""
msgid "Unable to choose a virutal machine name"
msgstr ""
-msgid "Invalid CDROM device name"
+msgid "Invalid vm storage device name"
msgstr ""
-msgid "Invalid storage type. Types supported: 'cdrom'"
+msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
msgstr ""
#, python-format
@@ -713,6 +735,12 @@ msgstr ""
msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr ""
+msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+msgstr ""
+
+msgid "Just support cdrom path update"
+msgstr ""
+
#, python-format
msgid "The storage device %(dev_name)s does not exist in the guest %(vm_name)s"
msgstr ""
@@ -729,10 +757,12 @@ msgstr ""
msgid "Error while removing storage device: %(error)s"
msgstr ""
-msgid "Do not support guest CDROM hot plug attachment"
+msgid "Do not support ide device hot plug"
msgstr ""
-msgid "Specify type and path to add a new virtual machine disk"
+msgid ""
+"Specify type and path or type and pool/volume to add a new virtual machine "
+"disk"
msgstr ""
msgid "Specify path to update virtual machine disk"
@@ -742,6 +772,13 @@ msgstr ""
msgid "Controller type %(type)s limitation of %(limit)s devices reached"
msgstr ""
+#, python-format
+msgid "Cannot lookup disk path information by given pool/volume: %(error)s"
+msgstr ""
+
+msgid "Volume already been used by other vm"
+msgstr ""
+
msgid "YUM Repository ID must be one word only string."
msgstr ""
@@ -889,108 +926,120 @@ msgstr ""
msgid "Create"
msgstr ""
-msgid "Replace a CDROM of VM"
+msgid "Edit Guest"
msgstr ""
-msgid "Device Name"
+msgid "General"
msgstr ""
-msgid "The name used to identify the CDROM. Read-only."
+msgid "Storage"
msgstr ""
-msgid "Device Type"
+msgid "Interface"
msgstr ""
-msgid "The device type. Currently, only \"cdrom\" is supported."
+msgid "Name"
msgstr ""
-msgid "ISO File Path"
+msgid "CPUs"
msgstr ""
-msgid "The ISO file path in the server."
+msgid "Memory (MB)"
msgstr ""
-msgid "Replace"
+msgid "Icon"
msgstr ""
-msgid "Edit Guest"
+msgid "Device"
msgstr ""
-msgid "General"
+msgid "Path"
msgstr ""
-msgid "Storage"
+msgid "Network"
msgstr ""
-msgid "Interface"
+msgid "Type"
msgstr ""
-msgid "Name"
+msgid "Save"
msgstr ""
-msgid "CPUs"
+msgid "Replace"
msgstr ""
-msgid "Memory (MB)"
+msgid "Detach"
msgstr ""
-msgid "Icon"
+msgid "Cancel"
msgstr ""
-msgid "Attach"
+msgid "Start"
msgstr ""
-msgid "Network"
+msgid "Reset"
msgstr ""
-msgid "Type"
+msgid "Power Off"
msgstr ""
-msgid "Save"
+msgid "Actions"
msgstr ""
-msgid "Detach"
+msgid "Connect"
msgstr ""
msgid "Manage Media"
msgstr ""
+msgid "Edit"
+msgstr ""
+
+msgid "Shut Down"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
msgid "Add a Storage Device to VM"
msgstr ""
+msgid "Device Name"
+msgstr ""
+
msgid ""
"The name used to identify the device. If omitted, a name will be chosen "
"automatically."
msgstr ""
-msgid "File Path"
+msgid "Device Type"
msgstr ""
-msgid "The ISO file path in the server for CDROM."
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Start"
+msgid "Device Bus"
msgstr ""
-msgid "Reset"
+msgid "Storage Pool"
msgstr ""
-msgid "Power Off"
+msgid "Storage pool which volume located in"
msgstr ""
-msgid "Actions"
+msgid "Storage Volume"
msgstr ""
-msgid "Connect"
+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."
@@ -1043,9 +1092,6 @@ msgstr ""
msgid "OK"
msgstr ""
-msgid "Cancel"
-msgstr ""
-
msgid "Confirm"
msgstr ""
@@ -1199,7 +1245,12 @@ msgstr ""
msgid "Download"
msgstr ""
-msgid "Report name should contain only letters, digits and/or hyphen ('-')."
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr ""
+
+msgid "Pending..."
msgstr ""
msgid ""
@@ -1229,6 +1280,9 @@ msgstr ""
msgid "Note the guest OS may ignore this request. Would you like to continue?"
msgstr ""
+msgid "VM Delete Confirmation"
+msgstr ""
+
msgid ""
"This CDROM will be detached permanently and you can re-attach it. Continue "
"to detach it?"
@@ -1336,7 +1390,7 @@ msgstr ""
msgid "Version:"
msgstr ""
-msgid "Log In"
+msgid "Session timeout, please re-login."
msgstr ""
msgid "User Name"
@@ -1345,6 +1399,9 @@ msgstr ""
msgid "Password"
msgstr ""
+msgid "Log In"
+msgstr ""
+
msgid "Generate a New Debug Report"
msgstr ""
@@ -1353,7 +1410,8 @@ msgstr ""
msgid ""
"The name used to identify the report. If omitted, a name will be chosen "
-"based on current time. Name can contain: letters, digits and hyphen (\"-\")."
+"based on current time. Name can contain: letters, digits, underscore (\"_\") "
+"and hyphen (\"-\")."
msgstr ""
msgid "Add a Repository"
@@ -1377,7 +1435,7 @@ msgstr ""
msgid "URL to the repository. Supported protocols are http, ftp, and file."
msgstr ""
-msgid "Repository is a mirror."
+msgid "Repository is a mirror"
msgstr ""
msgid "Distribution"
@@ -1471,6 +1529,9 @@ msgstr ""
msgid "SCSI Adapter"
msgstr ""
+msgid "Please, wait..."
+msgstr ""
+
msgid "Add Template"
msgstr ""
@@ -1486,9 +1547,6 @@ msgstr ""
msgid "Search ISOs"
msgstr ""
-msgid "Please, wait..."
-msgstr ""
-
msgid "The following ISOs are available:"
msgstr ""
@@ -1540,9 +1598,6 @@ msgstr ""
msgid "Graphics"
msgstr ""
-msgid "Storage Pool"
-msgstr ""
-
msgid "CPU"
msgstr ""
@@ -1579,9 +1634,6 @@ msgstr ""
msgid "System Statistics"
msgstr ""
-msgid "Collecting data after leaving this page"
-msgstr ""
-
msgid "Update Progress"
msgstr ""
@@ -1597,7 +1649,7 @@ msgstr ""
msgid "Address Space"
msgstr ""
-msgid "Alphanumeric and '_' characters only."
+msgid "Name should not contain '/' and '\"'."
msgstr ""
msgid "Isolated: no external network connection"
@@ -1642,6 +1694,9 @@ msgstr ""
msgid "Activate"
msgstr ""
+msgid "Extend"
+msgstr ""
+
msgid "Undefine"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index def044f..05416a0 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-04-24 13:01-0300\n"
+"POT-Creation-Date: 2014-06-24 11:38-0500\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n"
@@ -59,6 +59,10 @@ msgstr "Não é possível realizar a leitura da requisição do JSON"
msgid "This API only supports JSON"
msgstr "Essa API suporta apenas JSON"
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
msgid "Datastore is not initiated in the model object."
msgstr "Datastore não é inicializado no objeto modelo."
@@ -253,6 +257,11 @@ msgstr ""
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr ""
+#, fuzzy, python-format
+msgid ""
+"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
+msgstr "Não foi possível iniciar a máquina virtual %(name)s. Detalhes: %(err)s"
+
#, python-format
msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
msgstr "Interface %(iface)s não existe na máquina virtual %(name)s"
@@ -280,6 +289,12 @@ msgstr ""
"Especifique tipo e rede para adicionar a uma nova interface da máquina "
"virtual"
+#, fuzzy
+msgid "Specify type and network to update a virtual machine interface"
+msgstr ""
+"Especifique tipo e rede para adicionar a uma nova interface da máquina "
+"virtual"
+
#, python-format
msgid "Template %(name)s already exists"
msgstr "Modelo %(name)s já existe"
@@ -360,6 +375,9 @@ msgstr ""
msgid "Unable to delete template due error: %(err)s"
msgstr ""
+msgid "Disk size must be greater than 1GB."
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr "Storage pool %(name)s já existe"
@@ -717,11 +735,21 @@ msgstr "Incapaz de gerar o relatório de debug %(name)s. Detalhes: %(err)s"
msgid "You should give a name for the debug file report."
msgstr "Você deve dar um nome para o arquivo do relatório de debug."
+#, fuzzy
msgid ""
-"Name should be a string. Only letters, digits and hyphen ('-') are allowed."
+"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
+"('-') are allowed."
msgstr ""
-"Nome deve ser uma string. Somente letras, digitos e hífem ('-') são "
-"permitidos."
+"Nome deve ser uma string. Somente letras, digitos, sublinhar ('_') e hífem "
+"('-') são permitidos."
+
+#, fuzzy, python-format
+msgid ""
+"The debug report with specified name \"%(name)s\" already exists. Please use "
+"another one."
+msgstr ""
+"Um grupo de volume chamado '%(name)s' já existe. Por favor, escolher outro "
+"nome para criar o pool lógico."
#, python-format
msgid "Storage server %(server)s was not used by Kimchi"
@@ -777,10 +805,12 @@ msgstr ""
msgid "Unable to choose a virutal machine name"
msgstr "Incapaz de escolhre um nome para a máquina virtual"
-msgid "Invalid CDROM device name"
+#, fuzzy
+msgid "Invalid vm storage device name"
msgstr "Nome do dispositivo de CDROM inválido"
-msgid "Invalid storage type. Types supported: 'cdrom'"
+#, fuzzy
+msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
msgstr "Tipo de storage inválido. Tipos suportados: cdrom"
#, python-format
@@ -794,6 +824,13 @@ msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr ""
"Nome do dispositivo %(dev_name)s já existe na máquina virtual %(vm_name)s"
+#, fuzzy
+msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+msgstr "Tipo de storage inválido. Tipos suportados: cdrom"
+
+msgid "Just support cdrom path update"
+msgstr ""
+
#, python-format
msgid "The storage device %(dev_name)s does not exist in the guest %(vm_name)s"
msgstr ""
@@ -811,10 +848,14 @@ msgstr "Erro ao atualizar dispositivo de storage: %(error)s"
msgid "Error while removing storage device: %(error)s"
msgstr "Erro ao remover dispositivo de storage: %(error)s"
-msgid "Do not support guest CDROM hot plug attachment"
-msgstr "Associação de CDROM à máquina virtual via hot plug não é suportada"
+#, fuzzy
+msgid "Do not support ide device hot plug"
+msgstr "Não suporte conexão hot plug na interface do guest"
-msgid "Specify type and path to add a new virtual machine disk"
+#, fuzzy
+msgid ""
+"Specify type and path or type and pool/volume to add a new virtual machine "
+"disk"
msgstr ""
"Especifique o tipo e caminho para adicionar um novo disco de máquina virtual"
@@ -825,6 +866,13 @@ msgstr "Especifique o caminho para atualizar o disco da máquina virtual"
msgid "Controller type %(type)s limitation of %(limit)s devices reached"
msgstr ""
+#, python-format
+msgid "Cannot lookup disk path information by given pool/volume: %(error)s"
+msgstr ""
+
+msgid "Volume already been used by other vm"
+msgstr ""
+
msgid "YUM Repository ID must be one word only string."
msgstr "ID do repositório YUM deve ser uma string com uma palavra."
@@ -983,30 +1031,6 @@ msgstr "Memória"
msgid "Create"
msgstr "Criar"
-msgid "Replace a CDROM of VM"
-msgstr ""
-
-msgid "Device Name"
-msgstr ""
-
-msgid "The name used to identify the CDROM. Read-only."
-msgstr ""
-
-msgid "Device Type"
-msgstr ""
-
-msgid "The device type. Currently, only \"cdrom\" is supported."
-msgstr ""
-
-msgid "ISO File Path"
-msgstr ""
-
-msgid "The ISO file path in the server."
-msgstr ""
-
-msgid "Replace"
-msgstr "Trocar"
-
msgid "Edit Guest"
msgstr "Editar Máquinas Virtuais"
@@ -1031,8 +1055,13 @@ msgstr ""
msgid "Icon"
msgstr "Ícone"
-msgid "Attach"
-msgstr "Conectar"
+#, fuzzy
+msgid "Device"
+msgstr "Caminho do dispositivo"
+
+#, fuzzy
+msgid "Path"
+msgstr "Caminho do NFS"
msgid "Network"
msgstr "Redes"
@@ -1043,25 +1072,14 @@ msgstr "Tipo"
msgid "Save"
msgstr "Salvar"
+msgid "Replace"
+msgstr "Trocar"
+
msgid "Detach"
msgstr "Remover"
-msgid "Manage Media"
-msgstr "Gerenciar mídia"
-
-msgid "Add a Storage Device to VM"
-msgstr ""
-
-msgid ""
-"The name used to identify the device. If omitted, a name will be chosen "
-"automatically."
-msgstr ""
-
-msgid "File Path"
-msgstr ""
-
-msgid "The ISO file path in the server for CDROM."
-msgstr ""
+msgid "Cancel"
+msgstr "Cancelar"
msgid "Start"
msgstr "Iniciar"
@@ -1078,6 +1096,9 @@ msgstr "Ações"
msgid "Connect"
msgstr "Conectar"
+msgid "Manage Media"
+msgstr "Gerenciar mídia"
+
msgid "Edit"
msgstr "Editar"
@@ -1087,6 +1108,51 @@ msgstr "Desligar"
msgid "Delete"
msgstr "Remover"
+msgid "Add a Storage Device to VM"
+msgstr ""
+
+msgid "Device Name"
+msgstr ""
+
+msgid ""
+"The name used to identify the device. If omitted, a name will be chosen "
+"automatically."
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+
+#, fuzzy
+msgid "Device Bus"
+msgstr "Caminho do dispositivo"
+
+msgid "Storage Pool"
+msgstr "Nome do Storage Pool"
+
+#, fuzzy
+msgid "Storage pool which volume located in"
+msgstr "Caminho para storage pool deve ser uma string"
+
+#, fuzzy
+msgid "Storage Volume"
+msgstr "Nome do Storage Pool"
+
+#, fuzzy
+msgid "Storage volume to be attached"
+msgstr "Nome do volume deve ser uma string"
+
+msgid "File Path"
+msgstr ""
+
+msgid "The ISO file path in the server for CDROM."
+msgstr ""
+
+msgid "Attach"
+msgstr "Conectar"
+
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 novamenteO "
@@ -1142,9 +1208,6 @@ msgstr "Confirmação de remoção"
msgid "OK"
msgstr "OK"
-msgid "Cancel"
-msgstr "Cancelar"
-
msgid "Confirm"
msgstr "Confirmar"
@@ -1304,9 +1367,15 @@ msgstr "Renomear"
msgid "Download"
msgstr "Baixar"
-msgid "Report name should contain only letters, digits and/or hyphen ('-')."
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
msgstr "Nome do relatório deve apenas conter letras, números e/ou hífen ('-')."
+#, fuzzy
+msgid "Pending..."
+msgstr "Carregando..."
+
msgid ""
"This will delete the virtual machine and its virtual disks. This operation "
"cannot be undone. Would you like to continue?"
@@ -1336,6 +1405,10 @@ msgstr ""
msgid "Note the guest OS may ignore this request. Would you like to continue?"
msgstr ""
+#, fuzzy
+msgid "VM Delete Confirmation"
+msgstr "Confirmação de remoção"
+
msgid ""
"This CDROM will be detached permanently and you can re-attach it. Continue "
"to detach it?"
@@ -1451,8 +1524,8 @@ msgstr "Sair"
msgid "Version:"
msgstr ""
-msgid "Log In"
-msgstr "Entrar"
+msgid "Session timeout, please re-login."
+msgstr ""
msgid "User Name"
msgstr "Usuário"
@@ -1460,15 +1533,20 @@ msgstr "Usuário"
msgid "Password"
msgstr "Senha"
+msgid "Log In"
+msgstr "Entrar"
+
msgid "Generate a New Debug Report"
msgstr "Gerar um novo relatório de depuração"
msgid "Report Name"
msgstr "Nome do Relatório"
+#, fuzzy
msgid ""
"The name used to identify the report. If omitted, a name will be chosen "
-"based on current time. Name can contain: letters, digits and hyphen (\"-\")."
+"based on current time. Name can contain: letters, digits, underscore (\"_\") "
+"and hyphen (\"-\")."
msgstr ""
"Se o nome do relatório for omitido, será escolhido um nome baseado no "
"horário atual. O nome pode conter: letras, números e hífen ('-')."
@@ -1591,6 +1669,9 @@ msgstr "Credenciais do iSCSI"
msgid "SCSI Adapter"
msgstr "Adaptador SCSI"
+msgid "Please, wait..."
+msgstr "Por favor, aguarde..."
+
msgid "Add Template"
msgstr "Adicionar Modelo"
@@ -1606,9 +1687,6 @@ msgstr "Imagem ISO Remota"
msgid "Search ISOs"
msgstr "Procurar ISOs"
-msgid "Please, wait..."
-msgstr "Por favor, aguarde..."
-
msgid "The following ISOs are available:"
msgstr "As seguintes ISOs estão disponíveis:"
@@ -1660,9 +1738,6 @@ msgstr "CD-ROM"
msgid "Graphics"
msgstr "Gráficos"
-msgid "Storage Pool"
-msgstr "Nome do Storage Pool"
-
msgid "CPU"
msgstr "CPU"
@@ -1699,9 +1774,6 @@ msgstr "Processador"
msgid "System Statistics"
msgstr "Estatísticas do sistema"
-msgid "Collecting data after leaving this page"
-msgstr "Coletar dados após deixar essa página."
-
msgid "Update Progress"
msgstr "Progresso da atualização"
@@ -1717,8 +1789,9 @@ msgstr "Tipo da rede"
msgid "Address Space"
msgstr "Espaço de endereço"
-msgid "Alphanumeric and '_' characters only."
-msgstr "Alfanumérios e caracteres '_' apenas."
+#, fuzzy
+msgid "Name should not contain '/' and '\"'."
+msgstr "Nome do storage pool inválido. Não deve conter '/'."
msgid "Isolated: no external network connection"
msgstr "Isolado: nenhuma conexão externa"
@@ -1763,6 +1836,9 @@ msgstr "Desativar"
msgid "Activate"
msgstr "Ativar"
+msgid "Extend"
+msgstr ""
+
msgid "Undefine"
msgstr "Indefinir"
@@ -1777,3 +1853,12 @@ msgstr "Nenhum modelo encontrado."
msgid "Clone"
msgstr ""
+
+#~ msgid "Do not support guest CDROM hot plug attachment"
+#~ msgstr "Associação de CDROM à máquina virtual via hot plug não é suportada"
+
+#~ msgid "Collecting data after leaving this page"
+#~ msgstr "Coletar dados após deixar essa página."
+
+#~ msgid "Alphanumeric and '_' characters only."
+#~ msgstr "Alfanumérios e caracteres '_' apenas."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 246909b..a28f6e3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-24 13:01-0300\n"
+"POT-Creation-Date: 2014-06-24 11:38-0500\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"
@@ -59,6 +59,10 @@ msgstr "无法解析JSON请求"
msgid "This API only supports JSON"
msgstr "这个API仅支持JSON"
+#, python-format
+msgid "Parameters does not match requirement in schema: %(err)s"
+msgstr ""
+
msgid "Datastore is not initiated in the model object."
msgstr "尚未为model对象初始化数据存储。"
@@ -244,6 +248,11 @@ msgstr ""
msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s"
msgstr ""
+#, fuzzy, python-format
+msgid ""
+"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"
+msgstr "不能启动虚拟机 %(name)s. 详情：%(err)s"
+
#, python-format
msgid "Interface %(iface)s does not exist in virtual machine %(name)s"
msgstr "虚拟机 %(name)s 中没有接口 %(iface)s"
@@ -268,6 +277,10 @@ msgstr "虚拟机接口指定的网络模型卡无效"
msgid "Specify type and network to add a new virtual machine interface"
msgstr "为新的虚拟机接口指定类型和网络"
+#, fuzzy
+msgid "Specify type and network to update a virtual machine interface"
+msgstr "为新的虚拟机接口指定类型和网络"
+
#, python-format
msgid "Template %(name)s already exists"
msgstr "模板 %(name)s 已经存在"
@@ -344,6 +357,9 @@ msgstr ""
msgid "Unable to delete template due error: %(err)s"
msgstr ""
+msgid "Disk size must be greater than 1GB."
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr "存储池%(name)s已经存在"
@@ -664,9 +680,17 @@ msgstr "不能生成诊断报告%(name)s。详情：%(err)s"
msgid "You should give a name for the debug file report."
msgstr "应该为诊断文件报告指定一个名字。"
+#, fuzzy
msgid ""
-"Name should be a string. Only letters, digits and hyphen ('-') are allowed."
-msgstr "名字必须是一个字符串。只允许字母、数字和连字符 ('-')。"
+"Name should be a string. Only letters, digits, underscore ('_') and hyphen "
+"('-') are allowed."
+msgstr "名字必须是一个字符串。只允许字母、下划线 ('_') 数字和连字符 ('-')。"
+
+#, fuzzy, python-format
+msgid ""
+"The debug report with specified name \"%(name)s\" already exists. Please use "
+"another one."
+msgstr "卷组'%(name)s'已经存在，请选择其它的名字来创建逻辑存储池。"
#, python-format
msgid "Storage server %(server)s was not used by Kimchi"
@@ -719,10 +743,12 @@ msgstr "命令'%(cmd)s'运行%(seconds)s秒后超时。"
msgid "Unable to choose a virutal machine name"
msgstr "不能选择虚拟机名字"
-msgid "Invalid CDROM device name"
+#, fuzzy
+msgid "Invalid vm storage device name"
msgstr "无效的CDROM设备名字"
-msgid "Invalid storage type. Types supported: 'cdrom'"
+#, fuzzy
+msgid "Invalid storage type. Types supported: 'cdrom', 'disk'"
msgstr "无效的存储类型。支持的类型：'cdrom'"
#, python-format
@@ -733,6 +759,13 @@ msgstr "设备路径'%(value)s'不是一个有效的本地/远程路径"
msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr "设备%(dev_name)s在vm%(vm_name)s上已存在"
+#, fuzzy
+msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+msgstr "无效的存储类型。支持的类型：'cdrom'"
+
+msgid "Just support cdrom path update"
+msgstr ""
+
#, python-format
msgid "The storage device %(dev_name)s does not exist in the guest %(vm_name)s"
msgstr "存储设备%(dev_name)s在客户机%(vm_name)s上不存在。"
@@ -749,10 +782,14 @@ msgstr "更新存储设备时出错：%(error)s"
msgid "Error while removing storage device: %(error)s"
msgstr "移除存储设备时出错：%(error)s"
-msgid "Do not support guest CDROM hot plug attachment"
-msgstr "不支持客户机热插拔CDROM"
+#, fuzzy
+msgid "Do not support ide device hot plug"
+msgstr "不支持客户机接口的热插拔"
-msgid "Specify type and path to add a new virtual machine disk"
+#, fuzzy
+msgid ""
+"Specify type and path or type and pool/volume to add a new virtual machine "
+"disk"
msgstr "为新虚拟机磁盘指定类型和路径"
msgid "Specify path to update virtual machine disk"
@@ -762,6 +799,13 @@ msgstr "指定更新虚拟机磁盘的路径"
msgid "Controller type %(type)s limitation of %(limit)s devices reached"
msgstr ""
+#, python-format
+msgid "Cannot lookup disk path information by given pool/volume: %(error)s"
+msgstr ""
+
+msgid "Volume already been used by other vm"
+msgstr ""
+
msgid "YUM Repository ID must be one word only string."
msgstr "YUM软件仓库ID必须是只包含一个单词的字符串"
@@ -909,30 +953,6 @@ msgstr "内存"
msgid "Create"
msgstr "创建"
-msgid "Replace a CDROM of VM"
-msgstr ""
-
-msgid "Device Name"
-msgstr ""
-
-msgid "The name used to identify the CDROM. Read-only."
-msgstr ""
-
-msgid "Device Type"
-msgstr ""
-
-msgid "The device type. Currently, only \"cdrom\" is supported."
-msgstr ""
-
-msgid "ISO File Path"
-msgstr ""
-
-msgid "The ISO file path in the server."
-msgstr ""
-
-msgid "Replace"
-msgstr "替换"
-
msgid "Edit Guest"
msgstr "修改客户机"
@@ -957,8 +977,13 @@ msgstr ""
msgid "Icon"
msgstr "图标"
-msgid "Attach"
-msgstr "装载"
+#, fuzzy
+msgid "Device"
+msgstr "设备路径"
+
+#, fuzzy
+msgid "Path"
+msgstr "NFS 路径"
msgid "Network"
msgstr "网络"
@@ -969,25 +994,14 @@ msgstr "类型"
msgid "Save"
msgstr "保存"
+msgid "Replace"
+msgstr "替换"
+
msgid "Detach"
msgstr "卸载"
-msgid "Manage Media"
-msgstr "管理光盘介质"
-
-msgid "Add a Storage Device to VM"
-msgstr ""
-
-msgid ""
-"The name used to identify the device. If omitted, a name will be chosen "
-"automatically."
-msgstr ""
-
-msgid "File Path"
-msgstr ""
-
-msgid "The ISO file path in the server for CDROM."
-msgstr ""
+msgid "Cancel"
+msgstr "取消"
msgid "Start"
msgstr "启用"
@@ -1004,6 +1018,9 @@ msgstr "操作"
msgid "Connect"
msgstr "连接到"
+msgid "Manage Media"
+msgstr "管理光盘介质"
+
msgid "Edit"
msgstr "编辑"
@@ -1013,6 +1030,51 @@ msgstr ""
msgid "Delete"
msgstr "删除"
+msgid "Add a Storage Device to VM"
+msgstr ""
+
+msgid "Device Name"
+msgstr ""
+
+msgid ""
+"The name used to identify the device. If omitted, a name will be chosen "
+"automatically."
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
+msgstr ""
+
+#, fuzzy
+msgid "Device Bus"
+msgstr "设备路径"
+
+msgid "Storage Pool"
+msgstr "存储池"
+
+#, fuzzy
+msgid "Storage pool which volume located in"
+msgstr "存储池路径必须是字符串"
+
+#, fuzzy
+msgid "Storage Volume"
+msgstr "存储池名称"
+
+#, fuzzy
+msgid "Storage volume to be attached"
+msgstr "存储卷的名字必须是字符串"
+
+msgid "File Path"
+msgstr ""
+
+msgid "The ISO file path in the server for CDROM."
+msgstr ""
+
+msgid "Attach"
+msgstr "装载"
+
msgid "The username or password you entered is incorrect. Please try again."
msgstr "用户名或密码错误，请重新输入。"
@@ -1064,9 +1126,6 @@ msgstr "删除确认"
msgid "OK"
msgstr "确定"
-msgid "Cancel"
-msgstr "取消"
-
msgid "Confirm"
msgstr "确认"
@@ -1220,8 +1279,14 @@ msgstr "重命名"
msgid "Download"
msgstr "下载"
-msgid "Report name should contain only letters, digits and/or hyphen ('-')."
-msgstr "报告名字中只能包含字母、数字或连字符（-）。"
+msgid ""
+"Report name should contain only letters, digits, underscore ('_') and/or "
+"hyphen ('-')."
+msgstr "报告名字中只能包含字母、下划线 ('_') 数字或连字符（-）。"
+
+#, fuzzy
+msgid "Pending..."
+msgstr "正在加载..."
msgid ""
"This will delete the virtual machine and its virtual disks. This operation "
@@ -1250,6 +1315,10 @@ msgstr ""
msgid "Note the guest OS may ignore this request. Would you like to continue?"
msgstr ""
+#, fuzzy
+msgid "VM Delete Confirmation"
+msgstr "删除确认"
+
msgid ""
"This CDROM will be detached permanently and you can re-attach it. Continue "
"to detach it?"
@@ -1357,8 +1426,8 @@ msgstr "登出"
msgid "Version:"
msgstr ""
-msgid "Log In"
-msgstr "登录"
+msgid "Session timeout, please re-login."
+msgstr ""
msgid "User Name"
msgstr "用户名"
@@ -1366,15 +1435,20 @@ msgstr "用户名"
msgid "Password"
msgstr "密码"
+msgid "Log In"
+msgstr "登录"
+
msgid "Generate a New Debug Report"
msgstr "产生一个新的诊断报告"
msgid "Report Name"
msgstr "诊断报告名"
+#, fuzzy
msgid ""
"The name used to identify the report. If omitted, a name will be chosen "
-"based on current time. Name can contain: letters, digits and hyphen (\"-\")."
+"based on current time. Name can contain: letters, digits, underscore (\"_\") "
+"and hyphen (\"-\")."
msgstr ""
"名字用来标识诊断报告。如果省略，将会基于当前时间生成一个新名字。名字中可以包"
"含字母、数字和连字符（-）"
@@ -1494,6 +1568,9 @@ msgstr "iSCSI认证"
msgid "SCSI Adapter"
msgstr "SCSI适配器"
+msgid "Please, wait..."
+msgstr "请等待..."
+
msgid "Add Template"
msgstr "创建模板"
@@ -1509,9 +1586,6 @@ msgstr "远程ISO镜像"
msgid "Search ISOs"
msgstr "搜索ISO"
-msgid "Please, wait..."
-msgstr "请等待..."
-
msgid "The following ISOs are available:"
msgstr "可用ISO文件如下"
@@ -1563,9 +1637,6 @@ msgstr "光驱"
msgid "Graphics"
msgstr "图形"
-msgid "Storage Pool"
-msgstr "存储池"
-
msgid "CPU"
msgstr "处理器"
@@ -1602,9 +1673,6 @@ msgstr "处理器"
msgid "System Statistics"
msgstr "系统统计信息"
-msgid "Collecting data after leaving this page"
-msgstr "离开该页面仍继续收集数据"
-
msgid "Update Progress"
msgstr "更新进度"
@@ -1620,8 +1688,9 @@ msgstr "网络类型"
msgid "Address Space"
msgstr "地址空间"
-msgid "Alphanumeric and '_' characters only."
-msgstr "字母，数字和下划线。"
+#, fuzzy
+msgid "Name should not contain '/' and '\"'."
+msgstr "无效的存储池的名字。名字中不能包含‘/’。"
msgid "Isolated: no external network connection"
msgstr "隔离: 同物理网络不连通"
@@ -1665,6 +1734,9 @@ msgstr "停用"
msgid "Activate"
msgstr "激活"
+msgid "Extend"
+msgstr ""
+
msgid "Undefine"
msgstr "取消定义"
@@ -1679,3 +1751,12 @@ msgstr "没有发现模板"
msgid "Clone"
msgstr ""
+
+#~ msgid "Do not support guest CDROM hot plug attachment"
+#~ msgstr "不支持客户机热插拔CDROM"
+
+#~ msgid "Collecting data after leaving this page"
+#~ msgstr "离开该页面仍继续收集数据"
+
+#~ msgid "Alphanumeric and '_' characters only."
+#~ msgstr "字母，数字和下划线。"
diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index 90ecc17..c236ac9 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -206,7 +206,7 @@
"KCHDR0004E": _("Can not find any generated debug report matching name %(name)s"),
"KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"),
"KCHDR0006E": _("You should give a name for the debug file report."),
- "KCHDR0007E": _("Name should be a string. Only letters, digits and hyphen ('-') are allowed."),
+ "KCHDR0007E": _("Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."),
"KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."),
"KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"),
diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js
index 43484f5..f64b879 100644
--- a/ui/js/src/kimchi.report_add_main.js
+++ b/ui/js/src/kimchi.report_add_main.js
@@ -41,7 +41,7 @@ kimchi.report_add_main = function() {
return false;
}
var reportName = nameTextbox.val();
- var validator = RegExp("^[A-Za-z0-9-]*$");
+ var validator = RegExp("^[_A-Za-z0-9-]*$");
if (!validator.test(reportName)) {
kimchi.message.error.code('KCHDR6011M');
return false;
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
index ce23bc4..bd09cfc 100644
--- a/ui/pages/i18n.json.tmpl
+++ b/ui/pages/i18n.json.tmpl
@@ -113,7 +113,7 @@
"KCHDR6008M": "$_("Rename")",
"KCHDR6009M": "$_("Remove")",
"KCHDR6010M": "$_("Download")",
- "KCHDR6011M": "$_("Report name should contain only letters, digits and/or hyphen ('-').")",
+ "KCHDR6011M": "$_("Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-').")",
"KCHDR6012M": "$_("Pending...")",
"KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")",
@@ -163,4 +163,4 @@
"KCHPOOL6010M": "$_("Looking for available partitions ...")",
"KCHPOOL6011M": "$_("No available partitions found.")",
"KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")"
-}
\ No newline at end of file
+}
diff --git a/ui/pages/report-add.html.tmpl b/ui/pages/report-add.html.tmpl
index b7209fe..74ef313 100644
--- a/ui/pages/report-add.html.tmpl
+++ b/ui/pages/report-add.html.tmpl
@@ -35,7 +35,7 @@
</h2>
<div class="field">
<span>
- $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits and hyphen (\"-\").")
+ $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits, underscore (\"_\") and hyphen (\"-\").")
</span>
<input type="text" class="text" id="report-name-textbox" name="name" />
</div>
--
1.9.3
10 years, 6 months
[PATCH v6 0/4] Host device passthrough: Summary
by Zhou Zheng Sheng
Hi,
This patch series is to enable Kimchi to assign hos devices directly to
a VM, thus greately improve VM performance. Currently we support assigning
PCI device, USB device and SCSI LUN. For example, we can assign an NIC
to VM to improve guest network throughput, or passthrough a USB camera
to enable the guest OS to record video.
Host devices form a tree. We can assign most of the devices in the tree
to VM. By assigning a device, all the devices in its sub-tree are also
assigned. It might not make sense to assign a USB controller, because
the host may be using one of the devices connected to the controller.
Instead, Kimchi just presents the "leaf" devices to assign to guest.
In recent Linux kernel and KVM, it is able to recognize the IOMMU group
of a PCI device. The "leaf" PCI devices in the same IOMMU group should
be assigned and dismissed together. The IOMMU group is the actual
smallest isolation granularity of the PCI devices.
The first patch is to list all host devices information. It's useful on
its own to show host devices information.
The second patch is to list all eligible host devices to assign, as well
as the "affected" devices in the same IOMMU group.
The third patch creates a sub-collection "hostdevs" to the VM resource,
and deals with assigning and dismissing devices.
The fourth patch adds a sub-collection "vm_holders" to the host device
resource. It's to list all VMs that are holding the device.
I'll update API and unit test once everyone is happy with the interface
and logic.
v6:
Do not passthrough PCI device of class code 0x07. It might contains
system device not suitable to assign to guest.
v5:
Filter ealigible pci devices according to pci class. When assigning a
device to VM, check if there are other VMs holding it. Use
"kimchi.model.utils.get_vm_config_flag()" to correctly set the device
attaching API flag.
v4:
Add new sub-collection to host device to list the VMs holding the device.
v3:
Fix a small naming error introduced by rebase.
v2:
Handle the devices in VM's sub-collection "hostdevs".
v1:
Handle the devices in VM template.
Zhou Zheng Sheng (4):
Host device passthrough: List all types of host devices
Host device passthrough: List eligible device to passthrough
Host device passthrough: Directly assign and dissmis host device from
VM
Host device passthrough: List VMs that are holding a host device
docs/API.md | 11 +-
src/kimchi/control/host.py | 16 ++
src/kimchi/control/vm/hostdevs.py | 44 +++++
src/kimchi/featuretests.py | 10 +-
src/kimchi/hostdev.py | 316 +++++++++++++++++++++++++++++++
src/kimchi/i18n.py | 9 +
src/kimchi/mockmodel.py | 7 +-
src/kimchi/model/config.py | 2 +
src/kimchi/model/host.py | 32 ++--
src/kimchi/model/libvirtstoragepool.py | 18 +-
src/kimchi/model/vmhostdevs.py | 327 +++++++++++++++++++++++++++++++++
src/kimchi/rollbackcontext.py | 3 +
src/kimchi/xmlutils.py | 26 ++-
tests/test_rest.py | 6 +-
tests/test_storagepool.py | 7 +-
15 files changed, 795 insertions(+), 39 deletions(-)
create mode 100644 src/kimchi/control/vm/hostdevs.py
create mode 100644 src/kimchi/hostdev.py
create mode 100644 src/kimchi/model/vmhostdevs.py
--
1.9.3
10 years, 6 months
[PATCH V5 0/5] Switch to a traditional login flow
by shaohef＠linux.vnet.ibm.com
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V4 -> V5:
fix the login bug after an error user/password input
V3 -> V4:
improve the login page.
V2 -> V3:
improve when to show timeout message
V1 -> V2:
when username or password is wrong, back to login page with an error message.
when session time out, back to login page with an error message.
ShaoHe Feng (5):
create a new login page
redirect the URL to login page when session timeout or first login
when login successfully, redirect to the last page.
login page prompts error when username or password is wrong
login page prompts error when session timeout
src/kimchi/auth.py | 53 +++++++++++++++++----
src/kimchi/config.py.in | 7 +++
src/kimchi/root.py | 38 +++++++++++----
src/kimchi/server.py | 2 +
tests/test_rest.py | 1 -
ui/images/progressing.gif | Bin 0 -> 1152 bytes
ui/js/src/kimchi.main.js | 14 ++++--
ui/pages/login.html.tmpl | 118 ++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 209 insertions(+), 24 deletions(-)
create mode 100644 ui/images/progressing.gif
create mode 100644 ui/pages/login.html.tmpl
--
1.9.3
10 years, 6 months
[PATCH V3 0/4] bug fix: accept all characters for network name except / and "
by shaohef＠linux.vnet.ibm.com
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V2 -> V3:
rebase
V1 -> V2
just restrict " and /.
" is not allowed in dnsmasq configure file.
/ is not allowed in a linux file name.
we should not put extra restrictions.
ShaoHe Feng (4):
bug fix: network name can be any characters except " and /
network name support unicode.
escape < > and & in in xml for network name.
escape special characters for jQuery selector.
src/kimchi/model/networks.py | 11 ++++++++---
ui/js/src/kimchi.network.js | 18 +++++++++---------
ui/js/src/kimchi.utils.js | 7 +++++++
ui/pages/tabs/network.html.tmpl | 2 +-
4 files changed, 25 insertions(+), 13 deletions(-)
--
1.9.3
10 years, 6 months
[PATCH V2] Host info: Add support to Power.
by Paulo Vital
Add support to get the correct information of Power's CPU hardware,
due to differences between the content of Power's /proc/cpuinfo and x86's
/proc/cpuinfo.
Also, add IBM PowerKVM information as supported distro.
Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com>
---
src/kimchi/model/host.py | 42 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py
index 5844f4b..050dc20 100644
--- a/src/kimchi/model/host.py
+++ b/src/kimchi/model/host.py
@@ -50,17 +50,49 @@ class HostModel(object):
self.task = TaskModel(**kargs)
self.host_info = self._get_host_info()
- def _get_host_info(self):
+ def _get_ppc_cpu_info(self):
res = {}
with open('/proc/cpuinfo') as f:
for line in f.xreadlines():
- if "model name" in line:
- res['cpu'] = line.split(':')[1].strip()
- break
+ # Parse CPU, CPU's revision and CPU's clock information
+ for key in ['cpu', 'revision', 'clock']:
+ if key in line:
+ info = line.split(':')[1].strip()
+ if key == 'clock':
+ value = float(info.split('MHz')[0].strip()) / 1000
+ else:
+ value = info.split('(')[0].strip()
+ res[key] = value
+
+ # Power machines show, for each cpu/core, a block with
+ # all cpu information. Here we control the scan of the
+ # necessary information (1st block provides
+ # everything), skipping the function when find all
+ # information.
+ if len(res.keys()) == 3:
+ return "%(cpu)s (%(revision)s) @ %(clock)s GHz\
+ " % res
+
+ return ""
+
+ def _get_host_info(self):
+ res = {}
+ if platform.machine().startswith('ppc'):
+ res['cpu'] = self._get_ppc_cpu_info()
+ else:
+ with open('/proc/cpuinfo') as f:
+ for line in f.xreadlines():
+ if "model name" in line:
+ res['cpu'] = line.split(':')[1].strip()
+ break
res['memory'] = psutil.TOTAL_PHYMEM
+
+ # Include IBM PowerKVM name to supported distro names
+ _sup_distros = platform._supported_dists + ('ibm_powerkvm',)
# 'fedora' '17' 'Beefy Miracle'
- distro, version, codename = platform.linux_distribution()
+ distro, version, codename = platform.linux_distribution(
+ supported_dists=_sup_distros)
res['os_distro'] = distro
res['os_version'] = version
res['os_codename'] = unicode(codename, "utf-8")
--
1.8.3.1
10 years, 6 months
[PATCH] Fix Bug: Actions Menu Disappears after Refresh in Guests Tab
by Hongliang Wang
Open menu will disappear after guests list automatically refresh.
Fix it in this patch.
Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.guest_main.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js
index ea36d62..acbae15 100644
--- a/ui/js/src/kimchi.guest_main.js
+++ b/ui/js/src/kimchi.guest_main.js
@@ -169,7 +169,7 @@ kimchi.getVmsCurrentConsoleImgs = function() {
kimchi.getOpenMenuVmId = function() {
var result;
- var openMenu = $('#guestList .open:first')
+ var openMenu = $('#guestList div[name="actionmenu"] .popover:visible');
if(openMenu) {
var li_element=openMenu.closest('li');
result=li_element.attr('id');
@@ -300,7 +300,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) {
//Maintain menu open state
var actionMenu=guestActions.find("div[name=actionmenu]");
if (openMenu) {
- actionMenu.addClass("open");
+ $('.popover', actionMenu).toggle();
}
return result;
--
1.8.1.4
10 years, 6 months
[PATCH] Bug fix: Do not require login for simple resources
by Crístian Viana
The subdirectories "css", "js", "libs" and "images" currently require
a login session to be accessed. Those files are simple resources, thus
they don't need to be protected.
One consequence of this behavior is that it is not possible to create a remote
template with the current security settings.
Remove the login session requirement to access the subdirectories "css",
"js", "libs" and "images".
Signed-off-by: Aline Manera <alinefm(a)br.ibm.com>
Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com>
---
src/kimchi/config.py.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in
index 74c8fa5..4be767e 100644
--- a/src/kimchi/config.py.in
+++ b/src/kimchi/config.py.in
@@ -154,6 +154,7 @@ class UIConfig(dict):
ui_configs['/' + sub_dir] = {
'tools.staticdir.on': True,
'tools.staticdir.dir': os.path.join(paths.ui_dir, sub_dir),
+ 'tools.kimchisession.on': False,
'tools.nocache.on': False}
if sub_dir != 'images':
ui_configs['/' + sub_dir].update({
--
1.9.3
10 years, 6 months