Updated Branches: refs/heads/master 59dea827e -> a319ac705
cloudstack 3.0 UI - VPC - check in translated labels. (Reviewed-by: Brian) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a319ac70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a319ac70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a319ac70 Branch: refs/heads/master Commit: a319ac705546b70ad5be8240f61c5b0a610e506d Parents: 59dea82 Author: Jessica Wang <[email protected]> Authored: Tue Aug 28 11:04:41 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Tue Aug 28 11:47:32 2012 -0700 ---------------------------------------------------------------------- .../WEB-INF/classes/resources/messages.properties | 14 +- .../classes/resources/messages_ja.properties | 198 +- .../classes/resources/messages_zh_CN.properties | 2984 +++++++-------- 3 files changed, 1602 insertions(+), 1594 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a319ac70/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 7ee026d..1395903 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -17,6 +17,16 @@ #new labels (begin) ********************************************************************************************** + + +#new labels (end) ************************************************************************************************ + + +#modified labels (begin) ***************************************************************************************** + + +#modified labels (end) ******************************************************************************************* + message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue? label.local.storage.enabled=Local storage enabled label.tier.details=Tier details @@ -94,10 +104,7 @@ 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) @@ -107,7 +114,6 @@ 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. message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network. -#modified labels (end) ******************************************************************************************* label.ipaddress=IP Address http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a319ac70/client/WEB-INF/classes/resources/messages_ja.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index d217e26..633171a 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -15,98 +15,105 @@ # specific language governing permissions and limitations # 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:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue? -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 + + +#new labels (end) ************************************************************************************************ + + +#modified labels (begin) ***************************************************************************************** + + +#modified labels (end) ******************************************************************************************* + +message.zoneWizard.enable.local.storage=è¦å: ãã®ã¾ã¼ã³ã®ãã¼ã«ã« ã¹ãã¬ã¼ã¸ãæå¹ã«ããå ´åã¯ãã·ã¹ãã VM ã®èµ·åå ´æã«å¿ãã¦æ¬¡ã®æä½ãå¿ è¦ã§ãã<br/><br/>1. ã·ã¹ãã VM ããã©ã¤ã㪠ã¹ãã¬ã¼ã¸ã§èµ·åããå¿ è¦ãããå ´åã¯ããã©ã¤ã㪠ã¹ãã¬ã¼ã¸ãä½æããå¾ã§ã¾ã¼ã³ã«è¿½å ããå¿ è¦ãããã¾ããã¾ããç¡å¹ç¶æ ã®ã¾ã¼ã³ãèµ·åããå¿ è¦ãããã¾ãã<br/><br/>2. ã·ã¹ãã VM ããã¼ã«ã« ã¹ãã¬ã¼ã¸ã§èµ·åããå¿ è¦ãããå ´åã¯ãsystem.vm.use.local.storage ã true ã«è¨å®ãã¦ããã¾ã¼ã³ãæå¹ã«ããå¿ è¦ãããã¾ãã<br/><br/><br/>ç¶è¡ãã¦ãããããã§ãã? +label.local.storage.enabled=ãã¼ã«ã« ã¹ãã¬ã¼ã¸ã¯æå¹ã§ã +label.tier.details=é層ã®è©³ç´° +label.edit.tags=ã¿ã°ã®ç·¨é +label.network.rate.megabytes=ãããã¯ã¼ã¯é度 (MB/ç§) +label.action.enable.physical.network=ç©çãããã¯ã¼ã¯ã®æå¹å +label.action.disable.physical.network=ç©çãããã¯ã¼ã¯ã®ç¡å¹å +message.action.enable.physical.network=ãã®ç©çãããã¯ã¼ã¯ãæå¹ã«ãã¦ãããããã§ãã? +message.action.disable.physical.network=ãã®ç©çãããã¯ã¼ã¯ãç¡å¹ã«ãã¦ãããããã§ãã? + +label.select.tier=é層ã®é¸æ +label.add.ACL=ACL ã®è¿½å +label.remove.ACL=ACL ã®åé¤ +label.tier=é層 +label.network.ACL=ãããã¯ã¼ã¯ ACL +label.network.ACL.total=ãããã¯ã¼ã¯ ACL åè¨ +label.add.new.gateway=æ°ããã²ã¼ãã¦ã§ã¤ã®è¿½å +message.add.new.gateway.to.vpc=ãã® VPC ã«æ°ããã²ã¼ãã¦ã§ã¤ã追å ããããã®æ å ±ãæå®ãã¦ãã ããã +label.delete.gateway=ã²ã¼ãã¦ã§ã¤ã®åé¤ +message.delete.gateway=ãã®ã²ã¼ãã¦ã§ã¤ãåé¤ãã¦ãããããã§ãã? +label.CIDR.of.destination.network=å®å ãããã¯ã¼ã¯ã® CIDR +label.add.route=ã«ã¼ãã®è¿½å +label.add.static.route=éçã«ã¼ãã®è¿½å +label.remove.static.route=éçã«ã¼ãã®åé¤ +label.site.to.site.VPN=ãµã¤ãé VPN +label.add.VPN.gateway=VPN ã²ã¼ãã¦ã§ã¤ã®è¿½å +message.add.VPN.gateway=VPN ã²ã¼ãã¦ã§ã¤ã追å ãã¦ãããããã§ãã? +label.VPN.gateway=VPN ã²ã¼ãã¦ã§ã¤ +label.delete.VPN.gateway=VPN ã²ã¼ãã¦ã§ã¤ã®åé¤ +message.delete.VPN.gateway=ãã® VPN ã²ã¼ãã¦ã§ã¤ãåé¤ãã¦ãããããã§ãã? +label.VPN.connection=VPN æ¥ç¶ +label.IPsec.preshared.key=IPsec äºåå ±æãã¼ +label.IKE.policy=IKE ããªã·ã¼ +label.ESP.policy=ESP ããªã·ã¼ +label.create.VPN.connection=VPN æ¥ç¶ã®ä½æ +label.VPN.customer.gateway=VPN ã«ã¹ã¿ãã¼ ã²ã¼ãã¦ã§ã¤ +label.CIDR.list=CIDR ä¸è¦§ +label.IKE.lifetime=IKE æå¹æé (ç§) +label.ESP.lifetime=ESP æå¹æé (ç§) +label.dead.peer.detection=åæ¢ãã¢ã®æ¤åº +label.reset.VPN.connection=VPN æ¥ç¶ã®ãªã»ãã +message.reset.VPN.connection=VPN æ¥ç¶ããªã»ãããã¦ãããããã§ãã? +label.delete.VPN.connection=VPN æ¥ç¶ã®åé¤ +message.delete.VPN.connection=VPN æ¥ç¶ãåé¤ãã¦ãããããã§ãã? +label.add.new.tier=æ°ããé層ã®è¿½å +label.add.VM.to.tier=é層ã¸ã® VM ã®è¿½å +label.remove.tier=é層ã®åé¤ + +label.local.storage.enabled=ãã¼ã«ã« ã¹ãã¬ã¼ã¸ã¯æå¹ã§ã +label.associated.network=é¢é£ã¥ãããããããã¯ã¼ã¯ +label.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.tier=é層 +label.add.vpc=VPC ã®è¿½å +label.super.cidr.for.guest.networks=ã²ã¹ã ãããã¯ã¼ã¯ã®ã¹ã¼ãã¼ CIDR +label.DNS.domain.for.guest.networks=ã²ã¹ã ãããã¯ã¼ã¯ã® DNS ãã¡ã¤ã³ +label.configure.vpc=VPC ã®æ§æ +label.edit.vpc=VPC ã®ç·¨é +label.restart.vpc=VPC ã®åèµ·å +message.restart.vpc=VPC ãåèµ·åãã¦ãããããã§ãã? +label.remove.vpc=VPC ã®åé¤ +message.remove.vpc=VPC ãåé¤ãã¦ãããããã§ãã? +label.vpn.customer.gateway=VPN ã«ã¹ã¿ãã¼ ã²ã¼ãã¦ã§ã¤ +label.add.vpn.customer.gateway=VPN ã«ã¹ã¿ãã¼ ã²ã¼ãã¦ã§ã¤ã®è¿½å +label.IKE.encryption=IKE æå·å +label.IKE.hash=IKE ããã·ã¥ label.IKE.DH=IKE DH -label.ESP.encryption=ESP Encryption -label.ESP.hash=ESP Hash +label.ESP.encryption=ESP æå·å +label.ESP.hash=ESP ããã·ã¥ 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) ************************************************************************************************ +label.IKE.lifetime=IKE æå¹æé (ç§) +label.ESP.lifetime=ESP æå¹æé (ç§) +label.dead.peer.detection=åæ¢ãã¢ã®æ¤åº +label.delete.VPN.customer.gateway=VPN ã«ã¹ã¿ãã¼ ã²ã¼ãã¦ã§ã¤ã®åé¤ +message.delete.VPN.customer.gateway=ãã® VPN ã«ã¹ã¿ãã¼ ã²ã¼ãã¦ã§ã¤ãåé¤ãã¦ãããããã§ãã? +label.network.domain.text=ãããã¯ã¼ã¯ ãã¡ã¤ã³ +label.memory.mb=ã¡ã¢ãª (MB) +label.cpu.mhz=CPU (MHz) +message.action.remove.host=ãã®ãã¹ããåé¤ãã¦ãããããã§ãã? -#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. -message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network. -#modified labels (end) ******************************************************************************************* +message.action.reboot.router=ãã®ä»®æ³ã«ã¼ã¿ã¼ã§æä¾ãããã¹ã¦ã®ãµã¼ãã¹ãä¸æããã¾ãããã®ã«ã¼ã¿ã¼ãåèµ·åãã¦ãããããã§ãã? +message.action.stop.router=ãã®ä»®æ³ã«ã¼ã¿ã¼ã§æä¾ãããã¹ã¦ã®ãµã¼ãã¹ãä¸æããã¾ãããã®ã«ã¼ã¿ã¼ãåæ¢ãã¦ãããããã§ãã? +message.restart.network=ãã®ãããã¯ã¼ã¯ã§æä¾ãããã¹ã¦ã®ãµã¼ãã¹ãä¸æããã¾ãããã®ãããã¯ã¼ã¯ãåèµ·åãã¦ãããããã§ãã? label.ipaddress=IP ã¢ãã¬ã¹ @@ -115,14 +122,14 @@ label.vcipaddress=vCenter IP ã¢ãã¬ã¹ label.vsmctrlvlanid=ã³ã³ããã¼ã« VLAN ID label.vsmpktvlanid=ãã±ãã VLAN ID label.vsmstoragevlanid=ã¹ãã¬ã¼ã¸ VLAN ID -label.nexusVswitch=Nexus vSwitch -label.action.delete.nexusVswitch=Nexus vSwitch ã®åé¤ -label.action.enable.nexusVswitch=Nexus vSwitch ã®æå¹å -label.action.disable.nexusVswitch=Nexus vSwitch ã®ç¡å¹å -label.action.list.nexusVswitch=Nexus vSwitch ã®ä¸è¦§è¡¨ç¤º -message.action.delete.nexusVswitch=ãã® Nexus vSwitch ãåé¤ãã¦ãããããã§ãã? -message.action.enable.nexusVswitch=ãã® Nexus vSwitch ãæå¹ã«ãã¦ãããããã§ãã? -message.action.disable.nexusVswitch=ãã® Nexus vSwitch ãç¡å¹ã«ãã¦ãããããã§ãã? +label.nexusVswitch=Nexus 1000V +label.action.delete.nexusVswitch=Nexus 1000V ã®åé¤ +label.action.enable.nexusVswitch=Nexus 1000V ã®æå¹å +label.action.disable.nexusVswitch=Nexus 1000V ã®ç¡å¹å +label.action.list.nexusVswitch=Nexus 1000V ã®ä¸è¦§è¡¨ç¤º +message.action.delete.nexusVswitch=ãã® Nexus 1000V ãåé¤ãã¦ãããããã§ãã? +message.action.enable.nexusVswitch=ãã® Nexus 1000V ãæå¹ã«ãã¦ãããããã§ãã? +message.action.disable.nexusVswitch=ãã® Nexus 1000V ãç¡å¹ã«ãã¦ãããããã§ãã? message.specify.url=URL ãæå®ãã¦ãã ãã label.select.instance.to.attach.volume.to=ããªã¥ã¼ã ãã¢ã¿ããããã¤ã³ã¹ã¿ã³ã¹ãé¸æãã¦ãã ãã label.upload=ã¢ãããã¼ã @@ -136,7 +143,7 @@ label.action.register.iso=ISO ã®ç»é² label.isolation.method=åé¢æ¹æ³ label.action.register.template=ãã³ãã¬ã¼ãã®ç»é² label.checksum=MD5 ãã§ãã¯ãµã -label.cpu=CPU +label.vpn=VPN label.vlan=VLAN @@ -342,6 +349,7 @@ label.viewing=表示é ç®: label.move.to.top=æä¸ä½ã«ç§»å label.move.up.row=1 è¡ä¸ã«ç§»å label.move.down.row=1 è¡ä¸ã«ç§»å +label.move.to.bottom=æä¸ä½ã«ç§»å label.drag.new.position=æ°ããä½ç½®ã«ãã©ãã° label.order=é åº label.no.data=表示ãããã¼ã¿ãããã¾ãã @@ -393,7 +401,6 @@ label.stickiness=æç¶æ§ label.source=éä¿¡å label.least.connections=æå°æ¥ç¶ label.round.robin=ã©ã¦ã³ãããã³ -label.network.domain.text=ãããã¯ã¼ã¯ ãã¡ã¤ã³ ããã¹ã label.restart.required=åèµ·åãå¿ è¦ label.clean.up=ã¯ãªã¼ã³ ã¢ãã label.restart.network=ãããã¯ã¼ã¯ã®åèµ·å @@ -999,8 +1006,8 @@ label.code=ã³ã¼ã label.confirmation=ç¢ºèª label.cpu.allocated.for.VMs=VM ã«å²ãå½ã¦æ¸ã¿ã® CPU label.cpu.allocated=å²ãå½ã¦æ¸ã¿ã® CPU -label.cpu.mhz=CPU label.cpu.utilized=CPU 使ç¨ç +label.cpu=CPU label.created=ä½ææ¥æ label.cross.zones=ã¯ãã¹ ã¾ã¼ã³ label.custom.disk.size=ã«ã¹ã¿ã ãã£ã¹ã¯ ãµã¤ãº @@ -1118,7 +1125,6 @@ label.lun=LUN label.manage=管ç label.maximum=æ大 label.memory.allocated=å²ãå½ã¦æ¸ã¿ã®ã¡ã¢ãª -label.memory.mb=ã¡ã¢ãª label.memory.total=ã¡ã¢ãªåè¨ label.memory.used=ã¡ã¢ãªä½¿ç¨é label.memory=ã¡ã¢ãª @@ -1355,7 +1361,6 @@ label.volume.limits=ããªã¥ã¼ã å¶é label.volume.name=ããªã¥ã¼ã å label.volume=ããªã¥ã¼ã label.volumes=ããªã¥ã¼ã -label.vpn=VPN label.vsphere.managed=vSphere ã«ãã管ç label.waiting=å¾ æ©ãã¦ãã¾ã label.warn=è¦å @@ -1406,7 +1411,6 @@ message.action.primarystorage.enable.maintenance.mode=è¦å: ãã©ã¤ã㪠message.action.reboot.instance=ãã®ã¤ã³ã¹ã¿ã³ã¹ãåèµ·åãã¦ãããããã§ãã? message.action.reboot.systemvm=ãã®ã·ã¹ãã VM ãåèµ·åãã¦ãããããã§ãã? message.action.release.ip=ãã® IP ã¢ãã¬ã¹ã解æ¾ãã¦ãããããã§ãã? -message.action.remove.host=ã¯ã©ã¹ã¿ã¼å ã«æå¾ã¾ã§æ®ã£ãå¯ä¸ã®ãã¹ããåé¤ãã¦åã¤ã³ã¹ãã¼ã«ããã¨ããã¹ãä¸ã®ä½æ¥ç°å¢ããã³ãã¼ã¿ãã¼ã¹ãç ´æ£ãããVM ã²ã¹ãã使ç¨ã§ããªããªãã¾ãã message.action.restore.instance=ãã®ã¤ã³ã¹ã¿ã³ã¹ã復å ãã¦ãããããã§ãã? message.action.start.instance=ãã®ã¤ã³ã¹ã¿ã³ã¹ãèµ·åãã¦ãããããã§ãã? message.action.start.router=ãã®ã«ã¼ã¿ã¼ãèµ·åãã¦ãããããã§ãã?
