From 720399b155aa24f11a6271b805d755445afe5cc6 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Thu, 27 Jan 2011 10:47:59 -0800
Subject: [PATCH] More localization cleanup

---
 .../classes/resources/messages.properties     |  11 +-
 .../classes/resources/messages_en.properties  |  87 -----------
 .../classes/resources/resource.properties     | 137 ------------------
 .../classes/resources/resource_zh.properties  |  39 -----
 ui/jsp/instance.jsp                           |  10 +-
 5 files changed, 10 insertions(+), 274 deletions(-)
 delete mode 100644 client/WEB-INF/classes/resources/resource.properties
 delete mode 100644 client/WEB-INF/classes/resources/resource_zh.properties

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index b419f161c52..ff499262a07 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -344,7 +344,6 @@ label.wednesday=Wednesday
 label.thursday=Thursday
 label.friday=Friday
 label.saturday=Saturday
-label.time.zone=Time Zone
 label.keep=Keep
 label.snapshot.s=Snapshot (s)
 label.please.wait=Please Wait
@@ -415,11 +414,11 @@ label.zone.step.2.title=Step 2: <strong>Add a Zone</strong>
 label.zone.step.3.title=Step 3: <strong>Add a Pod</strong>
 label.zone.step.4.title=Step 4: <strong>Add an IP range</strong>
 
-label.vm.add=Add VM
-label.vm.start=Start VM
-label.vm.stop=Stop VM
-label.vm.reboot=Reboot VM
-label.vm.destroy=Destroy VM
+label.vm.add=Add Instance
+label.vm.start=Start
+label.vm.stop=Stop
+label.vm.reboot=Reboot
+label.vm.destroy=Destroy
 
 label.action.edit.account=Edit account
 label.action.resource.limits=Resource limits
diff --git a/client/WEB-INF/classes/resources/messages_en.properties b/client/WEB-INF/classes/resources/messages_en.properties
index aa3523cc0fa..e69de29bb2d 100644
--- a/client/WEB-INF/classes/resources/messages_en.properties
+++ b/client/WEB-INF/classes/resources/messages_en.properties
@@ -1,87 +0,0 @@
-#Labels
-label.cloud.console=Cloud Management Console
-label.welcome.cloud.console=Welcome to Management Console
-label.username=Username
-label.password=Password
-label.domain=Domain
-label.login=Login
-label.welcome=Welcome
-label.logout=Logout
-label.advanced.search=Advance Search
-label.close=Close
-label.name=Name
-label.status=Status
-label.actions=Actions
-label.zone=Zone
-label.pod=Pod
-label.add=Add
-label.add.zone=Add Zone
-label.adding.zone=Adding Zone
-label.add.host=Add Host
-label.add.cluster=Add Cluster
-label.add.primarystorage=Add Primary Storage
-label.add.secondarystorage=Add Secondary Storage
-label.add.pod=Add Pod
-label.adding.pod=Adding Pod
-label.add.vlan=Add VLAN
-label.add.direct.iprange=Add Direct Ip Range
-label.update.ssl.cert=Update SSL Certificate
-label.help=Help
-label.refresh=Refresh
-label.loading=Loading
-label.no.actions=No Available Actions
-label.no.items=No Available Items
-label.adding.cluster=Adding Cluster
-label.cluster=Cluster
-label.domain.name=Domain Name
-label.advanced=Advanced
-label.details=Details
-
-label.menu.dashboard=Dashboard
-label.menu.instances=Instances
-label.menu.my.instances=My Instances
-label.menu.all.instances=All Instances
-label.menu.running.instances=Running Instances
-label.menu.stopped.instances=Stopped Instances
-label.menu.destroyed.instances=Destroyed Instances
-label.menu.storage=Storage
-label.menu.volumes=Volumes
-label.menu.snapshots=Snapshots
-label.menu.network=Network
-label.menu.ipaddresses=IP Addresses
-label.menu.templates=Templates
-label.menu.my.templates=My Templates
-label.menu.featured.templates=Featured Templates
-label.menu.community.templates=Community Templates
-label.menu.isos=ISOs
-label.menu.my.isos=My ISOs
-label.menu.featured.isos=Featured ISOs
-label.menu.community.isos=Community ISOs
-label.menu.accounts=Accounts
-label.menu.domains=Domains
-label.menu.events=Events
-label.menu.alerts=Alerts
-label.menu.system=System
-label.menu.physical.resources=Physical Resources
-label.menu.virtual.resources=Virtual Resources
-label.menu.virtual.appliances=Virtual Appliances
-label.menu.system.vms=System VMs
-label.menu.configuration=Configuration
-label.menu.service.offerings=Service Offerings
-label.menu.disk.offerings=Disk Offerings
-label.menu.global.settings=Global Settings
-label.menu.security.groups=Security Groups
-
-label.vm.start=Start VM
-label.vm.stop=Stop VM
-label.vm.reboot=Reboot VM
-label.vm.destroy=Destroy VM
-
-#Messages
-
-#Errors
-error.login=Your username/password does not match our records.
-error.session.expired=Your session has expired.
-error.unresolved.internet.name=Your internet name cannot be resolved.
-error.mgmt.server.inaccessible=The Management Server is unaccessible.  Please try again later.
-error.menu.select=Unable to perform action due to no items being selected. 
\ No newline at end of file
diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
deleted file mode 100644
index 0422dc41523..00000000000
--- a/client/WEB-INF/classes/resources/resource.properties
+++ /dev/null
@@ -1,137 +0,0 @@
-actions = Actions
-add = Add
-help = Help
-advanced = Advanced
-version = Version
-
-dashboard = Dashboard
-instances = Instances
-router = Router
-storage = Storage
-volumes = Volumes
-snapshots = Snapshots
-ip.addresses = IP Addresses
-templates = Templates
-my.templates = My Templates
-featured.templates = Featured Templates
-community.templates = Community Templates
-isos = ISOs
-my.isos = My ISOs
-featured.isos = Featured ISOs
-community.isos = Community ISOs
-accounts = Accounts
-domains = Domains
-events = Events
-alerts = Alerts
-system = System
-configuration = Configuration
-
-global.settings = Global Settings
-resources = Resources
-service.offerings = Service Offerings
-disk.offerings = Disk Offerings
-
-details = Details
-statistics = Statistics
-network = Network
-secondary.storage = Secondary Storage
-
-no.available.actions = No available actions
-
-ID = ID
-name = Name
-display.text = Display Text
-os.type = OS Type
-public = Public
-instance.name = Instance Name
-group.name = Group Name
-service.offering = Service Offering
-password.enabled = Password Enabled
-instance.limit = Instance Limit
-public.ip.limit = Public IP Limit
-disk.volume.limit = Disk Volume Limit
-snapshot.limit = Snapshot Limit
-template.limit = Template Limit
-URL = URL
-zone = Zone
-pod = Pod
-cluster = Cluster
-bootable = Bootable
-group = Group
-storage.type = Storage Type
-CPU = CPU
-memory = Memory
-offer.HA = Offer HA
-network.type = Network Type
-created = Created
-disk.size = Disk Size
-value = Value
-description = Description
-category = Category
-hypervisor = Hypervisor
-dns1 = DNS 1
-dns2 = DNS 2
-internaldns1 = Internal DNS 1
-internaldns2 = Internal DNS 2
-vlan = VLAN
-guestcidraddress = Guest CIDR
-private.cidr = Private CIDR
-private.ip.range = Private IP Range
-gateway = Gateway
-state = State
-system.vm.type = System VM Type
-active.sessions = Active Sessions
-public.ip = Public IP
-private.ip = Private IP
-host = Host
-state = State
-os.preference = OS Preference
-last.disconnected = Last Disconnected
-IP.or.FQDN = IP/FQDN
-path = Path
-tags = Tags
-type = Type
-disk.total = Disk Total
-disk.allocated = Disk Allocated
-ip.address.range = IP Range
-OS.preference = OS Preference
-none = None
-
-disk.offering = Disk Offering
-copy.ISO.to = Copy ISO to
-no.available.iso = No Available ISO
-please.wait = Please wait
-
-your.session.has.expired = Your session has expired
-internet.name.can.not.be.resolved = Internet name can not be resolved
-management.server.is.not.accessible = Management server is not accessible
-please.select.at.least.one.item.in.middle.menu = Please select at least one item in middle menu
-please.confirm.you.want.to.detach.an.iso.from.the.virtual.machine = Please confirm you want to detach an ISO from the virtual machine
-please.specify.the.iso.you.wish.to.attach.to.virtual.machine = Please specify the ISO you wish to attach to virtual instance
-please.specify.the.new.name.you.want.to.change.for.the.virtual.machine = Please specify the new name you want to change for the virtual instance
-please.specify.the.new.group.you.want.to.assign.the.virtual.machine.to = Please specify the new group you want to assign the virtual machine to
-after.changing.service.offering.you.must.restart.the.virtual.machine.for.new.service.offering.to.take.effect = After changing service offering, you must restart the virtual machine for the new service offering to take effect.
-creating.a.template.of.disk.volume.could.take.up.to.several.hours.depending.on.the.size.of.the.disk.volume = Creating a template of disk volume could take up to several hours depending on the size of the disk volume
-please.specify.limits.to.the.various.resources.-1.means.the.resource.has.no.limits = Please specify limits to the various resources. -1 means the resource has no limits.
-please.confirm.you.want.to.disable.account.that.will.prevent.account.access.to.the.cloud.and.shut.down.all.existing.virtual.machines = Please confirm you want to disable account that will prevent account access to the cloud and shut down all existing virtual machines.
-please.confirm.you.want.to.lock.account.that.will.prevent.account.access.to.the.cloud = Please confirm you want to lock account that will prevent account access to the cloud.
-please.confirm.you.want.to.enable.account = Please confirm you want to enable account.
-please.select.an.available.zone.to.associate.your.new.ip.with..acquiring.additional.ip.may.cost.you.an.additional.dollars.per.month. = Please select an availability zone to associate your new IP with. Acquiring additional IP may cost you an additional dollars per month.
-please.restart.your.management.server.for.your.new.settings.to.take.effect = Please RESTART your management server for your new settings to take effect
-Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts. = Please choose a OS preference for this host.  Virtual machines will always be allocated to hosts with an OS preference that matches with the OS type of the template chosen for the virtual machine before choosing other hosts.
-customizable.during.VM.creation = Customizable during VM creation
-
-physical.resources = Physical Resources
-virtual.resources = Virtual Resources
-virtual.routers = Virtual Routers
-system.vms = System VMs
-system.vm = System VM
-
-add.zone = Add Zone
-add.host = Add Host
-add.primarystorage = Add Primary Storage
-add.secondarystorage = Add Secondary Storage
-add.pod = Add pod
-add.vlan = Add VLAN
-add.direct.ip.range = Add Direct IP Range
-update.SSL.certificate = Update SSL Certificate
\ No newline at end of file
diff --git a/client/WEB-INF/classes/resources/resource_zh.properties b/client/WEB-INF/classes/resources/resource_zh.properties
deleted file mode 100644
index 44c50ef43ca..00000000000
--- a/client/WEB-INF/classes/resources/resource_zh.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-actions = 功能
-add = 增加
-help = 幫助
-advanced = 進階
-version = 版本
-
-dashboard = 儀器板
-instance = 實例
-router = 路由器
-storage = 貯藏
-volume = 容積
-snapshot = 快照
-ip.address = 網路地址
-template = 模板
-my.template = 我的模板
-featured.template = 特色模板
-community.template = 共有模板
-iso = 空白模板
-my.iso = 我的空白模板
-featured.iso = 特色空白模板
-community.iso = 共有空白模板
-account = 帳戶
-domain = 領土
-event = 事件
-alert = 警報
-
-Details = 詳述
-Volume = 容積
-Statistics = 統計
-Zone = 區域
-Template = 模板
-Service = 服務
-HA = 高的可用性
-Created = 產生日期
-Account = 帳戶
-Host = 主機
-ISO = 空白模板
-
-
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index c85683953f2..b49eb976d1d 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1054,7 +1054,7 @@
     <div class="actionpanel_button_wrapper" id="add_vm_button">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/addvm_actionicon.png" alt="Add VM" /></div>
+                <img src="images/addvm_actionicon.png" /></div>
             <div class="actionpanel_button_links">
                 <fmt:message key="label.vm.add"/>
             </div>
@@ -1064,7 +1064,7 @@
     <div class="actionpanel_button_wrapper" id="start_vm_button">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/startvm_actionicon.png" alt="Start VM" /></div>
+                <img src="images/startvm_actionicon.png" /></div>
             <div class="actionpanel_button_links">
                 <fmt:message key="label.vm.start" />
             </div>
@@ -1073,7 +1073,7 @@
     <div class="actionpanel_button_wrapper" id="stop_vm_button">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/stopvm_actionicon.png" alt="Stop VM" /></div>
+                <img src="images/stopvm_actionicon.png"/></div>
             <div class="actionpanel_button_links">
                 <fmt:message key="label.vm.stop" />
             </div>
@@ -1082,7 +1082,7 @@
     <div class="actionpanel_button_wrapper" id="reboot_vm_button">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/rebootvm_actionicon.png" alt="Reboot VM" /></div>
+                <img src="images/rebootvm_actionicon.png" /></div>
             <div class="actionpanel_button_links">
                 <fmt:message key="label.vm.reboot" />
             </div>
@@ -1091,7 +1091,7 @@
     <div class="actionpanel_button_wrapper" id="destroy_vm_button">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/destroyvm_actionicon.png" alt="Destroy VM" /></div>
+                <img src="images/destroyvm_actionicon.png" /></div>
             <div class="actionpanel_button_links">
                 <fmt:message key="label.vm.destroy" />
             </div>