You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/02/14 16:50:59 UTC
[1/2] Fixed-Hardcoding-Issues
Updated Branches:
refs/heads/master db91e54bf -> e171cb181
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 242fa80..8159124 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -584,15 +584,15 @@
isEditable: true
},
ovmnetworklabel: {
- label: 'OVM traffic label',
+ label: 'label.ovm.traffic.label',
isEditable: true
},
lxcnetworklabel: {
- label: 'LXC Traffic Label',
+ label: 'label.lxc.traffic.label',
isEditable: true
},
hypervnetworklabel: {
- label: 'HyperV Traffic Label',
+ label: 'label.hyperv.traffic.label',
isEditable: true
}
}],
@@ -16061,16 +16061,16 @@
},
actions: {
add: {
- label: 'Add UCS Manager',
+ label: 'label.add.ucs.manager',
messages: {
notification: function (args) {
- return 'Add UCS Manager';
+ return 'label.add.ucs.manager';
}
},
createForm: {
- title: 'Add UCS Manager',
+ title: 'label.add.ucs.manager',
fields: {
name: {
label: 'label.name',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 8c63ce2..716c615 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -63,10 +63,10 @@
advSearchFields: {
name: {
- label: 'Name'
+ label: 'label.name'
},
zoneid: {
- label: 'Zone',
+ label: 'label.zone',
select: function(args) {
$.ajax({
url: createURL('listZones'),
@@ -706,14 +706,14 @@
//do nothing
} else if (result.jobstatus == 2) {
cloudStack.dialog.notice({
- message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + _s(result.jobresult.errortext)
+ message: "message.XSTools61plus.update.failed" + " " + _s(result.jobresult.errortext)
});
}
}
},
error: function(XMLHttpResponse) {
cloudStack.dialog.notice({
- message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + parseXMLHttpResponse(XMLHttpResponse)
+ message: "message.XSTools61plus.update.failed" + " " + parseXMLHttpResponse(XMLHttpResponse)
});
}
});
@@ -749,10 +749,10 @@
label: 'label.action.copy.template',
messages: {
confirm: function(args) {
- return 'Are you sure you want to copy template?';
+ return 'message.copy.template.confirm';
},
success: function(args) {
- return 'Template is being copied.';
+ return 'message.template.copying';
},
notification: function(args) {
return 'label.action.copy.template';
@@ -837,7 +837,7 @@
return 'message.action.download.template';
},
notification: function(args) {
- return 'Downloading template';
+ return 'message.action.downloading.template';
},
complete: function(args) {
var url = args.url;
@@ -940,7 +940,7 @@
}
}, {
id: {
- label: 'ID'
+ label: 'label.id'
},
zonename: {
label: 'label.zone.name'
@@ -1350,10 +1350,10 @@
advSearchFields: {
name: {
- label: 'Name'
+ label: 'label.name'
},
zoneid: {
- label: 'Zone',
+ label: 'label.zone',
select: function(args) {
$.ajax({
url: createURL('listZones'),
@@ -1376,10 +1376,10 @@
}
},
tagKey: {
- label: 'Tag Key'
+ label: 'label.tag.key'
},
tagValue: {
- label: 'Tag Value'
+ label: 'label.tag.value'
}
},
[2/2] git commit: updated refs/heads/master to e171cb1
Posted by bf...@apache.org.
Fixed-Hardcoding-Issues
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e171cb18
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e171cb18
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e171cb18
Branch: refs/heads/master
Commit: e171cb181c150ebdb140ffca575aad8c1b294fee
Parents: db91e54
Author: vetrivelc <ve...@citrix.com>
Authored: Thu Feb 6 18:41:52 2014 +0530
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Feb 14 07:44:54 2014 -0800
----------------------------------------------------------------------
.../classes/resources/messages.properties | 91 +++++++++++++
.../classes/resources/messages_ja_JP.properties | 133 +++++++++++++++++--
.../classes/resources/messages_zh_CN.properties | 127 +++++++++++++++++-
ui/dictionary.jsp | 87 +++++++++++-
ui/lib/jquery.validate.js | 34 ++---
ui/scripts/accounts.js | 2 +-
ui/scripts/autoscaler.js | 26 ++--
ui/scripts/domains.js | 2 +-
ui/scripts/installWizard.js | 4 +-
ui/scripts/instances.js | 71 +++++-----
ui/scripts/regions.js | 78 +++++------
ui/scripts/system.js | 12 +-
ui/scripts/templates.js | 24 ++--
13 files changed, 545 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/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 f1c166b..bd4a27d 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1269,11 +1269,65 @@ label.zoneWizard.trafficType.management=Management\: Traffic between CloudStack\
label.zoneWizard.trafficType.public=Public\: Traffic between the internet and virtual machines in the cloud.
label.zoneWizard.trafficType.storage=Storage\: Traffic between primary and secondary storage servers, such as VM templates and snapshots
label.ldap.group.name=LDAP Group
+label.password.reset.confirm=Password has been reset to
+label.provider=Provider
+label.resetVM=Reset VM
label.openDaylight=OpenDaylight
+label.assign.instance.another=Assign Instance to Another Account
+label.network.addVM=Add network to VM
+label.set.default.NIC=Set default NIC
+label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1\+
+label.dynamically.scalable=Dynamically Scalable
+label.instance.scaled.up=Instance Scaled Up
+label.tag.key=Tag Key
+label.tag.value=Tag Value
+label.ipv6.address=IPv6 IP Address
+label.ipv6.gateway=IPv6 Gateway
+label.ipv6.CIDR=IPv6 CIDR
+label.VPC.limits=VPC limits
+label.edit.region=Edit Region
+label.gslb.domain.name=GSLB Domain Name
+label.add.gslb=Add GSLB
+label.gslb.servicetype=Service Type
+label.gslb.details=GSLB details
+label.gslb.delete=delete GSLB
label.opendaylight.controllers=OpenDaylight Controllers
+label.portable.ip.ranges=Portable IP Ranges
+label.add.portable.ip.range=Add Portable IP Range
+label.delete.portable.ip.range=Delete Portable IP Range
label.opendaylight.controllerdetail=OpenDaylight Controller Details
+label.portable.ip.range.details=Portable IP Range details
+label.portable.ips=Portable IPs
+label.gslb.assigned.lb=assigned load balancing
+label.gslb.assigned.lb.more=assign more load balancing
+label.gslb.lb.rule=load balancing rule
+label.gslb.lb.details=load balancing details
+label.gslb.lb.remove=remove load balancing from this GSLB
+label.enable.autoscale=Enable Autoscale
+label.disable.autoscale=Disable Autoscale
+label.min.instances=Min Instances
+label.max.instances=Max Instances
label.add.OpenDaylight.device=Add OpenDaylight Controller
+label.show.advanced.settings=Show advanced settings
label.delete.OpenDaylight.device=Delete OpenDaylight Controller
+label.polling.interval.sec=Polling Interval (in sec)
+label.quiet.time.sec=Quiet Time (in sec)
+label.destroy.vm.graceperiod=Destroy VM Grace Period
+label.SNMP.community=SNMP Community
+label.SNMP.port=SNMP Port
+label.add.ucs.manager=Add UCS Manager
+label.ovm.traffic.label=OVM traffic label
+label.lxc.traffic.label=LXC Traffic Label
+label.hyperv.traffic.label=HyperV Traffic Label
+label.port=Port
+label.remove.ldap=Remove LDAP
+label.configure.ldap=Configure LDAP
+label.ldap.configuration=LDAP Configuration
+label.ldap.port=LDAP port
+label.create.nfs.secondary.staging.store=Create NFS secondary staging store
+label.volatile=Volatile
+label.planner.mode=Planner mode
+label.deployment.planner=Deployment planner
managed.state=Managed State
message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC.
message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
@@ -1587,6 +1641,43 @@ message.zone.step.1.desc=Please select a network model for your zone.
message.zone.step.2.desc=Please enter the following info to add a new zone
message.zone.step.3.desc=Please enter the following info to add a new pod
message.zoneWizard.enable.local.storage=WARNING\: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch\:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
+message.validate.fieldrequired=This field is required.
+message.validate.fixfield=Please fix this field.
+message.validate.email.address=Please enter a valid email address.
+message.validate.URL=Please enter a valid URL.
+message.validate.date=Please enter a valid date.
+message.validate.date.ISO=Please enter a valid date (ISO).
+message.validate.number=Please enter a valid number.
+message.validate.digits=Please enter only digits.
+message.validate.creditcard=Please enter a valid credit card number.
+message.validate.equalto=Please enter the same value again.
+message.validate.accept=Please enter a value with a valid extension.
+message.validate.maxlength=Please enter no more than {0} characters.
+message.validate.minlength=Please enter at least {0} characters.
+message.validate.range.length=Please enter a value between {0} and {1} characters long.
+message.validate.range=Please enter a value between {0} and {1}.
+message.validate.max=Please enter a value less than or equal to {0}.
+messgae.validate.min=Please enter a value greater than or equal to {0}.
+message.creating.systemVM=Creating system VMs (this may take a while)
+message.enabling.zone.dots=Enabling zone...
+message.restoreVM=Do you want to restore the VM ?
+message.no.host.available=No Hosts are available for Migration
+message.network.addVM.desc=Please specify the network that you would like to add this VM to. A new NIC will be added for this network.
+message.network.addVMNIC=Please confirm that you would like to add a new VM NIC for this network.
+message.set.default.NIC=Please confirm that you would like to make this NIC the default for this VM.
+message.set.default.NIC.manual=Please manually update the default NIC on the VM now.
+message.instance.scaled.up.confirm=Do you really want to scale Up your instance ?
+message.copy.template.confirm=Are you sure you want to copy template?
+message.template.copying=Template is being copied.
+message.XSTools61plus.update.failed=Failed to update XenServer Tools Version 6.1\+ field. Error\:
+message.gslb.delete.confirm=Please confirm you want to delete this GSLB
+message.portable.ip.delete.confirm=Please confirm you want to delete Portable IP Range
+message.gslb.lb.remove.confirm=Please confirm you want to remove load balancing from GSLB
+message.admin.guide.read=For VMware-based VMs, please read the dynamic scaling section in the admin guide before scaling. Would you like to continue?\,
+message.tier.required=Tier is required
+message.remove.ldap=Are you sure you want to delete the LDAP configuration?
+message.action.downloading.template=Downloading template.
+message.configure.ldap=Please confirm you would like to configure LDAP.
mode=Mode
network.rate=Network Rate
notification.reboot.instance=Reboot instance
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/client/WEB-INF/classes/resources/messages_ja_JP.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties
index 4232449..7dd5bd1 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -14,9 +14,24 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+label.port=\u30dd\u30fc\u30c8
+label.remove.ldap=LDAP \u306e\u524a\u9664
+message.remove.ldap=LDAP \u69cb\u6210\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+label.configure.ldap=LDAP \u306e\u69cb\u6210
+message.configure.ldap=LDAP \u3092\u69cb\u6210\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+label.ldap.configuration=LDAP \u69cb\u6210
+label.ldap.port=LDAP \u30dd\u30fc\u30c8
+label.create.nfs.secondary.staging.store=NFS \u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0 \u30b9\u30c8\u30a2\u3092\u4f5c\u6210\u3059\u308b
+label.volatile=\u63ee\u767a\u6027
+label.planner.mode=\u30d7\u30e9\u30f3\u30ca\u30fc \u30e2\u30fc\u30c9
+label.deployment.planner=\u5c55\u958b\u30d7\u30e9\u30f3\u30ca\u30fc
+label.quiesce.vm=VM \u3092\u4f11\u6b62\u3059\u308b
+label.smb.username=SMB \u30e6\u30fc\u30b6\u30fc\u540d
+label.smb.password=SMB \u30d1\u30b9\u30ef\u30fc\u30c9
+label.smb.domain=SMB \u30c9\u30e1\u30a4\u30f3
label.hypervisors=\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc
label.home=\u30db\u30fc\u30e0
-label.sockets=\u30bd\u30b1\u30c3\u30c8
+label.sockets=CPU Sockets
label.root.disk.size=\u30eb\u30fc\u30c8 \u30c7\u30a3\u30b9\u30af \u30b5\u30a4\u30ba
label.s3.nfs.server=S3 NFS \u30b5\u30fc\u30d0\u30fc
label.s3.nfs.path=S3 NFS \u30d1\u30b9
@@ -50,7 +65,7 @@ message.action.delete.nic=\u3053\u306e NIC \u3092\u524a\u9664\u3057\u3066\u3082\
changed.item.properties=\u9805\u76ee\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5909\u66f4
confirm.enable.s3=S3 \u30d9\u30fc\u30b9\u306e\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u6709\u52b9\u306b\u3059\u308b\u306b\u306f\u3001\u6b21\u306e\u60c5\u5831\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
confirm.enable.swift=Swift \u306e\u30b5\u30dd\u30fc\u30c8\u3092\u6709\u52b9\u306b\u3059\u308b\u306b\u306f\u3001\u6b21\u306e\u60c5\u5831\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-error.could.not.change.your.password.because.ldap.is.enabled=LDAP \u304c\u6709\u52b9\u306a\u305f\u3081\u3001\u30a8\u30e9\u30fc\u306b\u3088\u3063\u3066\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u5909\u66f4\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+error.could.not.change.your.password.because.ldap.is.enabled=Error could not change your password because LDAP is enabled.
error.could.not.enable.zone=\u30be\u30fc\u30f3\u3092\u6709\u52b9\u306b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
error.installWizard.message=\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u623b\u3063\u3066\u30a8\u30e9\u30fc\u3092\u4fee\u6b63\u3067\u304d\u307e\u3059\u3002
error.invalid.username.password=\u7121\u52b9\u306a\u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002
@@ -376,7 +391,7 @@ label.associated.network=\u95a2\u9023\u3065\u3051\u3089\u308c\u305f\u30cd\u30c3\
label.attached.iso=\u30a2\u30bf\u30c3\u30c1\u3055\u308c\u305f ISO
label.author.email=\u4f5c\u6210\u8005\u306e\u96fb\u5b50\u30e1\u30fc\u30eb
label.author.name=\u4f5c\u6210\u8005\u306e\u540d\u524d
-label.availability.zone=\u5229\u7528\u53ef\u80fd\u30be\u30fc\u30f3
+label.availability.zone=\u30a2\u30d9\u30a4\u30e9\u30d3\u30ea\u30c6\u30a3 \u30be\u30fc\u30f3
label.availability=\u53ef\u7528\u6027
label.available.public.ips=\u4f7f\u7528\u3067\u304d\u308b\u30d1\u30d6\u30ea\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9
label.available=\u4f7f\u7528\u53ef\u80fd
@@ -451,7 +466,7 @@ label.continue=\u7d9a\u884c
label.corrections.saved=\u63a5\u7d9a\u304c\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f
label.cpu.allocated.for.VMs=VM \u306b\u5272\u308a\u5f53\u3066\u6e08\u307f\u306e CPU
label.cpu.allocated=\u5272\u308a\u5f53\u3066\u6e08\u307f\u306e CPU
-label.CPU.cap=CPU \u4e0a\u9650
+label.CPU.cap=CPU \u30ad\u30e3\u30c3\u30d7
label.cpu.limits=CPU \u5236\u9650
label.cpu.mhz=CPU (MHz)
label.cpu.utilized=CPU \u4f7f\u7528\u7387
@@ -691,6 +706,7 @@ label.lang.arabic=\u30a2\u30e9\u30d3\u30a2\u8a9e
label.lang.brportugese=\u30dd\u30eb\u30c8\u30ac\u30eb\u8a9e (\u30d6\u30e9\u30b8\u30eb)
label.lang.catalan=\u30ab\u30bf\u30eb\u30cb\u30a2\u8a9e
label.lang.chinese=\u7c21\u4f53\u5b57\u4e2d\u56fd\u8a9e
+label.lang.dutch=Dutch (Netherlands)
label.lang.english=\u82f1\u8a9e
label.lang.french=\u30d5\u30e9\u30f3\u30b9\u8a9e
label.lang.german=\u30c9\u30a4\u30c4\u8a9e
@@ -698,6 +714,7 @@ label.lang.italian=\u30a4\u30bf\u30ea\u30a2\u8a9e
label.lang.japanese=\u65e5\u672c\u8a9e
label.lang.korean=\u97d3\u56fd\u8a9e
label.lang.norwegian=\u30ce\u30eb\u30a6\u30a7\u30fc\u8a9e
+label.lang.polish=Polish
label.lang.russian=\u30ed\u30b7\u30a2\u8a9e
label.lang.spanish=\u30b9\u30da\u30a4\u30f3\u8a9e
label.last.disconnected=\u6700\u7d42\u5207\u65ad\u65e5\u6642
@@ -997,7 +1014,7 @@ label.s3.endpoint=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8
label.s3.max_error_retry=\u6700\u5927\u30a8\u30e9\u30fc\u518d\u8a66\u884c\u6570
label.s3.secret_key=\u79d8\u5bc6\u30ad\u30fc
label.s3.socket_timeout=\u30bd\u30b1\u30c3\u30c8 \u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
-label.s3.use_https=HTTPS \u3092\u4f7f\u7528
+label.s3.use_https=HTTPS \u3092\u4f7f\u7528\u3059\u308b
label.saturday=\u571f\u66dc\u65e5
label.save.and.continue=\u4fdd\u5b58\u3057\u3066\u7d9a\u884c
label.save=\u4fdd\u5b58
@@ -1052,7 +1069,7 @@ label.source=\u9001\u4fe1\u5143
label.specify.IP.ranges=IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u6307\u5b9a
label.specify.vlan=VLAN \u3092\u6307\u5b9a\u3059\u308b
label.specify.vxlan=VXLAN \u3092\u6307\u5b9a\u3059\u308b
-label.SR.name = SR \u540d\u30e9\u30d9\u30eb
+label.SR.name = SR Name-Label
label.srx=SRX
label.PA=Palo Alto
label.start.IP=\u958b\u59cb IP \u30a2\u30c9\u30ec\u30b9
@@ -1096,7 +1113,7 @@ label.storage.tags=\u30b9\u30c8\u30ec\u30fc\u30b8 \u30bf\u30b0
label.storage.traffic=\u30b9\u30c8\u30ec\u30fc\u30b8 \u30c8\u30e9\u30d5\u30a3\u30c3\u30af
label.storage.type=\u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u7a2e\u985e
label.qos.type=QoS \u306e\u7a2e\u985e
-label.cache.mode=\u66f8\u304d\u8fbc\u307f\u30ad\u30e3\u30c3\u30b7\u30e5\u306e\u7a2e\u985e
+label.cache.mode=Write-cache Type
label.storage=\u30b9\u30c8\u30ec\u30fc\u30b8
label.subdomain.access=\u30b5\u30d6\u30c9\u30e1\u30a4\u30f3 \u30a2\u30af\u30bb\u30b9
label.submit=\u9001\u4fe1
@@ -1129,7 +1146,7 @@ label.tier.details=\u968e\u5c64\u306e\u8a73\u7d30
label.tier=\u968e\u5c64
label.time.zone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3
label.time=\u6642\u523b
-label.timeout.in.second = \u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 (\u79d2)
+label.timeout.in.second = Timeout(seconds)
label.timeout=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
label.timezone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3
label.token=\u30c8\u30fc\u30af\u30f3
@@ -1151,8 +1168,8 @@ label.unavailable=\u4f7f\u7528\u4e0d\u80fd
label.unlimited=\u7121\u5236\u9650
label.untagged=\u30bf\u30b0\u306a\u3057
label.update.project.resources=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 \u30ea\u30bd\u30fc\u30b9\u306e\u66f4\u65b0
-label.update.ssl.cert= SSL \u8a3c\u660e\u66f8
-label.update.ssl= SSL \u8a3c\u660e\u66f8
+label.update.ssl.cert= SSL Certificate
+label.update.ssl= SSL Certificate
label.updating=\u66f4\u65b0\u3057\u3066\u3044\u307e\u3059
label.upload.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
label.upload=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
@@ -1252,6 +1269,65 @@ label.zoneWizard.trafficType.management=\u7ba1\u7406\: \u30db\u30b9\u30c8\u3084
label.zoneWizard.trafficType.public=\u30d1\u30d6\u30ea\u30c3\u30af\: \u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u3068\u30af\u30e9\u30a6\u30c9\u5185\u306e\u4eee\u60f3\u30de\u30b7\u30f3\u306e\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u3067\u3059\u3002
label.zoneWizard.trafficType.storage=\u30b9\u30c8\u30ec\u30fc\u30b8\: VM \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3084\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306a\u3069\u3001\u30d7\u30e9\u30a4\u30de\u30ea\u304a\u3088\u3073\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8 \u30b5\u30fc\u30d0\u30fc\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u3067\u3059\u3002
label.ldap.group.name=LDAP \u30b0\u30eb\u30fc\u30d7
+label.password.reset.confirm=\u6b21\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306b\u30ea\u30bb\u30c3\u30c8\u3055\u308c\u307e\u3057\u305f:
+label.provider=\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc
+label.resetVM=VM \u306e\u30ea\u30bb\u30c3\u30c8
+label.openDaylight=OpenDaylight
+label.assign.instance.another=\u307b\u304b\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u3078\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u5272\u308a\u5f53\u3066
+label.network.addVM=VM \u3078\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u8ffd\u52a0
+label.set.default.NIC=\u30c7\u30d5\u30a9\u30eb\u30c8 NIC \u306e\u8a2d\u5b9a
+label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1 \u4ee5\u964d
+label.dynamically.scalable=\u52d5\u7684\u306b\u30b5\u30a4\u30ba\u8a2d\u5b9a\u3059\u308b
+label.instance.scaled.up=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u30b5\u30a4\u30ba\u304c\u62e1\u5927\u3055\u308c\u307e\u3057\u305f
+label.tag.key=\u30bf\u30b0 \u30ad\u30fc
+label.tag.value=\u30bf\u30b0\u5024
+label.ipv6.address=IPv6 IP \u30a2\u30c9\u30ec\u30b9
+label.ipv6.gateway=IPv6 \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4
+label.ipv6.CIDR=IPv6 CIDR
+label.VPC.limits=VPC \u5236\u9650
+label.edit.region=\u9818\u57df\u306e\u7de8\u96c6
+label.gslb.domain.name=GSLB \u30c9\u30e1\u30a4\u30f3\u540d
+label.add.gslb=GSLB \u306e\u8ffd\u52a0
+label.gslb.servicetype=\u30b5\u30fc\u30d3\u30b9\u306e\u7a2e\u985e
+label.gslb.details=GSLB \u306e\u8a73\u7d30
+label.gslb.delete=GSLB \u306e\u524a\u9664
+label.opendaylight.controllers=OpenDaylight Controllers
+label.portable.ip.ranges=\u30dd\u30fc\u30bf\u30d6\u30eb IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2
+label.add.portable.ip.range=\u30dd\u30fc\u30bf\u30d6\u30eb IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u8ffd\u52a0
+label.delete.portable.ip.range=\u30dd\u30fc\u30bf\u30d6\u30eb IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u524a\u9664
+label.opendaylight.controllerdetail=OpenDaylight Controller Details
+label.portable.ip.range.details=\u30dd\u30fc\u30bf\u30d6\u30eb IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u8a73\u7d30
+label.portable.ips=\u30dd\u30fc\u30bf\u30d6\u30eb IP \u30a2\u30c9\u30ec\u30b9
+label.gslb.assigned.lb=\u5272\u308a\u5f53\u3066\u6e08\u307f\u8ca0\u8377\u5206\u6563
+label.gslb.assigned.lb.more=\u8ca0\u8377\u5206\u6563\u306e\u8ffd\u52a0\u5272\u308a\u5f53\u3066
+label.gslb.lb.rule=\u8ca0\u8377\u5206\u6563\u898f\u5247
+label.gslb.lb.details=\u8ca0\u8377\u5206\u6563\u306e\u8a73\u7d30
+label.gslb.lb.remove=\u3053\u306e GSLB \u304b\u3089\u8ca0\u8377\u5206\u6563\u3092\u524a\u9664
+label.enable.autoscale=\u81ea\u52d5\u30b5\u30a4\u30ba\u8a2d\u5b9a\u306e\u6709\u52b9\u5316
+label.disable.autoscale=\u81ea\u52d5\u30b5\u30a4\u30ba\u8a2d\u5b9a\u306e\u7121\u52b9\u5316
+label.min.instances=\u6700\u5c0f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u6570
+label.max.instances=\u6700\u5927\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u6570
+label.add.OpenDaylight.device=Add OpenDaylight Controller
+label.show.advanced.settings=\u8a73\u7d30\u8a2d\u5b9a\u306e\u8868\u793a
+label.delete.OpenDaylight.device=Delete OpenDaylight Controller
+label.polling.interval.sec=\u30dd\u30fc\u30ea\u30f3\u30b0\u9593\u9694 (\u79d2)
+label.quiet.time.sec=\u5f85\u3061\u6642\u9593 (\u79d2)
+label.destroy.vm.graceperiod=VM \u7834\u68c4\u306e\u7336\u4e88\u671f\u9593
+label.SNMP.community=SNMP \u30b3\u30df\u30e5\u30cb\u30c6\u30a3
+label.SNMP.port=SNMP \u30dd\u30fc\u30c8
+label.add.ucs.manager=UCS Manager \u306e\u8ffd\u52a0
+label.ovm.traffic.label=OVM \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
+label.lxc.traffic.label=LXC \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
+label.hyperv.traffic.label=Hyper-V \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
+label.port=\u30dd\u30fc\u30c8
+label.remove.ldap=LDAP \u306e\u524a\u9664
+label.configure.ldap=LDAP \u306e\u69cb\u6210
+label.ldap.configuration=LDAP \u69cb\u6210
+label.ldap.port=LDAP \u30dd\u30fc\u30c8
+label.create.nfs.secondary.staging.store=NFS \u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0 \u30b9\u30c8\u30a2\u3092\u4f5c\u6210\u3059\u308b
+label.volatile=\u63ee\u767a\u6027
+label.planner.mode=\u30d7\u30e9\u30f3\u30ca\u30fc \u30e2\u30fc\u30c9
+label.deployment.planner=\u5c55\u958b\u30d7\u30e9\u30f3\u30ca\u30fc
managed.state=\u7ba1\u7406\u5bfe\u8c61\u72b6\u614b
message.acquire.new.ip.vpc=\u3053\u306e VPC \u306e\u65b0\u3057\u3044 IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
message.acquire.new.ip=\u3053\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u65b0\u3057\u3044 IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
@@ -1565,6 +1641,43 @@ message.zone.step.1.desc=\u30be\u30fc\u30f3\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\
message.zone.step.2.desc=\u65b0\u3057\u3044\u30be\u30fc\u30f3\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u3001\u6b21\u306e\u60c5\u5831\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
message.zone.step.3.desc=\u65b0\u3057\u3044\u30dd\u30c3\u30c9\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u3001\u6b21\u306e\u60c5\u5831\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
message.zoneWizard.enable.local.storage=\u8b66\u544a\: \u3053\u306e\u30be\u30fc\u30f3\u306e\u30ed\u30fc\u30ab\u30eb \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u6709\u52b9\u306b\u3059\u308b\u5834\u5408\u306f\u3001\u30b7\u30b9\u30c6\u30e0 VM \u306e\u8d77\u52d5\u5834\u6240\u306b\u5fdc\u3058\u3066\u6b21\u306e\u64cd\u4f5c\u304c\u5fc5\u8981\u3067\u3059\u3002<br/><br/>1. \u30b7\u30b9\u30c6\u30e0 VM \u3092\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3067\u8d77\u52d5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u5834\u5408\u306f\u3001\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u4f5c\u6210\u3057\u305f\u5f8c\u3067\u30be\u30fc\u30f3\u306b\u8ffd\u52a0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u30be\u30fc\u30f3\u3092\u7121\u52b9\u72b6\u614b\u304b\u3089\u958b\u59cb\u3059\u308b\u5fc5\u8981\u3082\u3042\u308a\u307e\u3059\u3002<br/><br/>2. \u30b7\u30b9\u30c6\u30e0 VM \u3092\u30ed\u30fc\u30ab\u30eb \u30b9\u30c8\u30ec\u30fc\u30b8\u3067\u8d77\u52d5\u3059
\u308b\u5fc5\u8981\u304c\u3042\u308b\u5834\u5408\u306f\u3001\u30be\u30fc\u30f3\u3092\u6709\u52b9\u306b\u3059\u308b\u524d\u306b system.vm.use.local.storage \u3092 true \u306b\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<br/><br/><br/>\u7d9a\u884c\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.validate.fieldrequired=\u3053\u308c\u306f\u5fc5\u9808\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3067\u3059\u3002
+message.validate.fixfield=\u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u4fee\u6b63\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+message.validate.email.address=Please enter a valid email address.
+message.validate.URL=Please enter a valid URL.
+message.validate.date=Please enter a valid date.
+message.validate.date.ISO=Please enter a valid date (ISO).
+message.validate.number=Please enter a valid number.
+message.validate.digits=Please enter only digits.
+message.validate.creditcard=Please enter a valid credit card number.
+message.validate.equalto=Please enter the same value again.
+message.validate.accept=Please enter a value with a valid extension.
+message.validate.maxlength=Please enter no more than {0} characters.
+message.validate.minlength=Please enter at least {0} characters.
+message.validate.range.length=Please enter a value between {0} and {1} characters long.
+message.validate.range=Please enter a value between {0} and {1}.
+message.validate.max=Please enter a value less than or equal to {0}.
+messgae.validate.min=Please enter a value greater than or equal to {0}.
+message.creating.systemVM=\u30b7\u30b9\u30c6\u30e0 VM \u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059 (\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044)
+message.enabling.zone.dots=\u30be\u30fc\u30f3\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+message.restoreVM=VM \u3092\u5fa9\u5143\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.no.host.available=\u79fb\u884c\u306b\u4f7f\u7528\u3067\u304d\u308b\u30db\u30b9\u30c8\u306f\u3042\u308a\u307e\u305b\u3093
+message.network.addVM.desc=\u3053\u306e VM \u3092\u8ffd\u52a0\u3059\u308b\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u305f\u3081\u306e\u65b0\u3057\u3044 NIC \u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002
+message.network.addVMNIC=\u3053\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u65b0\u3057\u3044 VM NIC \u3092\u8ffd\u52a0\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.set.default.NIC=\u3053\u306e NIC \u3092\u3053\u306e VM \u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u8a2d\u5b9a\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.set.default.NIC.manual=\u4eca\u3059\u3050\u306b\u3053\u306e VM \u306e\u30c7\u30d5\u30a9\u30eb\u30c8 NIC \u3092\u624b\u52d5\u3067\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+message.instance.scaled.up.confirm=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u30b5\u30a4\u30ba\u3092\u62e1\u5927\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.copy.template.confirm=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u30b3\u30d4\u30fc\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.template.copying=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u30b3\u30d4\u30fc\u3057\u3066\u3044\u307e\u3059\u3002
+message.XSTools61plus.update.failed=XenServer Tools Version 6.1 \u4ee5\u964d\u3078\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30a8\u30e9\u30fc\:
+message.gslb.delete.confirm=\u3053\u306e GSLB \u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.portable.ip.delete.confirm=\u3053\u306e\u30dd\u30fc\u30bf\u30d6\u30eb IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.gslb.lb.remove.confirm=GSLB \u304b\u3089\u8ca0\u8377\u5206\u6563\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.admin.guide.read=VMware \u30d9\u30fc\u30b9\u306e VM \u306b\u3064\u3044\u3066\u306f\u3001\u30b5\u30a4\u30ba\u5909\u66f4\u306e\u524d\u306b\u7ba1\u7406\u8005\u30ac\u30a4\u30c9\u306e\u52d5\u7684\u306a\u30b5\u30a4\u30ba\u5909\u66f4\u306e\u30bb\u30af\u30b7\u30e7\u30f3\u3092\u304a\u8aad\u307f\u304f\u3060\u3055\u3044\u3002\u7d9a\u884c\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?\,
+message.tier.required=\u968e\u5c64\u306f\u5fc5\u9808\u3067\u3059
+message.remove.ldap=LDAP \u69cb\u6210\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.action.downloading.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059\u3002
+message.configure.ldap=LDAP \u3092\u69cb\u6210\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
mode=\u30e2\u30fc\u30c9
network.rate=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u901f\u5ea6
notification.reboot.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u518d\u8d77\u52d5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/client/WEB-INF/classes/resources/messages_zh_CN.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 7cb65d3..88b13a1 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -14,9 +14,24 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+label.port=\u7aef\u53e3
+label.remove.ldap=\u5220\u9664 LDAP
+message.remove.ldap=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664 LDAP \u914d\u7f6e?
+label.configure.ldap=\u914d\u7f6e LDAP
+message.configure.ldap=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u914d\u7f6e LDAP\u3002
+label.ldap.configuration=LDAP \u914d\u7f6e
+label.ldap.port=LDAP \u7aef\u53e3
+label.create.nfs.secondary.staging.store=\u521b\u5efa NFS \u8f85\u52a9\u6682\u5b58\u5b58\u50a8
+label.volatile=\u53ef\u53d8
+label.planner.mode=\u89c4\u5212\u5668\u6a21\u5f0f
+label.deployment.planner=\u90e8\u7f72\u89c4\u5212\u5668
+label.quiesce.vm=\u9759\u9ed8 VM
+label.smb.username=SMB \u7528\u6237\u540d
+label.smb.password=SMB \u5bc6\u7801
+label.smb.domain=SMB \u57df
label.hypervisors=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f
label.home=\u9996\u9875
-label.sockets=\u63d2\u69fd
+label.sockets=CPU Sockets
label.root.disk.size=\u6839\u78c1\u76d8\u5927\u5c0f
label.s3.nfs.server=S3 NFS \u670d\u52a1\u5668
label.s3.nfs.path=S3 NFS \u8def\u5f84
@@ -50,7 +65,7 @@ message.action.delete.nic=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u79fb\u9664
changed.item.properties=\u66f4\u6539\u9879\u76ee\u5c5e\u6027
confirm.enable.s3=\u8bf7\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u542f\u7528\u5bf9 S3 \u652f\u6301\u7684\u8f85\u52a9\u5b58\u50a8\u7684\u652f\u6301
confirm.enable.swift=\u8bf7\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u542f\u7528\u5bf9 SWIFT \u7684\u652f\u6301
-error.could.not.change.your.password.because.ldap.is.enabled=\u9519\u8bef\u3002LDAP \u5904\u4e8e\u542f\u7528\u72b6\u6001\uff0c\u65e0\u6cd5\u66f4\u6539\u60a8\u7684\u5bc6\u7801\u3002
+error.could.not.change.your.password.because.ldap.is.enabled=Error could not change your password because LDAP is enabled.
error.could.not.enable.zone=\u65e0\u6cd5\u542f\u7528\u533a\u57df
error.installWizard.message=\u51fa\u73b0\u95ee\u9898\uff1b\u8bf7\u8fd4\u56de\u5e76\u66f4\u6b63\u4efb\u4f55\u9519\u8bef
error.invalid.username.password=\u7528\u6237\u540d\u6216\u5bc6\u7801\u65e0\u6548
@@ -691,6 +706,7 @@ label.lang.arabic=\u963f\u62c9\u4f2f\u8bed
label.lang.brportugese=\u8461\u8404\u7259\u8bed(\u5df4\u897f)
label.lang.catalan=\u52a0\u6cf0\u7f57\u5c3c\u4e9a\u8bed
label.lang.chinese=\u7b80\u4f53\u4e2d\u6587
+label.lang.dutch=Dutch (Netherlands)
label.lang.english=\u82f1\u8bed
label.lang.french=\u6cd5\u8bed
label.lang.german=\u5fb7\u8bed
@@ -698,6 +714,7 @@ label.lang.italian=\u610f\u5927\u5229\u8bed
label.lang.japanese=\u65e5\u8bed
label.lang.korean=\u97e9\u8bed
label.lang.norwegian=\u632a\u5a01\u8bed
+label.lang.polish=Polish
label.lang.russian=\u4fc4\u8bed
label.lang.spanish=\u897f\u73ed\u7259\u8bed
label.last.disconnected=\u4e0a\u6b21\u65ad\u5f00\u8fde\u63a5\u65f6\u95f4
@@ -1052,7 +1069,7 @@ label.source=\u6e90\u7b97\u6cd5
label.specify.IP.ranges=\u6307\u5b9a IP \u8303\u56f4
label.specify.vlan=\u6307\u5b9a VLAN
label.specify.vxlan=\u6307\u5b9a VXLAN
-label.SR.name = SR \u540d\u79f0\u6807\u7b7e
+label.SR.name = SR Name-Label
label.srx=SRX
label.PA=Palo Alto
label.start.IP=\u8d77\u59cb IP
@@ -1096,7 +1113,7 @@ label.storage.tags=\u5b58\u50a8\u6807\u7b7e
label.storage.traffic=\u5b58\u50a8\u901a\u4fe1
label.storage.type=\u5b58\u50a8\u7c7b\u578b
label.qos.type=QoS \u7c7b\u578b
-label.cache.mode=\u5199\u5165\u7f13\u5b58\u7c7b\u578b
+label.cache.mode=Write-cache Type
label.storage=\u5b58\u50a8
label.subdomain.access=\u5b50\u57df\u8bbf\u95ee
label.submit=\u63d0\u4ea4
@@ -1129,7 +1146,7 @@ label.tier.details=\u5c42\u8be6\u7ec6\u4fe1\u606f
label.tier=\u5c42
label.time.zone=\u65f6\u533a
label.time=\u65f6\u95f4
-label.timeout.in.second = \u8d85\u65f6(\u79d2)
+label.timeout.in.second = Timeout(seconds)
label.timeout=\u8d85\u65f6
label.timezone=\u65f6\u533a
label.token=\u4ee4\u724c
@@ -1151,8 +1168,8 @@ label.unavailable=\u4e0d\u53ef\u7528
label.unlimited=\u65e0\u9650\u5236
label.untagged=\u5df2\u53d6\u6d88\u6807\u8bb0
label.update.project.resources=\u66f4\u65b0\u9879\u76ee\u8d44\u6e90
-label.update.ssl.cert= SSL \u8bc1\u4e66
-label.update.ssl= SSL \u8bc1\u4e66
+label.update.ssl.cert= SSL Certificate
+label.update.ssl= SSL Certificate
label.updating=\u6b63\u5728\u66f4\u65b0
label.upload.volume=\u4e0a\u8f7d\u5377
label.upload=\u4e0a\u8f7d
@@ -1252,6 +1269,65 @@ label.zoneWizard.trafficType.management=\u7ba1\u7406\: CloudStack \u7684\u5185\u
label.zoneWizard.trafficType.public=\u516c\u7528\: \u4e91\u4e2d Internet \u4e0e\u865a\u62df\u673a\u4e4b\u95f4\u7684\u901a\u4fe1\u3002
label.zoneWizard.trafficType.storage=\u5b58\u50a8\: \u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u4e0e\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668(\u4f8b\u5982 VM \u6a21\u677f\u4e0e\u5feb\u7167)\u4e4b\u95f4\u7684\u901a\u4fe1
label.ldap.group.name=LDAP \u7ec4
+label.password.reset.confirm=\u5bc6\u7801\u5df2\u91cd\u7f6e\u4e3a
+label.provider=\u63d0\u4f9b\u7a0b\u5e8f
+label.resetVM=\u91cd\u7f6e VM
+label.openDaylight=OpenDaylight
+label.assign.instance.another=\u5c06\u5b9e\u4f8b\u5206\u914d\u7ed9\u5176\u4ed6\u5e10\u6237
+label.network.addVM=\u5c06\u7f51\u7edc\u6dfb\u52a0\u5230 VM
+label.set.default.NIC=\u8bbe\u7f6e\u9ed8\u8ba4 NIC
+label.Xenserver.Tools.Version61plus=XenServer Tools \u7248\u672c 6.1\+
+label.dynamically.scalable=\u53ef\u52a8\u6001\u6269\u5c55
+label.instance.scaled.up=\u5df2\u6269\u5c55\u5b9e\u4f8b
+label.tag.key=\u6807\u8bb0\u5bc6\u94a5
+label.tag.value=\u6807\u8bb0\u503c
+label.ipv6.address=IPv6 IP \u5730\u5740
+label.ipv6.gateway=IPv6 \u7f51\u5173
+label.ipv6.CIDR=IPv6 CIDR
+label.VPC.limits=VPC \u9650\u5236
+label.edit.region=\u7f16\u8f91\u533a\u57df
+label.gslb.domain.name=GSLB \u57df\u540d
+label.add.gslb=\u6dfb\u52a0 GSLB
+label.gslb.servicetype=\u670d\u52a1\u7c7b\u578b
+label.gslb.details=GSLB \u8be6\u7ec6\u4fe1\u606f
+label.gslb.delete=\u5220\u9664 GSLB
+label.opendaylight.controllers=OpenDaylight Controllers
+label.portable.ip.ranges=\u53ef\u79fb\u690d IP \u8303\u56f4
+label.add.portable.ip.range=\u6dfb\u52a0\u53ef\u79fb\u690d IP \u8303\u56f4
+label.delete.portable.ip.range=\u5220\u9664\u53ef\u79fb\u690d IP \u8303\u56f4
+label.opendaylight.controllerdetail=OpenDaylight Controller Details
+label.portable.ip.range.details=\u53ef\u79fb\u690d IP \u8303\u56f4\u8be6\u7ec6\u4fe1\u606f
+label.portable.ips=\u53ef\u79fb\u690d IP
+label.gslb.assigned.lb=\u5df2\u5206\u914d\u8d1f\u8f7d\u5e73\u8861
+label.gslb.assigned.lb.more=\u5206\u914d\u66f4\u591a\u8d1f\u8f7d\u5e73\u8861
+label.gslb.lb.rule=\u8d1f\u8f7d\u5e73\u8861\u89c4\u5219
+label.gslb.lb.details=\u8d1f\u8f7d\u5e73\u8861\u8be6\u7ec6\u4fe1\u606f
+label.gslb.lb.remove=\u4ece\u6b64 GSLB \u4e2d\u5220\u9664\u8d1f\u8f7d\u5e73\u8861
+label.enable.autoscale=\u542f\u7528\u81ea\u52a8\u6269\u5c55
+label.disable.autoscale=\u7981\u7528\u81ea\u52a8\u6269\u5c55
+label.min.instances=\u6700\u5c0f\u5b9e\u4f8b\u6570
+label.max.instances=\u6700\u5927\u5b9e\u4f8b\u6570
+label.add.OpenDaylight.device=Add OpenDaylight Controller
+label.show.advanced.settings=\u663e\u793a\u9ad8\u7ea7\u8bbe\u7f6e
+label.delete.OpenDaylight.device=Delete OpenDaylight Controller
+label.polling.interval.sec=\u8f6e\u8be2\u65f6\u95f4\u95f4\u9694(\u79d2)
+label.quiet.time.sec=\u5b89\u9759\u65f6\u95f4(\u79d2)
+label.destroy.vm.graceperiod=\u9500\u6bc1 VM \u5bbd\u9650\u671f
+label.SNMP.community=SNMP \u793e\u533a
+label.SNMP.port=SNMP \u7aef\u53e3
+label.add.ucs.manager=\u6dfb\u52a0 UCS \u7ba1\u7406\u5668
+label.ovm.traffic.label=OVM \u901a\u4fe1\u6807\u7b7e
+label.lxc.traffic.label=LXC \u901a\u4fe1\u6807\u7b7e
+label.hyperv.traffic.label=HyperV \u901a\u4fe1\u6807\u7b7e
+label.port=\u7aef\u53e3
+label.remove.ldap=\u5220\u9664 LDAP
+label.configure.ldap=\u914d\u7f6e LDAP
+label.ldap.configuration=LDAP \u914d\u7f6e
+label.ldap.port=LDAP \u7aef\u53e3
+label.create.nfs.secondary.staging.store=\u521b\u5efa NFS \u8f85\u52a9\u6682\u5b58\u5b58\u50a8
+label.volatile=\u53ef\u53d8
+label.planner.mode=\u89c4\u5212\u5668\u6a21\u5f0f
+label.deployment.planner=\u90e8\u7f72\u89c4\u5212\u5668
managed.state=\u6258\u7ba1\u72b6\u6001
message.acquire.new.ip.vpc=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64 VPC \u83b7\u53d6\u4e00\u4e2a\u65b0 IP\u3002
message.acquire.new.ip=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64\u7f51\u7edc\u83b7\u53d6\u4e00\u4e2a\u65b0 IP\u3002
@@ -1565,6 +1641,43 @@ message.zone.step.1.desc=\u8bf7\u4e3a\u60a8\u7684\u533a\u57df\u9009\u62e9\u4e00\
message.zone.step.2.desc=\u8bf7\u8f93\u5165\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u533a\u57df
message.zone.step.3.desc=\u8bf7\u8f93\u5165\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u63d0\u4f9b\u70b9
message.zoneWizard.enable.local.storage=\u8b66\u544a\: \u5982\u679c\u4e3a\u6b64\u533a\u57df\u542f\u7528\u4e86\u672c\u5730\u5b58\u50a8\uff0c\u5219\u5fc5\u987b\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e\u60a8\u5e0c\u671b\u542f\u52a8\u7cfb\u7edf VM \u7684\u4f4d\u7f6e\:<br/><br/>1. \u5982\u679c\u9700\u8981\u5728\u4e3b\u5b58\u50a8\u4e2d\u542f\u52a8\u7cfb\u7edf VM\uff0c\u5219\u5fc5\u987b\u5728\u5b8c\u6210\u521b\u5efa\u540e\u5c06\u4e3b\u5b58\u50a8\u6dfb\u52a0\u5230\u6b64\u533a\u57df\u4e2d\u3002<br/><br/>2. \u5982\u679c\u9700\u8981\u5728\u672c\u5730\u5b58\u50a8\u4e2d\u542f\u52a8\u7cfb\u7edf VM\uff0c\u5219\u5fc5\u987b\u5c06 system.vm.use.local.storage \u8bbe\u7f6e\u4e3a true\u3002<br/><br/><br/>\u662f\u5426\u8981\u7ee7\u7eed?
+message.validate.fieldrequired=\u6b64\u5b57\u6bb5\u4e3a\u5fc5\u586b\u5b57\u6bb5\u3002
+message.validate.fixfield=\u8bf7\u4fee\u590d\u6b64\u5b57\u6bb5\u3002
+message.validate.email.address=Please enter a valid email address.
+message.validate.URL=Please enter a valid URL.
+message.validate.date=Please enter a valid date.
+message.validate.date.ISO=Please enter a valid date (ISO).
+message.validate.number=Please enter a valid number.
+message.validate.digits=Please enter only digits.
+message.validate.creditcard=Please enter a valid credit card number.
+message.validate.equalto=Please enter the same value again.
+message.validate.accept=Please enter a value with a valid extension.
+message.validate.maxlength=Please enter no more than {0} characters.
+message.validate.minlength=Please enter at least {0} characters.
+message.validate.range.length=Please enter a value between {0} and {1} characters long.
+message.validate.range=Please enter a value between {0} and {1}.
+message.validate.max=Please enter a value less than or equal to {0}.
+messgae.validate.min=Please enter a value greater than or equal to {0}.
+message.creating.systemVM=\u6b63\u5728\u521b\u5efa\u7cfb\u7edf VM (\u6b64\u64cd\u4f5c\u53ef\u80fd\u9700\u8981\u4e00\u4e9b\u65f6\u95f4)
+message.enabling.zone.dots=\u6b63\u5728\u542f\u7528\u533a\u57df...
+message.restoreVM=\u662f\u5426\u8981\u8fd8\u539f\u6b64 VM?
+message.no.host.available=\u6ca1\u6709\u53ef\u7528\u4e8e\u8fc1\u79fb\u7684\u4e3b\u673a
+message.network.addVM.desc=\u8bf7\u6307\u5b9a\u8981\u5c06\u6b64 VM \u6dfb\u52a0\u5230\u7684\u7f51\u7edc\u3002\u5c06\u4e3a\u6b64\u7f51\u7edc\u6dfb\u52a0\u4e00\u4e2a\u65b0 NIC\u3002
+message.network.addVMNIC=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64\u7f51\u7edc\u6dfb\u52a0\u4e00\u4e2a\u65b0 VM NIC\u3002
+message.set.default.NIC=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u6b64 NIC \u8bbe\u7f6e\u4e3a\u6b64 VM \u7684\u9ed8\u8ba4 NIC\u3002
+message.set.default.NIC.manual=\u8bf7\u7acb\u5373\u624b\u52a8\u66f4\u65b0\u6b64 VM \u4e0a\u7684\u9ed8\u8ba4 NIC\u3002
+message.instance.scaled.up.confirm=\u662f\u5426\u786e\u5b9e\u8981\u6269\u5c55\u60a8\u7684\u5b9e\u4f8b?
+message.copy.template.confirm=\u662f\u5426\u786e\u5b9e\u8981\u590d\u5236\u6a21\u677f?
+message.template.copying=\u6b63\u5728\u590d\u5236\u6a21\u677f\u3002
+message.XSTools61plus.update.failed=\u65e0\u6cd5\u66f4\u65b0\u201cXenServer Tools \u7248\u672c 6.1\+\u201d\u5b57\u6bb5\u3002\u9519\u8bef\:
+message.gslb.delete.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64 GSLB
+message.portable.ip.delete.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u53ef\u79fb\u690d IP \u8303\u56f4
+message.gslb.lb.remove.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4ece GSLB \u4e2d\u5220\u9664\u8d1f\u8f7d\u5e73\u8861
+message.admin.guide.read=\u5bf9\u4e8e\u57fa\u4e8e VMware \u7684 VM\uff0c\u8bf7\u5148\u9605\u8bfb\u7ba1\u7406\u6307\u5357\u4e2d\u7684\u52a8\u6001\u6269\u5c55\u90e8\u5206\uff0c\u7136\u540e\u518d\u8fdb\u884c\u6269\u5c55\u3002\u662f\u5426\u8981\u7ee7\u7eed?\,
+message.tier.required=\u201c\u5c42\u201d\u4e3a\u5fc5\u586b\u9879
+message.remove.ldap=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664 LDAP \u914d\u7f6e?
+message.action.downloading.template=\u6b63\u5728\u4e0b\u8f7d\u6a21\u677f\u3002
+message.configure.ldap=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u914d\u7f6e LDAP\u3002
mode=\u6a21\u5f0f
network.rate=\u7f51\u7edc\u901f\u7387
notification.reboot.instance=\u91cd\u65b0\u542f\u52a8\u5b9e\u4f8b
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 16ecbab..7ccb466 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -43,6 +43,7 @@ dictionary = {
'label.hypervisors': '<fmt:message key="label.hypervisors" />',
'label.home': '<fmt:message key="label.home" />',
'label.sockets': '<fmt:message key="label.sockets" />',
+'label.add.ucs.manager': '<fmt:message key="label.add.ucs.manager" />',
'label.root.disk.size': '<fmt:message key="label.root.disk.size" />',
'label.s3.nfs.path': '<fmt:message key="label.s3.nfs.path" />',
'label.s3.nfs.server': '<fmt:message key="label.s3.nfs.server" />',
@@ -59,6 +60,8 @@ dictionary = {
'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />',
'label.routing': '<fmt:message key="label.routing" />',
'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />',
+'message.validate.fieldrequired': '<fmt:message key="message.validate.fieldrequired" />',
+'message.validate.fixfield': '<fmt:message key="message.validate.fixfield" />',
'label.about': '<fmt:message key="label.about" />',
'label.about.app': '<fmt:message key="label.about.app" />',
'label.app.name': '<fmt:message key="label.app.name" />',
@@ -700,6 +703,9 @@ dictionary = {
'label.keyboard.type': '<fmt:message key="label.keyboard.type" />',
'label.key': '<fmt:message key="label.key" />',
'label.kvm.traffic.label': '<fmt:message key="label.kvm.traffic.label" />',
+'label.ovm.traffic.label': '<fmt:message key="label.ovm.traffic.label" />',
+'label.lxc.traffic.label': '<fmt:message key="label.lxc.traffic.label" />',
+'label.hyperv.traffic.label': '<fmt:message key="label.hyperv.traffic.label" />',
'label.lang.chinese': '<fmt:message key="label.lang.chinese" />',
'label.lang.english': '<fmt:message key="label.lang.english" />',
'label.lang.japanese': '<fmt:message key="label.lang.japanese" />',
@@ -927,6 +933,7 @@ dictionary = {
'label.project.view': '<fmt:message key="label.project.view" />',
'label.protocol': '<fmt:message key="label.protocol" />',
'label.providers': '<fmt:message key="label.providers" />',
+'label.provider': '<fmt:message key="label.provider" />',
'label.public': '<fmt:message key="label.public" />',
'label.public.interface': '<fmt:message key="label.public.interface" />',
'label.public.ip': '<fmt:message key="label.public.ip" />',
@@ -1093,7 +1100,6 @@ dictionary = {
'label.storage.tags': '<fmt:message key="label.storage.tags" />',
'label.storage.type': '<fmt:message key="label.storage.type" />',
'label.qos.type': '<fmt:message key="label.qos.type" />',
-'label.cache.mode': '<fmt:message key="label.cache.mode" />',
'label.subdomain.access': '<fmt:message key="label.subdomain.access" />',
'label.submit': '<fmt:message key="label.submit" />',
'label.submitted.by': '<fmt:message key="label.submitted.by" />',
@@ -1199,6 +1205,7 @@ dictionary = {
'label.vm.start': '<fmt:message key="label.vm.start" />',
'label.vm.state': '<fmt:message key="label.vm.state" />',
'label.vm.stop': '<fmt:message key="label.vm.stop" />',
+'label.resetVM': '<fmt:message key="label.resetVM" />',
'label.vmware.traffic.label': '<fmt:message key="label.vmware.traffic.label" />',
'label.volgroup': '<fmt:message key="label.volgroup" />',
'label.volume': '<fmt:message key="label.volume" />',
@@ -1236,13 +1243,71 @@ dictionary = {
'label.zone.step.4.title': '<fmt:message key="label.zone.step.4.title" />',
'label.zone.wide': '<fmt:message key="label.zone.wide" />',
'label.ldap.group.name': '<fmt:message key="label.ldap.group.name" />',
+'label.password.reset.confirm': '<fmt:message key="label.password.reset.confirm" />',
'label.openDaylight': '<fmt:message key="OpenDaylight" />',
+'label.change.affinity': '<fmt:message key="label.change.affinity" />',
+'label.assign.instance.another': '<fmt:message key="label.assign.instance.another" />',
+'label.network.addVM': '<fmt:message key="label.network.addVM" />',
+'label.set.default.NIC': '<fmt:message key="label.set.default.NIC" />',
+'label.Xenserver.Tools.Version61plus': '<fmt:message key="label.Xenserver.Tools.Version61plus" />',
+'label.dynamically.scalabel': '<fmt:message key="label.dynamically.scalabel" />',
+'label.instance.scaled.up': '<fmt:message key="label.instance.scaled.up" />',
+'label.tag.value': '<fmt:message key="label.tag.value" />',
+'label.tag.key': '<fmt:message key="label.tag.key" />',
+'label.ipv6.address': '<fmt:message key="label.ipv6.address" />',
+'label.ipv6.gateway': '<fmt:message key="label.ipv6.gateway" />',
+'label.ipv6.CIDR': '<fmt:message key="label.ipv6.CIDR" />',
+'label.VPC.limits': '<fmt:message key="label.VPC.limits" />',
+'label.gslb.domain.name': '<fmt:message key="label.gslb.domain.name" />',
+'label.edit.region': '<fmt:message key="label.edit.region" />',
+'label.gslb.domain.name': '<fmt:message key="label.gslb.domain.name" />',
+'label.add.gslb': '<fmt:message key="label.add.gslb" />',
+'label.gslb.servicetype': '<fmt:message key="label.gslb.servicetype" />',
+'label.gslb.details': '<fmt:message key="label.gslb.details" />',
+'label.gslb.delete': '<fmt:message key="label.gslb.delete" />',
+'message.gslb.delete.confirm': '<fmt:message key="message.gslb.delete.confirm" />',
'label.opendaylight.controllers': '<fmt:message key="OpenDaylight Controllers" />',
+'label.portable.ip.ranges': '<fmt:message key="label.portable.ip.ranges" />',
+'label.add.portable.ip.range': '<fmt:message key="label.add.portable.ip.range" />',
+'label.delete.portable.ip.range': '<fmt:message key="label.delete.portable.ip.range" />',
+'message.portable.ip.delete.confirm': '<fmt:message key="message.portable.ip.delete.confirm" />',
'label.opendaylight.controllerdetail': '<fmt:message key="OpenDaylight Controller Details" />',
+'label.portable.ip.range.details': '<fmt:message key="label.portable.ip.range.details" />',
+'label.portable.ips': '<fmt:message key="label.portable.ips" />',
+'label.gslb.assigned.lb': '<fmt:message key="label.gslb.assigned.lb" />',
+'label.gslb.assigned.lb.more': '<fmt:message key="label.gslb.assigned.lb.more" />',
+'label.gslb.lb.rule': '<fmt:message key="label.gslb.lb.rule" />',
+'label.gslb.lb.details': '<fmt:message key="label.gslb.lb.details" />',
+'label.gslb.lb.remove': '<fmt:message key="label.gslb.lb.remove" />',
+'label.enable.autoscale': '<fmt:message key="label.enable.autoscale" />',
+'label.disable.autoscale': '<fmt:message key="label.disable.autoscale" />',
+'label.min.instances': '<fmt:message key="label.min.instances" />',
+'label.max.instances': '<fmt:message key="label.max.instances" />',
'label.add.OpenDaylight.device': '<fmt:message key="Add OpenDaylight Controller" />',
'label.delete.OpenDaylight.device': '<fmt:message key="Delete OpenDaylight Controller" />',
+'label.show.advanced.settings': '<fmt:message key="label.show.advanced.settings" />',
+'label.polling.interval.sec': '<fmt:message key="label.polling.interval.sec" />',
+'label.quiet.time.sec': '<fmt:message key="label.quiet.time.sec" />',
+'label.destroy.vm.graceperiod': '<fmt:message key="label.destroy.vm.graceperiod" />',
+'label.SNMP.community': '<fmt:message key="label.SNMP.community" />',
+'label.SNMP.port': '<fmt:message key="label.SNMP.port" />',
+'label.add.ucs.manager': '<fmt:message key="label.add.ucs.manager" />',
+'label.ovm.traffic.label': '<fmt:message key="label.ovm.traffic.label" />',
+'label.lxc.traffic.label': '<fmt:message key="label.lxc.traffic.label" />',
+'label.hyperv.traffic.label': '<fmt:message key="label.hyperv.traffic.label" />',
'managed.state': '<fmt:message key="managed.state" />',
+'message.gslb.lb.remove.confirm': '<fmt:message key="message.gslb.lb.remove.confirm" />',
+'message.admin.guide.read': '<fmt:message key="message.admin.guide.read" />',
+'message.tier.required': '<fmt:message key="message.tier.required" />',
+'message.network.addVMNIC': '<fmt:message key="message.network.addVMNIC" />',
+'message.copy.template.confirm': '<fmt:message key="message.copy.template.confirm" />',
+'message.template.copying': '<fmt:message key="message.template.copying" />',
+'message.XSTools61plus.update.failed': '<fmt:message key="message.XSTools61plus.update.failed" />',
+'message.set.default.NIC': '<fmt:message key="message.set.default.NIC" />',
+'message.set.default.NIC.manual': '<fmt:message key="message.set.default.NIC.manual" />',
'message.acquire.new.ip': '<fmt:message key="message.acquire.new.ip" />',
+'message.no.host.available':'<fmt:message key="message.no.host.available" />',
+'message.network.addVM.desc':'<fmt:message key="message.network.addVM.desc" />',
'message.acquire.new.ip.vpc': '<fmt:message key="message.acquire.new.ip.vpc" />',
'message.acquire.public.ip': '<fmt:message key="message.acquire.public.ip" />',
'message.action.cancel.maintenance': '<fmt:message key="message.action.cancel.maintenance" />',
@@ -1280,6 +1345,7 @@ dictionary = {
'message.action.disable.zone': '<fmt:message key="message.action.disable.zone" />',
'message.action.download.iso': '<fmt:message key="message.action.download.iso" />',
'message.action.download.template': '<fmt:message key="message.action.download.template" />',
+'message.action.downloading.template': '<fmt:message key="message.action.downloading.template" />',
'message.action.enable.cluster': '<fmt:message key="message.action.enable.cluster" />',
'message.action.enable.maintenance': '<fmt:message key="message.action.enable.maintenance" />',
'message.action.enable.physical.network': '<fmt:message key="message.action.enable.physical.network" />',
@@ -1413,6 +1479,8 @@ dictionary = {
'message.enable.vpn': '<fmt:message key="message.enable.vpn" />',
'message.enabling.security.group.provider': '<fmt:message key="message.enabling.security.group.provider" />',
'message.enabling.zone': '<fmt:message key="message.enabling.zone" />',
+'message.enabling.zone.dots': '<fmt:message key="message.enabling.zone.dots" />',
+'message.creating.systemVM': '<fmt:message key="message.creating.systemVM" />',
'message.enter.token': '<fmt:message key="message.enter.token" />',
'message.generate.keys': '<fmt:message key="message.generate.keys" />',
'message.installWizard.click.retry': '<fmt:message key="message.installWizard.click.retry" />',
@@ -1534,7 +1602,24 @@ dictionary = {
'message.zone.step.1.desc': '<fmt:message key="message.zone.step.1.desc" />',
'message.zone.step.2.desc': '<fmt:message key="message.zone.step.2.desc" />',
'message.zone.step.3.desc': '<fmt:message key="message.zone.step.3.desc" />',
+'message.restoreVM': '<fmt:message key="message.restoreVM" />',
'message.zoneWizard.enable.local.storage': '<fmt:message key="message.zoneWizard.enable.local.storage" />',
+'message.instance.scaled.up.confirm': '<fmt:message key="message.instance.scaled.up.confirm" />',
+'message.validate.email.address': '<fmt:message key="message.validate.email.address" />',
+'message.validate.URL': '<fmt:message key="message.validate.URL" />',
+'message.validate.date': '<fmt:message key="message.validate.date" />',
+'message.validate.date.ISO': '<fmt:message key="message.validate.date.ISO" />',
+'message.validate.number': '<fmt:message key="message.validate.number" />',
+'message.validate.digits': '<fmt:message key="message.validate.digits" />',
+'message.validate.creditcard': '<fmt:message key="message.validate.creditcard" />',
+'message.validate.equalto': '<fmt:message key="message.validate.equalto" />',
+'message.validate.accept': '<fmt:message key="message.validate.accept" />',
+'message.validate.maxlength': '<fmt:message key="message.validate.maxlength" />',
+'message.validate.minlength': '<fmt:message key="message.validate.minlength" />',
+'message.validate.range.length': '<fmt:message key="message.validate.range.length" />',
+'message.validate.range': '<fmt:message key="message.validate.range" />',
+'message.validate.max': '<fmt:message key="message.validate.max" />',
+'messgae.validate.min': '<fmt:message key="messgae.validate.min" />',
'mode': '<fmt:message key="mode" />',
'network.rate': '<fmt:message key="network.rate" />',
'notification.reboot.instance': '<fmt:message key="notification.reboot.instance" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/lib/jquery.validate.js
----------------------------------------------------------------------
diff --git a/ui/lib/jquery.validate.js b/ui/lib/jquery.validate.js
index 72296a6..2ee3961 100644
--- a/ui/lib/jquery.validate.js
+++ b/ui/lib/jquery.validate.js
@@ -260,23 +260,23 @@ $.extend($.validator, {
},
messages: {
- required: "This field is required.",
- remote: "Please fix this field.",
- email: "Please enter a valid email address.",
- url: "Please enter a valid URL.",
- date: "Please enter a valid date.",
- dateISO: "Please enter a valid date (ISO).",
- number: "Please enter a valid number.",
- digits: "Please enter only digits.",
- creditcard: "Please enter a valid credit card number.",
- equalTo: "Please enter the same value again.",
- accept: "Please enter a value with a valid extension.",
- maxlength: $.validator.format("Please enter no more than {0} characters."),
- minlength: $.validator.format("Please enter at least {0} characters."),
- rangelength: $.validator.format("Please enter a value between {0} and {1} characters long."),
- range: $.validator.format("Please enter a value between {0} and {1}."),
- max: $.validator.format("Please enter a value less than or equal to {0}."),
- min: $.validator.format("Please enter a value greater than or equal to {0}.")
+ required: 'message.validate.fieldrequired',
+ remote: 'message.validate.fixfield',
+ email: 'message.validate.email.address',
+ url: 'message.validate.URL',
+ date: 'message.validate.date',
+ dateISO: 'message.validate.date.ISO',
+ number: 'message.validate.number',
+ digits: 'message.validate.digits',
+ creditcard: 'message.validate.creditcard',
+ equalTo: 'message.validate.equalto',
+ accept: 'message.validate.accept',
+ maxlength: $.validator.format('message.validate.maxlength'),
+ minlength: $.validator.format('message.validate.minlength'),
+ rangelength: $.validator.format('message.validate.range.length'),
+ range: $.validator.format('message.validate.range'),
+ max: $.validator.format('message.validate.max'),
+ min: $.validator.format('messgae.validate.min')
},
autoCreateRanges: false,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index a15cc87..aff780e 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -728,7 +728,7 @@
}
},
vpcLimit: {
- label: 'VPC limits',
+ label: 'label.VPC.limits',
isEditable: function(context) {
if (context.accounts[0].accounttype == roleTypeUser || context.accounts[0].accounttype == roleTypeDomainAdmin) //updateResourceLimits is only allowed on account whose type is user or domain-admin
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/autoscaler.js
----------------------------------------------------------------------
diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js
index ab1b459..c8963fd 100644
--- a/ui/scripts/autoscaler.js
+++ b/ui/scripts/autoscaler.js
@@ -25,7 +25,7 @@
// UI actions to appear in dialog
autoscaleActions: {
enable: {
- label: 'Enable Autoscale',
+ label: 'label.enable.autoscale',
action: function(args) {
$.ajax({
url: createURL('enableAutoScaleVmGroup'),
@@ -53,7 +53,7 @@
}
},
disable: {
- label: 'Disable Autoscale',
+ label: 'label.disable.autoscale',
action: function(args) {
$.ajax({
url: createURL('disableAutoScaleVmGroup'),
@@ -328,7 +328,7 @@
},
minInstance: {
- label: 'Min Instances',
+ label: 'label.min.instances',
defaultValue: '3',
validation: {
required: true,
@@ -337,7 +337,7 @@
},
maxInstance: {
- label: 'Max Instances',
+ label: 'label.max.instances',
defaultValue: '10',
validation: {
required: true,
@@ -349,10 +349,10 @@
bottomFields: {
isAdvanced: {
isBoolean: true,
- label: 'Show advanced settings'
+ label: 'label.show.advanced.settings'
},
interval: {
- label: 'Polling Interval (in sec)',
+ label: 'label.polling.interval.sec',
defaultValue: '30',
validation: {
required: true,
@@ -361,7 +361,7 @@
},
quietTime: {
- label: 'Quiet Time (in sec)',
+ label: 'label.quiet.time.sec',
defaultValue: '300',
validation: {
required: true,
@@ -370,7 +370,7 @@
},
destroyVMgracePeriod: {
- label: 'Destroy VM Grace Period',
+ label: 'label.destroy.vm.graceperiod',
defaultValue: '30',
isHidden: true,
dependsOn: 'isAdvanced',
@@ -442,7 +442,7 @@
snmpCommunity: {
isHidden: true,
dependsOn: 'isAdvanced',
- label: 'SNMP Community',
+ label: 'label.SNMP.community',
defaultValue: 'public',
validation: {
required: true
@@ -452,7 +452,7 @@
snmpPort: {
isHidden: true,
dependsOn: 'isAdvanced',
- label: 'SNMP Port',
+ label: 'label.SNMP.port',
defaultValue: '161',
validation: {
required: true,
@@ -463,7 +463,7 @@
username: {
isHidden: true,
dependsOn: 'isAdvanced',
- label: 'User',
+ label: 'label.user',
select: function(args) {
var items = [];
if (args.context.originalAutoscaleData == null) { //new LB rule
@@ -1270,7 +1270,7 @@
if ('vpc' in args.context) { //from VPC section
if (args.data.tier == null) {
cloudStack.dialog.notice({
- message: 'Tier is required'
+ message: 'message.tier.required'
});
return;
}
@@ -1429,7 +1429,7 @@
if (template && template[0].hypervisor === 'VMware') {
cloudStack.dialog.confirm({
- message: 'For VMware-based VMs, please read the dynamic scaling section in the admin guide before scaling. Would you like to continue?,',
+ message: 'message.admin.guide.read',
action: function() {
//*** API calls start!!! ********
scaleUp(args);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/domains.js
----------------------------------------------------------------------
diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
index 5d8fd68..488382e 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -417,7 +417,7 @@
}
},
vpcLimit: {
- label: 'VPC limits',
+ label: 'label.VPC.limits',
isEditable: function(args) {
if (args.domains[0].id == g_domainid) //disallow to update the field on the domain you log in as
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/installWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
index dbea34e..25de4aa 100644
--- a/ui/scripts/installWizard.js
+++ b/ui/scripts/installWizard.js
@@ -287,7 +287,7 @@
response: {
success: function(args) {
var enableZone = function() {
- message('Enabling zone...');
+ message(dictionary['message.enabling.zone.dots']);
cloudStack.zoneWizard.enableZoneAction({
data: args.data,
formData: args.data,
@@ -302,7 +302,7 @@
var pollSystemVMs = function() {
// Poll System VMs, then enable zone
- message('Creating system VMs (this may take a while)');
+ message(dictionary['message.creating.systemVM']);
var poll = setInterval(function() {
$.ajax({
url: createURL('listSystemVms'),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index cd18f83..53c9e98 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -148,19 +148,16 @@
},
fields: {
name: {
- label: 'label.name',
- truncate: true
+ label: 'label.name'
},
instancename: {
label: 'label.internal.name'
},
displayname: {
- label: 'label.display.name',
- truncate: true
+ label: 'label.display.name'
},
zonename: {
- label: 'label.zone.name',
- truncate: true
+ label: 'label.zone.name'
},
state: {
label: 'label.state',
@@ -574,7 +571,7 @@
compactLabel: 'label.destroy',
createForm: {
title: 'label.action.destroy.instance',
- desc: 'Please confirm that you want to destroy this instance',
+ desc: 'label.action.destroy.instance',
preFilter: function(args) {
if (isAdmin() || isDomainAdmin()) {
args.$form.find('.form-item[rel=expunge]').css('display', 'inline-block');
@@ -584,7 +581,7 @@
},
fields: {
expunge: {
- label: 'Expunge',
+ label: 'label.expunge',
isBoolean: true,
isChecked: false
}
@@ -698,18 +695,18 @@
}
},
reset: {
- label: 'Reset VM',
- textLabel: 'Reset VM',
+ label: 'label.resetVM',
+ textLabel: 'label.resetVM',
messages: {
confirm: function(args) {
- return 'Do you want to restore the VM ?';
+ return 'message.restoreVM';
},
notification: function(args) {
- return 'Reset VM';
+ return 'label.resetVM';
},
complete: function(args) {
if (args.password != null && args.password.length > 0)
- return 'Password has been reset to ' + args.password;
+ return 'label.password.reset.confirm' + args.password;
else
return null;
}
@@ -745,7 +742,7 @@
},
changeAffinity: {
- label: 'Change affinity',
+ label: 'label.change.affinity',
action: {
custom: cloudStack.uiCustom.affinity({
@@ -874,7 +871,7 @@
},
messages: {
notification: function(args) {
- return 'Change affinity';
+ return 'label.change.affinity';
}
},
notification: {
@@ -1291,7 +1288,7 @@
});
} else {
cloudStack.dialog.notice({
- message: _l('No Hosts are avaialble for Migration')
+ message: _l(dictionary['message.no.host.available'])
}); //Only a single host in the set up
}
}
@@ -1574,10 +1571,10 @@
},
messages: {
confirm: function(args) {
- return 'Do you really want to scale Up your instance ?';
+ return 'message.instance.scaled.up.confirm';
},
notification: function(args) {
- return 'Instance Scaled Up';
+ return 'label.instance.scaled.up';
}
},
notification: {
@@ -1586,9 +1583,9 @@
},
assignVmToAnotherAccount: {
- label: 'Assign Instance to Another Account',
+ label: 'label.assign.instance.another',
createForm: {
- title: 'Assign Instance to Another Account',
+ title: 'label.assign.instance.another',
fields: {
domainid: {
label: 'label.domain',
@@ -1646,7 +1643,7 @@
},
messages: {
notification: function(args) {
- return 'Assign Instance to Another Account';
+ return 'label.assign.instance.another';
}
},
notification: {
@@ -1735,7 +1732,7 @@
},
isdynamicallyscalable: {
- label: 'Dynamically Scalable',
+ label: 'label.dynamically.scalable',
isBoolean: true,
isEditable: true,
converter: cloudStack.converters.toBooleanText
@@ -1771,7 +1768,7 @@
},
xenserverToolsVersion61plus: {
- label: 'XenServer Tools Version 6.1+',
+ label: 'label.Xenserver.Tools.Version61plus',
isBoolean: true,
isEditable: function () {
if (isAdmin())
@@ -1895,18 +1892,18 @@
multiple: true,
actions: {
add: {
- label: 'Add network to VM',
+ label: 'label.network.addVM',
messages: {
confirm: function(args) {
- return 'Please confirm that you would like to add a new VM NIC for this network.';
+ return 'message.network.addVMNIC';
},
notification: function(args) {
- return 'Add network to VM';
+ return 'label.network.addVM';
}
},
createForm: {
- title: 'Add network to VM',
- desc: 'Please specify the network that you would like to add this VM to. A new NIC will be added for this network.',
+ title: 'label.network.addVM',
+ desc: 'message.network.addVM.desc',
fields: {
networkid: {
label: 'label.network',
@@ -1955,13 +1952,13 @@
},
makeDefault: {
- label: 'Set default NIC',
+ label: 'label.set.default.NIC',
messages: {
confirm: function() {
- return 'Please confirm that you would like to make this NIC the default for this VM.';
+ return 'message.set.default.NIC';
},
notification: function(args) {
- return 'Set default NIC'
+ return 'label.set.default.NIC'
}
},
action: function(args) {
@@ -1978,7 +1975,7 @@
}
});
cloudStack.dialog.notice({
- message: _l('Please manually update the default NIC on the VM now.')
+ message: _l(dictionary['message.set.default.NIC.manual'])
});
}
});
@@ -2022,14 +2019,14 @@
},
fields: [{
id: {
- label: 'ID'
+ label: 'label.id'
},
name: {
label: 'label.name',
header: true
},
networkname: {
- label: 'Network Name'
+ label: 'label.network.name'
},
type: {
label: 'label.type'
@@ -2045,13 +2042,13 @@
},
ip6address: {
- label: 'IPv6 IP Address'
+ label: 'label.ipv6.address'
},
ip6gateway: {
- label: 'IPv6 Gateway'
+ label: 'label.ipv6.gateway'
},
ip6cidr: {
- label: 'IPv6 CIDR'
+ label: 'label.ipv6.CIDR'
},
isdefault: {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index ac573b7..66dae8c 100644
--- a/ui/scripts/regions.js
+++ b/ui/scripts/regions.js
@@ -277,27 +277,27 @@
label: 'label.name'
},
gslbdomainname: {
- label: 'GSLB Domain Name'
+ label: 'label.gslb.domain.name'
},
gslblbmethod: {
- label: 'Algorithm'
+ label: 'label.algorithm'
}
},
actions: {
add: {
- label: 'Add GSLB',
+ label: 'label.add.gslb',
messages: {
confirm: function(args) {
- return 'Add GSLB';
+ return 'label.add.gslb';
},
notification: function(args) {
- return 'Add GSLB';
+ return 'label.add.gslb';
}
},
createForm: {
- title: 'Add GSLB',
+ title: 'label.add.gslb',
fields: {
name: {
label: 'label.name',
@@ -309,13 +309,13 @@
label: 'label.description'
},
gslbdomainname: {
- label: 'GSLB Domain Name',
+ label: 'label.gslb.domain.name',
validation: {
required: true
}
},
gslblbmethod: {
- label: 'Algorithm',
+ label: 'label.algorithm',
select: function(args) {
var array1 = [{
id: 'roundrobin',
@@ -333,7 +333,7 @@
}
},
gslbservicetype: {
- label: 'Service Type',
+ label: 'label.gslb.servicetype',
select: function(args) {
var array1 = [{
id: 'tcp',
@@ -351,7 +351,7 @@
}
},
domainid: {
- label: 'Domain',
+ label: 'label.domain',
select: function(args) {
if (isAdmin() || isDomainAdmin()) {
$.ajax({
@@ -393,7 +393,7 @@
}
},
account: {
- label: 'Account',
+ label: 'label.account',
isHidden: function(args) {
if (isAdmin() || isDomainAdmin())
return false;
@@ -470,7 +470,7 @@
},
detailView: {
- name: 'GSLB details',
+ name: 'label.gslb.details',
viewAll: {
path: 'regions.lbUnderGSLB',
label: 'assigned load balancing'
@@ -502,13 +502,13 @@
}
},
remove: {
- label: 'delete GSLB',
+ label: 'label.gslb.delete',
messages: {
confirm: function(args) {
- return 'Please confirm you want to delete this GSLB';
+ return 'message.gslb.delete.confirm';
},
notification: function(args) {
- return 'delete GSLB';
+ return 'label.gslb.delete';
}
},
action: function(args) {
@@ -546,10 +546,10 @@
isEditable: true
},
gslbdomainname: {
- label: 'GSLB Domain Name'
+ label: 'label.gslb.domain.name'
},
gslblbmethod: {
- label: 'Algorithm',
+ label: 'label.algorithm',
isEditable: true,
select: function(args) {
var array1 = [{
@@ -568,10 +568,10 @@
}
},
gslbservicetype: {
- label: 'Service Type'
+ label: 'label.gslb.servicetype'
},
id: {
- label: 'ID'
+ label: 'label.id'
}
}],
dataProvider: function(args) {
@@ -598,10 +598,10 @@
portableIpRanges: {
id: 'portableIpRanges',
type: 'select',
- title: 'Portable IP Ranges',
+ title: 'label.portable.ip.ranges',
listView: {
id: 'portableIpRanges',
- label: 'Portable IP Ranges',
+ label: 'label.portable.ip.ranges',
fields: {
startip: {
label: 'label.start.IP'
@@ -638,14 +638,14 @@
},
actions: {
add: {
- label: 'Add Portable IP Range',
+ label: 'label.add.portable.ip.range',
messages: {
notification: function(args) {
- return 'Add Portable IP Range';
+ return 'label.add.portable.ip.range';
}
},
createForm: {
- title: 'Add Portable IP Range',
+ title: 'label.add.portable.ip.range',
fields: {
startip: {
label: 'label.start.IP',
@@ -718,16 +718,16 @@
},
detailView: {
- name: 'Portable IP Range details',
+ name: 'label.portable.ip.range.details',
actions: {
remove: {
- label: 'Delete Portable IP Range',
+ label: 'label.delete.portable.ip.range',
messages: {
confirm: function(args) {
- return 'Please confirm you want to delete Portable IP Range';
+ return 'message.portable.ip.delete.confirm';
},
notification: function(args) {
- return 'Delete Portable IP Range';
+ return 'label.delete.portable.ip.range';
}
},
action: function(args) {
@@ -780,7 +780,7 @@
label: 'label.vlan'
},
portableipaddress: {
- label: 'Portable IPs',
+ label: 'label.portable.ips',
converter: function(args) {
var text1 = '';
if (args != null) {
@@ -821,11 +821,11 @@
lbUnderGSLB: {
id: 'lbUnderGSLB',
type: 'select',
- title: 'assigned load balancing',
+ title: 'label.gslb.assigned.lb',
listView: {
section: 'lbUnderGSLB',
id: 'lbUnderGSLB',
- label: 'assigned load balancing',
+ label: 'label.gslb.assigned.lb',
fields: {
name: {
label: 'label.name'
@@ -857,17 +857,17 @@
},
actions: {
add: {
- label: 'assign more load balancing',
+ label: 'label.gslb.assigned.lb.more',
messages: {
notification: function(args) {
- return 'assign more load balancing';
+ return 'label.gslb.assigned.lb.more';
}
},
createForm: {
- title: 'assign more load balancing',
+ title: 'label.gslb.assigned.lb.more',
fields: {
loadbalancerrule: {
- label: 'load balancing rule',
+ label: 'label.gslb.lb.rule',
select: function(args) {
var data = {
globalloadbalancerruleid: args.context.GSLB[0].id,
@@ -934,16 +934,16 @@
},
detailView: {
- name: 'load balancing details',
+ name: 'label.gslb.lb.details',
actions: {
remove: {
- label: 'remove load balancing from this GSLB',
+ label: 'label.gslb.lb.remove',
messages: {
notification: function() {
- return 'remove load balancing from GSLB';
+ return 'label.gslb.lb.remove';
},
confirm: function() {
- return 'Please confirm you want to remove load balancing from GSLB';
+ return 'message.gslb.lb.remove.confirm';
}
},
action: function(args) {