[Kimchi-devel] [PATCH 1/2] Update messages

Fix typos and adjust messages to always begin with upper letter. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com&gt; --- src/kimchi/i18n.py | 68 ++++++++++++++++++++++++------------------------- ui/pages/i18n.json.tmpl | 22 ++++++++-------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index bbe4b02..9e66c68 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -23,7 +23,7 @@ _ = gettext.gettext messages = { - "KCHAPI0001E": _("Unkown parameter specified %(value)s"), + "KCHAPI0001E": _("Unknown parameter %(value)s"), "KCHAPI0002E": _("Delete is not allowed for %(resource)s"), "KCHAPI0003E": _("%(resource)s does not implement update method"), "KCHAPI0004E": _("Parameters %(params)s are not allowed to be updated in %(resource)s"), @@ -49,7 +49,7 @@ messages = { "KCHISCSI0001E": _("Unable to login to iSCSI host target %(portal)s. Details: %(err)s"), "KCHISCSI0002E": _("Unable to login to iSCSI host %(host)s target %(target)s"), - "KCHISO0001E": _("Unable to find ISO file ISO %(filename)s"), + "KCHISO0001E": _("Unable to find ISO file %(filename)s"), "KCHISO0002E": _("The ISO file %(filename)s is not bootable"), "KCHISO0003E": _("The ISO file %(filename)s does not have a valid El Torito boot record"), "KCHISO0004E": _("Invalid El Torito validation entry in ISO %(filename)s"), @@ -62,33 +62,33 @@ messages = { "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'." "Details: %(err)s" ), - "KCHIMG0001E": _("Error occurs when probing image os information."), + "KCHIMG0001E": _("An error occurred when probing image OS information."), "KCHIMG0002E": _("No OS information found in given image."), - "KCHIMG0003E": _("Unable to find/read image file %(filename)s"), + "KCHIMG0003E": _("Unable to read image file %(filename)s"), "KCHVM0001E": _("Virtual machine %(name)s already exists"), "KCHVM0002E": _("Virtual machine %(name)s does not exist"), - "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s already exists or it is not powered off."), + "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s is already in use or the virtual machine is not powered off."), "KCHVM0004E": _("Unable to retrieve screenshot for stopped virtual machine %(name)s"), "KCHVM0005E": _("Remote ISO image is not supported by this server."), - "KCHVM0006E": _("Screenshot not supported for virtual machine %(name)s"), + "KCHVM0006E": _("Screenshot is not supported on virtual machine %(name)s"), "KCHVM0007E": _("Unable to create virtual machine %(name)s. Details: %(err)s"), "KCHVM0008E": _("Unable to update virtual machine %(name)s. Details: %(err)s"), "KCHVM0009E": _("Unable to retrieve virtual machine %(name)s. Details: %(err)s"), - "KCHVM0010E": _("Unable to connect to powered off machine %(name)s."), + "KCHVM0010E": _("Unable to connect to powered off virtual machine %(name)s."), "KCHVM0011E": _("Virtual machine name must be a string"), - "KCHVM0012E": _("Invalid template URI: %(value)s specified for virtual machine"), - "KCHVM0013E": _("Invalid storage pool URI: %(value)s specified for virtual machine"), - "KCHVM0014E": _("Supported virtual machine graphics are spice or VNC"), + "KCHVM0012E": _("Invalid template URI %(value)s specified for virtual machine"), + "KCHVM0013E": _("Invalid storage pool URI %(value)s specified for virtual machine"), + "KCHVM0014E": _("Supported virtual machine graphics are Spice or VNC"), "KCHVM0015E": _("Graphics address to listen on must be IPv4 or IPv6"), "KCHVM0016E": _("Specify a template to create a virtual machine from"), "KCHVM0019E": _("Unable to start virtual machine %(name)s. Details: %(err)s"), "KCHVM0020E": _("Unable to power off virtual machine %(name)s. Details: %(err)s"), "KCHVM0021E": _("Unable to delete virtual machine %(name)s. Details: %(err)s"), "KCHVM0022E": _("Unable to reset virtual machine %(name)s. Details: %(err)s"), - "KCHVM0023E": _("User names list must be an array"), + "KCHVM0023E": _("User name list must be an array"), "KCHVM0024E": _("User name must be a string"), - "KCHVM0025E": _("Group names list must be an array"), + "KCHVM0025E": _("Group name list must be an array"), "KCHVM0026E": _("Group name must be a string"), "KCHVM0027E": _("User(s) '%(users)s' do not exist"), "KCHVM0028E": _("Group(s) '%(groups)s' do not exist"), @@ -123,8 +123,8 @@ messages = { "KCHTMPL0015E": _("Invalid storage pool URI %(value)s specified for template"), "KCHTMPL0016E": _("Specify an ISO image as CDROM or a base image to create a template"), "KCHTMPL0017E": _("All networks for the template must be specified in a list."), - "KCHTMPL0018E": _("Must specify a volume to a template, when storage pool is iscsi or scsi"), - "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)s"), + "KCHTMPL0018E": _("Specify a volume to a template when storage pool is iSCSI or SCSI"), + "KCHTMPL0019E": _("The volume %(volume)s is not in storage pool %(pool)s"), "KCHTMPL0020E": _("Unable to create template due error: %(err)s"), "KCHTMPL0021E": _("Unable to delete template due error: %(err)s"), "KCHTMPL0022E": _("Disk size must be greater than 1GB."), @@ -144,20 +144,20 @@ messages = { "KCHPOOL0012E": _("Unable to create NFS Pool as export path %(path)s may block during mount"), "KCHPOOL0013E": _("Unable to create NFS Pool as export path %(path)s mount failed"), "KCHPOOL0014E": _("Unsupported storage pool type: %(type)s"), - "KCHPOOL0015E": _("Error while getting xml for storage pool %(pool)s"), + "KCHPOOL0015E": _("Error while retrieving storage pool XML to %(pool)s"), "KCHPOOL0016E": _("Storage pool name must be a string"), - "KCHPOOL0017E": _("Supported storage pool types are dir, netfs, logical and kimchi-iso"), + "KCHPOOL0017E": _("Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-iso"), "KCHPOOL0018E": _("Storage pool path must be a string"), "KCHPOOL0019E": _("Storage pool host must be a IP or hostname"), - "KCHPOOL0020E": _("Storage pool devices must be the full path to the block device"), + "KCHPOOL0020E": _("Storage pool device must be the absolute path to the block device"), "KCHPOOL0021E": _("Storage pool devices parameter must be a list"), "KCHPOOL0022E": _("Target IQN of an iSCSI pool must be a string"), "KCHPOOL0023E": _("Port of a remote storage server must be an integer between 1 and 65535"), - "KCHPOOL0024E": _("Login username of the iSCSI target must be a string"), - "KCHPOOL0025E": _("Login password of the iSCSI target must be a string"), + "KCHPOOL0024E": _("iSCSI target username must be a string"), + "KCHPOOL0025E": _("iSCSI target password must be a string"), "KCHPOOL0026E": _("Specify name and type to create a storage pool"), "KCHPOOL0027E": _("%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)s."), - "KCHPOOL0028E": _("Error while extending logical pool %(pool)s. Details: %(err)s"), + "KCHPOOL0028E": _("Unable to extend logical pool %(pool)s. Details: %(err)s"), "KCHPOOL0029E": _("The parameter disks only can be updated for logical storage pool."), "KCHPOOL0030E": _("The SCSI host adapter name must be a string."), "KCHPOOL0031E": _("The storage pool kimchi_isos is reserved for internal use"), @@ -170,7 +170,7 @@ messages = { "KCHVOL0001E": _("Storage volume %(name)s already exists"), "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"), - "KCHVOL0003E": _("Unable to create storage volume %(volume)s becuase storage pool %(pool)s is not active"), + "KCHVOL0003E": _("Unable to create storage volume %(volume)s because storage pool %(pool)s is not active"), "KCHVOL0004E": _("Specify %(item)s in order to create storage volume %(volume)s"), "KCHVOL0005E": _("Unable to retrieve storage volume %(volume)s because storage pool %(pool)s is not active"), "KCHVOL0006E": _("Unable to list storage volumes because storage pool %(pool)s is not active"), @@ -185,8 +185,8 @@ messages = { "KCHVOL0015E": _("Storage volume format not supported"), "KCHVOL0016E": _("Storage volume requires a volume name"), "KCHVOL0017E": _("Unable to update database with storage volume information due error: %(err)s"), - "KCHVOL0018E": _("Only one of %(param)s can be specified"), - "KCHVOL0019E": _("Creating volume from %(param)s is not supported"), + "KCHVOL0018E": _("Only one of parameter %(param)s can be specified"), + "KCHVOL0019E": _("Create volume from %(param)s is not supported"), "KCHVOL0020E": _("Storage volume capacity must be an integer number."), "KCHVOL0021E": _("Storage volume URL must be http://, https://, ftp:// or ftps://."), @@ -216,10 +216,10 @@ messages = { "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), "KCHDR0003E": _("Unable to create debug report %(name)s. Details: %(err)s."), - "KCHDR0004E": _("Can not find any generated debug report matching name %(name)s"), + "KCHDR0004E": _("Can not find any debug report with the given name %(name)s"), "KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"), - "KCHDR0006E": _("You should give a name for the debug file report."), - "KCHDR0007E": _("Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."), + "KCHDR0006E": _("You should give a name for the debug report file."), + "KCHDR0007E": _("Debug report name must be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."), "KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), @@ -241,23 +241,23 @@ messages = { "KCHUTILS0001E": _("Invalid URI %(uri)s"), "KCHUTILS0002E": _("Timeout while running command '%(cmd)s' after %(seconds)s seconds"), - "KCHUTILS0003E": _("Unable to choose a virutal machine name"), + "KCHUTILS0003E": _("Unable to choose a virtual machine name"), "KCHVMSTOR0001E": _("Invalid vm storage device name"), "KCHVMSTOR0002E": _("Invalid storage type. Types supported: 'cdrom', 'disk'"), - "KCHVMSTOR0003E": _("The path '%(value)s' is not valid local/remote path for the device"), - "KCHVMSTOR0004E": _("Device name %(dev_name)s already exists in vm %(vm_name)s"), - "KCHVMSTOR0006E": _("Just support cdrom path update"), - "KCHVMSTOR0007E": _("The storage device %(dev_name)s does not exist in the guest %(vm_name)s"), + "KCHVMSTOR0003E": _("The path '%(value)s' is not a valid local/remote path for the device"), + "KCHVMSTOR0004E": _("Device name %(dev_name)s already exists in the virtual machine %(vm_name)s"), + "KCHVMSTOR0006E": _("Only CDROM path can be update."), + "KCHVMSTOR0007E": _("The storage device %(dev_name)s does not exist in the virtual machine %(vm_name)s"), "KCHVMSTOR0008E": _("Error while creating new storage device: %(error)s"), "KCHVMSTOR0009E": _("Error while updating storage device: %(error)s"), "KCHVMSTOR0010E": _("Error while removing storage device: %(error)s"), - "KCHVMSTOR0011E": _("Do not support ide device hot plug"), + "KCHVMSTOR0011E": _("Do not support IDE device hot plug"), "KCHVMSTOR0012E": _("Specify type and path or type and pool/volume to add a new virtual machine disk"), "KCHVMSTOR0013E": _("Specify path to update virtual machine disk"), "KCHVMSTOR0014E": _("Controller type %(type)s limitation of %(limit)s devices reached"), - "KCHVMSTOR0015E": _("Cannot lookup disk path information by given pool/volume: %(error)s"), - "KCHVMSTOR0016E": _("Volume already been used by other vm"), + "KCHVMSTOR0015E": _("Cannot retrieve disk path information for given pool/volume: %(error)s"), + "KCHVMSTOR0016E": _("Volume already in use by other virtual machine."), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), "KCHREPOS0001E": _("YUM Repository ID must be one word only string."), diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index d920ae2..b552101 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -39,7 +39,7 @@ "KCHAPI6003E": "$_("This is not a valid Linux path")", "KCHAPI6004E": "$_("This is not a valid URL.")", "KCHAPI6005E": "$_("No such data available.")", - "KCHAPI6006E": "$_("options needed.")", + "KCHAPI6006E": "$_("Options needed.")", "KCHAPI6007E": "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")", "KCHAPI6001M": "$_("Delete Confirmation")", @@ -52,11 +52,11 @@ "KCHAPI6008M": "$_("Creating...")", "KCHGRD6001M": "$_("Loading...")", - "KCHGRD6002M": "$_("An error occurs while checking for packages update.")", + "KCHGRD6002M": "$_("An error occurred while checking for packages update.")", "KCHGRD6003M": "$_("Retry")", "KCHGRD6004M": "$_("Detailed message:")", - "KCHTMPL6001W": "$_("No iso found")", + "KCHTMPL6001W": "$_("No ISO found")", "KCHTMPL6002E": "$_("This is not a valid ISO file.")", @@ -100,7 +100,7 @@ "KCHUPD6005M": "$_("Repository")", "KCHUPD6006M": "$_("Update All")", "KCHUPD6007M": "$_("Updating...")", - "KCHUPD6008M": "$_("Failed to retrieve updates.")", + "KCHUPD6008M": "$_("Failed to retrieve packages update information.")", "KCHUPD6009M": "$_("Failed to update package(s).")", @@ -126,8 +126,8 @@ " the guest OS shutdown. Would you like to continue?")", "KCHVM6006M": "$_("Shut Down Confirmation")", "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", - "KCHVM6008M": "$_("VM Delete Confirmation")", - "KCHVM6009M": "$_("This VM is not persistent. Power Off will delete it. Continue?")", + "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", + "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", @@ -152,9 +152,9 @@ "KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")", "KCHPOOL6004M": "$_("SCSI Fibre Channel")", "KCHPOOL6005M": "$_("No SCSI adapters found.")", - "KCHPOOL6006M": "$_("loading targets...")", - "KCHPOOL6007M": "$_("no targets is got, please input one.")", - "KCHPOOL6008M": "$_("failed to load targets.")", + "KCHPOOL6006M": "$_("Loading iSCSI targets...")", + "KCHPOOL6007M": "$_("No iSCSI found. Please input one.")", + "KCHPOOL6008M": "$_("Failed to load iSCSI targets.")", "KCHPOOL6001E": "$_("The storage pool name can not be blank.")", "KCHPOOL6002E": "$_("The storage pool path can not be blank.")", @@ -164,12 +164,12 @@ "KCHPOOL6006E": "$_("No logical device selected.")", "KCHPOOL6007E": "$_("The iSCSI target can not be blank.")", "KCHPOOL6008E": "$_("Server name can not be blank.")", - "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. please, modify it.")", + "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")", "KCHPOOL6010M": "$_("Looking for available partitions ...")", "KCHPOOL6011M": "$_("No available partitions found.")", "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", - "KCHVMSTOR0001E": "$_("CDROM path need to be a valid local path and cannot be blank.")", + "KCHVMSTOR0001E": "$_("CDROM path needs to be a valid local/remote path and cannot be blank.")", "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")" } -- 1.9.3