cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [7/7] git commit: updated refs/heads/master to 6a11d09
Date Wed, 17 Sep 2014 20:59:37 GMT
Fix Externalization of hard-coded label strings

-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and
'dictionary2.jsp' -- this is due to JSP file constraints as the
localization object is getting quite long

-Per change above, 'dictionary' object is now split into an additonal
'dictionary2' object, which is merged with the main dict object on page
load

-All new dictionary mappings should be added to 'dictionary2' now.

Signed-off-by: Brian Federle <brian.federle@citrix.com>


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

Branch: refs/heads/master
Commit: 6a11d099cfcddc32f97c6d243910ec281d521c4f
Parents: c661289
Author: vetrivelc <vetrivel.chinnasamy@citrix.com>
Authored: Fri Sep 12 15:17:59 2014 +0530
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Sep 17 13:59:13 2014 -0700

----------------------------------------------------------------------
 .../classes/resources/messages.properties       |   43 +-
 .../classes/resources/messages_ja_JP.properties | 3796 +++++++++---------
 .../classes/resources/messages_zh_CN.properties | 3768 ++++++++---------
 ui/dictionary.jsp                               |  912 +----
 ui/dictionary2.jsp                              | 1046 +++++
 ui/index.jsp                                    |    1 +
 ui/modules/vnmcAsa1000v/vnmcAsa1000v.js         |   86 +-
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  |    2 +-
 ui/scripts/accounts.js                          |   10 +-
 ui/scripts/autoscaler.js                        |   14 +-
 ui/scripts/cloudStack.js                        |    4 +
 ui/scripts/configuration.js                     |   22 +-
 ui/scripts/domains.js                           |    2 +-
 ui/scripts/events.js                            |   50 +-
 ui/scripts/instances.js                         |    6 +-
 ui/scripts/lbStickyPolicy.js                    |    4 +-
 ui/scripts/network.js                           |   16 +-
 ui/scripts/projects.js                          |    4 +-
 ui/scripts/regions.js                           |    8 +-
 ui/scripts/sharedFunctions.js                   |   54 +-
 ui/scripts/storage.js                           |   54 +-
 ui/scripts/system.js                            |   30 +-
 ui/scripts/templates.js                         |   16 +-
 ui/scripts/ui-custom/autoscaler.js              |    4 +-
 ui/scripts/ui-custom/healthCheck.js             |   10 +-
 ui/scripts/ui-custom/physicalResources.js       |    8 +-
 ui/scripts/ui-custom/regions.js                 |    2 +-
 ui/scripts/ui-custom/zoneWizard.js              |    6 +-
 ui/scripts/ui/dialog.js                         |    2 +-
 ui/scripts/ui/widgets/listView.js               |    4 +-
 ui/scripts/ui/widgets/multiEdit.js              |    2 +-
 ui/scripts/vpc.js                               |  122 +-
 ui/scripts/zoneWizard.js                        |   30 +-
 33 files changed, 5192 insertions(+), 4946 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a11d099/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 4655973..c9eb7ae 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -84,7 +84,7 @@ error.session.expired=Your session has expired.
 error.something.went.wrong.please.correct.the.following=Something went wrong; please correct
the following
 error.unable.to.reach.management.server=Unable to reach Management Server
 error.unresolved.internet.name=Your internet name cannot be resolved.
-extractable=Extractable
+label.extractable=Extractable
 force.delete.domain.warning=Warning\: Choosing this option will cause the deletion of all
child domains and all associated accounts and their resources.
 force.delete=Force Delete
 force.remove.host.warning=Warning\: Choosing this option will cause CloudStack to forcefully
stop all running virtual machines before removing this host from the cluster.
@@ -437,7 +437,7 @@ label.certificate=Server certificate
 label.change.service.offering=Change service offering
 label.change.value=Change value
 label.character=Character
-label.checksum=MD5 checksum
+label.md5.checksum=MD5 checksum
 label.cidr.account=CIDR or Account/Security Group
 label.CIDR.list=CIDR list
 label.cidr.list=Source CIDR
@@ -504,7 +504,7 @@ label.default=Default
 label.delete.affinity.group=Delete Affinity Group
 label.delete.BigSwitchVns=Remove BigSwitch Vns Controller
 label.delete.F5=Delete F5
-label.delete.gateway=delete gateway
+label.delete.gateway=Delete gateway
 label.delete.NetScaler=Delete NetScaler
 label.delete.NiciraNvp=Remove Nvp Controller
 label.delete.NuageVsp=Remove Nuage VSD
@@ -512,9 +512,9 @@ label.delete.BrocadeVcs=Remove Brocade Vcs Switch
 label.delete.project=Delete project
 label.delete.SRX=Delete SRX
 label.delete.PA=Delete Palo Alto
-label.delete.VPN.connection=delete VPN connection
-label.delete.VPN.customer.gateway=delete VPN Customer Gateway
-label.delete.VPN.gateway=delete VPN Gateway
+label.delete.VPN.connection=Delete VPN connection
+label.delete.VPN.customer.gateway=Delete VPN Customer Gateway
+label.delete.VPN.gateway=Delete VPN Gateway
 label.delete.vpn.user=Delete VPN user
 label.delete=Delete
 label.deleting.failed=Deleting Failed
@@ -757,6 +757,7 @@ label.LUN.number=LUN \#
 label.lun=LUN
 label.make.project.owner=Make account project owner
 label.manage.resources=Manage Resources
+label.management.server=Management Server
 label.manage=Manage
 label.managed=Managed
 label.management.ips=Management IP Addresses
@@ -1000,7 +1001,7 @@ label.remove.static.nat.rule=Remove static NAT rule
 label.remove.static.route=Remove static route
 label.remove.tier=Remove tier
 label.remove.vm.from.lb=Remove VM from load balancer rule
-label.remove.vpc=remove VPC
+label.remove.vpc=Remove VPC
 label.removing.user=Removing User
 label.removing=Removing
 label.required=Required
@@ -1017,7 +1018,7 @@ label.resource=Resource
 label.resources=Resources
 label.restart.network=Restart network
 label.restart.required=Restart required
-label.restart.vpc=restart VPC
+label.restart.vpc=Restart VPC
 label.restore=Restore
 label.retry.interval=Retry Interval
 label.review=Review
@@ -1324,7 +1325,7 @@ 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.gslb.delete=Delete GSLB
 label.opendaylight.controller=OpenDaylight Controller
 label.opendaylight.controllers=OpenDaylight Controllers
 label.portable.ip.ranges=Portable IP Ranges
@@ -1333,11 +1334,11 @@ 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.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
@@ -1361,21 +1362,21 @@ label.add.vnmc.provider=Add VNMC provider
 label.enable.vnmc.provider=Enable VNMC provider
 label.add.vnmc.device=Add VNMC device
 label.ciscovnmc.resource.details=CiscoVNMC resource details
-label.delete.ciscovnmc.resource=delete CiscoVNMC resource
+label.delete.ciscovnmc.resource=Delete CiscoVNMC resource
 label.enable.vnmc.device=Enable VNMC device
 label.disbale.vnmc.device=Disable VNMC device
 label.disable.vnmc.provider=Disable VNMC provider
 label.services=Services
 label.secondary.staging.store=Secondary Staging Store
 label.release.account=Release from Account
-label.release.account.lowercase=release from account
+label.release.account.lowercase=Release from account
 label.vlan.vni.ranges=VLAN/VNI Range(s)
 label.dedicated.vlan.vni.ranges=Dedicated VLAN/VNI Ranges
 label.dedicate.vlan.vni.range=Dedicate VLAN/VNI Range
 label.vlan.vni.range=VLAN/VNI Range
 label.vlan.range.details=VLAN Range details
 label.release.dedicated.vlan.range=Release dedicated VLAN range
-label.broadcat.uri=broadcast URI
+label.broadcat.uri=Broadcast URI
 label.ipv4.cidr=IPv4 CIDR
 label.guest.network.details=Guest network details
 label.ipv4.gateway=IPv4 Gateway
@@ -1473,10 +1474,10 @@ label.ipv4.end.ip=IPv4 End IP
 label.ipv6.start.ip=IPv6 Start IP
 label.ipv6.end.ip=IPv6 End IP
 label.vm.password=Password of the VM is
-label.group.by.zone=group by zone
-label.group.by.pod=group by pod
-label.group.by.cluster=group by cluster
-label.group.by.account=group by account
+label.group.by.zone=Group by zone
+label.group.by.pod=Group by pod
+label.group.by.cluster=Group by cluster
+label.group.by.account=Group by account
 label.no.grouping=(no grouping)
 label.create.nfs.secondary.staging.storage=Create NFS Secondary Staging Store
 label.username.lower=username


Mime
View raw message