You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2013/04/29 15:51:36 UTC

git commit: updated refs/heads/master to 9416cb1

Updated Branches:
  refs/heads/master 35b416616 -> 9416cb14a


Adding arabic key to resource file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9416cb14
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9416cb14
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9416cb14

Branch: refs/heads/master
Commit: 9416cb14a9f9008d2c9e6355000e5abbbaeef3cf
Parents: 35b4166
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Apr 29 09:51:24 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Apr 29 09:51:24 2013 -0400

----------------------------------------------------------------------
 .../WEB-INF/classes/resources/messages.properties  |  569 +++++++--------
 1 files changed, 282 insertions(+), 287 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9416cb14/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index bab65de..8f9c662 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,16 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-label.add.affinity.group=Add new affinity group
-message.delete.affinity.group=Please confirm that you would like to remove this affinity group.
-label.delete.affinity.group=Delete Affinity Group
-label.edit.affinity.group=Edit Affinity Group
-label.affinity=Affinity
-label.anti.affinity=Anti-affinity
-label.affinity.groups=Affinity Groups
-label.anti.affinity.groups=Anti-affinity Groups
-label.affinity.group=Affinity Group
-label.anti.affinity.group=Anti-affinity Group
+
 changed.item.properties=Changed item properties
 confirm.enable.s3=Please fill in the following information to enable support for S3-backed Secondary Storage
 confirm.enable.swift=Please fill in the following information to enable support for Swift
@@ -31,7 +22,7 @@ error.could.not.enable.zone=Could not enable zone
 error.installWizard.message=Something went wrong; you may go back and correct any errors
 error.invalid.username.password=Invalid username or password
 error.login=Your username/password does not match our records.
-error.menu.select=Unable to perform action due to no items being selected. 
+error.menu.select=Unable to perform action due to no items being selected.
 error.mgmt.server.inaccessible=The Management Server is unaccessible.  Please try again later.
 error.password.not.match=The password fields do not match
 error.please.specify.physical.network.tags=Network offerings is not available until you specify tags for this physical network.
@@ -40,115 +31,115 @@ error.something.went.wrong.please.correct.the.following=Something went wrong; pl
 error.unable.to.reach.management.server=Unable to reach Management Server
 error.unresolved.internet.name=Your internet name cannot be resolved.
 extractable=Extractable
-force.delete.domain.warning=Warning: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
+force.delete.domain.warning=Warning\: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
 force.delete=Force Delete
+force.remove.host.warning=Warning\: Choosing this option will cause CloudStack to forcefully stop all running virtual machines before removing this host from the cluster.
 force.remove=Force Remove
-force.remove.host.warning=Warning: Choosing this option will cause CloudStack to forcefully stop all running virtual machines before removing this host from the cluster.
+force.stop.instance.warning=Warning\: Forcing a stop on this instance should be your last option. It can lead to data loss as well as inconsistent behavior of the virtual machine state.
 force.stop=Force Stop
-force.stop.instance.warning=Warning: Forcing a stop on this instance should be your last option. It can lead to data loss as well as inconsistent behavior of the virtual machine state.
 ICMP.code=ICMP Code
 ICMP.type=ICMP Type
 image.directory=Image Directory
 inline=Inline
 instances.actions.reboot.label=Reboot instance
 label.accept.project.invitation=Accept project invitation
-label.account=Account
 label.account.and.security.group=Account, Security group
 label.account.id=Account ID
 label.account.name=Account Name
-label.accounts=Accounts
 label.account.specific=Account-Specific
+label.account=Account
+label.accounts=Accounts
 label.acquire.new.ip=Acquire New IP
-label.action.attach.disk=Attach Disk
 label.action.attach.disk.processing=Attaching Disk....
-label.action.attach.iso=Attach ISO
+label.action.attach.disk=Attach Disk
 label.action.attach.iso.processing=Attaching ISO....
-label.action.cancel.maintenance.mode=Cancel Maintenance Mode
+label.action.attach.iso=Attach ISO
 label.action.cancel.maintenance.mode.processing=Cancelling Maintenance Mode....
+label.action.cancel.maintenance.mode=Cancel Maintenance Mode
 label.action.change.password=Change Password
-label.action.change.service=Change Service
 label.action.change.service.processing=Changing Service....
-label.action.copy.ISO=Copy ISO
+label.action.change.service=Change Service
 label.action.copy.ISO.processing=Coping ISO....
-label.action.copy.template=Copy Template
+label.action.copy.ISO=Copy ISO
 label.action.copy.template.processing=Coping Template....
-label.action.create.template=Create Template
+label.action.copy.template=Copy Template
 label.action.create.template.from.vm=Create Template from VM
 label.action.create.template.from.volume=Create Template from Volume
 label.action.create.template.processing=Creating Template....
-label.action.create.vm=Create VM
+label.action.create.template=Create Template
 label.action.create.vm.processing=Creating VM....
-label.action.create.volume=Create Volume
+label.action.create.vm=Create VM
 label.action.create.volume.processing=Creating Volume....
-label.action.delete.account=Delete account
+label.action.create.volume=Create Volume
 label.action.delete.account.processing=Deleting account....
-label.action.delete.cluster=Delete Cluster
+label.action.delete.account=Delete account
 label.action.delete.cluster.processing=Deleting Cluster....
-label.action.delete.disk.offering=Delete Disk Offering
+label.action.delete.cluster=Delete Cluster
 label.action.delete.disk.offering.processing=Deleting Disk Offering....
-label.action.delete.domain=Delete Domain
+label.action.delete.disk.offering=Delete Disk Offering
 label.action.delete.domain.processing=Deleting Domain....
-label.action.delete.firewall=Delete firewall rule
+label.action.delete.domain=Delete Domain
 label.action.delete.firewall.processing=Deleting Firewall....
-label.action.delete.ingress.rule=Delete Ingress Rule
+label.action.delete.firewall=Delete firewall rule
 label.action.delete.ingress.rule.processing=Deleting Ingress Rule....
-label.action.delete.IP.range=Delete IP Range
+label.action.delete.ingress.rule=Delete Ingress Rule
 label.action.delete.IP.range.processing=Deleting IP Range....
-label.action.delete.ISO=Delete ISO
+label.action.delete.IP.range=Delete IP Range
 label.action.delete.ISO.processing=Deleting ISO....
-label.action.delete.load.balancer=Delete load balancer rule
+label.action.delete.ISO=Delete ISO
 label.action.delete.load.balancer.processing=Deleting Load Balancer....
-label.action.delete.network=Delete Network
+label.action.delete.load.balancer=Delete load balancer rule
 label.action.delete.network.processing=Deleting Network....
+label.action.delete.network=Delete Network
 label.action.delete.nexusVswitch=Delete Nexus 1000v
 label.action.delete.physical.network=Delete physical network
-label.action.delete.pod=Delete Pod
 label.action.delete.pod.processing=Deleting Pod....
-label.action.delete.primary.storage=Delete Primary Storage
+label.action.delete.pod=Delete Pod
 label.action.delete.primary.storage.processing=Deleting Primary Storage....
-label.action.delete.secondary.storage=Delete Secondary Storage
+label.action.delete.primary.storage=Delete Primary Storage
 label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
-label.action.delete.security.group=Delete Security Group
+label.action.delete.secondary.storage=Delete Secondary Storage
 label.action.delete.security.group.processing=Deleting Security Group....
-label.action.delete.service.offering=Delete Service Offering
+label.action.delete.security.group=Delete Security Group
 label.action.delete.service.offering.processing=Deleting Service Offering....
-label.action.delete.snapshot=Delete Snapshot
+label.action.delete.service.offering=Delete Service Offering
 label.action.delete.snapshot.processing=Deleting Snapshot....
+label.action.delete.snapshot=Delete Snapshot
 label.action.delete.system.service.offering=Delete System Service Offering
-label.action.delete.template=Delete Template
 label.action.delete.template.processing=Deleting Template....
-label.action.delete.user=Delete User
+label.action.delete.template=Delete Template
 label.action.delete.user.processing=Deleting User....
-label.action.delete.volume=Delete Volume
+label.action.delete.user=Delete User
 label.action.delete.volume.processing=Deleting Volume....
-label.action.delete.zone=Delete Zone
+label.action.delete.volume=Delete Volume
 label.action.delete.zone.processing=Deleting Zone....
-label.action.destroy.instance=Destroy Instance
+label.action.delete.zone=Delete Zone
 label.action.destroy.instance.processing=Destroying Instance....
-label.action.destroy.systemvm=Destroy System VM
+label.action.destroy.instance=Destroy Instance
 label.action.destroy.systemvm.processing=Destroying System VM....
-label.action.detach.disk=Detach Disk
+label.action.destroy.systemvm=Destroy System VM
 label.action.detach.disk.processing=Detaching Disk....
-label.action.detach.iso=Detach ISO
+label.action.detach.disk=Detach Disk
 label.action.detach.iso.processing=Detaching ISO....
-label.action.disable.account=Disable account
+label.action.detach.iso=Detach ISO
 label.action.disable.account.processing=Disabling account....
-label.action.disable.cluster=Disable Cluster
+label.action.disable.account=Disable account
 label.action.disable.cluster.processing=Disabling Cluster....
+label.action.disable.cluster=Disable Cluster
 label.action.disable.nexusVswitch=Disable Nexus 1000v
 label.action.disable.physical.network=Disable physical network
-label.action.disable.pod=Disable Pod
 label.action.disable.pod.processing=Disabling Pod....
-label.action.disable.static.NAT=Disable Static NAT
+label.action.disable.pod=Disable Pod
 label.action.disable.static.NAT.processing=Disabling Static NAT....
-label.action.disable.user=Disable User
+label.action.disable.static.NAT=Disable Static NAT
 label.action.disable.user.processing=Disabling User....
-label.action.disable.zone=Disable Zone
+label.action.disable.user=Disable User
 label.action.disable.zone.processing=Disabling Zone....
+label.action.disable.zone=Disable Zone
 label.action.download.ISO=Download ISO
 label.action.download.template=Download Template
-label.action.download.volume=Download Volume
 label.action.download.volume.processing=Downloading Volume....
+label.action.download.volume=Download Volume
 label.action.edit.account=Edit account
 label.action.edit.disk.offering=Edit Disk Offering
 label.action.edit.domain=Edit Domain
@@ -156,9 +147,9 @@ label.action.edit.global.setting=Edit Global Setting
 label.action.edit.host=Edit Host
 label.action.edit.instance=Edit Instance
 label.action.edit.ISO=Edit ISO
-label.action.edit.network=Edit Network
 label.action.edit.network.offering=Edit Network Offering
 label.action.edit.network.processing=Editing Network....
+label.action.edit.network=Edit Network
 label.action.edit.pod=Edit Pod
 label.action.edit.primary.storage=Edit Primary Storage
 label.action.edit.resource.limits=Edit Resource Limits
@@ -166,37 +157,37 @@ label.action.edit.service.offering=Edit Service Offering
 label.action.edit.template=Edit Template
 label.action.edit.user=Edit User
 label.action.edit.zone=Edit Zone
-label.action.enable.account=Enable account
 label.action.enable.account.processing=Enabling account....
-label.action.enable.cluster=Enable Cluster
+label.action.enable.account=Enable account
 label.action.enable.cluster.processing=Enabling Cluster....
-label.action.enable.maintenance.mode=Enable Maintenance Mode
+label.action.enable.cluster=Enable Cluster
 label.action.enable.maintenance.mode.processing=Enabling Maintenance Mode....
+label.action.enable.maintenance.mode=Enable Maintenance Mode
 label.action.enable.nexusVswitch=Enable Nexus 1000v
 label.action.enable.physical.network=Enable physical network
-label.action.enable.pod=Enable Pod
 label.action.enable.pod.processing=Enabling Pod....
-label.action.enable.static.NAT=Enable Static NAT
+label.action.enable.pod=Enable Pod
 label.action.enable.static.NAT.processing=Enabling Static NAT....
-label.action.enable.user=Enable User
+label.action.enable.static.NAT=Enable Static NAT
 label.action.enable.user.processing=Enabling User....
-label.action.enable.zone=Enable Zone
+label.action.enable.user=Enable User
 label.action.enable.zone.processing=Enabling Zone....
-label.action.force.reconnect=Force Reconnect
+label.action.enable.zone=Enable Zone
 label.action.force.reconnect.processing=Reconnecting....
-label.action.generate.keys=Generate Keys
+label.action.force.reconnect=Force Reconnect
 label.action.generate.keys.processing=Generate Keys....
+label.action.generate.keys=Generate Keys
 label.action.list.nexusVswitch=List Nexus 1000v
-label.action.lock.account=Lock account
 label.action.lock.account.processing=Locking account....
-label.action.manage.cluster=Manage Cluster
+label.action.lock.account=Lock account
 label.action.manage.cluster.processing=Managing Cluster....
-label.action.migrate.instance=Migrate Instance
+label.action.manage.cluster=Manage Cluster
 label.action.migrate.instance.processing=Migrating Instance....
-label.action.migrate.router=Migrate Router
+label.action.migrate.instance=Migrate Instance
 label.action.migrate.router.processing=Migrating Router....
-label.action.migrate.systemvm=Migrate System VM
+label.action.migrate.router=Migrate Router
 label.action.migrate.systemvm.processing=Migrating System VM....
+label.action.migrate.systemvm=Migrate System VM
 label.action.reboot.instance.processing=Rebooting Instance....
 label.action.reboot.instance=Reboot Instance
 label.action.reboot.router.processing=Rebooting Router....
@@ -217,7 +208,6 @@ label.action.resize.volume=Resize Volume
 label.action.resource.limits=Resource limits
 label.action.restore.instance.processing=Restoring Instance....
 label.action.restore.instance=Restore Instance
-label.actions=Actions
 label.action.start.instance.processing=Starting Instance....
 label.action.start.instance=Start Instance
 label.action.start.router.processing=Starting Router....
@@ -241,18 +231,19 @@ label.action.update.resource.count=Update Resource Count
 label.action.vmsnapshot.create=Take VM Snapshot
 label.action.vmsnapshot.delete=Delete VM snapshot
 label.action.vmsnapshot.revert=Revert to VM snapshot
+label.actions=Actions
 label.activate.project=Activate Project
 label.active.sessions=Active Sessions
+label.add.account.to.project=Add account to project
 label.add.account=Add Account
-label.add.accounts=Add accounts
 label.add.accounts.to=Add accounts to
-label.add.account.to.project=Add account to project
+label.add.accounts=Add accounts
 label.add.ACL=Add ACL
-label.add=Add
+label.add.affinity.group=Add new affinity group
 label.add.BigSwitchVns.device=Add BigSwitch Vns Controller
-label.add.by=Add by
 label.add.by.cidr=Add By CIDR
 label.add.by.group=Add By Group
+label.add.by=Add by
 label.add.cluster=Add Cluster
 label.add.compute.offering=Add compute offering
 label.add.direct.iprange=Add Direct Ip Range
@@ -263,24 +254,15 @@ label.add.F5.device=Add F5 device
 label.add.firewall=Add firewall rule
 label.add.guest.network=Add guest network
 label.add.host=Add Host
-label.adding=Adding
-label.adding.cluster=Adding Cluster
-label.adding.failed=Adding Failed
-label.adding.pod=Adding Pod
-label.adding.processing=Adding....
 label.add.ingress.rule=Add Ingress Rule
-label.adding.succeeded=Adding Succeeded
-label.adding.user=Adding User
-label.adding.zone=Adding Zone
 label.add.ip.range=Add IP Range
-label.additional.networks=Additional Networks
 label.add.load.balancer=Add Load Balancer
 label.add.more=Add More
 label.add.netScaler.device=Add Netscaler device
 label.add.network.ACL=Add network ACL
-label.add.network=Add Network
 label.add.network.device=Add Network Device
 label.add.network.offering=Add network offering
+label.add.network=Add Network
 label.add.new.F5=Add new F5
 label.add.new.gateway=Add new gateway
 label.add.new.NetScaler=Add new NetScaler
@@ -306,21 +288,34 @@ label.add.template=Add Template
 label.add.to.group=Add to group
 label.add.user=Add User
 label.add.vlan=Add VLAN
+label.add.VM.to.tier=Add VM to tier
 label.add.vm=Add VM
-label.add.vms=Add VMs
 label.add.vms.to.lb=Add VM(s) to load balancer rule
-label.add.VM.to.tier=Add VM to tier
+label.add.vms=Add VMs
 label.add.volume=Add Volume
 label.add.vpc=Add VPC
 label.add.vpn.customer.gateway=Add VPN Customer Gateway
 label.add.VPN.gateway=Add VPN Gateway
 label.add.vpn.user=Add VPN user
 label.add.zone=Add Zone
+label.add=Add
+label.adding.cluster=Adding Cluster
+label.adding.failed=Adding Failed
+label.adding.pod=Adding Pod
+label.adding.processing=Adding....
+label.adding.succeeded=Adding Succeeded
+label.adding.user=Adding User
+label.adding.zone=Adding Zone
+label.adding=Adding
+label.additional.networks=Additional Networks
 label.admin.accounts=Admin Accounts
 label.admin=Admin
-label.advanced=Advanced
 label.advanced.mode=Advanced Mode
 label.advanced.search=Advance Search
+label.advanced=Advanced
+label.affinity.group=Affinity Group
+label.affinity.groups=Affinity Groups
+label.affinity=Affinity
 label.agent.password=Agent Password
 label.agent.username=Agent Username
 label.agree=Agree
@@ -328,23 +323,26 @@ label.alert=Alert
 label.algorithm=Algorithm
 label.allocated=Allocated
 label.allocation.state=Allocation State
+label.anti.affinity.group=Anti-affinity Group
+label.anti.affinity.groups=Anti-affinity Groups
+label.anti.affinity=Anti-affinity
 label.api.key=API Key
 label.apply=Apply
-label.assign=Assign
 label.assign.to.load.balancer=Assigning instance to load balancer
-label.associated.network=Associated Network
+label.assign=Assign
 label.associated.network.id=Associated Network ID
+label.associated.network=Associated Network
 label.attached.iso=Attached ISO
 label.author.email=Author e-mail
 label.author.name=Author name
-label.availability=Availability
 label.availability.zone=Availability Zone
-label.available=Available
+label.availability=Availability
 label.available.public.ips=Available Public IP Addresses
+label.available=Available
 label.back=Back
 label.bandwidth=Bandwidth
-label.basic=Basic
 label.basic.mode=Basic Mode
+label.basic=Basic
 label.bigswitch.controller.address=BigSwitch Vns Controller Address
 label.bootable=Bootable
 label.broadcast.domain.range=Broadcast domain range
@@ -359,12 +357,12 @@ label.by.pod=By Pod
 label.by.role=By Role
 label.by.start.date=By Start Date
 label.by.state=By State
-label.bytes.received=Bytes Received
-label.bytes.sent=Bytes Sent
 label.by.traffic.type=By Traffic Type
-label.by.type=By Type
 label.by.type.id=By Type ID
+label.by.type=By Type
 label.by.zone=By Zone
+label.bytes.received=Bytes Received
+label.bytes.sent=Bytes Sent
 label.cancel=Cancel
 label.capacity=Capacity
 label.certificate=Certificate
@@ -373,50 +371,50 @@ label.change.value=Change value
 label.character=Character
 label.checksum=MD5 checksum
 label.cidr.account=CIDR or Account/Security Group
-label.cidr=CIDR
 label.CIDR.list=CIDR list
 label.cidr.list=Source CIDR
 label.CIDR.of.destination.network=CIDR of destination network
+label.cidr=CIDR
 label.clean.up=Clean up
 label.clear.list=Clear list
 label.close=Close
 label.cloud.console=Cloud Management Console
 label.cloud.managed=Cloud.com Managed
-label.cluster=Cluster
 label.cluster.name=Cluster Name
-label.clusters=Clusters
 label.cluster.type=Cluster Type
+label.cluster=Cluster
+label.clusters=Clusters
 label.clvm=CLVM
 label.code=Code
 label.community=Community
 label.compute.and.storage=Compute and Storage
-label.compute=Compute
 label.compute.offering=Compute offering
 label.compute.offerings=Compute offerings
+label.compute=Compute
 label.configuration=Configuration
-label.configure=Configure
 label.configure.network.ACLs=Configure Network ACLs
 label.configure.vpc=Configure VPC
-label.confirmation=Confirmation
+label.configure=Configure
 label.confirm.password=Confirm password
-label.congratulations=Congratulations!
+label.confirmation=Confirmation
+label.congratulations=Congratulations\!
 label.conserve.mode=Conserve mode
 label.console.proxy=Console proxy
 label.continue.basic.install=Continue with basic installation
 label.continue=Continue
 label.corrections.saved=Corrections saved
-label.cpu.allocated=CPU Allocated
 label.cpu.allocated.for.VMs=CPU Allocated for VMs
+label.cpu.allocated=CPU Allocated
 label.CPU.cap=CPU Cap
-label.cpu=CPU
 label.cpu.limits=CPU limits
 label.cpu.mhz=CPU (in MHz)
 label.cpu.utilized=CPU Utilized
-label.created.by.system=Created by system
-label.created=Created
+label.cpu=CPU
 label.create.project=Create project
 label.create.template=Create template
 label.create.VPN.connection=Create VPN Connection
+label.created.by.system=Created by system
+label.created=Created
 label.cross.zones=Cross Zones
 label.custom.disk.size=Custom Disk Size
 label.daily=Daily
@@ -427,11 +425,11 @@ label.day.of.week=Day of Week
 label.dead.peer.detection=Dead Peer Detection
 label.decline.invitation=Decline invitation
 label.dedicated=Dedicated
-label.default=Default
 label.default.use=Default Use
 label.default.view=Default View
+label.default=Default
+label.delete.affinity.group=Delete Affinity Group
 label.delete.BigSwitchVns=Remove BigSwitch Vns Controller
-label.delete=Delete
 label.delete.F5=Delete F5
 label.delete.gateway=delete gateway
 label.delete.NetScaler=Delete NetScaler
@@ -442,58 +440,60 @@ label.delete.VPN.connection=delete VPN connection
 label.delete.VPN.customer.gateway=delete VPN Customer Gateway
 label.delete.VPN.gateway=delete VPN Gateway
 label.delete.vpn.user=Delete VPN user
+label.delete=Delete
 label.deleting.failed=Deleting Failed
 label.deleting.processing=Deleting....
 label.description=Description
 label.destination.physical.network.id=Destination physical network ID
 label.destination.zone=Destination Zone
-label.destroy=Destroy
 label.destroy.router=Destroy router
+label.destroy=Destroy
 label.detaching.disk=Detaching Disk
 label.details=Details
 label.device.id=Device ID
 label.devices=Devices
-label.dhcp=DHCP
 label.DHCP.server.type=DHCP Server Type
+label.dhcp=DHCP
 label.direct.ips=Shared Network IPs
-label.disabled=Disabled
 label.disable.provider=Disable provider
 label.disable.vpn=Disable VPN
+label.disabled=Disabled
 label.disabling.vpn.access=Disabling VPN Access
 label.disk.allocated=Disk Allocated
 label.disk.offering=Disk Offering
-label.disk.size=Disk Size
 label.disk.size.gb=Disk Size (in GB)
+label.disk.size=Disk Size
 label.disk.total=Disk Total
 label.disk.volume=Disk Volume
 label.display.name=Display name
 label.display.text=Display Text
 label.dns.1=DNS 1
 label.dns.2=DNS 2
-label.dns=DNS
 label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
+label.dns=DNS
 label.domain.admin=Domain Admin
-label.domain=Domain
 label.domain.id=Domain ID
 label.domain.name=Domain Name
 label.domain.router=Domain router
 label.domain.suffix=DNS Domain Suffix (i.e., xyz.com)
+label.domain=Domain
 label.done=Done
 label.double.quotes.are.not.allowed=Double quotes are not allowed
 label.download.progress=Download Progress
 label.drag.new.position=Drag to new position
-label.edit=Edit
+label.edit.affinity.group=Edit Affinity Group
 label.edit.lb.rule=Edit LB rule
 label.edit.network.details=Edit network details
 label.edit.project.details=Edit project details
 label.edit.tags=Edit tags
 label.edit.traffic.type=Edit traffic type
 label.edit.vpc=Edit VPC
+label.edit=Edit
 label.egress.rule=Egress rule
 label.egress.rules=Egress rules
-label.elastic=Elastic
 label.elastic.IP=Elastic IP
 label.elastic.LB=Elastic LB
+label.elastic=Elastic
 label.email=Email
 label.enable.provider=Enable provider
 label.enable.s3=Enable S3-backed Secondary Storage
@@ -502,18 +502,17 @@ label.enable.vpn=Enable VPN
 label.enabling.vpn.access=Enabling VPN Access
 label.enabling.vpn=Enabling VPN
 label.end.IP=End IP
-label.endpoint=Endpoint
-label.endpoint.or.operation=Endpoint or Operation
 label.end.port=End Port
 label.end.reserved.system.IP=End Reserved system IP
 label.end.vlan=End Vlan
+label.endpoint.or.operation=Endpoint or Operation
+label.endpoint=Endpoint
 label.enter.token=Enter token
 label.error.code=Error Code
 label.error=Error
 label.ESP.encryption=ESP Encryption
 label.ESP.hash=ESP Hash
 label.ESP.lifetime=ESP Lifetime (second)
-label.ESP.lifetime=ESP Lifetime(second)
 label.ESP.policy=ESP policy
 label.esx.host=ESX/ESXi Host
 label.example=Example
@@ -527,8 +526,8 @@ label.firewall=Firewall
 label.first.name=First Name
 label.format=Format
 label.friday=Friday
-label.full=Full
 label.full.path=Full path
+label.full=Full
 label.gateway=Gateway
 label.general.alerts=General Alerts
 label.generating.url=Generating URL
@@ -536,40 +535,39 @@ label.go.step.2=Go to Step 2
 label.go.step.3=Go to Step 3
 label.go.step.4=Go to Step 4
 label.go.step.5=Go to Step 5
-label.group=Group
 label.group.optional=Group (Optional)
+label.group=Group
 label.guest.cidr=Guest CIDR
 label.guest.end.ip=Guest end IP
 label.guest.gateway=Guest Gateway
-label.guest=Guest
-label.guest.ip=Guest IP Address
 label.guest.ip.range=Guest IP Range
+label.guest.ip=Guest IP Address
 label.guest.netmask=Guest Netmask
 label.guest.networks=Guest networks
 label.guest.start.ip=Guest start IP
 label.guest.traffic=Guest Traffic
 label.guest.type=Guest Type
+label.guest=Guest
 label.ha.enabled=HA Enabled
 label.help=Help
 label.hide.ingress.rule=Hide Ingress Rule
 label.hints=Hints
 label.host.alerts=Host Alerts
-label.host=Host
 label.host.MAC=Host MAC
 label.host.name=Host Name
+label.host.tags=Host Tags
+label.host=Host
 label.hosts=Hosts
-label.host.tags=Host Tags 
 label.hourly=Hourly
 label.hypervisor.capabilities=Hypervisor capabilities
-label.hypervisor=Hypervisor
 label.hypervisor.type=Hypervisor Type
 label.hypervisor.version=Hypervisor version
+label.hypervisor=Hypervisor
 label.id=ID
 label.IKE.DH=IKE DH
 label.IKE.encryption=IKE Encryption
 label.IKE.hash=IKE Hash
 label.IKE.lifetime=IKE lifetime (second)
-label.IKE.lifetime=IKE Lifetime (second)
 label.IKE.policy=IKE policy
 label.info=Info
 label.ingress.rule=Ingress Rule
@@ -584,54 +582,55 @@ label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage?
 label.installWizard.addPrimaryStorageIntro.title=Let&rsquo;s add primary storage
 label.installWizard.addSecondaryStorageIntro.subtitle=What is secondary storage?
 label.installWizard.addSecondaryStorageIntro.title=Let&rsquo;s add secondary storage
+label.installWizard.addZone.title=Add zone
 label.installWizard.addZoneIntro.subtitle=What is a zone?
 label.installWizard.addZoneIntro.title=Let&rsquo;s add a zone
-label.installWizard.addZone.title=Add zone
 label.installWizard.click.launch=Click the launch button.
-label.installWizard.subtitle=This tour will aid you in setting up your CloudStack&#8482 installation
-label.installWizard.title=Hello and Welcome to CloudStack&#8482
-label.instance=Instance
+label.installWizard.subtitle=This tour will aid you in setting up your CloudStack&\#8482 installation
+label.installWizard.title=Hello and Welcome to CloudStack&\#8482
 label.instance.limits=Instance Limits
 label.instance.name=Instance Name
+label.instance=Instance
 label.instances=Instances
 label.internal.dns.1=Internal DNS 1
 label.internal.dns.2=Internal DNS 2
 label.internal.name=Internal name
 label.interval.type=Interval Type
-label.introduction.to.cloudstack=Introduction to CloudStack&#8482
+label.introduction.to.cloudstack=Introduction to CloudStack&\#8482
 label.invalid.integer=Invalid Integer
 label.invalid.number=Invalid Number
 label.invitations=Invitations
-label.invited.accounts=Invited accounts
-label.invite=Invite
 label.invite.to=Invite to
+label.invite=Invite
+label.invited.accounts=Invited accounts
 label.ip.address=IP Address
-label.ipaddress=IP Address
 label.ip.allocations=IP Allocations
-label.ip=IP
 label.ip.limits=Public IP Limits
 label.ip.or.fqdn=IP or FQDN
 label.ip.range=IP Range
 label.ip.ranges=IP Ranges
-label.IPsec.preshared.key=IPsec Preshared-Key
+label.ip=IP
+label.ipaddress=IP Address
 label.ips=IPs
-label.iscsi=iSCSI
+label.IPsec.preshared.key=IPsec Preshared-Key
 label.is.default=Is Default
+label.is.redundant.router=Redundant
+label.is.shared=Is Shared
+label.is.system=Is System
+label.iscsi=iSCSI
 label.iso.boot=ISO Boot
 label.iso=ISO
 label.isolated.networks=Isolated networks
 label.isolation.method=Isolation method
 label.isolation.mode=Isolation Mode
 label.isolation.uri=Isolation URI
-label.is.redundant.router=Redundant
-label.is.shared=Is Shared
-label.is.system=Is System
 label.item.listing=Item listing
 label.keep=Keep
-label.keyboard.type=Keyboard type
 label.key=Key
+label.keyboard.type=Keyboard type
 label.kvm.traffic.label=KVM traffic label
 label.label=Label
+label.lang.arabic=Arabic
 label.lang.brportugese=Brazilian Portugese
 label.lang.catalan=Catalan
 label.lang.chinese=Chinese (Simplified)
@@ -644,37 +643,34 @@ label.lang.korean=Korean
 label.lang.norwegian=Norwegian
 label.lang.russian=Russian
 label.lang.spanish=Spanish
-label.lang.arabic=Arabic
 label.last.disconnected=Last Disconnected
 label.last.name=Last Name
 label.latest.events=Latest events
-label.launch=Launch
 label.launch.vm=Launch VM
-label.launch.zone=Launch zone 
+label.launch.zone=Launch zone
+label.launch=Launch
 label.LB.isolation=LB isolation
 label.least.connections=Least connections
 label.level=Level
 label.linklocal.ip=Link Local IP Adddress
 label.load.balancer=Load Balancer
-label.load.balancing=Load Balancing
 label.load.balancing.policies=Load balancing policies
+label.load.balancing=Load Balancing
 label.loading=Loading
-label.local=Local
 label.local.storage.enabled=Local storage enabled
-label.local.storage.enabled=Local Storage Enabled
 label.local.storage=Local Storage
+label.local=Local
 label.login=Login
 label.logout=Logout
+label.LUN.number=LUN \#
 label.lun=LUN
-label.LUN.number=LUN #
 label.make.project.owner=Make account project owner
+label.manage.resources=Manage Resources
 label.manage=Manage
 label.management.ips=Management IP Addresses
 label.management=Management
-label.manage.resources=Manage Resources
 label.max.cpus=Max. CPU cores
 label.max.guest.limit=Max guest limit
-label.maximum=Maximum
 label.max.memory=Max. memory (MiB)
 label.max.networks=Max. networks
 label.max.primary.storage=Max. primary (GiB)
@@ -685,13 +681,14 @@ label.max.templates=Max. templates
 label.max.vms=Max. user VMs
 label.max.volumes=Max. volumes
 label.max.vpcs=Max. VPCs
+label.maximum=Maximum
 label.may.continue=You may now continue.
 label.memory.allocated=Memory Allocated
 label.memory.limits=Memory limits (MiB)
 label.memory.mb=Memory (in MB)
-label.memory=Memory
 label.memory.total=Memory Total
 label.memory.used=Memory Used
+label.memory=Memory
 label.menu.accounts=Accounts
 label.menu.alerts=Alerts
 label.menu.all.accounts=All Accounts
@@ -715,8 +712,8 @@ label.menu.my.accounts=My Accounts
 label.menu.my.instances=My Instances
 label.menu.my.isos=My ISOs
 label.menu.my.templates=My Templates
-label.menu.network=Network
 label.menu.network.offerings=Network Offerings
+label.menu.network=Network
 label.menu.physical.resources=Physical Resources
 label.menu.regions=Regions
 label.menu.running.instances=Running Instances
@@ -726,15 +723,15 @@ label.menu.snapshots=Snapshots
 label.menu.stopped.instances=Stopped Instances
 label.menu.storage=Storage
 label.menu.system.service.offerings=System Offerings
-label.menu.system=System
 label.menu.system.vms=System VMs
+label.menu.system=System
 label.menu.templates=Templates
 label.menu.virtual.appliances=Virtual Appliances
 label.menu.virtual.resources=Virtual Resources
 label.menu.volumes=Volumes
 label.migrate.instance.to.host=Migrate instance to another host
-label.migrate.instance.to=Migrate instance to
 label.migrate.instance.to.ps=Migrate instance to another primary storage
+label.migrate.instance.to=Migrate instance to
 label.migrate.router.to=Migrate Router to
 label.migrate.systemvm.to=Migrate System VM to
 label.migrate.to.host=Migrate to host
@@ -752,24 +749,22 @@ label.move.up.row=Move up one row
 label.my.account=My Account
 label.my.network=My network
 label.my.templates=My templates
-label.name=Name
 label.name.optional=Name (Optional)
+label.name=Name
 label.nat.port.range=NAT Port Range
 label.netmask=Netmask
 label.netScaler=NetScaler
+label.network.ACL.total=Network ACL Total
 label.network.ACL=Network ACL
 label.network.ACLs=Network ACLs
-label.network.ACL.total=Network ACL Total
 label.network.desc=Network Desc
-label.network.device=Network Device
 label.network.device.type=Network Device Type
-label.network.domain=Network Domain
+label.network.device=Network Device
 label.network.domain.text=Network domain
+label.network.domain=Network Domain
 label.network.id=Network ID
-label.networking.and.security=Networking and security
 label.network.label.display.for.blank.value=Use default gateway
 label.network.name=Network Name
-label.network=Network
 label.network.offering.display.text=Network Offering Display Text
 label.network.offering.id=Network Offering ID
 label.network.offering.name=Network Offering Name
@@ -778,18 +773,20 @@ label.network.rate.megabytes=Network Rate (Mb/s)
 label.network.rate=Network Rate
 label.network.read=Network Read
 label.network.service.providers=Network Service Providers
-label.networks=Networks
 label.network.type=Network Type
 label.network.write=Network Write
-label.new=New
+label.network=Network
+label.networking.and.security=Networking and security
+label.networks=Networks
 label.new.password=New Password
 label.new.project=New Project
 label.new.vm=New VM
+label.new=New
 label.next=Next
 label.nexusVswitch=Nexus 1000v
-label.nfs=NFS
 label.nfs.server=NFS Server
 label.nfs.storage=NFS Storage
+label.nfs=NFS
 label.nic.adapter.type=NIC adapter type
 label.nicira.controller.address=Controller Address
 label.nicira.l3gatewayserviceuuid=L3 Gateway Service Uuid
@@ -801,20 +798,19 @@ label.no.data=No data to show
 label.no.errors=No Recent Errors
 label.no.isos=No available ISOs
 label.no.items=No Available Items
-label.none=None
-label.no=No
 label.no.security.groups=No Available Security Groups
-label.not.found=Not Found
 label.no.thanks=No thanks
-label.no.thanks=No Thanks
+label.no=No
+label.none=None
+label.not.found=Not Found
 label.notifications=Notifications
+label.num.cpu.cores=\# of CPU Cores
 label.number.of.clusters=Number of Clusters
 label.number.of.hosts=Number of Hosts
 label.number.of.pods=Number of Pods
 label.number.of.system.vms=Number of System VMs
 label.number.of.virtual.routers=Number of Virtual Routers
 label.number.of.zones=Number of Zones
-label.num.cpu.cores=# of CPU Cores
 label.numretries=Number of Retries
 label.ocfs2=OCFS2
 label.offer.ha=Offer HA
@@ -825,14 +821,14 @@ label.os.preference=OS Preference
 label.os.type=OS Type
 label.owned.public.ips=Owned Public IP Addresses
 label.owner.account=Owner Account
-label.owner.domain=Owner Domain  
+label.owner.domain=Owner Domain
 label.parent.domain=Parent Domain
 label.password.enabled=Password Enabled
 label.password=Password
 label.path=Path
 label.perfect.forward.secrecy=Perfect Forward Secrecy
 label.physical.network.ID=Physical network ID
-label.physical.network=Physical Network        
+label.physical.network=Physical Network
 label.PING.CIFS.password=PING CIFS password
 label.PING.CIFS.username=PING CIFS username
 label.PING.dir=PING Directory
@@ -848,8 +844,8 @@ label.port.forwarding.policies=Port forwarding policies
 label.port.forwarding=Port Forwarding
 label.port.range=Port Range
 label.PreSetup=PreSetup
-label.previous=Previous
 label.prev=Prev
+label.previous=Previous
 label.primary.allocated=Primary Storage Allocated
 label.primary.network=Primary Network
 label.primary.storage.count=Primary Storage Pools
@@ -858,20 +854,20 @@ label.primary.storage=Primary Storage
 label.primary.used=Primary Storage Used
 label.private.Gateway=Private Gateway
 label.private.interface=Private Interface
-label.private.ip=Private IP Address
 label.private.ip.range=Private IP Range
+label.private.ip=Private IP Address
 label.private.ips=Private IP Addresses
-label.privatekey=PKCS#8 Private Key
 label.private.network=Private network
 label.private.port=Private Port
 label.private.zone=Private Zone
+label.privatekey=PKCS\#8 Private Key
 label.project.dashboard=Project dashboard
 label.project.id=Project ID
 label.project.invite=Invite to project
 label.project.name=Project name
+label.project.view=Project View
 label.project=Project
 label.projects=Projects
-label.project.view=Project View
 label.protocol=Protocol
 label.providers=Providers
 label.public.interface=Public Interface
@@ -879,9 +875,9 @@ label.public.ip=Public IP Address
 label.public.ips=Public IP Addresses
 label.public.network=Public network
 label.public.port=Public Port
-label.public=Public
-label.public.traffic=Public traffic     
+label.public.traffic=Public traffic
 label.public.zone=Public Zone
+label.public=Public
 label.purpose=Purpose
 label.Pxe.server.type=Pxe Server Type
 label.quickview=Quickview
@@ -901,7 +897,6 @@ label.remove.ingress.rule=Remove ingress rule
 label.remove.ip.range=Remove IP range
 label.remove.pf=Remove port forwarding rule
 label.remove.project.account=Remove account from project
-label.remove.project.account=Remove project account
 label.remove.region=Remove Region
 label.remove.rule=Remove rule
 label.remove.static.nat.rule=Remove static NAT rule
@@ -909,8 +904,8 @@ label.remove.static.route=Remove static route
 label.remove.tier=Remove tier
 label.remove.vm.from.lb=Remove VM from load balancer rule
 label.remove.vpc=remove VPC
-label.removing=Removing
 label.removing.user=Removing User
+label.removing=Removing
 label.required=Required
 label.reserved.system.gateway=Reserved system gateway
 label.reserved.system.ip=Reserved System IP
@@ -920,9 +915,9 @@ label.resize.new.offering.id=New Offering
 label.resize.new.size=New Size(GB)
 label.resize.shrink.ok=Shrink OK
 label.resource.limits=Resource Limits
+label.resource.state=Resource state
 label.resource=Resource
 label.resources=Resources
-label.resource.state=Resource state
 label.restart.network=Restart network
 label.restart.required=Restart required
 label.restart.vpc=restart VPC
@@ -951,36 +946,36 @@ label.scope=Scope
 label.search=Search
 label.secondary.storage.count=Secondary Storage Pools
 label.secondary.storage.limits=Secondary Storage limits (GiB)
-label.secondary.storage=Secondary Storage
 label.secondary.storage.vm=Secondary storage VM
+label.secondary.storage=Secondary Storage
 label.secondary.used=Secondary Storage Used
 label.secret.key=Secret Key
 label.security.group.name=Security Group Name
 label.security.group=Security Group
 label.security.groups.enabled=Security Groups Enabled
 label.security.groups=Security Groups
+label.select-view=Select view
 label.select.a.template=Select a template
 label.select.a.zone=Select a zone
-label.select.instance=Select instance
 label.select.instance.to.attach.volume.to=Select instance to attach volume to
+label.select.instance=Select instance
 label.select.iso.or.template=Select ISO or template
 label.select.offering=Select offering
 label.select.project=Select Project
-label.select=Select
 label.select.tier=Select Tier
-label.select-view=Select view
 label.select.vm.for.static.nat=Select VM for static NAT
+label.select=Select
 label.sent=Sent
 label.server=Server
 label.service.capabilities=Service Capabilities
 label.service.offering=Service Offering
 label.session.expired=Session Expired
+label.set.up.zone.type=Set up zone type
 label.setup.network=Setup Network
-label.setup=Setup
 label.setup.zone=Setup Zone
-label.set.up.zone.type=Set up zone type
-label.SharedMountPoint=SharedMountPoint
+label.setup=Setup
 label.shared=Shared
+label.SharedMountPoint=SharedMountPoint
 label.show.ingress.rule=Show Ingress Rule
 label.shutdown.provider=Shutdown provider
 label.site.to.site.VPN=Site-to-site VPN
@@ -988,9 +983,9 @@ label.size=Size
 label.skip.guide=I have used CloudStack before, skip this guide
 label.snapshot.limits=Snapshot Limits
 label.snapshot.name=Snapshot Name
+label.snapshot.s=Snapshot (s)
 label.snapshot.schedule=Setup Recurring Snapshot
 label.snapshot=Snapshot
-label.snapshot.s=Snapshot (s)
 label.snapshots=Snapshots
 label.source.nat=Source NAT
 label.source=Source
@@ -1004,21 +999,21 @@ label.start.reserved.system.IP=Start Reserved system IP
 label.start.vlan=Start Vlan
 label.state=State
 label.static.nat.enabled=Static NAT Enabled
-label.static.nat=Static NAT
 label.static.nat.to=Static NAT to
 label.static.nat.vm.details=Static NAT VM Details
+label.static.nat=Static NAT
 label.statistics=Statistics
 label.status=Status
+label.step.1.title=Step 1\: <strong>Select a Template</strong>
 label.step.1=Step 1
-label.step.1.title=Step 1: <strong>Select a Template</strong>
+label.step.2.title=Step 2\: <strong>Service Offering</strong>
 label.step.2=Step 2
-label.step.2.title=Step 2: <strong>Service Offering</strong>
+label.step.3.title=Step 3\: <strong id\="step3_label">Select a Disk Offering</strong>
 label.step.3=Step 3
-label.step.3.title=Step 3: <strong id="step3_label">Select a Disk Offering</strong>
+label.step.4.title=Step 4\: <strong>Network</strong>
 label.step.4=Step 4
-label.step.4.title=Step 4: <strong>Network</strong>
+label.step.5.title=Step 5\: <strong>Review</strong>
 label.step.5=Step 5
-label.step.5.title=Step 5: <strong>Review</strong>
 label.stickiness=Stickiness
 label.sticky.cookie-name=Cookie name
 label.sticky.domain=Domain
@@ -1032,15 +1027,15 @@ label.sticky.postonly=Post only
 label.sticky.prefix=Prefix
 label.sticky.request-learn=Request learn
 label.sticky.tablesize=Table size
-label.stopped.vms=Stopped VMs
 label.stop=Stop
-label.storage=Storage
+label.stopped.vms=Stopped VMs
 label.storage.tags=Storage Tags
 label.storage.traffic=Storage Traffic
 label.storage.type=Storage Type
+label.storage=Storage
 label.subdomain.access=Subdomain Access
 label.submit=Submit
-label.submitted.by=[Submitted by: <span id="submitted_by"></span>]
+label.submitted.by=[Submitted by\: <span id\="submitted_by"></span>]
 label.succeeded=Succeeded
 label.sunday=Sunday
 label.super.cidr.for.guest.networks=Super CIDR for Guest Networks
@@ -1050,9 +1045,9 @@ label.suspend.project=Suspend Project
 label.system.capacity=System Capacity
 label.system.offering=System Offering
 label.system.service.offering=System Service Offering
-label.system.vms=System VMs
-label.system.vm=System VM
 label.system.vm.type=System VM Type
+label.system.vm=System VM
+label.system.vms=System VMs
 label.system.wide.capacity=System-wide capacity
 label.tagged=Tagged
 label.tags=Tags
@@ -1067,14 +1062,14 @@ label.theme.lightblue=Custom - Light Blue
 label.thursday=Thursday
 label.tier.details=Tier details
 label.tier=Tier
+label.time.zone=Timezone
+label.time=Time
 label.timeout.in.second = Timeout(seconds)
 label.timeout=Timeout
-label.time=Time
-label.time.zone=Timezone
 label.timezone=Timezone
 label.token=Token
-label.total.cpu=Total CPU
 label.total.CPU=Total CPU
+label.total.cpu=Total CPU
 label.total.hosts=Total Hosts
 label.total.memory=Total Memory
 label.total.of.ip=Total of IP Address
@@ -1082,8 +1077,8 @@ label.total.of.vm=Total of VM
 label.total.storage=Total Storage
 label.total.vms=Total VMs
 label.traffic.label=Traffic label
-label.traffic.types=Traffic Types
 label.traffic.type=Traffic Type
+label.traffic.types=Traffic Types
 label.tuesday=Tuesday
 label.type.id=Type ID
 label.type=Type
@@ -1094,15 +1089,15 @@ label.update.project.resources=Update project resources
 label.update.ssl.cert= SSL Certificate
 label.update.ssl= SSL Certificate
 label.updating=Updating
-label.upload=Upload
 label.upload.volume=Upload volume
+label.upload=Upload
 label.url=URL
 label.usage.interface=Usage Interface
+label.use.vm.ip=Use VM IP\:
 label.used=Used
+label.user=User
 label.username=Username
 label.users=Users
-label.user=User
-label.use.vm.ip=Use VM IP:
 label.value=Value
 label.vcdcname=vCenter DC name
 label.vcenter.cluster=vCenter Cluster
@@ -1115,47 +1110,47 @@ label.vcipaddress=vCenter IP Address
 label.version=Version
 label.view.all=View all
 label.view.console=View console
-label.viewing=Viewing
 label.view.more=View more
 label.view=View
-label.virtual.appliances=Virtual Appliances
+label.viewing=Viewing
 label.virtual.appliance=Virtual Appliance
+label.virtual.appliances=Virtual Appliances
 label.virtual.machines=Virtual machines
 label.virtual.network=Virtual Network
-label.virtual.routers=Virtual Routers
 label.virtual.router=Virtual Router
+label.virtual.routers=Virtual Routers
 label.vlan.id=VLAN ID
 label.vlan.range=VLAN Range
 label.vlan=VLAN
 label.vm.add=Add Instance
 label.vm.destroy=Destroy
 label.vm.display.name=VM display name
-label.VMFS.datastore=VMFS datastore
-label.vmfs=VMFS
 label.vm.name=VM name
 label.vm.reboot=Reboot
+label.vm.start=Start
+label.vm.state=VM state
+label.vm.stop=Stop
+label.VMFS.datastore=VMFS datastore
+label.vmfs=VMFS
 label.VMs.in.tier=VMs in tier
+label.vms=VMs
 label.vmsnapshot.current=isCurrent
 label.vmsnapshot.memory=Snapshot memory
 label.vmsnapshot.parentname=Parent
 label.vmsnapshot.type=Type
 label.vmsnapshot=VM Snapshots
-label.vm.start=Start
-label.vm.state=VM state
-label.vm.stop=Stop
-label.vms=VMs
 label.vmware.traffic.label=VMware traffic label
 label.volgroup=Volume Group
 label.volume.limits=Volume Limits
 label.volume.name=Volume Name
-label.volumes=Volumes
 label.volume=Volume
+label.volumes=Volumes
 label.vpc.id=VPC ID
 label.VPC.router.details=VPC router details
 label.vpc=VPC
 label.VPN.connection=VPN Connection
-label.vpn.customer.gateway=VPN Customer Gateway
 label.VPN.customer.gateway=VPN Customer Gateway
+label.vpn.customer.gateway=VPN Customer Gateway
 label.VPN.gateway=VPN Gateway
 label.vpn=VPN
 label.vsmctrlvlanid=Control VLAN ID
@@ -1168,27 +1163,27 @@ label.wednesday=Wednesday
 label.weekly=Weekly
 label.welcome.cloud.console=Welcome to Management Console
 label.welcome=Welcome
-label.what.is.cloudstack=What is CloudStack&#8482?
+label.what.is.cloudstack=What is CloudStack&\#8482?
 label.xen.traffic.label=XenServer traffic label
 label.yes=Yes
 label.zone.details=Zone details
 label.zone.id=Zone ID
 label.zone.name=Zone name
-label.zone.step.1.title=Step 1: <strong>Select a Network</strong>
-label.zone.step.2.title=Step 2: <strong>Add a Zone</strong>
-label.zone.step.3.title=Step 3: <strong>Add a Pod</strong>
-label.zone.step.4.title=Step 4: <strong>Add an IP range</strong>
-label.zones=Zones
+label.zone.step.1.title=Step 1\: <strong>Select a Network</strong>
+label.zone.step.2.title=Step 2\: <strong>Add a Zone</strong>
+label.zone.step.3.title=Step 3\: <strong>Add a Pod</strong>
+label.zone.step.4.title=Step 4\: <strong>Add an IP range</strong>
 label.zone.type=Zone Type
 label.zone.wide=Zone-Wide
-label.zoneWizard.trafficType.guest=Guest: Traffic between end-user virtual machines
-label.zoneWizard.trafficType.management=Management: Traffic between CloudStack\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs
-label.zoneWizard.trafficType.public=Public: Traffic between the internet and virtual machines in the cloud.
-label.zoneWizard.trafficType.storage=Storage: Traffic between primary and secondary storage servers, such as VM templates and snapshots
 label.zone=Zone
+label.zones=Zones
+label.zoneWizard.trafficType.guest=Guest\: Traffic between end-user virtual machines
+label.zoneWizard.trafficType.management=Management\: Traffic between CloudStack\\\\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs
+label.zoneWizard.trafficType.public=Public\: Traffic between the internet and virtual machines in the cloud.
+label.zoneWizard.trafficType.storage=Storage\: Traffic between primary and secondary storage servers, such as VM templates and snapshots
 managed.state=Managed State
-message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
 message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC.
+message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
 message.acquire.public.ip=Please select a zone from which you want to acquire your new IP from.
 message.action.cancel.maintenance.mode=Please confirm that you want to cancel this maintenance.
 message.action.cancel.maintenance=Your host has been successfully canceled for maintenance. This process can take up to several minutes.
@@ -1197,8 +1192,8 @@ message.action.change.service.warning.for.router=Your router must be stopped bef
 message.action.delete.cluster=Please confirm that you want to delete this cluster.
 message.action.delete.disk.offering=Please confirm that you want to delete this disk offering.
 message.action.delete.domain=Please confirm that you want to delete this domain.
-message.action.delete.external.firewall=Please confirm that you would like to remove this external firewall. Warning: If you are planning to add back the same external firewall, you must reset usage data on the device.
-message.action.delete.external.load.balancer=Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device.
+message.action.delete.external.firewall=Please confirm that you would like to remove this external firewall. Warning\: If you are planning to add back the same external firewall, you must reset usage data on the device.
+message.action.delete.external.load.balancer=Please confirm that you would like to remove this external load balancer. Warning\: If you are planning to add back the same external load balancer, you must reset usage data on the device.
 message.action.delete.ingress.rule=Please confirm that you want to delete this ingress rule.
 message.action.delete.ISO.for.all.zones=The ISO is used by all zones. Please confirm that you want to delete it from all zones.
 message.action.delete.ISO=Please confirm that you want to delete this ISO.
@@ -1234,15 +1229,14 @@ message.action.enable.pod=Please confirm that you want to enable this pod.
 message.action.enable.zone=Please confirm that you want to enable this zone.
 message.action.force.reconnect=Your host has been successfully forced to reconnect.  This process can take up to several minutes.
 message.action.host.enable.maintenance.mode=Enabling maintenance mode will cause a live migration of all running instances on this host to any available host.
-message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine.  
+message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine.
 message.action.manage.cluster=Please confirm that you want to manage the cluster.
-message.action.primarystorage.enable.maintenance.mode=Warning: placing the primary storage into maintenance mode will cause all VMs using volumes from it to be stopped.  Do you want to continue?
+message.action.primarystorage.enable.maintenance.mode=Warning\: placing the primary storage into maintenance mode will cause all VMs using volumes from it to be stopped.  Do you want to continue?
 message.action.reboot.instance=Please confirm that you want to reboot this instance.
 message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
 message.action.reboot.systemvm=Please confirm that you want to reboot this system VM.
 message.action.release.ip=Please confirm that you want to release this IP.
 message.action.remove.host=Please confirm that you want to remove this host.
-message.action.remove.host=Removing last/only host in cluster and reinstalling the host will destroy working environment/database on the host and render the VM Guests unuseable.
 message.action.reset.password.off=Your instance currently does not support this feature.
 message.action.reset.password.warning=Your instance must be stopped before attempting to change its current password.
 message.action.restore.instance=Please confirm that you want to restore this instance.
@@ -1257,40 +1251,40 @@ message.action.unmanage.cluster=Please confirm that you want to unmanage the clu
 message.action.vmsnapshot.delete=Please confirm that you want to delete this VM snapshot.
 message.action.vmsnapshot.revert=Revert VM snapshot
 message.activate.project=Are you sure you want to activate this project?
-message.add.cluster=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
-message.add.cluster.zone=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>
+message.add.cluster.zone=Add a hypervisor managed cluster for zone <b><span id\="zone_name"></span></b>
+message.add.cluster=Add a hypervisor managed cluster for zone <b><span id\="zone_name"></span></b>, pod <b><span id\="pod_name"></span></b>
 message.add.disk.offering=Please specify the following parameters to add a new disk offering
 message.add.domain=Please specify the subdomain you want to create under this domain
 message.add.firewall=Add a firewall to zone
 message.add.guest.network=Please confirm that you would like to add a guest network
 message.add.host=Please specify the following parameters to add a new host
-message.adding.host=Adding host
-message.adding.Netscaler.device=Adding Netscaler device
-message.adding.Netscaler.provider=Adding Netscaler provider
+message.add.ip.range.direct.network=Add an IP range to direct network <b><span id\="directnetwork_name"></span></b> in zone <b><span id\="zone_name"></span></b>
+message.add.ip.range.to.pod=<p>Add an IP range to pod\: <b><span id\="pod_name_label"></span></b></p>
 message.add.ip.range=Add an IP range to public network in zone
-message.add.ip.range.direct.network=Add an IP range to direct network <b><span id="directnetwork_name"></span></b> in zone <b><span id="zone_name"></span></b>
-message.add.ip.range.to.pod=<p>Add an IP range to pod: <b><span id="pod_name_label"></span></b></p>
-message.additional.networks.desc=Please select additional network(s) that your virtual instance will be connected to.
+message.add.load.balancer.under.ip=The load balancer rule has been added under IP\:
 message.add.load.balancer=Add a load balancer to zone
-message.add.load.balancer.under.ip=The load balancer rule has been added under IP:
-message.add.network=Add a new network for zone: <b><span id="zone_name"></span></b>
+message.add.network=Add a new network for zone\: <b><span id\="zone_name"></span></b>
 message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC.
-message.add.pod=Add a new pod for zone <b><span id="add_pod_zone_name"></span></b>
-message.add.pod.during.zone.creation=Each zone must contain in one or more pods, and we will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack's internal management traffic. The reserved IP range must be unique for each zone in the cloud.
+message.add.pod.during.zone.creation=Each zone must contain in one or more pods, and we will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack\\'s internal management traffic. The reserved IP range must be unique for each zone in the cloud.
+message.add.pod=Add a new pod for zone <b><span id\="add_pod_zone_name"></span></b>
+message.add.primary.storage=Add a new Primary Storage for zone <b><span id\="zone_name"></span></b>, pod <b><span id\="pod_name"></span></b>
 message.add.primary=Please specify the following parameters to add a new primary storage
-message.add.primary.storage=Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
 message.add.region=Please specify the required information to add a new region.
-message.add.secondary.storage=Add a new storage for zone <b><span id="zone_name"></span></b>
+message.add.secondary.storage=Add a new storage for zone <b><span id\="zone_name"></span></b>
 message.add.service.offering=Please fill in the following data to add a new compute offering.
 message.add.system.service.offering=Please fill in the following data to add a new system service offering.
 message.add.template=Please enter the following data to create your new template
 message.add.volume=Please fill in the following data to add a new volume.
 message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
+message.adding.host=Adding host
+message.adding.Netscaler.device=Adding Netscaler device
+message.adding.Netscaler.provider=Adding Netscaler provider
+message.additional.networks.desc=Please select additional network(s) that your virtual instance will be connected to.
 message.advanced.mode.desc=Choose this network model if you wish to enable VLAN support.  This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking.
 message.advanced.security.group=Choose this if you wish to use security groups to provide guest VM isolation.
 message.advanced.virtual=Choose this if you wish to use zone-wide VLANs to provide guest VM isolation.
-message.after.enable.s3=S3-backed Secondary Storage configured. Note: When you leave this page, you will not be able to re-configure S3 again.
-message.after.enable.swift=Swift configured. Note: When you leave this page, you will not be able to re-configure Swift again.
+message.after.enable.s3=S3-backed Secondary Storage configured. Note\: When you leave this page, you will not be able to re-configure S3 again.
+message.after.enable.swift=Swift configured. Note\: When you leave this page, you will not be able to re-configure Swift again.
 message.alert.state.detected=Alert state detected
 message.allow.vpn.access=Please enter a username and password of the user that you want to allow VPN access.
 message.apply.snapshot.policy=You have successfully updated your current snapshot policy.
@@ -1315,10 +1309,10 @@ message.confirm.join.project=Please confirm you wish to join this project.
 message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
 message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
 message.copy.iso.confirm=Please confirm that you wish to copy your ISO to
-message.copy.template=Copy template <b id="copy_template_name_text">XXX</b> from zone <b id="copy_template_source_zone_text"></b> to
+message.copy.template=Copy template <b id\="copy_template_name_text">XXX</b> from zone <b id\="copy_template_source_zone_text"></b> to
+message.create.template.vm=Create VM from template <b id\="p_name"></b>
+message.create.template.volume=Please specify the following information before creating a template of your disk volume\: <b><span id\="volume_name"></span></b>. Creation of the template can range from several minutes to longer depending on the size of the volume.
 message.create.template=Are you sure you want to create template?
-message.create.template.vm=Create VM from template <b id="p_name"></b>
-message.create.template.volume=Please specify the following information before creating a template of your disk volume: <b><span id="volume_name"></span></b>. Creation of the template can range from several minutes to longer depending on the size of the volume.
 message.creating.cluster=Creating cluster
 message.creating.guest.network=Creating guest network
 message.creating.physical.networks=Creating physical networks
@@ -1328,6 +1322,7 @@ message.creating.secondary.storage=Creating secondary storage
 message.creating.zone=Creating zone
 message.decline.invitation=Are you sure you want to decline this project invitation?
 message.delete.account=Please confirm that you want to delete this account.
+message.delete.affinity.group=Please confirm that you would like to remove this affinity group.
 message.delete.gateway=Please confirm you want to delete the gateway
 message.delete.project=Are you sure you want to delete this project?
 message.delete.user=Please confirm that you would like to delete this user.
@@ -1337,31 +1332,31 @@ message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gatew
 message.desc.advanced.zone=For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks and providing custom network offerings such as firewall, VPN, or load balancer support.
 message.desc.basic.zone=Provide a single network where each VM instance is assigned an IP directly from the network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).
 message.desc.cluster=Each pod must contain one or more clusters, and we will add the first cluster now. A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Each cluster consists of one or more hosts and one or more primary storage servers.
-message.desc.host=Each cluster must contain at least one host (computer) for guest VMs to run on, and we will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
+message.desc.host=Each cluster must contain at least one host (computer) for guest VMs to run on, and we will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host\\'s DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
 message.desc.primary.storage=Each cluster must contain one or more primary storage servers, and we will add the first one now. Primary storage contains the disk volumes for all the VMs running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.
 message.desc.secondary.storage=Each zone must have at least one NFS or secondary storage server, and we will add the first one now. Secondary storage stores VM templates, ISO images, and VM disk volume snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.
 message.desc.zone=A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.
 message.detach.disk=Are you sure you want to detach this disk?
 message.detach.iso.confirm=Please confirm that you want to detach the ISO from this virtual instance.
-message.disable.account=Please confirm that you want to disable this account.  By disabling the account, all users for this account will no longer have access to their cloud resources.  All running virtual machines will be immediately shut down. 
+message.disable.account=Please confirm that you want to disable this account.  By disabling the account, all users for this account will no longer have access to their cloud resources.  All running virtual machines will be immediately shut down.
 message.disable.snapshot.policy=You have successfully disabled your current snapshot policy.
 message.disable.user=Please confirm that you would like to disable this user.
 message.disable.vpn.access=Please confirm that you want to disable VPN Access.
 message.disable.vpn=Are you sure you want to disable VPN?
-message.download.ISO=Please click <a href="#">00000</a> to download ISO    
-message.download.template=Please click <a href="#">00000</a> to download template 
+message.download.ISO=Please click <a href\="\#">00000</a> to download ISO
+message.download.template=Please click <a href\="\#">00000</a> to download template
 message.download.volume.confirm=Please confirm that you want to download this volume
-message.download.volume=Please click <a href="#">00000</a> to download volume
+message.download.volume=Please click <a href\="\#">00000</a> to download volume
 message.edit.account=Edit ("-1" indicates no limit to the amount of resources create)
 message.edit.confirm=Please confirm that your changes before clicking "Save".
 message.edit.limits=Please specify limits to the following resources.  A "-1" indicates no limit to the amount of resources create.
 message.edit.traffic.type=Please specify the traffic label you want associated with this traffic type.
 message.enable.account=Please confirm that you want to enable this account.
-message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
-message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP
 message.enable.user=Please confirm that you would like to enable this user.
 message.enable.vpn.access=VPN is currently disabled for this IP Address.  Would you like to enable VPN access?
 message.enable.vpn=Please confirm that you want VPN access enabled for this IP address.
+message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
+message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP
 message.enabling.security.group.provider=Enabling Security Group provider
 message.enabling.zone=Enabling zone
 message.enter.token=Please enter the token that you were given in your invite e-mail.
@@ -1369,14 +1364,14 @@ message.generate.keys=Please confirm that you would like to generate new keys fo
 message.guest.traffic.in.advanced.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.
 message.guest.traffic.in.basic.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.
 message.installWizard.click.retry=Click the button to retry launch.
-message.installWizard.copy.whatIsACluster=A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack&#8482; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack&#8482; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster. 
-message.installWizard.copy.whatIsAHost=A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack&#8482; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones. 
-message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack&#8482; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.
-message.installWizard.copy.whatIsAZone=A zone is the largest organizational unit within a CloudStack&#8482; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).
-message.installWizard.copy.whatIsCloudStack=CloudStack&#8482 is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack&#8482 manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack&#8482 to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack&#8482 provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features. 
-message.installWizard.copy.whatIsPrimaryStorage=A CloudStack&#8482; cloud infrastructure makes use of two types of storage: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts. 
-message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>
-message.installWizard.now.building=Now building your cloud... 
+message.installWizard.copy.whatIsACluster=A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack&\#8482; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack&\#8482; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.
+message.installWizard.copy.whatIsAHost=A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack&\#8482; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.
+message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack&\#8482; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.
+message.installWizard.copy.whatIsAZone=A zone is the largest organizational unit within a CloudStack&\#8482; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).
+message.installWizard.copy.whatIsCloudStack=CloudStack&\#8482 is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack&\#8482 manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack&\#8482 to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack&\#8482 provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features.
+message.installWizard.copy.whatIsPrimaryStorage=A CloudStack&\#8482; cloud infrastructure makes use of two types of storage\: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts.
+message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following\:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>
+message.installWizard.now.building=Now building your cloud...
 message.installWizard.tooltip.addCluster.name=A name for the cluster.  This can be text of your choosing and is not used by CloudStack.
 message.installWizard.tooltip.addHost.hostname=The DNS name or IP address of the host.
 message.installWizard.tooltip.addHost.password=This is the password for the user named above (from your XenServer install).
@@ -1406,26 +1401,26 @@ message.instanceWizard.noTemplates=You do not have any templates available; plea
 message.ip.address.changed=Your IP addresses may have changed; would you like to refresh the listing? Note that in this case the details pane will close.
 message.iso.desc=Disc image containing data or bootable media for OS
 message.join.project=You have now joined a project. Please switch to Project view to see the project.
-message.launch.vm.on.private.network=Do you wish to launch your instance on your own private dedicated network? 
+message.launch.vm.on.private.network=Do you wish to launch your instance on your own private dedicated network?
 message.launch.zone=Zone is ready to launch; please proceed to the next step.
 message.lock.account=Please confirm that you want to lock this account.  By locking the account, all users for this account will no longer be able to manage their cloud resources.  Existing resources can still be accessed.
 message.migrate.instance.confirm=Please confirm the host you wish to migrate the virtual instance to.
 message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
 message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
-message.migrate.router.confirm=Please confirm the host you wish to migrate the router to:
-message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to:
+message.migrate.router.confirm=Please confirm the host you wish to migrate the router to\:
+message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to\:
 message.migrate.volume=Please confirm that you want to migrate volume to another primary storage.
-message.new.user=Specify the following to add a new user to the account 
+message.new.user=Specify the following to add a new user to the account
 message.no.network.support.configuration.not.true=You do not have any zone that has security group enabled. Thus, no additional network features.  Please continue to step 5.
 message.no.network.support=Your selected hypervisor, vSphere, does not have any additional network features.  Please continue to step 5.
 message.no.projects.adminOnly=You do not have any projects.<br/>Please ask your administrator to create a new project.
 message.no.projects=You do not have any projects.<br/>Please create a new one from the projects section.
-message.number.clusters=<h2><span> # of </span> Clusters</h2>
-message.number.hosts=<h2><span> # of </span> Hosts</h2>
-message.number.pods=<h2><span> # of </span> Pods</h2>
-message.number.storage=<h2><span> # of </span> Primary Storage Volumes</h2>
-message.number.zones=<h2><span> # of </span> Zones</h2>
-message.pending.projects.1=You have pending project invitations:
+message.number.clusters=<h2><span> \# of </span> Clusters</h2>
+message.number.hosts=<h2><span> \# of </span> Hosts</h2>
+message.number.pods=<h2><span> \# of </span> Pods</h2>
+message.number.storage=<h2><span> \# of </span> Primary Storage Volumes</h2>
+message.number.zones=<h2><span> \# of </span> Zones</h2>
+message.pending.projects.1=You have pending project invitations\:
 message.pending.projects.2=To view, please go to the projects section, then select invitations from the drop-down.
 message.please.add.at.lease.one.traffic.range=Please add at least one traffic range.
 message.please.proceed=Please proceed to the next step.
@@ -1456,7 +1451,7 @@ message.select.security.groups=Please select security group(s) for your new VM
 message.select.template=Please select a template for your new virtual instance.
 message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
 message.setup.physical.network.during.zone.creation=When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.
-message.setup.successful=Cloud setup successful!
+message.setup.successful=Cloud setup successful\!
 message.snapshot.schedule=You can setup recurring snapshot schedules by selecting from the available options below and applying your policy preference
 message.specify.url=Please specify URL
 message.step.1.continue=Please select a template or ISO to continue
@@ -1467,7 +1462,7 @@ message.step.3.continue=Please select a disk offering to continue
 message.step.3.desc=
 message.step.4.continue=Please select at least one network to continue
 message.step.4.desc=Please select the primary network that your virtual instance will be connected to.
-message.storage.traffic=Traffic between CloudStack's internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
+message.storage.traffic=Traffic between CloudStack\\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
 message.suspend.project=Are you sure you want to suspend this project?
 message.template.desc=OS image that can be used to boot VMs
 message.tooltip.dns.1=Name of a DNS server for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
@@ -1481,7 +1476,7 @@ message.tooltip.reserved.system.netmask=The network prefix that defines the pod
 message.tooltip.zone.name=A name for the zone.
 message.update.os.preference=Please choose a OS preference for this host.  All virtual instances with similar preferences will be first allocated to this host before choosing another.
 message.update.resource.count=Please confirm that you want to update resource counts for this account.
-message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance:
+message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance\:
 message.validate.instance.name=Instance name can not be longer than 63 characters. Only ASCII letters a~z, A~Z, digits 0~9, hyphen are allowed. Must start with a letter and end with a letter or a digit.
 message.virtual.network.desc=A dedicated virtualized network for your account.  The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.
 message.vm.create.template.confirm=Create Template will reboot the VM automatically.
@@ -1492,9 +1487,9 @@ message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation
 message.Zone.creation.complete=Zone creation complete
 message.zone.no.network.selection=The zone you selected does not have any choices for network selection.
 message.zone.step.1.desc=Please select a network model for your zone.
-message.zone.step.2.desc=Please enter the following info to add a new zone 
-message.zone.step.3.desc=Please enter the following info to add a new pod 
-message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
+message.zone.step.2.desc=Please enter the following info to add a new zone
+message.zone.step.3.desc=Please enter the following info to add a new pod
+message.zoneWizard.enable.local.storage=WARNING\: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch\:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
 mode=Mode
 network.rate=Network Rate
 notification.reboot.instance=Reboot instance
@@ -1512,14 +1507,14 @@ state.Creating=Creating
 state.Declined=Declined
 state.Destroyed=Destroyed
 state.Disabled=Disabled
-state.enabled=Enabled
 state.Enabled=Enabled
+state.enabled=Enabled
 state.Error=Error
 state.Expunging=Expunging
 state.Migrating=Migrating
 state.Pending=Pending
-state.ready=Ready
 state.Ready=Ready
+state.ready=Ready
 state.Running=Running
 state.Starting=Starting
 state.Stopped=Stopped