From caae9f7e043cebca510a8b4bd7d287014e7c07ce Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 24 Aug 2012 11:58:16 -0700 Subject: [PATCH 1/4] cloudstack 3.0 UI - VPC feature - localize VPC labels in messages.properties for network.js (Reviewed-by: Brian) --- .../classes/resources/messages.properties | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 899e3c0fe60..7ee026d186c 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -63,6 +63,37 @@ message.delete.VPN.connection=Please confirm that you want to delete VPN connect label.add.new.tier=Add new tier label.add.VM.to.tier=Add VM to tier label.remove.tier=Remove tier + +label.local.storage.enabled=Local Storage Enabled +label.associated.network=Associated Network +label.add.port.forwarding.rule=Add port forwarding rule +label.dns=DNS + +label.vpc=VPC +label.vpc.id=VPC ID +label.tier=Tier +label.add.vpc=Add VPC +label.super.cidr.for.guest.networks=Super CIDR for Guest Networks +label.DNS.domain.for.guest.networks=DNS domain for Guest Networks +label.configure.vpc=Configure VPC +label.edit.vpc=Edit VPC +label.restart.vpc=restart VPC +message.restart.vpc=Please confirm that you want to restart the VPC +label.remove.vpc=remove VPC +message.remove.vpc=Please confirm that you want to remove the VPC +label.vpn.customer.gateway=VPN Customer Gateway +label.add.vpn.customer.gateway=Add VPN Customer Gateway +label.IKE.encryption=IKE Encryption +label.IKE.hash=IKE Hash +label.IKE.DH=IKE DH +label.ESP.encryption=ESP Encryption +label.ESP.hash=ESP Hash +label.perfect.forward.secrecy=Perfect Forward Secrecy +label.IKE.lifetime=IKE lifetime (second) +label.ESP.lifetime=ESP Lifetime (second) +label.dead.peer.detection=Dead Peer Detection +label.delete.VPN.customer.gateway=delete VPN Customer Gateway +message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway #new labels (end) ************************************************************************************************ From de85e211c3f7a79690360189425a5bb3e904008d Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 24 Aug 2012 11:58:38 -0700 Subject: [PATCH 2/4] cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_zh_CN.properties for network.js (Reviewed-by: Brian) --- .../resources/messages_zh_CN.properties | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 54f079c1bb2..e7d049a26a3 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -16,12 +16,92 @@ # under the License. #new labels (begin) ********************************************************************************************** +message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:

1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.

2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.


Would you like to continue? +label.local.storage.enabled=Local storage enabled +label.tier.details=Tier details +label.edit.tags=Edit tags +label.network.rate.megabytes=Network Rate (MB/s) +label.action.enable.physical.network=Enable physical network +label.action.disable.physical.network=Disable physical network +message.action.enable.physical.network=Please confirm that you want to enable this physical network. +message.action.disable.physical.network=Please confirm that you want to disable this physical network. +label.select.tier=Select Tier +label.add.ACL=Add ACL +label.remove.ACL=Remove ACL +label.tier=Tier +label.network.ACL=Network ACL +label.network.ACL.total=Network ACL Total +label.add.new.gateway=Add new gateway +message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC. +label.delete.gateway=delete gateway +message.delete.gateway=Please confirm you want to delete the gateway +label.CIDR.of.destination.network=CIDR of destination network +label.add.route=Add route +label.add.static.route=Add static route +label.remove.static.route=Remove static route +label.site.to.site.VPN=site-to-site VPN +label.add.VPN.gateway=Add VPN Gateway +message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway +label.VPN.gateway=VPN Gateway +label.delete.VPN.gateway=delete VPN Gateway +message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gateway +label.VPN.connection=VPN Connection +label.IPsec.preshared.key=IPsec Preshared-Key +label.IKE.policy=IKE policy +label.ESP.policy=ESP policy +label.create.VPN.connection=Create VPN Connection +label.VPN.customer.gateway=VPN Customer Gateway +label.CIDR.list=CIDR list +label.IKE.lifetime=IKE Lifetime (second) +label.ESP.lifetime=ESP Lifetime(second) +label.dead.peer.detection=Dead Peer Detection +label.reset.VPN.connection=Reset VPN connection +message.reset.VPN.connection=Please confirm that you want to reset VPN connection +label.delete.VPN.connection=delete VPN connection +message.delete.VPN.connection=Please confirm that you want to delete VPN connection +label.add.new.tier=Add new tier +label.add.VM.to.tier=Add VM to tier +label.remove.tier=Remove tier +label.local.storage.enabled=Local Storage Enabled +label.associated.network=Associated Network +label.add.port.forwarding.rule=Add port forwarding rule +label.dns=DNS + +label.vpc=VPC +label.vpc.id=VPC ID +label.tier=Tier +label.add.vpc=Add VPC +label.super.cidr.for.guest.networks=Super CIDR for Guest Networks +label.DNS.domain.for.guest.networks=DNS domain for Guest Networks +label.configure.vpc=Configure VPC +label.edit.vpc=Edit VPC +label.restart.vpc=restart VPC +message.restart.vpc=Please confirm that you want to restart the VPC +label.remove.vpc=remove VPC +message.remove.vpc=Please confirm that you want to remove the VPC +label.vpn.customer.gateway=VPN Customer Gateway +label.add.vpn.customer.gateway=Add VPN Customer Gateway +label.IKE.encryption=IKE Encryption +label.IKE.hash=IKE Hash +label.IKE.DH=IKE DH +label.ESP.encryption=ESP Encryption +label.ESP.hash=ESP Hash +label.perfect.forward.secrecy=Perfect Forward Secrecy +label.IKE.lifetime=IKE lifetime (second) +label.ESP.lifetime=ESP Lifetime (second) +label.dead.peer.detection=Dead Peer Detection +label.delete.VPN.customer.gateway=delete VPN Customer Gateway +message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway #new labels (end) ************************************************************************************************ #modified labels (begin) ***************************************************************************************** +label.network.domain.text=Network domain +label.memory.mb=Memory (in MB) +label.cpu.mhz=CPU (in MHz) +message.action.remove.host=Please confirm that you want to remove this host. message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router. message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router. From 6807da63bb9db3f3153ee95e1fe22853b0dc0c64 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 24 Aug 2012 11:58:55 -0700 Subject: [PATCH 3/4] cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_ja.properties for network.js (Reviewed-by: Brian) --- .../classes/resources/messages_ja.properties | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index c7de4ec4866..d217e266696 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -16,12 +16,92 @@ # under the License. #new labels (begin) ********************************************************************************************** +message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:

1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.

2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.


Would you like to continue? +label.local.storage.enabled=Local storage enabled +label.tier.details=Tier details +label.edit.tags=Edit tags +label.network.rate.megabytes=Network Rate (MB/s) +label.action.enable.physical.network=Enable physical network +label.action.disable.physical.network=Disable physical network +message.action.enable.physical.network=Please confirm that you want to enable this physical network. +message.action.disable.physical.network=Please confirm that you want to disable this physical network. +label.select.tier=Select Tier +label.add.ACL=Add ACL +label.remove.ACL=Remove ACL +label.tier=Tier +label.network.ACL=Network ACL +label.network.ACL.total=Network ACL Total +label.add.new.gateway=Add new gateway +message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC. +label.delete.gateway=delete gateway +message.delete.gateway=Please confirm you want to delete the gateway +label.CIDR.of.destination.network=CIDR of destination network +label.add.route=Add route +label.add.static.route=Add static route +label.remove.static.route=Remove static route +label.site.to.site.VPN=site-to-site VPN +label.add.VPN.gateway=Add VPN Gateway +message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway +label.VPN.gateway=VPN Gateway +label.delete.VPN.gateway=delete VPN Gateway +message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gateway +label.VPN.connection=VPN Connection +label.IPsec.preshared.key=IPsec Preshared-Key +label.IKE.policy=IKE policy +label.ESP.policy=ESP policy +label.create.VPN.connection=Create VPN Connection +label.VPN.customer.gateway=VPN Customer Gateway +label.CIDR.list=CIDR list +label.IKE.lifetime=IKE Lifetime (second) +label.ESP.lifetime=ESP Lifetime(second) +label.dead.peer.detection=Dead Peer Detection +label.reset.VPN.connection=Reset VPN connection +message.reset.VPN.connection=Please confirm that you want to reset VPN connection +label.delete.VPN.connection=delete VPN connection +message.delete.VPN.connection=Please confirm that you want to delete VPN connection +label.add.new.tier=Add new tier +label.add.VM.to.tier=Add VM to tier +label.remove.tier=Remove tier +label.local.storage.enabled=Local Storage Enabled +label.associated.network=Associated Network +label.add.port.forwarding.rule=Add port forwarding rule +label.dns=DNS + +label.vpc=VPC +label.vpc.id=VPC ID +label.tier=Tier +label.add.vpc=Add VPC +label.super.cidr.for.guest.networks=Super CIDR for Guest Networks +label.DNS.domain.for.guest.networks=DNS domain for Guest Networks +label.configure.vpc=Configure VPC +label.edit.vpc=Edit VPC +label.restart.vpc=restart VPC +message.restart.vpc=Please confirm that you want to restart the VPC +label.remove.vpc=remove VPC +message.remove.vpc=Please confirm that you want to remove the VPC +label.vpn.customer.gateway=VPN Customer Gateway +label.add.vpn.customer.gateway=Add VPN Customer Gateway +label.IKE.encryption=IKE Encryption +label.IKE.hash=IKE Hash +label.IKE.DH=IKE DH +label.ESP.encryption=ESP Encryption +label.ESP.hash=ESP Hash +label.perfect.forward.secrecy=Perfect Forward Secrecy +label.IKE.lifetime=IKE lifetime (second) +label.ESP.lifetime=ESP Lifetime (second) +label.dead.peer.detection=Dead Peer Detection +label.delete.VPN.customer.gateway=delete VPN Customer Gateway +message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway #new labels (end) ************************************************************************************************ #modified labels (begin) ***************************************************************************************** +label.network.domain.text=Network domain +label.memory.mb=Memory (in MB) +label.cpu.mhz=CPU (in MHz) +message.action.remove.host=Please confirm that you want to remove this host. message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router. message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router. From 57f0f20dca460e37a4ce395d4ba0d84e221d0f81 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 24 Aug 2012 11:59:12 -0700 Subject: [PATCH 4/4] cloudstack 3.0 UI - VPC feature - add VPC localization labels for network.js in dictionary.jsp (Reviewed-by: Brian) --- ui/dictionary.jsp | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index fffd4617ac6..e4c7ca3e11c 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -1350,6 +1350,35 @@ dictionary = { 'message.delete.VPN.connection': '', 'label.add.new.tier': '', 'label.add.VM.to.tier': '', -'label.remove.tier': '' +'label.remove.tier': '', +'label.local.storage.enabled=Local Storage Enabled': '', +'label.associated.network': '', +'label.add.port.forwarding.rule': '', +'label.dns': '', +'label.vpc': '', +'label.vpc.id': '', +'label.tier': '', +'label.add.vpc': '', +'label.super.cidr.for.guest.networks': '', +'label.DNS.domain.for.guest.networks': '', +'label.configure.vpc': '', +'label.edit.vpc': '', +'label.restart.vpc': '', +'message.restart.vpc': '', +'label.remove.vpc': '', +'message.remove.vpc': '', +'label.vpn.customer.gateway': '', +'label.add.vpn.customer.gateway': '', +'label.IKE.encryption': '', +'label.IKE.hash': '', +'label.IKE.DH': '', +'label.ESP.encryption': '', +'label.ESP.hash': '', +'label.perfect.forward.secrecy': '', +'label.IKE.lifetime': '', +'label.ESP.lifetime': '', +'label.dead.peer.detection': '', +'label.delete.VPN.customer.gateway': '', +'message.delete.VPN.customer.gateway': '' };