diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 6ac2806a4d2..6d845614eaf 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,4 +1,74 @@
-label.installWizard.title=Hello and Welcome to CloudStack™.
+#new labels (begin) **********************************************************************************************
+message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
+label.migrate.instance.to.host=Migrate instance to another host
+message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
+label.migrate.instance.to.ps=Migrate instance to another primary storage
+label.corrections.saved=Corrections saved
+message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following:
Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications
ISO images - OS images that can be bootable or non-bootable
Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates
+message.installWizard.copy.whatIsPrimaryStorage=A CloudStack™ 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.
Primary storage 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.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.
The host is the smallest organizational unit within a CloudStack™ deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.
+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™ deployment. Clusters are contained within pods, and pods are contained within zones.
CloudStack™ allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.
+message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.
A pod is the second-largest organizational unit within a CloudStack™ 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™ 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™ is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack™ manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack™ to deploy, manage, and configure cloud computing environments.
Extending beyond individual virtual machine images running on commodity hardware, CloudStack™ 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.tooltip.addSecondaryStorage.path=The exported path, located on the server you specified above
+message.installWizard.tooltip.addSecondaryStorage.nfsServer=The IP address of the NFS server hosting the secondary storage
+message.installWizard.tooltip.addPrimaryStorage.path=(for NFS) In NFS this is the exported path from the server. Path (for SharedMountPoint). With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".
+message.installWizard.tooltip.addPrimaryStorage.server=(for NFS, iSCSI, or PreSetup) The IP address or DNS name of the storage device.
+message.installWizard.tooltip.addPrimaryStorage.name=The name for the storage device.
+message.installWizard.tooltip.addHost.password=This is the password for the user named above (from your XenServer install).
+message.installWizard.tooltip.addHost.username=Usually root.
+message.installWizard.tooltip.addHost.hostname=The DNS name or IP address of the host.
+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.addPod.reservedSystemEndIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
+message.installWizard.tooltip.addPod.reservedSystemStartIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
+message.installWizard.tooltip.addPod.reservedSystemNetmask=The netmask in use on the subnet the guests will use.
+message.installWizard.tooltip.addPod.reservedSystemGateway=The gateway for the hosts in that pod.
+message.installWizard.tooltip.addPod.name=A name for the pod
+message.installWizard.tooltip.configureGuestTraffic.guestEndIp=The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
+message.installWizard.tooltip.configureGuestTraffic.guestStartIp=The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
+message.installWizard.tooltip.configureGuestTraffic.guestNetmask=The netmask in use on the subnet that the guests should use
+message.installWizard.tooltip.configureGuestTraffic.guestGateway=The gateway that the guests should use
+message.installWizard.tooltip.configureGuestTraffic.description=A description for your network
+message.installWizard.tooltip.configureGuestTraffic.name=A name for your network
+message.installWizard.tooltip.addZone.internaldns2=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
+message.installWizard.tooltip.addZone.internaldns1=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
+message.installWizard.tooltip.addZone.dns2=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
+message.installWizard.tooltip.addZone.name=A name for the zone
+message.installWizard.tooltip.addZone.dns1=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
+message.setup.successful=Cloud setup successful!
+label.may.continue=You may now continue.
+error.installWizard.message=Something went wrong; you may go back and correct any errors
+message.installWizard.now.building=Now building your cloud...
+message.installWizard.click.retry=Click the button to retry launch.
+label.launch=Launch
+label.installWizard.click.launch=Click the launch button.
+label.congratulations=Congratulations!
+label.installWizard.addSecondaryStorageIntro.subtitle=What is secondary storage?
+label.installWizard.addSecondaryStorageIntro.title=Let’s add secondary storage
+label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage?
+label.installWizard.addPrimaryStorageIntro.title=Let’s add primary storage
+label.installWizard.addHostIntro.subtitle=What is a host?
+label.installWizard.addHostIntro.title=Let’s add a host
+label.installWizard.addClusterIntro.subtitle=What is a cluster?
+label.installWizard.addClusterIntro.title=Let’s add a cluster
+label.installWizard.addPodIntro.subtitle=What is a pod?
+label.installWizard.addPodIntro.title=Let’s add a pod
+label.installWizard.addZone.title=Add zone
+label.installWizard.addZoneIntro.subtitle=What is a zone?
+label.installWizard.addZoneIntro.title=Let’s add a zone
+error.password.not.match=The password fields do not match
+label.confirm.password=Confirm password
+message.change.password=Please change your password.
+label.save.and.continue=Save and continue
+label.skip.guide=I have used CloudStack before, skip this guide
+label.continue.basic.install=Continue with basic installation
+label.introduction.to.cloudstack=Introduction to CloudStack™
+label.what.is.cloudstack=What is CloudStack™?
+label.hints=Hints
+label.installWizard.subtitle=This tour will aid you in setting up your CloudStack™ installation
+label.continue=Continue
+label.installWizard.title=Hello and Welcome to CloudStack™
label.agree=Agree
label.license.agreement=License Agreement
label.license.agreement.subtitle=Please accept the CloudStack™ EULA before installing.
@@ -207,11 +277,176 @@ label.notifications=Notifications
label.default.view=Default View
label.project.view=Project View
-#cloudstack 3.0 (end) **********************************************************************************************
+message.add.system.service.offering=Please fill in the following data to add a new system service offering.
+message.action.delete.system.service.offering=Please confirm that you want to delete this system service offering.
+label.action.delete.system.service.offering=Delete System Service Offering
+label.hypervisor.capabilities=Hypervisor capabilities
+label.hypervisor.version=Hypervisor version
+label.max.guest.limit=Max guest limit
+label.add.network.offering=Add network offering
+label.supported.services=Supported Services
+label.service.capabilities=Service Capabilities
+label.guest.type=Guest Type
+label.specify.IP.ranges=Specify IP ranges
+label.conserve.mode=Conserve mode
+label.created.by.system=Created by system
+label.menu.system.service.offerings=System Service Offerings
+label.add.system.service.offering=Add System Service Offering
+label.redundant.router.capability=Redundant router capability
+label.supported.source.NAT.type=Supported Source NAT type
+label.elastic.LB=Elastic LB
+label.LB.isolation=LB isolation
+label.elastic.IP=Elastic IP
+label.network.label.display.for.blank.value=Use default gateway
+label.xen.traffic.label=XenServer traffic label
+label.kvm.traffic.label=KVM traffic label
+label.vmware.traffic.label=VMware traffic label
+label.start.IP=Start IP
+label.end.IP=End IP
+label.remove.ip.range=Remove IP range
+label.ip.ranges=IP Ranges
+label.start.vlan=Start Vlan
+label.end.vlan=End Vlan
+label.broadcast.domain.range=Broadcast domain range
+label.compute=Compute
+message.add.guest.network=Please confirm that you would like to add a guest network
+label.subdomain.access=Subdomain Access
+label.guest.start.ip=Guest start IP
+label.guest.end.ip=Guest end IP
+label.virtual.router=Virtual Router
+label.physical.network.ID=Physical network ID
+label.destination.physical.network.id=Destination physical network ID
+label.dhcp=DHCP
+label.destroy.router=Destroy router
+message.confirm.destroy.router=Please confirm that you would like to destroy this router
+label.change.service.offering=Change service offering
+label.view.console=View console
+label.redundant.state=Redundant state
+label.enable.provider=Enable provider
+message.confirm.enable.provider=Please confirm that you would like to enable this provider
+label.disable.provider=Disable provider
+message.confirm.disable.provider=Please confirm that you would like to disable this provider
+label.shutdown.provider=Shutdown provider
+message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
+label.netScaler=NetScaler
+label.add.new.NetScaler=Add new NetScaler
+label.capacity=Capacity
+label.dedicated=Dedicated
+label.f5=F5
+label.add.new.F5=Add new F5
+label.srx=SRX
+label.providers=Providers
+label.add.new.SRX=Add new SRX
+label.timeout=Timeout
+label.public.network=Public network
+label.private.network=Private network
+label.enable.swift=Enable Swift
+confirm.enable.swift=Please fill in the following information to enable support for Swift
+message.after.enable.swift=Swift configured. Note: When you leave this page, you will not be able to re-configure Swift again.
+label.key=Key
+label.delete.NetScaler=Delete NetScaler
+message.confirm.delete.NetScaler=Please confirm that you would like to delete NetScaler
+label.delete.F5=Delete F5
+message.confirm.delete.F5=Please confirm that you would like to delete F5
+label.delete.SRX=Delete SRX
+message.confirm.delete.SRX=Please confirm that you would like to delete SRX
+label.pods=Pods
+label.pod.name=Pod name
+label.reserved.system.gateway=Reserved system gateway
+label.reserved.system.netmask=Reserved system netmask
+label.start.reserved.system.IP=Start Reserved system IP
+label.end.reserved.system.IP=End Reserved system IP
+label.clusters=Clusters
+label.cluster.name=Cluster Name
+label.host.MAC=Host MAC
+label.agent.username=Agent Username
+label.agent.password=Agent Password
+message.confirm.action.force.reconnect=Please confirm that you want to force reconnect this host.
+label.resource.state=Resource state
+label.LUN.number=LUN #
+message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
+message.tooltip.zone.name=A name for the zone.
+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.
+message.tooltip.dns.2=A second DNS server name for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
+message.tooltip.internal.dns.1=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
+message.tooltip.internal.dns.2=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
+message.tooltip.network.domain=A DNS suffix that will create a custom domain name for the network that is accessed by guest VMs.
+message.tooltip.pod.name=A name for this pod.
+message.tooltip.reserved.system.gateway=The gateway for the hosts in the pod.
+message.tooltip.reserved.system.netmask=The network prefix that defines the pod subnet. Uses CIDR notation.
+message.creating.zone=Creating zone
+message.creating.physical.networks=Creating physical networks
+message.configuring.physical.networks=Configuring physical networks
+message.adding.Netscaler.device=Adding Netscaler device
+message.creating.pod=Creating pod
+message.configuring.public.traffic=Configuring public traffic
+message.configuring.storage.traffic=Configuring storage traffic
+message.configuring.guest.traffic=Configuring guest traffic
+message.creating.cluster=Creating cluster
+message.adding.host=Adding host
+message.creating.primary.storage=Creating primary storage
+message.creating.secondary.storage=Creating secondary storage
+message.Zone.creation.complete=Zone creation complete
+message.enabling.zone=Enabling zone
+error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following
+error.could.not.enable.zone=Could not enable zone
+message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone?
+message.please.add.at.lease.one.traffic.range=Please add at lease one traffic range.
+message.you.must.have.at.least.one.physical.network=You must have at least one physical network
+message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing
+
+label.zone.type=Zone Type
+label.setup.zone=Setup Zone
+label.setup.network=Setup Network
+label.add.resources=Add Resources
+label.launch=Launch
+label.set.up.zone.type=Set up zone type
+message.please.select.a.configuration.for.your.zone=Please select a configuration for your zone.
+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)
+label.basic=Basic
+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.
+label.advanced=Advanced
+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.
+label.physical.network=Physical Network
+label.public.traffic=Public traffic
+label.guest.traffic=Guest Traffic
+label.storage.traffic=Storage Traffic
+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 management server. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.
Drag and drop one or more traffic types onto each physical network.
+label.add.physical.network=Add physical network
+label.traffic.types=Traffic Types
+label.management=Management
+label.guest=Guest
+label.please.specify.netscaler.info=Please specify Netscaler info
+message.public.traffic.in.advanced.zone=Public traffic is generated when VMs in the cloud access the internet. Publicly-accessible IPs must be allocated for this purpose. End users can use the CloudStack UI to acquire these IPs to implement NAT between their guest network and their public network.
Provide at lease one range of IP addresses for internet traffic.
+message.public.traffic.in.basic.zone=Public traffic is generated when VMs in the cloud access the Internet or provide services to clients over the Internet. Publicly accessible IPs must be allocated for this purpose. When a instance is created, an IP from this set of Public IPs will be allocated to the instance in addition to the guest IP address. Static 1-1 NAT will be set up automatically between the public IP and the guest IP. End users can also use the CloudStack UI to acquire additional IPs to implement static NAT between their instances and the public IP.
+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.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.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.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 lease 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.
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 lease 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.
Provide the IP address and exported path.
+label.launch.zone=Launch zone
+message.please.wait.while.zone.is.being.created=Please wait while your zone is being created; this may take a while...
+
+label.load.balancing=Load Balancing
+label.static.nat.enabled=Static NAT Enabled
+label.zones=Zones
+label.view.more=View more
+label.number.of.zones=Number of Zones
+label.number.of.pods=Number of Pods
+label.number.of.clusters=Number of Clusters
+label.number.of.hosts=Number of Hosts
+label.total.hosts=Total Hosts
+label.total.CPU=Total CPU
+label.total.memory=Total Memory
+label.total.storage=Total Storage
+
+#new labels (end) **********************************************************************************************
-#cloudstack 2.2.Y (begin) ******************************************************************************************
label.action.migrate.router=Migrate Router
label.action.migrate.router.processing=Migrating Router....
message.migrate.router.confirm=Please confirm the host you wish to migrate the router to:
@@ -253,7 +488,7 @@ label.action.unmanage.cluster=Unmanage Cluster
message.action.unmanage.cluster=Please confirm that you want to unmanage the cluster.
label.action.unmanage.cluster.processing=Unmanaging Cluster....
-allocation.state=Allocation State
+label.allocation.state=Allocation State
managed.state=Managed State
label.default.use=Default Use
@@ -760,7 +995,7 @@ label.no=No
label.none=None
label.not.found=Not Found
label.num.cpu.cores=# of CPU Cores
-label.numretries = Number of Retries
+label.numretries=Number of Retries
label.offer.ha=Offer HA
label.optional=Optional
label.os.preference=OS Preference
@@ -1065,129 +1300,6 @@ error.mgmt.server.inaccessible=The Management Server is unaccessible. Please tr
error.session.expired=Your session has expired.
error.unresolved.internet.name=Your internet name cannot be resolved.
-#Jes
-message.add.system.service.offering=Please fill in the following data to add a new system service offering.
-message.action.delete.system.service.offering=Please confirm that you want to delete this system service offering.
-label.action.delete.system.service.offering=Delete System Service Offering
-hypervisor.capabilities=Hypervisor capabilities
-hypervisor.version=Hypervisor version
-max.guest.limit=Max guest limit
-security.group.enabled=Security group enabled
-add.network.offering=Add network offering
-supported.services=Supported Services
-service.capabilities=Service Capabilities
-guest.type=Guest Type
-specify.IP.ranges=Specify IP ranges
-conserve.mode=Conserve mode
-created.by.system=Created by system
-label.menu.system.service.offerings=System Service Offerings
-label.add.system.service.offering=Add System Service Offering
-redundant.router.capability=Redundant router capability
-supported.source.NAT.type=Supported Source NAT type
-elastic.LB=Elastic LB
-LB.isolation=LB isolation
-elastic.IP=Elastic IP
-network.label.display.for.blank.value=Use default gateway
-Xen.traffic.label=XenServer traffic label
-KVM.traffic.label=KVM traffic label
-VMware.traffic.label=VMware traffic label
-start.IP=Start IP range
-end.IP=End IP range
-IP.range.is.added=IP range is added
-remove.IP.range=Remove IP range
-storage.traffic.type.is.updated=Storage traffic type is updated
-management.traffic.type.is.updated=Management traffic type is updated
-public.traffic.type.is.updated=Public traffic type is updated
-guest.traffic.type.is.updated=Guest traffic type is updated
-IP.ranges=IP Ranges
-start.Vlan=Start Vlan
-end.Vlan=End Vlan
-broadcast.domain.range=Broadcast domain range
-label.compute=Compute
-message.add.guest.network=Please confirm that you would like to add a guest network
-subdomain.access=Subdomain Access
-guest.start.IP=Guest start IP
-guest.end.IP=Guest end IP
-restart.required=Restart required
-virtual.router=Virtual Router
-physical.network.ID=Physical network ID
-destination.physical.network.ID=Destination physical network ID
-DHCP=DHCP
-destroy.router=Destroy router
-confirm.destroy.router=Please confirm that you would like to destroy this router
-change.service.offering=Change service offering
-view.console=View console
-redundant.state=Redundant state
-enable.provider=Enable provider
-confirm.enable.provider=Please confirm that you would like to enable this provider
-disable.provider=Disable provider
-confirm.disable.provider=Please confirm that you would like to disable this provider
-shutdown.provider=Shutdown provider
-confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
-NetScaler=NetScaler
-add.new.NetScaler=Add new NetScaler
-number.of.retries=Number of retries
-capacity=Capacity
-dedicated=Dedicated
-F5=F5
-add.new.F5=Add new F5
-SRX=SRX
-providers=Providers
-add.new.SRX=Add new SRX
-timeout=Timeout
-public.network=Public network
-private.network=Private network
-public=Public
-enable.swift=Enable Swift
-confirm.enable.swift=Please fill in the following information to enable support for Swift
-message.after.enable.swift=Swift configured. Note: When you leave this page, you will not be able to re-configure Swift again.
-URL=URL
-key=Key
-domain=Domain
-delete.NetScaler=Delete NetScaler
-confirm.delete.NetScaler=Please confirm that you would like to delete NetScaler
-delete.F5=Delete F5
-confirm.delete.F5=Please confirm that you would like to delete F5
-delete.SRX=Delete SRX
-confirm.delete.SRX=Please confirm that you would like to delete SRX
-label.pods=Pods
-pod.name=Pod name
-reserved.system.gateway=Reserved system gateway
-reserved.system.netmask=Reserved system netmask
-start.reserved.system.IP=Start Reserved system IP
-end.reserved.system.IP=End Reserved system IP
-label.clusters=Clusters
-cluster.name=Cluster Name
-host.MAC=Host MAC
-agent.username=Agent Username
-agent.password=Agent Password
-confirm.action.force.reconnect=Please confirm that you want to force reconnect this host.
-resource.state=Resource state
-LUN.number=LUN #
-confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
-tooltip.zone.name=A name for the zone.
-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.
-tooltip.dns.2=A second DNS server name for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
-tooltip.internal.dns.1=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
-tooltip.internal.dns.2=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
-tooltip.network.domain=A DNS suffix that will create a custom domain name for the network that is accessed by guest VMs.
-tooltip.pod.name=A name for this pod.
-tooltip.reserved.system.gateway=The gateway for the hosts in the pod.
-tooltip.reserved.system.netmask=The network prefix that defines the pod subnet. Uses CIDR notation.
-creating.zone=Creating zone
-creating.physical.networks=Creating physical networks
-configuring.physical.networks=Configuring physical networks
-adding.Netscaler.device=Adding Netscaler device
-creating.pod=Creating pod
-configuring.public.traffic=Configuring public traffic
-configuring.storage.traffic=Configuring storage traffic
-configuring.guest.traffic=Configuring guest traffic
-creating.cluster=Creating cluster
-adding.host=Adding host
-creating.primary.storage=Creating primary storage
-creating.secondary.storage=Creating secondary storage
-Zone.creation.complete=Zone creation complete
-
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 4b4bd555f76..cbc12668862 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -1,4 +1,74 @@
-label.installWizard.title=こんにちは、CloudStack™ へようこそ。
+#new labels (begin) **********************************************************************************************
+message.migrate.instance.to.host=別のホストにインスタンスを移行することを確認してください。
+label.migrate.instance.to.host=別のホストにインスタンスを移行する
+message.migrate.instance.to.ps=別のプライマリ·ストレージにインスタンスを移行することを確認してください。
+label.migrate.instance.to.ps=別のプライマリストレージにインスタンスを移行する
+label.corrections.saved=修正が保存され
+message.installWizard.copy.whatIsSecondaryStorage=セカンダリストレージは、ゾーンに関連付けられており、それは次のように格納されてい:
コモディティ·ハードウェア上で実行されている個々の仮想マシンのイメージを超えて拡張すると、CloudStack™は、サービスとしての仮想データセンターを実現するためのターンキー·クラウド·インフラストラクチャ·ソフトウェア·スタックを提供します - マルチティアとマルチテナント型のクラウドを構築、デプロイ、および管理するために不可欠なすべてのコンポーネントを提供アプリケーション。オープンソースとプレミアムバージョンの両方がほぼ同じ機能を提供するオープンソースのバージョンでは、用意されています。
+message.installWizard.tooltip.addSecondaryStorage.path=あなたは上記で指定したサーバー上にあるエクスポートされたパス、
+message.installWizard.tooltip.addSecondaryStorage.nfsServer=セカンダリ·ストレージをホストしているNFSサーバのIPアドレス
+message.installWizard.tooltip.addPrimaryStorage.path=（NFS）のNFSでは、これはサーバーからエクスポートされたパスです。パス（SharedMountPoint用）。 KVMでこれは、このプライマリ·ストレージがマウントされている場所は、各ホスト上のパスです。たとえば、 /mnt/primary。
+message.installWizard.tooltip.addPrimaryStorage.server=（NFS、iSCSI、またはPreSetup）のIPアドレスまたはストレージデバイスのDNS名。
+message.installWizard.tooltip.addPrimaryStorage.name=ストレージデバイスの名前を入力します。
+message.installWizard.tooltip.addHost.password=これは上記の名前のユーザのパスワード（XenServerのインストールから）です。
+message.installWizard.tooltip.addHost.username=通常ルート。
+message.installWizard.tooltip.addHost.hostname=DNS名またはホストのIPアドレス。
+message.installWizard.tooltip.addCluster.name=クラスタの名前。これは任意のテキストにすることができ、CloudStack使用されていません。
+message.installWizard.tooltip.addPod.reservedSystemEndIp=これはCloudStackは、セカンダリストレージの仮想マシンとコンソールのプロキシ仮想マシンを管理するために使用するプライベートネットワーク内のIP範囲です。これらのIPアドレスは、コンピューティング·サーバーと同じサブネットから取得されます。
+message.installWizard.tooltip.addPod.reservedSystemStartIp=これはCloudStackは、セカンダリストレージの仮想マシンとコンソールのプロキシ仮想マシンを管理するために使用するプライベートネットワーク内のIP範囲です。これらのIPアドレスは、コンピューティング·サーバーと同じサブネットから取得されます。
+message.installWizard.tooltip.addPod.reservedSystemNetmask=お客様が使用されるサブネットで使用中のマスク。
+message.installWizard.tooltip.addPod.reservedSystemGateway=そのポッド内のホストに対するゲートウェイ。
+message.installWizard.tooltip.addPod.name=ポッドの名前
+message.installWizard.tooltip.configureGuestTraffic.guestEndIp=このゾーンのゲストへの割り当てのために利用できるようになりますIPアドレスの範囲。つのNICが使用されている場合、これらのIPはポッドCIDR CIDRと同じである必要があります。
+message.installWizard.tooltip.configureGuestTraffic.guestStartIp=このゾーンのゲストへの割り当てのために利用できるようになりますIPアドレスの範囲。つのNICが使用されている場合、これらのIPはポッドCIDR CIDRと同じである必要があります。
+message.installWizard.tooltip.configureGuestTraffic.guestNetmask=ゲストが使用する必要があるサブネットで使用中のマスク
+message.installWizard.tooltip.configureGuestTraffic.guestGateway=ゲストが使用するゲートウェイ
+message.installWizard.tooltip.configureGuestTraffic.description=ネットワークの説明
+message.installWizard.tooltip.configureGuestTraffic.name=あなたのネットワークの名前
+message.installWizard.tooltip.addZone.internaldns2=これらは、ゾーン内のシステムのVMで使用するためのDNSサーバです。これらのDNSサーバーは、システムのVMのプライベート·ネットワーク·インタフェースを介してアクセスされます。あなたはポッドを提供するプライベートIPアドレスは、ここという名前のDNSサーバへのルートを持っている必要があります。
+message.installWizard.tooltip.addZone.internaldns1=これらは、ゾーン内のシステムのVMで使用するためのDNSサーバです。これらのDNSサーバーは、システムのVMのプライベート·ネットワーク·インタフェースを介してアクセスされます。あなたはポッドを提供するプライベートIPアドレスは、ここという名前のDNSサーバへのルートを持っている必要があります。
+message.installWizard.tooltip.addZone.dns2=これらは、ゾーン内のゲストVMで使用するためのDNSサーバです。これらのDNSサーバーは、後で追加され、パブリックネットワークを介してアクセスされます。ゾーンのパブリックIPアドレスは、ここで名前のDNSサーバへのルートを持っている必要があります。
+message.installWizard.tooltip.addZone.name=ゾーンの名前
+message.installWizard.tooltip.addZone.dns1=これらは、ゾーン内のゲストVMで使用するためのDNSサーバです。これらのDNSサーバーは、後で追加され、パブリックネットワークを介してアクセスされます。ゾーンのパブリックIPアドレスは、ここで名前のDNSサーバへのルートを持っている必要があります。
+message.setup.successful=雲のセットアップに成功！
+label.may.continue=あなたは今継続することができます。
+error.installWizard.message=何かが間違っていた、元に戻ってすべてのエラーを訂正することができる
+message.installWizard.now.building=今すぐあなたのクラウドを構築...
+message.installWizard.click.retry=起動を再試行する]ボタンをクリックします。
+label.launch=起動する
+label.installWizard.click.launch=起動ボタンをクリックします。
+label.congratulations=おめでとう！
+label.installWizard.addSecondaryStorageIntro.subtitle=二次記憶装置とは何ですか？
+label.installWizard.addSecondaryStorageIntro.title=のがセカンダリ·ストレージを追加してみましょう
+label.installWizard.addPrimaryStorageIntro.subtitle=プライマリストレージとは何ですか？
+label.installWizard.addPrimaryStorageIntro.title=のは、プライマリ·ストレージを追加してみましょう
+label.installWizard.addHostIntro.subtitle=ホストとは何ですか？
+label.installWizard.addHostIntro.title=のホストを追加してみましょう
+label.installWizard.addClusterIntro.subtitle=クラスタとは何ですか？
+label.installWizard.addClusterIntro.title=のクラスタを追加してみましょう
+label.installWizard.addPodIntro.subtitle=ポッドとは何ですか？
+label.installWizard.addPodIntro.title=のは、ポッドを追加してみましょう
+label.installWizard.addZone.title=ゾーンを追加する
+label.installWizard.addZoneIntro.subtitle=ゾーンとは何ですか？
+label.installWizard.addZoneIntro.title=ゾーンを追加する
+error.password.not.match=パスワードフィールドが一致しません
+label.confirm.password=パスワードを確認
+message.change.password=パスワードを変更してください。
+label.save.and.continue=保存して続行
+label.skip.guide=このガイドをスキップする前に、私はCloudStack使用している
+label.continue.basic.install=基本的なインストールを続行し
+label.introduction.to.cloudstack=CloudStack™するために導入
+label.what.is.cloudstack=CloudStack™ は何ですか？
+label.hints=ヒント
+label.installWizard.subtitle=このツアーでは、あなたのCloudStack™ のインストールを設定する際に役立ちます
+label.continue=続ける
+label.installWizard.title=こんにちは、CloudStack™ へようこそ。
label.agree=同意する
label.license.agreement=ライセンス契約
label.license.agreement.subtitle=インストールする前に、CloudStack™ ライセンスに同意してください。
@@ -206,11 +276,178 @@ message.reset.password.warning.notStopped=インスタンスは、その現在
label.notifications=通知
label.default.view=デフォルトのビュー
label.project.view=プロジェクトビュー
-#cloudstack 3.0 (end) **********************************************************************************************
+
+message.add.system.service.offering=新しいシステム·サービスの提供を追加するには、次のデータを記入してください。
+message.action.delete.system.service.offering=このシステムサービスの提供を削除することを確認してください。
+label.action.delete.system.service.offering=削除システムサービスの提供
+label.hypervisor.capabilities=機能をハイパーバイザ
+label.hypervisor.version=のバージョンをハイパーバイザ
+label.max.guest.limit=最大ゲストの制限
+label.add.network.offering=ネットワークの提供を追加します。
+label.supported.services=サポートされているサービス
+label.service.capabilities=サービス機能
+label.guest.type=ゲストの種類
+label.specify.IP.ranges=指定したIPの範囲
+label.conserve.mode=モードを節約
+label.created.by.system=システムによって作成され
+label.menu.system.service.offerings=システムサービスの提供
+label.add.system.service.offering=システムサービスの提供を追加します。
+label.redundant.router.capability=Redundant router capability
+label.supported.source.NAT.type=Supported Source NAT type
+label.elastic.LB=Elastic LB
+label.LB.isolation=LB isolation
+label.elastic.IP=Elastic IP
+label.network.label.display.for.blank.value=デフォルトゲートウェイを使用する
+label.xen.traffic.label=XenServerのトラフィックのラベル
+label.kvm.traffic.label=KVMトラフィックのラベル
+label.vmware.traffic.label=VMwareのトラフィックのラベル
+label.start.IP=IPアドレスの範囲を起動します。
+label.end.IP=終了IPアドレスの範囲
+label.remove.ip.range=IPアドレス範囲を削除します。
+label.ip.ranges=IP範囲
+label.start.vlan=スタートVLAN
+label.end.vlan=エンドVLAN
+label.broadcast.domain.range=ドメインの範囲をブロードキャスト
+label.compute=計算
+message.add.guest.network=あなたがゲストネットワークを追加したいことを確認してください
+label.subdomain.access=サブドメインアクセス
+label.guest.start.ip=ゲストの開始IP
+label.guest.end.ip=ゲストの終了IP
+label.virtual.router=Virtual Router
+label.physical.network.ID=物理的なネットワークID
+label.destination.physical.network.id=先の物理的なネットワークID
+label.dhcp=DHCP
+label.destroy.router=ルータを破壊する
+message.confirm.destroy.router=このルータを破壊することを確認してください
+label.change.service.offering=サービス·オファリングを変更する
+label.view.console=コンソールを表示する
+label.redundant.state=冗長状態
+label.enable.provider=プロバイダを有効にする
+message.confirm.enable.provider=このプロバイダを有効にしたいことを確認してください
+label.disable.provider=プロバイダを無効にする
+message.confirm.disable.provider=このプロバイダを無効にしたいことを確認してください
+label.shutdown.provider=シャットダウン·プロバイダー
+message.confirm.shutdown.provider=このプロバイダをシャットダウンすることを確認してください
+label.netScaler=NetScaler
+label.add.new.NetScaler=新しいNetScalerを追加する
+number.of.retries=再試行の回数
+label.capacity=容量
+label.dedicated=専用の
+label.f5=F5
+label.add.new.F5=新しいF5キーを追加する
+label.srx=SRX
+label.providers=プロバイダー
+label.add.new.SRX=新しいSRXを追加します。
+label.timeout=タイムアウト
+label.public.network=パブリックネットワーク
+label.private.network=プライベートネットワーク
+label.enable.swift=スウィフトを有効にする
+confirm.enable.swift=スウィフトのサポートを有効にするには、次の情報を入力してください。
+message.after.enable.swift=スウィフトは、設定されています。注：このページを出るときは、もう一度再構成するスウィフトにはできません。
+label.key=キー
+label.delete.NetScaler=削除NetScalerは
+message.confirm.delete.NetScaler=あなたがNetScalerを削除したいことを確認してください
+label.delete.F5=削除F5
+message.confirm.delete.F5=F5キーを削除したいことを確認してください
+label.delete.SRX=削除SRX
+message.confirm.delete.SRX=あなたはSRXを削除したいことを確認してください
+label.pods=ポッド
+label.pod.name=ポッド名
+label.reserved.system.gateway=予約システムのゲートウェイ
+label.reserved.system.netmask=予約システムのネットマスク
+label.start.reserved.system.IP=予約システムのIPを起動します。
+label.end.reserved.system.IP=最後の予約システムのIP
+label.clusters=クラスタ
+label.cluster.name=クラスタ名
+label.host.MAC=ホストのMAC
+label.agent.username=エージェントのユーザー名
+label.agent.password=エージェントのパスワード
+message.confirm.action.force.reconnect=このホストを再接続を強制することを確認してください。
+label.resource.state=リソースの状態
+label.LUN.number=LUN #
+message.confirm.remove.IP.range=あなたがこのIPアドレス範囲の削除を希望することを確認してください。
+message.tooltip.zone.name=ゾーンの名前を入力します。
+message.tooltip.dns.1=ゾーン内のVMで使用するためにDNSサーバーの名前を指定します。ゾーンのパブリックIPアドレスは、このサーバへのルートを持っている必要があります。
+message.tooltip.dns.2=ゾーン内のVMで使用するための二次DNSサーバー名を指定します。ゾーンのパブリックIPアドレスは、このサーバへのルートを持っている必要があります
+message.tooltip.internal.dns.1=ゾーン内のCloudStack内部システムのVMによって使用されるDNSサーバーの名前を指定します。ポッド用のプライベートIPアドレスはこのサーバへのルートを持っている必要があります。
+message.tooltip.internal.dns.2=ゾーン内のCloudStack内部システムのVMによって使用されるDNSサーバーの名前を指定します。ポッド用のプライベートIPアドレスはこのサーバへのルートを持っている必要があります。
+message.tooltip.network.domain=ゲストVMによってアクセスされるネットワーク用のカスタムドメイン名を作成するDNSサフィックスです。
+message.tooltip.pod.name=このポッドの名前を入力します。
+message.tooltip.reserved.system.gateway=ポッド内のホストに対するゲートウェイ。
+message.tooltip.reserved.system.netmask=ポッドサブネットを定義するネットワーク接頭辞。 CIDR表記を使用しています。
+message.creating.zone=ゾーンを作成する
+message.creating.physical.networks=物理的なネットワークを作成する
+message.configuring.physical.networks=物理的なネットワークを構成する
+message.adding.Netscaler.device=NetScalerのデバイスを追加する
+message.creating.pod=ポッドを作成する
+message.configuring.public.traffic=公共交通を構成する
+message.configuring.storage.traffic=ストレージ·トラフィックの設定
+message.configuring.guest.traffic=ゲストのトラフィックを設定する
+message.creating.cluster=クラスタの作成
+message.adding.host=ホストを追加する
+message.creating.primary.storage=プライマリ·ストレージを作成する
+message.creating.secondary.storage=セカンダリ·ストレージを作成する
+message.Zone.creation.complete=完全なゾーンの作成
+message.enabling.zone=Enabling zone
+error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following
+error.could.not.enable.zone=Could not enable zone
+message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone?
+message.please.add.at.lease.one.traffic.range=Please add at lease one traffic range.
+message.you.must.have.at.least.one.physical.network=You must have at least one physical network
+message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing
+
+label.zone.type=Zone Type
+label.setup.zone=Setup Zone
+label.setup.network=Setup Network
+label.add.resources=Add Resources
+label.launch=Launch
+label.set.up.zone.type=Set up zone type
+message.please.select.a.configuration.for.your.zone=Please select a configuration for your zone.
+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)
+label.basic=Basic
+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.
+label.advanced=Advanced
+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.
+label.physical.network=Physical Network
+label.public.traffic=Public traffic
+label.guest.traffic=Guest Traffic
+label.storage.traffic=Storage Traffic
+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 management server. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.
Drag and drop one or more traffic types onto each physical network.
+label.add.physical.network=Add physical network
+label.traffic.types=Traffic Types
+label.management=Management
+label.guest=Guest
+label.please.specify.netscaler.info=Please specify Netscaler info
+message.public.traffic.in.advanced.zone=Public traffic is generated when VMs in the cloud access the internet. Publicly-accessible IPs must be allocated for this purpose. End users can use the CloudStack UI to acquire these IPs to implement NAT between their guest network and their public network.
Provide at lease one range of IP addresses for internet traffic.
+message.public.traffic.in.basic.zone=Public traffic is generated when VMs in the cloud access the Internet or provide services to clients over the Internet. Publicly accessible IPs must be allocated for this purpose. When a instance is created, an IP from this set of Public IPs will be allocated to the instance in addition to the guest IP address. Static 1-1 NAT will be set up automatically between the public IP and the guest IP. End users can also use the CloudStack UI to acquire additional IPs to implement static NAT between their instances and the public IP.
+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.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.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.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 lease 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.
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 lease 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.
- 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)
+
-
+
- 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.
-
+
+
-
+
@@ -476,8 +474,8 @@
- 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.
-
- When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the management server. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.
Drag and drop one or more traffic types onto each physical network.
+
- Public traffic is generated when VMs in the cloud access the internet. Publicly-accessible IPs must be allocated for this purpose. End users can use the CloudStack UI to acquire these IPs to implement NAT between their guest network and their public network.
Provide at lease one range of IP addresses for internet traffic.
+
+
+
@@ -596,15 +595,15 @@
-
Netscaler
-
Public traffic
-
Pod
-
Guest Traffic
-
Storage Traffic
+
+
+
+
+
- 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.
+
- Guest network traffic is communication between end-user virtual machines.
+
+
+
@@ -636,15 +636,15 @@
-
Netscaler
-
Public traffic
-
Pod
-
Guest Traffic
-
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.
+
@@ -653,15 +653,15 @@
-
Cluster
-
Host
-
Primary Storage
-
Secondary Storage
+
+
+
+
- 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.
-
+
+
@@ -671,14 +671,14 @@
-
Cluster
-
Host
-
Primary Storage
-
Secondary Storage
+
+
+
+
- Each cluster must contain at lease 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.
Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
-
+
+
@@ -688,14 +688,14 @@
-
Cluster
-
Host
-
Primary Storage
-
Secondary 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.
-
+
+
@@ -705,14 +705,14 @@
-
Cluster
-
Host
-
Primary Storage
-
Secondary Storage
+
+
+
+
- Each zone must have at lease 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.
Provide the IP address and exported path.
-
+
+
@@ -720,9 +720,9 @@
-
Launch zone
+
- Please wait while your zone is being created; this may take a while...
+
@@ -734,9 +734,9 @@
-
Previous
-
Cancel
-
Next
+
+
+
@@ -744,16 +744,16 @@
-
Firewall
-
View All
+
+
-
Load Balancing
-
View All
+
+
-
Port Forwarding
-
View All
+
+
@@ -762,12 +762,12 @@
-
Static NAT Enabled
+
-
Firewall
-
View All
+
+
@@ -907,31 +907,31 @@
- Refresh
+
- Zones
-
View more
+
+
- Number of Zones
+
- Number of Pods
+
- Number of Clusters
+
- Number of Hosts
+
@@ -940,24 +940,24 @@
- Hosts
-
View more
+
+
- Total Hosts
+
- Total CPU
+
- Total Memory
+
- Total Storage
+
@@ -1614,6 +1614,76 @@
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index f40aaeba223..4d1f1f97e4e 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -281,17 +281,22 @@
response: {
success: function(args) {
if (args.doInstall && cloudStack.context.users[0].role == 'admin') {
- cloudStack.uiCustom.installWizard({
- $container: $container,
- context: context,
- complete: function() {
- // Show cloudStack main UI
- $container.cloudStack(cloudStackArgs);
- }
- });
+ var initInstallWizard = function(eulaHTML) {
+ cloudStack.uiCustom.installWizard({
+ $container: $container,
+ context: context,
+ eula: eulaHTML,
+ complete: function() {
+ // Show cloudStack main UI
+ $container.cloudStack(cloudStackArgs);
+ }
+ });
+ };
+
+ initInstallWizard(loginArgs.eula);
} else {
// Show cloudStack main UI
- $container.cloudStack(cloudStackArgs);
+ $container.cloudStack($.extend(cloudStackArgs, { hasLogo: loginArgs.eula }));
}
}
}
@@ -306,7 +311,17 @@
}
};
- cloudStack.uiCustom.login(loginArgs);
+ // EULA check
+ $.ajax({
+ url: 'eula.html',
+ dataType: 'html',
+ success: function(html) {
+ cloudStack.uiCustom.login($.extend(loginArgs, { eula: html, hasLogo: true }));
+ },
+ error: function() {
+ cloudStack.uiCustom.login(loginArgs);
+ }
+ });
// Localization
cloudStack.localizationFn = function(str) {
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 96fffd58c19..a8a4cea3cec 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -896,14 +896,14 @@
hypervisorCapabilities: {
type: 'select',
- title: 'hypervisor.capabilities',
+ title: 'label.hypervisor.capabilities',
listView: {
id: 'hypervisorCapabilities',
- label: 'hypervisor.capabilities',
+ label: 'label.hypervisor.capabilities',
fields: {
hypervisor: { label: 'label.hypervisor' },
- hypervisorversion: { label: 'hypervisor.version' },
- maxguestslimit: { label: 'max.guest.limit' }
+ hypervisorversion: { label: 'label.hypervisor.version' },
+ maxguestslimit: { label: 'label.max.guest.limit' }
},
dataProvider: function(args) {
var array1 = [];
@@ -962,14 +962,10 @@
{
id: { label: 'label.id' },
hypervisor: { label: 'label.hypervisor' },
- hypervisorversion: { label: 'hypervisor.version' },
+ hypervisorversion: { label: 'label.hypervisor.version' },
maxguestslimit: {
- label: 'max.guest.limit',
+ label: 'label.max.guest.limit',
isEditable: true
- },
- securitygroupenabled: {
- label: 'security.group.enabled',
- converter: cloudStack.converters.toBooleanText
}
}
],
@@ -1047,10 +1043,10 @@
actions: {
add: {
- label: 'add.network.offering',
+ label: 'label.add.network.offering',
createForm: {
- title: 'add.network.offering',
+ title: 'label.add.network.offering',
preFilter: function(args) {
var $availability = args.$form.find('.form-item[rel=availability]');
var $serviceOfferingId = args.$form.find('.form-item[rel=serviceOfferingId]');
@@ -1107,7 +1103,7 @@
},
guestIpType: {
- label: 'guest.type',
+ label: 'label.guest.type',
select: function(args) {
args.response.success({
data: [
@@ -1131,7 +1127,7 @@
specifyVlan: { label: 'label.specify.vlan', isBoolean: true },
supportedServices: {
- label: 'supported.services',
+ label: 'label.supported.services',
dynamic: function(args) {
$.ajax({
@@ -1149,7 +1145,7 @@
// Sanitize names
switch (serviceName) {
case 'Vpn': serviceDisplayName = 'VPN'; break;
- case 'Dhcp': serviceDisplayName = 'DHCP'; break;
+ case 'Dhcp': serviceDisplayName = dictionary['label.dhcp']; break;
case 'Dns': serviceDisplayName = 'DNS'; break;
case 'Lb': serviceDisplayName = 'Load Balancer'; break;
case 'SourceNat': serviceDisplayName = 'Source NAT'; break;
@@ -1281,14 +1277,14 @@
},
"service.SourceNat.redundantRouterCapabilityCheckbox" : {
- label: "redundant.router.capability",
+ label: "label.redundant.router.capability",
isHidden: true,
dependsOn: 'service.SourceNat.isEnabled',
isBoolean: true
},
"service.SourceNat.sourceNatTypeDropdown": {
- label: 'supported.source.NAT.type',
+ label: 'label.supported.source.NAT.type',
isHidden: true,
dependsOn: 'service.SourceNat.isEnabled',
select: function(args) {
@@ -1301,13 +1297,13 @@
}
},
"service.Lb.elasticLbCheckbox" : {
- label: "elastic.LB",
+ label: "label.elastic.LB",
isHidden: true,
dependsOn: 'service.Lb.isEnabled',
isBoolean: true
},
"service.Lb.lbIsolationDropdown": {
- label: 'LB.isolation',
+ label: 'label.LB.isolation',
isHidden: true,
dependsOn: 'service.Lb.isEnabled',
select: function(args) {
@@ -1320,7 +1316,7 @@
}
},
"service.StaticNat.elasticIpCheckbox" : {
- label: "elastic.IP",
+ label: "label.elastic.IP",
isHidden: true,
dependsOn: 'service.StaticNat.isEnabled',
isBoolean: true
@@ -1328,7 +1324,7 @@
//show or hide upon checked services and selected providers above (end)
- conservemode: { label: 'conserve.mode', isBoolean: true },
+ conservemode: { label: 'label.conserve.mode', isBoolean: true },
tags: { label: 'label.tags' },
@@ -1633,7 +1629,7 @@
},
state: { label: 'label.state' },
guestiptype: {
- label: 'guest.type'
+ label: 'label.guest.type'
},
availability: {
label: 'label.availability',
@@ -1647,7 +1643,7 @@
}
},
isdefault: { //created by system by default
- label: 'created.by.system',
+ label: 'label.created.by.system',
converter: cloudStack.converters.toBooleanText
},
specifyvlan: {
@@ -1655,11 +1651,11 @@
converter: cloudStack.converters.toBooleanText
},
specifyipranges: {
- label: 'specify.IP.ranges',
+ label: 'label.specify.IP.ranges',
converter: cloudStack.converters.toBooleanText
},
conservemode: {
- label: 'conserve.mode',
+ label: 'label.conserve.mode',
converter: cloudStack.converters.toBooleanText
},
networkrate: {
@@ -1679,10 +1675,10 @@
label: 'label.traffic.type'
},
supportedServices: {
- label: 'supported.services'
+ label: 'label.supported.services'
},
serviceCapabilities: {
- label: 'service.capabilities'
+ label: 'label.service.capabilities'
}
}
],
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
index f496ed76727..e394e54ac01 100644
--- a/ui/scripts/installWizard.js
+++ b/ui/scripts/installWizard.js
@@ -36,201 +36,201 @@
// Tooltips
'tooltip.addZone.name': function(args) {
args.response.success({
- text: 'A name for the zone.'
+ text: 'message.installWizard.tooltip.addZone.name'
});
},
'tooltip.addZone.dns1': function(args) {
args.response.success({
- text: 'These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.'
+ text: 'message.installWizard.tooltip.addZone.dns1'
});
},
'tooltip.addZone.dns2': function(args) {
args.response.success({
- text: 'These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.'
+ text: 'message.installWizard.tooltip.addZone.dns2'
});
},
'tooltip.addZone.internaldns1': function(args) {
args.response.success({
- text: 'These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.'
+ text: 'message.installWizard.tooltip.addZone.internaldns1'
});
},
'tooltip.addZone.internaldns2': function(args) {
args.response.success({
- text: 'These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.'
+ text: 'message.installWizard.tooltip.addZone.internaldns2'
});
},
'tooltip.configureGuestTraffic.name': function(args) {
args.response.success({
- text: 'A name for your network'
+ text: 'message.installWizard.tooltip.configureGuestTraffic.name'
});
},
'tooltip.configureGuestTraffic.description': function(args) {
args.response.success({
- text: 'A description for your network'
+ text: 'message.installWizard.tooltip.configureGuestTraffic.description'
});
},
'tooltip.configureGuestTraffic.guestGateway': function(args) {
args.response.success({
- text: 'The gateway that the guests should use'
+ text: 'message.installWizard.tooltip.configureGuestTraffic.guestGateway'
});
},
'tooltip.configureGuestTraffic.guestNetmask': function(args) {
args.response.success({
- text: 'The netmask in use on the subnet that the guests should use'
+ text: 'message.installWizard.tooltip.configureGuestTraffic.guestNetmask'
});
},
'tooltip.configureGuestTraffic.guestStartIp': function(args) {
args.response.success({
- text: 'The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.'
+ text: 'message.installWizard.tooltip.configureGuestTraffic.guestStartIp'
});
},
'tooltip.configureGuestTraffic.guestEndIp': function(args) {
args.response.success({
- text: 'The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.'
+ text: 'message.installWizard.tooltip.configureGuestTraffic.guestEndIp'
});
},
'tooltip.addPod.name': function(args) {
args.response.success({
- text: 'A name for the pod'
+ text: 'message.installWizard.tooltip.addPod.name'
});
},
'tooltip.addPod.reservedSystemGateway': function(args) {
args.response.success({
- text: 'The gateway for the hosts in that pod.'
+ text: 'message.installWizard.tooltip.addPod.reservedSystemGateway'
});
},
'tooltip.addPod.reservedSystemNetmask': function(args) {
args.response.success({
- text: 'The netmask in use on the subnet the guests will use.'
+ text: 'message.installWizard.tooltip.addPod.reservedSystemNetmask'
});
},
'tooltip.addPod.reservedSystemStartIp': function(args) {
args.response.success({
- text: 'This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.'
+ text: 'message.installWizard.tooltip.addPod.reservedSystemStartIp'
});
},
'tooltip.addPod.reservedSystemEndIp': function(args) {
args.response.success({
- text: 'This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.'
+ text: 'message.installWizard.tooltip.addPod.reservedSystemEndIp'
});
},
'tooltip.addCluster.name': function(args) {
args.response.success({
- text: 'A name for the cluster. This can be text of your choosing and is not used by CloudStack.'
+ text: 'message.installWizard.tooltip.addCluster.name'
});
},
'tooltip.addHost.hostname': function(args) {
args.response.success({
- text: 'The DNS name or IP address of the host.'
+ text: 'message.installWizard.tooltip.addHost.hostname'
});
},
'tooltip.addHost.username': function(args) {
args.response.success({
- text: 'Usually root.'
+ text: 'message.installWizard.tooltip.addHost.username'
});
},
'tooltip.addHost.password': function(args) {
args.response.success({
- text: 'This is the password for the user named above (from your XenServer install).'
+ text: 'message.installWizard.tooltip.addHost.password'
});
},
'tooltip.addPrimaryStorage.name': function(args) {
args.response.success({
- text: 'The name for the storage device.'
+ text: 'message.installWizard.tooltip.addPrimaryStorage.name'
});
},
'tooltip.addPrimaryStorage.server': function(args) {
args.response.success({
- text: '(for NFS, iSCSI, or PreSetup) The IP address or DNS name of the storage device.'
+ text: 'message.installWizard.tooltip.addPrimaryStorage.server'
});
},
'tooltip.addPrimaryStorage.path': function(args) {
args.response.success({
- text: '(for NFS) In NFS this is the exported path from the server. Path (for SharedMountPoint). With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".'
+ text: 'message.installWizard.tooltip.addPrimaryStorage.path'
});
},
'tooltip.addSecondaryStorage.nfsServer': function(args) {
args.response.success({
- text: 'The IP address of the NFS server hosting the secondary storage'
+ text: 'message.installWizard.tooltip.addSecondaryStorage.nfsServer'
});
},
'tooltip.addSecondaryStorage.path': function(args) {
args.response.success({
- text: 'The exported path, located on the server you specified above'
+ text: 'message.installWizard.tooltip.addSecondaryStorage.path'
});
},
// Intro text
whatIsCloudStack: function(args) {
args.response.success({
- text: 'CloudStack™ is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack™ manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack™ to deploy, manage, and configure cloud computing environments.
Extending beyond individual virtual machine images running on commodity hardware, CloudStack™ 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. '
+ text: 'message.installWizard.copy.whatIsCloudStack'
});
},
// EULA
eula: function(args) {
args.response.success({
- text: '
CITRIX® LICENSE AGREEMENT
This is a legal agreement ("AGREEMENT") between you, the Licensed User, and Citrix Systems, Inc., Citrix Systems International GmbH, or Citrix Systems Asia Pacific Pty Ltd. Your location of receipt of this product or feature release (both hereinafter "PRODUCT") or technical support (hereinafter "SUPPORT") determines the providing entity hereunder (the applicable entity is hereinafter referred to as "CITRIX"). Citrix Systems, Inc., a Delaware corporation, licenses this PRODUCT in the Americas and Japan and provides SUPPORT in the Americas. Citrix Systems International GmbH, a Swiss company wholly owned by Citrix Systems, Inc., licenses this PRODUCT and provides SUPPORT in Europe, the Middle East, and Africa, and licenses the PRODUCT in Asia and the Pacific (excluding Japan). Citrix Systems Asia Pacific Pty Ltd. provides SUPPORT in Asia and the Pacific (excluding Japan). Citrix Systems Japan KK provides SUPPORT in Japan. BY INSTALLING AND/OR USING THE PRODUCT, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT INSTALL AND/OR USE THE PRODUCT.
1. GRANT OF LICENSE. The PRODUCT is the Citrix proprietary software program in object code form distributed hereunder. This PRODUCT is licensed under a CPU socket model. The PRODUCT is activated by licenses that allow use of the Software in increments defined by the license model ("Licenses").
Under the CPU socket model, a "CPU socket" is an individual CPU socket on a server running the PRODUCT, regardless of whether or not the socket contains a CPU.
Licenses for other CITRIX PRODUCTS or other editions of the same PRODUCT may not be used to increase the allowable use for the PRODUCT. Licenses are version specific for the PRODUCT. They must be the same version or later than the PRODUCT being accessed. CITRIX grants to you the following worldwide and non-exclusive rights to the PRODUCT and accompanying documentation (collectively called the "SOFTWARE"):
a. License. You may install the SOFTWARE on servers containing up to the number of CPU sockets for which you have purchased Licenses ("Production Servers"). In addition, you may install the management portion of the SOFTWARE on management servers as required to support the SOFTWARE running on the Production Servers. You may use the SOFTWARE to provide cloud services for internal users or third parties. Each License that is installed in both a production and disaster recovery environment may be used only in one of the environments at any one time, except for duplicate use during routine testing of the disaster recovery environment. You have the right to customize the SOFTWARE Web user interface only.
b. Perpetual License. If the SOFTWARE is "Perpetual License SOFTWARE," the SOFTWARE is licensed on a perpetual basis and includes the right to receive Subscription (as defined in Section 2 below).
c. Annual PRODUCT. If the SOFTWARE is "Annual License SOFTWARE," your license is for one (1) year and includes the right to receive Updates for that period (but not under Subscription as defined in Section 2 below). For the purposes of this AGREEMENT, an "Update" shall mean a generally available release of the same SOFTWARE. To extend an Annual License, you must purchase and install a new license prior to the expiration of the current License. Note that if a new License is not purchased and installed, Annual License SOFTWARE is not licensed for use beyond the expiration of the license period. Annual License SOFTWARE may disable itself upon expiration of the license period.
d. Partner Demo. If this SOFTWARE is labeled "Partner Demo," notwithstanding any term to the contrary in this AGREEMENT, your License permits use only if you are a current CITRIX authorized distributor or reseller and then only for demonstration, test, or evaluation purposes in support of your customers. Partner Demo SOFTWARE may not be used for customer training. Note that Partner Demo SOFTWARE disables itself on the "time-out" date identified on the SOFTWARE packaging.
e. Evaluation. If this SOFTWARE is labeled "Evaluation," notwithstanding any term to the contrary in this AGREEMENT, your License permits use only for your internal demonstration, test, or evaluation purposes. Note that Evaluation SOFTWARE disables itself on the "time-out" date identified on the SOFTWARE packaging.
f. Archive Copy. You may make one (1) copy of the SOFTWARE in machine-readable form solely for back-up purposes, provided that you reproduce all proprietary notices on the copy.
2. SUBSCRIPTION RIGHTS. Your initial subscription for Perpetual License SOFTWARE ("Subscription"), including SUPPORT, shall begin on the date the Licenses are delivered to you by email. Subscription shall continue for a one (1) year term subject to your purchase of annual renewals (the "Subscription Term"). During the initial or a renewal Subscription Term, CITRIX may, from time to time, generally make Updates available for licensing to the public. Upon general availability of Updates during the Subscription Term, CITRIX shall provide you with Updates for covered Licenses. Any such Updates so delivered to you shall be considered SOFTWARE under the terms of this AGREEMENT, except they are not covered by the Limited Warranty applicable to SOFTWARE, to the extent permitted by applicable law. Subscription Advantage may be purchased for the SOFTWARE until it is no longer offered in accordance with the CITRIX PRODUCT Support Lifecycle Policy posted at www.citrix.com.
You acknowledge that CITRIX may develop and market new or different computer programs or editions of the SOFTWARE that use portions of the SOFTWARE and that perform all or part of the functions performed by the SOFTWARE. Nothing contained in this AGREEMENT shall give you any rights with respect to such new or different computer programs or editions. You also acknowledge that CITRIX is not obligated under this AGREEMENT to make any Updates available to the public. Any deliveries of Updates shall be Ex Works CITRIX (Incoterms 2000).
3. SUPPORT. SUPPORT is sold including various combinations of Incidents, technical contacts, coverage hours, geographic coverage areas, technical relationship management coverage, and infrastructure assessment options. The offering you purchase determines your entitlement. An "Incident" is defined as a single SUPPORT issue and reasonable effort(s) needed to resolve it. An Incident may require multiple telephone calls and offline research to achieve final resolution. The Incident severity will determine the response levels for the SOFTWARE. Unused Incidents and other entitlements expire at the end of each annual term. SUPPORT may be purchased for the SOFTWARE until it is no longer offered in accordance with the CITRIX PRODUCT Support Lifecycle Policy posted at www.citrix.com. SUPPORT will be provided remotely from CITRIX to your locations. Where on-site visits are mutually agreed, you will be billed for reasonable travel and living expenses in accordance with your travel policy. CITRIX\' performance is predicated upon the following responsibilities being fulfilled by you: (i) you will designate a Customer Support Manager ("CSM") who will be the primary administrative contact; (ii) you will designate Named Contacts (including a CSM), preferably each CITRIX certified, and each Named Contact (excluding CSM) will be supplied with an individual service ID number for contacting SUPPORT; (iii) you agree to perform reasonable problem determination activities and to perform reasonable problem resolution activities as suggested by CITRIX. You agree to cooperate with such requests; (iv) you are responsible for implementing procedures necessary to safeguard the integrity and security of SOFTWARE and data from unauthorized access and for reconstructing any lost or altered files resulting from catastrophic failures; (v) you are responsible for procuring, installing, and maintaining all equipment, telephone lines, communications interfaces, and other hardware at your site and providing CITRIX with access to your facilities as required to operate the SOFTWARE and permitting CITRIX to perform the service called for by this AGREEMENT; and (vi) you are required to implement all currently available and applicable hotfixes, hotfix rollup packs, and service packs or their equivalent to the SOFTWARE in a timely manner. CITRIX is not required to provide any SUPPORT relating to problems arising out of: (i) your or any third party\'s alterations or additions to the SOFTWARE, operating system or environment that adversely affects the SOFTWARE (ii) Citrix provided alterations or additions to the SOFTWARE that do not address Errors or Defects; (ii) any functionality not defined in the PRODUCT documentation published by CITRIX and included with the PRODUCT; (iii) use of the SOFTWARE on a processor and peripherals other than the processor and peripherals defined in the documentation; (iv) SOFTWARE that has reached End-of-Life; and (v) any consulting deliverables from any party. An "Error" is defined as a failure in the SOFTWARE to materially conform to the functionality defined in the documentation. A "Defect" is defined as a failure in the SOFTWARE to conform to the specifications in the documentation. In situations where CITRIX cannot provide a satisfactory resolution to your critical problem through normal SUPPORT methods, CITRIX may engage its product development team to create a private fix. Private fixes are designed to address your specific situation and may not be distributed by you outside your organization without written consent from CITRIX. CITRIX retains all right, title, and interest in and to all private fixes. Any hotfixes or private fixes are not SOFTWARE under the terms of this AGREEMENT and they are not covered by the Limited Warranty or Infringement Indemnification applicable to SOFTWARE, to the extent permitted by applicable law. With respect to infrastructure assessments or other consulting services, all intellectual property rights in all reports, preexisting works and derivative works of such preexisting works, as well as installation scripts and other deliverables and developments made, conceived, created, discovered, invented, or reduced to practice in the performance of the assessment are and shall remain the sole and absolute property of CITRIX, subject to a worldwide, nonexclusive License to you for internal use.
4. DESCRIPTION OF OTHER RIGHTS, LIMITATIONS, AND OBLIGATIONS. You may not transfer, rent, timeshare, grant rights in or lease the SOFTWARE except to the extent such foregoing restriction is expressly prohibited by applicable law. If you purchased Licenses for the SOFTWARE to replace other CITRIX Licenses for other CITRIX SOFTWARE and such replacement is a condition of the transaction, you agree to destroy those other CITRIX Licenses and retain no copies after installation of the new Licenses and SOFTWARE. You shall provide the serial numbers of such replaced Licenses and corresponding replacement Licenses to the reseller, and upon request, directly to CITRIX for license tracking purposes. You may not modify, translate, reverse engineer, decompile, disassemble, create derivative works based on, or copy the SOFTWARE except as specifically licensed herein or to the extent such foregoing restriction is expressly prohibited by applicable law. You may not remove any proprietary notices, labels, or marks on any SOFTWARE. To the extent permitted by applicable law, you agree to allow CITRIX to audit your compliance with the terms of this AGREEMENT upon prior written notice during normal business hours. Notwithstanding the foregoing, this AGREEMENT shall not prevent or restrict you from exercising additional or different rights to any free, open source code, documentation and materials contained in or provided with the SOFTWARE in accordance with the applicable free or open source license for such code, documentation, and materials.
ALL RIGHTS IN THE SOFTWARE NOT EXPRESSLY GRANTED ARE RESERVED BY CITRIX OR ITS SUPPLIERS.
You hereby agree, that to the extent that any applicable mandatory laws (such as, for example, national laws implementing EC Directive 91/250 on the Legal Protection of Computer Programs) give you the right to perform any of the aforementioned activities without the consent of CITRIX to gain certain information about the SOFTWARE, before you exercise any such rights, you shall first request such information from CITRIX in writing detailing the purpose for which you need the information. Only if and after CITRIX, at its sole discretion, partly or completely denies your request, shall you exercise your statutory rights.
5. INFRINGEMENT INDEMNIFICATION. CITRIX shall indemnify and defend, or at its option, settle any claim, suit, or proceeding brought against you based on an allegation that the SOFTWARE (excluding Open Source Software) infringes upon any patent or copyright of any third party ("Infringement Claim"), provided you promptly notify CITRIX in writing of your notification or discovery of an Infringement Claim such that CITRIX is not prejudiced by any delay in such notification. For purposes of this Section 5, "Open Source Software" means software distributed by Citrix under an open source licensing model (e.g., the GNU General Public License, BSD or a license similar to those approved by the Open Source Initiative). CITRIX will have sole control over the defense or settlement of any Infringement Claim and you will provide reasonable assistance in the defense of the same. Following notice of an Infringement Claim, or if CITRIX believes such a claim is likely, CITRIX may at its sole expense and option: (i) procure for you the right to continue to use the alleged infringing SOFTWARE; (ii) replace or modify the SOFTWARE to make it non-infringing; or (iii) accept return of the SOFTWARE and provide you with a refund as appropriate. CITRIX assumes no liability for any Infringement Claims or allegations of infringement based on: (i) your use of any SOFTWARE after notice that you should cease use of such SOFTWARE due to an Infringement Claim; (ii) any modification of the SOFTWARE by you or at your direction; or (iii) your combination of SOFTWARE with non-CITRIX programs, data, hardware, or other materials, if such Infringement Claim would have been avoided by the use of the SOFTWARE alone. THE FOREGOING STATES YOUR EXCLUSIVE REMEDY WITH RESPECT TO ANY INFRINGEMENT CLAIM.
6. LIMITED WARRANTY AND DISCLAIMER. CITRIX warrants that for a period of ninety (90) days from the date of delivery of the SOFTWARE to you, the SOFTWARE will perform substantially in accordance with the PRODUCT documentation published by CITRIX and included with the PRODUCT. CITRIX and its suppliers\' entire liability and your exclusive remedy under this warranty (which is subject to you returning the SOFTWARE to CITRIX or an authorized reseller) will be, at the sole option of CITRIX and subject to applicable law, to replace the media and/or SOFTWARE or to refund the purchase price and terminate this AGREEMENT. This limited warranty does not cover any modification of the SOFTWARE by you or related issues. CITRIX will provide the SUPPORT requested by you in a professional and workmanlike manner, but CITRIX cannot guarantee that every question or problem raised by you will be resolved or resolved in a certain amount of time. With respect to consulting services, CITRIX and its suppliers\' entire liability and your exclusive remedy under this warranty is re-performance of the services.
TO THE EXTENT PERMITTED BY APPLICABLE LAW AND EXCEPT FOR THE ABOVE LIMITED WARRANTY FOR SOFTWARE, CITRIX AND ITS SUPPLIERS MAKE AND YOU RECEIVE NO WARRANTIES OR CONDITIONS, EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE; AND CITRIX AND ITS SUPPLIERS SPECIFICALLY DISCLAIM WITH RESPECT TO SOFTWARE, UPDATES, SUBSCRIPTION ADVANTAGE, AND SUPPORT ANY CONDITIONS OF QUALITY, AVAILABILITY, RELIABILITY, SECURITY, LACK OF VIRUSES, BUGS, OR ERRORS, AND ANY IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, ANY WARRANTY OF TITLE, QUIET ENJOYMENT, QUIET POSSESSION, MERCHANTABILITY, NONINFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE IS NOT DESIGNED, MANUFACTURED, OR INTENDED FOR USE OR DISTRIBUTION WITH ANY EQUIPMENT THE FAILURE OF WHICH COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE. YOU ASSUME THE RESPONSIBILITY FOR THE SELECTION OF THE SOFTWARE AND HARDWARE TO ACHIEVE YOUR INTENDED RESULTS, AND FOR THE INSTALLATION OF, USE OF, AND RESULTS OBTAINED FROM THE SOFTWARE AND HARDWARE.
7. PROPRIETARY RIGHTS. No title to or ownership of the SOFTWARE is transferred to you. CITRIX and/or its licensors own and retain all title and ownership of all intellectual property rights in and to the SOFTWARE, including any adaptations, modifications, translations, derivative works or copies. You acquire only a limited License to use the SOFTWARE.
8. EXPORT RESTRICTION. You agree that you will not export, re-export, or import the SOFTWARE in any form without the appropriate government licenses. You understand that under no circumstances may the SOFTWARE be exported to any country subject to U.S. embargo or to U.S.-designated denied persons or prohibited entities or U.S. specially designated nationals.
9. LIMITATION OF LIABILITY. TO THE EXTENT PERMITTED BY APPLICABLE LAW, YOU AGREE THAT NEITHER CITRIX NOR ITS AFFILIATES, SUPPLIERS, OR AUTHORIZED DISTRIBUTORS SHALL BE LIABLE FOR ANY LOSS OF DATA OR PRIVACY, LOSS OF INCOME, LOSS OF OPPORTUNITY OR PROFITS, COST OF RECOVERY, LOSS ARISING FROM YOUR USE OF THE SOFTWARE OR SUPPORT, OR DAMAGE ARISING FROM YOUR USE OF THIRD PARTY SOFTWARE OR HARDWARE OR ANY OTHER SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR INDIRECT DAMAGES ARISING OUT OF OR IN CONNECTION WITH THIS AGREEMENT; OR THE USE OF THE SOFTWARE OR SUPPORT, REFERENCE MATERIALS, OR ACCOMPANYING DOCUMENTATION; OR YOUR EXPORTATION, REEXPORTATION, OR IMPORTATION OF THE SOFTWARE, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY. THIS LIMITATION WILL APPLY EVEN IF CITRIX, ITS AFFILIATES, SUPPLIERS, OR AUTHORIZED DISTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL THE LIABILITY OF CITRIX, ITS AFFILIATES, SUPPLIERS, OR AUTHORIZED DISTRIBUTORS EXCEED THE AMOUNT PAID FOR THE SOFTWARE, SUBSCRIPTION (INCLUDING SUBSCRIPTION WITH SUPPORT) OR SUPPORT AT ISSUE. YOU ACKNOWLEDGE THAT THE LICENSE OR SUPPORT FEE REFLECTS THIS ALLOCATION OF RISK. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU. For purposes of this AGREEMENT, the term "CITRIX AFFILIATE" shall mean any legal entity fifty percent (50%) or more of the voting interests in which are owned directly or indirectly by Citrix Systems, Inc. Affiliates, suppliers, and authorized distributors are intended to be third party beneficiaries of this AGREEMENT.
10. TERMINATION. This AGREEMENT is effective until terminated. You may terminate this AGREEMENT at any time by removing the SOFTWARE from your computers and destroying all copies and providing written notice to CITRIX with the serial numbers of the terminated licenses. CITRIX may terminate this AGREEMENT at any time for your breach of this AGREEMENT. Unauthorized copying of the SOFTWARE or the accompanying documentation or otherwise failing to comply with the license grant of this AGREEMENT will result in automatic termination of this AGREEMENT and will make available to CITRIX all other legal remedies. You agree and acknowledge that your material breach of this AGREEMENT shall cause CITRIX irreparable harm for which monetary damages alone would be inadequate and that, to the extent permitted by applicable law, CITRIX shall be entitled to injunctive or equitable relief without the need for posting a bond. Upon termination of this AGREEMENT, the License granted herein will terminate and you must immediately destroy the SOFTWARE and accompanying documentation, and all backup copies thereof.
11. U.S. GOVERNMENT END-USERS. If you are a U.S. Government agency, in accordance with Section 12.212 of the Federal Acquisition Regulation (48 CFR 12.212 (October 1995)) and Sections 227.7202-1 and 227.7202-3 of the Defense Federal Acquisition Regulation Supplement (48 CFR 227.7202-1, 227.7202-3 (June 1995)), you hereby acknowledge that the SOFTWARE constitutes "Commercial Computer Software" and that the use, duplication, and disclosure of the SOFTWARE by the U.S. Government or any of its agencies is governed by, and is subject to, all of the terms, conditions, restrictions, and limitations set forth in this standard commercial license AGREEMENT. In the event that, for any reason, Sections 12.212, 227.7202-1 or 227.7202-3 are deemed not applicable, you hereby acknowledge that the Government\'s right to use, duplicate, or disclose the SOFTWARE are "Restricted Rights" as defined in 48 CFR Section 52.227-19(c)(1) and (2) (June 1987), or DFARS 252.227-7014(a)(14) (June 1995), as applicable. Manufacturer is Citrix Systems, Inc., 851 West Cypress Creek Road, Fort Lauderdale, Florida, 33309.
12. AUTHORIZED DISTRIBUTORS AND RESELLERS. CITRIX authorized distributors and resellers do not have the right to make modifications to this AGREEMENT or to make any additional representations, commitments, or warranties binding on CITRIX.
13. CHOICE OF LAW AND VENUE. If provider is Citrix Systems, Inc., this AGREEMENT will be governed by the laws of the State of Florida without reference to conflict of laws principles and excluding the United Nations Convention on Contracts for the International Sale of Goods, and in any dispute arising out of this AGREEMENT, you consent to the exclusive personal jurisdiction and venue in the State and Federal courts within Broward County, Florida. If provider is Citrix Systems International GmbH, this AGREEMENT will be governed by the laws of Switzerland without reference to the conflict of laws principles, and excluding the United Nations Convention on Contracts for the International Sale of Goods, and in any dispute arising out of this AGREEMENT, you consent to the exclusive personal jurisdiction and venue of the competent courts in the Canton of Zurich. If provider is Citrix Systems Asia Pacific Pty Ltd, this AGREEMENT will be governed by the laws of the State of New South Wales, Australia and excluding the United Nations Convention on Contracts for the International Sale of Goods, and in any dispute arising out of this AGREEMENT, you consent to the exclusive personal jurisdiction and venue of the competent courts sitting in the State of New South Wales. If any provision of this AGREEMENT is invalid or unenforceable under applicable law, it shall be to that extent deemed omitted and the remaining provisions will continue in full force and effect. To the extent a provision is deemed omitted, the parties agree to comply with the remaining terms of this AGREEMENT in a manner consistent with the original intent of the AGREEMENT.
14. HOW TO CONTACT CITRIX. Should you have any questions concerning this AGREEMENT or want to contact CITRIX for any reason, write to CITRIX at the following address: Citrix Systems, Inc., Customer Service, 851 West Cypress Creek Road, Ft. Lauderdale, Florida 33309; Citrix Systems International GmbH, Rheinweg 9, CH-8200 Schaffhausen, Switzerland; or Citrix Systems Asia Pacific Pty Ltd., Level 3, 1 Julius Ave., Riverside Corporate Park, North Ryde NSW 2113, Sydney, Australia.
15. TRADEMARKS. Citrixis a trademark and/or registered trademark of Citrix Systems, Inc., in the U.S. and other countries.
'
+ text: ''
});
},
whatIsAZone: function(args) {
args.response.success({
- text: 'A zone is the largest organizational unit within a CloudStack™ 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).'
+ text: 'message.installWizard.copy.whatIsAZone'
});
},
whatIsAPod: function(args) {
args.response.success({
- text: 'A pod often represents a single rack. Hosts in the same pod are in the same subnet.
A pod is the second-largest organizational unit within a CloudStack™ 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'
+ text: 'message.installWizard.copy.whatIsAPod'
});
},
whatIsACluster: function(args) {
args.response.success({
- text: '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™ deployment. Clusters are contained within pods, and pods are contained within zones.
CloudStack™ allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster. '
+ text: 'message.installWizard.copy.whatIsACluster'
});
},
whatIsAHost: function(args) {
args.response.success({
- text: '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.
The host is the smallest organizational unit within a CloudStack™ deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones. '
+ text: 'message.installWizard.copy.whatIsAHost'
});
},
whatIsPrimaryStorage: function(args) {
args.response.success({
- text: 'A CloudStack™ 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.
Primary storage 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. '
+ text: 'message.installWizard.copy.whatIsPrimaryStorage'
});
},
whatIsSecondaryStorage: function(args) {
args.response.success({
- text: 'Secondary storage is associated with a zone, and it stores the following:
Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications
ISO images - OS images that can be bootable or non-bootable
Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates
').addClass('install-wizard');
var $container = args.$container;
+ var eulaHTML = args.eula;
var state = {}; // Hold wizard form state
-
var launchStart; // Holds last launch callback, in case of error
var $launchState;
@@ -27,7 +27,7 @@
cloudStack.installWizard.copy[id]({
response: {
success: function(args) {
- $elem.append(args.text);
+ $elem.append(_l(args.text));
}
}
});
@@ -79,7 +79,7 @@
var $subtitle = $('').addClass('subtitle')
.html(subtitle);
var $copy = getCopy(copyID, $(''));
- var $prev = elems.prevButton('Go back');
+ var $prev = elems.prevButton(_l('label.back'));
var $continue = elems.nextButton('OK');
$continue.click(function() {
@@ -121,9 +121,9 @@
var $container = $('').addClass(id);
var $form = $('
').addClass('setup-form');
- var $save = elems.nextButton('Continue', { type: 'submit' });
- var $prev = elems.prevButton('Go back');
- var $title = $('').addClass('title').html(title);
+ var $save = elems.nextButton(_l('label.continue'), { type: 'submit' });
+ var $prev = elems.prevButton(_l('label.back'));
+ var $title = $('').addClass('title').html(_l(title));
// Generate form
form = cloudStack.dialog.createForm({
@@ -190,8 +190,8 @@
tooltip: function(title, content) {
return $('