cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [09/50] git commit: updated refs/heads/ui-cisco-asa1000v-support to ac07a54
Date Thu, 02 May 2013 17:31:15 GMT
Merge branch 'master' into ui-add-remove-nics

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/dictionary.jsp


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

Branch: refs/heads/ui-cisco-asa1000v-support
Commit: eacbb4cb2d4e807b9f21a2ca49b99f86408c1c83
Parents: 6b1da42 ce7dc70
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Apr 30 11:57:38 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Apr 30 11:57:38 2013 -0700

----------------------------------------------------------------------
 .../cloud/configuration/ConfigurationService.java  |   15 +-
 api/src/com/cloud/network/NetworkModel.java        |    2 +-
 .../api/command/admin/cluster/ListClustersCmd.java |    8 +-
 .../api/command/admin/config/ListCfgsByCmd.java    |   44 +-
 .../api/command/admin/config/UpdateCfgCmd.java     |   47 +-
 .../api/command/admin/pod/ListPodsByCmd.java       |    7 +
 .../command/admin/systemvm/ListSystemVMsCmd.java   |    7 +
 .../api/command/user/iso/ListIsosCmd.java          |    7 +
 .../api/command/user/network/ListNetworksCmd.java  |    7 +
 .../command/user/template/ListTemplatesCmd.java    |    8 +
 .../api/response/ConfigurationResponse.java        |    3 +
 .../WEB-INF/classes/resources/messages.properties  |  569 ++--
 .../classes/resources/messages_ar.properties       |  285 ++
 .../classes/resources/messages_ca.properties       |    1 +
 .../classes/resources/messages_de_DE.properties    |   23 +-
 .../classes/resources/messages_es.properties       | 1367 ++++----
 .../classes/resources/messages_fr_FR.properties    | 1842 +++++-----
 .../classes/resources/messages_it_IT.properties    |    2 +-
 .../classes/resources/messages_ja.properties       | 2685 +++++++--------
 .../classes/resources/messages_ko_KR.properties    |    4 +-
 .../classes/resources/messages_nb_NO.properties    |    1 +
 .../classes/resources/messages_pt_BR.properties    |    2 +-
 .../classes/resources/messages_ru_RU.properties    |    4 +-
 .../classes/resources/messages_zh_CN.properties    |    5 +-
 client/tomcatconf/applicationContext.xml.in        |    2 +-
 client/tomcatconf/nonossComponentContext.xml.in    |    2 +-
 core/src/com/cloud/vm/VMInstanceVO.java            |    1 -
 docs/en-US/changed-API-commands-4.2.xml            |   15 +-
 docs/en-US/guest-ip-ranges.xml                     |   10 +-
 .../framework/client/ClientEventBus.java           |    4 +-
 .../cloudstack/framework/eventbus/EventBus.java    |   32 -
 .../framework/eventbus/EventBusBase.java           |  308 --
 .../framework/eventbus/EventBusEndpoint.java       |   61 -
 .../framework/eventbus/EventDispatcher.java        |  104 -
 .../framework/eventbus/EventHandler.java           |   30 -
 .../framework/eventbus/PublishScope.java           |   24 -
 .../cloudstack/framework/eventbus/Subscriber.java  |   24 -
 .../framework/messagebus/MessageBus.java           |   34 +
 .../framework/messagebus/MessageBusBase.java       |  408 +++
 .../framework/messagebus/MessageBusEndpoint.java   |   61 +
 .../framework/messagebus/MessageDispatcher.java    |  104 +
 .../framework/messagebus/MessageHandler.java       |   30 +
 .../framework/messagebus/MessageSubscriber.java    |   24 +
 .../framework/messagebus/PublishScope.java         |   24 +
 .../framework/server/ServerEventBus.java           |    4 +-
 .../sampleserver/SampleManagerComponent.java       |   12 +-
 .../sampleserver/SampleManagerComponent2.java      |   12 +-
 .../cloudstack/messagebus/TestMessageBus.java      |  116 +
 .../ipc/test/resources/MessageBusTestContext.xml   |   51 +
 .../vmware/manager/VmwareManagerImpl.java          |    3 +-
 .../hypervisor/xen/resource/CitrixHelper.java      |    3 +-
 .../cloud/network/resource/NetscalerResource.java  |   64 +-
 pom.xml                                            |    1 +
 server/src/com/cloud/alert/AlertManagerImpl.java   |   27 +-
 server/src/com/cloud/api/ApiDBUtils.java           |    2 +-
 server/src/com/cloud/api/ApiServer.java            |   17 +-
 server/src/com/cloud/capacity/dao/CapacityDao.java |    2 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   35 +-
 server/src/com/cloud/configuration/Config.java     |   20 +-
 .../cloud/configuration/ConfigurationManager.java  |    2 +-
 .../configuration/ConfigurationManagerImpl.java    |  173 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   65 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |    9 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   11 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   19 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    2 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |    6 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   11 +-
 .../src/com/cloud/server/ManagementServerImpl.java |  153 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |    1 +
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |    2 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   11 +-
 .../com/cloud/template/TemplateAdapterBase.java    |    7 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   10 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |    2 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    8 +-
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |    2 +-
 .../affinity/AffinityApiTestConfiguration.java     |   29 +-
 .../networkoffering/ChildTestConfiguration.java    |   38 +-
 setup/db/db/schema-410to420.sql                    |   39 +-
 setup/db/templates.sql                             |   12 +
 .../component/test_multiple_ip_ranges.py           |  238 ++
 test/integration/component/test_vpn_users.py       |  447 +++
 test/integration/smoke/test_global_settings.py     |   14 +-
 tools/transifex/.tx/config                         |   32 +
 tools/transifex/README-transifex.txt               |   71 +
 tools/transifex/sync-transifex-ui.sh               |  160 +
 ui/dictionary.jsp                                  | 1724 +++++-----
 ui/index.jsp                                       |    1 +
 ui/scripts/system.js                               |  160 +-
 .../vmware/util/VmwareGuestOsMapper.java           |   16 +-
 91 files changed, 7083 insertions(+), 5008 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eacbb4cb/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --cc client/WEB-INF/classes/resources/messages.properties
index 32f5946,8f9c662..2145e7f
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@@ -14,18 -14,7 +14,8 @@@
  # KIND, either express or implied.  See the License for the
  # specific language governing permissions and limitations
  # under the License.
 -
 +label.action.delete.nic=Remove NIC
- message.action.delete.nic=Please confirm that want to remove this NIC, which will also remove
the associated network from the VM.
- label.add.affinity.group=Add new affinity group
- message.delete.affinity.group=Please confirm that you would like to remove this affinity
group.
- label.delete.affinity.group=Delete Affinity Group
- label.edit.affinity.group=Edit Affinity Group
- label.affinity=Affinity
- label.anti.affinity=Anti-affinity
- label.affinity.groups=Affinity Groups
- label.anti.affinity.groups=Anti-affinity Groups
- label.affinity.group=Affinity Group
- label.anti.affinity.group=Anti-affinity Group
++message.action.delete.nic=Please confirm that want to remove this NIC, which will also remove
the associated network from the VM. 
  changed.item.properties=Changed item properties
  confirm.enable.s3=Please fill in the following information to enable support for S3-backed
Secondary Storage
  confirm.enable.swift=Please fill in the following information to enable support for Swift

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eacbb4cb/ui/dictionary.jsp
----------------------------------------------------------------------
diff --cc ui/dictionary.jsp
index 47ba794,d2b4a93..dd76c14
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@@ -25,437 -25,24 +25,26 @@@ under the License
  <% long now = System.currentTimeMillis(); %>
  <script language="javascript">
  dictionary = {
- 'label.action.delete.nic': '<fmt:message key="label.action.delete.nic"/>',
- 'message.action.delete.nic': '<fmt:message key="message.action.delete.nic"/>',
- 'label.add.affinity.group': '<fmt:message key="label.add.affinity.group"/>',
- 'message.delete.affinity.group': '<fmt:message key="message.delete.affinity.group"/>',
- 'label.delete.affinity.group': '<fmt:message key="label.delete.affinity.group"/>',
- 'label.edit.affinity.group': '<fmt:message key="label.edit.affinity.group"/>',
- 'label.affinity': '<fmt:message key="label.affinity"/>',
- 'label.anti.affinity': '<fmt:message key="label.anti.affinity"/>',
- 'label.affinity.groups': '<fmt:message key="label.affinity.groups"/>',
- 'label.anti.affinity.groups': '<fmt:message key="label.anti.affinity.groups"/>',
- 'label.affinity.group': '<fmt:message key="label.affinity.group"/>',
- 'label.anti.affinity.group': '<fmt:message key="label.anti.affinity.group"/>',
- 'message.redirecting.region': '<fmt:message key="message.redirecting.region"/>',
- 'label.use.vm.ip': '<fmt:message key="label.use.vm.ip"/>',
- 'label.cpu.limits': '<fmt:message key="label.cpu.limits"/>',
- 'label.memory.limits': '<fmt:message key="label.memory.limits"/>',
- 'label.primary.storage.limits': '<fmt:message key="label.primary.storage.limits"/>',
- 'label.secondary.storage.limits': '<fmt:message key="label.secondary.storage.limits"/>',
- 'label.max.cpus': '<fmt:message key="label.max.cpus"/>',
- 'label.max.memory': '<fmt:message key="label.max.memory"/>',
- 'label.max.primary.storage': '<fmt:message key="label.max.primary.storage"/>',
- 'label.max.secondary.storage': '<fmt:message key="label.max.secondary.storage"/>',
- 'label.add.region': '<fmt:message key="label.add.region"/>',
- 'label.remove.region': '<fmt:message key="label.remove.region"/>',
- 'message.remove.region': '<fmt:message key="message.remove.region"/>',
- 'message.add.region': '<fmt:message key="message.add.region"/>',
- 'label.region': '<fmt:message key="label.region"/>',
- 'label.endpoint': '<fmt:message key="label.endpoint"/>',
- 'label.menu.regions': '<fmt:message key="label.menu.regions"/>',
- 'label.plugins': '<fmt:message key="label.plugins"/>',
- 'label.plugin.details': '<fmt:message key="label.plugin.details"/>',
- 'label.author.name': '<fmt:message key="label.author.name"/>',
- 'label.author.email': '<fmt:message key="label.author.email"/>',
- 'label.external.link': '<fmt:message key="label.external.link"/>',
- 'label.enable.s3': '<fmt:message key="label.enable.s3"/>',
- 'confirm.enable.s3': '<fmt:message key="confirm.enable.s3"/>',
- 'message.after.enable.s3': '<fmt:message key="message.after.enable.s3"/>',
- 'label.s3.access_key': '<fmt:message key="label.s3.access_key"/>',
- 'label.s3.secret_key': '<fmt:message key="label.s3.secret_key"/>',
- 'label.s3.bucket': '<fmt:message key="label.s3.bucket"/>',
- 'label.s3.endpoint': '<fmt:message key="label.s3.endpoint"/>',
- 'label.s3.use_https': '<fmt:message key="label.s3.use_https"/>',
- 'label.s3.connection_timeout': '<fmt:message key="label.s3.connection_timeout"/>',
- 'label.s3.max_error_retry': '<fmt:message key="label.s3.max_error_retry"/>',
- 'label.s3.socket_timeout': '<fmt:message key="label.s3.socket_timeout"/>',
- 'label.egress.rules': '<fmt:message key="label.egress.rules"/>',
- 'message.acquire.new.ip.vpc': '<fmt:message key="message.acquire.new.ip.vpc"/>',
- 'label.quickview': '<fmt:message key="label.quickview"/>',
- 'label.migrate.to.host': '<fmt:message key="label.migrate.to.host"/>',
- 'label.migrate.to.storage': '<fmt:message key="label.migrate.to.storage"/>',
- 'label.stop': '<fmt:message key="label.stop"/>',
- 'label.reboot': '<fmt:message key="label.reboot"/>',
- 'label.destroy': '<fmt:message key="label.destroy"/>',
- 'label.restore': '<fmt:message key="label.restore"/>',
- 'label.broadcast.uri': '<fmt:message key="label.broadcast.uri"/>',
- 'label.isolation.uri': '<fmt:message key="label.isolation.uri"/>',
- 'message.zoneWizard.enable.local.storage': '<fmt:message key="message.zoneWizard.enable.local.storage"/>',
- 'label.edit.tags': '<fmt:message key="label.edit.tags"/>',  
- 'label.local.storage.enabled': '<fmt:message key="label.local.storage.enabled"/>',
- 'label.tier.details': '<fmt:message key="label.tier.details"/>',
- 'label.action.enable.physical.network': '<fmt:message key="label.action.enable.physical.network"/>',
- 'label.action.disable.physical.network': '<fmt:message key="label.action.disable.physical.network"/>',
- 'message.action.enable.physical.network': '<fmt:message key="message.action.enable.physical.network"/>',
- 'message.action.disable.physical.network': '<fmt:message key="message.action.disable.physical.network"/>',
- 'message.configure.all.traffic.types': '<fmt:message key="message.configure.all.traffic.types"/>',
- 'label.ipaddress': '<fmt:message key="label.ipaddress"/>',
- 'label.vcdcname': '<fmt:message key="label.vcdcname"/>',
- 'label.vcipaddress': '<fmt:message key="label.vcipaddress"/>',
- 'label.vsmctrlvlanid': '<fmt:message key="label.vsmctrlvlanid"/>',
- 'label.vsmpktvlanid': '<fmt:message key="label.vsmpktvlanid"/>',
- 'label.vsmstoragevlanid': '<fmt:message key="label.vsmstoragevlanid"/>',
- 'message.specify.url': '<fmt:message key="message.specify.url"/>',
- 'label.select.instance.to.attach.volume.to': '<fmt:message key="label.select.instance.to.attach.volume.to"/>',
- 'label.upload': '<fmt:message key="label.upload"/>',
- 'label.upload.volume': '<fmt:message key="label.upload.volume"/>',
- 'label.virtual.routers': '<fmt:message key="label.virtual.routers"/>',
- 'label.primary.storage.count': '<fmt:message key="label.primary.storage.count"/>',
- 'label.secondary.storage.count': '<fmt:message key="label.secondary.storage.count"/>',
- 'label.number.of.system.vms': '<fmt:message key="label.number.of.system.vms"/>',
- 'label.number.of.virtual.routers': '<fmt:message key="label.number.of.virtual.routers"/>',
- 'label.max.networks': '<fmt:message key="label.max.networks"/>',
- 'label.latest.events': '<fmt:message key="label.latest.events"/>',
- 'state.Enabled': '<fmt:message key="state.Enabled"/>',
- 'label.system.wide.capacity': '<fmt:message key="label.system.wide.capacity"/>',
- 'label.management': '<fmt:message key="label.management"/>',
- 'label.management.ips': '<fmt:message key="label.management.ips"/>',
- 'label.guest': '<fmt:message key="label.guest"/>',
- 'label.network.service.providers': '<fmt:message key="label.network.service.providers"/>',
- 'message.launch.zone': '<fmt:message key="message.launch.zone"/>',
- 'label.compute.offering': '<fmt:message key="label.compute.offering"/>',
- 'label.add.compute.offering': '<fmt:message key="label.add.compute.offering"/>',
- 'label.compute.offerings': '<fmt:message key="label.compute.offerings"/>',
- 'label.select.offering': '<fmt:message key="label.select.offering"/>',
- 'label.menu.infrastructure': '<fmt:message key="label.menu.infrastructure"/>',
- 'label.sticky.domain': '<fmt:message key="label.sticky.domain"/>',
- 'label.sticky.postonly': '<fmt:message key="label.sticky.postonly"/>',
- 'label.sticky.indirect': '<fmt:message key="label.sticky.indirect"/>',
- 'label.sticky.nocache': '<fmt:message key="label.sticky.nocache"/>',
- 'label.sticky.prefix': '<fmt:message key="label.sticky.prefix"/>',
- 'label.sticky.request-learn': '<fmt:message key="label.sticky.request-learn"/>',
- 'label.sticky.holdtime': '<fmt:message key="label.sticky.holdtime"/>',
- 'label.sticky.length': '<fmt:message key="label.sticky.length"/>',
- 'label.sticky.mode': '<fmt:message key="label.sticky.mode"/>',
- 'label.sticky.cookie-name': '<fmt:message key="label.sticky.cookie-name"/>',
- 'label.sticky.expire': '<fmt:message key="label.sticky.expire"/>',
- 'label.sticky.tablesize': '<fmt:message key="label.sticky.tablesize"/>',
- 'state.Migrating': '<fmt:message key="state.Migrating"/>',
- 'state.Allocating': '<fmt:message key="state.Allocating"/>',
- 'label.total.of.ip': '<fmt:message key="label.total.of.ip"/>',
- 'state.Stopping': '<fmt:message key="state.Stopping"/>',
- 'message.add.load.balancer.under.ip': '<fmt:message key="message.add.load.balancer.under.ip"/>',
- 'message.select.instance': '<fmt:message key="message.select.instance"/>',
- 'label.select': '<fmt:message key="label.select"/>',
- 'label.select.vm.for.static.nat': '<fmt:message key="label.select.vm.for.static.nat"/>',
- 'label.select.instance': '<fmt:message key="label.select.instance"/>',
- 'label.nat.port.range': '<fmt:message key="label.nat.port.range"/>',
- 'label.static.nat.vm.details': '<fmt:message key="label.static.nat.vm.details"/>',
- 'label.edit.lb.rule': '<fmt:message key="label.edit.lb.rule"/>',
- 'message.migrate.instance.to.host': '<fmt:message key="message.migrate.instance.to.host"/>',
- 'label.migrate.instance.to.host': '<fmt:message key="label.migrate.instance.to.host"/>',
- 'message.migrate.instance.to.ps': '<fmt:message key="message.migrate.instance.to.ps"/>',
- 'label.migrate.instance.to.ps': '<fmt:message key="label.migrate.instance.to.ps"/>',
- 'label.corrections.saved': '<fmt:message key="label.corrections.saved"/>',
- 'message.installWizard.copy.whatIsSecondaryStorage': '<fmt:message key="message.installWizard.copy.whatIsSecondaryStorage"/>',
- 'message.installWizard.copy.whatIsPrimaryStorage': '<fmt:message key="message.installWizard.copy.whatIsPrimaryStorage"/>',
- 'message.installWizard.copy.whatIsAHost': '<fmt:message key="message.installWizard.copy.whatIsAHost"/>',
- 'message.installWizard.copy.whatIsACluster': '<fmt:message key="message.installWizard.copy.whatIsACluster"/>',
- 'message.installWizard.copy.whatIsACluster': '<fmt:message key="message.installWizard.copy.whatIsACluster"/>',
- 'message.installWizard.copy.whatIsAPod': '<fmt:message key="message.installWizard.copy.whatIsAPod"/>',
- 'message.installWizard.copy.whatIsAZone': '<fmt:message key="message.installWizard.copy.whatIsAZone"/>',
- 'message.installWizard.copy.whatIsCloudStack': '<fmt:message key="message.installWizard.copy.whatIsCloudStack"/>',
- 'message.installWizard.tooltip.addSecondaryStorage.path': '<fmt:message key="message.installWizard.tooltip.addSecondaryStorage.path"/>',
- 'message.installWizard.tooltip.addSecondaryStorage.nfsServer': '<fmt:message key="message.installWizard.tooltip.addSecondaryStorage.nfsServer"/>',
- 'message.installWizard.tooltip.addPrimaryStorage.path': '<fmt:message key="message.installWizard.tooltip.addPrimaryStorage.path"/>',
- 'message.installWizard.tooltip.addPrimaryStorage.server': '<fmt:message key="message.installWizard.tooltip.addPrimaryStorage.server"/>',
- 'message.installWizard.tooltip.addPrimaryStorage.name': '<fmt:message key="message.installWizard.tooltip.addPrimaryStorage.name"/>',
- 'message.installWizard.tooltip.addHost.password': '<fmt:message key="message.installWizard.tooltip.addHost.password"/>',
- 'message.installWizard.tooltip.addHost.username': '<fmt:message key="message.installWizard.tooltip.addHost.username"/>',
- 'message.installWizard.tooltip.addHost.hostname': '<fmt:message key="message.installWizard.tooltip.addHost.hostname"/>',
- 'message.installWizard.tooltip.addCluster.name': '<fmt:message key="message.installWizard.tooltip.addCluster.name"/>',
- 'message.installWizard.tooltip.addPod.reservedSystemEndIp': '<fmt:message key="message.installWizard.tooltip.addPod.reservedSystemEndIp"/>',
- 'message.installWizard.tooltip.addPod.reservedSystemStartIp': '<fmt:message key="message.installWizard.tooltip.addPod.reservedSystemStartIp"/>',
- 'message.installWizard.tooltip.addPod.reservedSystemNetmask': '<fmt:message key="message.installWizard.tooltip.addPod.reservedSystemNetmask"/>',
- 'message.installWizard.tooltip.addPod.reservedSystemGateway': '<fmt:message key="message.installWizard.tooltip.addPod.reservedSystemGateway"/>',
- 'message.installWizard.tooltip.addPod.name': '<fmt:message key="message.installWizard.tooltip.addPod.name"/>',
- 'message.installWizard.tooltip.configureGuestTraffic.guestEndIp': '<fmt:message key="message.installWizard.tooltip.configureGuestTraffic.guestEndIp"/>',
- 'message.installWizard.tooltip.configureGuestTraffic.guestStartIp': '<fmt:message key="message.installWizard.tooltip.configureGuestTraffic.guestStartIp"/>',
- 'message.installWizard.tooltip.configureGuestTraffic.guestNetmask': '<fmt:message key="message.installWizard.tooltip.configureGuestTraffic.guestNetmask"/>',
- 'message.installWizard.tooltip.configureGuestTraffic.guestGateway': '<fmt:message key="message.installWizard.tooltip.configureGuestTraffic.guestGateway"/>',
- 'message.installWizard.tooltip.configureGuestTraffic.description': '<fmt:message key="message.installWizard.tooltip.configureGuestTraffic.description"/>',
- 'message.installWizard.tooltip.configureGuestTraffic.name': '<fmt:message key="message.installWizard.tooltip.configureGuestTraffic.name"/>',
- 'message.installWizard.tooltip.addZone.internaldns2': '<fmt:message key="message.installWizard.tooltip.addZone.internaldns2"/>',
- 'message.installWizard.tooltip.addZone.internaldns1': '<fmt:message key="message.installWizard.tooltip.addZone.internaldns1"/>',
- 'message.installWizard.tooltip.addZone.dns2': '<fmt:message key="message.installWizard.tooltip.addZone.dns2"/>',
- 'message.installWizard.tooltip.addZone.dns1': '<fmt:message key="message.installWizard.tooltip.addZone.dns1"/>',
- 'message.installWizard.tooltip.addZone.name': '<fmt:message key="message.installWizard.tooltip.addZone.name"/>',
- 'label.launch': '<fmt:message key="label.launch"/>',
- 'label.hints': '<fmt:message key="label.hints"/>',
- 'label.continue': '<fmt:message key="label.continue"/>',
- 'message.setup.successful': '<fmt:message key="message.setup.successful"/>',
- 'label.may.continue': '<fmt:message key="label.may.continue"/>',
- 'error.installWizard.message': '<fmt:message key="error.installWizard.message"/>',
- 'message.installWizard.now.building': '<fmt:message key="message.installWizard.now.building"/>',
- 'message.installWizard.click.retry': '<fmt:message key="message.installWizard.click.retry"/>',
- 'label.installWizard.click.launch': '<fmt:message key="label.installWizard.click.launch"/>',
- 'label.congratulations': '<fmt:message key="label.congratulations"/>',
- 'label.installWizard.addSecondaryStorageIntro.subtitle': '<fmt:message key="label.installWizard.addSecondaryStorageIntro.subtitle"/>',
- 'label.installWizard.addSecondaryStorageIntro.title': '<fmt:message key="label.installWizard.addSecondaryStorageIntro.title"/>',
- 'label.installWizard.addPrimaryStorageIntro.subtitle': '<fmt:message key="label.installWizard.addPrimaryStorageIntro.subtitle"/>',
- 'label.installWizard.addPrimaryStorageIntro.title': '<fmt:message key="label.installWizard.addPrimaryStorageIntro.title"/>',
- 'label.installWizard.addHostIntro.subtitle': '<fmt:message key="label.installWizard.addHostIntro.subtitle"/>',
- 'label.installWizard.addHostIntro.title': '<fmt:message key="label.installWizard.addHostIntro.title"/>',
- 'label.installWizard.addClusterIntro.subtitle': '<fmt:message key="label.installWizard.addClusterIntro.subtitle"/>',
- 'label.installWizard.addClusterIntro.title': '<fmt:message key="label.installWizard.addClusterIntro.title"/>',
- 'label.installWizard.addPodIntro.subtitle': '<fmt:message key="label.installWizard.addPodIntro.subtitle"/>',
- 'label.installWizard.addPodIntro.title': '<fmt:message key="label.installWizard.addPodIntro.title"/>',
- 'label.installWizard.addZone.title': '<fmt:message key="label.installWizard.addZone.title"/>',
- 'error.password.not.match': '<fmt:message key="error.password.not.match"/>',
- 'label.installWizard.addZoneIntro.subtitle': '<fmt:message key="label.installWizard.addZoneIntro.subtitle"/>',
- 'label.installWizard.addZoneIntro.title': '<fmt:message key="label.installWizard.addZoneIntro.title"/>',
- 'label.confirm.password': '<fmt:message key="label.confirm.password"/>',
- 'message.change.password': '<fmt:message key="message.change.password"/>',
- 'label.save.and.continue': '<fmt:message key="label.save.and.continue"/>',
- 'label.continue.basic.install': '<fmt:message key="label.continue.basic.install"/>',
- 'label.skip.guide': '<fmt:message key="label.skip.guide"/>',
- 'label.introduction.to.cloudstack': '<fmt:message key="label.introduction.to.cloudstack"/>',
- 'label.what.is.cloudstack': '<fmt:message key="label.what.is.cloudstack"/>',
- 'label.installWizard.subtitle': '<fmt:message key="label.installWizard.subtitle"/>',
- 'label.installWizard.title': '<fmt:message key="label.installWizard.title"/>',
- 'label.agree': '<fmt:message key="label.agree"/>',
- 'label.port.forwarding.policies': '<fmt:message key="label.port.forwarding.policies"/>',
- 'label.load.balancing.policies': '<fmt:message key="label.load.balancing.policies"/>',
- 'label.networking.and.security': '<fmt:message key="label.networking.and.security"/>',
- 'label.bandwidth': '<fmt:message key="label.bandwidth"/>',
- 'label.virtual.machines': '<fmt:message key="label.virtual.machines"/>',
- 'label.compute.and.storage': '<fmt:message key="label.compute.and.storage"/>',
- 'label.task.completed': '<fmt:message key="label.task.completed"/>',
- 'label.update.project.resources': '<fmt:message key="label.update.project.resources"/>',
- 'label.remove.project.account': '<fmt:message key="label.remove.project.account"/>',
- 'label.item.listing': '<fmt:message key="label.item.listing"/>',
- 'message.select.item': '<fmt:message key="message.select.item"/>',
- 'label.removing': '<fmt:message key="label.removing"/>',
- 'label.invite': '<fmt:message key="label.invite"/>',
- 'label.project.dashboard': '<fmt:message key="label.project.dashboard"/>',
- 'label.add.by': '<fmt:message key="label.add.by"/>',
- 'label.max.vms': '<fmt:message key="label.max.vms"/>',
- 'label.max.public.ips': '<fmt:message key="label.max.public.ips"/>',
- 'label.max.volumes': '<fmt:message key="label.max.volumes"/>',
- 'label.max.snapshots': '<fmt:message key="label.max.snapshots"/>',
- 'label.max.templates': '<fmt:message key="label.max.templates"/>',
- 'label.max.vpcs': '<fmt:message key="label.max.vpcs"/>',
- 'label.remind.later': '<fmt:message key="label.remind.later"/>',
- 'label.invited.accounts': '<fmt:message key="label.invited.accounts"/>',
- 'label.add.accounts.to': '<fmt:message key="label.add.accounts.to"/>',
- 'label.invite.to': '<fmt:message key="label.invite.to"/>',
- 'label.add.accounts': '<fmt:message key="label.add.accounts"/>',
- 'label.project.name': '<fmt:message key="label.project.name"/>',
- 'label.create.project': '<fmt:message key="label.create.project"/>',
- 'label.networks': '<fmt:message key="label.networks"/>',
- 'label.launch.vm': '<fmt:message key="label.launch.vm"/>',
- 'label.new.vm': '<fmt:message key="label.new.vm"/>',
- 'label.previous': '<fmt:message key="label.previous"/>',
- 'label.add.to.group': '<fmt:message key="label.add.to.group"/>',
- 'message.vm.review.launch': '<fmt:message key="message.vm.review.launch"/>',
- 'label.new': '<fmt:message key="label.new"/>',
- 'message.select.security.groups': '<fmt:message key="message.select.security.groups"/>',
- 'message.please.proceed': '<fmt:message key="message.please.proceed"/>',
- 'message.please.select.networks': '<fmt:message key="message.please.select.networks"/>',
- 'message.zone.no.network.selection': '<fmt:message key="message.zone.no.network.selection"/>',
- 'label.no.thanks': '<fmt:message key="label.no.thanks"/>',
- 'label.my.templates': '<fmt:message key="label.my.templates"/>',
- 'message.select.iso': '<fmt:message key="message.select.iso"/>',
- 'message.select.template': '<fmt:message key="message.select.template"/>',
- 'message.template.desc': '<fmt:message key="message.template.desc"/>',
- 'message.iso.desc': '<fmt:message key="message.iso.desc"/>',
- 'label.select.iso.or.template': '<fmt:message key="label.select.iso.or.template"/>',
- 'message.select.a.zone': '<fmt:message key="message.select.a.zone"/>',
- 'label.select.a.zone': '<fmt:message key="label.select.a.zone"/>',
- 'label.review': '<fmt:message key="label.review"/>',
- 'label.select.a.template': '<fmt:message key="label.select.a.template"/>',
- 'label.setup': '<fmt:message key="label.setup"/>',
- 'state.Allocated': '<fmt:message key="state.Allocated"/>',
- 'changed.item.properties': '<fmt:message key="changed.item.properties"/>',
- 'label.apply': '<fmt:message key="label.apply"/>',
- 'label.default': '<fmt:message key="label.default"/>',
- 'label.viewing': '<fmt:message key="label.viewing"/>',
- 'label.drag.new.position': '<fmt:message key="label.drag.new.position"/>',
- 'label.move.down.row': '<fmt:message key="label.move.down.row"/>',
- 'label.move.up.row': '<fmt:message key="label.move.up.row"/>',
- 'label.move.to.top': '<fmt:message key="label.move.to.top"/>',
- 'label.move.to.bottom': '<fmt:message key="label.move.to.bottom"/>',
- 'label.order': '<fmt:message key="label.order"/>',
- 'label.no.data': '<fmt:message key="label.no.data"/>',
- 'label.change.value': '<fmt:message key="label.change.value"/>',
- 'label.clear.list': '<fmt:message key="label.clear.list"/>',
- 'label.add.vm': '<fmt:message key="label.add.vm"/>',
- 'label.full.path': '<fmt:message key="label.full.path"/>',
- 'message.add.domain': '<fmt:message key="message.add.domain"/>',
- 'message.delete.user': '<fmt:message key="message.delete.user"/>',
- 'message.enable.user': '<fmt:message key="message.enable.user"/>',
- 'message.disable.user': '<fmt:message key="message.disable.user"/>',
- 'message.generate.keys': '<fmt:message key="message.generate.keys"/>',
- 'message.update.resource.count': '<fmt:message key="message.update.resource.count"/>',
- 'message.edit.account': '<fmt:message key="message.edit.account"/>',
- 'label.totoal.of.ip': '<fmt:message key="label.totoal.of.ip"/>',
- 'label.total.of.vm': '<fmt:message key="label.total.of.vm"/>',
- 'state.enabled': '<fmt:message key="state.enabled"/>',
- 'message.action.download.iso': '<fmt:message key="message.action.download.iso"/>',
- 'message.action.download.template': '<fmt:message key="message.action.download.template"/>',
- 'label.destination.zone': '<fmt:message key="label.destination.zone"/>',
- 'label.nic.adapter.type': '<fmt:message key="label.nic.adapter.type"/>',
- 'label.keyboard.type': '<fmt:message key="label.keyboard.type"/>',
- 'label.root.disk.controller': '<fmt:message key="label.root.disk.controller"/>',
- 'label.community': '<fmt:message key="label.community"/>',
- 'label.remove.egress.rule': '<fmt:message key="label.remove.egress.rule"/>',
- 'label.add.egress.rule': '<fmt:message key="label.add.egress.rule"/>',
- 'label.egress.rule': '<fmt:message key="label.egress.rule"/>',
- 'label.remove.ingress.rule': '<fmt:message key="label.remove.ingress.rule"/>',
- 'label.delete.vpn.user': '<fmt:message key="label.delete.vpn.user"/>',
- 'label.add.vpn.user': '<fmt:message key="label.add.vpn.user"/>',
- 'label.remove.pf': '<fmt:message key="label.remove.pf"/>',
- 'label.remove.vm.from.lb': '<fmt:message key="label.remove.vm.from.lb"/>',
- 'label.add.vms.to.lb': '<fmt:message key="label.add.vms.to.lb"/>',
- 'label.remove.static.nat.rule': '<fmt:message key="label.remove.static.nat.rule"/>',
- 'label.remove.rule': '<fmt:message key="label.remove.rule"/>',
- 'label.add.static.nat.rule': '<fmt:message key="label.add.static.nat.rule"/>',
- 'label.add.rule': '<fmt:message key="label.add.rule"/>',
- 'label.configuration': '<fmt:message key="label.configuration"/>',
- 'message.disable.vpn': '<fmt:message key="message.disable.vpn"/>',
- 'label.disable.vpn': '<fmt:message key="label.disable.vpn"/>',
- 'message.enable.vpn': '<fmt:message key="message.enable.vpn"/>',
- 'label.enable.vpn': '<fmt:message key="label.enable.vpn"/>',
- 'message.acquire.new.ip': '<fmt:message key="message.acquire.new.ip"/>',
- 'label.elastic': '<fmt:message key="label.elastic"/>',
- 'label.my.network': '<fmt:message key="label.my.network" />',
- 'label.add.vms': '<fmt:message key="label.add.vms" />',
- 'label.configure': '<fmt:message key="label.configure" />',
- 'label.stickiness': '<fmt:message key="label.stickiness" />',
- 'label.source': '<fmt:message key="label.source" />',
- 'label.least.connections': '<fmt:message key="label.least.connections" />',
- 'label.round.robin': '<fmt:message key="label.round.robin" />',
- 'label.network.domain.text': '<fmt:message key="label.network.domain.text" />',
- 'label.restart.required': '<fmt:message key="label.restart.required" />',
- 'label.clean.up': '<fmt:message key="label.clean.up" />',
- 'message.restart.network': '<fmt:message key="message.restart.network" />',
- 'label.restart.network': '<fmt:message key="label.restart.network" />',
- 'label.edit.network.details': '<fmt:message key="label.edit.network.details" />',
- 'message.add.guest.network': '<fmt:message key="message.add.guest.network" />',
- 'label.add.guest.network': '<fmt:message key="label.add.guest.network" />',
- 'label.guest.networks': '<fmt:message key="label.guest.networks" />',
- 'message.ip.address.changed': '<fmt:message key="message.ip.address.changed" />',
- 'state.BackingUp': '<fmt:message key="state.BackingUp" />',
- 'state.BackedUp': '<fmt:message key="state.BackedUp" />',
- 'label.done': '<fmt:message key="label.done" />',
- 'label.vm.name': '<fmt:message key="label.vm.name" />',
- 'message.migrate.volume': '<fmt:message key="message.migrate.volume" />',
- 'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
- 'message.create.template': '<fmt:message key="message.create.template" />',
- 'label.create.template': '<fmt:message key="label.create.template" />',
- 'message.download.volume.confirm': '<fmt:message key="message.download.volume.confirm"
/>',
- 'message.detach.disk': '<fmt:message key="message.detach.disk" />',
- 'state.ready': '<fmt:message key="state.ready" />',
- 'state.Ready': '<fmt:message key="state.Ready" />',
- 'label.vm.display.name': '<fmt:message key="label.vm.display.name" />',
- 'label.select-view': '<fmt:message key="label.select-view" />',
- 'label.local.storage': '<fmt:message key="label.local.storage" />',
- 'label.direct.ips': '<fmt:message key="label.direct.ips" />',
- 'label.view.all': '<fmt:message key="label.view.all" />',
- 'label.fetch.latest': '<fmt:message key="label.fetch.latest" />',
- 'label.zone.details': '<fmt:message key="label.zone.details" />',
- 'message.alert.state.detected': '<fmt:message key="message.alert.state.detected" />',
- 'state.Starting': '<fmt:message key="state.Starting" />',
- 'state.Expunging': '<fmt:message key="state.Expunging" />',
- 'state.Creating': '<fmt:message key="state.Creating" />',
- 'message.decline.invitation': '<fmt:message key="message.decline.invitation" />',
- 'label.decline.invitation': '<fmt:message key="label.decline.invitation" />',
- 'message.confirm.join.project': '<fmt:message key="message.confirm.join.project" />',
- 'message.join.project': '<fmt:message key="message.join.project" />',
- 'label.accept.project.invitation': '<fmt:message key="label.accept.project.invitation"
/>',
- 'label.token': '<fmt:message key="label.token" />',
- 'label.project.id': '<fmt:message key="label.project.id" />',
- 'message.enter.token': '<fmt:message key="message.enter.token" />',
- 'label.enter.token': '<fmt:message key="label.enter.token" />',
- 'state.Accepted': '<fmt:message key="state.Accepted" />',
- 'state.Pending': '<fmt:message key="state.Pending" />',
- 'state.Completed': '<fmt:message key="state.Completed" />',
- 'state.Declined': '<fmt:message key="state.Declined" />',
- 'label.project': '<fmt:message key="label.project" />',
- 'label.invitations': '<fmt:message key="label.invitations" />',
- 'label.delete.project': '<fmt:message key="label.delete.project" />',
- 'message.delete.project': '<fmt:message key="message.delete.project" />',
- 'message.activate.project': '<fmt:message key="message.activate.project" />',
- 'label.activate.project': '<fmt:message key="label.activate.project" />',
- 'label.suspend.project': '<fmt:message key="label.suspend.project" />',
- 'message.suspend.project': '<fmt:message key="message.suspend.project" />',
- 'state.Suspended': '<fmt:message key="state.Suspended" />',
- 'label.edit.project.details': '<fmt:message key="label.edit.project.details" />',
- 'label.new.project': '<fmt:message key="label.new.project" />',
- 'state.Active': '<fmt:message key="state.Active" />',
- 'state.Disabled': '<fmt:message key="state.Disabled" />',
- 'label.projects': '<fmt:message key="label.projects" />',
- 'label.make.project.owner': '<fmt:message key="label.make.project.owner" />',
- 'label.remove.project.account': '<fmt:message key="label.remove.project.account" />',
- 'message.project.invite.sent': '<fmt:message key="message.project.invite.sent" />',
- 'label.add.account.to.project': '<fmt:message key="label.add.account.to.project" />',
- 'label.revoke.project.invite': '<fmt:message key="label.revoke.project.invite" />',
- 'label.project.invite': '<fmt:message key="label.project.invite" />',
- 'label.select.project': '<fmt:message key="label.select.project" />',
- 'message.no.projects': '<fmt:message key="message.no.projects" />',
- 'message.no.projects.adminOnly': '<fmt:message key="message.no.projects.adminOnly" />',
- 'message.pending.projects.1': '<fmt:message key="message.pending.projects.1" />',
- 'message.pending.projects.2': '<fmt:message key="message.pending.projects.2" />',
- 'message.instanceWizard.noTemplates': '<fmt:message key="message.instanceWizard.noTemplates"
/>',
- 'label.view': '<fmt:message key="label.view" />',
- 'instances.actions.reboot.label': '<fmt:message key="instances.actions.reboot.label"
/>',
- 'label.filterBy': '<fmt:message key="label.filterBy" />',
- 'label.ok': '<fmt:message key="label.ok" />',
- 'notification.reboot.instance': '<fmt:message key="notification.reboot.instance" />',
- 'notification.start.instance': '<fmt:message key="notification.start.instance" />',
- 'notification.stop.instance': '<fmt:message key="notification.stop.instance" />',
- 'label.display.name': '<fmt:message key="label.display.name" />',
- 'label.zone.name': '<fmt:message key="label.zone.name" />',
- 'ui.listView.filters.all': '<fmt:message key="ui.listView.filters.all" />',
- 'ui.listView.filters.mine': '<fmt:message key="ui.listView.filters.mine" />',
- 'state.Running': '<fmt:message key="state.Running" />',
- 'state.Stopped': '<fmt:message key="state.Stopped" />',
- 'state.Destroyed': '<fmt:message key="state.Destroyed" />',
- 'state.Error': '<fmt:message key="state.Error" />',
- 'message.reset.password.warning.notPasswordEnabled': '<fmt:message key="message.reset.password.warning.notPasswordEnabled"
/>',
- 'message.reset.password.warning.notStopped': '<fmt:message key="message.reset.password.warning.notStopped"
/>',
- 'label.notifications': '<fmt:message key="label.notifications" />',
- 'label.default.view': '<fmt:message key="label.default.view" />',
- 'label.project.view': '<fmt:message key="label.project.view" />',
- 'label.action.migrate.router': '<fmt:message key="label.action.migrate.router" />',
- 'label.action.migrate.router.processing': '<fmt:message key="label.action.migrate.router.processing"
/>',
- 'message.migrate.router.confirm': '<fmt:message key="message.migrate.router.confirm"
/>',
- 'label.migrate.router.to': '<fmt:message key="label.migrate.router.to" />',
- 'label.action.migrate.systemvm': '<fmt:message key="label.action.migrate.systemvm" />',
- 'label.action.migrate.systemvm.processing': '<fmt:message key="label.action.migrate.systemvm.processing"
/>',
- 'message.migrate.systemvm.confirm': '<fmt:message key="message.migrate.systemvm.confirm"
/>',
- 'label.migrate.systemvm.to': '<fmt:message key="label.migrate.systemvm.to" />',
- 'mode': '<fmt:message key="mode" />',
- 'side.by.side': '<fmt:message key="side.by.side" />',
- 'inline': '<fmt:message key="inline" />',
++'label.action.delete.nic': '<fmt:message key="label.action.delete.nic" />',
++'message.action.delete.nic': '<fmt:message key="message.action.delete.nic" />',
+ 'changed.item.properties': '<fmt:message key="changed.item.properties" />',
+ 'confirm.enable.s3': '<fmt:message key="confirm.enable.s3" />',
+ 'confirm.enable.swift': '<fmt:message key="confirm.enable.swift" />',
+ 'error.could.not.enable.zone': '<fmt:message key="error.could.not.enable.zone" />',
+ 'error.installWizard.message': '<fmt:message key="error.installWizard.message" />',
+ 'error.invalid.username.password': '<fmt:message key="error.invalid.username.password"
/>',
+ 'error.login': '<fmt:message key="error.login" />',
+ 'error.menu.select': '<fmt:message key="error.menu.select" />',
+ 'error.mgmt.server.inaccessible': '<fmt:message key="error.mgmt.server.inaccessible"
/>',
+ 'error.password.not.match': '<fmt:message key="error.password.not.match" />',
+ 'error.please.specify.physical.network.tags': '<fmt:message key="error.please.specify.physical.network.tags"
/>',
+ 'error.session.expired': '<fmt:message key="error.session.expired" />',
+ 'error.something.went.wrong.please.correct.the.following': '<fmt:message key="error.something.went.wrong.please.correct.the.following"
/>',
+ 'error.unable.to.reach.management.server': '<fmt:message key="error.unable.to.reach.management.server"
/>',
+ 'error.unresolved.internet.name': '<fmt:message key="error.unresolved.internet.name"
/>',
  'extractable': '<fmt:message key="extractable" />',
- 'label.ocfs2': '<fmt:message key="label.ocfs2" />',
- 'label.action.edit.host': '<fmt:message key="label.action.edit.host" />',
- 'network.rate': '<fmt:message key="network.rate" />',
- 'ICMP.type': '<fmt:message key="ICMP.type" />',
- 'ICMP.code': '<fmt:message key="ICMP.code" />',
- 'image.directory': '<fmt:message key="image.directory" />',
- 'label.action.create.template.from.vm': '<fmt:message key="label.action.create.template.from.vm"
/>',
- 'label.action.create.template.from.volume': '<fmt:message key="label.action.create.template.from.volume"
/>',
- 'message.vm.create.template.confirm': '<fmt:message key="message.vm.create.template.confirm"
/>',
- 'label.action.manage.cluster': '<fmt:message key="label.action.manage.cluster" />',
- 'message.action.manage.cluster': '<fmt:message key="message.action.manage.cluster" />',
- 'label.action.manage.cluster.processing': '<fmt:message key="label.action.manage.cluster.processing"
/>',
- 'label.action.unmanage.cluster': '<fmt:message key="label.action.unmanage.cluster" />',
- 'message.action.unmanage.cluster': '<fmt:message key="message.action.unmanage.cluster"
/>',
- 'label.action.unmanage.cluster.processing': '<fmt:message key="label.action.unmanage.cluster.processing"
/>',
- 'label.allocation.state': '<fmt:message key="label.allocation.state" />',
- 'managed.state': '<fmt:message key="managed.state" />',
- 'label.default.use': '<fmt:message key="label.default.use" />',
- 'label.host.tags': '<fmt:message key="label.host.tags" />',
- 'label.cidr': '<fmt:message key="label.cidr" />',
- 'label.cidr.list': '<fmt:message key="label.cidr.list" />',
- 'label.storage.tags': '<fmt:message key="label.storage.tags" />',
- 'label.redundant.router': '<fmt:message key="label.redundant.router" />',
- 'label.is.redundant.router': '<fmt:message key="label.is.redundant.router" />',
- 'force.delete': '<fmt:message key="force.delete" />',
  'force.delete.domain.warning': '<fmt:message key="force.delete.domain.warning" />',
+ 'force.delete': '<fmt:message key="force.delete" />',
  'force.remove': '<fmt:message key="force.remove" />',
  'force.remove.host.warning': '<fmt:message key="force.remove.host.warning" />',
  'force.stop': '<fmt:message key="force.stop" />',


Mime
View raw message