From 0646588fc6d5cfc6d9b0da80d8e44697d72005d3 Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Wed, 1 Oct 2014 08:51:37 +0100 Subject: [PATCH] CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???" - removed duplicate entries in dictionary - added dictionary entries that have been missed during the dictionary split - added missing entries in messages.properties - fixed other localization issues --- .../classes/resources/messages.properties | 93 +++++++++++++++++++ ui/dictionary.jsp | 1 - ui/dictionary2.jsp | 54 +++-------- ui/scripts/configuration.js | 2 +- ui/scripts/storage.js | 2 +- ui/scripts/templates.js | 2 +- ui/scripts/ui-custom/physicalResources.js | 6 +- 7 files changed, 110 insertions(+), 50 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index c9eb7ae2466..a76855f763e 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -1524,6 +1524,77 @@ label.vgpu.video.ram=Video RAM label.vgpu.max.resolution=Max resolution label.vgpu.max.vgpu.per.gpu=vGPUs per GPU label.vgpu.remaining.capacity=Remaining capacity +label.routing.host=Routing Host +label.usage.server=Usage Server +label.user.vm=User VM +label.resource.limit.exceeded=Resource Limit Exceeded +label.direct.attached.public.ip=Direct Attached Public IP +label.usage.sanity.result=Usage Sanity Result +label.select.region=Select region +label.info.upper=INFO +label.warn.upper=WARN +label.error.upper=ERROR +label.event.deleted=Event Deleted +label.add.ciscoASA1000v=Add CiscoASA1000v Resource +label.delete.ciscoASA1000v=Delete CiscoASA1000v +label.inside.port.profile=Inside Port Profile +label.archive=Archive +label.event.archived=Event Archived +label.alert.details=Alert details +label.alert.deleted=Alert Deleted +label.alert.archived=Alert Archived +label.volume.details=Volume details +label.volume.migrated=Volume migrated +label.storage.pool=Storage Pool +label.enable.host=Enable Host +label.disable.host=Disable Host +label.copying.iso=Copying ISO +label.add.internal.lb=Add Internal LB +label.internal.lb.details=Internal LB details +label.delete.internal.lb=Delete Internal LB +label.remove.vm.load.balancer=Remove VM from load balancer +label.add.acl.list=Add ACL List +label.add.list.name=ACL List Name +label.add.network.acl.list=Add Network ACL List +label.delete.acl.list=Delete ACL List +label.acl.replaced=ACL replaced +label.ipv4.dns1=IPv4 DNS1 +label.ipv4.dns2=IPv4 DNS2 +label.protocol.number=Protocol Number +label.edit.acl.rule=Edit ACL rule +label.source.ip.address=Source IP Address +label.source.port=Source Port +label.instance.port=Instance Port +label.assigned.vms=Assigned VMs +label.replace.acl=Replace ACL +label.source.nat.supported=SourceNAT Supported +label.acl.name=ACL Name +label.acl.id=ACL ID +label.passive=Passive +label.replace.acl.list=Replace ACL List +label.vswitch.name=vSwitch Name +label.vSwitch.type=vSwitch Type +label.ping.path=Ping Path +label.response.timeout.in.sec=Response Timeout (in sec) +label.health.check.interval.in.sec=Health Check Interval (in sec) +label.healthy.threshold=Healthy Threshold +label.unhealthy.threshold=Unhealthy Threshold +label.other=Other +label.vm.id=VM ID +label.vnmc=VNMC +label.scale.up.policy=SCALE UP POLICY +label.counter=Counter +label.operator=Operator +label.threshold=Threshold +label.load.balancer.type=Load Balancer Type +label.vgpu=VGPU +label.sticky.name=Sticky Name +label.stickiness.method=Stickiness method +label.gslb=GSLB +label.portable.ip=Portable IP +label.internallbvm=InternalLbVm +label.agent.state=Agent State +label.duration.in.sec=Duration(in sec) 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. @@ -1656,6 +1727,25 @@ message.confirm.enable.provider=Please confirm that you would like to enable thi message.confirm.join.project=Please confirm you wish to join this project. message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range. message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider +message.confirm.current.guest.CIDR.unchanged=Do you want to keep the current guest network CIDR unchanged? +message.confirm.delete.ciscoASA1000v=Please confirm you want to delete CiscoASA1000v +message.confirm.remove.selected.events=Please confirm you would like to remove the selected events +message.confirm.archive.selected.events=Please confirm you would like to archive the selected events +message.confirm.remove.event=Are you sure you want to remove this event? +message.confirm.archive.event=Please confirm that you want to archive this event. +message.confirm.remove.selected.alerts=Please confirm you would like to remove the selected alerts +message.confirm.archive.selected.alerts=Please confirm you would like to archive the selected alerts +message.confirm.delete.alert=Are you sure you want to delete this alert ? +message.confirm.archive.alert=Please confirm that you want to archive this alert. +message.confirm.migrate.volume=Do you want to migrate this volume? +message.confirm.attach.disk=Are you sure you want to attach disk? +message.confirm.create.volume=Are you sure you want to create volume? +message.confirm.enable.host=Please confirm that you want to enable the host +message.confirm.disable.host=Please confirm that you want to disable the host +message.confirm.delete.internal.lb=Please confirm you want to delete Internal LB +message.confirm.remove.load.balancer=Please confirm you want to remove VM from load balancer +message.confirm.delete.acl.list=Are you sure you want to delete this ACL list? +message.confirm.replace.acl.new.one=Do you want to replace the ACL with a new one? message.copy.iso.confirm=Please confirm that you wish to copy your ISO to message.copy.template=Copy template XXX from zone to message.create.template.vm=Create VM from template @@ -1826,6 +1916,8 @@ message.tooltip.zone.name=A name for the zone. message.update.os.preference=Please choose a OS preference for this host. All virtual instances with similar preferences will be first allocated to this host before choosing another. message.update.resource.count=Please confirm that you want to update resource counts for this account. message.update.ssl=Please submit a new X.509 compliant SSL certificate chain to be updated to each console proxy and secondary storage virtual instance\: +message.update.ssl.succeeded=Update SSL Certificates succeeded +message.update.ssl.failed=Failed to update SSL Certificate. message.validate.instance.name=Instance name can not be longer than 63 characters. Only ASCII letters a~z, A~Z, digits 0~9, hyphen are allowed. Must start with a letter and end with a letter or a digit. message.virtual.network.desc=A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router. message.vm.create.template.confirm=Create Template will reboot the VM automatically. @@ -1944,6 +2036,7 @@ state.Completed=Completed state.Creating=Creating state.Declined=Declined state.Destroyed=Destroyed +state.detached=Detached state.Disabled=Disabled state.Enabled=Enabled state.enabled=Enabled diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index c03ad67a9e0..7751b1fc271 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -964,7 +964,6 @@ dictionary = { 'label.projects': '', 'label.project.view': '', 'label.protocol': '', -'label.providers': '', 'label.provider': '', 'label.providers': '', 'label.public': '', diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp index 39299b3dacc..8f2a378de81 100644 --- a/ui/dictionary2.jsp +++ b/ui/dictionary2.jsp @@ -25,21 +25,6 @@ under the License. <% long now = System.currentTimeMillis(); %>