June 2014 - Kimchi-devel - oVirt List Archives

[PATCH] Issue#380: Loading icon message splitted into two lines in Chinese
by Wen Wang 26 Jun '14

26 Jun '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Bugfix: Force Chinese charactors below the loading icon display in oneline Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 684dd7b..2f4d172 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -232,6 +232,7 @@ text-align: center; top: 0; width: 49px; + white-space: nowrap; } .grid-loading-icon { -- 1.7.1

2 1

[PATCH v2] UI changes to allow underscore in debug report name.
by Christy Perez 26 Jun '14

26 Jun '14

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

3 3

[PATCH] bug fix: UI set the network persistent attribute.
by shaohef＠linux.vnet.ibm.com 26 Jun '14

26 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> When create a network, start it and then stop it. It report this is not a persistent network, it will delete it. This is not right. Every netowrk that kimchi create is persistent at present. Js code should set the persistent attribute of network after a create action. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7bb3f98..cbd967f 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -195,6 +195,7 @@ kimchi.initNetworkCreation = function() { network.state = result.state === "active" ? "up" : "down"; network.interface = result.interface ? result.interface : i18n["KCHNET6001M"]; network.addrSpace = result.subnet ? result.subnet : i18n["KCHNET6001M"]; + network.persistent = result.persistent; kimchi.addNetworkItem(network); $("#networkConfig").dialog("close"); }); -- 1.9.3

2 1

[PATCH] Bugfix: Minor i18n updates(Chinese)
by Wen Wang 26 Jun '14

26 Jun '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Changed some Chinese translation Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 688048e..48c1ea2 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-06-25 13:38+0800\n" +"POT-Creation-Date: 2014-06-26 14:51+0800\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -251,7 +251,7 @@ msgstr "未能关闭虚拟机%(name)s。详情：%(err)s" #, python-format msgid "" "Unable to get access metadata of virtual machine %(name)s. Details: %(err)s" -msgstr "未能启动虚拟机 %(name)s. 详情：%(err)s" +msgstr "无法获得虚拟机 %(name)s的元数据，详情：%(err)s" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -1044,7 +1044,7 @@ msgid "Storage Pool" msgstr "存储池" msgid "Storage pool which volume located in" -msgstr "存储卷所占用的存储池" +msgstr "存储卷所在的存储池" msgid "Storage Volume" msgstr "存储卷" -- 1.7.1

2 1

[PATCH] add firewalld to debian Install Dependencies
by shaohef＠linux.vnet.ibm.com 26 Jun '14

26 Jun '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> When install kimchi deb package on Ubuntu14.04, it report firewalld is required, but it is not installed. This Ubuntu14.04 is a fresh OS, I install the Dependencies according to README.md But README.md misses firewalld. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 4a504d8..dc85d16 100644 --- a/docs/README.md +++ b/docs/README.md @@ -75,7 +75,7 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc python-parted nginx + open-iscsi lvm2 xsltproc python-parted nginx firewalld Packages version requirement: python-jsonschema >= 1.3.0 -- 1.9.3

3 4

[PATCH V3] Update i18n package scripts(Chinese)
by Wen Wang 26 Jun '14

26 Jun '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3 Minor changes to the Chinese translation(Hongliang Wang) A dot that accidentally added in "msgid" deleted(Cristian Viana) V1 -> V2 Only zh_CN.po file is included. remove the correct the fuzzy part and have the missed translation done. Finished English to Chinese translation Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 116 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 59 insertions(+), 57 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index caef515..490b41b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -24,10 +24,10 @@ msgstr "" "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" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -64,11 +64,11 @@ msgstr "尚未为model对象初始化数据存储。" #, python-format msgid "Unable to start task due error: %(err)s" -msgstr "" +msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" -msgstr "" +msgstr "用户'%(username)s'身份验证失败.[错误代码：%(code)s]" msgid "You are not authorized to access Kimchi" msgstr "您没有被授权访问Kimchi" @@ -134,8 +134,8 @@ msgstr "ISO文件%(filename)s的卷描述符格式错误" msgid "" "The hypervisor doesn't have permission to use this ISO %(filename)s. " "Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " +"file access control lists for '%(user)s' user if possible, or add the '%" +"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" "hypervisor没有访问ISO文件%(filename)s的权限。可以将ISO移到/var/lib/libvirt目" @@ -174,7 +174,7 @@ msgstr "不能创建虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to update virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能更新虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s" @@ -210,39 +210,39 @@ msgstr "不能启动虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Unable to power off virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能关闭虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to delete virtual machine %(name)s. Details: %(err)s" -msgstr "不能删除虚拟机 %(name)s. 详情：%(err)s" +msgstr "不能删除虚拟机 %(name)s。详情：%(err)s" #, python-format msgid "Unable to reset virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "未能重置虚拟机%(name)s。详情：%(err)s" msgid "User names list must be an array" -msgstr "" +msgstr "用户名列表必须是一个数组" msgid "User name must be a string" -msgstr "" +msgstr "用户名必须是一个字符串" msgid "Group names list must be an array" -msgstr "" +msgstr "用户组名称列表必须是一个数组" msgid "Group name must be a string" -msgstr "" +msgstr "用户组名称必须是一个字符串" #, python-format msgid "User(s) '%(users)s' do not exist" -msgstr "" +msgstr "用户'%(users)s'不存在" #, python-format msgid "Group(s) '%(groups)s' do not exist" -msgstr "" +msgstr "用户组'%(groups)s'不存在" #, python-format msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "未能关闭虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -311,7 +311,7 @@ msgid "Template distribution version must be a string" msgstr "模板的发行版版本号必须是一个字符串" msgid "The number of CPUs must be an integer greater than 0" -msgstr "" +msgstr "CPU数量必须为一个大于0的整数" msgid "Amount of memory (MB) must be an integer greater than 512" msgstr "总内存数（MB为单位）必须是一个大于512的整数" @@ -338,11 +338,11 @@ msgstr "存储池%(pool)s中没有存储卷%(volume)s" #, python-format msgid "Unable to create template due error: %(err)s" -msgstr "" +msgstr "创建模板失败。详情：%(err)s" #, python-format msgid "Unable to delete template due error: %(err)s" -msgstr "" +msgstr "由于错误：%(err)s，未能删除模板" #, python-format msgid "Storage pool %(name)s already exists" @@ -370,8 +370,8 @@ msgstr "不能创建存储池 %(name)s。详情： %(err)s" #, python-format msgid "" -"Unable to get number of storage volumes in storage pool %(name)s. Details: " -"%(err)s" +"Unable to get number of storage volumes in storage pool %(name)s. Details: %" +"(err)s" msgstr "不能获取储存池%(name)s中卷的数目。详情： %(err)s" #, python-format @@ -438,8 +438,8 @@ msgstr "为新存储池指定名字和类型" #, python-format msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." +"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)" +"s." msgstr "%(disk)s 不是有效的磁盘/分区。不能被添加到存储池%(pool)s中" #, python-format @@ -484,7 +484,7 @@ msgstr "卷组'%(name)s'已经存在，请选择其它的名字来创建逻辑 #, python-format msgid "Unable to update database with deep scan information due error: %(err)s" -msgstr "" +msgstr "全盘扫描信息更新失败。详情：%(err)s。" #, python-format msgid "Storage volume %(name)s already exists" @@ -517,8 +517,8 @@ msgstr "不能列出存储卷，因为存储池%(pool)s没有激活" #, python-format msgid "" -"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: " -"%(err)s" +"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %" +"(err)s" msgstr "不能在存储池%(pool)s中创建存储卷%(name)s。详情：%(err)s" #, python-format @@ -557,7 +557,7 @@ msgstr "存储卷需要名字" #, python-format msgid "" "Unable to update database with storage volume information due error: %(err)s" -msgstr "" +msgstr "存储卷信息更新失败。详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -634,13 +634,13 @@ msgstr "不能以桥设备%(name)s作为VLAN的trunk设备。" #, python-format msgid "Failed to activate interface %(iface)s: %(err)s." -msgstr "" +msgstr "网络接口启动失败 %(iface)s：%(err)s。" #, python-format msgid "" "Failed to activate interface %(iface)s. Please check the physical link " "status." -msgstr "" +msgstr "网络接口%(err)s启动失败，请检查网络连接情况。" #, python-format msgid "Debug report %(name)s does not exist" @@ -720,10 +720,10 @@ msgid "Unable to choose a virutal machine name" msgstr "不能选择虚拟机名字" msgid "Invalid CDROM device name" -msgstr "无效的CDROM设备名字" +msgstr "无效的CDROM设备名称" msgid "Invalid storage type. Types supported: 'cdrom'" -msgstr "无效的存储类型。支持的类型：'cdrom'" +msgstr "无效的存储类型。支持类型为：'cdrom'" #, python-format msgid "The path '%(value)s' is not valid local/remote path for the device" @@ -753,14 +753,14 @@ msgid "Do not support guest CDROM hot plug attachment" msgstr "不支持客户机热插拔CDROM" msgid "Specify type and path to add a new virtual machine disk" -msgstr "为新虚拟机磁盘指定类型和路径" +msgstr "为新的虚拟机磁盘指定类型和路径" msgid "Specify path to update virtual machine disk" msgstr "指定更新虚拟机磁盘的路径" #, python-format msgid "Controller type %(type)s limitation of %(limit)s devices reached" -msgstr "" +msgstr "控制器类型为%(type)s的设备达到上限%(limit)s" msgid "YUM Repository ID must be one word only string." msgstr "YUM软件仓库ID必须是只包含一个单词的字符串" @@ -910,25 +910,25 @@ msgid "Create" msgstr "创建" msgid "Replace a CDROM of VM" -msgstr "" +msgstr "替换一个虚拟机的CDROM" msgid "Device Name" -msgstr "" +msgstr "设备名称" msgid "The name used to identify the CDROM. Read-only." -msgstr "" +msgstr "CDROM名称，只读。" msgid "Device Type" -msgstr "" +msgstr "设备类型" msgid "The device type. Currently, only \"cdrom\" is supported." -msgstr "" +msgstr "设备类型。目前仅支持设备类型：\"cdrom\"。 " msgid "ISO File Path" -msgstr "" +msgstr "ISO文件路径" msgid "The ISO file path in the server." -msgstr "" +msgstr "服务器端所使用的ISO文件路径" msgid "Replace" msgstr "替换" @@ -952,7 +952,7 @@ msgid "CPUs" msgstr "中央处理器" msgid "Memory (MB)" -msgstr "" +msgstr "内存(MB)" msgid "Icon" msgstr "图标" @@ -976,18 +976,18 @@ msgid "Manage Media" msgstr "管理光盘介质" msgid "Add a Storage Device to VM" -msgstr "" +msgstr "为虚拟机添加一个存储设备" msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." -msgstr "" +msgstr "设备名称，如果留空系统会自动生成一个" msgid "File Path" -msgstr "" +msgstr "文件路径" msgid "The ISO file path in the server for CDROM." -msgstr "" +msgstr "服务器端CDROM所使用的ISO文件路径" msgid "Start" msgstr "启用" @@ -996,7 +996,7 @@ msgid "Reset" msgstr "重置" msgid "Power Off" -msgstr "" +msgstr "关闭电源" msgid "Actions" msgstr "操作" @@ -1008,7 +1008,7 @@ msgid "Edit" msgstr "编辑" msgid "Shut Down" -msgstr "" +msgstr "关机" msgid "Delete" msgstr "删除" @@ -1229,26 +1229,26 @@ msgid "" msgstr "这将删除虚拟机和它的虚拟磁盘。该操作不能撤销，继续吗？" msgid "Power off Confirmation" -msgstr "" +msgstr "关闭电源确认" msgid "" "This action may produce undesirable results, for example unflushed disk " "cache in the guest. Would you like to continue?" -msgstr "" +msgstr "这样做可能导致不良后果，比如客户机磁盘缓存未刷新，确认要继续吗？" msgid "Reset Confirmation" -msgstr "" +msgstr "重置确认" msgid "" "There is a risk of data loss caused by reset without the guest OS shutdown. " "Would you like to continue?" -msgstr "" +msgstr "在客户机操作系统未关闭的情况下重置有风险导致数据丢失，确认要继续吗？" msgid "Shut Down Confirmation" -msgstr "" +msgstr "关机确认" msgid "Note the guest OS may ignore this request. Would you like to continue?" -msgstr "" +msgstr "注意，客户机操作系统可能会忽略这个请求，确认要继续吗？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1287,7 +1287,8 @@ msgstr "创建一个网络" msgid "" "This network is not persistent. Instead of stop, this action will " "permanently delete it. Would you like to continue?" -msgstr "" +msgstr "这是一个临时的网络配置，该操作会永久地删除这个网络而不是停止其运行，" +"确定要继续吗？" msgid "" "This will permanently delete the storage pool. Would you like to continue?" @@ -1349,13 +1350,13 @@ msgid "Help" msgstr "帮助" msgid "About" -msgstr "" +msgstr "关于" msgid "Log out" msgstr "登出" msgid "Version:" -msgstr "" +msgstr "版本：" msgid "Log In" msgstr "登录" @@ -1678,4 +1679,5 @@ msgid "No templates found." msgstr "没有发现模板" msgid "Clone" -msgstr "" +msgstr "制作副本" + -- 1.7.1

2 3

[PATCH] bug fix: Set charset to help pages
by Aline Manera 26 Jun '14

26 Jun '14

From: Aline Manera <alinefm(a)br.ibm.com> That way Portuguese and Chinese characters can be properly displayed Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- ui/pages/help/dita-help.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/pages/help/dita-help.xsl b/ui/pages/help/dita-help.xsl index 2ea1c38..9cfeeea 100644 --- a/ui/pages/help/dita-help.xsl +++ b/ui/pages/help/dita-help.xsl @@ -8,6 +8,7 @@ <html> <head> <title><xsl:value-of select="/cshelp/title" /></title> + <meta charset="UTF-8" /> <link rel="shortcut icon" href="/images/logo.ico" /> <link rel="stylesheet" type="text/css" href="/help/kimchi.css" /> </head> -- 1.7.10.4

2 2

[PATCH V4] Update i18n package scripts(Chinese)
by Wen Wang 26 Jun '14

26 Jun '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> V4 Have the missed 7 parts translated and fixed the fuzzy part (Aline Manera) V2 -> V3 Minor changes to the Chinese translation(Hongliang Wang) A dot that accidentally added in "msgid" deleted(Cristian Viana) V1 -> V2 Only zh_CN.po file is included. remove the correct the fuzzy part and have the missed translation done. Finished English to Chinese translation Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 271 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 162 insertions(+), 109 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 246909b..688048e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-24 13:01-0300\n" +"POT-Creation-Date: 2014-06-25 13:38+0800\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -59,16 +59,20 @@ msgstr "无法解析JSON请求" msgid "This API only supports JSON" msgstr "这个API仅支持JSON" +#, python-format +msgid "Parameters does not match requirement in schema: %(err)s" +msgstr "参数不符合要求的格式：%(err)s" + msgid "Datastore is not initiated in the model object." msgstr "尚未为model对象初始化数据存储。" #, python-format msgid "Unable to start task due error: %(err)s" -msgstr "" +msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" -msgstr "" +msgstr "用户'%(username)s'身份验证失败.[错误代码：%(code)s]" msgid "You are not authorized to access Kimchi" msgstr "您没有被授权访问Kimchi" @@ -134,8 +138,8 @@ msgstr "ISO文件%(filename)s的卷描述符格式错误" msgid "" "The hypervisor doesn't have permission to use this ISO %(filename)s. " "Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " +"file access control lists for '%(user)s' user if possible, or add the '%" +"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" "hypervisor没有访问ISO文件%(filename)s的权限。可以将ISO移到/var/lib/libvirt目" @@ -174,7 +178,7 @@ msgstr "不能创建虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to update virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能更新虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s" @@ -210,39 +214,44 @@ msgstr "不能启动虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Unable to power off virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能关闭虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to delete virtual machine %(name)s. Details: %(err)s" -msgstr "不能删除虚拟机 %(name)s. 详情：%(err)s" +msgstr "不能删除虚拟机 %(name)s。详情：%(err)s" #, python-format msgid "Unable to reset virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "未能重置虚拟机%(name)s。详情：%(err)s" msgid "User names list must be an array" -msgstr "" +msgstr "用户名列表必须是一个数组" msgid "User name must be a string" -msgstr "" +msgstr "用户名必须是一个字符串" msgid "Group names list must be an array" -msgstr "" +msgstr "用户组名称列表必须是一个数组" msgid "Group name must be a string" -msgstr "" +msgstr "用户组名称必须是一个字符串" #, python-format msgid "User(s) '%(users)s' do not exist" -msgstr "" +msgstr "用户'%(users)s'不存在" #, python-format msgid "Group(s) '%(groups)s' do not exist" -msgstr "" +msgstr "用户组'%(groups)s'不存在" #, python-format msgid "Unable to shutdown virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "未能关闭虚拟机%(name)s。详情：%(err)s" + +#, python-format +msgid "" +"Unable to get access metadata of virtual machine %(name)s. Details: %(err)s" +msgstr "未能启动虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -268,6 +277,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 "模板 %(name)s 已经存在" @@ -311,7 +323,7 @@ msgid "Template distribution version must be a string" msgstr "模板的发行版版本号必须是一个字符串" msgid "The number of CPUs must be an integer greater than 0" -msgstr "" +msgstr "CPU数量必须为一个大于0的整数" msgid "Amount of memory (MB) must be an integer greater than 512" msgstr "总内存数（MB为单位）必须是一个大于512的整数" @@ -338,11 +350,14 @@ msgstr "存储池%(pool)s中没有存储卷%(volume)s" #, python-format msgid "Unable to create template due error: %(err)s" -msgstr "" +msgstr "创建模板失败。详情：%(err)s" #, python-format msgid "Unable to delete template due error: %(err)s" -msgstr "" +msgstr "由于错误：%(err)s，未能删除模板" + +msgid "Disk size must be greater than 1GB." +msgstr "磁盘大小必须大于1GB。" #, python-format msgid "Storage pool %(name)s already exists" @@ -370,8 +385,8 @@ msgstr "不能创建存储池 %(name)s。详情： %(err)s" #, python-format msgid "" -"Unable to get number of storage volumes in storage pool %(name)s. Details: " -"%(err)s" +"Unable to get number of storage volumes in storage pool %(name)s. Details: %" +"(err)s" msgstr "不能获取储存池%(name)s中卷的数目。详情： %(err)s" #, python-format @@ -438,8 +453,8 @@ msgstr "为新存储池指定名字和类型" #, python-format msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." +"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)" +"s." msgstr "%(disk)s 不是有效的磁盘/分区。不能被添加到存储池%(pool)s中" #, python-format @@ -484,7 +499,7 @@ msgstr "卷组'%(name)s'已经存在，请选择其它的名字来创建逻辑 #, python-format msgid "Unable to update database with deep scan information due error: %(err)s" -msgstr "" +msgstr "全盘扫描信息更新失败。详情：%(err)s。" #, python-format msgid "Storage volume %(name)s already exists" @@ -517,8 +532,8 @@ msgstr "不能列出存储卷，因为存储池%(pool)s没有激活" #, python-format msgid "" -"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: " -"%(err)s" +"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %" +"(err)s" msgstr "不能在存储池%(pool)s中创建存储卷%(name)s。详情：%(err)s" #, python-format @@ -557,7 +572,7 @@ msgstr "存储卷需要名字" #, python-format msgid "" "Unable to update database with storage volume information due error: %(err)s" -msgstr "" +msgstr "存储卷信息更新失败。详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -634,13 +649,13 @@ msgstr "不能以桥设备%(name)s作为VLAN的trunk设备。" #, python-format msgid "Failed to activate interface %(iface)s: %(err)s." -msgstr "" +msgstr "网络接口启动失败 %(iface)s：%(err)s。" #, python-format msgid "" "Failed to activate interface %(iface)s. Please check the physical link " "status." -msgstr "" +msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Debug report %(name)s does not exist" @@ -669,6 +684,12 @@ msgid "" msgstr "名字必须是一个字符串。只允许字母、数字和连字符 ('-')。" #, 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" msgstr "存储服务器%(server)s未被Kimchi使用" @@ -719,11 +740,11 @@ msgstr "命令'%(cmd)s'运行%(seconds)s秒后超时。" msgid "Unable to choose a virutal machine name" msgstr "不能选择虚拟机名字" -msgid "Invalid CDROM device name" -msgstr "无效的CDROM设备名字" +msgid "Invalid vm storage device name" +msgstr "无效的虚拟机存储设备名称" -msgid "Invalid storage type. Types supported: 'cdrom'" -msgstr "无效的存储类型。支持的类型：'cdrom'" +msgid "Invalid storage type. Types supported: 'cdrom', 'disk'" +msgstr "无效的存储类型。支持类型为：'cdrom'，'disk'" #, python-format msgid "The path '%(value)s' is not valid local/remote path for the device" @@ -733,6 +754,12 @@ msgstr "设备路径'%(value)s'不是一个有效的本地/远程路径" msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "设备%(dev_name)s在vm%(vm_name)s上已存在" +msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" +msgstr "无效的目标设备总线类型。支持类型为：'ide'，'scsi'，'virtio'" + +msgid "Just support cdrom path update" +msgstr "仅支持cdrom路径更新" + #, 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,18 +776,27 @@ 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" +msgid "Do not support ide device hot plug" +msgstr "不支持ide设备热插拔" -msgid "Specify type and path to add a new virtual machine disk" -msgstr "为新虚拟机磁盘指定类型和路径" +msgid "" +"Specify type and path or type and pool/volume to add a new virtual machine " +"disk" +msgstr "为添加新建虚拟机磁盘指定类型和路径或者类型和存储池/存储卷" msgid "Specify path to update virtual machine disk" msgstr "指定更新虚拟机磁盘的路径" #, python-format msgid "Controller type %(type)s limitation of %(limit)s devices reached" -msgstr "" +msgstr "控制器类型为%(type)s的设备达到上限%(limit)s" + +#, python-format +msgid "Cannot lookup disk path information by given pool/volume: %(error)s" +msgstr "使用给出的存储池/存储卷查找磁盘路径信息失败，详情：%(error)s" + +msgid "Volume already been used by other vm" +msgstr "存储卷已经被其他虚拟机使用" msgid "YUM Repository ID must be one word only string." msgstr "YUM软件仓库ID必须是只包含一个单词的字符串" @@ -909,30 +945,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 "修改客户机" @@ -952,13 +964,16 @@ msgid "CPUs" msgstr "中央处理器" msgid "Memory (MB)" -msgstr "" +msgstr "内存(MB)" msgid "Icon" msgstr "图标" -msgid "Attach" -msgstr "装载" +msgid "Device" +msgstr "设备名称" + +msgid "Path" +msgstr "路径" msgid "Network" msgstr "网络" @@ -969,25 +984,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 "启用" @@ -996,7 +1000,7 @@ msgid "Reset" msgstr "重置" msgid "Power Off" -msgstr "" +msgstr "关闭电源" msgid "Actions" msgstr "操作" @@ -1004,15 +1008,59 @@ msgstr "操作" msgid "Connect" msgstr "连接到" +msgid "Manage Media" +msgstr "管理光盘介质" + msgid "Edit" msgstr "编辑" msgid "Shut Down" -msgstr "" +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 "设备类型。目前支持设备类型：\"cdrom\"和\"disk\"。 " + +msgid "Device Bus" +msgstr "设备总线" + +msgid "Storage Pool" +msgstr "存储池" + +msgid "Storage pool which volume located in" +msgstr "存储卷所占用的存储池" + +msgid "Storage Volume" +msgstr "存储卷" + +msgid "Storage volume to be attached" +msgstr "被添加的存储卷" + +msgid "File Path" +msgstr "文件路径" + +msgid "The ISO file path in the server for CDROM." +msgstr "服务器端CDROM所使用的ISO文件路径" + +msgid "Attach" +msgstr "装载" + msgid "The username or password you entered is incorrect. Please try again." msgstr "用户名或密码错误，请重新输入。" @@ -1064,9 +1112,6 @@ msgstr "删除确认" msgid "OK" msgstr "确定" -msgid "Cancel" -msgstr "取消" - msgid "Confirm" msgstr "确认" @@ -1223,32 +1268,38 @@ msgstr "下载" msgid "Report name should contain only letters, digits and/or hyphen ('-')." msgstr "报告名字中只能包含字母、数字或连字符（-）。" +msgid "Pending..." +msgstr "正在加载..." + msgid "" "This will delete the virtual machine and its virtual disks. This operation " "cannot be undone. Would you like to continue?" msgstr "这将删除虚拟机和它的虚拟磁盘。该操作不能撤销，继续吗？" msgid "Power off Confirmation" -msgstr "" +msgstr "关闭电源确认" msgid "" "This action may produce undesirable results, for example unflushed disk " "cache in the guest. Would you like to continue?" -msgstr "" +msgstr "这样做可能导致不良后果，比如客户机磁盘缓存未刷新，确认要继续吗？" msgid "Reset Confirmation" -msgstr "" +msgstr "重置确认" msgid "" "There is a risk of data loss caused by reset without the guest OS shutdown. " "Would you like to continue?" -msgstr "" +msgstr "在客户机操作系统未关闭的情况下重置有风险导致数据丢失，确认要继续吗？" msgid "Shut Down Confirmation" -msgstr "" +msgstr "关机确认" msgid "Note the guest OS may ignore this request. Would you like to continue?" -msgstr "" +msgstr "注意，客户机操作系统可能会忽略这个请求，确认要继续吗？" + +msgid "VM Delete Confirmation" +msgstr "虚拟机删除确认" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1288,6 +1339,8 @@ msgid "" "This network is not persistent. Instead of stop, this action will " "permanently delete it. Would you like to continue?" msgstr "" +"这是一个临时的网络配置，该操作会永久地删除这个网络而不是停止其运行，确定要继" +"续吗？" msgid "" "This will permanently delete the storage pool. Would you like to continue?" @@ -1349,16 +1402,16 @@ msgid "Help" msgstr "帮助" msgid "About" -msgstr "" +msgstr "关于" msgid "Log out" msgstr "登出" msgid "Version:" -msgstr "" +msgstr "版本：" -msgid "Log In" -msgstr "登录" +msgid "Session timeout, please re-login." +msgstr "登录超时，请重新登录。" msgid "User Name" msgstr "用户名" @@ -1366,6 +1419,9 @@ msgstr "用户名" msgid "Password" msgstr "密码" +msgid "Log In" +msgstr "登录" + msgid "Generate a New Debug Report" msgstr "产生一个新的诊断报告" @@ -1494,6 +1550,9 @@ msgstr "iSCSI认证" msgid "SCSI Adapter" msgstr "SCSI适配器" +msgid "Please, wait..." +msgstr "请等待..." + msgid "Add Template" msgstr "创建模板" @@ -1509,9 +1568,6 @@ msgstr "远程ISO镜像" msgid "Search ISOs" msgstr "搜索ISO" -msgid "Please, wait..." -msgstr "请等待..." - msgid "The following ISOs are available:" msgstr "可用ISO文件如下" @@ -1563,9 +1619,6 @@ msgstr "光驱" msgid "Graphics" msgstr "图形" -msgid "Storage Pool" -msgstr "存储池" - msgid "CPU" msgstr "处理器" @@ -1602,9 +1655,6 @@ msgstr "处理器" msgid "System Statistics" msgstr "系统统计信息" -msgid "Collecting data after leaving this page" -msgstr "离开该页面仍继续收集数据" - msgid "Update Progress" msgstr "更新进度" @@ -1620,8 +1670,8 @@ msgstr "网络类型" msgid "Address Space" msgstr "地址空间" -msgid "Alphanumeric and '_' characters only." -msgstr "字母，数字和下划线。" +msgid "Name should not contain '/' and '\"'." +msgstr "名字中不能包含‘/’和'\"'。" msgid "Isolated: no external network connection" msgstr "隔离: 同物理网络不连通" @@ -1665,6 +1715,9 @@ msgstr "停用" msgid "Activate" msgstr "激活" +msgid "Extend" +msgstr "扩展" + msgid "Undefine" msgstr "取消定义" @@ -1678,4 +1731,4 @@ msgid "No templates found." msgstr "没有发现模板" msgid "Clone" -msgstr "" +msgstr "制作副本" -- 1.7.1

3 5

[PATCH] issue#382: Fix wrong default behavior of add guest cdrom
by lvroyce＠linux.vnet.ibm.com 26 Jun '14

26 Jun '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Add function for cdrom and disk form validation, so that cdrom will not be created when no path given. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 28 ++++++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 6af00cc..20e81ca 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -127,6 +127,25 @@ kimchi.guest_storage_add_main = function() { }); }); + var validateCDROM = function(settings) { + if (settings['path'] && settings['path'] != '') + return true; + else { + kimchi.message.error.code('KCHVMSTOR0001E'); + return false; + } + } + + var validateDisk = function(settings) { + if (settings['pool'] && settings['vol']) + return true; + else { + kimchi.message.error.code('KCHVMSTOR0002E'); + return false; + } + } + + validator = {cdrom: validateCDROM, disk: validateDisk}; var submitForm = function(event) { if (submitButton.prop('disabled')) { return false; @@ -147,6 +166,15 @@ kimchi.guest_storage_add_main = function() { settings[$(c).attr('name')] = $(c).val(); } }); + // Validate form for cdrom and disk + validateSpecifiedForm = validator[settings['type']]; + if (!validateSpecifiedForm(settings)) { + $(submitButton).prop('disabled', false); + $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $(c).prop('disabled', false); + }); + return false; + } $(submitButton).addClass('loading').text(i18n['KCHVMCD6003M']); kimchi.addVMStorage(settings, function(result) { diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ce23bc4..477733f 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -162,5 +162,8 @@ "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. please, modify it.")", "KCHPOOL6010M": "$_("Looking for available partitions ...")", "KCHPOOL6011M": "$_("No available partitions found.")", - "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")" -} \ No newline at end of file + "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", + + "KCHVMSTOR0001E": "$_("CDROM path cannot be blank.")", + "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")" +} -- 1.8.3.2

4 3

[PATCH] Show remote Ubuntu 14.04 in new Template window
by Rodrigo Trujillo 25 Jun '14

25 Jun '14

This patch changes ubuntu.json, adding iso entry for ubuntu for PPC Little Endian. Then users are able to install a ppc virtual machine using this iso. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(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 fbd931a..7c9fbc1 100644 --- a/src/distros.d/ubuntu.json +++ b/src/distros.d/ubuntu.json @@ -12,5 +12,12 @@ "os_arch": "x86_64", "os_version": "13.10", "path": "http://ubuntu-releases.cs.umn.edu/13.10/ubuntu-13.10-desktop-amd64.iso" + }, + { + "name": "Ubuntu Server 14.04 LE (Trusty Tahr)", + "os_distro": "ubuntu", + "os_arch": "ppc64", + "os_version": "14.04", + "path": "http://cdimages.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-ppc64…" } ] -- 1.9.3

4 8