You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/30 02:47:00 UTC
[01/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Updated Branches:
refs/heads/internallb 440e8484d -> 4c22c911a
Fix small typo
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c34233d5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c34233d5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c34233d5
Branch: refs/heads/internallb
Commit: c34233d5b1091bda9cd6580351845f5c90dcff2f
Parents: 0412c95
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Apr 26 08:55:47 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Apr 26 08:56:29 2013 +0200
----------------------------------------------------------------------
agent/conf/agent.properties | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c34233d5/agent/conf/agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index e49afbf..7dc4ba8 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -78,7 +78,7 @@ domr.scripts.dir=scripts/network/domr/kvm
# a sensible default will be selected based on the network.bridge.type but can
# be overridden here.
# native = com.cloud.hypervisor.kvm.resource.BridgeVifDriver
-# openvswitch = com.cloud.hypervisor.kvm.resource.OvsBridgeDriver
+# openvswitch = com.cloud.hypervisor.kvm.resource.OvsVifDriver
#libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.BridgeVifDriver
# set the hypervisor type, values are: kvm, lxc
[33/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
[TRANSLATION] Adding arabic strings
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/134704bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/134704bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/134704bb
Branch: refs/heads/internallb
Commit: 134704bb10fd6177c103b12adb3045683ce2f1ad
Parents: 08f6a24
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Apr 29 06:56:46 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Apr 29 06:56:46 2013 -0400
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 1 +
.../classes/resources/messages_ar.properties | 1547 +++++++++++++++
ui/index.jsp | 1 +
3 files changed, 1549 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/134704bb/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 fbc0471..9f84c5a 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -631,6 +631,7 @@ label.lang.japanese=Japanese
label.lang.korean=Korean
label.lang.russian=Russian
label.lang.spanish=Spanish
+label.lang.arabic=Arabic
label.last.disconnected=Last Disconnected
label.last.name=Last Name
label.latest.events=Latest events
[02/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2152 Fix rel number, needs to be present
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0412c95e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0412c95e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0412c95e
Branch: refs/heads/internallb
Commit: 0412c95ef845cb9b67d9fd4a3d89d11b2399b521
Parents: 2f40a90
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Apr 23 15:05:20 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Apr 26 08:56:29 2013 +0200
----------------------------------------------------------------------
packaging/centos63/package.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0412c95e/packaging/centos63/package.sh
----------------------------------------------------------------------
diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh
index faa089b..c466f58 100755
--- a/packaging/centos63/package.sh
+++ b/packaging/centos63/package.sh
@@ -44,7 +44,7 @@ if echo $VERSION | grep SNAPSHOT ; then
else
DEFVER="-D_ver $REALVER"
DEFPRE=
- DEFREL=
+ DEFREL="-D_rel 1"
fi
mkdir -p $RPMDIR/SPECS
@@ -78,7 +78,7 @@ else
REALVER=`echo $VERSION`
DEFVER="-D_ver $REALVER"
DEFPRE=
- DEFREL=
+ DEFREL="-D_rel 1"
fi
mkdir -p $RPMDIR/SPECS
[25/50] [abbrv] CLOUDSTACK-2138 - first automate sync with Transifex.
1/ Upload the lastest EN resource file on Transifex. 2/ Download the lastest
L10N resource file for "ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU
zh_CN" form Transifex to CS repo
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_it_IT.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties
index c6bc2db..f0c6524 100644
--- a/client/WEB-INF/classes/resources/messages_it_IT.properties
+++ b/client/WEB-INF/classes/resources/messages_it_IT.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
changed.item.properties=Elementi delle propriet\u00e0 modificati
confirm.enable.s3=Si prega di inserire i valori richiesti per abilitare il supporto per il Secondary Storage di tipo S3
confirm.enable.swift=Si prega di inserire i valori richiesti per abilitare il supporto per Swift
[10/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - API: change listZones API to to take in zonetype instead of networktype (to be consistent with other listXXXXXXXs API).
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a20ed3a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a20ed3a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a20ed3a4
Branch: refs/heads/internallb
Commit: a20ed3a43de2de6df10e2348330371fba7a535a0
Parents: 3e2eb59
Author: Jessica Wang <je...@apache.org>
Authored: Fri Apr 26 11:37:32 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Apr 26 11:37:32 2013 -0700
----------------------------------------------------------------------
.../api/command/user/zone/ListZonesByCmd.java | 9 +++++----
.../src/com/cloud/api/query/QueryManagerImpl.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a20ed3a4/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
index d0dc736..ed31037 100644
--- a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
@@ -23,6 +23,7 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
@@ -56,8 +57,8 @@ public class ListZonesByCmd extends BaseListCmd {
@Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the name of the zone")
private String name;
- @Parameter(name=ApiConstants.NETWORK_TYPE, type=CommandType.STRING, description="the network type of the zone")
- private String networkType;
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
@Parameter(name=ApiConstants.SHOW_CAPACITIES, type=CommandType.BOOLEAN, description="flag to display the capacity of the zones")
private Boolean showCapacities;
@@ -82,8 +83,8 @@ public class ListZonesByCmd extends BaseListCmd {
return name;
}
- public String getNetworkType(){
- return networkType;
+ public String getZoneType() {
+ return zoneType;
}
public Boolean getShowCapacities() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a20ed3a4/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 2c003d3..50018e5 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2219,7 +2219,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
Long id = cmd.getId();
String keyword = cmd.getKeyword();
String name = cmd.getName();
- String networkType = cmd.getNetworkType();
+ String networkType = cmd.getZoneType();
Filter searchFilter = new Filter(DataCenterJoinVO.class, null, false, cmd.getStartIndex(), cmd.getPageSizeVal());
SearchCriteria<DataCenterJoinVO> sc = _dcJoinDao.createSearchCriteria();
[48/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Look for null pointer on account id before trying to update usage when releasing
an IP. This seems to be possible if expunge fails at some point after freeing
an IP, on subsequent expunge tries the IP is freed already and gets null pointer
when looking for account id.
BUG-ID: CLOUDSTACK-2279
Bugfix-for: 4.1,4.2
Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1367251304 -0600
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a0dbf890
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0dbf890
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0dbf890
Branch: refs/heads/internallb
Commit: a0dbf8909058dba202c057f5b9d589026399c6ef
Parents: 8545e68
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Apr 29 10:01:44 2013 -0600
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Mon Apr 29 10:01:44 2013 -0600
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0dbf890/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 7adcf07..4a8b38f 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2886,7 +2886,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
}
// Save usage event
- if (ip.getAllocatedToAccountId() != Account.ACCOUNT_ID_SYSTEM) {
+ if (ip.getAllocatedToAccountId() != null && ip.getAllocatedToAccountId() != Account.ACCOUNT_ID_SYSTEM) {
VlanVO vlan = _vlanDao.findById(ip.getVlanId());
String guestType = vlan.getVlanType().toString();
[20/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/deaf9106
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/deaf9106
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/deaf9106
Branch: refs/heads/internallb
Commit: deaf9106ca557a938edf25bee65cf6b4eb3ac03f
Parents: b2fdd5e
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Mon Apr 29 14:11:51 2013 +0530
Committer: Harikrishna Patnala <ha...@citrix.com>
Committed: Mon Apr 29 14:11:51 2013 +0530
----------------------------------------------------------------------
.../cloud/configuration/ConfigurationService.java | 15 +-
api/src/com/cloud/network/NetworkModel.java | 2 +-
.../api/command/admin/config/ListCfgsByCmd.java | 44 +++-
.../api/command/admin/config/UpdateCfgCmd.java | 47 +++-
.../api/response/ConfigurationResponse.java | 3 +
server/src/com/cloud/alert/AlertManagerImpl.java | 27 ++-
server/src/com/cloud/api/ApiDBUtils.java | 2 +-
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 | 25 +--
.../src/com/cloud/network/NetworkManagerImpl.java | 7 +-
server/src/com/cloud/network/NetworkModelImpl.java | 11 +-
.../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 | 41 +++-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 1 +
.../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 | 4 +
test/integration/smoke/test_global_settings.py | 14 +-
29 files changed, 389 insertions(+), 201 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/api/src/com/cloud/configuration/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java
index 6937d0b..fdbd9d6 100644
--- a/api/src/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/com/cloud/configuration/ConfigurationService.java
@@ -20,6 +20,11 @@ import java.util.List;
import javax.naming.NamingException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.exception.ResourceAllocationException;
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
@@ -46,10 +51,6 @@ import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
import com.cloud.dc.DataCenter;
import com.cloud.dc.Pod;
import com.cloud.dc.Vlan;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Networks.TrafficType;
import com.cloud.offering.DiskOffering;
import com.cloud.offering.NetworkOffering;
@@ -65,7 +66,7 @@ public interface ConfigurationService {
* - the command wrapping name and value parameters
* @return updated configuration object if successful
*/
- Configuration updateConfiguration(UpdateCfgCmd cmd);
+ Configuration updateConfiguration(UpdateCfgCmd cmd) throws InvalidParameterValueException;
/**
* Create a service offering through the API
@@ -250,7 +251,7 @@ public interface ConfigurationService {
NetworkOffering getNetworkOffering(long id);
- Integer getNetworkOfferingNetworkRate(long networkOfferingId);
+ Integer getNetworkOfferingNetworkRate(long networkOfferingId, Long dataCenterId);
Account getVlanAccount(long vlanId);
@@ -262,7 +263,7 @@ public interface ConfigurationService {
Long getDefaultPageSize();
- Integer getServiceOfferingNetworkRate(long serviceOfferingId);
+ Integer getServiceOfferingNetworkRate(long serviceOfferingId, Long dataCenterId);
DiskOffering getDiskOffering(long diskOfferingId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/api/src/com/cloud/network/NetworkModel.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java
index 4d7d714..d81b2d7 100644
--- a/api/src/com/cloud/network/NetworkModel.java
+++ b/api/src/com/cloud/network/NetworkModel.java
@@ -181,7 +181,7 @@ public interface NetworkModel {
/**
* @return
*/
- String getDefaultNetworkDomain();
+ String getDefaultNetworkDomain(long zoneId);
/**
* @param ntwkOffId
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index 9f34405..a11904e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -45,11 +45,17 @@ public class ListCfgsByCmd extends BaseListCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "lists configuration by name")
private String configName;
- @Parameter(name=ApiConstants.SCOPE, type = CommandType.STRING, description = "scope(zone/cluster/pool/account) of the parameter that needs to be updated")
- private String scope;
+ @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, description="the ID of the Zone to update the parameter value for corresponding zone")
+ private Long zone_id;
- @Parameter(name=ApiConstants.ID, type = CommandType.UUID, entityType = {ZoneResponse.class, ClusterResponse.class, StoragePoolResponse.class, AccountResponse.class}, description = "corresponding ID of the scope")
- private Long id;
+ @Parameter(name=ApiConstants.CLUSTER_ID, type=CommandType.UUID, entityType=ClusterResponse.class, description="the ID of the Cluster to update the parameter value for corresponding cluster")
+ private Long cluster_id;
+
+ @Parameter(name=ApiConstants.STORAGE_ID, type=CommandType.UUID, entityType=StoragePoolResponse.class, description="the ID of the Storage pool to update the parameter value for corresponding storage pool")
+ private Long storagepool_id;
+
+ @Parameter(name=ApiConstants.ACCOUNT_ID, type=CommandType.UUID, entityType=AccountResponse.class, description="the ID of the Account to update the parameter value for corresponding account")
+ private Long account_id;
// ///////////////////////////////////////////////////
@@ -64,14 +70,21 @@ public class ListCfgsByCmd extends BaseListCmd {
return configName;
}
- public String getScope() {
- return scope;
+ public Long getZoneId() {
+ return zone_id;
+ }
+
+ public Long getClusterId() {
+ return cluster_id;
}
- public Long getId() {
- return id;
+ public Long getStoragepoolId() {
+ return storagepool_id;
}
+ public Long getAccountId() {
+ return account_id;
+ }
@Override
public Long getPageSizeVal() {
@@ -100,10 +113,17 @@ public class ListCfgsByCmd extends BaseListCmd {
for (Configuration cfg : result.first()) {
ConfigurationResponse cfgResponse = _responseGenerator.createConfigurationResponse(cfg);
cfgResponse.setObjectName("configuration");
- if (scope != null) {
- cfgResponse.setScope(scope);
- } else {
- cfgResponse.setScope("global");
+ if(getZoneId() != null) {
+ cfgResponse.setScope("zone");
+ }
+ if(getClusterId() != null) {
+ cfgResponse.setScope("cluster");
+ }
+ if(getStoragepoolId() != null) {
+ cfgResponse.setScope("storagepool");
+ }
+ if(getAccountId() != null) {
+ cfgResponse.setScope("account");
}
configResponses.add(cfgResponse);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
index 074c5a3..deb61d3 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
@@ -43,11 +43,17 @@ public class UpdateCfgCmd extends BaseCmd {
@Parameter(name=ApiConstants.VALUE, type=CommandType.STRING, description="the value of the configuration", length=4095)
private String value;
- @Parameter(name=ApiConstants.SCOPE, type = CommandType.STRING, description = "scope(zone/cluster/pool/account) of the parameter that needs to be updated")
- private String scope;
+ @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, description="the ID of the Zone to update the parameter value for corresponding zone")
+ private Long zone_id;
- @Parameter(name=ApiConstants.ID, type = CommandType.UUID, entityType = {ZoneResponse.class, ClusterResponse.class, StoragePoolResponse.class, AccountResponse.class}, description = "corresponding ID of the scope")
- private Long id;
+ @Parameter(name=ApiConstants.CLUSTER_ID, type=CommandType.UUID, entityType=ClusterResponse.class, description="the ID of the Cluster to update the parameter value for corresponding cluster")
+ private Long cluster_id;
+
+ @Parameter(name=ApiConstants.STORAGE_ID, type=CommandType.UUID, entityType=StoragePoolResponse.class, description="the ID of the Storage pool to update the parameter value for corresponding storage pool")
+ private Long storagepool_id;
+
+ @Parameter(name=ApiConstants.ACCOUNT_ID, type=CommandType.UUID, entityType=AccountResponse.class, description="the ID of the Account to update the parameter value for corresponding account")
+ private Long account_id;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
@@ -61,12 +67,20 @@ public class UpdateCfgCmd extends BaseCmd {
return value;
}
- public String getScope() {
- return scope;
+ public Long getZoneId() {
+ return zone_id;
}
- public Long getId() {
- return id;
+ public Long getClusterId() {
+ return cluster_id;
+ }
+
+ public Long getStoragepoolId() {
+ return storagepool_id;
+ }
+
+ public Long getAccountId() {
+ return account_id;
}
/////////////////////////////////////////////////////
@@ -89,12 +103,19 @@ public class UpdateCfgCmd extends BaseCmd {
if (cfg != null) {
ConfigurationResponse response = _responseGenerator.createConfigurationResponse(cfg);
response.setResponseName(getCommandName());
- if (scope != null) {
- response.setScope(scope);
- response.setValue(value);
- } else {
- response.setScope("global");
+ if(getZoneId() != null) {
+ response.setScope("zone");
+ }
+ if(getClusterId() != null) {
+ response.setScope("cluster");
+ }
+ if(getStoragepoolId() != null) {
+ response.setScope("storagepool");
+ }
+ if(getAccountId() != null) {
+ response.setScope("account");
}
+ response.setValue(value);
this.setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update config");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
index 176c47a..fa0d4b4 100644
--- a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
@@ -35,6 +35,9 @@ public class ConfigurationResponse extends BaseResponse {
@SerializedName(ApiConstants.SCOPE) @Param(description="scope(zone/cluster/pool/account) of the parameter that needs to be updated")
private String scope;
+ @SerializedName(ApiConstants.ID) @Param(description="the value of the configuration")
+ private Long id;
+
@SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the configuration")
private String description;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/alert/AlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
index 655ed98..6839d44 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -70,6 +70,7 @@ import com.cloud.host.dao.HostDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.org.Grouping.AllocationState;
import com.cloud.resource.ResourceManager;
+import com.cloud.server.ConfigurationServer;
import com.cloud.storage.StorageManager;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.utils.NumbersUtil;
@@ -106,7 +107,8 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager {
@Inject private PrimaryDataStoreDao _storagePoolDao;
@Inject private ConfigurationDao _configDao;
@Inject private ResourceManager _resourceMgr;
- @Inject private ConfigurationManager _configMgr;
+ @Inject private ConfigurationManager _configMgr;
+ @Inject ConfigurationServer _configServer;
private Timer _timer = null;
private float _cpuOverProvisioningFactor = 1;
private long _capacityCheckPeriod = 60L * 60L * 1000L; // one hour by default
@@ -562,19 +564,30 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager {
float overProvFactor = 1f;
capacity = _capacityDao.findCapacityBy(capacityType.intValue(), cluster.getDataCenterId(), null, cluster.getId());
- if (capacityType == Capacity.CAPACITY_TYPE_STORAGE){
- capacity.add(getUsedStats(capacityType, cluster.getDataCenterId(), cluster.getPodId(), cluster.getId()));
+ // cpu and memory allocated capacity notification threshold can be defined at cluster level, so getting the value if they are defined at cluster level
+ double capacityValue = 0;
+ switch (capacityType) {
+ case Capacity.CAPACITY_TYPE_STORAGE:
+ capacity.add(getUsedStats(capacityType, cluster.getDataCenterId(), cluster.getPodId(), cluster.getId()));
+ capacityValue = _capacityTypeThresholdMap.get(capacityType);
+ break;
+ case Capacity.CAPACITY_TYPE_CPU:
+ overProvFactor = ApiDBUtils.getCpuOverprovisioningFactor();
+ capacityValue = Double.parseDouble(_configServer.getConfigValue(Config.CPUCapacityThreshold.key(), Config.ConfigurationParameterScope.cluster.toString(), cluster.getId()));
+ break;
+ case Capacity.CAPACITY_TYPE_MEMORY:
+ capacityValue = Double.parseDouble(_configServer.getConfigValue(Config.MemoryCapacityThreshold.key(), Config.ConfigurationParameterScope.cluster.toString(), cluster.getId()));
+ break;
+ default:
+ capacityValue = _capacityTypeThresholdMap.get(capacityType);
}
if (capacity == null || capacity.size() == 0){
continue;
- }
- if (capacityType == Capacity.CAPACITY_TYPE_CPU){
- overProvFactor = ApiDBUtils.getCpuOverprovisioningFactor();
}
double totalCapacity = capacity.get(0).getTotalCapacity() * overProvFactor;
double usedCapacity = capacity.get(0).getUsedCapacity() + capacity.get(0).getReservedCapacity();
- if (totalCapacity != 0 && usedCapacity/totalCapacity > _capacityTypeThresholdMap.get(capacityType)){
+ if (totalCapacity != 0 && usedCapacity/totalCapacity > capacityValue){
generateEmailAlert(ApiDBUtils.findZoneById(cluster.getDataCenterId()), ApiDBUtils.findPodById(cluster.getPodId()), cluster,
totalCapacity, usedCapacity, capacityType);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 21ce63b..e291c84 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -1034,7 +1034,7 @@ public class ApiDBUtils {
}
public static Integer getNetworkRate(long networkOfferingId) {
- return _configMgr.getNetworkOfferingNetworkRate(networkOfferingId);
+ return _configMgr.getNetworkOfferingNetworkRate(networkOfferingId, null);
}
public static Account getVlanAccount(long vlanId) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/capacity/dao/CapacityDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/dao/CapacityDao.java b/server/src/com/cloud/capacity/dao/CapacityDao.java
index 0132f69..04466f4 100755
--- a/server/src/com/cloud/capacity/dao/CapacityDao.java
+++ b/server/src/com/cloud/capacity/dao/CapacityDao.java
@@ -41,5 +41,5 @@ public interface CapacityDao extends GenericDao<CapacityVO, Long> {
List<SummedCapacity> listCapacitiesGroupedByLevelAndType(Integer capacityType, Long zoneId, Long podId, Long clusterId, int level, Long limit);
void updateCapacityState(Long dcId, Long podId, Long clusterId,
Long hostId, String capacityState);
- List<Long> listClustersCrossingThreshold(short capacityType, Long zoneId, Float disableThreshold, long computeRequested);
+ List<Long> listClustersCrossingThreshold(short capacityType, Long zoneId, String ConfigName, long computeRequested);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index c3d9817..ec5081a 100755
--- a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
+import com.cloud.configuration.Config;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.log4j.Logger;
@@ -115,12 +116,20 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2 = " GROUP BY cluster_id, capacity_type order by percent desc limit ";
private static final String UPDATE_CAPACITY_STATE = "UPDATE `cloud`.`op_host_capacity` SET capacity_state = ? WHERE ";
- private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT cluster_id " +
- "FROM (SELECT cluster_id, ( (sum(capacity.used_capacity) + sum(capacity.reserved_capacity) + ?)/sum(total_capacity) ) ratio "+
- "FROM `cloud`.`op_host_capacity` capacity "+
- "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0 "+
- "GROUP BY cluster_id) tmp " +
- "WHERE tmp.ratio > ? ";
+
+ private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT clusterList.cluster_id " +
+ "FROM ( SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio, cluster.configValue value " +
+ "FROM ( SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved, capacity.total_capacity total, " +
+ "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) " +
+ "WHEN 1 THEN ( SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) " +
+ "ELSE ( SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " +
+ "END configValue " +
+ "FROM `cloud`.`op_host_capacity` capacity " +
+ "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0) cluster " +
+
+ "GROUP BY cluster.cluster_id) clusterList " +
+ "WHERE clusterList.ratio > clusterList.value; ";
+
public CapacityDaoImpl() {
@@ -146,20 +155,22 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
}
@Override
- public List<Long> listClustersCrossingThreshold(short capacityType, Long zoneId, Float disableThreshold, long compute_requested){
+ public List<Long> listClustersCrossingThreshold(short capacityType, Long zoneId, String configName, long compute_requested){
Transaction txn = Transaction.currentTxn();
PreparedStatement pstmt = null;
List<Long> result = new ArrayList<Long>();
StringBuilder sql = new StringBuilder(LIST_CLUSTERS_CROSSING_THRESHOLD);
-
-
+ // during listing the clusters that cross the threshold
+ // we need to check with disabled thresholds of each cluster if not defined at cluster consider the global value
try {
pstmt = txn.prepareAutoCloseStatement(sql.toString());
pstmt.setLong(1,compute_requested);
- pstmt.setShort(2,capacityType);
- pstmt.setFloat(3,disableThreshold);
- pstmt.setLong(4,zoneId);
+ pstmt.setString(2, configName);
+ pstmt.setString(3, configName);
+ pstmt.setString(4, configName);
+ pstmt.setLong(5,zoneId);
+ pstmt.setShort(6,capacityType);
ResultSet rs = pstmt.executeQuery();
while (rs.next()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index dbcbc53..af6adcf 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -53,8 +53,8 @@ public enum Config {
CapacityCheckPeriod("Alert", ManagementServer.class, Integer.class, "capacity.check.period", "300000", "The interval in milliseconds between capacity checks", null),
StorageAllocatedCapacityThreshold("Alert", ManagementServer.class, Float.class, "cluster.storage.allocated.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of allocated storage utilization above which alerts will be sent about low storage available.", null),
StorageCapacityThreshold("Alert", ManagementServer.class, Float.class, "cluster.storage.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of storage utilization above which alerts will be sent about low storage available.", null),
- CPUCapacityThreshold("Alert", ManagementServer.class, Float.class, "cluster.cpu.allocated.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of cpu utilization above which alerts will be sent about low cpu available.", null),
- MemoryCapacityThreshold("Alert", ManagementServer.class, Float.class, "cluster.memory.allocated.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of memory utilization above which alerts will be sent about low memory available.", null),
+ CPUCapacityThreshold("Alert", ManagementServer.class, Float.class, "cluster.cpu.allocated.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of cpu utilization above which alerts will be sent about low cpu available.", null, ConfigurationParameterScope.cluster.toString()),
+ MemoryCapacityThreshold("Alert", ManagementServer.class, Float.class, "cluster.memory.allocated.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of memory utilization above which alerts will be sent about low memory available.", null, ConfigurationParameterScope.cluster.toString()),
PublicIpCapacityThreshold("Alert", ManagementServer.class, Float.class, "zone.virtualnetwork.publicip.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of public IP address space utilization above which alerts will be sent.", null),
PrivateIpCapacityThreshold("Alert", ManagementServer.class, Float.class, "pod.privateip.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of private IP address space utilization above which alerts will be sent.", null),
SecondaryStorageCapacityThreshold("Alert", ManagementServer.class, Float.class, "zone.secstorage.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of secondary storage utilization above which alerts will be sent about low storage available.", null),
@@ -63,8 +63,8 @@ public enum Config {
LocalStorageCapacityThreshold("Alert", ManagementServer.class, Float.class, "cluster.localStorage.capacity.notificationthreshold", "0.75", "Percentage (as a value between 0 and 1) of local storage utilization above which alerts will be sent about low local storage available.", null),
StorageAllocatedCapacityDisableThreshold("Alert", ManagementServer.class, Float.class, "pool.storage.allocated.capacity.disablethreshold", "0.85", "Percentage (as a value between 0 and 1) of allocated storage utilization above which allocators will disable using the pool for low allocated storage available.", null),
StorageCapacityDisableThreshold("Alert", ManagementServer.class, Float.class, "pool.storage.capacity.disablethreshold", "0.85", "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.", null),
- CPUCapacityDisableThreshold("Alert", ManagementServer.class, Float.class, "cluster.cpu.allocated.capacity.disablethreshold", "0.85", "Percentage (as a value between 0 and 1) of cpu utilization above which allocators will disable using the cluster for low cpu available. Keep the corresponding notification threshold lower than this to be notified beforehand.", null),
- MemoryCapacityDisableThreshold("Alert", ManagementServer.class, Float.class, "cluster.memory.allocated.capacity.disablethreshold", "0.85", "Percentage (as a value between 0 and 1) of memory utilization above which allocators will disable using the cluster for low memory available. Keep the corresponding notification threshold lower than this to be notified beforehand.", null),
+ CPUCapacityDisableThreshold("Alert", ManagementServer.class, Float.class, "cluster.cpu.allocated.capacity.disablethreshold", "0.85", "Percentage (as a value between 0 and 1) of cpu utilization above which allocators will disable using the cluster for low cpu available. Keep the corresponding notification threshold lower than this to be notified beforehand.", null, ConfigurationParameterScope.cluster.toString()),
+ MemoryCapacityDisableThreshold("Alert", ManagementServer.class, Float.class, "cluster.memory.allocated.capacity.disablethreshold", "0.85", "Percentage (as a value between 0 and 1) of memory utilization above which allocators will disable using the cluster for low memory available. Keep the corresponding notification threshold lower than this to be notified beforehand.", null, ConfigurationParameterScope.cluster.toString()),
// Storage
@@ -93,8 +93,8 @@ public enum Config {
GuestVlanBits("Network", ManagementServer.class, Integer.class, "guest.vlan.bits", "12", "The number of bits to reserve for the VLAN identifier in the guest subnet.", null),
//MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null),
- NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed in network.", null),
- GuestDomainSuffix("Network", AgentManager.class, String.class, "guest.domain.suffix", "cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null),
+ NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed in network.", null, ConfigurationParameterScope.zone.toString()),
+ GuestDomainSuffix("Network", AgentManager.class, String.class, "guest.domain.suffix", "cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null, ConfigurationParameterScope.zone.toString()),
DirectNetworkNoDefaultRoute("Network", ManagementServer.class, Boolean.class, "direct.network.no.default.route", "false", "Direct Network Dhcp Server should not send a default route", "true/false"),
OvsTunnelNetwork("Network", ManagementServer.class, Boolean.class, "sdn.ovs.controller", "false", "Enable/Disable Open vSwitch SDN controller for L2-in-L3 overlay networks", null),
OvsTunnelNetworkDefaultLabel("Network", ManagementServer.class, String.class, "sdn.ovs.controller.default.label", "cloud-public", "Default network label to be used when fetching interface for GRE endpoints", null),
@@ -112,7 +112,7 @@ public enum Config {
//VPN
RemoteAccessVpnPskLength("Network", AgentManager.class, Integer.class, "remote.access.vpn.psk.length", "24", "The length of the ipsec preshared key (minimum 8, maximum 256)", null),
- RemoteAccessVpnClientIpRange("Network", AgentManager.class, String.class, "remote.access.vpn.client.iprange", "10.1.2.1-10.1.2.8", "The range of ips to be allocated to remote access vpn clients. The first ip in the range is used by the VPN server", null),
+ RemoteAccessVpnClientIpRange("Network", AgentManager.class, String.class, "remote.access.vpn.client.iprange", "10.1.2.1-10.1.2.8", "The range of ips to be allocated to remote access vpn clients. The first ip in the range is used by the VPN server", null, ConfigurationParameterScope.account.toString()),
RemoteAccessVpnUserLimit("Network", AgentManager.class, String.class, "remote.access.vpn.user.limit", "8", "The maximum number of VPN users that can be created per account", null),
Site2SiteVpnConnectionPerVpnGatewayLimit("Network", ManagementServer.class, Integer.class, "site2site.vpn.vpngateway.connection.limit", "4", "The maximum number of VPN connection per VPN gateway", null),
Site2SiteVpnSubnetsPerCustomerGatewayLimit("Network", ManagementServer.class, Integer.class, "site2site.vpn.customergateway.subnets.limit", "10", "The maximum number of subnets per customer gateway", null),
@@ -149,7 +149,7 @@ public enum Config {
S3Enable("Advanced", ManagementServer.class, Boolean.class, "s3.enable", "false", "enable s3 ", null),
EventPurgeInterval("Advanced", ManagementServer.class, Integer.class, "event.purge.interval", "86400", "The interval (in seconds) to wait before running the event purge thread", null),
AccountCleanupInterval("Advanced", ManagementServer.class, Integer.class, "account.cleanup.interval", "86400", "The interval (in seconds) between cleanup for removed accounts", null),
- AllowPublicUserTemplates("Advanced", ManagementServer.class, Integer.class, "allow.public.user.templates", "true", "If false, users will not be able to create public templates.", null),
+ AllowPublicUserTemplates("Advanced", ManagementServer.class, Integer.class, "allow.public.user.templates", "true", "If false, users will not be able to create public templates.", null, ConfigurationParameterScope.account.toString()),
InstanceName("Advanced", AgentManager.class, String.class, "instance.name", "VM", "Name of the deployment instance.", "instanceName"),
ExpungeDelay("Advanced", UserVmManager.class, Integer.class, "expunge.delay", "86400", "Determines how long (in seconds) to wait before actually expunging destroyed vm. The default value = the default value of expunge.interval", null),
ExpungeInterval("Advanced", UserVmManager.class, Integer.class, "expunge.interval", "86400", "The interval (in seconds) to wait before running the expunge thread.", null),
@@ -419,7 +419,7 @@ public enum Config {
global,
zone,
cluster,
- pool,
+ storagepool,
account
}
@@ -427,7 +427,7 @@ public enum Config {
static {
_scopeLevelConfigsMap.put(ConfigurationParameterScope.zone.toString(), new ArrayList<Config>());
_scopeLevelConfigsMap.put(ConfigurationParameterScope.cluster.toString(), new ArrayList<Config>());
- _scopeLevelConfigsMap.put(ConfigurationParameterScope.pool.toString(), new ArrayList<Config>());
+ _scopeLevelConfigsMap.put(ConfigurationParameterScope.storagepool.toString(), new ArrayList<Config>());
_scopeLevelConfigsMap.put(ConfigurationParameterScope.account.toString(), new ArrayList<Config>());
_scopeLevelConfigsMap.put(ConfigurationParameterScope.global.toString(), new ArrayList<Config>());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/configuration/ConfigurationManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java
index 738c5ba..bce1776 100755
--- a/server/src/com/cloud/configuration/ConfigurationManager.java
+++ b/server/src/com/cloud/configuration/ConfigurationManager.java
@@ -60,7 +60,7 @@ public interface ConfigurationManager extends ConfigurationService, Manager {
* @param name
* @param value
*/
- void updateConfiguration(long userId, String name, String category, String value, String scope, Long id);
+ String updateConfiguration(long userId, String name, String category, String value, String scope, Long id);
/**
* Creates a new service offering
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index d5e405d..068a586 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -39,7 +39,9 @@ import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
+import com.cloud.dc.*;
import com.cloud.dc.dao.*;
+import com.cloud.user.*;
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.api.ApiConstants.LDAPParams;
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
@@ -64,6 +66,10 @@ import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -72,20 +78,8 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.capacity.dao.CapacityDao;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
-import com.cloud.dc.AccountVlanMapVO;
-import com.cloud.dc.ClusterVO;
-import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
-import com.cloud.dc.DataCenterIpAddressVO;
-import com.cloud.dc.DataCenterLinkLocalIpAddressVO;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.dc.DcDetailVO;
-import com.cloud.dc.HostPodVO;
-import com.cloud.dc.Pod;
-import com.cloud.dc.PodVlanMapVO;
-import com.cloud.dc.Vlan;
import com.cloud.dc.Vlan.VlanType;
-import com.cloud.dc.VlanVO;
import com.cloud.deploy.DataCenterDeployment;
import com.cloud.domain.Domain;
import com.cloud.domain.DomainVO;
@@ -133,6 +127,7 @@ import com.cloud.org.Grouping;
import com.cloud.org.Grouping.AllocationState;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
+import com.cloud.server.ConfigurationServer;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.DiskOfferingVO;
@@ -144,12 +139,6 @@ import com.cloud.storage.s3.S3Manager;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.storage.swift.SwiftManager;
import com.cloud.test.IPRangeConfig;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.AccountVO;
-import com.cloud.user.ResourceLimitService;
-import com.cloud.user.User;
-import com.cloud.user.UserContext;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.StringUtils;
@@ -182,8 +171,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Inject
DataCenterDao _zoneDao;
@Inject
- DcDetailsDao _zoneDetailsDao;
- @Inject
DomainDao _domainDao;
@Inject
SwiftDao _swiftDao;
@@ -245,6 +232,18 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
FirewallRulesDao _firewallDao;
@Inject
VpcManager _vpcMgr;
+ @Inject
+ ConfigurationServer _configServer;
+ @Inject
+ DcDetailsDao _dcDetailsDao;
+ @Inject
+ ClusterDetailsDao _clusterDetailsDao;
+ @Inject
+ StoragePoolDetailsDao _storagePoolDetailsDao;
+ @Inject
+ AccountDetailsDao _accountDetailsDao;
+ @Inject
+ PrimaryDataStoreDao _storagePoolDao;
// FIXME - why don't we have interface for DataCenterLinkLocalIpAddressDao?
@Inject protected DataCenterLinkLocalIpAddressDao _LinkLocalIpAllocDao;
@@ -323,9 +322,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Override
@DB
- public void updateConfiguration(long userId, String name, String category, String value, String scope, Long resourceId) {
+ public String updateConfiguration(long userId, String name, String category, String value, String scope, Long resourceId) {
- String validationMsg = validateConfigurationValue(name, value, scope);
+ String validationMsg = validateConfigurationValue(name, value);
if (validationMsg != null) {
s_logger.error("Invalid configuration option, name: " + name + ", value:" + value);
@@ -335,23 +334,61 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// If scope of the parameter is given then it needs to be updated in the corresponding details table,
// if scope is mentioned as global or not mentioned then it is normal global parameter updation
if (scope != null && !scope.isEmpty() && !Config.ConfigurationParameterScope.global.toString().equalsIgnoreCase(scope)) {
- if (Config.ConfigurationParameterScope.zone.toString().equalsIgnoreCase(scope)) {
- DataCenterVO zone = _zoneDao.findById(resourceId);
- if (zone == null) {
- throw new InvalidParameterValueException("unable to find zone by id " + resourceId);
- }
- DcDetailVO dcDetailVO = _zoneDetailsDao.findDetail(resourceId, name.toLowerCase());
- if (dcDetailVO == null) {
- dcDetailVO = new DcDetailVO(zone.getId(), name, value);
- _zoneDetailsDao.persist(dcDetailVO);
- } else {
- dcDetailVO.setValue(value);
- _zoneDetailsDao.update(resourceId, dcDetailVO);
- }
- } else {
- s_logger.error("TO Do for the remaining levels (cluster/pool/account)");
- throw new InvalidParameterValueException("The scope "+ scope +" yet to be implemented");
- }
+ switch (Config.ConfigurationParameterScope.valueOf(scope)) {
+ case zone: DataCenterVO zone = _zoneDao.findById(resourceId);
+ if (zone == null) {
+ throw new InvalidParameterValueException("unable to find zone by id " + resourceId);
+ }
+ DcDetailVO dcDetailVO = _dcDetailsDao.findDetail(resourceId, name.toLowerCase());
+ if (dcDetailVO == null) {
+ dcDetailVO = new DcDetailVO(resourceId, name, value);
+ _dcDetailsDao.persist(dcDetailVO);
+ } else {
+ dcDetailVO.setValue(value);
+ _dcDetailsDao.update(dcDetailVO.getId(), dcDetailVO);
+ } break;
+ case cluster: ClusterVO cluster = _clusterDao.findById(resourceId);
+ if (cluster == null) {
+ throw new InvalidParameterValueException("unable to find cluster by id " + resourceId);
+ }
+ ClusterDetailsVO clusterDetailsVO = _clusterDetailsDao.findDetail(resourceId, name);
+ if (clusterDetailsVO == null) {
+ clusterDetailsVO = new ClusterDetailsVO(resourceId, name, value);
+ _clusterDetailsDao.persist(clusterDetailsVO);
+ } else {
+ clusterDetailsVO.setValue(value);
+ _clusterDetailsDao.update(clusterDetailsVO.getId(), clusterDetailsVO);
+ } break;
+
+ case storagepool: StoragePoolVO pool = _storagePoolDao.findById(resourceId);
+ if (pool == null) {
+ throw new InvalidParameterValueException("unable to find storage pool by id " + resourceId);
+ }
+ StoragePoolDetailVO storagePoolDetailVO = _storagePoolDetailsDao.findDetail(resourceId, name);
+ if (storagePoolDetailVO == null) {
+ storagePoolDetailVO = new StoragePoolDetailVO(resourceId, name, value);
+ _storagePoolDetailsDao.persist(storagePoolDetailVO);
+
+ } else {
+ storagePoolDetailVO.setValue(value);
+ _storagePoolDetailsDao.update(storagePoolDetailVO.getId(), storagePoolDetailVO);
+ } break;
+
+ case account: AccountVO account = _accountDao.findById(resourceId);
+ if (account == null) {
+ throw new InvalidParameterValueException("unable to find account by id " + resourceId);
+ }
+ AccountDetailVO accountDetailVO = _accountDetailsDao.findDetail(resourceId, name);
+ if (accountDetailVO == null) {
+ accountDetailVO = new AccountDetailVO(resourceId, name, value);
+ _accountDetailsDao.persist(accountDetailVO);
+ } else {
+ accountDetailVO.setValue(value);
+ _accountDetailsDao.update(accountDetailVO.getId(), accountDetailVO);
+ } break;
+ default: throw new InvalidParameterValueException("Scope provided is invalid");
+ }
+ return value;
}
// Execute all updates in a single transaction
@@ -450,16 +487,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
txn.commit();
+ return _configDao.getValue(name);
}
@Override
@ActionEvent(eventType = EventTypes.EVENT_CONFIGURATION_VALUE_EDIT, eventDescription = "updating configuration")
- public Configuration updateConfiguration(UpdateCfgCmd cmd) {
+ public Configuration updateConfiguration(UpdateCfgCmd cmd) throws InvalidParameterValueException {
Long userId = UserContext.current().getCallerUserId();
String name = cmd.getCfgName();
String value = cmd.getValue();
- String scope = cmd.getScope();
- Long id = cmd.getId();
+ Long zoneId = cmd.getZoneId();
+ Long clusterId = cmd.getClusterId();
+ Long storagepoolId = cmd.getStoragepoolId();
+ Long accountId = cmd.getAccountId();
UserContext.current().setEventDetails(" Name: " + name + " New Value: " + (((name.toLowerCase()).contains("password")) ? "*****" :
(((value == null) ? "" : value))));
// check if config value exists
@@ -476,17 +516,44 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
value = null;
}
- updateConfiguration(userId, name, config.getCategory(), value, scope, id);
- String updatedValue = _configDao.getValue(name);
+ String scope = null;
+ Long id = null;
+ int paramCountCheck = 0;
+
+ if (zoneId != null) {
+ scope = Config.ConfigurationParameterScope.zone.toString();
+ id = zoneId;
+ paramCountCheck++;
+ }
+ if (clusterId != null) {
+ scope = Config.ConfigurationParameterScope.cluster.toString();
+ id = clusterId;
+ paramCountCheck++;
+ }
+ if (accountId != null) {
+ scope = Config.ConfigurationParameterScope.account.toString();
+ id = accountId;
+ paramCountCheck++;
+ }
+ if (storagepoolId != null) {
+ scope = Config.ConfigurationParameterScope.storagepool.toString();
+ id = storagepoolId;
+ paramCountCheck++;
+ }
+
+ if (paramCountCheck > 1) {
+ throw new InvalidParameterValueException("cannot handle multiple IDs, provide only one ID corresponding to the scope");
+ }
+
+ String updatedValue = updateConfiguration(userId, name, config.getCategory(), value, scope, id);
if ((value == null && updatedValue == null) || updatedValue.equalsIgnoreCase(value)) {
return _configDao.findByName(name);
-
} else {
throw new CloudRuntimeException("Unable to update configuration parameter " + name);
}
}
- private String validateConfigurationValue(String name, String value, String scope) {
+ private String validateConfigurationValue(String name, String value) {
Config c = Config.getConfig(name);
if (c == null) {
@@ -494,12 +561,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
return "Invalid configuration variable.";
}
String configScope = c.getScope();
- if (scope != null && !scope.isEmpty()) {
- if (!configScope.contains(scope)) {
- s_logger.error("Invalid scope " + scope + " for the parameter " + name);
- return "Invalid scope for the parameter.";
- }
- }
Class<?> type = c.getType();
@@ -4077,7 +4138,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
@Override
- public Integer getNetworkOfferingNetworkRate(long networkOfferingId) {
+ public Integer getNetworkOfferingNetworkRate(long networkOfferingId, Long dataCenterId) {
// validate network offering information
NetworkOffering no = getNetworkOffering(networkOfferingId);
@@ -4089,7 +4150,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (no.getRateMbps() != null) {
networkRate = no.getRateMbps();
} else {
- networkRate = Integer.parseInt(_configDao.getValue(Config.NetworkThrottlingRate.key()));
+ networkRate = Integer.parseInt(_configServer.getConfigValue(Config.NetworkThrottlingRate.key(), Config.ConfigurationParameterScope.zone.toString(), dataCenterId));
}
// networkRate is unsigned int in netowrkOfferings table, and can't be
@@ -4225,7 +4286,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
@Override
- public Integer getServiceOfferingNetworkRate(long serviceOfferingId) {
+ public Integer getServiceOfferingNetworkRate(long serviceOfferingId, Long dataCenterId) {
// validate network offering information
ServiceOffering offering = _serviceOfferingDao.findById(serviceOfferingId);
@@ -4239,7 +4300,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
} else {
// for domain router service offering, get network rate from
if (offering.getSystemVmType() != null && offering.getSystemVmType().equalsIgnoreCase(VirtualMachine.Type.DomainRouter.toString())) {
- networkRate = Integer.parseInt(_configDao.getValue(Config.NetworkThrottlingRate.key()));
+ networkRate = Integer.parseInt(_configServer.getConfigValue(Config.NetworkThrottlingRate.key(), Config.ConfigurationParameterScope.zone.toString(), dataCenterId));
} else {
networkRate = Integer.parseInt(_configDao.getValue(Config.VmNetworkThrottlingRate.key()));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index 1647cf7..2e7e9f6 100755
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -452,21 +452,6 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
return disabledPods;
}
- private Map<Short,Float> getCapacityThresholdMap(){
- // Lets build this real time so that the admin wont have to restart MS if he changes these values
- Map<Short,Float> disableThresholdMap = new HashMap<Short, Float>();
-
- String cpuDisableThresholdString = _configDao.getValue(Config.CPUCapacityDisableThreshold.key());
- float cpuDisableThreshold = NumbersUtil.parseFloat(cpuDisableThresholdString, 0.85F);
- disableThresholdMap.put(Capacity.CAPACITY_TYPE_CPU, cpuDisableThreshold);
-
- String memoryDisableThresholdString = _configDao.getValue(Config.MemoryCapacityDisableThreshold.key());
- float memoryDisableThreshold = NumbersUtil.parseFloat(memoryDisableThresholdString, 0.85F);
- disableThresholdMap.put(Capacity.CAPACITY_TYPE_MEMORY, memoryDisableThreshold);
-
- return disableThresholdMap;
- }
-
private List<Short> getCapacitiesForCheckingThreshold(){
List<Short> capacityList = new ArrayList<Short>();
capacityList.add(Capacity.CAPACITY_TYPE_CPU);
@@ -476,7 +461,6 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
private void removeClustersCrossingThreshold(List<Long> clusterListForVmAllocation, ExcludeList avoid, VirtualMachineProfile<? extends VirtualMachine> vmProfile, DeploymentPlan plan){
- Map<Short,Float> capacityThresholdMap = getCapacityThresholdMap();
List<Short> capacityList = getCapacitiesForCheckingThreshold();
List<Long> clustersCrossingThreshold = new ArrayList<Long>();
@@ -491,12 +475,11 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
return;
}
if (capacity == Capacity.CAPACITY_TYPE_CPU) {
- clustersCrossingThreshold = _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(),
- capacityThresholdMap.get(capacity), cpu_requested);
+ clustersCrossingThreshold = _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(), Config.CPUCapacityDisableThreshold.key(), cpu_requested);
}
else if (capacity == Capacity.CAPACITY_TYPE_MEMORY ) {
clustersCrossingThreshold = _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(),
- capacityThresholdMap.get(capacity), ram_requested );
+ Config.MemoryCapacityDisableThreshold.key(), ram_requested );
}
@@ -506,8 +489,8 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
// Remove clusters crossing disabled threshold
clusterListForVmAllocation.removeAll(clustersCrossingThreshold);
- s_logger.debug("Cannot allocate cluster list " + clustersCrossingThreshold.toString() + " for vm creation since their allocated percentage" +
- " crosses the disable capacity threshold: " + capacityThresholdMap.get(capacity) + " for capacity Type : " + capacity + ", skipping these clusters");
+ s_logger.debug("Cannot allocate cluster list " + clustersCrossingThreshold.toString() + " for vm creation since their allocated percentage" +
+ " crosses the disable capacity threshold defined at each cluster/ at global value for capacity Type : " + capacity + ", skipping these clusters");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 72ccac0..7adcf07 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -46,6 +46,7 @@ import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
+import com.cloud.server.ConfigurationServer;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.IpAddress.State;
import com.cloud.network.Network.*;
@@ -153,6 +154,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
RemoteAccessVpnService _vpnMgr;
@Inject
PodVlanMapDao _podVlanMapDao;
+ @Inject
+ ConfigurationServer _configServer;
List<NetworkGuru> _networkGurus;
public List<NetworkGuru> getNetworkGurus() {
@@ -245,7 +248,6 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
int _networkGcWait;
int _networkGcInterval;
- String _networkDomain;
int _networkLockTimeout;
private Map<String, String> _configs;
@@ -866,7 +868,6 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
_networkGcInterval = NumbersUtil.parseInt(_configs.get(Config.NetworkGcInterval.key()), 600);
_configs = _configDao.getConfiguration("Network", params);
- _networkDomain = _configs.get(Config.GuestDomainSuffix.key());
_networkLockTimeout = NumbersUtil.parseInt(_configs.get(Config.NetworkLockTimeout.key()), 600);
@@ -2023,7 +2024,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
// 2) If null, generate networkDomain using domain suffix from the global config variables
if (networkDomain == null) {
- networkDomain = "cs" + Long.toHexString(owner.getId()) + _networkDomain;
+ networkDomain = "cs" + Long.toHexString(owner.getId()) + _configServer.getConfigValue(Config.GuestDomainSuffix.key(), Config.ConfigurationParameterScope.zone.toString(), zoneId);
}
} else {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index c5930d9..bd62886 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -52,6 +52,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.UnsupportedServiceException;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.server.ConfigurationServer;
import com.cloud.network.IpAddress.State;
import com.cloud.network.Network.Capability;
import com.cloud.network.Network.GuestType;
@@ -143,6 +144,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
@Inject
PodVlanMapDao _podVlanMapDao;
+ @Inject
+ ConfigurationServer _configServer;
List<NetworkElement> _networkElements;
public List<NetworkElement> getNetworkElements() {
@@ -921,9 +924,9 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
}
}
if (isUserVmsDefaultNetwork || isDomRGuestOrPublicNetwork) {
- return _configMgr.getServiceOfferingNetworkRate(vm.getServiceOfferingId());
+ return _configMgr.getServiceOfferingNetworkRate(vm.getServiceOfferingId(), vm.getDataCenterId());
} else {
- return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId());
+ return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId(), vm.getDataCenterId());
}
}
@@ -1564,8 +1567,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
}
@Override
- public String getDefaultNetworkDomain() {
- return _networkDomain;
+ public String getDefaultNetworkDomain(long zoneId) {
+ return _configServer.getConfigValue(Config.GuestDomainSuffix.key(), Config.ConfigurationParameterScope.zone.toString(), zoneId);
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 224a680..bc7bb0c 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -582,7 +582,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
// 2) If null, generate networkDomain using domain suffix from the global config variables
if (networkDomain == null) {
- networkDomain = "cs" + Long.toHexString(owner.getId()) + _ntwkModel.getDefaultNetworkDomain();
+ networkDomain = "cs" + Long.toHexString(owner.getId()) + _ntwkModel.getDefaultNetworkDomain(zoneId);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 673535a..062743b 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -62,6 +62,7 @@ import com.cloud.network.rules.FirewallRule.Purpose;
import com.cloud.network.rules.FirewallRuleVO;
import com.cloud.network.rules.RulesManager;
import com.cloud.projects.Project.ListProjectResourcesCriteria;
+import com.cloud.server.ConfigurationServer;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.DomainManager;
@@ -100,6 +101,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
@Inject UsageEventDao _usageEventDao;
@Inject ConfigurationDao _configDao;
@Inject List<RemoteAccessVPNServiceProvider> _vpnServiceProviders;
+ @Inject ConfigurationServer _configServer;
int _userLimit;
@@ -156,7 +158,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
}
if (ipRange == null) {
- ipRange = _clientIpRange;
+ ipRange = _configServer.getConfigValue(Config.RemoteAccessVpnClientIpRange.key(), Config.ConfigurationParameterScope.account.toString(), ipAddr.getAccountId());
}
String[] range = ipRange.split("-");
if (range.length != 2) {
@@ -200,7 +202,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
private void validateRemoteAccessVpnConfiguration() throws ConfigurationException {
String ipRange = _clientIpRange;
if (ipRange == null) {
- s_logger.warn("Remote Access VPN configuration missing client ip range -- ignoring");
+ s_logger.warn("Remote Access VPN global configuration missing client ip range -- ignoring");
return;
}
Integer pskLength = _pskLength;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index cd890ce..3d97447 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -48,8 +48,10 @@ import com.cloud.dc.*;
import com.cloud.dc.dao.DcDetailsDao;
import com.cloud.user.*;
import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -59,6 +61,7 @@ import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.configuration.dao.ResourceCountDao;
import com.cloud.dc.DataCenter.NetworkType;
+import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.dc.dao.VlanDao;
@@ -112,6 +115,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
@Inject private ConfigurationDao _configDao;
@Inject private DataCenterDao _zoneDao;
+ @Inject private ClusterDao _clusterDao;
+ @Inject private PrimaryDataStoreDao _storagePoolDao;
@Inject private HostPodDao _podDao;
@Inject private DiskOfferingDao _diskOfferingDao;
@Inject private ServiceOfferingDao _serviceOfferingDao;
@@ -698,7 +703,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
return dcDetailVO.getValue();
} break;
- case cluster: ClusterDetailsVO cluster = _clusterDetailsDao.findById(resourceId);
+ case cluster: ClusterVO cluster = _clusterDao.findById(resourceId);
if (cluster == null) {
throw new InvalidParameterValueException("unable to find cluster by id " + resourceId);
}
@@ -707,7 +712,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
return clusterDetailsVO.getValue();
} break;
- case pool: StoragePoolDetailVO pool = _storagePoolDetailsDao.findById(resourceId);
+ case storagepool: StoragePoolVO pool = _storagePoolDao.findById(resourceId);
if (pool == null) {
throw new InvalidParameterValueException("unable to find storage pool by id " + resourceId);
}
@@ -716,7 +721,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
return storagePoolDetailVO.getValue();
} break;
- case account: AccountDetailVO account = _accountDetailsDao.findById(resourceId);
+ case account: AccountVO account = _accountDao.findById(resourceId);
if (account == null) {
throw new InvalidParameterValueException("unable to find account by id " + resourceId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 1799f77..f18c9d5 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1274,16 +1274,41 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
Object name = cmd.getConfigName();
Object category = cmd.getCategory();
Object keyword = cmd.getKeyword();
- Long id = cmd.getId();
- String scope = cmd.getScope();
+ Long zoneId = cmd.getZoneId();
+ Long clusterId = cmd.getClusterId();
+ Long storagepoolId = cmd.getStoragepoolId();
+ Long accountId = cmd.getAccountId();
+ String scope = null;
+ Long id = null;
+ int paramCountCheck = 0;
- if (scope!= null && !scope.isEmpty()) {
+ if (zoneId != null) {
+ scope = Config.ConfigurationParameterScope.zone.toString();
+ id = zoneId;
+ paramCountCheck++;
+ }
+ if (clusterId != null) {
+ scope = Config.ConfigurationParameterScope.cluster.toString();
+ id = clusterId;
+ paramCountCheck++;
+ }
+ if (accountId != null) {
+ scope = Config.ConfigurationParameterScope.account.toString();
+ id = accountId;
+ paramCountCheck++;
+ }
+ if (storagepoolId != null) {
+ scope = Config.ConfigurationParameterScope.storagepool.toString();
+ id = storagepoolId;
+ paramCountCheck++;
+ }
+
+ if (paramCountCheck > 1) {
+ throw new InvalidParameterValueException("cannot handle multiple IDs, provide only one ID corresponding to the scope");
+ }
+
+ if (scope != null && !scope.isEmpty()) {
// getting the list of parameters at requested scope
- try {
- Config.ConfigurationParameterScope.valueOf(scope.toLowerCase());
- } catch (Exception e ) {
- throw new InvalidParameterValueException("Invalid scope " + scope + " while listing configuration parameters");
- }
if (id == null) {
throw new InvalidParameterValueException("Invalid id null, id is needed corresponding to the scope");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
index a0d5d0e..38b5253 100644
--- a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
@@ -41,6 +41,7 @@ public class StoragePoolDetailsDaoImpl extends GenericDaoBase<StoragePoolDetailV
super();
PoolSearch = createSearchBuilder();
PoolSearch.and("pool", PoolSearch.entity().getPoolId(), SearchCriteria.Op.EQ);
+ PoolSearch.and("name", PoolSearch.entity().getName(), SearchCriteria.Op.EQ);
PoolSearch.done();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/template/TemplateAdapterBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java
index 1b11425..d3fd165 100755
--- a/server/src/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -32,6 +32,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreRole;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
+import com.cloud.configuration.Config;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.DataCenterVO;
@@ -44,6 +45,7 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.org.Grouping;
+import com.cloud.server.ConfigurationServer;
import com.cloud.storage.GuestOS;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.TemplateType;
@@ -82,6 +84,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
protected @Inject ResourceLimitService _resourceLimitMgr;
protected @Inject DataStoreManager storeMgr;
@Inject TemplateManager templateMgr;
+ @Inject ConfigurationServer _configServer;
@Override
public boolean stop() {
@@ -167,8 +170,8 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
if (url.toLowerCase().contains("file://")) {
throw new InvalidParameterValueException("File:// type urls are currently unsupported");
}
-
- boolean allowPublicUserTemplates = Boolean.parseBoolean(_configDao.getValue("allow.public.user.templates"));
+ // check whether owner can create public templates
+ boolean allowPublicUserTemplates = Boolean.parseBoolean(_configServer.getConfigValue(Config.AllowPublicUserTemplates.key(), Config.ConfigurationParameterScope.account.toString(), templateOwner.getId()));
if (!isAdmin && !allowPublicUserTemplates && isPublic) {
throw new InvalidParameterValueException("Only private templates/ISO can be created.");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index c7eaa64..63c6f6e 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -113,6 +113,7 @@ import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
import com.cloud.resource.ResourceManager;
+import com.cloud.server.ConfigurationServer;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.LaunchPermissionVO;
import com.cloud.storage.Snapshot;
@@ -253,6 +254,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
protected ResourceManager _resourceMgr;
@Inject VolumeManager volumeMgr;
@Inject VMTemplateHostDao templateHostDao;
+ @Inject
+ ConfigurationServer _configServer;
int _primaryStorageDownloadWait;
@@ -1609,7 +1612,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
boolean isAdmin = _accountMgr.isAdmin(caller.getType());
- boolean allowPublicUserTemplates = Boolean.valueOf(_configDao.getValue("allow.public.user.templates"));
+ // check configuration parameter(allow.public.user.templates) value for the template owner
+ boolean allowPublicUserTemplates = Boolean.valueOf(_configServer.getConfigValue(Config.AllowPublicUserTemplates.key(), Config.ConfigurationParameterScope.account.toString(), template.getAccountId()));
if (!isAdmin && !allowPublicUserTemplates && isPublic != null && isPublic) {
throw new InvalidParameterValueException("Only private " + mediaType + "s can be created.");
}
@@ -1842,8 +1846,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
if (isPublic == null) {
isPublic = Boolean.FALSE;
}
- boolean allowPublicUserTemplates = Boolean.parseBoolean(_configDao
- .getValue("allow.public.user.templates"));
+ // check whether template owner can create public templates
+ boolean allowPublicUserTemplates = Boolean.parseBoolean(_configServer.getConfigValue(Config.AllowPublicUserTemplates.key(), Config.ConfigurationParameterScope.account.toString(), templateOwner.getId()));
if (!isAdmin && !allowPublicUserTemplates && isPublic) {
throw new PermissionDeniedException("Failed to create template "
+ name + ", only private templates can be created.");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/test/com/cloud/network/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java
index 511249f..9d5d4ff 100644
--- a/server/test/com/cloud/network/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/network/MockNetworkModelImpl.java
@@ -566,7 +566,7 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
* @see com.cloud.network.NetworkModel#getDefaultNetworkDomain()
*/
@Override
- public String getDefaultNetworkDomain() {
+ public String getDefaultNetworkDomain(long zoneId) {
// TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
index 6cda294..83b1924 100755
--- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
@@ -283,7 +283,7 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu
* @see com.cloud.configuration.ConfigurationService#getNetworkOfferingNetworkRate(long)
*/
@Override
- public Integer getNetworkOfferingNetworkRate(long networkOfferingId) {
+ public Integer getNetworkOfferingNetworkRate(long networkOfferingId, Long dataCenterId) {
// TODO Auto-generated method stub
return null;
}
@@ -336,7 +336,7 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu
* @see com.cloud.configuration.ConfigurationService#getServiceOfferingNetworkRate(long)
*/
@Override
- public Integer getServiceOfferingNetworkRate(long serviceOfferingId) {
+ public Integer getServiceOfferingNetworkRate(long serviceOfferingId, Long dataCenterId) {
// TODO Auto-generated method stub
return null;
}
@@ -426,9 +426,9 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu
* @see com.cloud.configuration.ConfigurationManager#updateConfiguration(long, java.lang.String, java.lang.String, java.lang.String)
*/
@Override
- public void updateConfiguration(long userId, String name, String category, String value, String scope, Long resourceId) {
+ public String updateConfiguration(long userId, String name, String category, String value, String scope, Long resourceId) {
// TODO Auto-generated method stub
-
+ return null;
}
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/test/com/cloud/vpc/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
index 9857964..14cd09d 100644
--- a/server/test/com/cloud/vpc/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
@@ -581,7 +581,7 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
* @see com.cloud.network.NetworkModel#getDefaultNetworkDomain()
*/
@Override
- public String getDefaultNetworkDomain() {
+ public String getDefaultNetworkDomain(long zoneId) {
// TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java b/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
index fb29469..4dd6ad7 100644
--- a/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
+++ b/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
@@ -18,10 +18,17 @@ package org.apache.cloudstack.affinity;
import java.io.IOException;
+import com.cloud.server.ConfigurationServer;
+import com.cloud.user.AccountDetailsDao;
+import com.cloud.user.AccountManager;
+import com.cloud.user.ResourceLimitService;
+import com.cloud.user.UserContextInitializer;
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.mockito.Mockito;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -38,6 +45,8 @@ import com.cloud.api.query.dao.UserAccountJoinDaoImpl;
import com.cloud.capacity.dao.CapacityDaoImpl;
import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl;
import com.cloud.configuration.dao.ConfigurationDao;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.dc.dao.DcDetailsDao;
import com.cloud.dc.dao.AccountVlanMapDaoImpl;
import com.cloud.dc.dao.ClusterDaoImpl;
import com.cloud.dc.dao.DataCenterDaoImpl;
@@ -100,10 +109,6 @@ import com.cloud.storage.s3.S3Manager;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.storage.swift.SwiftManager;
import com.cloud.tags.dao.ResourceTagsDaoImpl;
-import com.cloud.user.AccountManager;
-import com.cloud.user.ResourceLimitService;
-import com.cloud.user.UserContext;
-import com.cloud.user.UserContextInitializer;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.AccountDaoImpl;
import com.cloud.user.dao.UserDaoImpl;
@@ -330,6 +335,22 @@ public class AffinityApiTestConfiguration {
public DataCenterLinkLocalIpAddressDao datacenterLinkLocalIpAddressDao() {
return Mockito.mock(DataCenterLinkLocalIpAddressDao.class);
}
+
+ @Bean
+ public ConfigurationServer configurationServer() {
+ return Mockito.mock(ConfigurationServer.class);
+ }
+
+ @Bean
+ public ClusterDetailsDao clusterDetailsDao() {
+ return Mockito.mock(ClusterDetailsDao.class);
+ }
+
+ @Bean
+ public AccountDetailsDao accountDetailsDao() {
+ return Mockito.mock(AccountDetailsDao.class);
+ }
+
public static class Library implements TypeFilter {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
index f1163ef..709dfe2 100644
--- a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
+++ b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
@@ -19,8 +19,14 @@ package org.apache.cloudstack.networkoffering;
import java.io.IOException;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.dc.dao.*;
+import com.cloud.server.ConfigurationServer;
+import com.cloud.user.*;
import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.mockito.Mockito;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -37,18 +43,6 @@ import com.cloud.api.query.dao.UserAccountJoinDaoImpl;
import com.cloud.capacity.dao.CapacityDaoImpl;
import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl;
import com.cloud.configuration.dao.ConfigurationDao;
-import com.cloud.dc.dao.AccountVlanMapDaoImpl;
-import com.cloud.dc.dao.ClusterDaoImpl;
-import com.cloud.dc.dao.DataCenterDaoImpl;
-import com.cloud.dc.dao.DataCenterIpAddressDaoImpl;
-import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao;
-import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl;
-import com.cloud.dc.dao.DataCenterVnetDaoImpl;
-import com.cloud.dc.dao.DcDetailsDaoImpl;
-import com.cloud.dc.dao.HostPodDaoImpl;
-import com.cloud.dc.dao.PodVlanDaoImpl;
-import com.cloud.dc.dao.PodVlanMapDaoImpl;
-import com.cloud.dc.dao.VlanDaoImpl;
import com.cloud.domain.dao.DomainDaoImpl;
import com.cloud.event.dao.UsageEventDaoImpl;
import com.cloud.host.dao.HostDaoImpl;
@@ -97,10 +91,6 @@ import com.cloud.storage.s3.S3Manager;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.storage.swift.SwiftManager;
import com.cloud.tags.dao.ResourceTagsDaoImpl;
-import com.cloud.user.AccountManager;
-import com.cloud.user.ResourceLimitService;
-import com.cloud.user.UserContext;
-import com.cloud.user.UserContextInitializer;
import com.cloud.user.dao.AccountDaoImpl;
import com.cloud.user.dao.UserDaoImpl;
import com.cloud.utils.component.SpringComponentScanUtils;
@@ -323,6 +313,22 @@ public class ChildTestConfiguration {
public DataCenterLinkLocalIpAddressDao datacenterLinkLocalIpAddressDao() {
return Mockito.mock(DataCenterLinkLocalIpAddressDao.class);
}
+
+ @Bean
+ public ConfigurationServer configurationServer() {
+ return Mockito.mock(ConfigurationServer.class);
+ }
+
+ @Bean
+ public ClusterDetailsDao clusterDetailsDao() {
+ return Mockito.mock(ClusterDetailsDao.class);
+ }
+
+ @Bean
+ public AccountDetailsDao accountDetailsDao() {
+ return Mockito.mock(AccountDetailsDao.class);
+ }
+
public static class Library implements TypeFilter {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 78444fd..a6913b6 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -1110,3 +1110,7 @@ CREATE VIEW `cloud`.`account_view` AS
and async_job.job_status = 0;
alter table `cloud_usage`.`usage_network_offering` add column nic_id bigint(20) unsigned NOT NULL;
+ALTER TABLE `cloud`.`data_center_details` MODIFY value varchar(1024);
+ALTER TABLE `cloud`.`cluster_details` MODIFY value varchar(255);
+ALTER TABLE `cloud`.`storage_pool_details` MODIFY value varchar(255);
+ALTER TABLE `cloud`.`account_details` MODIFY value varchar(255);
[14/50] [abbrv] Sort in alphabetical order (to avoid duplicate key)
and better compare with l10n ressource files (already in alphabetical order)
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ec28ce1/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 1880be5..d2b4a93 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,574 +25,141 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script language="javascript">
dictionary = {
-'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" />',
+'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" />',
'force.stop.instance.warning': '<fmt:message key="force.stop.instance.warning" />',
-'label.PreSetup': '<fmt:message key="label.PreSetup" />',
-'label.SR.name ': '<fmt:message key="label.SR.name " />',
-'label.SharedMountPoint': '<fmt:message key="label.SharedMountPoint" />',
-'label.clvm': '<fmt:message key="label.clvm" />',
-'label.rbd': '<fmt:message key="label.rbd" />',
-'label.volgroup': '<fmt:message key="label.volgroup" />',
-'label.VMFS.datastore': '<fmt:message key="label.VMFS.datastore" />',
-'label.network.device': '<fmt:message key="label.network.device" />',
-'label.add.network.device': '<fmt:message key="label.add.network.device" />',
-'label.network.device.type': '<fmt:message key="label.network.device.type" />',
-'label.DHCP.server.type': '<fmt:message key="label.DHCP.server.type" />',
-'label.Pxe.server.type': '<fmt:message key="label.Pxe.server.type" />',
-'label.PING.storage.IP': '<fmt:message key="label.PING.storage.IP" />',
-'label.PING.dir': '<fmt:message key="label.PING.dir" />',
-'label.TFTP.dir': '<fmt:message key="label.TFTP.dir" />',
-'label.PING.CIFS.username': '<fmt:message key="label.PING.CIFS.username" />',
-'label.PING.CIFS.password': '<fmt:message key="label.PING.CIFS.password" />',
-'label.CPU.cap': '<fmt:message key="label.CPU.cap" />',
-'label.action.enable.zone': '<fmt:message key="label.action.enable.zone" />',
-'label.action.enable.zone.processing': '<fmt:message key="label.action.enable.zone.processing" />',
-'message.action.enable.zone': '<fmt:message key="message.action.enable.zone" />',
-'label.action.disable.zone': '<fmt:message key="label.action.disable.zone" />',
-'label.action.disable.zone.processing': '<fmt:message key="label.action.disable.zone.processing" />',
-'message.action.disable.zone': '<fmt:message key="message.action.disable.zone" />',
-'label.action.enable.pod': '<fmt:message key="label.action.enable.pod" />',
-'label.action.enable.pod.processing': '<fmt:message key="label.action.enable.pod.processing" />',
-'message.action.enable.pod': '<fmt:message key="message.action.enable.pod" />',
-'label.action.disable.pod': '<fmt:message key="label.action.disable.pod" />',
-'label.action.disable.pod.processing': '<fmt:message key="label.action.disable.pod.processing" />',
-'message.action.disable.pod': '<fmt:message key="message.action.disable.pod" />',
-'label.action.enable.cluster': '<fmt:message key="label.action.enable.cluster" />',
-'label.action.enable.cluster.processing': '<fmt:message key="label.action.enable.cluster.processing" />',
-'message.action.enable.cluster': '<fmt:message key="message.action.enable.cluster" />',
-'label.action.disable.cluster': '<fmt:message key="label.action.disable.cluster" />',
-'label.action.disable.cluster.processing': '<fmt:message key="label.action.disable.cluster.processing" />',
-'message.action.disable.cluster': '<fmt:message key="message.action.disable.cluster" />',
+'ICMP.code': '<fmt:message key="ICMP.code" />',
+'ICMP.type': '<fmt:message key="ICMP.type" />',
+'image.directory': '<fmt:message key="image.directory" />',
+'inline': '<fmt:message key="inline" />',
+'instances.actions.reboot.label': '<fmt:message key="instances.actions.reboot.label" />',
+'label.accept.project.invitation': '<fmt:message key="label.accept.project.invitation" />',
+'label.account.and.security.group': '<fmt:message key="label.account.and.security.group" />',
+'label.account': '<fmt:message key="label.account" />',
'label.account.id': '<fmt:message key="label.account.id" />',
'label.account.name': '<fmt:message key="label.account.name" />',
-'label.account.specific': '<fmt:message key="label.account.specific" />',
-'label.account': '<fmt:message key="label.account" />',
'label.accounts': '<fmt:message key="label.accounts" />',
+'label.account.specific': '<fmt:message key="label.account.specific" />',
'label.acquire.new.ip': '<fmt:message key="label.acquire.new.ip" />',
-'label.show.ingress.rule': '<fmt:message key="label.show.ingress.rule" />',
-'label.hide.ingress.rule': '<fmt:message key="label.hide.ingress.rule" />',
-'label.action.attach.disk.processing': '<fmt:message key="label.action.attach.disk.processing" />',
'label.action.attach.disk': '<fmt:message key="label.action.attach.disk" />',
-'label.action.attach.iso.processing': '<fmt:message key="label.action.attach.iso.processing" />',
+'label.action.attach.disk.processing': '<fmt:message key="label.action.attach.disk.processing" />',
'label.action.attach.iso': '<fmt:message key="label.action.attach.iso" />',
-'label.action.cancel.maintenance.mode.processing': '<fmt:message key="label.action.cancel.maintenance.mode.processing" />',
+'label.action.attach.iso.processing': '<fmt:message key="label.action.attach.iso.processing" />',
'label.action.cancel.maintenance.mode': '<fmt:message key="label.action.cancel.maintenance.mode" />',
+'label.action.cancel.maintenance.mode.processing': '<fmt:message key="label.action.cancel.maintenance.mode.processing" />',
'label.action.change.password': '<fmt:message key="label.action.change.password" />',
-'label.action.change.service.processing': '<fmt:message key="label.action.change.service.processing" />',
'label.action.change.service': '<fmt:message key="label.action.change.service" />',
-'label.action.copy.ISO.processing': '<fmt:message key="label.action.copy.ISO.processing" />',
+'label.action.change.service.processing': '<fmt:message key="label.action.change.service.processing" />',
'label.action.copy.ISO': '<fmt:message key="label.action.copy.ISO" />',
-'label.action.copy.template.processing': '<fmt:message key="label.action.copy.template.processing" />',
+'label.action.copy.ISO.processing': '<fmt:message key="label.action.copy.ISO.processing" />',
'label.action.copy.template': '<fmt:message key="label.action.copy.template" />',
-'label.action.create.template.processing': '<fmt:message key="label.action.create.template.processing" />',
+'label.action.copy.template.processing': '<fmt:message key="label.action.copy.template.processing" />',
'label.action.create.template': '<fmt:message key="label.action.create.template" />',
-'label.action.create.vm.processing': '<fmt:message key="label.action.create.vm.processing" />',
+'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" />',
+'label.action.create.template.processing': '<fmt:message key="label.action.create.template.processing" />',
'label.action.create.vm': '<fmt:message key="label.action.create.vm" />',
-'label.action.create.volume.processing': '<fmt:message key="label.action.create.volume.processing" />',
+'label.action.create.vm.processing': '<fmt:message key="label.action.create.vm.processing" />',
'label.action.create.volume': '<fmt:message key="label.action.create.volume" />',
-'label.action.delete.IP.range.processing': '<fmt:message key="label.action.delete.IP.range.processing" />',
-'label.action.delete.IP.range': '<fmt:message key="label.action.delete.IP.range" />',
-'label.action.delete.ISO.processing': '<fmt:message key="label.action.delete.ISO.processing" />',
-'label.action.delete.ISO': '<fmt:message key="label.action.delete.ISO" />',
-'label.action.delete.account.processing': '<fmt:message key="label.action.delete.account.processing" />',
+'label.action.create.volume.processing': '<fmt:message key="label.action.create.volume.processing" />',
'label.action.delete.account': '<fmt:message key="label.action.delete.account" />',
-'label.action.delete.cluster.processing': '<fmt:message key="label.action.delete.cluster.processing" />',
+'label.action.delete.account.processing': '<fmt:message key="label.action.delete.account.processing" />',
'label.action.delete.cluster': '<fmt:message key="label.action.delete.cluster" />',
-'label.action.delete.disk.offering.processing': '<fmt:message key="label.action.delete.disk.offering.processing" />',
+'label.action.delete.cluster.processing': '<fmt:message key="label.action.delete.cluster.processing" />',
'label.action.delete.disk.offering': '<fmt:message key="label.action.delete.disk.offering" />',
-'label.action.update.resource.count': '<fmt:message key="label.action.update.resource.count" />',
-'label.action.update.resource.count.processing': '<fmt:message key="label.action.update.resource.count.processing" />',
+'label.action.delete.disk.offering.processing': '<fmt:message key="label.action.delete.disk.offering.processing" />',
'label.action.delete.domain': '<fmt:message key="label.action.delete.domain" />',
'label.action.delete.domain.processing': '<fmt:message key="label.action.delete.domain.processing" />',
-'label.action.delete.firewall.processing': '<fmt:message key="label.action.delete.firewall.processing" />',
'label.action.delete.firewall': '<fmt:message key="label.action.delete.firewall" />',
-'label.action.delete.ingress.rule.processing': '<fmt:message key="label.action.delete.ingress.rule.processing" />',
+'label.action.delete.firewall.processing': '<fmt:message key="label.action.delete.firewall.processing" />',
'label.action.delete.ingress.rule': '<fmt:message key="label.action.delete.ingress.rule" />',
-'label.action.delete.load.balancer.processing': '<fmt:message key="label.action.delete.load.balancer.processing" />',
+'label.action.delete.ingress.rule.processing': '<fmt:message key="label.action.delete.ingress.rule.processing" />',
+'label.action.delete.IP.range': '<fmt:message key="label.action.delete.IP.range" />',
+'label.action.delete.IP.range.processing': '<fmt:message key="label.action.delete.IP.range.processing" />',
+'label.action.delete.ISO': '<fmt:message key="label.action.delete.ISO" />',
+'label.action.delete.ISO.processing': '<fmt:message key="label.action.delete.ISO.processing" />',
'label.action.delete.load.balancer': '<fmt:message key="label.action.delete.load.balancer" />',
-'label.action.edit.network.processing': '<fmt:message key="label.action.edit.network.processing" />',
-'label.action.edit.network': '<fmt:message key="label.action.edit.network" />',
-'label.action.delete.network.processing': '<fmt:message key="label.action.delete.network.processing" />',
+'label.action.delete.load.balancer.processing': '<fmt:message key="label.action.delete.load.balancer.processing" />',
'label.action.delete.network': '<fmt:message key="label.action.delete.network" />',
+'label.action.delete.network.processing': '<fmt:message key="label.action.delete.network.processing" />',
'label.action.delete.nexusVswitch': '<fmt:message key="label.action.delete.nexusVswitch" />',
-'label.action.enable.nexusVswitch': '<fmt:message key="label.action.enable.nexusVswitch" />',
-'label.action.disable.nexusVswitch': '<fmt:message key="label.action.disable.nexusVswitch" />',
-'label.action.delete.pod.processing': '<fmt:message key="label.action.delete.pod.processing" />',
+'label.action.delete.physical.network': '<fmt:message key="label.action.delete.physical.network" />',
'label.action.delete.pod': '<fmt:message key="label.action.delete.pod" />',
-'label.action.delete.primary.storage.processing': '<fmt:message key="label.action.delete.primary.storage.processing" />',
+'label.action.delete.pod.processing': '<fmt:message key="label.action.delete.pod.processing" />',
'label.action.delete.primary.storage': '<fmt:message key="label.action.delete.primary.storage" />',
-'label.action.delete.secondary.storage.processing': '<fmt:message key="label.action.delete.secondary.storage.processing" />',
+'label.action.delete.primary.storage.processing': '<fmt:message key="label.action.delete.primary.storage.processing" />',
'label.action.delete.secondary.storage': '<fmt:message key="label.action.delete.secondary.storage" />',
-'label.action.delete.security.group.processing': '<fmt:message key="label.action.delete.security.group.processing" />',
+'label.action.delete.secondary.storage.processing': '<fmt:message key="label.action.delete.secondary.storage.processing" />',
'label.action.delete.security.group': '<fmt:message key="label.action.delete.security.group" />',
-'label.action.delete.service.offering.processing': '<fmt:message key="label.action.delete.service.offering.processing" />',
+'label.action.delete.security.group.processing': '<fmt:message key="label.action.delete.security.group.processing" />',
'label.action.delete.service.offering': '<fmt:message key="label.action.delete.service.offering" />',
-'label.action.delete.snapshot.processing': '<fmt:message key="label.action.delete.snapshot.processing" />',
+'label.action.delete.service.offering.processing': '<fmt:message key="label.action.delete.service.offering.processing" />',
'label.action.delete.snapshot': '<fmt:message key="label.action.delete.snapshot" />',
-'label.action.delete.template.processing': '<fmt:message key="label.action.delete.template.processing" />',
+'label.action.delete.snapshot.processing': '<fmt:message key="label.action.delete.snapshot.processing" />',
+'label.action.delete.system.service.offering': '<fmt:message key="label.action.delete.system.service.offering" />',
'label.action.delete.template': '<fmt:message key="label.action.delete.template" />',
-'label.action.delete.user.processing': '<fmt:message key="label.action.delete.user.processing" />',
+'label.action.delete.template.processing': '<fmt:message key="label.action.delete.template.processing" />',
'label.action.delete.user': '<fmt:message key="label.action.delete.user" />',
-'label.action.delete.volume.processing': '<fmt:message key="label.action.delete.volume.processing" />',
+'label.action.delete.user.processing': '<fmt:message key="label.action.delete.user.processing" />',
'label.action.delete.volume': '<fmt:message key="label.action.delete.volume" />',
-'label.action.delete.zone.processing': '<fmt:message key="label.action.delete.zone.processing" />',
+'label.action.delete.volume.processing': '<fmt:message key="label.action.delete.volume.processing" />',
'label.action.delete.zone': '<fmt:message key="label.action.delete.zone" />',
-'label.action.destroy.instance.processing': '<fmt:message key="label.action.destroy.instance.processing" />',
+'label.action.delete.zone.processing': '<fmt:message key="label.action.delete.zone.processing" />',
'label.action.destroy.instance': '<fmt:message key="label.action.destroy.instance" />',
-'label.action.destroy.systemvm.processing': '<fmt:message key="label.action.destroy.systemvm.processing" />',
+'label.action.destroy.instance.processing': '<fmt:message key="label.action.destroy.instance.processing" />',
'label.action.destroy.systemvm': '<fmt:message key="label.action.destroy.systemvm" />',
-'label.action.detach.disk.processing': '<fmt:message key="label.action.detach.disk.processing" />',
+'label.action.destroy.systemvm.processing': '<fmt:message key="label.action.destroy.systemvm.processing" />',
'label.action.detach.disk': '<fmt:message key="label.action.detach.disk" />',
-'label.action.detach.iso.processing': '<fmt:message key="label.action.detach.iso.processing" />',
+'label.action.detach.disk.processing': '<fmt:message key="label.action.detach.disk.processing" />',
'label.action.detach.iso': '<fmt:message key="label.action.detach.iso" />',
-'label.action.disable.account.processing': '<fmt:message key="label.action.disable.account.processing" />',
+'label.action.detach.iso.processing': '<fmt:message key="label.action.detach.iso.processing" />',
'label.action.disable.account': '<fmt:message key="label.action.disable.account" />',
-'label.action.disable.static.NAT.processing': '<fmt:message key="label.action.disable.static.NAT.processing" />',
+'label.action.disable.account.processing': '<fmt:message key="label.action.disable.account.processing" />',
+'label.action.disable.cluster': '<fmt:message key="label.action.disable.cluster" />',
+'label.action.disable.cluster.processing': '<fmt:message key="label.action.disable.cluster.processing" />',
+'label.action.disable.nexusVswitch': '<fmt:message key="label.action.disable.nexusVswitch" />',
+'label.action.disable.physical.network': '<fmt:message key="label.action.disable.physical.network" />',
+'label.action.disable.pod': '<fmt:message key="label.action.disable.pod" />',
+'label.action.disable.pod.processing': '<fmt:message key="label.action.disable.pod.processing" />',
'label.action.disable.static.NAT': '<fmt:message key="label.action.disable.static.NAT" />',
-'label.action.disable.user.processing': '<fmt:message key="label.action.disable.user.processing" />',
+'label.action.disable.static.NAT.processing': '<fmt:message key="label.action.disable.static.NAT.processing" />',
'label.action.disable.user': '<fmt:message key="label.action.disable.user" />',
+'label.action.disable.user.processing': '<fmt:message key="label.action.disable.user.processing" />',
+'label.action.disable.zone': '<fmt:message key="label.action.disable.zone" />',
+'label.action.disable.zone.processing': '<fmt:message key="label.action.disable.zone.processing" />',
'label.action.download.ISO': '<fmt:message key="label.action.download.ISO" />',
'label.action.download.template': '<fmt:message key="label.action.download.template" />',
-'label.action.download.volume.processing': '<fmt:message key="label.action.download.volume.processing" />',
'label.action.download.volume': '<fmt:message key="label.action.download.volume" />',
-'label.action.edit.ISO': '<fmt:message key="label.action.edit.ISO" />',
+'label.action.download.volume.processing': '<fmt:message key="label.action.download.volume.processing" />',
'label.action.edit.account': '<fmt:message key="label.action.edit.account" />',
'label.action.edit.disk.offering': '<fmt:message key="label.action.edit.disk.offering" />',
'label.action.edit.domain': '<fmt:message key="label.action.edit.domain" />',
'label.action.edit.global.setting': '<fmt:message key="label.action.edit.global.setting" />',
+'label.action.edit.host': '<fmt:message key="label.action.edit.host" />',
'label.action.edit.instance': '<fmt:message key="label.action.edit.instance" />',
+'label.action.edit.ISO': '<fmt:message key="label.action.edit.ISO" />',
+'label.action.edit.network': '<fmt:message key="label.action.edit.network" />',
'label.action.edit.network.offering': '<fmt:message key="label.action.edit.network.offering" />',
+'label.action.edit.network.processing': '<fmt:message key="label.action.edit.network.processing" />',
'label.action.edit.pod': '<fmt:message key="label.action.edit.pod" />',
'label.action.edit.primary.storage': '<fmt:message key="label.action.edit.primary.storage" />',
'label.action.edit.resource.limits': '<fmt:message key="label.action.edit.resource.limits" />',
@@ -600,112 +167,192 @@ dictionary = {
'label.action.edit.template': '<fmt:message key="label.action.edit.template" />',
'label.action.edit.user': '<fmt:message key="label.action.edit.user" />',
'label.action.edit.zone': '<fmt:message key="label.action.edit.zone" />',
-'label.action.enable.account.processing': '<fmt:message key="label.action.enable.account.processing" />',
'label.action.enable.account': '<fmt:message key="label.action.enable.account" />',
-'label.action.enable.maintenance.mode.processing': '<fmt:message key="label.action.enable.maintenance.mode.processing" />',
+'label.action.enable.account.processing': '<fmt:message key="label.action.enable.account.processing" />',
+'label.action.enable.cluster': '<fmt:message key="label.action.enable.cluster" />',
+'label.action.enable.cluster.processing': '<fmt:message key="label.action.enable.cluster.processing" />',
'label.action.enable.maintenance.mode': '<fmt:message key="label.action.enable.maintenance.mode" />',
-'label.action.enable.static.NAT.processing': '<fmt:message key="label.action.enable.static.NAT.processing" />',
+'label.action.enable.maintenance.mode.processing': '<fmt:message key="label.action.enable.maintenance.mode.processing" />',
+'label.action.enable.nexusVswitch': '<fmt:message key="label.action.enable.nexusVswitch" />',
+'label.action.enable.physical.network': '<fmt:message key="label.action.enable.physical.network" />',
+'label.action.enable.pod': '<fmt:message key="label.action.enable.pod" />',
+'label.action.enable.pod.processing': '<fmt:message key="label.action.enable.pod.processing" />',
'label.action.enable.static.NAT': '<fmt:message key="label.action.enable.static.NAT" />',
-'label.action.enable.user.processing': '<fmt:message key="label.action.enable.user.processing" />',
+'label.action.enable.static.NAT.processing': '<fmt:message key="label.action.enable.static.NAT.processing" />',
'label.action.enable.user': '<fmt:message key="label.action.enable.user" />',
-'label.action.force.reconnect.processing': '<fmt:message key="label.action.force.reconnect.processing" />',
+'label.action.enable.user.processing': '<fmt:message key="label.action.enable.user.processing" />',
+'label.action.enable.zone': '<fmt:message key="label.action.enable.zone" />',
+'label.action.enable.zone.processing': '<fmt:message key="label.action.enable.zone.processing" />',
'label.action.force.reconnect': '<fmt:message key="label.action.force.reconnect" />',
-'label.action.generate.keys.processing': '<fmt:message key="label.action.generate.keys.processing" />',
+'label.action.force.reconnect.processing': '<fmt:message key="label.action.force.reconnect.processing" />',
'label.action.generate.keys': '<fmt:message key="label.action.generate.keys" />',
-'label.action.lock.account.processing': '<fmt:message key="label.action.lock.account.processing" />',
+'label.action.generate.keys.processing': '<fmt:message key="label.action.generate.keys.processing" />',
'label.action.lock.account': '<fmt:message key="label.action.lock.account" />',
+'label.action.lock.account.processing': '<fmt:message key="label.action.lock.account.processing" />',
+'label.action.manage.cluster': '<fmt:message key="label.action.manage.cluster" />',
+'label.action.manage.cluster.processing': '<fmt:message key="label.action.manage.cluster.processing" />',
'label.action.migrate.instance': '<fmt:message key="label.action.migrate.instance" />',
'label.action.migrate.instance.processing': '<fmt:message key="label.action.migrate.instance.processing" />',
-'label.action.reboot.instance.processing': '<fmt:message key="label.action.reboot.instance.processing" />',
+'label.action.migrate.router': '<fmt:message key="label.action.migrate.router" />',
+'label.action.migrate.router.processing': '<fmt:message key="label.action.migrate.router.processing" />',
+'label.action.migrate.systemvm': '<fmt:message key="label.action.migrate.systemvm" />',
+'label.action.migrate.systemvm.processing': '<fmt:message key="label.action.migrate.systemvm.processing" />',
'label.action.reboot.instance': '<fmt:message key="label.action.reboot.instance" />',
-'label.action.reboot.router.processing': '<fmt:message key="label.action.reboot.router.processing" />',
+'label.action.reboot.instance.processing': '<fmt:message key="label.action.reboot.instance.processing" />',
'label.action.reboot.router': '<fmt:message key="label.action.reboot.router" />',
-'label.action.reboot.systemvm.processing': '<fmt:message key="label.action.reboot.systemvm.processing" />',
+'label.action.reboot.router.processing': '<fmt:message key="label.action.reboot.router.processing" />',
'label.action.reboot.systemvm': '<fmt:message key="label.action.reboot.systemvm" />',
+'label.action.reboot.systemvm.processing': '<fmt:message key="label.action.reboot.systemvm.processing" />',
'label.action.recurring.snapshot': '<fmt:message key="label.action.recurring.snapshot" />',
-'label.action.release.ip.processing': '<fmt:message key="label.action.release.ip.processing" />',
+'label.action.register.iso': '<fmt:message key="label.action.register.iso" />',
+'label.action.register.template': '<fmt:message key="label.action.register.template" />',
'label.action.release.ip': '<fmt:message key="label.action.release.ip" />',
-'label.action.remove.host.processing': '<fmt:message key="label.action.remove.host.processing" />',
+'label.action.release.ip.processing': '<fmt:message key="label.action.release.ip.processing" />',
'label.action.remove.host': '<fmt:message key="label.action.remove.host" />',
-'label.action.reset.password.processing': '<fmt:message key="label.action.reset.password.processing" />',
+'label.action.remove.host.processing': '<fmt:message key="label.action.remove.host.processing" />',
'label.action.reset.password': '<fmt:message key="label.action.reset.password" />',
+'label.action.reset.password.processing': '<fmt:message key="label.action.reset.password.processing" />',
+'label.action.resize.volume': '<fmt:message key="label.action.resize.volume" />',
'label.action.resource.limits': '<fmt:message key="label.action.resource.limits" />',
-'label.action.restore.instance.processing': '<fmt:message key="label.action.restore.instance.processing" />',
'label.action.restore.instance': '<fmt:message key="label.action.restore.instance" />',
-'label.action.start.instance.processing': '<fmt:message key="label.action.start.instance.processing" />',
+'label.action.restore.instance.processing': '<fmt:message key="label.action.restore.instance.processing" />',
+'label.actions': '<fmt:message key="label.actions" />',
'label.action.start.instance': '<fmt:message key="label.action.start.instance" />',
-'label.action.start.router.processing': '<fmt:message key="label.action.start.router.processing" />',
+'label.action.start.instance.processing': '<fmt:message key="label.action.start.instance.processing" />',
'label.action.start.router': '<fmt:message key="label.action.start.router" />',
-'label.action.start.systemvm.processing': '<fmt:message key="label.action.start.systemvm.processing" />',
+'label.action.start.router.processing': '<fmt:message key="label.action.start.router.processing" />',
'label.action.start.systemvm': '<fmt:message key="label.action.start.systemvm" />',
-'label.action.stop.instance.processing': '<fmt:message key="label.action.stop.instance.processing" />',
+'label.action.start.systemvm.processing': '<fmt:message key="label.action.start.systemvm.processing" />',
'label.action.stop.instance': '<fmt:message key="label.action.stop.instance" />',
-'label.action.stop.router.processing': '<fmt:message key="label.action.stop.router.processing" />',
+'label.action.stop.instance.processing': '<fmt:message key="label.action.stop.instance.processing" />',
'label.action.stop.router': '<fmt:message key="label.action.stop.router" />',
-'label.action.stop.systemvm.processing': '<fmt:message key="label.action.stop.systemvm.processing" />',
+'label.action.stop.router.processing': '<fmt:message key="label.action.stop.router.processing" />',
'label.action.stop.systemvm': '<fmt:message key="label.action.stop.systemvm" />',
-'label.action.take.snapshot.processing': '<fmt:message key="label.action.take.snapshot.processing" />',
+'label.action.stop.systemvm.processing': '<fmt:message key="label.action.stop.systemvm.processing" />',
'label.action.take.snapshot': '<fmt:message key="label.action.take.snapshot" />',
-'label.action.update.OS.preference.processing': '<fmt:message key="label.action.update.OS.preference.processing" />',
+'label.action.take.snapshot.processing': '<fmt:message key="label.action.take.snapshot.processing" />',
+'label.action.unmanage.cluster': '<fmt:message key="label.action.unmanage.cluster" />',
+'label.action.unmanage.cluster.processing': '<fmt:message key="label.action.unmanage.cluster.processing" />',
'label.action.update.OS.preference': '<fmt:message key="label.action.update.OS.preference" />',
-'label.actions': '<fmt:message key="label.actions" />',
+'label.action.update.OS.preference.processing': '<fmt:message key="label.action.update.OS.preference.processing" />',
+'label.action.update.resource.count': '<fmt:message key="label.action.update.resource.count" />',
+'label.action.update.resource.count.processing': '<fmt:message key="label.action.update.resource.count.processing" />',
+'label.action.vmsnapshot.create': '<fmt:message key="label.action.vmsnapshot.create" />',
+'label.action.vmsnapshot.delete': '<fmt:message key="label.action.vmsnapshot.delete" />',
+'label.action.vmsnapshot.revert': '<fmt:message key="label.action.vmsnapshot.revert" />',
+'label.activate.project': '<fmt:message key="label.activate.project" />',
'label.active.sessions': '<fmt:message key="label.active.sessions" />',
'label.add.account': '<fmt:message key="label.add.account" />',
+'label.add.accounts': '<fmt:message key="label.add.accounts" />',
+'label.add.accounts.to': '<fmt:message key="label.add.accounts.to" />',
+'label.add.account.to.project': '<fmt:message key="label.add.account.to.project" />',
+'label.add.ACL': '<fmt:message key="label.add.ACL" />',
+'label.add.affinity.group': '<fmt:message key="label.add.affinity.group" />',
+'label.add.BigSwitchVns.device': '<fmt:message key="label.add.BigSwitchVns.device" />',
'label.add.by.cidr': '<fmt:message key="label.add.by.cidr" />',
+'label.add.by': '<fmt:message key="label.add.by" />',
'label.add.by.group': '<fmt:message key="label.add.by.group" />',
'label.add.cluster': '<fmt:message key="label.add.cluster" />',
+'label.add.compute.offering': '<fmt:message key="label.add.compute.offering" />',
'label.add.direct.iprange': '<fmt:message key="label.add.direct.iprange" />',
'label.add.disk.offering': '<fmt:message key="label.add.disk.offering" />',
'label.add.domain': '<fmt:message key="label.add.domain" />',
+'label.add.egress.rule': '<fmt:message key="label.add.egress.rule" />',
+'label.add.F5.device': '<fmt:message key="label.add.F5.device" />',
'label.add.firewall': '<fmt:message key="label.add.firewall" />',
+'label.add': '<fmt:message key="label.add" />',
+'label.add.guest.network': '<fmt:message key="label.add.guest.network" />',
'label.add.host': '<fmt:message key="label.add.host" />',
+'label.adding.cluster': '<fmt:message key="label.adding.cluster" />',
+'label.adding.failed': '<fmt:message key="label.adding.failed" />',
+'label.adding': '<fmt:message key="label.adding" />',
+'label.adding.pod': '<fmt:message key="label.adding.pod" />',
+'label.adding.processing': '<fmt:message key="label.adding.processing" />',
'label.add.ingress.rule': '<fmt:message key="label.add.ingress.rule" />',
+'label.adding.succeeded': '<fmt:message key="label.adding.succeeded" />',
+'label.adding.user': '<fmt:message key="label.adding.user" />',
+'label.adding.zone': '<fmt:message key="label.adding.zone" />',
'label.add.ip.range': '<fmt:message key="label.add.ip.range" />',
+'label.additional.networks': '<fmt:message key="label.additional.networks" />',
'label.add.load.balancer': '<fmt:message key="label.add.load.balancer" />',
'label.add.more': '<fmt:message key="label.add.more" />',
+'label.add.netScaler.device': '<fmt:message key="label.add.netScaler.device" />',
+'label.add.network.ACL': '<fmt:message key="label.add.network.ACL" />',
+'label.add.network.device': '<fmt:message key="label.add.network.device" />',
'label.add.network': '<fmt:message key="label.add.network" />',
+'label.add.network.offering': '<fmt:message key="label.add.network.offering" />',
+'label.add.new.F5': '<fmt:message key="label.add.new.F5" />',
+'label.add.new.gateway': '<fmt:message key="label.add.new.gateway" />',
+'label.add.new.NetScaler': '<fmt:message key="label.add.new.NetScaler" />',
+'label.add.new.SRX': '<fmt:message key="label.add.new.SRX" />',
+'label.add.new.tier': '<fmt:message key="label.add.new.tier" />',
+'label.add.NiciraNvp.device': '<fmt:message key="label.add.NiciraNvp.device" />',
'label.add.pod': '<fmt:message key="label.add.pod" />',
+'label.add.port.forwarding.rule': '<fmt:message key="label.add.port.forwarding.rule" />',
'label.add.primary.storage': '<fmt:message key="label.add.primary.storage" />',
+'label.add.region': '<fmt:message key="label.add.region" />',
+'label.add.route': '<fmt:message key="label.add.route" />',
+'label.add.rule': '<fmt:message key="label.add.rule" />',
'label.add.secondary.storage': '<fmt:message key="label.add.secondary.storage" />',
'label.add.security.group': '<fmt:message key="label.add.security.group" />',
'label.add.service.offering': '<fmt:message key="label.add.service.offering" />',
+'label.add.SRX.device': '<fmt:message key="label.add.SRX.device" />',
+'label.add.static.nat.rule': '<fmt:message key="label.add.static.nat.rule" />',
+'label.add.static.route': '<fmt:message key="label.add.static.route" />',
'label.add.system.service.offering': '<fmt:message key="label.add.system.service.offering" />',
'label.add.template': '<fmt:message key="label.add.template" />',
+'label.add.to.group': '<fmt:message key="label.add.to.group" />',
'label.add.user': '<fmt:message key="label.add.user" />',
'label.add.vlan': '<fmt:message key="label.add.vlan" />',
+'label.add.vm': '<fmt:message key="label.add.vm" />',
+'label.add.vms': '<fmt:message key="label.add.vms" />',
+'label.add.vms.to.lb': '<fmt:message key="label.add.vms.to.lb" />',
+'label.add.VM.to.tier': '<fmt:message key="label.add.VM.to.tier" />',
'label.add.volume': '<fmt:message key="label.add.volume" />',
+'label.add.vpc': '<fmt:message key="label.add.vpc" />',
+'label.add.vpn.customer.gateway': '<fmt:message key="label.add.vpn.customer.gateway" />',
+'label.add.VPN.gateway': '<fmt:message key="label.add.VPN.gateway" />',
+'label.add.vpn.user': '<fmt:message key="label.add.vpn.user" />',
'label.add.zone': '<fmt:message key="label.add.zone" />',
-'label.add': '<fmt:message key="label.add" />',
-'label.adding.cluster': '<fmt:message key="label.adding.cluster" />',
-'label.adding.failed': '<fmt:message key="label.adding.failed" />',
-'label.adding.pod': '<fmt:message key="label.adding.pod" />',
-'label.adding.processing': '<fmt:message key="label.adding.processing" />',
-'label.adding.succeeded': '<fmt:message key="label.adding.succeeded" />',
-'label.adding.user': '<fmt:message key="label.adding.user" />',
-'label.adding.zone': '<fmt:message key="label.adding.zone" />',
-'label.adding': '<fmt:message key="label.adding" />',
-'label.additional.networks': '<fmt:message key="label.additional.networks" />',
'label.admin.accounts': '<fmt:message key="label.admin.accounts" />',
'label.admin': '<fmt:message key="label.admin" />',
+'label.advanced': '<fmt:message key="label.advanced" />',
'label.advanced.mode': '<fmt:message key="label.advanced.mode" />',
'label.advanced.search': '<fmt:message key="label.advanced.search" />',
-'label.advanced': '<fmt:message key="label.advanced" />',
+'label.affinity': '<fmt:message key="label.affinity" />',
+'label.affinity.group': '<fmt:message key="label.affinity.group" />',
+'label.affinity.groups': '<fmt:message key="label.affinity.groups" />',
+'label.agent.password': '<fmt:message key="label.agent.password" />',
+'label.agent.username': '<fmt:message key="label.agent.username" />',
+'label.agree': '<fmt:message key="label.agree" />',
'label.alert': '<fmt:message key="label.alert" />',
'label.algorithm': '<fmt:message key="label.algorithm" />',
'label.allocated': '<fmt:message key="label.allocated" />',
+'label.allocation.state': '<fmt:message key="label.allocation.state" />',
+'label.anti.affinity': '<fmt:message key="label.anti.affinity" />',
+'label.anti.affinity.group': '<fmt:message key="label.anti.affinity.group" />',
+'label.anti.affinity.groups': '<fmt:message key="label.anti.affinity.groups" />',
'label.api.key': '<fmt:message key="label.api.key" />',
-'label.assign.to.load.balancer': '<fmt:message key="label.assign.to.load.balancer" />',
+'label.apply': '<fmt:message key="label.apply" />',
'label.assign': '<fmt:message key="label.assign" />',
+'label.assign.to.load.balancer': '<fmt:message key="label.assign.to.load.balancer" />',
+'label.associated.network': '<fmt:message key="label.associated.network" />',
'label.associated.network.id': '<fmt:message key="label.associated.network.id" />',
'label.attached.iso': '<fmt:message key="label.attached.iso" />',
-'label.availability.zone': '<fmt:message key="label.availability.zone" />',
+'label.author.email': '<fmt:message key="label.author.email" />',
+'label.author.name': '<fmt:message key="label.author.name" />',
'label.availability': '<fmt:message key="label.availability" />',
-'label.available.public.ips': '<fmt:message key="label.available.public.ips" />',
+'label.availability.zone': '<fmt:message key="label.availability.zone" />',
'label.available': '<fmt:message key="label.available" />',
+'label.available.public.ips': '<fmt:message key="label.available.public.ips" />',
'label.back': '<fmt:message key="label.back" />',
+'label.bandwidth': '<fmt:message key="label.bandwidth" />',
'label.basic.mode': '<fmt:message key="label.basic.mode" />',
+'label.bigswitch.controller.address': '<fmt:message key="label.bigswitch.controller.address" />',
'label.bootable': '<fmt:message key="label.bootable" />',
+'label.broadcast.domain.range': '<fmt:message key="label.broadcast.domain.range" />',
'label.broadcast.domain.type': '<fmt:message key="label.broadcast.domain.type" />',
+'label.broadcast.uri': '<fmt:message key="label.broadcast.uri" />',
'label.by.account': '<fmt:message key="label.by.account" />',
'label.by.availability': '<fmt:message key="label.by.availability" />',
'label.by.domain': '<fmt:message key="label.by.domain" />',
@@ -715,31 +362,64 @@ dictionary = {
'label.by.role': '<fmt:message key="label.by.role" />',
'label.by.start.date': '<fmt:message key="label.by.start.date" />',
'label.by.state': '<fmt:message key="label.by.state" />',
+'label.bytes.received': '<fmt:message key="label.bytes.received" />',
+'label.bytes.sent': '<fmt:message key="label.bytes.sent" />',
'label.by.traffic.type': '<fmt:message key="label.by.traffic.type" />',
-'label.by.type.id': '<fmt:message key="label.by.type.id" />',
'label.by.type': '<fmt:message key="label.by.type" />',
+'label.by.type.id': '<fmt:message key="label.by.type.id" />',
'label.by.zone': '<fmt:message key="label.by.zone" />',
-'label.bytes.received': '<fmt:message key="label.bytes.received" />',
-'label.bytes.sent': '<fmt:message key="label.bytes.sent" />',
'label.cancel': '<fmt:message key="label.cancel" />',
+'label.capacity': '<fmt:message key="label.capacity" />',
'label.certificate': '<fmt:message key="label.certificate" />',
-'label.privatekey': '<fmt:message key="label.privatekey" />',
-'label.domain.suffix': '<fmt:message key="label.domain.suffix" />',
+'label.change.service.offering': '<fmt:message key="label.change.service.offering" />',
+'label.change.value': '<fmt:message key="label.change.value" />',
'label.character': '<fmt:message key="label.character" />',
+'label.checksum': '<fmt:message key="label.checksum" />',
'label.cidr.account': '<fmt:message key="label.cidr.account" />',
+'label.cidr': '<fmt:message key="label.cidr" />',
+'label.cidr.list': '<fmt:message key="label.cidr.list" />',
+'label.CIDR.list': '<fmt:message key="label.CIDR.list" />',
+'label.CIDR.of.destination.network': '<fmt:message key="label.CIDR.of.destination.network" />',
+'label.clean.up': '<fmt:message key="label.clean.up" />',
+'label.clear.list': '<fmt:message key="label.clear.list" />',
'label.close': '<fmt:message key="label.close" />',
'label.cloud.console': '<fmt:message key="label.cloud.console" />',
'label.cloud.managed': '<fmt:message key="label.cloud.managed" />',
-'label.cluster.type': '<fmt:message key="label.cluster.type" />',
'label.cluster': '<fmt:message key="label.cluster" />',
+'label.cluster.name': '<fmt:message key="label.cluster.name" />',
+'label.clusters': '<fmt:message key="label.clusters" />',
+'label.cluster.type': '<fmt:message key="label.cluster.type" />',
+'label.clvm': '<fmt:message key="label.clvm" />',
'label.code': '<fmt:message key="label.code" />',
+'label.community': '<fmt:message key="label.community" />',
+'label.compute.and.storage': '<fmt:message key="label.compute.and.storage" />',
+'label.compute': '<fmt:message key="label.compute" />',
+'label.compute.offering': '<fmt:message key="label.compute.offering" />',
+'label.compute.offerings': '<fmt:message key="label.compute.offerings" />',
+'label.configuration': '<fmt:message key="label.configuration" />',
+'label.configure': '<fmt:message key="label.configure" />',
+'label.configure.network.ACLs': '<fmt:message key="label.configure.network.ACLs" />',
+'label.configure.vpc': '<fmt:message key="label.configure.vpc" />',
'label.confirmation': '<fmt:message key="label.confirmation" />',
-'label.cpu.allocated.for.VMs': '<fmt:message key="label.cpu.allocated.for.VMs" />',
+'label.confirm.password': '<fmt:message key="label.confirm.password" />',
+'label.congratulations': '<fmt:message key="label.congratulations" />',
+'label.conserve.mode': '<fmt:message key="label.conserve.mode" />',
+'label.console.proxy' : '<fmt:message key="label.console.proxy" />',
+'label.continue.basic.install': '<fmt:message key="label.continue.basic.install" />',
+'label.continue': '<fmt:message key="label.continue" />',
+'label.corrections.saved': '<fmt:message key="label.corrections.saved" />',
'label.cpu.allocated': '<fmt:message key="label.cpu.allocated" />',
+'label.cpu.allocated.for.VMs': '<fmt:message key="label.cpu.allocated.for.VMs" />',
+'label.CPU.cap': '<fmt:message key="label.CPU.cap" />',
+'label.cpu': '<fmt:message key="label.cpu" />',
+'label.cpu.limits': '<fmt:message key="label.cpu.limits" />',
'label.cpu.mhz': '<fmt:message key="label.cpu.mhz" />',
'label.cpu.utilized': '<fmt:message key="label.cpu.utilized" />',
-'label.cpu': '<fmt:message key="label.cpu" />',
+'label.created.by.system': '<fmt:message key="label.created.by.system" />',
'label.created': '<fmt:message key="label.created" />',
+'label.create.project': '<fmt:message key="label.create.project" />',
+'label.create.template': '<fmt:message key="label.create.template" />',
+'label.create.VPN.connection': '<fmt:message key="label.create.VPN.connection" />',
'label.cross.zones': '<fmt:message key="label.cross.zones" />',
'label.custom.disk.size': '<fmt:message key="label.custom.disk.size" />',
'label.daily': '<fmt:message key="label.daily" />',
@@ -747,48 +427,112 @@ dictionary = {
'label.date': '<fmt:message key="label.date" />',
'label.day.of.month': '<fmt:message key="label.day.of.month" />',
'label.day.of.week': '<fmt:message key="label.day.of.week" />',
+'label.dead.peer.detection': '<fmt:message key="label.dead.peer.detection" />',
+'label.decline.invitation': '<fmt:message key="label.decline.invitation" />',
+'label.dedicated': '<fmt:message key="label.dedicated" />',
+'label.default': '<fmt:message key="label.default" />',
+'label.default.use': '<fmt:message key="label.default.use" />',
+'label.default.view': '<fmt:message key="label.default.view" />',
+'label.delete.affinity.group': '<fmt:message key="label.delete.affinity.group" />',
+'label.delete.BigSwitchVns': '<fmt:message key="label.delete.BigSwitchVns" />',
+'label.delete.F5': '<fmt:message key="label.delete.F5" />',
'label.delete': '<fmt:message key="label.delete" />',
+'label.delete.gateway': '<fmt:message key="label.delete.gateway" />',
+'label.delete.NetScaler': '<fmt:message key="label.delete.NetScaler" />',
+'label.delete.NiciraNvp': '<fmt:message key="label.delete.NiciraNvp" />',
+'label.delete.project': '<fmt:message key="label.delete.project" />',
+'label.delete.SRX': '<fmt:message key="label.delete.SRX" />',
+'label.delete.VPN.connection': '<fmt:message key="label.delete.VPN.connection" />',
+'label.delete.VPN.customer.gateway': '<fmt:message key="label.delete.VPN.customer.gateway" />',
+'label.delete.VPN.gateway': '<fmt:message key="label.delete.VPN.gateway" />',
+'label.delete.vpn.user': '<fmt:message key="label.delete.vpn.user" />',
'label.deleting.failed': '<fmt:message key="label.deleting.failed" />',
'label.deleting.processing': '<fmt:message key="label.deleting.processing" />',
'label.description': '<fmt:message key="label.description" />',
+'label.destination.physical.network.id': '<fmt:message key="label.destination.physical.network.id" />',
+'label.destination.zone': '<fmt:message key="label.destination.zone" />',
+'label.destroy': '<fmt:message key="label.destroy" />',
+'label.destroy.router': '<fmt:message key="label.destroy.router" />',
'label.detaching.disk': '<fmt:message key="label.detaching.disk" />',
'label.details': '<fmt:message key="label.details" />',
-'label.nexusVswitch': '<fmt:message key="label.nexusVswitch" />',
'label.device.id': '<fmt:message key="label.device.id" />',
+'label.devices': '<fmt:message key="label.devices" />',
+'label.dhcp': '<fmt:message key="label.dhcp" />',
+'label.DHCP.server.type': '<fmt:message key="label.DHCP.server.type" />',
+'label.direct.ips': '<fmt:message key="label.direct.ips" />',
'label.disabled': '<fmt:message key="label.disabled" />',
+'label.disable.provider': '<fmt:message key="label.disable.provider" />',
+'label.disable.vpn': '<fmt:message key="label.disable.vpn" />',
'label.disabling.vpn.access': '<fmt:message key="label.disabling.vpn.access" />',
'label.disk.allocated': '<fmt:message key="label.disk.allocated" />',
'label.disk.offering': '<fmt:message key="label.disk.offering" />',
-'label.disk.size.gb': '<fmt:message key="label.disk.size.gb" />',
'label.disk.size': '<fmt:message key="label.disk.size" />',
+'label.disk.size.gb': '<fmt:message key="label.disk.size.gb" />',
'label.disk.total': '<fmt:message key="label.disk.total" />',
'label.disk.volume': '<fmt:message key="label.disk.volume" />',
+'label.display.name': '<fmt:message key="label.display.name" />',
'label.display.text': '<fmt:message key="label.display.text" />',
'label.dns.1': '<fmt:message key="label.dns.1" />',
'label.dns.2': '<fmt:message key="label.dns.2" />',
+'label.DNS.domain.for.guest.networks': '<fmt:message key="label.DNS.domain.for.guest.networks" />',
+'label.dns': '<fmt:message key="label.dns" />',
'label.domain.admin': '<fmt:message key="label.domain.admin" />',
+'label.domain': '<fmt:message key="label.domain" />',
'label.domain.id': '<fmt:message key="label.domain.id" />',
'label.domain.name': '<fmt:message key="label.domain.name" />',
-'label.domain': '<fmt:message key="label.domain" />',
+'label.domain.router' : '<fmt:message key="label.domain.router" />',
+'label.domain.suffix': '<fmt:message key="label.domain.suffix" />',
+'label.done': '<fmt:message key="label.done" />',
'label.double.quotes.are.not.allowed': '<fmt:message key="label.double.quotes.are.not.allowed" />',
'label.download.progress': '<fmt:message key="label.download.progress" />',
+'label.drag.new.position': '<fmt:message key="label.drag.new.position" />',
+'label.edit.affinity.group': '<fmt:message key="label.edit.affinity.group" />',
'label.edit': '<fmt:message key="label.edit" />',
+'label.edit.lb.rule': '<fmt:message key="label.edit.lb.rule" />',
+'label.edit.network.details': '<fmt:message key="label.edit.network.details" />',
+'label.edit.project.details': '<fmt:message key="label.edit.project.details" />',
+'label.edit.tags': '<fmt:message key="label.edit.tags" />',
+'label.edit.traffic.type': '<fmt:message key="label.edit.traffic.type" />',
+'label.edit.vpc': '<fmt:message key="label.edit.vpc" />',
+'label.egress.rule': '<fmt:message key="label.egress.rule" />',
+'label.egress.rules': '<fmt:message key="label.egress.rules" />',
+'label.elastic': '<fmt:message key="label.elastic" />',
+'label.elastic.IP': '<fmt:message key="label.elastic.IP" />',
+'label.elastic.LB': '<fmt:message key="label.elastic.LB" />',
'label.email': '<fmt:message key="label.email" />',
+'label.enable.provider': '<fmt:message key="label.enable.provider" />',
+'label.enable.s3': '<fmt:message key="label.enable.s3" />',
+'label.enable.swift': '<fmt:message key="label.enable.swift" />',
+'label.enable.vpn': '<fmt:message key="label.enable.vpn" />',
'label.enabling.vpn.access': '<fmt:message key="label.enabling.vpn.access" />',
'label.enabling.vpn': '<fmt:message key="label.enabling.vpn" />',
-'label.end.port': '<fmt:message key="label.end.port" />',
+'label.end.IP': '<fmt:message key="label.end.IP" />',
+'label.endpoint': '<fmt:message key="label.endpoint" />',
'label.endpoint.or.operation': '<fmt:message key="label.endpoint.or.operation" />',
+'label.end.port': '<fmt:message key="label.end.port" />',
+'label.end.reserved.system.IP': '<fmt:message key="label.end.reserved.system.IP" />',
+'label.end.vlan': '<fmt:message key="label.end.vlan" />',
+'label.enter.token': '<fmt:message key="label.enter.token" />',
'label.error.code': '<fmt:message key="label.error.code" />',
'label.error': '<fmt:message key="label.error" />',
+'label.ESP.encryption': '<fmt:message key="label.ESP.encryption" />',
+'label.ESP.hash': '<fmt:message key="label.ESP.hash" />',
+'label.ESP.lifetime': '<fmt:message key="label.ESP.lifetime" />',
+'label.ESP.policy': '<fmt:message key="label.ESP.policy" />',
'label.esx.host': '<fmt:message key="label.esx.host" />',
'label.example': '<fmt:message key="label.example" />',
+'label.external.link': '<fmt:message key="label.external.link" />',
+'label.f5': '<fmt:message key="label.f5" />',
'label.failed': '<fmt:message key="label.failed" />',
'label.featured': '<fmt:message key="label.featured" />',
+'label.fetch.latest': '<fmt:message key="label.fetch.latest" />',
+'label.filterBy': '<fmt:message key="label.filterBy" />',
'label.firewall': '<fmt:message key="label.firewall" />',
'label.first.name': '<fmt:message key="label.first.name" />',
'label.format': '<fmt:message key="label.format" />',
'label.friday': '<fmt:message key="label.friday" />',
'label.full': '<fmt:message key="label.full" />',
+'label.full.path': '<fmt:message key="label.full.path" />',
'label.gateway': '<fmt:message key="label.gateway" />',
'label.general.alerts': '<fmt:message key="label.general.alerts" />',
'label.generating.url': '<fmt:message key="label.generating.url" />',
@@ -796,50 +540,98 @@ dictionary = {
'label.go.step.3': '<fmt:message key="label.go.step.3" />',
'label.go.step.4': '<fmt:message key="label.go.step.4" />',
'label.go.step.5': '<fmt:message key="label.go.step.5" />',
-'label.group.optional': '<fmt:message key="label.group.optional" />',
'label.group': '<fmt:message key="label.group" />',
+'label.group.optional': '<fmt:message key="label.group.optional" />',
'label.guest.cidr': '<fmt:message key="label.guest.cidr" />',
+'label.guest.end.ip': '<fmt:message key="label.guest.end.ip" />',
+'label.guest': '<fmt:message key="label.guest" />',
'label.guest.gateway': '<fmt:message key="label.guest.gateway" />',
-'label.guest.ip.range': '<fmt:message key="label.guest.ip.range" />',
'label.guest.ip': '<fmt:message key="label.guest.ip" />',
+'label.guest.ip.range': '<fmt:message key="label.guest.ip.range" />',
'label.guest.netmask': '<fmt:message key="label.guest.netmask" />',
+'label.guest.networks': '<fmt:message key="label.guest.networks" />',
+'label.guest.start.ip': '<fmt:message key="label.guest.start.ip" />',
+'label.guest.type': '<fmt:message key="label.guest.type" />',
'label.ha.enabled': '<fmt:message key="label.ha.enabled" />',
'label.help': '<fmt:message key="label.help" />',
+'label.hide.ingress.rule': '<fmt:message key="label.hide.ingress.rule" />',
+'label.hints': '<fmt:message key="label.hints" />',
'label.host.alerts': '<fmt:message key="label.host.alerts" />',
-'label.host.name': '<fmt:message key="label.host.name" />',
'label.host': '<fmt:message key="label.host" />',
+'label.host.MAC': '<fmt:message key="label.host.MAC" />',
+'label.host.name': '<fmt:message key="label.host.name" />',
'label.hosts': '<fmt:message key="label.hosts" />',
+'label.host.tags': '<fmt:message key="label.host.tags" />',
'label.hourly': '<fmt:message key="label.hourly" />',
-'label.hypervisor.type': '<fmt:message key="label.hypervisor.type" />',
+'label.hypervisor.capabilities': '<fmt:message key="label.hypervisor.capabilities" />',
'label.hypervisor': '<fmt:message key="label.hypervisor" />',
+'label.hypervisor.type': '<fmt:message key="label.hypervisor.type" />',
+'label.hypervisor.version': '<fmt:message key="label.hypervisor.version" />',
'label.id': '<fmt:message key="label.id" />',
+'label.IKE.DH': '<fmt:message key="label.IKE.DH" />',
+'label.IKE.encryption': '<fmt:message key="label.IKE.encryption" />',
+'label.IKE.hash': '<fmt:message key="label.IKE.hash" />',
+'label.IKE.lifetime': '<fmt:message key="label.IKE.lifetime" />',
+'label.IKE.policy': '<fmt:message key="label.IKE.policy" />',
'label.info': '<fmt:message key="label.info" />',
'label.ingress.rule': '<fmt:message key="label.ingress.rule" />',
'label.initiated.by': '<fmt:message key="label.initiated.by" />',
+'label.installWizard.addClusterIntro.subtitle': '<fmt:message key="label.installWizard.addClusterIntro.subtitle" />',
+'label.installWizard.addClusterIntro.title': '<fmt:message key="label.installWizard.addClusterIntro.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.addPodIntro.subtitle': '<fmt:message key="label.installWizard.addPodIntro.subtitle" />',
+'label.installWizard.addPodIntro.title': '<fmt:message key="label.installWizard.addPodIntro.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.addSecondaryStorageIntro.subtitle': '<fmt:message key="label.installWizard.addSecondaryStorageIntro.subtitle" />',
+'label.installWizard.addSecondaryStorageIntro.title': '<fmt:message key="label.installWizard.addSecondaryStorageIntro.title" />',
+'label.installWizard.addZoneIntro.subtitle': '<fmt:message key="label.installWizard.addZoneIntro.subtitle" />',
+'label.installWizard.addZoneIntro.title': '<fmt:message key="label.installWizard.addZoneIntro.title" />',
+'label.installWizard.addZone.title': '<fmt:
<TRUNCATED>
[47/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Update l10n resource file Web-UI with latest version from transifex.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8545e68a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8545e68a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8545e68a
Branch: refs/heads/internallb
Commit: 8545e68aaf6242c735fd2b176d48fad52820bc8e
Parents: 87cafdc
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 16:24:21 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 16:24:21 2013 +0100
----------------------------------------------------------------------
.../classes/resources/messages_ar.properties | 55 +-
.../classes/resources/messages_de_DE.properties | 22 +-
.../classes/resources/messages_es.properties | 1366 +++++++-------
.../classes/resources/messages_fr_FR.properties | 78 +-
.../classes/resources/messages_it_IT.properties | 1 -
.../classes/resources/messages_ja.properties | 12 +-
.../classes/resources/messages_ko_KR.properties | 3 -
.../classes/resources/messages_pt_BR.properties | 1 -
.../classes/resources/messages_ru_RU.properties | 3 -
.../classes/resources/messages_zh_CN.properties | 4 -
10 files changed, 801 insertions(+), 744 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_ar.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ar.properties b/client/WEB-INF/classes/resources/messages_ar.properties
index f0b7796..4d3011b 100644
--- a/client/WEB-INF/classes/resources/messages_ar.properties
+++ b/client/WEB-INF/classes/resources/messages_ar.properties
@@ -24,14 +24,14 @@ label.action.delete.system.service.offering=\u062d\u0630\u0641 \u0646\u0638\u062
label.action.disable.physical.network=\u062a\u0639\u0637\u064a\u0644 \u0634\u0628\u0643\u0629 \u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
label.action.enable.physical.network=\u062a\u0645\u0643\u064a\u0646 \u0634\u0628\u0643\u0629 \u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
label.activate.project=\u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.add.account.to.project=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
label.add.accounts.to=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a \u0625\u0644\u0649
-label.add.accounts=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
+label.add.accounts=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
+label.add.account.to.project=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
label.add.ACL=\u0625\u0636\u0627\u0641\u0629 ACL
label.add.network.ACL=\u0625\u0636\u0627\u0641\u0629 \u0634\u0628\u0643\u0629 ACL
label.add.new.gateway=\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u062c\u062f\u064a\u062f\u0629
label.add.new.tier=\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629 \u062c\u062f\u064a\u062f\u0629
-label.add.port.forwarding.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629 \u0645\u0646\u0641\u0630 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647
+label.add.port.forwarding.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629 \u0645\u0646\u0641\u0630 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647
label.add.route=\u0625\u0636\u0627\u0641\u0629 \u0645\u0633\u0627\u0631
label.add.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629
label.add.static.route=\u0625\u0636\u0627\u0641\u0629 \u062a\u0648\u062c\u064a\u0647 \u062b\u0627\u0628\u062a
@@ -39,6 +39,7 @@ label.add.to.group=\u0625\u0636\u0627\u0641\u0629 \u0625\u0644\u0649 \u0627\u064
label.add.VM.to.tier=\u0625\u0636\u0627\u0641\u0629 \u062c\u0647\u0627\u0632 \u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0641\u064a \u0637\u0628\u0642\u0629
label.add.vpc=\u0625\u0636\u0627\u0641\u0629 \u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629
label.add.VPN.gateway=\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.allocated=\u062a\u062e\u0635\u064a\u0635
label.apply=\u062a\u0637\u0628\u064a\u0642
label.associated.network=\u0634\u0628\u0643\u0629 \u0645\u0631\u062a\u0628\u0637\u0629
label.broadcast.uri=\u0628\u062b \u0627\u0644\u0631\u0627\u0628\u0637
@@ -50,13 +51,16 @@ label.clear.list=\u0645\u0633\u062d \u0627\u0644\u0642\u0627\u0626\u0645\u0629
label.configuration=\u0627\u0644\u062a\u0643\u0648\u064a\u0646
label.configure.network.ACLs=\u0636\u0628\u0637 \u0634\u0628\u0643\u0629 ACLs
label.configure=\u0642\u0645 \u0628\u062a\u0643\u0648\u064a\u0646
+label.configure.vpc=\u062a\u0643\u0648\u064a\u0646 VPC
+label.corrections.saved=\u062a\u0645 \u062d\u0641\u0638 \u0627\u0644\u062a\u0635\u062d\u064a\u062d\u0627\u062a
label.cpu.mhz=\u0648\u062d\u062f\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062c\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064a\u0629 (\u0628\u0627\u0644\u0645\u064a\u063a\u0627\u0647\u064a\u0631\u062a\u0632)
+label.cpu=\u00d9\u0088\u00d8\u00ad\u00d8\u00af\u00d8\u00a9 \u00d8\u00a7\u00d9\u0084\u00d9
label.create.project=\u0623\u0646\u0634\u0626 \u0645\u0634\u0631\u0648\u0639
label.create.VPN.connection=\u0625\u0646\u0634\u0627\u0621 \u0627\u062a\u0635\u0627\u0644 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
label.dead.peer.detection=\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f
label.decline.invitation=\u0631\u0641\u0636 \u0627\u0644\u062f\u0639\u0648\u0629
-label.default.view=\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629
label.default=\u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
+label.default.view=\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629
label.delete.gateway=\u0627\u062d\u0630\u0641 \u0627\u0644\u0628\u0648\u0627\u0628\u0629
label.delete.project=\u062d\u0630\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
label.delete.VPN.connection=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
@@ -66,14 +70,18 @@ label.destroy=\u0647\u062f\u0645
label.devices=\u0627\u0644\u0623\u062c\u0647\u0632\u0629
label.direct.ips=\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0634\u062a\u0631\u0643\u0629 IPs
label.display.name=\u0639\u0631\u0636 \u0627\u0644\u0627\u0633\u0645
+label.DNS.domain.for.guest.networks=\u0645\u062c\u0627\u0644 DNS \u0644\u0634\u0628\u0643\u0627\u062a \u0627\u0644\u0632\u0627\u0626\u0631
label.dns=\u0646\u0638\u0627\u0645 \u062a\u0633\u0645\u064a\u0629 \u0627\u0644\u0645\u062c\u0627\u0644 DNS
label.drag.new.position=\u0627\u0633\u062d\u0628 \u0644\u0645\u0648\u0642\u0641 \u062c\u062f\u064a\u062f
label.edit.network.details=\u062a\u062d\u0631\u064a\u0631 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
label.edit.project.details=\u0627\u0636\u0627\u0641\u0629 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
label.edit.tags=\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0639\u0644\u0627\u0645\u0627\u062a
+label.edit.vpc=\u062a\u0639\u062f\u064a\u0644 VPC
label.egress.rules=\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u062e\u0631\u0648\u062c
label.elastic=\u0645\u0631\u0646
label.enable.s3=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u0648\u064a S3
+label.endpoint=\u0646\u0642\u0637\u0629 \u0627\u0644\u0646\u0647\u0627\u064a\u0629
+label.error=\u062e\u0637\u0623
label.ESP.lifetime=\u0639\u0645\u0631 ESP (\u062b\u0627\u0646\u064a\u0629)
label.ESP.policy=\u0633\u064a\u0627\u0633\u0629 ESP
label.filterBy=\u062a\u0635\u0641\u064a\u0629 \u062d\u0633\u0628
@@ -81,9 +89,10 @@ label.full.path=\u0645\u0633\u0627\u0631 \u0643\u0627\u0645\u0644
label.guest.type=\u0646\u0648\u0639 \u0627\u0644\u0636\u064a\u0641
label.IKE.lifetime=\u0639\u0645\u0631 IKE (\u062b\u0627\u0646\u064a\u0629)
label.IKE.policy=\u0633\u064a\u0627\u0633\u0629 IKE
+label.instances=\u0627\u0644\u062d\u0627\u0644\u0627\u062a
label.invitations=\u062f\u0639\u0648\u0627\u062a
-label.invite.to=\u062f\u0639\u0648\u0629 \u0644\u0640
label.invited.accounts=\u062f\u0639\u0648\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
+label.invite.to=\u062f\u0639\u0648\u0629 \u0644\u0640
label.IPsec.preshared.key=\u0645\u0641\u062a\u0627\u062d \u0623\u0645\u0646 \u0628\u0631\u0648\u062a\u0648\u0643\u0648\u0644 \u0627\u0644\u0625\u0646\u062a\u0631\u0646\u062a \u062a\u0645\u062a \u0645\u0634\u0627\u0631\u0643\u062a\u0647 \u0645\u0633\u0628\u0642\u0627
label.isolation.uri=\u0639\u0632\u0644 \u0627\u0644\u0631\u0627\u0628\u0637
label.keyboard.type=\u0646\u0648\u0639 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0641\u0627\u062a\u064a\u062d
@@ -92,6 +101,7 @@ label.local.storage.enabled=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u0
label.make.project.owner=\u062c\u0639\u0644 \u0627\u0644\u062d\u0633\u0627\u0628 \u0645\u0627\u0644\u0643 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
label.max.guest.limit=\u0627\u0644\u062d\u062f \u0627\u0644\u0623\u0642\u0635\u0627\u0621 \u0644\u0636\u064a\u0641
label.memory.mb=\u0627\u0644\u0630\u0627\u0643\u0631\u0629 ( \u0628\u0627\u0644\u0645\u064a\u062c\u0627\u0628\u0627\u064a\u0628\u062a)
+label.memory=\u0627\u0644\u0630\u0627\u0643\u0631\u0629
label.menu.alerts=\u0627\u0644\u062a\u0646\u0628\u064a\u0647\u0627\u062a
label.menu.all.accounts=\u062c\u0645\u064a\u0639 \u0627\u0644\u062d\u0633\u0627\u0628\u0627\u062a
label.menu.all.instances=\u062c\u0645\u064a\u0639 \u0627\u0644\u062d\u0627\u0644\u0627\u062a
@@ -103,10 +113,12 @@ label.menu.destroyed.instances=\u062d\u0627\u0644\u0627\u062a \u0627\u0644\u062a
label.menu.disk.offerings=\u0639\u0631\u0648\u0636 \u0627\u0644\u0642\u0631\u0635
label.menu.domains=\u0627\u0644\u0645\u062c\u0627\u0644\u0627\u062a
label.menu.events=\u0623\u062d\u062f\u0627\u062b
-label.menu.featured.isos=\u0645\u0645\u064a\u0632\u0627\u062a \u0627\u0644\u062a\u0636\u0627\u0645\u0646 \u0627\u0644\u062f\u0648\u0644\u064a
+label.menu.featured.isos=\u0645\u0645\u064a\u0632\u0627\u062a \u0627\u0644\u062a\u0636\u0627\u0645\u0646 \u0627\u0644\u062f\u0648\u0644\u064a
label.menu.featured.templates=\u0642\u0648\u0627\u0644\u0628 \u0645\u0645\u064a\u0632\u0629
label.menu.global.settings=\u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0639\u0645\u0648\u0645\u064a\u0629
label.menu.instances=\u0627\u0644\u062d\u0627\u0644\u0627\u062a
+label.migrate.instance.to.host=\u0646\u0642\u0644 \u0627\u0644\u0642\u0627\u0644\u0628 \u0625\u0644\u0649 \u0645\u0636\u064a\u0641 \u0622\u062e\u0631
+label.migrate.instance.to.ps=\u0646\u0642\u0644 \u0627\u0644\u0642\u0627\u0644\u0628 \u0625\u0644\u0649 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0623\u0633\u0627\u0633\u064a\u0629
label.migrate.to.host=\u0627\u0644\u062a\u062d\u0648\u0644 \u0625\u0644\u0649 \u0627\u0644\u0645\u0636\u064a\u0641
label.migrate.to.storage=\u0627\u0644\u062a\u062d\u0648\u0644 \u0625\u0644\u0649 \u0627\u0644\u062a\u062e\u0632\u064a\u0646
label.move.down.row=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0633\u0641\u0644 \u0628\u0635\u0641 \u0648\u0627\u062d\u062f
@@ -115,9 +127,9 @@ label.move.to.top=\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0623
label.move.up.row=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0639\u0644\u0649 \u0628\u0635\u0641 \u0648\u0627\u062d\u062f
label.my.network=\u0634\u0628\u0643\u062a\u064a
label.my.templates=\u0642\u0648\u0627\u0644\u0628\u064a
+label.network.ACLs=\u0634\u0628\u0643\u0629 ACLs
label.network.ACL.total=\u0625\u062c\u0645\u0627\u0644 \u0634\u0628\u0643\u0629 ACL
label.network.ACL=\u0634\u0628\u0643\u0629 ACL
-label.network.ACLs=\u0634\u0628\u0643\u0629 ACLs
label.networks=\u0627\u0644\u0634\u0628\u0643\u0627\u062a
label.new.project=\u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f
label.new=\u062c\u062f\u064a\u062f
@@ -130,18 +142,20 @@ label.previous=\u0627\u0644\u0633\u0627\u0628\u0642
label.private.Gateway=\u0645\u0646\u0641\u0630\\Gateway \u062e\u0627\u0635
label.project.invite=\u062f\u0639\u0648\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
label.project.name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.project.view=\u0639\u0631\u0636 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.project=\u0645\u0634\u0631\u0648\u0639
label.projects=\u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639
+label.project=\u0645\u0634\u0631\u0648\u0639
+label.project.view=\u0639\u0631\u0636 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
label.quickview=\u0646\u0638\u0631\u0629 \u0633\u0631\u064a\u0639\u0629
label.reboot=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644
label.remind.later=\u0630\u0643\u0631\u0646\u064a \u0644\u0627\u062d\u0642\u0627\u064b
label.remove.ACL=\u0625\u0632\u0627\u0644\u0629 ACL
label.remove.static.route=\u0625\u0632\u0627\u0644\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647 \u062b\u0627\u0628\u062a
label.remove.tier=\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629
+label.remove.vpc=\u0625\u0632\u0627\u0644\u0629 VPC
label.reset.VPN.connection=\u0625\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0627\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
label.restart.network=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
label.restart.required=\u0645\u0637\u0644\u0648\u0628 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0634\u063a\u064a\u0644
+label.restart.vpc=\u0625\u0639\u062f\u0627\u0629 \u062a\u0634\u063a\u064a\u0644 VPC
label.restore=\u0625\u0633\u062a\u0639\u0627\u062f\u0629
label.review=\u0645\u0631\u0627\u062c\u0639\u0629
label.revoke.project.invite=\u0625\u0644\u063a\u0627\u0621 \u0627\u0644\u062f\u0639\u0648\u0629
@@ -155,10 +169,11 @@ label.s3.socket_timeout=\u0645\u0647\u0644\u0629 \u0627\u0644\u0645\u0642\u0628\
label.s3.use_https=\u0627\u0633\u062a\u062e\u062f\u0645 HTTPS
label.scope=\u0627\u0644\u0645\u062c\u0627\u0644
label.search=\u0628\u062d\u062b
-label.select-view=\u062d\u062f\u062f \u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636
+label.secret.key=\u0627\u0644\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u0633\u0631\u064a
label.select.a.template=\u0627\u062e\u062a\u0631 \u0642\u0627\u0644\u0628
label.select.project=\u062d\u062f\u062f \u0627\u0644\u0645\u0634\u0631\u0648\u0639
label.select.tier=\u062d\u062f\u062f \u0637\u0628\u0642\u0629
+label.select-view=\u062d\u062f\u062f \u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636
label.service.capabilities=\u0642\u062f\u0631\u0627\u062a \u0627\u0644\u062e\u062f\u0645\u0629
label.setup=\u0627\u0644\u062a\u062b\u0628\u064a\u062a
label.site.to.site.VPN=\u0645\u0648\u0642\u0639 \u0625\u0644\u0649 \u0645\u0648\u0642\u0639-\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u064a\u0629 VPN
@@ -173,22 +188,26 @@ label.tier.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0637\u0628
label.tier=\u0637\u0628\u0642\u0629
label.upload=\u0631\u0641\u0639
label.view.all=\u0639\u0631\u0636 \u0627\u0644\u0643\u0644
-label.view=\u0639\u0631\u0636
label.viewing=\u0639\u0631\u0636
+label.view=\u0639\u0631\u0636
+label.vm.destroy=\u0647\u062f\u0645
+label.vm.reboot=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644
label.VMs.in.tier=\u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0641\u064a \u0637\u0628\u0642\u0629
+label.vm.stop=\u062a\u0648\u0642\u0641
label.volume.limits=\u062d\u062f\u0648\u062f \u0627\u0644\u0645\u0646\u0637\u0642\u0629
label.vpc.id=\u0647\u0648\u064a\u0629 \u062e\u0627\u0635\u0629 \u0628\u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629
label.VPC.router.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u062c\u0647\u0627\u0632 \u0627\u0644\u062a\u0648\u062c\u064a\u0647 VPC
label.vpc=\u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629 VPC
label.VPN.connection=\u0625\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.vpn.customer.gateway=\u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0644\u0644\u0639\u0645\u064a\u0644
label.VPN.customer.gateway=\u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0644\u0644\u0639\u0645\u064a\u0644
label.VPN.gateway=\u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-label.waiting=\u0642\u064a\u062f \u0627\u0644\u0625\u0646\u062a\u0638\u0627\u0631
+label.waiting=\u0642\u064a\u062f \u0627\u0644\u0625\u0646\u062a\u0638\u0627\u0631
label.warn=\u062a\u062d\u0630\u064a\u0631
label.wednesday=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
label.weekly=\u0625\u0633\u0628\u0648\u0639\u064a
label.welcome.cloud.console=\u0645\u0631\u062d\u0628\u0627 \u0628\u0643\u0645 \u0641\u064a \u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u062d\u0643\u0645 \u0627\u0644\u0625\u0631\u0627\u062f\u064a\u0629
-label.welcome=\u0645\u0631\u062d\u0628\u0627
+label.welcome=\u0645\u0631\u062d\u0628\u0627
label.yes=\u0646\u0639\u0645
label.zone.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
label.zone.name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
@@ -198,7 +217,6 @@ label.zone.step.3.title=\u0627\u0644\u062e\u0637\u0648\u0629 3 \\\: \u0639\u0644
label.zone.step.4.title=\u0627\u0644\u062e\u0637\u0648\u0629 4 \\\: <\u0642\u0648\u064a> \u0625\u0636\u0627\u0641\u0629 \u0645\u062c\u0645\u0648\u0639\u0629 IP <\\\u0642\u0648\u064a>
label.zone.wide=\u0645\u0646\u0637\u0642\u0629 \u0648\u0627\u0633\u0639\u0629
label.zoneWizard.trafficType.guest=\u0627\u0644\u0636\u064a\u0641 \\\: \u0627\u0644\u062d\u0631\u0643\u0629 \u0628\u064a\u0646 \u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0646\u0647\u0627\u0626\u064a.
-label.zoneWizard.trafficType.management=\u0625\u062f\u0627\u0631\u0629\\\: \u0627\u0644\u062d\u0631\u0643\u0629 \u0628\u064a\u0646 \u0627\u0644\u0645\u0648\u0627\u0631\u062f \u0627\u0644\u062f\u0627\u062e\u0644\u064a\u0629 \u0644 \u0643\u0644\u0627\u0648\u062f \u0633\u062a\u0627\u0643 \u060c \u0645\u062a\u0636\u0645\u0646\u0629 \u0623\u064a \u062c\u0632\u0621 \u064a\u062a\u0635\u0644 \u0628\u062e\u0627\u062f\u0645\\\u0633\u064a\u0631\u0641\u0631 \u0627\u0644\u0625\u062f\u0627\u0631\u0629 \u060c \u0645\u062b\u0644 \u0627\u0644\u0645\u0636\u064a\u0641\u0627\u062a \u0648 \u0623\u0646\u0638\u0645\u0629 \u0643\u0644\u0627\u0648\u062f \u0633\u062a\u0627\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629.
label.zoneWizard.trafficType.public=\u0627\u0644\u0639\u0627\u0645\u0629 \\\: \u0627\u0644\u0645\u0631\u0648\u0631 \u0628\u064a\u0646 \u0627\u0644\u0625\u0646\u062a\u0631\u0646\u062a \u0648\u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u064a\u0629 \u0641\u064a \u0627\u0644\u0633\u062d\u0627\u0628\u0629.
label.zoneWizard.trafficType.storage=\u0627\u0644\u062a\u062e\u0632\u064a\u0646 \\\: \u0627\u0644\u0645\u0631\u0648\u0631 \u0628\u064a\u0646 \u0645\u0644\u0642\u0645\u0627\u062a \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0627\u0628\u062a\u062f\u0627\u0626\u064a\u0629 \u0648\u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629\u060c \u0645\u062b\u0644 \u0642\u0648\u0627\u0644\u0628 VM \u0648\u0627\u0644\u0644\u0642\u0637\u0627\u062a
message.acquire.new.ip.vpc=\u064a\u0631\u062c\u0649 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0628\u0648\u0631\u062a\u0648\u0643\u0648\u0644 \u0625\u0646\u062a\u0631\u0646\u062a \u062c\u062f\u064a\u062f \u0644\u0647\u0630\u0627 \u0627\u0644\u062d\u0627\u0633\u0648\u0628 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a.
@@ -209,12 +227,14 @@ message.activate.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u064
message.add.domain=\u064a\u0631\u062c\u0649 \u062a\u062d\u062f\u064a\u062f \u0627\u0644\u0645\u062c\u0627\u0644 \u0627\u0644\u0641\u0631\u0639\u064a \u0627\u0644\u0630\u064a \u062a\u0631\u064a\u062f \u0625\u0646\u0634\u0627\u0621 \u062a\u062d\u062a \u0647\u0630\u0627 \u0627\u0644\u0646\u0637\u0627\u0642
message.add.new.gateway.to.vpc=\u0641\u0636\u0644\u0627 \u062d\u062f\u062f \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0644\u0625\u0636\u0627\u0641\u0629 \u0628\u0648\u0627\u0628\u0629 gateway \u0644\u0647\u0630\u0647 \u0627\u0644\u0633\u062d\u0627\u0628\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u062e\u0627\u0635\u0629 VPC
message.add.system.service.offering=\u0627\u0644\u0631\u062c\u0627\u0621 \u062a\u0639\u0628\u0626\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0644\u0625\u0636\u0627\u0641\u0629 \u0646\u0638\u0627\u0645 \u062c\u062f\u064a\u062f \u0644\u0637\u0631\u062d
+message.add.VPN.gateway=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u0625\u0636\u0627\u0641\u0629 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 VPN
message.after.enable.s3=\u062a\u0645 \u0625\u0639\u062f\u0627\u062f \u0627\u0644\u062a\u062e\u0632\u064a\u0646 S3 \u0644\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629. \u062a\u0646\u0648\u064a\u0647 \: \u0639\u0646\u062f \u0645\u063a\u0627\u062f\u0631\u062a\u0643 \u0644\u0647\u0630\u0647 \u0627\u0644\u0635\u0641\u062d\u0629 \u0644\u0646 \u064a\u0643\u0648\u0646 \u0628\u0625\u0645\u0643\u0627\u0646\u0643 \u0625\u0639\u0627\u062f\u0629 \u0636\u0628\u0637 S3 \u0645\u0631\u0629 \u0623\u062e\u0631\u0649.
message.confirm.join.project=\u0646\u0631\u062c\u0648 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629 \u0641\u064a \u0627\u0644\u0645\u0634\u0631\u0648\u0639
message.decline.invitation=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0631\u0641\u0636 \u0647\u0630\u0647 \u0627\u0644\u062f\u0639\u0648\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639\u061f
message.delete.gateway=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u0628\u0648\u0627\u0628\u0629
message.delete.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u061f
message.delete.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062d\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
+message.delete.VPN.connection=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 VPN
message.delete.VPN.gateway=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
message.detach.disk=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0641\u0635\u0644 \u0647\u0630\u0627 \u0627\u0644\u0642\u0631\u0635\u061f
message.disable.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
@@ -223,15 +243,19 @@ message.enable.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u062
message.generate.keys=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u0625\u0646\u0634\u0627\u0621 \u0645\u0641\u0627\u062a\u064a\u062d \u062c\u062f\u064a\u062f\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
message.instanceWizard.noTemplates=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0642\u0648\u0627\u0644\u0628 \u0645\u062a\u0627\u062d\u0629\u061b \u064a\u0631\u062c\u0649 \u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0644\u0628 \u0645\u062a\u0648\u0627\u0641\u0642\u060c \u0648\u0625\u0639\u0627\u062f\u0629 \u0625\u0637\u0644\u0627\u0642 \u0627\u0644\u0645\u0639\u0627\u0644\u062c .
message.join.project=\u0644\u0642\u062f \u0627\u0646\u0636\u0645\u0645\u062a \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639. \u064a\u0631\u062c\u0649 \u0627\u0644\u062a\u0628\u062f\u064a\u0644 \u0625\u0644\u0649 \u0637\u0631\u064a\u0642\u0629 \u0639\u0631\u0636 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0644\u0631\u0624\u064a\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+message.migrate.instance.to.host=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0646\u0642\u0644 \u0627\u0644\u0642\u0627\u0644\u0628 \u0625\u0644\u0649 \u0645\u0636\u064a\u0641 \u0622\u062e\u0631.
+message.migrate.instance.to.ps=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0646\u0642\u0644 \u0627\u0644\u0642\u0627\u0644\u0628 \u0625\u0644\u0649 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0623\u0633\u0627\u0633\u064a\u0629.
message.no.projects.adminOnly=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0645\u0634\u0627\u0631\u064a\u0639. <br/> \u0627\u0644\u0631\u062c\u0627\u0621 \u0637\u0644\u0628 \u0645\u0646 \u0627\u0644\u0645\u0633\u0624\u0648\u0644 \u0625\u0646\u0634\u0627\u0621 \u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f.
message.no.projects=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0645\u0634\u0627\u0631\u064a\u0639. <br/> \u064a\u0631\u062c\u0649 \u0625\u0646\u0634\u0627\u0621 \u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f \u0645\u0646 \u0642\u0633\u0645 \u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639.
message.pending.projects.1=\u0644\u062f\u064a\u0643 \u062f\u0639\u0648\u0627\u062a \u0645\u0634\u0631\u0648\u0639 \u0645\u0639\u0644\u0642\u0629/\:
message.pending.projects.2=\u0644\u0639\u0631\u0636\u060c \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u0630\u0647\u0627\u0628 \u0625\u0644\u0649 \u0642\u0633\u0645 \u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639\u060c \u062b\u0645 \u062d\u062f\u062f \u062f\u0639\u0648\u0627\u062a \u0645\u0646 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0646\u0633\u062f\u0644\u0629.
message.please.select.networks=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u0634\u0628\u0643\u0627\u062a \u0644\u062c\u0647\u0627\u0632\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
message.project.invite.sent=\u062a\u0645 \u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u062f\u0639\u0648\u0629 ; \u0633\u064a\u062a\u0645 \u0625\u0636\u0627\u0641\u062a\u0647\u0645 \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0645\u062c\u0631\u062f \u0642\u0628\u0648\u0644 \u0627\u0644\u062f\u0639\u0648\u0629
+message.remove.vpc=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u0640VPC
message.reset.password.warning.notPasswordEnabled=\u0627\u0644\u0642\u0627\u0644\u0628 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u062a\u0645 \u0627\u0646\u0634\u0627\u0626\u0647 \u0645\u0646 \u062f\u0648\u0646 \u0643\u0644\u0645\u0629 \u0645\u0631\u0648\u0631 \u0645\u0645\u0643\u0646\u0629
message.reset.password.warning.notStopped=\u064a\u062c\u0628 \u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u062e\u0627\u0635 \u0628\u0643 \u0642\u0628\u0644 \u0645\u062d\u0627\u0648\u0644\u0629 \u062a\u063a\u064a\u064a\u0631 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 \u0627\u0644\u062d\u0627\u0644\u064a\u0629
message.reset.VPN.connection=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0625\u0639\u0627\u062f\u0629-\u0636\u0628\u0637 \u0625\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 VPN
+message.restart.vpc=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0640VPN
message.select.template=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0642\u0627\u0644\u0628 \u0644\u0645\u062b\u0627\u0644\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0627\u0644\u062c\u062f\u064a\u062f
message.step.2.desc=
message.step.3.desc=
@@ -250,11 +274,12 @@ state.Creating=\u0625\u0646\u0634\u0627\u0621
state.Declined=\u062a\u0645 \u0627\u0644\u0631\u0641\u0636
state.Destroyed=\u062f\u0645\u0631
state.enabled=\u062a\u0645\u0643\u064a\u0646
+state.Enabled=\u062a\u0645\u0643\u064a\u0646
state.Error=\u062e\u0637\u0623
state.Expunging=\u0645\u062d\u0648
state.Pending=\u0641\u064a \u0627\u0644\u0627\u0646\u062a\u0638\u0627\u0631
-state.Ready=\u062c\u0627\u0647\u0632
state.ready=\u062c\u0627\u0647\u0632
+state.Ready=\u062c\u0627\u0647\u0632
state.Stopped=\u062a\u0648\u0642\u0641
state.Suspended=\u062a\u0645 \u0627\u0644\u0625\u064a\u0642\u0627\u0641
ui.listView.filters.all=\u0627\u0644\u0643\u0644
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_de_DE.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_de_DE.properties b/client/WEB-INF/classes/resources/messages_de_DE.properties
index 9b1d6b0..ca87323 100644
--- a/client/WEB-INF/classes/resources/messages_de_DE.properties
+++ b/client/WEB-INF/classes/resources/messages_de_DE.properties
@@ -22,7 +22,7 @@ error.session.expired=Ihre Sitzung ist abgelaufen.
force.delete.domain.warning=Achtung\: Diese Auswahl f\u00fchrt zu einer L\u00f6schung aller untergeordneten Domains und aller angeschlossenen Konten sowie ihrer Quellen.
force.delete=Erzwinge L\u00f6schung
force.remove=Erzwinge Entfernung
-force.remove.host.warning=Achtung\: Diese Auswahl wird CloudStack zum sofortigen Anhalten der virtuellen Maschine f\u00fchren, bevor der Host vom Cluster entfernt wurde.
+force.remove.host.warning=Achtung\: Diese Auswahl wird CloudStack zum sofortigen Anhalten der virtuellen Maschine f\u00fchren, bevor der Host vom Cluster entfernt wurde.
force.stop=Erzwinge Abbruch
ICMP.code=ICMP Code
ICMP.type=ICMP-Typ
@@ -160,7 +160,7 @@ label.action.migrate.instance.processing=Umziehen einer Instanz
label.action.reboot.instance=Instanz neustarten
label.action.reboot.instance.processing=Neustarten der Instanz...
label.action.reboot.router.processing=Neustart vom Router ....
-label.action.reboot.router=Router neu starten
+label.action.reboot.router=Router neu starten
label.action.reboot.systemvm.processing=Neustart-System VM ....
label.action.reboot.systemvm=System VM neu starten
label.action.release.ip=IP ver\u00f6ffentlichen
@@ -272,7 +272,7 @@ label.cidr=CIDR
label.cidr.list=Quelle CIDR
label.close=Schliessen
label.cloud.console=Cloud Management Konsole
-label.cloud.managed=Geleitet von cloud.com
+label.cloud.managed=Geleitet von cloud.com
label.cluster=Cluster
label.cluster.type=Cluster-Typ
label.code=Code
@@ -280,7 +280,7 @@ label.configuration=Konfiguration
label.confirmation=Best\u00e4tigung
label.congratulations=Herzlichen Gl\u00fcckwunsch
label.corrections.saved=Korrekturen gespeichert
-label.cpu.allocated=Zugeteilte CPU
+label.cpu.allocated=Zugeteilte CPU
label.CPU.cap=CPU Obergrenze
label.cpu=CPU
label.cpu.mhz=CPU (in MHz)
@@ -709,7 +709,7 @@ message.enable.account=Bitte best\u00e4tigen Sie, dass Sie dieses Konto aktivier
message.enabled.vpn=Ihr VPN Zugriff ist zurzeit aktiv und via IP k\u00f6nnen Sie darauf zugreifen
message.enable.vpn.access=VPN ist zurzeit nicht f\u00fcr diese IP Addresse aktiviert. M\u00f6chten Sie den VPN Zugriff aktivieren?
message.installWizard.click.retry=Bitte den Start Button f\u00fcr einen neuen Versuch dr\u00fccken
-message.installWizard.tooltip.addCluster.name=Der Name des Clusters. Der Name kann frei gew\u00e4hlt werden und wird von Cloudstack nicht genutzt.
+message.installWizard.tooltip.addCluster.name=Der Name des Clusters. Der Name kann frei gew\u00e4hlt werden und wird von Cloudstack nicht genutzt.
message.installWizard.tooltip.addHost.hostname=Der DNS-Name oder die IP-Adresse des hosts
message.installWizard.tooltip.addHost.password=Dies ist das Passwort des o.a. Users (von der XenServer Installation)
message.installWizard.tooltip.addHost.username=\u00fcberlicherweise root
@@ -718,16 +718,16 @@ message.installWizard.tooltip.addPod.reservedSystemGateway=Das Gateways f\u00fcr
message.installWizard.tooltip.addPod.reservedSystemNetmask=Die Subnetzmaske des Gast-Netzwerks
message.installWizard.tooltip.addPrimaryStorage.name=Der Name der Storage Devices
message.installWizard.tooltip.addPrimaryStorage.path=(f\u00fcr NFS) Bei NFS wird hier der exportierte Pfad (Shared Mount Point) angegeben. F\u00fcr KVM wird hier der Pfad angegeben, wo auf jedem Host das primary storage gemountet wurde. Z.B. "/mnt/primary"
-message.installWizard.tooltip.addPrimaryStorage.server=(f\u00fcr NFS, iSCSI oder PreSetup) Die IP-Adresse oder der DNS-Name des storage devices.
-message.installWizard.tooltip.addSecondaryStorage.nfsServer=Die IP-Adresse des NFS-Servers, der den Secondary Storage bereitstellt.
-message.installWizard.tooltip.addSecondaryStorage.path=Der exportierte Pfad, der auf dem o.a. Server liegt.
+message.installWizard.tooltip.addPrimaryStorage.server=(f\u00fcr NFS, iSCSI oder PreSetup) Die IP-Adresse oder der DNS-Name des storage devices.
+message.installWizard.tooltip.addSecondaryStorage.nfsServer=Die IP-Adresse des NFS-Servers, der den Secondary Storage bereitstellt.
+message.installWizard.tooltip.addSecondaryStorage.path=Der exportierte Pfad, der auf dem o.a. Server liegt.
message.installWizard.tooltip.addZone.name=Der Name f\u00fcr die zone
-message.installWizard.tooltip.configureGuestTraffic.description=Eine Beschreibung des Netzwerkes.
-message.installWizard.tooltip.configureGuestTraffic.guestGateway=Das gateway, welches der Gast benutzen soll.
+message.installWizard.tooltip.configureGuestTraffic.description=Eine Beschreibung des Netzwerkes.
+message.installWizard.tooltip.configureGuestTraffic.guestGateway=Das gateway, welches der Gast benutzen soll.
message.installWizard.tooltip.configureGuestTraffic.guestNetmask=Die Subnetzmaske des Gast-Netzwerks
message.installWizard.tooltip.configureGuestTraffic.name=Der Name f\u00fcr das Netzwerk
message.migrate.instance.to.host=Bitte best\u00e4tigen sie, dass die Instanz auf einen anderen Host migriert werden soll
-message.migrate.instance.to.ps=Bitte best\u00e4tigen sie, dass sie die Instanz auf einen anderen prim\u00e4ren Speicher migrieren wollen.
+message.migrate.instance.to.ps=Bitte best\u00e4tigen sie, dass sie die Instanz auf einen anderen prim\u00e4ren Speicher migrieren wollen.
message.new.user=Spezifieren Sie das folgende um einen neuen Nutzer dem Benutzerkonto hinzuzuf\u00fcgen
message.remove.vpn.access=Bitte best\u00e4tigen Sie, dass Sie den VPN-Zugriff vom folgenden Benutzer entfernen m\u00f6chten.
message.setup.successful=Cloud setup erfolgreich
[43/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Adding latest arabic resource file
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/137fd188
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/137fd188
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/137fd188
Branch: refs/heads/internallb
Commit: 137fd188cf45b484fae03d8c2e9ebae856197ab9
Parents: bdbeb7b
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Apr 29 10:09:47 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Apr 29 10:09:47 2013 -0400
----------------------------------------------------------------------
.../classes/resources/messages_ar.properties | 1665 ++-------------
1 files changed, 189 insertions(+), 1476 deletions(-)
----------------------------------------------------------------------
[03/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2161 coping /etc/iptables/iptables-* to /etc/iptables/rules to work for old templates
In 4.2 templates iptables-persistent is looking for /etc/iptables/rules.v4 file but the old templates 4.1 and earlier
are looking for /etc/iptables/rules.
So coping the file to both rules and rules.v4
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c65ad6b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c65ad6b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c65ad6b8
Branch: refs/heads/internallb
Commit: c65ad6b8e80a90a535fded7e284dce8c74f94a98
Parents: c34233d
Author: Jayapal <ja...@citrix.com>
Authored: Thu Apr 25 15:19:31 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Fri Apr 26 13:43:13 2013 +0530
----------------------------------------------------------------------
.../debian/config/etc/init.d/cloud-early-config | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c65ad6b8/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 187ae25..6ffd648 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -520,6 +520,7 @@ setup_sshd(){
local eth=$2
[ -f /etc/ssh/sshd_config ] && sed -i -e "s/^[#]*ListenAddress.*$/ListenAddress $ip/" /etc/ssh/sshd_config
sed -i "/3922/s/eth./$eth/" /etc/iptables/rules.v4
+ sed -i "/3922/s/eth./$eth/" /etc/iptables/rules
}
@@ -692,6 +693,8 @@ setup_router() {
enable_fwding 1
chkconfig nfs-common off
cp /etc/iptables/iptables-router /etc/iptables/rules.v4
+#for old templates
+ cp /etc/iptables/iptables-router /etc/iptables/rules
setup_sshd $ETH1_IP "eth1"
}
@@ -764,6 +767,7 @@ EOF
disable_rpfilter
enable_fwding 1
cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules
setup_sshd $ETH0_IP "eth0"
cp /etc/vpcdnsmasq.conf /etc/dnsmasq.conf
cp /etc/cloud-nic.rules /etc/udev/rules.d/cloud-nic.rules
@@ -790,6 +794,7 @@ setup_dhcpsrvr() {
enable_fwding 0
chkconfig nfs-common off
cp /etc/iptables/iptables-router /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-router /etc/iptables/rules
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
@@ -825,6 +830,7 @@ setup_secstorage() {
echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-secstorage /etc/iptables/rules
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -849,6 +855,7 @@ setup_console_proxy() {
sed -i /gateway/d /etc/hosts
echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -874,6 +881,7 @@ setup_elbvm() {
echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-elbvm /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-elbvm /etc/iptables/rules
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
[22/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2138 - add a sync-transifex-ui.sh script to automate the exchange between CloudStack L10N resource files and Transifex CS-UI resource files
Signed-off-by: Milamber <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/509cfa98
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/509cfa98
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/509cfa98
Branch: refs/heads/internallb
Commit: 509cfa98567f3d64b6da8bcb50c3d18e6d2bc122
Parents: 766b36f
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 11:00:48 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 11:02:26 2013 +0100
----------------------------------------------------------------------
tools/transifex/.tx/config | 19 ++++
tools/transifex/README-transifex.txt | 65 ++++++++++++
tools/transifex/sync-transifex-ui.sh | 158 +++++++++++++++++++++++++++++
3 files changed, 242 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/509cfa98/tools/transifex/.tx/config
----------------------------------------------------------------------
diff --git a/tools/transifex/.tx/config b/tools/transifex/.tx/config
new file mode 100644
index 0000000..171d9b1
--- /dev/null
+++ b/tools/transifex/.tx/config
@@ -0,0 +1,19 @@
+[main]
+host = https://www.transifex.com
+
+[CloudStack_UI.2-2messagesproperties]
+file_filter = translations/CloudStack_UI.2-2messagesproperties/<lang>.properties
+source_lang = en
+
+[CloudStack_UI.30xmessagesproperties]
+file_filter = translations/CloudStack_UI.30xmessagesproperties/<lang>.properties
+source_lang = en
+
+[CloudStack_UI.41xmessageproperties]
+file_filter = translations/CloudStack_UI.41xmessageproperties/<lang>.properties
+source_lang = en
+
+[CloudStack_UI.42xmessagesproperties]
+file_filter = translations/CloudStack_UI.42xmessagesproperties/<lang>.properties
+source_lang = en
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/509cfa98/tools/transifex/README-transifex.txt
----------------------------------------------------------------------
diff --git a/tools/transifex/README-transifex.txt b/tools/transifex/README-transifex.txt
new file mode 100644
index 0000000..986aed7
--- /dev/null
+++ b/tools/transifex/README-transifex.txt
@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+sync-transifex-ui is a script to automate the synchronisation between
+Apache CloudStack L10N resource files and Transifex CloudStack project.
+
+Commun usage is:
+
+1/ Init and configure the transifex client CLI
+(Already made on git CloudStack repo)
+
+ ./sync-transifex-ui.sh init-transifex https://www.transifex.com/projects/p/CloudStack_UI/
+
+2/ Upload to Transifex the last version of the source language (en)
+which generally have the new keys/values to translate.
+
+ ./sync-transifex-ui.sh upload-source-language CloudStack_UI.42xmessagesproperties
+
+3/ Download the last L10N resource files from Transifex to resources
+files directory in CloudStack tree to upade the L10N resource files
+with the translatons from traductors.
+
+ ./sync-transifex-ui.sh download-l10n-languages CloudStack_UI.42xmessagesproperties
+
+=====
+The sync-transifex-ui provide too the ability to :
+
+* Download from Transifex the source language resource files. Be carrefully,
+with this,you can remove some transation on Transifex if some keys has
+been removed inside the source language resource files.
+
+ ./sync-transifex-ui.sh download-source-language CloudStack_UI.42xmessagesproperties
+
+* Upload the L10N resource files on Transifex.
+
+ ./sync-transifex-ui.sh upload-l10n-languages CloudStack_UI.42xmessagesproperties
+
+=====
+Note 1:
+Choose the good branch on git matching with the good resource on Transifex:
+(no branch) <--> CloudStack_UI.2-2messagesproperties
+(no branch) <--> CloudStack_UI.30xmessagesproperties
+(4.1) <--> CloudStack_UI.41xmessageproperties
+(master) <--> CloudStack_UI.42xmessagesproperties
+
+Note 2:
+If you want add a new L10N language, we need edit the sync-transifex-ui.sh script
+to add his language code in LIST_LANG variable, before run the download-l10n-languages
+command.
+
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/509cfa98/tools/transifex/sync-transifex-ui.sh
----------------------------------------------------------------------
diff --git a/tools/transifex/sync-transifex-ui.sh b/tools/transifex/sync-transifex-ui.sh
new file mode 100755
index 0000000..5fb4e57
--- /dev/null
+++ b/tools/transifex/sync-transifex-ui.sh
@@ -0,0 +1,158 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+SRCLANG=en
+LIST_LANG="ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU zh_CN"
+
+DIRECTORY_RESOURCES="../../client/WEB-INF/classes/resources"
+WORKDIR="./work-dir"
+
+AL2_STRING="# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied. See the License for the\n# specific language governing permissions and limitations\n# under the License.\n"
+
+doInit()
+{
+ tx init
+ tx set --auto-remote ${ARGUMENTS}
+}
+
+doMakeWdir()
+{
+ mkdir -p ${WORKDIR}
+}
+
+doCheckInit()
+{
+ if [ ! -f ./.tx/config ]; then
+ echo "Error: Transifex project isn't init. Please run $0 init-transifex URL-transifex-project" >&2
+ exit 2
+ fi
+}
+
+doUploadL10NLangs()
+{
+ # l10n languages
+ for CODELANG in ${LIST_LANG} ; do
+ if [ -f "${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties" ]; then
+ native2ascii -reverse -encoding UTF-8 ${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties ${WORKDIR}/messages_${CODELANG}.properties
+ sed -i "s/\\\\\\\'/'/g" ${WORKDIR}/messages_${CODELANG}.properties
+ tx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties
+ tx push -t -r ${ARGUMENTS} -l ${CODELANG}
+ else
+ echo "Warning: the resource file for language ${CODELANG} doesn't exist."
+ fi
+ done
+}
+
+doDownloadL10NLangs()
+{
+ # prepare l10n languages
+ for CODELANG in ${LIST_LANG} ; do
+ if [ -f "${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties" ]; then
+ native2ascii -reverse -encoding UTF-8 ${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties ${WORKDIR}/messages_${CODELANG}.properties
+ sed -i "s/\\\\\\\'/'/g" ${WORKDIR}/messages_${CODELANG}.properties
+ tx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties
+ else
+ echo "Warning: the resource file for language ${CODELANG} doesn't exist."
+ fi
+ done
+
+ # get all resource files from transifex
+ tx pull -r ${ARGUMENTS}
+
+ # l10n languages
+ for CODELANG in ${LIST_LANG} ; do
+ #tx pull -r ${ARGUMENTS} -l ${CODELANG}
+ if [ -f "${WORKDIR}/messages_${CODELANG}.properties" ]; then
+ native2ascii -encoding UTF-8 ${WORKDIR}/messages_${CODELANG}.properties ${WORKDIR}/messages_${CODELANG}.properties.tmp1
+ grep -v "^#" ${WORKDIR}/messages_${CODELANG}.properties.tmp1 | sort -f | uniq | sed "s/'/\\\\\\\\\'/g" > ${WORKDIR}/messages_${CODELANG}.properties.tmp2
+ echo "$AL2_STRING" | cat - ${WORKDIR}/messages_${CODELANG}.properties.tmp2 > ${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties
+ else
+ echo "Warning: the resource file for language ${CODELANG} doesn't exist on transifex"
+ fi
+ done
+}
+
+doUploadSourceLang()
+{
+ # Source language
+ if [ -f ${DIRECTORY_RESOURCES}/messages.properties ]; then
+ native2ascii -reverse -encoding UTF-8 ${DIRECTORY_RESOURCES}/messages.properties ${WORKDIR}/messages.properties
+ sed -i "s/\\\\\\\'/'/g" ${WORKDIR}/messages.properties
+ tx set --source -r ${ARGUMENTS} -l ${SRCLANG} ${WORKDIR}/messages.properties
+ tx push -s -r ${ARGUMENTS}
+ else
+ echo "Warning: the source language doesn't exist!"
+ fi
+}
+
+doDownloadSourceLang()
+{
+ # get all resource files from transifex
+ tx pull -s -r ${ARGUMENTS}
+ # Source language
+ if [ -f "${WORKDIR}/messages.properties" ]; then
+ native2ascii -encoding UTF-8 ${WORKDIR}/messages.properties ${WORKDIR}/messages.properties.tmp1
+ grep -v "^#" ${WORKDIR}/messages.properties.tmp1 | sort -f | uniq | sed "s/'/\\\\\\\\\'/g" > ${WORKDIR}/messages.properties.tmp2
+ echo "$AL2_STRING" | cat - ${WORKDIR}/messages.properties.tmp2 > ${DIRECTORY_RESOURCES}/messages.properties
+ else
+ echo "Warning: the source language hasn't been retrieve!"
+ fi
+}
+
+if [ $# -ne 2 ]; then
+ COMMAND="error"
+else
+ COMMAND="$1"
+ ARGUMENTS="$2"
+ doMakeWdir
+fi
+
+case "$COMMAND" in
+ upload-source-language)
+ doCheckInit
+ doUploadSourceLang
+ ;;
+
+ download-source-language)
+ doCheckInit
+ doDownloadSourceLang
+ ;;
+
+ upload-l10n-languages)
+ doCheckInit
+ doUploadL10NLangs
+ ;;
+
+ download-l10n-languages)
+ doCheckInit
+ doDownloadL10NLangs
+ ;;
+
+ init-transifex)
+ doInit
+ ;;
+
+ *|error)
+ echo "Usage: $0 [upload-source-language|download-source-language] [upload-l10n-languages|download-l10n-languages] transifex-resource" >&2
+ echo "\n\tExemple: $0 download-l10n-languages CloudStack_UI-42xmessagesproperties\n" >&2
+ echo "Usage: $0 init-transifex URL-transifex-project" >&2
+ echo "\n\tExemple: $0 init-transifex https://www.transifex.com/projects/p/CloudStack_UI/\n" >&2
+ exit 1
+ ;;
+esac
+
[41/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Adding arabic to .tx/config file
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bdbeb7bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bdbeb7bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bdbeb7bc
Branch: refs/heads/internallb
Commit: bdbeb7bc3bafe0a694d43ef58f5d21d6f9cff0b5
Parents: 9416cb1
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Apr 29 09:53:13 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Apr 29 09:53:13 2013 -0400
----------------------------------------------------------------------
tools/transifex/.tx/config | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdbeb7bc/tools/transifex/.tx/config
----------------------------------------------------------------------
diff --git a/tools/transifex/.tx/config b/tools/transifex/.tx/config
index 80c02aa..9c495cc 100644
--- a/tools/transifex/.tx/config
+++ b/tools/transifex/.tx/config
@@ -17,6 +17,7 @@ source_lang = en
file_filter = translations/CloudStack_UI.42xmessagesproperties/<lang>.properties
source_file = work-dir/messages.properties
source_lang = en
+trans.ar = work-dir/messages_ar.properties
trans.ca = work-dir/messages_ca.properties
trans.de_DE = work-dir/messages_de_DE.properties
trans.es = work-dir/messages_es.properties
[27/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2138 - first automate sync with Transifex. 1/ Upload the lastest EN resource file on Transifex. 2/ Download the lastest L10N resource file for "ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU zh_CN" form Transifex to CS repo.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b633353f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b633353f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b633353f
Branch: refs/heads/internallb
Commit: b633353fff295782a31db86f39f5b6b937b83377
Parents: 509cfa9
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 11:14:57 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 11:14:57 2013 +0100
----------------------------------------------------------------------
.../classes/resources/messages_ca.properties | 1 +
.../classes/resources/messages_de_DE.properties | 1 +
.../classes/resources/messages_es.properties | 1 +
.../classes/resources/messages_fr_FR.properties | 1788 +++++-----
.../classes/resources/messages_it_IT.properties | 1 +
.../classes/resources/messages_ja.properties | 2679 ++++++++-------
.../classes/resources/messages_ko_KR.properties | 1 +
.../classes/resources/messages_nb_NO.properties | 1 +
.../classes/resources/messages_pt_BR.properties | 1 +
.../classes/resources/messages_ru_RU.properties | 1 +
.../classes/resources/messages_zh_CN.properties | 1 +
tools/transifex/.tx/config | 12 +
12 files changed, 2255 insertions(+), 2233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_ca.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ca.properties b/client/WEB-INF/classes/resources/messages_ca.properties
index 2d8e953..4e66083 100644
--- a/client/WEB-INF/classes/resources/messages_ca.properties
+++ b/client/WEB-INF/classes/resources/messages_ca.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
confirm.enable.swift=Si us plau ompliu la seg\u00fcent informaci\u00f3 per habilitar el suport per a Swift
error.installWizard.message=Quelcom ha fallat, vost\u00e8 pot tornar enrere i corregir els errors detalls suggerime
error.password.not.match=Els camps de contrasenya no coincideixen
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_de_DE.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_de_DE.properties b/client/WEB-INF/classes/resources/messages_de_DE.properties
index 4581268..9b1d6b0 100644
--- a/client/WEB-INF/classes/resources/messages_de_DE.properties
+++ b/client/WEB-INF/classes/resources/messages_de_DE.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
error.installWizard.message=Ein Fehler ist aufgetreten; Sie k\u00f6nnen zur\u00fcckgehen und den Fehler korregieren
error.login=Ihr Benutzername / Passwort stimmt nicht mit uneren unseren Aufzeichnungen \u00fcberein.
error.session.expired=Ihre Sitzung ist abgelaufen.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_es.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 28f9363..c0680b3 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
error.installWizard.message=Algo salio mal, debes ir para atr\u00e1s y corregir los error.
error.login=Su nombre de usuario / contrase\u00c3\u00b1a no coincide con nuestros registros.
error.mgmt.server.inaccessible=El Servidor de Gesti\u00c3\u00b3n es inaccesible. Por favor, int\u00c3\u00a9ntelo de nuevo m\u00c3\u00a1s tarde.
[40/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Adding arabic key to resource file
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9416cb14
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9416cb14
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9416cb14
Branch: refs/heads/internallb
Commit: 9416cb14a9f9008d2c9e6355000e5abbbaeef3cf
Parents: 35b4166
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Apr 29 09:51:24 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Apr 29 09:51:24 2013 -0400
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 569 +++++++--------
1 files changed, 282 insertions(+), 287 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9416cb14/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 bab65de..8f9c662 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,16 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-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
+
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
@@ -31,7 +22,7 @@ error.could.not.enable.zone=Could not enable zone
error.installWizard.message=Something went wrong; you may go back and correct any errors
error.invalid.username.password=Invalid username or password
error.login=Your username/password does not match our records.
-error.menu.select=Unable to perform action due to no items being selected.
+error.menu.select=Unable to perform action due to no items being selected.
error.mgmt.server.inaccessible=The Management Server is unaccessible. Please try again later.
error.password.not.match=The password fields do not match
error.please.specify.physical.network.tags=Network offerings is not available until you specify tags for this physical network.
@@ -40,115 +31,115 @@ error.something.went.wrong.please.correct.the.following=Something went wrong; pl
error.unable.to.reach.management.server=Unable to reach Management Server
error.unresolved.internet.name=Your internet name cannot be resolved.
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.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.
force.remove=Force Remove
-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.
+force.stop.instance.warning=Warning\: Forcing a stop on this instance should be your last option. It can lead to data loss as well as inconsistent behavior of the virtual machine state.
force.stop=Force Stop
-force.stop.instance.warning=Warning: Forcing a stop on this instance should be your last option. It can lead to data loss as well as inconsistent behavior of the virtual machine state.
ICMP.code=ICMP Code
ICMP.type=ICMP Type
image.directory=Image Directory
inline=Inline
instances.actions.reboot.label=Reboot instance
label.accept.project.invitation=Accept project invitation
-label.account=Account
label.account.and.security.group=Account, Security group
label.account.id=Account ID
label.account.name=Account Name
-label.accounts=Accounts
label.account.specific=Account-Specific
+label.account=Account
+label.accounts=Accounts
label.acquire.new.ip=Acquire New IP
-label.action.attach.disk=Attach Disk
label.action.attach.disk.processing=Attaching Disk....
-label.action.attach.iso=Attach ISO
+label.action.attach.disk=Attach Disk
label.action.attach.iso.processing=Attaching ISO....
-label.action.cancel.maintenance.mode=Cancel Maintenance Mode
+label.action.attach.iso=Attach ISO
label.action.cancel.maintenance.mode.processing=Cancelling Maintenance Mode....
+label.action.cancel.maintenance.mode=Cancel Maintenance Mode
label.action.change.password=Change Password
-label.action.change.service=Change Service
label.action.change.service.processing=Changing Service....
-label.action.copy.ISO=Copy ISO
+label.action.change.service=Change Service
label.action.copy.ISO.processing=Coping ISO....
-label.action.copy.template=Copy Template
+label.action.copy.ISO=Copy ISO
label.action.copy.template.processing=Coping Template....
-label.action.create.template=Create Template
+label.action.copy.template=Copy Template
label.action.create.template.from.vm=Create Template from VM
label.action.create.template.from.volume=Create Template from Volume
label.action.create.template.processing=Creating Template....
-label.action.create.vm=Create VM
+label.action.create.template=Create Template
label.action.create.vm.processing=Creating VM....
-label.action.create.volume=Create Volume
+label.action.create.vm=Create VM
label.action.create.volume.processing=Creating Volume....
-label.action.delete.account=Delete account
+label.action.create.volume=Create Volume
label.action.delete.account.processing=Deleting account....
-label.action.delete.cluster=Delete Cluster
+label.action.delete.account=Delete account
label.action.delete.cluster.processing=Deleting Cluster....
-label.action.delete.disk.offering=Delete Disk Offering
+label.action.delete.cluster=Delete Cluster
label.action.delete.disk.offering.processing=Deleting Disk Offering....
-label.action.delete.domain=Delete Domain
+label.action.delete.disk.offering=Delete Disk Offering
label.action.delete.domain.processing=Deleting Domain....
-label.action.delete.firewall=Delete firewall rule
+label.action.delete.domain=Delete Domain
label.action.delete.firewall.processing=Deleting Firewall....
-label.action.delete.ingress.rule=Delete Ingress Rule
+label.action.delete.firewall=Delete firewall rule
label.action.delete.ingress.rule.processing=Deleting Ingress Rule....
-label.action.delete.IP.range=Delete IP Range
+label.action.delete.ingress.rule=Delete Ingress Rule
label.action.delete.IP.range.processing=Deleting IP Range....
-label.action.delete.ISO=Delete ISO
+label.action.delete.IP.range=Delete IP Range
label.action.delete.ISO.processing=Deleting ISO....
-label.action.delete.load.balancer=Delete load balancer rule
+label.action.delete.ISO=Delete ISO
label.action.delete.load.balancer.processing=Deleting Load Balancer....
-label.action.delete.network=Delete Network
+label.action.delete.load.balancer=Delete load balancer rule
label.action.delete.network.processing=Deleting Network....
+label.action.delete.network=Delete Network
label.action.delete.nexusVswitch=Delete Nexus 1000v
label.action.delete.physical.network=Delete physical network
-label.action.delete.pod=Delete Pod
label.action.delete.pod.processing=Deleting Pod....
-label.action.delete.primary.storage=Delete Primary Storage
+label.action.delete.pod=Delete Pod
label.action.delete.primary.storage.processing=Deleting Primary Storage....
-label.action.delete.secondary.storage=Delete Secondary Storage
+label.action.delete.primary.storage=Delete Primary Storage
label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
-label.action.delete.security.group=Delete Security Group
+label.action.delete.secondary.storage=Delete Secondary Storage
label.action.delete.security.group.processing=Deleting Security Group....
-label.action.delete.service.offering=Delete Service Offering
+label.action.delete.security.group=Delete Security Group
label.action.delete.service.offering.processing=Deleting Service Offering....
-label.action.delete.snapshot=Delete Snapshot
+label.action.delete.service.offering=Delete Service Offering
label.action.delete.snapshot.processing=Deleting Snapshot....
+label.action.delete.snapshot=Delete Snapshot
label.action.delete.system.service.offering=Delete System Service Offering
-label.action.delete.template=Delete Template
label.action.delete.template.processing=Deleting Template....
-label.action.delete.user=Delete User
+label.action.delete.template=Delete Template
label.action.delete.user.processing=Deleting User....
-label.action.delete.volume=Delete Volume
+label.action.delete.user=Delete User
label.action.delete.volume.processing=Deleting Volume....
-label.action.delete.zone=Delete Zone
+label.action.delete.volume=Delete Volume
label.action.delete.zone.processing=Deleting Zone....
-label.action.destroy.instance=Destroy Instance
+label.action.delete.zone=Delete Zone
label.action.destroy.instance.processing=Destroying Instance....
-label.action.destroy.systemvm=Destroy System VM
+label.action.destroy.instance=Destroy Instance
label.action.destroy.systemvm.processing=Destroying System VM....
-label.action.detach.disk=Detach Disk
+label.action.destroy.systemvm=Destroy System VM
label.action.detach.disk.processing=Detaching Disk....
-label.action.detach.iso=Detach ISO
+label.action.detach.disk=Detach Disk
label.action.detach.iso.processing=Detaching ISO....
-label.action.disable.account=Disable account
+label.action.detach.iso=Detach ISO
label.action.disable.account.processing=Disabling account....
-label.action.disable.cluster=Disable Cluster
+label.action.disable.account=Disable account
label.action.disable.cluster.processing=Disabling Cluster....
+label.action.disable.cluster=Disable Cluster
label.action.disable.nexusVswitch=Disable Nexus 1000v
label.action.disable.physical.network=Disable physical network
-label.action.disable.pod=Disable Pod
label.action.disable.pod.processing=Disabling Pod....
-label.action.disable.static.NAT=Disable Static NAT
+label.action.disable.pod=Disable Pod
label.action.disable.static.NAT.processing=Disabling Static NAT....
-label.action.disable.user=Disable User
+label.action.disable.static.NAT=Disable Static NAT
label.action.disable.user.processing=Disabling User....
-label.action.disable.zone=Disable Zone
+label.action.disable.user=Disable User
label.action.disable.zone.processing=Disabling Zone....
+label.action.disable.zone=Disable Zone
label.action.download.ISO=Download ISO
label.action.download.template=Download Template
-label.action.download.volume=Download Volume
label.action.download.volume.processing=Downloading Volume....
+label.action.download.volume=Download Volume
label.action.edit.account=Edit account
label.action.edit.disk.offering=Edit Disk Offering
label.action.edit.domain=Edit Domain
@@ -156,9 +147,9 @@ label.action.edit.global.setting=Edit Global Setting
label.action.edit.host=Edit Host
label.action.edit.instance=Edit Instance
label.action.edit.ISO=Edit ISO
-label.action.edit.network=Edit Network
label.action.edit.network.offering=Edit Network Offering
label.action.edit.network.processing=Editing Network....
+label.action.edit.network=Edit Network
label.action.edit.pod=Edit Pod
label.action.edit.primary.storage=Edit Primary Storage
label.action.edit.resource.limits=Edit Resource Limits
@@ -166,37 +157,37 @@ label.action.edit.service.offering=Edit Service Offering
label.action.edit.template=Edit Template
label.action.edit.user=Edit User
label.action.edit.zone=Edit Zone
-label.action.enable.account=Enable account
label.action.enable.account.processing=Enabling account....
-label.action.enable.cluster=Enable Cluster
+label.action.enable.account=Enable account
label.action.enable.cluster.processing=Enabling Cluster....
-label.action.enable.maintenance.mode=Enable Maintenance Mode
+label.action.enable.cluster=Enable Cluster
label.action.enable.maintenance.mode.processing=Enabling Maintenance Mode....
+label.action.enable.maintenance.mode=Enable Maintenance Mode
label.action.enable.nexusVswitch=Enable Nexus 1000v
label.action.enable.physical.network=Enable physical network
-label.action.enable.pod=Enable Pod
label.action.enable.pod.processing=Enabling Pod....
-label.action.enable.static.NAT=Enable Static NAT
+label.action.enable.pod=Enable Pod
label.action.enable.static.NAT.processing=Enabling Static NAT....
-label.action.enable.user=Enable User
+label.action.enable.static.NAT=Enable Static NAT
label.action.enable.user.processing=Enabling User....
-label.action.enable.zone=Enable Zone
+label.action.enable.user=Enable User
label.action.enable.zone.processing=Enabling Zone....
-label.action.force.reconnect=Force Reconnect
+label.action.enable.zone=Enable Zone
label.action.force.reconnect.processing=Reconnecting....
-label.action.generate.keys=Generate Keys
+label.action.force.reconnect=Force Reconnect
label.action.generate.keys.processing=Generate Keys....
+label.action.generate.keys=Generate Keys
label.action.list.nexusVswitch=List Nexus 1000v
-label.action.lock.account=Lock account
label.action.lock.account.processing=Locking account....
-label.action.manage.cluster=Manage Cluster
+label.action.lock.account=Lock account
label.action.manage.cluster.processing=Managing Cluster....
-label.action.migrate.instance=Migrate Instance
+label.action.manage.cluster=Manage Cluster
label.action.migrate.instance.processing=Migrating Instance....
-label.action.migrate.router=Migrate Router
+label.action.migrate.instance=Migrate Instance
label.action.migrate.router.processing=Migrating Router....
-label.action.migrate.systemvm=Migrate System VM
+label.action.migrate.router=Migrate Router
label.action.migrate.systemvm.processing=Migrating System VM....
+label.action.migrate.systemvm=Migrate System VM
label.action.reboot.instance.processing=Rebooting Instance....
label.action.reboot.instance=Reboot Instance
label.action.reboot.router.processing=Rebooting Router....
@@ -217,7 +208,6 @@ label.action.resize.volume=Resize Volume
label.action.resource.limits=Resource limits
label.action.restore.instance.processing=Restoring Instance....
label.action.restore.instance=Restore Instance
-label.actions=Actions
label.action.start.instance.processing=Starting Instance....
label.action.start.instance=Start Instance
label.action.start.router.processing=Starting Router....
@@ -241,18 +231,19 @@ label.action.update.resource.count=Update Resource Count
label.action.vmsnapshot.create=Take VM Snapshot
label.action.vmsnapshot.delete=Delete VM snapshot
label.action.vmsnapshot.revert=Revert to VM snapshot
+label.actions=Actions
label.activate.project=Activate Project
label.active.sessions=Active Sessions
+label.add.account.to.project=Add account to project
label.add.account=Add Account
-label.add.accounts=Add accounts
label.add.accounts.to=Add accounts to
-label.add.account.to.project=Add account to project
+label.add.accounts=Add accounts
label.add.ACL=Add ACL
-label.add=Add
+label.add.affinity.group=Add new affinity group
label.add.BigSwitchVns.device=Add BigSwitch Vns Controller
-label.add.by=Add by
label.add.by.cidr=Add By CIDR
label.add.by.group=Add By Group
+label.add.by=Add by
label.add.cluster=Add Cluster
label.add.compute.offering=Add compute offering
label.add.direct.iprange=Add Direct Ip Range
@@ -263,24 +254,15 @@ label.add.F5.device=Add F5 device
label.add.firewall=Add firewall rule
label.add.guest.network=Add guest network
label.add.host=Add Host
-label.adding=Adding
-label.adding.cluster=Adding Cluster
-label.adding.failed=Adding Failed
-label.adding.pod=Adding Pod
-label.adding.processing=Adding....
label.add.ingress.rule=Add Ingress Rule
-label.adding.succeeded=Adding Succeeded
-label.adding.user=Adding User
-label.adding.zone=Adding Zone
label.add.ip.range=Add IP Range
-label.additional.networks=Additional Networks
label.add.load.balancer=Add Load Balancer
label.add.more=Add More
label.add.netScaler.device=Add Netscaler device
label.add.network.ACL=Add network ACL
-label.add.network=Add Network
label.add.network.device=Add Network Device
label.add.network.offering=Add network offering
+label.add.network=Add Network
label.add.new.F5=Add new F5
label.add.new.gateway=Add new gateway
label.add.new.NetScaler=Add new NetScaler
@@ -306,21 +288,34 @@ label.add.template=Add Template
label.add.to.group=Add to group
label.add.user=Add User
label.add.vlan=Add VLAN
+label.add.VM.to.tier=Add VM to tier
label.add.vm=Add VM
-label.add.vms=Add VMs
label.add.vms.to.lb=Add VM(s) to load balancer rule
-label.add.VM.to.tier=Add VM to tier
+label.add.vms=Add VMs
label.add.volume=Add Volume
label.add.vpc=Add VPC
label.add.vpn.customer.gateway=Add VPN Customer Gateway
label.add.VPN.gateway=Add VPN Gateway
label.add.vpn.user=Add VPN user
label.add.zone=Add Zone
+label.add=Add
+label.adding.cluster=Adding Cluster
+label.adding.failed=Adding Failed
+label.adding.pod=Adding Pod
+label.adding.processing=Adding....
+label.adding.succeeded=Adding Succeeded
+label.adding.user=Adding User
+label.adding.zone=Adding Zone
+label.adding=Adding
+label.additional.networks=Additional Networks
label.admin.accounts=Admin Accounts
label.admin=Admin
-label.advanced=Advanced
label.advanced.mode=Advanced Mode
label.advanced.search=Advance Search
+label.advanced=Advanced
+label.affinity.group=Affinity Group
+label.affinity.groups=Affinity Groups
+label.affinity=Affinity
label.agent.password=Agent Password
label.agent.username=Agent Username
label.agree=Agree
@@ -328,23 +323,26 @@ label.alert=Alert
label.algorithm=Algorithm
label.allocated=Allocated
label.allocation.state=Allocation State
+label.anti.affinity.group=Anti-affinity Group
+label.anti.affinity.groups=Anti-affinity Groups
+label.anti.affinity=Anti-affinity
label.api.key=API Key
label.apply=Apply
-label.assign=Assign
label.assign.to.load.balancer=Assigning instance to load balancer
-label.associated.network=Associated Network
+label.assign=Assign
label.associated.network.id=Associated Network ID
+label.associated.network=Associated Network
label.attached.iso=Attached ISO
label.author.email=Author e-mail
label.author.name=Author name
-label.availability=Availability
label.availability.zone=Availability Zone
-label.available=Available
+label.availability=Availability
label.available.public.ips=Available Public IP Addresses
+label.available=Available
label.back=Back
label.bandwidth=Bandwidth
-label.basic=Basic
label.basic.mode=Basic Mode
+label.basic=Basic
label.bigswitch.controller.address=BigSwitch Vns Controller Address
label.bootable=Bootable
label.broadcast.domain.range=Broadcast domain range
@@ -359,12 +357,12 @@ label.by.pod=By Pod
label.by.role=By Role
label.by.start.date=By Start Date
label.by.state=By State
-label.bytes.received=Bytes Received
-label.bytes.sent=Bytes Sent
label.by.traffic.type=By Traffic Type
-label.by.type=By Type
label.by.type.id=By Type ID
+label.by.type=By Type
label.by.zone=By Zone
+label.bytes.received=Bytes Received
+label.bytes.sent=Bytes Sent
label.cancel=Cancel
label.capacity=Capacity
label.certificate=Certificate
@@ -373,50 +371,50 @@ label.change.value=Change value
label.character=Character
label.checksum=MD5 checksum
label.cidr.account=CIDR or Account/Security Group
-label.cidr=CIDR
label.CIDR.list=CIDR list
label.cidr.list=Source CIDR
label.CIDR.of.destination.network=CIDR of destination network
+label.cidr=CIDR
label.clean.up=Clean up
label.clear.list=Clear list
label.close=Close
label.cloud.console=Cloud Management Console
label.cloud.managed=Cloud.com Managed
-label.cluster=Cluster
label.cluster.name=Cluster Name
-label.clusters=Clusters
label.cluster.type=Cluster Type
+label.cluster=Cluster
+label.clusters=Clusters
label.clvm=CLVM
label.code=Code
label.community=Community
label.compute.and.storage=Compute and Storage
-label.compute=Compute
label.compute.offering=Compute offering
label.compute.offerings=Compute offerings
+label.compute=Compute
label.configuration=Configuration
-label.configure=Configure
label.configure.network.ACLs=Configure Network ACLs
label.configure.vpc=Configure VPC
-label.confirmation=Confirmation
+label.configure=Configure
label.confirm.password=Confirm password
-label.congratulations=Congratulations!
+label.confirmation=Confirmation
+label.congratulations=Congratulations\!
label.conserve.mode=Conserve mode
label.console.proxy=Console proxy
label.continue.basic.install=Continue with basic installation
label.continue=Continue
label.corrections.saved=Corrections saved
-label.cpu.allocated=CPU Allocated
label.cpu.allocated.for.VMs=CPU Allocated for VMs
+label.cpu.allocated=CPU Allocated
label.CPU.cap=CPU Cap
-label.cpu=CPU
label.cpu.limits=CPU limits
label.cpu.mhz=CPU (in MHz)
label.cpu.utilized=CPU Utilized
-label.created.by.system=Created by system
-label.created=Created
+label.cpu=CPU
label.create.project=Create project
label.create.template=Create template
label.create.VPN.connection=Create VPN Connection
+label.created.by.system=Created by system
+label.created=Created
label.cross.zones=Cross Zones
label.custom.disk.size=Custom Disk Size
label.daily=Daily
@@ -427,11 +425,11 @@ label.day.of.week=Day of Week
label.dead.peer.detection=Dead Peer Detection
label.decline.invitation=Decline invitation
label.dedicated=Dedicated
-label.default=Default
label.default.use=Default Use
label.default.view=Default View
+label.default=Default
+label.delete.affinity.group=Delete Affinity Group
label.delete.BigSwitchVns=Remove BigSwitch Vns Controller
-label.delete=Delete
label.delete.F5=Delete F5
label.delete.gateway=delete gateway
label.delete.NetScaler=Delete NetScaler
@@ -442,58 +440,60 @@ 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
label.deleting.processing=Deleting....
label.description=Description
label.destination.physical.network.id=Destination physical network ID
label.destination.zone=Destination Zone
-label.destroy=Destroy
label.destroy.router=Destroy router
+label.destroy=Destroy
label.detaching.disk=Detaching Disk
label.details=Details
label.device.id=Device ID
label.devices=Devices
-label.dhcp=DHCP
label.DHCP.server.type=DHCP Server Type
+label.dhcp=DHCP
label.direct.ips=Shared Network IPs
-label.disabled=Disabled
label.disable.provider=Disable provider
label.disable.vpn=Disable VPN
+label.disabled=Disabled
label.disabling.vpn.access=Disabling VPN Access
label.disk.allocated=Disk Allocated
label.disk.offering=Disk Offering
-label.disk.size=Disk Size
label.disk.size.gb=Disk Size (in GB)
+label.disk.size=Disk Size
label.disk.total=Disk Total
label.disk.volume=Disk Volume
label.display.name=Display name
label.display.text=Display Text
label.dns.1=DNS 1
label.dns.2=DNS 2
-label.dns=DNS
label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
+label.dns=DNS
label.domain.admin=Domain Admin
-label.domain=Domain
label.domain.id=Domain ID
label.domain.name=Domain Name
label.domain.router=Domain router
label.domain.suffix=DNS Domain Suffix (i.e., xyz.com)
+label.domain=Domain
label.done=Done
label.double.quotes.are.not.allowed=Double quotes are not allowed
label.download.progress=Download Progress
label.drag.new.position=Drag to new position
-label.edit=Edit
+label.edit.affinity.group=Edit Affinity Group
label.edit.lb.rule=Edit LB rule
label.edit.network.details=Edit network details
label.edit.project.details=Edit project details
label.edit.tags=Edit tags
label.edit.traffic.type=Edit traffic type
label.edit.vpc=Edit VPC
+label.edit=Edit
label.egress.rule=Egress rule
label.egress.rules=Egress rules
-label.elastic=Elastic
label.elastic.IP=Elastic IP
label.elastic.LB=Elastic LB
+label.elastic=Elastic
label.email=Email
label.enable.provider=Enable provider
label.enable.s3=Enable S3-backed Secondary Storage
@@ -502,18 +502,17 @@ label.enable.vpn=Enable VPN
label.enabling.vpn.access=Enabling VPN Access
label.enabling.vpn=Enabling VPN
label.end.IP=End IP
-label.endpoint=Endpoint
-label.endpoint.or.operation=Endpoint or Operation
label.end.port=End Port
label.end.reserved.system.IP=End Reserved system IP
label.end.vlan=End Vlan
+label.endpoint.or.operation=Endpoint or Operation
+label.endpoint=Endpoint
label.enter.token=Enter token
label.error.code=Error Code
label.error=Error
label.ESP.encryption=ESP Encryption
label.ESP.hash=ESP Hash
label.ESP.lifetime=ESP Lifetime (second)
-label.ESP.lifetime=ESP Lifetime(second)
label.ESP.policy=ESP policy
label.esx.host=ESX/ESXi Host
label.example=Example
@@ -527,8 +526,8 @@ label.firewall=Firewall
label.first.name=First Name
label.format=Format
label.friday=Friday
-label.full=Full
label.full.path=Full path
+label.full=Full
label.gateway=Gateway
label.general.alerts=General Alerts
label.generating.url=Generating URL
@@ -536,40 +535,39 @@ label.go.step.2=Go to Step 2
label.go.step.3=Go to Step 3
label.go.step.4=Go to Step 4
label.go.step.5=Go to Step 5
-label.group=Group
label.group.optional=Group (Optional)
+label.group=Group
label.guest.cidr=Guest CIDR
label.guest.end.ip=Guest end IP
label.guest.gateway=Guest Gateway
-label.guest=Guest
-label.guest.ip=Guest IP Address
label.guest.ip.range=Guest IP Range
+label.guest.ip=Guest IP Address
label.guest.netmask=Guest Netmask
label.guest.networks=Guest networks
label.guest.start.ip=Guest start IP
label.guest.traffic=Guest Traffic
label.guest.type=Guest Type
+label.guest=Guest
label.ha.enabled=HA Enabled
label.help=Help
label.hide.ingress.rule=Hide Ingress Rule
label.hints=Hints
label.host.alerts=Host Alerts
-label.host=Host
label.host.MAC=Host MAC
label.host.name=Host Name
+label.host.tags=Host Tags
+label.host=Host
label.hosts=Hosts
-label.host.tags=Host Tags
label.hourly=Hourly
label.hypervisor.capabilities=Hypervisor capabilities
-label.hypervisor=Hypervisor
label.hypervisor.type=Hypervisor Type
label.hypervisor.version=Hypervisor version
+label.hypervisor=Hypervisor
label.id=ID
label.IKE.DH=IKE DH
label.IKE.encryption=IKE Encryption
label.IKE.hash=IKE Hash
label.IKE.lifetime=IKE lifetime (second)
-label.IKE.lifetime=IKE Lifetime (second)
label.IKE.policy=IKE policy
label.info=Info
label.ingress.rule=Ingress Rule
@@ -584,54 +582,55 @@ label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage?
label.installWizard.addPrimaryStorageIntro.title=Let’s add primary storage
label.installWizard.addSecondaryStorageIntro.subtitle=What is secondary storage?
label.installWizard.addSecondaryStorageIntro.title=Let’s add secondary storage
+label.installWizard.addZone.title=Add zone
label.installWizard.addZoneIntro.subtitle=What is a zone?
label.installWizard.addZoneIntro.title=Let’s add a zone
-label.installWizard.addZone.title=Add zone
label.installWizard.click.launch=Click the launch button.
-label.installWizard.subtitle=This tour will aid you in setting up your CloudStack™ installation
-label.installWizard.title=Hello and Welcome to CloudStack™
-label.instance=Instance
+label.installWizard.subtitle=This tour will aid you in setting up your CloudStack&\#8482 installation
+label.installWizard.title=Hello and Welcome to CloudStack&\#8482
label.instance.limits=Instance Limits
label.instance.name=Instance Name
+label.instance=Instance
label.instances=Instances
label.internal.dns.1=Internal DNS 1
label.internal.dns.2=Internal DNS 2
label.internal.name=Internal name
label.interval.type=Interval Type
-label.introduction.to.cloudstack=Introduction to CloudStack™
+label.introduction.to.cloudstack=Introduction to CloudStack&\#8482
label.invalid.integer=Invalid Integer
label.invalid.number=Invalid Number
label.invitations=Invitations
-label.invited.accounts=Invited accounts
-label.invite=Invite
label.invite.to=Invite to
+label.invite=Invite
+label.invited.accounts=Invited accounts
label.ip.address=IP Address
-label.ipaddress=IP Address
label.ip.allocations=IP Allocations
-label.ip=IP
label.ip.limits=Public IP Limits
label.ip.or.fqdn=IP or FQDN
label.ip.range=IP Range
label.ip.ranges=IP Ranges
-label.IPsec.preshared.key=IPsec Preshared-Key
+label.ip=IP
+label.ipaddress=IP Address
label.ips=IPs
-label.iscsi=iSCSI
+label.IPsec.preshared.key=IPsec Preshared-Key
label.is.default=Is Default
+label.is.redundant.router=Redundant
+label.is.shared=Is Shared
+label.is.system=Is System
+label.iscsi=iSCSI
label.iso.boot=ISO Boot
label.iso=ISO
label.isolated.networks=Isolated networks
label.isolation.method=Isolation method
label.isolation.mode=Isolation Mode
label.isolation.uri=Isolation URI
-label.is.redundant.router=Redundant
-label.is.shared=Is Shared
-label.is.system=Is System
label.item.listing=Item listing
label.keep=Keep
-label.keyboard.type=Keyboard type
label.key=Key
+label.keyboard.type=Keyboard type
label.kvm.traffic.label=KVM traffic label
label.label=Label
+label.lang.arabic=Arabic
label.lang.brportugese=Brazilian Portugese
label.lang.catalan=Catalan
label.lang.chinese=Chinese (Simplified)
@@ -644,37 +643,34 @@ label.lang.korean=Korean
label.lang.norwegian=Norwegian
label.lang.russian=Russian
label.lang.spanish=Spanish
-label.lang.arabic=Arabic
label.last.disconnected=Last Disconnected
label.last.name=Last Name
label.latest.events=Latest events
-label.launch=Launch
label.launch.vm=Launch VM
-label.launch.zone=Launch zone
+label.launch.zone=Launch zone
+label.launch=Launch
label.LB.isolation=LB isolation
label.least.connections=Least connections
label.level=Level
label.linklocal.ip=Link Local IP Adddress
label.load.balancer=Load Balancer
-label.load.balancing=Load Balancing
label.load.balancing.policies=Load balancing policies
+label.load.balancing=Load Balancing
label.loading=Loading
-label.local=Local
label.local.storage.enabled=Local storage enabled
-label.local.storage.enabled=Local Storage Enabled
label.local.storage=Local Storage
+label.local=Local
label.login=Login
label.logout=Logout
+label.LUN.number=LUN \#
label.lun=LUN
-label.LUN.number=LUN #
label.make.project.owner=Make account project owner
+label.manage.resources=Manage Resources
label.manage=Manage
label.management.ips=Management IP Addresses
label.management=Management
-label.manage.resources=Manage Resources
label.max.cpus=Max. CPU cores
label.max.guest.limit=Max guest limit
-label.maximum=Maximum
label.max.memory=Max. memory (MiB)
label.max.networks=Max. networks
label.max.primary.storage=Max. primary (GiB)
@@ -685,13 +681,14 @@ label.max.templates=Max. templates
label.max.vms=Max. user VMs
label.max.volumes=Max. volumes
label.max.vpcs=Max. VPCs
+label.maximum=Maximum
label.may.continue=You may now continue.
label.memory.allocated=Memory Allocated
label.memory.limits=Memory limits (MiB)
label.memory.mb=Memory (in MB)
-label.memory=Memory
label.memory.total=Memory Total
label.memory.used=Memory Used
+label.memory=Memory
label.menu.accounts=Accounts
label.menu.alerts=Alerts
label.menu.all.accounts=All Accounts
@@ -715,8 +712,8 @@ label.menu.my.accounts=My Accounts
label.menu.my.instances=My Instances
label.menu.my.isos=My ISOs
label.menu.my.templates=My Templates
-label.menu.network=Network
label.menu.network.offerings=Network Offerings
+label.menu.network=Network
label.menu.physical.resources=Physical Resources
label.menu.regions=Regions
label.menu.running.instances=Running Instances
@@ -726,15 +723,15 @@ label.menu.snapshots=Snapshots
label.menu.stopped.instances=Stopped Instances
label.menu.storage=Storage
label.menu.system.service.offerings=System Offerings
-label.menu.system=System
label.menu.system.vms=System VMs
+label.menu.system=System
label.menu.templates=Templates
label.menu.virtual.appliances=Virtual Appliances
label.menu.virtual.resources=Virtual Resources
label.menu.volumes=Volumes
label.migrate.instance.to.host=Migrate instance to another host
-label.migrate.instance.to=Migrate instance to
label.migrate.instance.to.ps=Migrate instance to another primary storage
+label.migrate.instance.to=Migrate instance to
label.migrate.router.to=Migrate Router to
label.migrate.systemvm.to=Migrate System VM to
label.migrate.to.host=Migrate to host
@@ -752,24 +749,22 @@ label.move.up.row=Move up one row
label.my.account=My Account
label.my.network=My network
label.my.templates=My templates
-label.name=Name
label.name.optional=Name (Optional)
+label.name=Name
label.nat.port.range=NAT Port Range
label.netmask=Netmask
label.netScaler=NetScaler
+label.network.ACL.total=Network ACL Total
label.network.ACL=Network ACL
label.network.ACLs=Network ACLs
-label.network.ACL.total=Network ACL Total
label.network.desc=Network Desc
-label.network.device=Network Device
label.network.device.type=Network Device Type
-label.network.domain=Network Domain
+label.network.device=Network Device
label.network.domain.text=Network domain
+label.network.domain=Network Domain
label.network.id=Network ID
-label.networking.and.security=Networking and security
label.network.label.display.for.blank.value=Use default gateway
label.network.name=Network Name
-label.network=Network
label.network.offering.display.text=Network Offering Display Text
label.network.offering.id=Network Offering ID
label.network.offering.name=Network Offering Name
@@ -778,18 +773,20 @@ label.network.rate.megabytes=Network Rate (Mb/s)
label.network.rate=Network Rate
label.network.read=Network Read
label.network.service.providers=Network Service Providers
-label.networks=Networks
label.network.type=Network Type
label.network.write=Network Write
-label.new=New
+label.network=Network
+label.networking.and.security=Networking and security
+label.networks=Networks
label.new.password=New Password
label.new.project=New Project
label.new.vm=New VM
+label.new=New
label.next=Next
label.nexusVswitch=Nexus 1000v
-label.nfs=NFS
label.nfs.server=NFS Server
label.nfs.storage=NFS Storage
+label.nfs=NFS
label.nic.adapter.type=NIC adapter type
label.nicira.controller.address=Controller Address
label.nicira.l3gatewayserviceuuid=L3 Gateway Service Uuid
@@ -801,20 +798,19 @@ label.no.data=No data to show
label.no.errors=No Recent Errors
label.no.isos=No available ISOs
label.no.items=No Available Items
-label.none=None
-label.no=No
label.no.security.groups=No Available Security Groups
-label.not.found=Not Found
label.no.thanks=No thanks
-label.no.thanks=No Thanks
+label.no=No
+label.none=None
+label.not.found=Not Found
label.notifications=Notifications
+label.num.cpu.cores=\# of CPU Cores
label.number.of.clusters=Number of Clusters
label.number.of.hosts=Number of Hosts
label.number.of.pods=Number of Pods
label.number.of.system.vms=Number of System VMs
label.number.of.virtual.routers=Number of Virtual Routers
label.number.of.zones=Number of Zones
-label.num.cpu.cores=# of CPU Cores
label.numretries=Number of Retries
label.ocfs2=OCFS2
label.offer.ha=Offer HA
@@ -825,14 +821,14 @@ label.os.preference=OS Preference
label.os.type=OS Type
label.owned.public.ips=Owned Public IP Addresses
label.owner.account=Owner Account
-label.owner.domain=Owner Domain
+label.owner.domain=Owner Domain
label.parent.domain=Parent Domain
label.password.enabled=Password Enabled
label.password=Password
label.path=Path
label.perfect.forward.secrecy=Perfect Forward Secrecy
label.physical.network.ID=Physical network ID
-label.physical.network=Physical Network
+label.physical.network=Physical Network
label.PING.CIFS.password=PING CIFS password
label.PING.CIFS.username=PING CIFS username
label.PING.dir=PING Directory
@@ -848,8 +844,8 @@ label.port.forwarding.policies=Port forwarding policies
label.port.forwarding=Port Forwarding
label.port.range=Port Range
label.PreSetup=PreSetup
-label.previous=Previous
label.prev=Prev
+label.previous=Previous
label.primary.allocated=Primary Storage Allocated
label.primary.network=Primary Network
label.primary.storage.count=Primary Storage Pools
@@ -858,20 +854,20 @@ label.primary.storage=Primary Storage
label.primary.used=Primary Storage Used
label.private.Gateway=Private Gateway
label.private.interface=Private Interface
-label.private.ip=Private IP Address
label.private.ip.range=Private IP Range
+label.private.ip=Private IP Address
label.private.ips=Private IP Addresses
-label.privatekey=PKCS#8 Private Key
label.private.network=Private network
label.private.port=Private Port
label.private.zone=Private Zone
+label.privatekey=PKCS\#8 Private Key
label.project.dashboard=Project dashboard
label.project.id=Project ID
label.project.invite=Invite to project
label.project.name=Project name
+label.project.view=Project View
label.project=Project
label.projects=Projects
-label.project.view=Project View
label.protocol=Protocol
label.providers=Providers
label.public.interface=Public Interface
@@ -879,9 +875,9 @@ label.public.ip=Public IP Address
label.public.ips=Public IP Addresses
label.public.network=Public network
label.public.port=Public Port
-label.public=Public
-label.public.traffic=Public traffic
+label.public.traffic=Public traffic
label.public.zone=Public Zone
+label.public=Public
label.purpose=Purpose
label.Pxe.server.type=Pxe Server Type
label.quickview=Quickview
@@ -901,7 +897,6 @@ label.remove.ingress.rule=Remove ingress rule
label.remove.ip.range=Remove IP range
label.remove.pf=Remove port forwarding rule
label.remove.project.account=Remove account from project
-label.remove.project.account=Remove project account
label.remove.region=Remove Region
label.remove.rule=Remove rule
label.remove.static.nat.rule=Remove static NAT rule
@@ -909,8 +904,8 @@ 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.removing=Removing
label.removing.user=Removing User
+label.removing=Removing
label.required=Required
label.reserved.system.gateway=Reserved system gateway
label.reserved.system.ip=Reserved System IP
@@ -920,9 +915,9 @@ label.resize.new.offering.id=New Offering
label.resize.new.size=New Size(GB)
label.resize.shrink.ok=Shrink OK
label.resource.limits=Resource Limits
+label.resource.state=Resource state
label.resource=Resource
label.resources=Resources
-label.resource.state=Resource state
label.restart.network=Restart network
label.restart.required=Restart required
label.restart.vpc=restart VPC
@@ -951,36 +946,36 @@ label.scope=Scope
label.search=Search
label.secondary.storage.count=Secondary Storage Pools
label.secondary.storage.limits=Secondary Storage limits (GiB)
-label.secondary.storage=Secondary Storage
label.secondary.storage.vm=Secondary storage VM
+label.secondary.storage=Secondary Storage
label.secondary.used=Secondary Storage Used
label.secret.key=Secret Key
label.security.group.name=Security Group Name
label.security.group=Security Group
label.security.groups.enabled=Security Groups Enabled
label.security.groups=Security Groups
+label.select-view=Select view
label.select.a.template=Select a template
label.select.a.zone=Select a zone
-label.select.instance=Select instance
label.select.instance.to.attach.volume.to=Select instance to attach volume to
+label.select.instance=Select instance
label.select.iso.or.template=Select ISO or template
label.select.offering=Select offering
label.select.project=Select Project
-label.select=Select
label.select.tier=Select Tier
-label.select-view=Select view
label.select.vm.for.static.nat=Select VM for static NAT
+label.select=Select
label.sent=Sent
label.server=Server
label.service.capabilities=Service Capabilities
label.service.offering=Service Offering
label.session.expired=Session Expired
+label.set.up.zone.type=Set up zone type
label.setup.network=Setup Network
-label.setup=Setup
label.setup.zone=Setup Zone
-label.set.up.zone.type=Set up zone type
-label.SharedMountPoint=SharedMountPoint
+label.setup=Setup
label.shared=Shared
+label.SharedMountPoint=SharedMountPoint
label.show.ingress.rule=Show Ingress Rule
label.shutdown.provider=Shutdown provider
label.site.to.site.VPN=Site-to-site VPN
@@ -988,9 +983,9 @@ label.size=Size
label.skip.guide=I have used CloudStack before, skip this guide
label.snapshot.limits=Snapshot Limits
label.snapshot.name=Snapshot Name
+label.snapshot.s=Snapshot (s)
label.snapshot.schedule=Setup Recurring Snapshot
label.snapshot=Snapshot
-label.snapshot.s=Snapshot (s)
label.snapshots=Snapshots
label.source.nat=Source NAT
label.source=Source
@@ -1004,21 +999,21 @@ label.start.reserved.system.IP=Start Reserved system IP
label.start.vlan=Start Vlan
label.state=State
label.static.nat.enabled=Static NAT Enabled
-label.static.nat=Static NAT
label.static.nat.to=Static NAT to
label.static.nat.vm.details=Static NAT VM Details
+label.static.nat=Static NAT
label.statistics=Statistics
label.status=Status
+label.step.1.title=Step 1\: <strong>Select a Template</strong>
label.step.1=Step 1
-label.step.1.title=Step 1: <strong>Select a Template</strong>
+label.step.2.title=Step 2\: <strong>Service Offering</strong>
label.step.2=Step 2
-label.step.2.title=Step 2: <strong>Service Offering</strong>
+label.step.3.title=Step 3\: <strong id\="step3_label">Select a Disk Offering</strong>
label.step.3=Step 3
-label.step.3.title=Step 3: <strong id="step3_label">Select a Disk Offering</strong>
+label.step.4.title=Step 4\: <strong>Network</strong>
label.step.4=Step 4
-label.step.4.title=Step 4: <strong>Network</strong>
+label.step.5.title=Step 5\: <strong>Review</strong>
label.step.5=Step 5
-label.step.5.title=Step 5: <strong>Review</strong>
label.stickiness=Stickiness
label.sticky.cookie-name=Cookie name
label.sticky.domain=Domain
@@ -1032,15 +1027,15 @@ label.sticky.postonly=Post only
label.sticky.prefix=Prefix
label.sticky.request-learn=Request learn
label.sticky.tablesize=Table size
-label.stopped.vms=Stopped VMs
label.stop=Stop
-label.storage=Storage
+label.stopped.vms=Stopped VMs
label.storage.tags=Storage Tags
label.storage.traffic=Storage Traffic
label.storage.type=Storage Type
+label.storage=Storage
label.subdomain.access=Subdomain Access
label.submit=Submit
-label.submitted.by=[Submitted by: <span id="submitted_by"></span>]
+label.submitted.by=[Submitted by\: <span id\="submitted_by"></span>]
label.succeeded=Succeeded
label.sunday=Sunday
label.super.cidr.for.guest.networks=Super CIDR for Guest Networks
@@ -1050,9 +1045,9 @@ label.suspend.project=Suspend Project
label.system.capacity=System Capacity
label.system.offering=System Offering
label.system.service.offering=System Service Offering
-label.system.vms=System VMs
-label.system.vm=System VM
label.system.vm.type=System VM Type
+label.system.vm=System VM
+label.system.vms=System VMs
label.system.wide.capacity=System-wide capacity
label.tagged=Tagged
label.tags=Tags
@@ -1067,14 +1062,14 @@ label.theme.lightblue=Custom - Light Blue
label.thursday=Thursday
label.tier.details=Tier details
label.tier=Tier
+label.time.zone=Timezone
+label.time=Time
label.timeout.in.second = Timeout(seconds)
label.timeout=Timeout
-label.time=Time
-label.time.zone=Timezone
label.timezone=Timezone
label.token=Token
-label.total.cpu=Total CPU
label.total.CPU=Total CPU
+label.total.cpu=Total CPU
label.total.hosts=Total Hosts
label.total.memory=Total Memory
label.total.of.ip=Total of IP Address
@@ -1082,8 +1077,8 @@ label.total.of.vm=Total of VM
label.total.storage=Total Storage
label.total.vms=Total VMs
label.traffic.label=Traffic label
-label.traffic.types=Traffic Types
label.traffic.type=Traffic Type
+label.traffic.types=Traffic Types
label.tuesday=Tuesday
label.type.id=Type ID
label.type=Type
@@ -1094,15 +1089,15 @@ label.update.project.resources=Update project resources
label.update.ssl.cert= SSL Certificate
label.update.ssl= SSL Certificate
label.updating=Updating
-label.upload=Upload
label.upload.volume=Upload volume
+label.upload=Upload
label.url=URL
label.usage.interface=Usage Interface
+label.use.vm.ip=Use VM IP\:
label.used=Used
+label.user=User
label.username=Username
label.users=Users
-label.user=User
-label.use.vm.ip=Use VM IP:
label.value=Value
label.vcdcname=vCenter DC name
label.vcenter.cluster=vCenter Cluster
@@ -1115,47 +1110,47 @@ label.vcipaddress=vCenter IP Address
label.version=Version
label.view.all=View all
label.view.console=View console
-label.viewing=Viewing
label.view.more=View more
label.view=View
-label.virtual.appliances=Virtual Appliances
+label.viewing=Viewing
label.virtual.appliance=Virtual Appliance
+label.virtual.appliances=Virtual Appliances
label.virtual.machines=Virtual machines
label.virtual.network=Virtual Network
-label.virtual.routers=Virtual Routers
label.virtual.router=Virtual Router
+label.virtual.routers=Virtual Routers
label.vlan.id=VLAN ID
label.vlan.range=VLAN Range
label.vlan=VLAN
label.vm.add=Add Instance
label.vm.destroy=Destroy
label.vm.display.name=VM display name
-label.VMFS.datastore=VMFS datastore
-label.vmfs=VMFS
label.vm.name=VM name
label.vm.reboot=Reboot
+label.vm.start=Start
+label.vm.state=VM state
+label.vm.stop=Stop
+label.VMFS.datastore=VMFS datastore
+label.vmfs=VMFS
label.VMs.in.tier=VMs in tier
+label.vms=VMs
label.vmsnapshot.current=isCurrent
label.vmsnapshot.memory=Snapshot memory
label.vmsnapshot.parentname=Parent
label.vmsnapshot.type=Type
label.vmsnapshot=VM Snapshots
-label.vm.start=Start
-label.vm.state=VM state
-label.vm.stop=Stop
-label.vms=VMs
label.vmware.traffic.label=VMware traffic label
label.volgroup=Volume Group
label.volume.limits=Volume Limits
label.volume.name=Volume Name
-label.volumes=Volumes
label.volume=Volume
+label.volumes=Volumes
label.vpc.id=VPC ID
label.VPC.router.details=VPC router details
label.vpc=VPC
label.VPN.connection=VPN Connection
-label.vpn.customer.gateway=VPN Customer Gateway
label.VPN.customer.gateway=VPN Customer Gateway
+label.vpn.customer.gateway=VPN Customer Gateway
label.VPN.gateway=VPN Gateway
label.vpn=VPN
label.vsmctrlvlanid=Control VLAN ID
@@ -1168,27 +1163,27 @@ label.wednesday=Wednesday
label.weekly=Weekly
label.welcome.cloud.console=Welcome to Management Console
label.welcome=Welcome
-label.what.is.cloudstack=What is CloudStack™?
+label.what.is.cloudstack=What is CloudStack&\#8482?
label.xen.traffic.label=XenServer traffic label
label.yes=Yes
label.zone.details=Zone details
label.zone.id=Zone ID
label.zone.name=Zone name
-label.zone.step.1.title=Step 1: <strong>Select a Network</strong>
-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.zones=Zones
+label.zone.step.1.title=Step 1\: <strong>Select a Network</strong>
+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.zone.type=Zone Type
label.zone.wide=Zone-Wide
-label.zoneWizard.trafficType.guest=Guest: Traffic between end-user virtual machines
-label.zoneWizard.trafficType.management=Management: Traffic between CloudStack\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs
-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.zone=Zone
+label.zones=Zones
+label.zoneWizard.trafficType.guest=Guest\: Traffic between end-user virtual machines
+label.zoneWizard.trafficType.management=Management\: Traffic between CloudStack\\\\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs
+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
managed.state=Managed State
-message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
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.
message.acquire.public.ip=Please select a zone from which you want to acquire your new IP from.
message.action.cancel.maintenance.mode=Please confirm that you want to cancel this maintenance.
message.action.cancel.maintenance=Your host has been successfully canceled for maintenance. This process can take up to several minutes.
@@ -1197,8 +1192,8 @@ message.action.change.service.warning.for.router=Your router must be stopped bef
message.action.delete.cluster=Please confirm that you want to delete this cluster.
message.action.delete.disk.offering=Please confirm that you want to delete this disk offering.
message.action.delete.domain=Please confirm that you want to delete this domain.
-message.action.delete.external.firewall=Please confirm that you would like to remove this external firewall. Warning: If you are planning to add back the same external firewall, you must reset usage data on the device.
-message.action.delete.external.load.balancer=Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device.
+message.action.delete.external.firewall=Please confirm that you would like to remove this external firewall. Warning\: If you are planning to add back the same external firewall, you must reset usage data on the device.
+message.action.delete.external.load.balancer=Please confirm that you would like to remove this external load balancer. Warning\: If you are planning to add back the same external load balancer, you must reset usage data on the device.
message.action.delete.ingress.rule=Please confirm that you want to delete this ingress rule.
message.action.delete.ISO.for.all.zones=The ISO is used by all zones. Please confirm that you want to delete it from all zones.
message.action.delete.ISO=Please confirm that you want to delete this ISO.
@@ -1234,15 +1229,14 @@ message.action.enable.pod=Please confirm that you want to enable this pod.
message.action.enable.zone=Please confirm that you want to enable this zone.
message.action.force.reconnect=Your host has been successfully forced to reconnect. This process can take up to several minutes.
message.action.host.enable.maintenance.mode=Enabling maintenance mode will cause a live migration of all running instances on this host to any available host.
-message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine.
+message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine.
message.action.manage.cluster=Please confirm that you want to manage the cluster.
-message.action.primarystorage.enable.maintenance.mode=Warning: placing the primary storage into maintenance mode will cause all VMs using volumes from it to be stopped. Do you want to continue?
+message.action.primarystorage.enable.maintenance.mode=Warning\: placing the primary storage into maintenance mode will cause all VMs using volumes from it to be stopped. Do you want to continue?
message.action.reboot.instance=Please confirm that you want to reboot this instance.
message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
message.action.reboot.systemvm=Please confirm that you want to reboot this system VM.
message.action.release.ip=Please confirm that you want to release this IP.
message.action.remove.host=Please confirm that you want to remove this host.
-message.action.remove.host=Removing last/only host in cluster and reinstalling the host will destroy working environment/database on the host and render the VM Guests unuseable.
message.action.reset.password.off=Your instance currently does not support this feature.
message.action.reset.password.warning=Your instance must be stopped before attempting to change its current password.
message.action.restore.instance=Please confirm that you want to restore this instance.
@@ -1257,40 +1251,40 @@ message.action.unmanage.cluster=Please confirm that you want to unmanage the clu
message.action.vmsnapshot.delete=Please confirm that you want to delete this VM snapshot.
message.action.vmsnapshot.revert=Revert VM snapshot
message.activate.project=Are you sure you want to activate this project?
-message.add.cluster=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
-message.add.cluster.zone=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>
+message.add.cluster.zone=Add a hypervisor managed cluster for zone <b><span id\="zone_name"></span></b>
+message.add.cluster=Add a hypervisor managed cluster for zone <b><span id\="zone_name"></span></b>, pod <b><span id\="pod_name"></span></b>
message.add.disk.offering=Please specify the following parameters to add a new disk offering
message.add.domain=Please specify the subdomain you want to create under this domain
message.add.firewall=Add a firewall to zone
message.add.guest.network=Please confirm that you would like to add a guest network
message.add.host=Please specify the following parameters to add a new host
-message.adding.host=Adding host
-message.adding.Netscaler.device=Adding Netscaler device
-message.adding.Netscaler.provider=Adding Netscaler provider
+message.add.ip.range.direct.network=Add an IP range to direct network <b><span id\="directnetwork_name"></span></b> in zone <b><span id\="zone_name"></span></b>
+message.add.ip.range.to.pod=<p>Add an IP range to pod\: <b><span id\="pod_name_label"></span></b></p>
message.add.ip.range=Add an IP range to public network in zone
-message.add.ip.range.direct.network=Add an IP range to direct network <b><span id="directnetwork_name"></span></b> in zone <b><span id="zone_name"></span></b>
-message.add.ip.range.to.pod=<p>Add an IP range to pod: <b><span id="pod_name_label"></span></b></p>
-message.additional.networks.desc=Please select additional network(s) that your virtual instance will be connected to.
+message.add.load.balancer.under.ip=The load balancer rule has been added under IP\:
message.add.load.balancer=Add a load balancer to zone
-message.add.load.balancer.under.ip=The load balancer rule has been added under IP:
-message.add.network=Add a new network for zone: <b><span id="zone_name"></span></b>
+message.add.network=Add a new network for zone\: <b><span id\="zone_name"></span></b>
message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC.
-message.add.pod=Add a new pod for zone <b><span id="add_pod_zone_name"></span></b>
-message.add.pod.during.zone.creation=Each zone must contain in one or more pods, and we will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack's internal management traffic. The reserved IP range must be unique for each zone in the cloud.
+message.add.pod.during.zone.creation=Each zone must contain in one or more pods, and we will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack\\'s internal management traffic. The reserved IP range must be unique for each zone in the cloud.
+message.add.pod=Add a new pod for zone <b><span id\="add_pod_zone_name"></span></b>
+message.add.primary.storage=Add a new Primary Storage for zone <b><span id\="zone_name"></span></b>, pod <b><span id\="pod_name"></span></b>
message.add.primary=Please specify the following parameters to add a new primary storage
-message.add.primary.storage=Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
message.add.region=Please specify the required information to add a new region.
-message.add.secondary.storage=Add a new storage for zone <b><span id="zone_name"></span></b>
+message.add.secondary.storage=Add a new storage for zone <b><span id\="zone_name"></span></b>
message.add.service.offering=Please fill in the following data to add a new compute offering.
message.add.system.service.offering=Please fill in the following data to add a new system service offering.
message.add.template=Please enter the following data to create your new template
message.add.volume=Please fill in the following data to add a new volume.
message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
+message.adding.host=Adding host
+message.adding.Netscaler.device=Adding Netscaler device
+message.adding.Netscaler.provider=Adding Netscaler provider
+message.additional.networks.desc=Please select additional network(s) that your virtual instance will be connected to.
message.advanced.mode.desc=Choose this network model if you wish to enable VLAN support. This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking.
message.advanced.security.group=Choose this if you wish to use security groups to provide guest VM isolation.
message.advanced.virtual=Choose this if you wish to use zone-wide VLANs to provide guest VM isolation.
-message.after.enable.s3=S3-backed Secondary Storage configured. Note: When you leave this page, you will not be able to re-configure S3 again.
-message.after.enable.swift=Swift configured. Note: When you leave this page, you will not be able to re-configure Swift again.
+message.after.enable.s3=S3-backed Secondary Storage configured. Note\: When you leave this page, you will not be able to re-configure S3 again.
+message.after.enable.swift=Swift configured. Note\: When you leave this page, you will not be able to re-configure Swift again.
message.alert.state.detected=Alert state detected
message.allow.vpn.access=Please enter a username and password of the user that you want to allow VPN access.
message.apply.snapshot.policy=You have successfully updated your current snapshot policy.
@@ -1315,10 +1309,10 @@ 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.copy.iso.confirm=Please confirm that you wish to copy your ISO to
-message.copy.template=Copy template <b id="copy_template_name_text">XXX</b> from zone <b id="copy_template_source_zone_text"></b> to
+message.copy.template=Copy template <b id\="copy_template_name_text">XXX</b> from zone <b id\="copy_template_source_zone_text"></b> to
+message.create.template.vm=Create VM from template <b id\="p_name"></b>
+message.create.template.volume=Please specify the following information before creating a template of your disk volume\: <b><span id\="volume_name"></span></b>. Creation of the template can range from several minutes to longer depending on the size of the volume.
message.create.template=Are you sure you want to create template?
-message.create.template.vm=Create VM from template <b id="p_name"></b>
-message.create.template.volume=Please specify the following information before creating a template of your disk volume: <b><span id="volume_name"></span></b>. Creation of the template can range from several minutes to longer depending on the size of the volume.
message.creating.cluster=Creating cluster
message.creating.guest.network=Creating guest network
message.creating.physical.networks=Creating physical networks
@@ -1328,6 +1322,7 @@ message.creating.secondary.storage=Creating secondary storage
message.creating.zone=Creating zone
message.decline.invitation=Are you sure you want to decline this project invitation?
message.delete.account=Please confirm that you want to delete this account.
+message.delete.affinity.group=Please confirm that you would like to remove this affinity group.
message.delete.gateway=Please confirm you want to delete the gateway
message.delete.project=Are you sure you want to delete this project?
message.delete.user=Please confirm that you would like to delete this user.
@@ -1337,31 +1332,31 @@ message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gatew
message.desc.advanced.zone=For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks and providing custom network offerings such as firewall, VPN, or load balancer support.
message.desc.basic.zone=Provide a single network where each VM instance is assigned an IP directly from the network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).
message.desc.cluster=Each pod must contain one or more clusters, and we will add the first cluster now. A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Each cluster consists of one or more hosts and one or more primary storage servers.
-message.desc.host=Each cluster must contain at least one host (computer) for guest VMs to run on, and we will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
+message.desc.host=Each cluster must contain at least one host (computer) for guest VMs to run on, and we will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host\\'s DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
message.desc.primary.storage=Each cluster must contain one or more primary storage servers, and we will add the first one now. Primary storage contains the disk volumes for all the VMs running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.
message.desc.secondary.storage=Each zone must have at least one NFS or secondary storage server, and we will add the first one now. Secondary storage stores VM templates, ISO images, and VM disk volume snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.
message.desc.zone=A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.
message.detach.disk=Are you sure you want to detach this disk?
message.detach.iso.confirm=Please confirm that you want to detach the ISO from this virtual instance.
-message.disable.account=Please confirm that you want to disable this account. By disabling the account, all users for this account will no longer have access to their cloud resources. All running virtual machines will be immediately shut down.
+message.disable.account=Please confirm that you want to disable this account. By disabling the account, all users for this account will no longer have access to their cloud resources. All running virtual machines will be immediately shut down.
message.disable.snapshot.policy=You have successfully disabled your current snapshot policy.
message.disable.user=Please confirm that you would like to disable this user.
message.disable.vpn.access=Please confirm that you want to disable VPN Access.
message.disable.vpn=Are you sure you want to disable VPN?
-message.download.ISO=Please click <a href="#">00000</a> to download ISO
-message.download.template=Please click <a href="#">00000</a> to download template
+message.download.ISO=Please click <a href\="\#">00000</a> to download ISO
+message.download.template=Please click <a href\="\#">00000</a> to download template
message.download.volume.confirm=Please confirm that you want to download this volume
-message.download.volume=Please click <a href="#">00000</a> to download volume
+message.download.volume=Please click <a href\="\#">00000</a> to download volume
message.edit.account=Edit ("-1" indicates no limit to the amount of resources create)
message.edit.confirm=Please confirm that your changes before clicking "Save".
message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create.
message.edit.traffic.type=Please specify the traffic label you want associated with this traffic type.
message.enable.account=Please confirm that you want to enable this account.
-message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
-message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP
message.enable.user=Please confirm that you would like to enable this user.
message.enable.vpn.access=VPN is currently disabled for this IP Address. Would you like to enable VPN access?
message.enable.vpn=Please confirm that you want VPN access enabled for this IP address.
+message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
+message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP
message.enabling.security.group.provider=Enabling Security Group provider
message.enabling.zone=Enabling zone
message.enter.token=Please enter the token that you were given in your invite e-mail.
@@ -1369,14 +1364,14 @@ message.generate.keys=Please confirm that you would like to generate new keys fo
message.guest.traffic.in.advanced.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.
message.guest.traffic.in.basic.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.
message.installWizard.click.retry=Click the button to retry launch.
-message.installWizard.copy.whatIsACluster=A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack™ deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack™ allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.
-message.installWizard.copy.whatIsAHost=A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack™ deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.
-message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack™ deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.
-message.installWizard.copy.whatIsAZone=A zone is the largest organizational unit within a CloudStack™ deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).
-message.installWizard.copy.whatIsCloudStack=CloudStack™ is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack™ manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack™ to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack™ provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features.
-message.installWizard.copy.whatIsPrimaryStorage=A CloudStack™ cloud infrastructure makes use of two types of storage: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts.
-message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>
-message.installWizard.now.building=Now building your cloud...
+message.installWizard.copy.whatIsACluster=A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack&\#8482; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack&\#8482; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.
+message.installWizard.copy.whatIsAHost=A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack&\#8482; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.
+message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack&\#8482; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.
+message.installWizard.copy.whatIsAZone=A zone is the largest organizational unit within a CloudStack&\#8482; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).
+message.installWizard.copy.whatIsCloudStack=CloudStack&\#8482 is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack&\#8482 manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack&\#8482 to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack&\#8482 provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features.
+message.installWizard.copy.whatIsPrimaryStorage=A CloudStack&\#8482; cloud infrastructure makes use of two types of storage\: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts.
+message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following\:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>
+message.installWizard.now.building=Now building your cloud...
message.installWizard.tooltip.addCluster.name=A name for the cluster. This can be text of your choosing and is not used by CloudStack.
message.installWizard.tooltip.addHost.hostname=The DNS name or IP address of the host.
message.installWizard.tooltip.addHost.password=This is the password for the user named above (from your XenServer install).
@@ -1406,26 +1401,26 @@ message.instanceWizard.noTemplates=You do not have any templates available; plea
message.ip.address.changed=Your IP addresses may have changed; would you like to refresh the listing? Note that in this case the details pane will close.
message.iso.desc=Disc image containing data or bootable media for OS
message.join.project=You have now joined a project. Please switch to Project view to see the project.
-message.launch.vm.on.private.network=Do you wish to launch your instance on your own private dedicated network?
+message.launch.vm.on.private.network=Do you wish to launch your instance on your own private dedicated network?
message.launch.zone=Zone is ready to launch; please proceed to the next step.
message.lock.account=Please confirm that you want to lock this account. By locking the account, all users for this account will no longer be able to manage their cloud resources. Existing resources can still be accessed.
message.migrate.instance.confirm=Please confirm the host you wish to migrate the virtual instance to.
message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
-message.migrate.router.confirm=Please confirm the host you wish to migrate the router to:
-message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to:
+message.migrate.router.confirm=Please confirm the host you wish to migrate the router to\:
+message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to\:
message.migrate.volume=Please confirm that you want to migrate volume to another primary storage.
-message.new.user=Specify the following to add a new user to the account
+message.new.user=Specify the following to add a new user to the account
message.no.network.support.configuration.not.true=You do not have any zone that has security group enabled. Thus, no additional network features. Please continue to step 5.
message.no.network.support=Your selected hypervisor, vSphere, does not have any additional network features. Please continue to step 5.
message.no.projects.adminOnly=You do not have any projects.<br/>Please ask your administrator to create a new project.
message.no.projects=You do not have any projects.<br/>Please create a new one from the projects section.
-message.number.clusters=<h2><span> # of </span> Clusters</h2>
-message.number.hosts=<h2><span> # of </span> Hosts</h2>
-message.number.pods=<h2><span> # of </span> Pods</h2>
-message.number.storage=<h2><span> # of </span> Primary Storage Volumes</h2>
-message.number.zones=<h2><span> # of </span> Zones</h2>
-message.pending.projects.1=You have pending project invitations:
+message.number.clusters=<h2><span> \# of </span> Clusters</h2>
+message.number.hosts=<h2><span> \# of </span> Hosts</h2>
+message.number.pods=<h2><span> \# of </span> Pods</h2>
+message.number.storage=<h2><span> \# of </span> Primary Storage Volumes</h2>
+message.number.zones=<h2><span> \# of </span> Zones</h2>
+message.pending.projects.1=You have pending project invitations\:
message.pending.projects.2=To view, please go to the projects section, then select invitations from the drop-down.
message.please.add.at.lease.one.traffic.range=Please add at least one traffic range.
message.please.proceed=Please proceed to the next step.
@@ -1456,7 +1451,7 @@ message.select.security.groups=Please select security group(s) for your new VM
message.select.template=Please select a template for your new virtual instance.
message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
message.setup.physical.network.during.zone.creation=When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.
-message.setup.successful=Cloud setup successful!
+message.setup.successful=Cloud setup successful\!
message.snapshot.schedule=You can setup recurring snapshot schedules by selecting from the available options below and applying your policy preference
message.specify.url=Please specify URL
message.step.1.continue=Please select a template or ISO to continue
@@ -1467,7 +1462,7 @@ message.step.3.continue=Please select a disk offering to continue
message.step.3.desc=
message.step.4.continue=Please select at least one network to continue
message.step.4.desc=Please select the primary network that your virtual instance will be connected to.
-message.storage.traffic=Traffic between CloudStack's internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
+message.storage.traffic=Traffic between CloudStack\\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
message.suspend.project=Are you sure you want to suspend this project?
message.template.desc=OS image that can be used to boot VMs
message.tooltip.dns.1=Name of a DNS server for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
@@ -1481,7 +1476,7 @@ message.tooltip.reserved.system.netmask=The network prefix that defines the pod
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 to be updated to each console proxy virtual instance:
+message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance\:
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.
@@ -1492,9 +1487,9 @@ message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation
message.Zone.creation.complete=Zone creation complete
message.zone.no.network.selection=The zone you selected does not have any choices for network selection.
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.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?
mode=Mode
network.rate=Network Rate
notification.reboot.instance=Reboot instance
@@ -1512,14 +1507,14 @@ state.Creating=Creating
state.Declined=Declined
state.Destroyed=Destroyed
state.Disabled=Disabled
-state.enabled=Enabled
state.Enabled=Enabled
+state.enabled=Enabled
state.Error=Error
state.Expunging=Expunging
state.Migrating=Migrating
state.Pending=Pending
-state.ready=Ready
state.Ready=Ready
+state.ready=Ready
state.Running=Running
state.Starting=Starting
state.Stopped=Stopped
[37/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Add more detail in a warning message. useful when we add a new L10N language at first time
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53d69d34
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53d69d34
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53d69d34
Branch: refs/heads/internallb
Commit: 53d69d34ca20d7d824f8a4cc9ac66228926f80ce
Parents: 8e5186d
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 13:53:25 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 13:53:25 2013 +0100
----------------------------------------------------------------------
tools/transifex/sync-transifex-ui.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53d69d34/tools/transifex/sync-transifex-ui.sh
----------------------------------------------------------------------
diff --git a/tools/transifex/sync-transifex-ui.sh b/tools/transifex/sync-transifex-ui.sh
index daba88d..ed10809 100755
--- a/tools/transifex/sync-transifex-ui.sh
+++ b/tools/transifex/sync-transifex-ui.sh
@@ -67,7 +67,9 @@ doDownloadL10NLangs()
sed -i"" "s/\\\\\\\'/'/g" ${WORKDIR}/messages_${CODELANG}.properties
tx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties
else
- echo "Warning: the resource file for language ${CODELANG} doesn't exist."
+ echo "\nWarning: the resource file for language ${CODELANG} doesn't exist."
+ echo "Run this command to force get this language from transifex:"
+ echo "\ntx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties\n"
fi
done
[06/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-1567 ui and api changes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93ef3ad5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93ef3ad5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93ef3ad5
Branch: refs/heads/internallb
Commit: 93ef3ad55050657768703f22c0215427e09f544c
Parents: 318c7f2
Author: Radhika PC <ra...@citrix.com>
Authored: Fri Apr 26 16:31:49 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Fri Apr 26 16:32:21 2013 +0530
----------------------------------------------------------------------
docs/en-US/added-API-commands-4.2.xml | 24 ++++++++++++++++++++++++
docs/en-US/delete-event-alerts.xml | 12 ++++++++++++
docs/en-US/events.xml | 2 +-
docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 55568 bytes
4 files changed, 37 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/added-API-commands-4.2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-API-commands-4.2.xml b/docs/en-US/added-API-commands-4.2.xml
index 4bec148..3471624 100644
--- a/docs/en-US/added-API-commands-4.2.xml
+++ b/docs/en-US/added-API-commands-4.2.xml
@@ -39,5 +39,29 @@
<para>The response parameters are: id, ipaddress, secondaryips, gateway, netmask, macaddr,
broadcasturi, isolationuri, isdefault,</para>
</listitem>
+ <listitem>
+ <para>deleteAlerts </para>
+ <para>Deletes the specified alerts. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false </para>
+ </listitem>
+ <listitem>
+ <para>archiveAlerts</para>
+ <para>Archives the specified alerts. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false </para>
+ </listitem>
+ <listitem>
+ <para>deleteEvents </para>
+ <para>Deletes the specified events. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false</para>
+ </listitem>
+ <listitem>
+ <para>archiveEvents</para>
+ <para>Archives the specified events. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false </para>
+ </listitem>
</itemizedlist>
</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/delete-event-alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-event-alerts.xml b/docs/en-US/delete-event-alerts.xml
index 3eebcb7..ef39040 100644
--- a/docs/en-US/delete-event-alerts.xml
+++ b/docs/en-US/delete-event-alerts.xml
@@ -28,6 +28,18 @@
or by using the Details page. If you want to delete multiple alerts or events at the same time,
you can use the respective context menu. You can delete alerts or events by category for a time
period.</para>
+ <para>In order to support the delete or archive alerts, the following global parameters have been
+ added:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">alert.purge.delay</emphasis>: The alerts older than specified
+ number of days are purged. Set the value to 0 to never purge alerts automatically.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">alert.purge.interval</emphasis>: The interval in seconds to wait
+ before running the alert purge thread. The default is 86400 seconds (one day).</para>
+ </listitem>
+ </itemizedlist>
<note>
<para>Archived alerts or events cannot be viewed in the UI, or by using the API. They are
maintained in the database for auditing or compliance purposes.</para>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/events.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/events.xml b/docs/en-US/events.xml
index 4a14458..3b93ee0 100644
--- a/docs/en-US/events.xml
+++ b/docs/en-US/events.xml
@@ -25,7 +25,7 @@
physical resources associated with a cloud environment. Events are used by monitoring systems,
usage and billing systems, or any other event-driven workflow systems to discern a pattern and
make the right business decision. In &PRODUCT; an event could be a state change of virtual or
- psychical resources, an action performed by an user (action events), or policy based events
+ physical resources, an action performed by an user (action events), or policy based events
(alerts).</para>
<xi:include href="events-log.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="event-framework.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/images/eip-ns-basiczone.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/eip-ns-basiczone.png b/docs/en-US/images/eip-ns-basiczone.png
new file mode 100644
index 0000000..315ff55
Binary files /dev/null and b/docs/en-US/images/eip-ns-basiczone.png differ
[07/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Please, please, pretty please try to stay away from the exec plugin whereever possible. It ussually ends up being non portable across developer operating systems. Most commands like cp have a perfectly usable equivalent in ant like the copy task.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1adec812
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1adec812
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1adec812
Branch: refs/heads/internallb
Commit: 1adec812fad2fd58559d5b2e37b8b35d121486ce
Parents: 93ef3ad
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Apr 26 13:56:07 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Apr 26 14:00:01 2013 +0200
----------------------------------------------------------------------
client/pom.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1adec812/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 743cd36..a7c7009 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -450,16 +450,15 @@
</goals>
<configuration>
<target if="${nonoss}">
- <echo>test</echo>
<replaceregexp
file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
match="classpath:componentContext.xml"
replace="classpath:nonossComponentContext.xml" byline="true" />
- <exec executable="cp">
- <arg value="-r" />
- <arg value="${basedir}/../plugins/network-elements/cisco-vnmc/scripts" />
- <arg value="${basedir}/target/generated-webapp/WEB-INF/classes/" />
- </exec>
+ <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
+ <fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
+ <include name="**/*" />
+ </fileset>
+ </copy>
</target>
</configuration>
</execution>
[32/50] [abbrv] [TRANSLATION] Adding arabic strings
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/134704bb/client/WEB-INF/classes/resources/messages_ar.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ar.properties b/client/WEB-INF/classes/resources/messages_ar.properties
new file mode 100644
index 0000000..b4b1974
--- /dev/null
+++ b/client/WEB-INF/classes/resources/messages_ar.properties
@@ -0,0 +1,1547 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+#new labels (begin) **********************************************************************************************
+label.egress.rules=\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u062e\u0631\u0648\u062c
+message.acquire.new.ip.vpc=\u064a\u0631\u062c\u0649 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0628\u0648\u0631\u062a\u0648\u0643\u0648\u0644 \u0625\u0646\u062a\u0631\u0646\u062a \u062c\u062f\u064a\u062f \u0644\u0647\u0630\u0627 \u0627\u0644\u062d\u0627\u0633\u0648\u0628 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a.
+label.zoneWizard.trafficType.management=\u0625\u062f\u0627\u0631\u0629\\\: \u0627\u0644\u062d\u0631\u0643\u0629 \u0628\u064a\u0646 \u0627\u0644\u0645\u0648\u0627\u0631\u062f \u0627\u0644\u062f\u0627\u062e\u0644\u064a\u0629 \u0644 \u0643\u0644\u0627\u0648\u062f \u0633\u062a\u0627\u0643 \u060c \u0645\u062a\u0636\u0645\u0646\u0629 \u0623\u064a \u062c\u0632\u0621 \u064a\u062a\u0635\u0644 \u0628\u062e\u0627\u062f\u0645\\\u0633\u064a\u0631\u0641\u0631 \u0627\u0644\u0625\u062f\u0627\u0631\u0629 \u060c \u0645\u062b\u0644 \u0627\u0644\u0645\u0636\u064a\u0641\u0627\u062a \u0648 \u0623\u0646\u0638\u0645\u0629 \u0643\u0644\u0627\u0648\u062f \u0633\u062a\u0627\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629.
+label.zoneWizard.trafficType.public=\u0627\u0644\u0639\u0627\u0645\u0629 \\\: \u0627\u0644\u0645\u0631\u0648\u0631 \u0628\u064a\u0646 \u0627\u0644\u0625\u0646\u062a\u0631\u0646\u062a \u0648\u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u064a\u0629 \u0641\u064a \u0627\u0644\u0633\u062d\u0627\u0628\u0629.
+label.zoneWizard.trafficType.guest=\u0627\u0644\u0636\u064a\u0641 \\\: \u0627\u0644\u062d\u0631\u0643\u0629 \u0628\u064a\u0646 \u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0646\u0647\u0627\u0626\u064a.
+label.zoneWizard.trafficType.storage=\u0627\u0644\u062a\u062e\u0632\u064a\u0646 \\\: \u0627\u0644\u0645\u0631\u0648\u0631 \u0628\u064a\u0646 \u0645\u0644\u0642\u0645\u0627\u062a \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0627\u0628\u062a\u062f\u0627\u0626\u064a\u0629 \u0648\u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629\u060c \u0645\u062b\u0644 \u0642\u0648\u0627\u0644\u0628 VM \u0648\u0627\u0644\u0644\u0642\u0637\u0627\u062a
+label.quickview=\u0646\u0638\u0631\u0629 \u0633\u0631\u064a\u0639\u0629
+label.migrate.to.host=\u0627\u0644\u062a\u062d\u0648\u0644 \u0625\u0644\u0649 \u0627\u0644\u0645\u0636\u064a\u0641
+label.migrate.to.storage=\u0627\u0644\u062a\u062d\u0648\u0644 \u0625\u0644\u0649 \u0627\u0644\u062a\u062e\u0632\u064a\u0646
+label.stop=\u062a\u0648\u0642\u0641
+label.reboot=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644
+label.destroy=\u0647\u062f\u0645
+label.restore=\u0625\u0633\u062a\u0639\u0627\u062f\u0629
+label.isolation.uri=\u0639\u0632\u0644 \u0627\u0644\u0631\u0627\u0628\u0637
+label.broadcast.uri=\u0628\u062b \u0627\u0644\u0631\u0627\u0628\u0637
+label.enable.s3=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u0648\u064a S3
+confirm.enable.s3=\u0641\u0636\u0644\u0627 \u0642\u0645 \u0628\u062a\u0639\u0628\u0626\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u0642\u0627\u062f\u0645\u0629 \u0644\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 S3 \u0644\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629.
+message.after.enable.s3=\u062a\u0645 \u0625\u0639\u062f\u0627\u062f \u0627\u0644\u062a\u062e\u0632\u064a\u0646 S3 \u0644\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629. \u062a\u0646\u0648\u064a\u0647 \: \u0639\u0646\u062f \u0645\u063a\u0627\u062f\u0631\u062a\u0643 \u0644\u0647\u0630\u0647 \u0627\u0644\u0635\u0641\u062d\u0629 \u0644\u0646 \u064a\u0643\u0648\u0646 \u0628\u0625\u0645\u0643\u0627\u0646\u0643 \u0625\u0639\u0627\u062f\u0629 \u0636\u0628\u0637 S3 \u0645\u0631\u0629 \u0623\u062e\u0631\u0649.
+label.s3.access_key=\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u0648\u0635\u0648\u0644
+label.s3.secret_key=\u0627\u0644\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u0633\u0631\u064a
+label.s3.bucket=\u062f\u0644\u0648
+label.s3.endpoint=\u0646\u0642\u0637\u0629 \u0627\u0644\u0646\u0647\u0627\u064a\u0629
+label.s3.use_https=\u0627\u0633\u062a\u062e\u062f\u0645 HTTPS
+label.s3.connection_timeout=\u0645\u0647\u0644\u0629 \u0627\u0644\u0627\u062a\u0635\u0627\u0644
+label.s3.max_error_retry=\u0623\u0642\u0635\u0649 \u062e\u0637\u0623 \u0641\u064a \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629
+label.s3.socket_timeout=\u0645\u0647\u0644\u0629 \u0627\u0644\u0645\u0642\u0628\u0633
+#new labels (end) ************************************************************************************************
+
+
+#modified labels (begin) *****************************************************************************************
+label.site.to.site.VPN=\u0645\u0648\u0642\u0639 \u0625\u0644\u0649 \u0645\u0648\u0642\u0639-\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u064a\u0629 VPN
+message.zoneWizard.enable.local.storage=\u062a\u062d\u0630\u064a\u0631\\\: \u0625\u0630\u0627 \u0642\u0645\u062a \u0628\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0645\u062d\u0644\u064a\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0637\u0627\u0642 \u064a\u062c\u0628 \u0639\u0644\u064a\u0643 \u0639\u0645\u0644 \u0627\u0644\u0622\u062a\u064a \u060c \u0625\u0639\u062a\u0645\u0627\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0645\u0643\u0627\u0646 \u0627\u0644\u0630\u064a \u062a\u0631\u063a\u0628 \u0623\u0646 \u064a\u0646\u0637\u0644\u0642 \u0645\u0646\u0647 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \\\: </br><br/> \n1.\u0625\u0630\u0627 \u0643\u0627\u0646 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u064a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0625\u0628\u062
a\u062f\u0627\u0626\u064a\u0629
+#modified labels (end) *******************************************************************************************
+
+label.configure.network.ACLs=\u0636\u0628\u0637 \u0634\u0628\u0643\u0629 ACLs
+label.network.ACLs=\u0634\u0628\u0643\u0629 ACLs
+label.add.network.ACL=\u0625\u0636\u0627\u0641\u0629 \u0634\u0628\u0643\u0629 ACL
+label.private.Gateway=\u0645\u0646\u0641\u0630\\Gateway \u062e\u0627\u0635
+label.VPC.router.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u062c\u0647\u0627\u0632 \u0627\u0644\u062a\u0648\u062c\u064a\u0647 VPC
+label.VMs.in.tier=\u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0641\u064a \u0637\u0628\u0642\u0629
+label.local.storage.enabled=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0645\u062d\u0644\u064a
+label.tier.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0637\u0628\u0642\u0629
+label.edit.tags=\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0639\u0644\u0627\u0645\u0627\u062a
+label.action.enable.physical.network=\u062a\u0645\u0643\u064a\u0646 \u0634\u0628\u0643\u0629 \u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
+label.action.disable.physical.network=\u062a\u0639\u0637\u064a\u0644 \u0634\u0628\u0643\u0629 \u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
+message.action.enable.physical.network=\u0641\u0636\u0644\u0627 \u060c \u0623\u0643\u0651\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062a\u0645\u0643\u064a\u0646 \u0647\u0630\u0647 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
+message.action.disable.physical.network=\u0641\u0636\u0644\u0627 \u060c \u0623\u0643\u0651\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0647 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
+
+label.select.tier=\u062d\u062f\u062f \u0637\u0628\u0642\u0629
+label.add.ACL=\u0625\u0636\u0627\u0641\u0629 ACL
+label.remove.ACL=\u0625\u0632\u0627\u0644\u0629 ACL
+label.tier=\u0637\u0628\u0642\u0629
+label.network.ACL=\u0634\u0628\u0643\u0629 ACL
+label.network.ACL.total=\u0625\u062c\u0645\u0627\u0644 \u0634\u0628\u0643\u0629 ACL
+label.add.new.gateway=\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u062c\u062f\u064a\u062f\u0629
+message.add.new.gateway.to.vpc=\u0641\u0636\u0644\u0627 \u062d\u062f\u062f \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0644\u0625\u0636\u0627\u0641\u0629 \u0628\u0648\u0627\u0628\u0629 gateway \u0644\u0647\u0630\u0647 \u0627\u0644\u0633\u062d\u0627\u0628\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u062e\u0627\u0635\u0629 VPC
+label.delete.gateway=\u0627\u062d\u0630\u0641 \u0627\u0644\u0628\u0648\u0627\u0628\u0629
+message.delete.gateway=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u0628\u0648\u0627\u0628\u0629
+label.CIDR.of.destination.network=CIDR \u0627\u0644\u062e\u0627\u0635 \u0628\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0648\u062c\u0647\u0629.
+label.add.route=\u0625\u0636\u0627\u0641\u0629 \u0645\u0633\u0627\u0631
+label.add.static.route=\u0625\u0636\u0627\u0641\u0629 \u062a\u0648\u062c\u064a\u0647 \u062b\u0627\u0628\u062a
+label.remove.static.route=\u0625\u0632\u0627\u0644\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647 \u062b\u0627\u0628\u062a
+label.add.VPN.gateway=\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+# message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
+label.VPN.gateway=\u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.delete.VPN.gateway=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+message.delete.VPN.gateway=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.VPN.connection=\u0625\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.IPsec.preshared.key=\u0645\u0641\u062a\u0627\u062d \u0623\u0645\u0646 \u0628\u0631\u0648\u062a\u0648\u0643\u0648\u0644 \u0627\u0644\u0625\u0646\u062a\u0631\u0646\u062a \u062a\u0645\u062a \u0645\u0634\u0627\u0631\u0643\u062a\u0647 \u0645\u0633\u0628\u0642\u0627
+label.IKE.policy=\u0633\u064a\u0627\u0633\u0629 IKE
+label.ESP.policy=\u0633\u064a\u0627\u0633\u0629 ESP
+label.create.VPN.connection=\u0625\u0646\u0634\u0627\u0621 \u0627\u062a\u0635\u0627\u0644 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.VPN.customer.gateway=\u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0644\u0644\u0639\u0645\u064a\u0644
+label.CIDR.list=\u0642\u0627\u0626\u0645\u0629 CIDR
+label.IKE.lifetime=\u0639\u0645\u0631 IKE (\u062b\u0627\u0646\u064a\u0629)
+label.ESP.lifetime=\u0639\u0645\u0631 ESP (\u062b\u0627\u0646\u064a\u0629)
+label.dead.peer.detection=\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f
+label.reset.VPN.connection=\u0625\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0627\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+message.reset.VPN.connection=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0625\u0639\u0627\u062f\u0629-\u0636\u0628\u0637 \u0625\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 VPN
+label.delete.VPN.connection=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+# message.delete.VPN.connection=Please confirm that you want to delete VPN connection
+label.add.new.tier=\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629 \u062c\u062f\u064a\u062f\u0629
+label.add.VM.to.tier=\u0625\u0636\u0627\u0641\u0629 \u062c\u0647\u0627\u0632 \u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0641\u064a \u0637\u0628\u0642\u0629
+label.remove.tier=\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629
+
+label.local.storage.enabled=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0645\u062d\u0644\u064a
+label.associated.network=\u0634\u0628\u0643\u0629 \u0645\u0631\u062a\u0628\u0637\u0629
+label.add.port.forwarding.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629 \u0645\u0646\u0641\u0630 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647
+label.dns=\u0646\u0638\u0627\u0645 \u062a\u0633\u0645\u064a\u0629 \u0627\u0644\u0645\u062c\u0627\u0644 DNS
+
+label.vpc=\u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629 VPC
+label.vpc.id=\u0647\u0648\u064a\u0629 \u062e\u0627\u0635\u0629 \u0628\u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629
+label.tier=\u0637\u0628\u0642\u0629
+label.add.vpc=\u0625\u0636\u0627\u0641\u0629 \u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629
+label.super.cidr.for.guest.networks=CIDR \u0645\u0645\u062a\u0627\u0632 \u0644\u0634\u0628\u0643\u0627\u062a \u0627\u0644\u0636\u064a\u0641.
+# label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
+# label.configure.vpc=Configure VPC
+# label.edit.vpc=Edit VPC
+# label.restart.vpc=restart VPC
+# message.restart.vpc=Please confirm that you want to restart the VPC
+# label.remove.vpc=remove VPC
+# message.remove.vpc=Please confirm that you want to remove the VPC
+# label.vpn.customer.gateway=VPN Customer Gateway
+# label.add.vpn.customer.gateway=Add VPN Customer Gateway
+# label.IKE.encryption=IKE Encryption
+# label.IKE.hash=IKE Hash
+# label.IKE.DH=IKE DH
+# label.ESP.encryption=ESP Encryption
+# label.ESP.hash=ESP Hash
+# label.perfect.forward.secrecy=Perfect Forward Secrecy
+label.IKE.lifetime=\u0639\u0645\u0631 IKE (\u062b\u0627\u0646\u064a\u0629)
+label.ESP.lifetime=\u0639\u0645\u0631 ESP (\u062b\u0627\u0646\u064a\u0629)
+label.dead.peer.detection=\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f
+label.delete.VPN.customer.gateway=\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 VPN \u0627\u0644\u0645\u062e\u0635\u0635\u0629
+# message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway
+
+# label.network.domain.text=Network domain
+label.memory.mb=\u0627\u0644\u0630\u0627\u0643\u0631\u0629 ( \u0628\u0627\u0644\u0645\u064a\u062c\u0627\u0628\u0627\u064a\u0628\u062a)
+label.cpu.mhz=\u0648\u062d\u062f\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062c\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064a\u0629 (\u0628\u0627\u0644\u0645\u064a\u063a\u0627\u0647\u064a\u0631\u062a\u0632)
+
+# message.action.remove.host=Please confirm that you want to remove this host.
+
+# message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
+# message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
+# message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network.
+
+
+# label.ipaddress=IP Address
+# label.vcdcname=vCenter DC name
+# label.vcipaddress=vCenter IP Address
+# label.vsmctrlvlanid=Control VLAN ID
+# label.vsmpktvlanid=Packet VLAN ID
+# label.vsmstoragevlanid=Storage VLAN ID
+# label.nexusVswitch=Nexus 1000v
+# label.action.delete.nexusVswitch=Delete Nexus 1000v
+# label.action.enable.nexusVswitch=Enable Nexus 1000v
+# label.action.disable.nexusVswitch=Disable Nexus 1000v
+# label.action.list.nexusVswitch=List Nexus 1000v
+# message.action.delete.nexusVswitch=Please confirm that you want to delete this nexus 1000v
+# message.action.enable.nexusVswitch=Please confirm that you want to enable this nexus 1000v
+# message.action.disable.nexusVswitch=Please confirm that you want to disable this nexus 1000v
+# message.specify.url=Please specify URL
+# label.select.instance.to.attach.volume.to=Select instance to attach volume to
+label.upload=\u0631\u0641\u0639
+# label.upload.volume=Upload volume
+# label.virtual.routers=Virtual Routers
+# label.primary.storage.count=Primary Storage Pools
+# label.secondary.storage.count=Secondary Storage Pools
+# label.number.of.system.vms=Number of System VMs
+# label.number.of.virtual.routers=Number of Virtual Routers
+# label.action.register.iso=Register ISO
+# label.isolation.method=Isolation method
+# label.action.register.template=Register template
+# label.checksum=MD5 checksum
+# label.vpn=VPN
+# label.vlan=VLAN
+
+
+# label.management.ips=Management IP Addresses
+label.devices=\u0627\u0644\u0623\u062c\u0647\u0632\u0629
+# label.rules=Rules
+# label.traffic.label=Traffic label
+# label.vm.state=VM state
+# message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
+# label.domain.router=Domain router
+# label.console.proxy=Console proxy
+# label.secondary.storage.vm=Secondary storage VM
+# label.add.netScaler.device=Add Netscaler device
+# label.add.F5.device=Add F5 device
+# label.add.SRX.device=Add SRX device
+# label.account.and.security.group=Account, Security group
+# label.fetch.latest=Fetch latest
+# label.system.offering=System Offering
+# 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.
+
+
+# label.isolated.networks=Isolated networks
+# label.latest.events=Latest events
+# state.Enabled=Enabled
+# label.system.wide.capacity=System-wide capacity
+# label.network.service.providers=Network Service Providers
+# message.launch.zone=Zone is ready to launch; please proceed to the next step.
+# error.unable.to.reach.management.server=Unable to reach Management Server
+# label.internal.name=Internal name
+# message.configure.all.traffic.types=You have multiple physical networks; please configure labels for each traffic type by clicking on the Edit button.
+# message.edit.traffic.type=Please specify the traffic label you want associated with this traffic type.
+# label.edit.traffic.type=Edit traffic type
+# label.label=Label
+# label.max.networks=Max. networks
+# error.invalid.username.password=Invalid username or password
+# message.enabling.security.group.provider=Enabling Security Group provider
+# message.adding.Netscaler.provider=Adding Netscaler provider
+# message.creating.guest.network=Creating guest network
+# label.action.delete.physical.network=Delete physical network
+# message.action.delete.physical.network=Please confirm that you want to delete this physical network
+# message.installWizard.copy.whatIsAHost=A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack&\\\#8482; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.
+
+
+# label.add.compute.offering=Add compute offering
+# label.compute.offering=Compute offering
+# label.compute.offerings=Compute offerings
+# label.select.offering=Select offering
+# label.menu.infrastructure=Infrastructure
+label.sticky.tablesize=\u062d\u062c\u0645 \u0627\u0644\u062c\u062f\u0648\u0644
+# label.sticky.expire=Expires
+# label.sticky.cookie-name=Cookie name
+# label.sticky.mode=Mode
+# label.sticky.length=Length
+# label.sticky.holdtime=Hold time
+# label.sticky.request-learn=Request learn
+# label.sticky.prefix=Prefix
+# label.sticky.nocache=No cache
+# label.sticky.indirect=Indirect
+# label.sticky.postonly=Post only
+# label.sticky.domain=Domain
+# state.Allocating=Allocating
+# state.Migrating=Migrating
+# error.please.specify.physical.network.tags=Network offerings is not available until you specify tags for this physical network.
+
+
+# state.Stopping=Stopping
+# message.add.load.balancer.under.ip=The load balancer rule has been added under IP\\\:
+# message.select.instance=Please select an instance.
+# label.select=Select
+# label.select.vm.for.static.nat=Select VM for static NAT
+# label.select.instance=Select instance
+# label.nat.port.range=NAT Port Range
+# label.static.nat.vm.details=Static NAT VM Details
+# label.edit.lb.rule=Edit LB rule
+# message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
+# label.migrate.instance.to.host=Migrate instance to another host
+# message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
+# label.migrate.instance.to.ps=Migrate instance to another primary storage
+# label.corrections.saved=Corrections saved
+# message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following\\\:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>
+# message.installWizard.copy.whatIsPrimaryStorage=A CloudStack&\\\#8482; cloud infrastructure makes use of two types of storage\\\: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts.
+# message.installWizard.copy.whatIsACluster=A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack&\\\#8482; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack&\\\#8482; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.
+# message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack&\\\#8482; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.
+# message.installWizard.copy.whatIsAZone=A zone is the largest organizational unit within a CloudStack&\\\#8482; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).
+# message.installWizard.copy.whatIsCloudStack=CloudStack&\\\#8482 is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack&\\\#8482 manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack&\\\#8482 to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack&\\\#8482 provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features.
+# message.installWizard.tooltip.addSecondaryStorage.path=The exported path, located on the server you specified above
+# message.installWizard.tooltip.addSecondaryStorage.nfsServer=The IP address of the NFS server hosting the secondary storage
+# message.installWizard.tooltip.addPrimaryStorage.path=(for NFS) In NFS this is the exported path from the server. Path (for SharedMountPoint). With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".
+# message.installWizard.tooltip.addPrimaryStorage.server=(for NFS, iSCSI, or PreSetup) The IP address or DNS name of the storage device.
+# message.installWizard.tooltip.addPrimaryStorage.name=The name for the storage device.
+# message.installWizard.tooltip.addHost.password=This is the password for the user named above (from your XenServer install).
+# message.installWizard.tooltip.addHost.username=Usually root.
+# message.installWizard.tooltip.addHost.hostname=The DNS name or IP address of the host.
+# message.installWizard.tooltip.addCluster.name=A name for the cluster. This can be text of your choosing and is not used by CloudStack.
+# message.installWizard.tooltip.addPod.reservedSystemEndIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
+# message.installWizard.tooltip.addPod.reservedSystemStartIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
+# message.installWizard.tooltip.addPod.reservedSystemNetmask=The netmask in use on the subnet the guests will use.
+# message.installWizard.tooltip.addPod.reservedSystemGateway=The gateway for the hosts in that pod.
+# message.installWizard.tooltip.addPod.name=A name for the pod
+# message.installWizard.tooltip.configureGuestTraffic.guestEndIp=The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
+# message.installWizard.tooltip.configureGuestTraffic.guestStartIp=The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
+# message.installWizard.tooltip.configureGuestTraffic.guestNetmask=The netmask in use on the subnet that the guests should use
+# message.installWizard.tooltip.configureGuestTraffic.guestGateway=The gateway that the guests should use
+# message.installWizard.tooltip.configureGuestTraffic.description=A description for your network
+# message.installWizard.tooltip.configureGuestTraffic.name=A name for your network
+# message.installWizard.tooltip.addZone.internaldns2=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
+# message.installWizard.tooltip.addZone.internaldns1=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
+# message.installWizard.tooltip.addZone.dns2=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
+# message.installWizard.tooltip.addZone.name=A name for the zone
+# message.installWizard.tooltip.addZone.dns1=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
+# message.setup.successful=Cloud setup successful\\\!
+# label.may.continue=You may now continue.
+# error.installWizard.message=Something went wrong; you may go back and correct any errors
+# message.installWizard.now.building=Now building your cloud...
+# message.installWizard.click.retry=Click the button to retry launch.
+# label.launch=Launch
+# label.installWizard.click.launch=Click the launch button.
+# label.congratulations=Congratulations\\\!
+# label.installWizard.addSecondaryStorageIntro.subtitle=What is secondary storage?
+# label.installWizard.addSecondaryStorageIntro.title=Let’s add secondary storage
+# label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage?
+# label.installWizard.addPrimaryStorageIntro.title=Let’s add primary storage
+# label.installWizard.addHostIntro.subtitle=What is a host?
+# label.installWizard.addHostIntro.title=Let’s add a host
+# label.installWizard.addClusterIntro.subtitle=What is a cluster?
+# label.installWizard.addClusterIntro.title=Let’s add a cluster
+# label.installWizard.addPodIntro.subtitle=What is a pod?
+# label.installWizard.addPodIntro.title=Let’s add a pod
+# label.installWizard.addZone.title=Add zone
+# label.installWizard.addZoneIntro.subtitle=What is a zone?
+# label.installWizard.addZoneIntro.title=Let’s add a zone
+# error.password.not.match=The password fields do not match
+# label.confirm.password=Confirm password
+# message.change.password=Please change your password.
+# label.save.and.continue=Save and continue
+# label.skip.guide=I have used CloudStack before, skip this guide
+# label.continue.basic.install=Continue with basic installation
+# label.introduction.to.cloudstack=Introduction to CloudStack&\\\#8482
+# label.what.is.cloudstack=What is CloudStack&\\\#8482?
+# label.hints=Hints
+# label.installWizard.subtitle=This tour will aid you in setting up your CloudStack&\\\#8482 installation
+# label.continue=Continue
+# label.installWizard.title=Hello and Welcome to CloudStack&\\\#8482
+# label.agree=Agree
+# label.manage.resources=Manage Resources
+# label.port.forwarding.policies=Port forwarding policies
+# label.load.balancing.policies=Load balancing policies
+# label.networking.and.security=Networking and security
+# label.bandwidth=Bandwidth
+# label.virtual.machines=Virtual machines
+# label.compute.and.storage=Compute and Storage
+# label.task.completed=Task completed
+# label.update.project.resources=Update project resources
+# label.remove.project.account=Remove project account
+# label.item.listing=Item listing
+# message.select.item=Please select an item.
+# label.removing=Removing
+# label.invite=Invite
+# label.add.by=Add by
+# label.max.vms=Max. user VMs
+# label.max.public.ips=Max. public IPs
+# label.max.volumes=Max. volumes
+# label.max.snapshots=Max. snapshots
+# label.max.templates=Max. templates
+# label.max.vpcs=Max. VPCs
+# label.project.dashboard=Project dashboard
+label.remind.later=\u0630\u0643\u0631\u0646\u064a \u0644\u0627\u062d\u0642\u0627\u064b
+label.invited.accounts=\u062f\u0639\u0648\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
+label.invite.to=\u062f\u0639\u0648\u0629 \u0644\u0640
+label.add.accounts.to=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a \u0625\u0644\u0649
+label.add.accounts=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
+label.project.name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+label.create.project=\u0623\u0646\u0634\u0626 \u0645\u0634\u0631\u0648\u0639
+label.networks=\u0627\u0644\u0634\u0628\u0643\u0627\u062a
+# label.launch.vm=Launch VM
+# label.new.vm=New VM
+label.previous=\u0627\u0644\u0633\u0627\u0628\u0642
+label.add.to.group=\u0625\u0636\u0627\u0641\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629
+message.vm.review.launch=\u064a\u0631\u062c\u0649 \u0645\u0631\u0627\u062c\u0639\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0648\u062a\u0623\u0643\u062f \u0623\u0646 \u0645\u062b\u0627\u0644\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0635\u062d\u064a\u062d \u0642\u0628\u0644 \u0627\u0644\u0625\u0646\u0637\u0644\u0627\u0642
+# message.select.security.groups=Please select security group(s) for your new VM
+label.new=\u062c\u062f\u064a\u062f
+message.please.select.networks=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u0634\u0628\u0643\u0627\u062a \u0644\u062c\u0647\u0627\u0632\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
+# message.please.proceed=Please proceed to the next step.
+# message.zone.no.network.selection=The zone you selected does not have any choices for network selection.
+label.no.thanks=\u0644\u0627\u061b \u0634\u0643\u0631\u0627\u064b
+label.my.templates=\u0642\u0648\u0627\u0644\u0628\u064a
+message.select.template=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0642\u0627\u0644\u0628 \u0644\u0645\u062b\u0627\u0644\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0627\u0644\u062c\u062f\u064a\u062f
+# message.select.iso=Please select an ISO for your new virtual instance.
+# message.template.desc=OS image that can be used to boot VMs
+# message.iso.desc=Disc image containing data or bootable media for OS
+# label.select.iso.or.template=Select ISO or template
+# message.select.a.zone=A zone typically corresponds to a single datacenter. Multiple zones help make the cloud more reliable by providing physical isolation and redundancy.
+# label.select.a.zone=Select a zone
+label.review=\u0645\u0631\u0627\u062c\u0639\u0629
+label.select.a.template=\u0627\u062e\u062a\u0631 \u0642\u0627\u0644\u0628
+label.setup=\u0627\u0644\u062a\u062b\u0628\u064a\u062a
+state.Allocated=\u062a\u062e\u0635\u064a\u0635
+changed.item.properties=\u062a\u063a\u064a\u0631 \u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0639\u0646\u0635\u0631
+label.apply=\u062a\u0637\u0628\u064a\u0642
+label.default=\u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
+label.viewing=\u0639\u0631\u0636
+label.move.to.top=\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0623\u0639\u0644\u0649
+label.move.up.row=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0639\u0644\u0649 \u0628\u0635\u0641 \u0648\u0627\u062d\u062f
+label.move.down.row=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0633\u0641\u0644 \u0628\u0635\u0641 \u0648\u0627\u062d\u062f
+label.move.to.bottom=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0633\u0641\u0644
+label.drag.new.position=\u0627\u0633\u062d\u0628 \u0644\u0645\u0648\u0642\u0641 \u062c\u062f\u064a\u062f
+label.order=\u062a\u0631\u062a\u064a\u0628
+label.no.data=\u0644\u0627 \u064a\u0648\u062c\u062f \u0628\u064a\u0627\u0646\u0627\u062a \u0644\u0644\u0639\u0631\u0636
+label.change.value=\u062a\u063a\u064a\u0631 \u0627\u0644\u0642\u064a\u0645\u0629
+label.clear.list=\u0645\u0633\u062d \u0627\u0644\u0642\u0627\u0626\u0645\u0629
+label.full.path=\u0645\u0633\u0627\u0631 \u0643\u0627\u0645\u0644
+message.add.domain=\u064a\u0631\u062c\u0649 \u062a\u062d\u062f\u064a\u062f \u0627\u0644\u0645\u062c\u0627\u0644 \u0627\u0644\u0641\u0631\u0639\u064a \u0627\u0644\u0630\u064a \u062a\u0631\u064a\u062f \u0625\u0646\u0634\u0627\u0621 \u062a\u062d\u062a \u0647\u0630\u0627 \u0627\u0644\u0646\u0637\u0627\u0642
+message.delete.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062d\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
+message.enable.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062a\u0641\u0639\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
+message.disable.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
+message.generate.keys=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u0625\u0646\u0634\u0627\u0621 \u0645\u0641\u0627\u062a\u064a\u062d \u062c\u062f\u064a\u062f\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
+message.update.resource.count=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062a\u062d\u062f\u064a\u062b \u0645\u0635\u0627\u062f\u0631 \u0627\u0644\u062d\u0633\u0627\u0628\u0627\u062a \u0644\u0647\u0630\u0627 \u0627\u0644\u062d\u0633\u0627\u0628
+# message.edit.account=Edit ("-1" indicates no limit to the amount of resources create)
+# label.total.of.vm=Total of VM
+# label.total.of.ip=Total of IP Address
+state.enabled=\u062a\u0645\u0643\u064a\u0646
+# message.action.download.iso=Please confirm that you want to download this ISO.
+# message.action.download.template=Please confirm that you want to download this template.
+# label.destination.zone=Destination Zone
+label.keyboard.type=\u0646\u0648\u0639 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0641\u0627\u062a\u064a\u062d
+# label.nic.adapter.type=NIC adapter type
+# label.root.disk.controller=Root disk controller
+# label.community=Community
+# label.remove.egress.rule=Remove egress rule
+# label.add.egress.rule=Add egress rule
+# label.egress.rule=Egress rule
+# label.remove.ingress.rule=Remove ingress rule
+# label.delete.vpn.user=Delete VPN user
+# label.add.vpn.user=Add VPN user
+# label.remove.pf=Remove port forwarding rule
+# label.remove.vm.from.lb=Remove VM from load balancer rule
+# label.add.vms.to.lb=Add VM(s) to load balancer rule
+# label.add.vm=Add VM
+# label.remove.static.nat.rule=Remove static NAT rule
+# label.remove.rule=Remove rule
+# label.add.static.nat.rule=Add static NAT rule
+label.add.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629
+label.configuration=\u0627\u0644\u062a\u0643\u0648\u064a\u0646
+# message.disable.vpn=Are you sure you want to disable VPN?
+# label.disable.vpn=Disable VPN
+# message.enable.vpn=Please confirm that you want VPN access enabled for this IP address.
+# label.enable.vpn=Enable VPN
+# message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
+label.elastic=\u0645\u0631\u0646
+label.my.network=\u0634\u0628\u0643\u062a\u064a
+# label.add.vms=Add VMs
+label.configure=\u0642\u0645 \u0628\u062a\u0643\u0648\u064a\u0646
+# label.stickiness=Stickiness
+label.source=\u0645\u0635\u062f\u0631
+label.least.connections=\u0623\u0642\u0644 \u0627\u0644\u0625\u062a\u0635\u0627\u0644\u0627\u062a
+# label.round.robin=Round-robin
+label.restart.required=\u0645\u0637\u0644\u0648\u0628 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0634\u063a\u064a\u0644
+label.clean.up=\u062a\u0646\u0638\u064a\u0641
+label.restart.network=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
+label.edit.network.details=\u062a\u062d\u0631\u064a\u0631 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
+# label.add.guest.network=Add guest network
+# label.guest.networks=Guest networks
+# message.ip.address.changed=Your IP addresses may have changed; would you like to refresh the listing? Note that in this case the details pane will close.
+# state.BackingUp=Backing Up
+# state.BackedUp=Backed Up
+# label.done=Done
+# label.vm.name=VM name
+# message.migrate.volume=Please confirm that you want to migrate volume to another primary storage.
+# label.migrate.volume=Migrate volume to another primary storage
+# message.create.template=Are you sure you want to create template?
+# label.create.template=Create template
+# message.download.volume.confirm=Please confirm that you want to download this volume
+message.detach.disk=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0641\u0635\u0644 \u0647\u0630\u0627 \u0627\u0644\u0642\u0631\u0635\u061f
+state.ready=\u062c\u0627\u0647\u0632
+state.Ready=\u062c\u0627\u0647\u0632
+# label.vm.display.name=VM display name
+label.select-view=\u062d\u062f\u062f \u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636
+# label.local.storage=Local Storage
+label.direct.ips=\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0634\u062a\u0631\u0643\u0629 IPs
+label.view.all=\u0639\u0631\u0636 \u0627\u0644\u0643\u0644
+label.zone.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
+# message.alert.state.detected=Alert state detected
+# state.Starting=Starting
+state.Expunging=\u0645\u062d\u0648
+state.Creating=\u0625\u0646\u0634\u0627\u0621
+message.decline.invitation=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0631\u0641\u0636 \u0647\u0630\u0647 \u0627\u0644\u062f\u0639\u0648\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639\u061f
+label.decline.invitation=\u0631\u0641\u0636 \u0627\u0644\u062f\u0639\u0648\u0629
+message.confirm.join.project=\u0646\u0631\u062c\u0648 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629 \u0641\u064a \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+message.join.project=\u0644\u0642\u062f \u0627\u0646\u0636\u0645\u0645\u062a \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639. \u064a\u0631\u062c\u0649 \u0627\u0644\u062a\u0628\u062f\u064a\u0644 \u0625\u0644\u0649 \u0637\u0631\u064a\u0642\u0629 \u0639\u0631\u0636 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0644\u0631\u0624\u064a\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+label.accept.project.invitation=\u0642\u0628\u0648\u0644 \u062f\u0639\u0648\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+# label.token=Token
+# label.project.id=Project ID
+# message.enter.token=Please enter the token that you were given in your invite e-mail.
+# label.enter.token=Enter token
+state.Accepted=\u062a\u0645 \u0627\u0644\u0642\u0628\u0648\u0644
+state.Pending=\u0641\u064a \u0627\u0644\u0627\u0646\u062a\u0638\u0627\u0631
+state.Completed=\u062a\u0645 \u0627\u0644\u0627\u0643\u0645\u0627\u0644
+state.Declined=\u062a\u0645 \u0627\u0644\u0631\u0641\u0636
+label.project=\u0645\u0634\u0631\u0648\u0639
+label.invitations=\u062f\u0639\u0648\u0627\u062a
+label.delete.project=\u062d\u0630\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+message.delete.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u061f
+message.activate.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062a\u0641\u0639\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u061f
+label.activate.project=\u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+label.suspend.project=\u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+message.suspend.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0625\u064a\u0642\u0627\u0641 \u0647\u0630\u0627 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u061f
+state.Suspended=\u062a\u0645 \u0627\u0644\u0625\u064a\u0642\u0627\u0641
+label.edit.project.details=\u0627\u0636\u0627\u0641\u0629 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+label.new.project=\u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f
+state.Active=\u0646\u0634\u0637
+# state.Disabled=Disabled
+label.projects=\u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639
+label.make.project.owner=\u062c\u0639\u0644 \u0627\u0644\u062d\u0633\u0627\u0628 \u0645\u0627\u0644\u0643 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
+# label.remove.project.account=Remove project account
+message.project.invite.sent=\u062a\u0645 \u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u062f\u0639\u0648\u0629 ; \u0633\u064a\u062a\u0645 \u0625\u0636\u0627\u0641\u062a\u0647\u0645 \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0645\u062c\u0631\u062f \u0642\u0628\u0648\u0644 \u0627\u0644\u062f\u0639\u0648\u0629
+label.add.account.to.project=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
+label.revoke.project.invite=\u0625\u0644\u063a\u0627\u0621 \u0627\u0644\u062f\u0639\u0648\u0629
+label.project.invite=\u062f\u0639\u0648\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+label.select.project=\u062d\u062f\u062f \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+message.no.projects=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0645\u0634\u0627\u0631\u064a\u0639. <br/> \u064a\u0631\u062c\u0649 \u0625\u0646\u0634\u0627\u0621 \u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f \u0645\u0646 \u0642\u0633\u0645 \u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639.
+message.no.projects.adminOnly=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0645\u0634\u0627\u0631\u064a\u0639. <br/> \u0627\u0644\u0631\u062c\u0627\u0621 \u0637\u0644\u0628 \u0645\u0646 \u0627\u0644\u0645\u0633\u0624\u0648\u0644 \u0625\u0646\u0634\u0627\u0621 \u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f.
+message.pending.projects.1=\u0644\u062f\u064a\u0643 \u062f\u0639\u0648\u0627\u062a \u0645\u0634\u0631\u0648\u0639 \u0645\u0639\u0644\u0642\u0629/\:
+message.pending.projects.2=\u0644\u0639\u0631\u0636\u060c \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u0630\u0647\u0627\u0628 \u0625\u0644\u0649 \u0642\u0633\u0645 \u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639\u060c \u062b\u0645 \u062d\u062f\u062f \u062f\u0639\u0648\u0627\u062a \u0645\u0646 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0646\u0633\u062f\u0644\u0629.
+message.instanceWizard.noTemplates=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0642\u0648\u0627\u0644\u0628 \u0645\u062a\u0627\u062d\u0629\u061b \u064a\u0631\u062c\u0649 \u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0644\u0628 \u0645\u062a\u0648\u0627\u0641\u0642\u060c \u0648\u0625\u0639\u0627\u062f\u0629 \u0625\u0637\u0644\u0627\u0642 \u0627\u0644\u0645\u0639\u0627\u0644\u062c .
+label.view=\u0639\u0631\u0636
+instances.actions.reboot.label=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+label.filterBy=\u062a\u0635\u0641\u064a\u0629 \u062d\u0633\u0628
+label.ok=\u0645\u0648\u0627\u0641\u0642
+notification.reboot.instance=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+notification.start.instance=\u0628\u062f\u0621 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+notification.stop.instance=\u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+label.display.name=\u0639\u0631\u0636 \u0627\u0644\u0627\u0633\u0645
+label.zone.name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
+ui.listView.filters.all=\u0627\u0644\u0643\u0644
+# ui.listView.filters.mine=Mine
+# state.Running=Running
+state.Stopped=\u062a\u0648\u0642\u0641
+state.Destroyed=\u062f\u0645\u0631
+state.Error=\u062e\u0637\u0623
+message.reset.password.warning.notPasswordEnabled=\u0627\u0644\u0642\u0627\u0644\u0628 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u062a\u0645 \u0627\u0646\u0634\u0627\u0626\u0647 \u0645\u0646 \u062f\u0648\u0646 \u0643\u0644\u0645\u0629 \u0645\u0631\u0648\u0631 \u0645\u0645\u0643\u0646\u0629
+message.reset.password.warning.notStopped=\u064a\u062c\u0628 \u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u062e\u0627\u0635 \u0628\u0643 \u0642\u0628\u0644 \u0645\u062d\u0627\u0648\u0644\u0629 \u062a\u063a\u064a\u064a\u0631 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 \u0627\u0644\u062d\u0627\u0644\u064a\u0629
+label.notifications=\u0627\u0644\u062a\u0646\u0628\u064a\u0647\u0627\u062a
+label.default.view=\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629
+label.project.view=\u0639\u0631\u0636 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+
+message.add.system.service.offering=\u0627\u0644\u0631\u062c\u0627\u0621 \u062a\u0639\u0628\u0626\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0644\u0625\u0636\u0627\u0641\u0629 \u0646\u0638\u0627\u0645 \u062c\u062f\u064a\u062f \u0644\u0637\u0631\u062d
+message.action.delete.system.service.offering=\u0627\u0644\u0631\u062c\u0627\u0621 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u062e\u062f\u0645\u0629 \u0627\u0644\u0646\u0638\u0627\u0645 \u0627\u0644\u0645\u0642\u062f\u0645\u0629.
+label.action.delete.system.service.offering=\u062d\u0630\u0641 \u0646\u0638\u0627\u0645 \u062a\u0642\u062f\u064a\u0645 \u0627\u0644\u062e\u062f\u0645\u0629
+# label.hypervisor.capabilities=Hypervisor capabilities
+# label.hypervisor.version=Hypervisor version
+label.max.guest.limit=\u0627\u0644\u062d\u062f \u0627\u0644\u0623\u0642\u0635\u0627\u0621 \u0644\u0636\u064a\u0641
+# label.add.network.offering=Add network offering
+label.supported.services=\t\u0627\u0644\u062e\u062f\u0645\u0627\u062a \u0627\u0644\u0645\u062f\u0639\u0648\u0645\u0629
+label.service.capabilities=\u0642\u062f\u0631\u0627\u062a \u0627\u0644\u062e\u062f\u0645\u0629
+label.guest.type=\u0646\u0648\u0639 \u0627\u0644\u0636\u064a\u0641
+label.specify.IP.ranges=\u062a\u062d\u062f\u064a\u062f \u0646\u0637\u0627\u0642\u0627\u062a IP
+# label.conserve.mode=Conserve mode
+# label.created.by.system=Created by system
+# label.menu.system.service.offerings=System Offerings
+# label.add.system.service.offering=Add System Service Offering
+# label.redundant.router.capability=Redundant router capability
+# label.supported.source.NAT.type=Supported Source NAT type
+# label.elastic.LB=Elastic LB
+# label.LB.isolation=LB isolation
+# label.elastic.IP=Elastic IP
+# label.network.label.display.for.blank.value=Use default gateway
+# label.xen.traffic.label=XenServer traffic label
+# label.kvm.traffic.label=KVM traffic label
+# label.vmware.traffic.label=VMware traffic label
+# label.start.IP=Start IP
+# label.end.IP=End IP
+# label.remove.ip.range=Remove IP range
+# label.ip.ranges=IP Ranges
+# label.start.vlan=Start Vlan
+# label.end.vlan=End Vlan
+# label.broadcast.domain.range=Broadcast domain range
+# label.compute=Compute
+# message.add.guest.network=Please confirm that you would like to add a guest network
+# label.subdomain.access=Subdomain Access
+# label.guest.start.ip=Guest start IP
+# label.guest.end.ip=Guest end IP
+# label.virtual.router=Virtual Router
+# label.physical.network.ID=Physical network ID
+# label.destination.physical.network.id=Destination physical network ID
+# label.dhcp=DHCP
+# label.destroy.router=Destroy router
+# message.confirm.destroy.router=Please confirm that you would like to destroy this router
+# label.change.service.offering=Change service offering
+# label.view.console=View console
+# label.redundant.state=Redundant state
+# label.enable.provider=Enable provider
+# message.confirm.enable.provider=Please confirm that you would like to enable this provider
+# label.disable.provider=Disable provider
+# message.confirm.disable.provider=Please confirm that you would like to disable this provider
+# label.shutdown.provider=Shutdown provider
+# message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
+# label.netScaler=NetScaler
+# label.add.new.NetScaler=Add new NetScaler
+# label.capacity=Capacity
+# label.dedicated=Dedicated
+# label.f5=F5
+# label.add.new.F5=Add new F5
+# label.srx=SRX
+# label.providers=Providers
+# label.add.new.SRX=Add new SRX
+# label.timeout=Timeout
+# label.public.network=Public network
+# label.private.network=Private network
+# label.enable.swift=Enable Swift
+# confirm.enable.swift=Please fill in the following information to enable support for Swift
+# message.after.enable.swift=Swift configured. Note\\\: When you leave this page, you will not be able to re-configure Swift again.
+# label.key=Key
+# label.delete.NetScaler=Delete NetScaler
+# message.confirm.delete.NetScaler=Please confirm that you would like to delete NetScaler
+# label.delete.F5=Delete F5
+# message.confirm.delete.F5=Please confirm that you would like to delete F5
+# label.delete.SRX=Delete SRX
+# message.confirm.delete.SRX=Please confirm that you would like to delete SRX
+# label.pods=Pods
+# label.pod.name=Pod name
+# label.reserved.system.gateway=Reserved system gateway
+# label.reserved.system.netmask=Reserved system netmask
+# label.start.reserved.system.IP=Start Reserved system IP
+# label.end.reserved.system.IP=End Reserved system IP
+# label.clusters=Clusters
+# label.cluster.name=Cluster Name
+# label.host.MAC=Host MAC
+# label.agent.username=Agent Username
+# label.agent.password=Agent Password
+# message.confirm.action.force.reconnect=Please confirm that you want to force reconnect this host.
+# label.resource.state=Resource state
+# label.LUN.number=LUN \\\#
+# message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
+# message.tooltip.zone.name=A name for the zone.
+# message.tooltip.dns.1=Name of a DNS server for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
+# message.tooltip.dns.2=A second DNS server name for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
+# message.tooltip.internal.dns.1=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
+# message.tooltip.internal.dns.2=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
+# message.tooltip.network.domain=A DNS suffix that will create a custom domain name for the network that is accessed by guest VMs.
+# message.tooltip.pod.name=A name for this pod.
+# message.tooltip.reserved.system.gateway=The gateway for the hosts in the pod.
+# message.tooltip.reserved.system.netmask=The network prefix that defines the pod subnet. Uses CIDR notation.
+# message.creating.zone=Creating zone
+# message.creating.physical.networks=Creating physical networks
+# message.configuring.physical.networks=Configuring physical networks
+# message.adding.Netscaler.device=Adding Netscaler device
+# message.creating.pod=Creating pod
+# message.configuring.public.traffic=Configuring public traffic
+# message.configuring.storage.traffic=Configuring storage traffic
+# message.configuring.guest.traffic=Configuring guest traffic
+# message.creating.cluster=Creating cluster
+# message.adding.host=Adding host
+# message.creating.primary.storage=Creating primary storage
+# message.creating.secondary.storage=Creating secondary storage
+# message.Zone.creation.complete=Zone creation complete
+# message.enabling.zone=Enabling zone
+# error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following
+# error.could.not.enable.zone=Could not enable zone
+# message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone?
+# message.please.add.at.lease.one.traffic.range=Please add at least one traffic range.
+# message.you.must.have.at.least.one.physical.network=You must have at least one physical network
+# message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing
+
+# label.zone.type=Zone Type
+# label.setup.zone=Setup Zone
+# label.setup.network=Setup Network
+# label.add.resources=Add Resources
+# label.launch=Launch
+# label.set.up.zone.type=Set up zone type
+# message.please.select.a.configuration.for.your.zone=Please select a configuration for your zone.
+# message.desc.basic.zone=Provide a single network where each VM instance is assigned an IP directly from the network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).
+# label.basic=Basic
+# message.desc.advanced.zone=For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks and providing custom network offerings such as firewall, VPN, or load balancer support.
+# label.advanced=Advanced
+# message.desc.zone=A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.
+# label.physical.network=Physical Network
+# label.public.traffic=Public traffic
+# label.guest.traffic=Guest Traffic
+# label.storage.traffic=Storage Traffic
+# message.setup.physical.network.during.zone.creation=When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.
+# label.add.physical.network=Add physical network
+# label.traffic.types=Traffic Types
+# label.management=Management
+# label.guest=Guest
+# label.please.specify.netscaler.info=Please specify Netscaler info
+# message.public.traffic.in.advanced.zone=Public traffic is generated when VMs in the cloud access the internet. Publicly-accessible IPs must be allocated for this purpose. End users can use the CloudStack UI to acquire these IPs to implement NAT between their guest network and their public network.<br/><br/>Provide at least one range of IP addresses for internet traffic.
+# message.public.traffic.in.basic.zone=Public traffic is generated when VMs in the cloud access the Internet or provide services to clients over the Internet. Publicly accessible IPs must be allocated for this purpose. When a instance is created, an IP from this set of Public IPs will be allocated to the instance in addition to the guest IP address. Static 1-1 NAT will be set up automatically between the public IP and the guest IP. End users can also use the CloudStack UI to acquire additional IPs to implement static NAT between their instances and the public IP.
+# message.add.pod.during.zone.creation=Each zone must contain in one or more pods, and we will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack's internal management traffic. The reserved IP range must be unique for each zone in the cloud.
+# message.guest.traffic.in.advanced.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.
+# message.guest.traffic.in.basic.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.
+# message.storage.traffic=Traffic between CloudStack's internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
+# message.desc.cluster=Each pod must contain one or more clusters, and we will add the first cluster now. A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Each cluster consists of one or more hosts and one or more primary storage servers.
+# message.desc.host=Each cluster must contain at least one host (computer) for guest VMs to run on, and we will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
+# message.desc.primary.storage=Each cluster must contain one or more primary storage servers, and we will add the first one now. Primary storage contains the disk volumes for all the VMs running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.
+# message.desc.secondary.storage=Each zone must have at least one NFS or secondary storage server, and we will add the first one now. Secondary storage stores VM templates, ISO images, and VM disk volume snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.
+# label.launch.zone=Launch zone
+# message.please.wait.while.zone.is.being.created=Please wait while your zone is being created; this may take a while...
+
+# label.load.balancing=Load Balancing
+# label.static.nat.enabled=Static NAT Enabled
+# label.zones=Zones
+# label.view.more=View more
+# label.number.of.zones=Number of Zones
+# label.number.of.pods=Number of Pods
+# label.number.of.clusters=Number of Clusters
+# label.number.of.hosts=Number of Hosts
+# label.total.hosts=Total Hosts
+# label.total.CPU=Total CPU
+# label.total.memory=Total Memory
+# label.total.storage=Total Storage
+# label.purpose=Purpose
+
+
+
+
+# label.action.migrate.router=Migrate Router
+# label.action.migrate.router.processing=Migrating Router....
+# message.migrate.router.confirm=Please confirm the host you wish to migrate the router to\\\:
+# label.migrate.router.to=Migrate Router to
+
+# label.action.migrate.systemvm=Migrate System VM
+# label.action.migrate.systemvm.processing=Migrating System VM....
+# message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to\\\:
+# label.migrate.systemvm.to=Migrate System VM to
+
+
+# mode=Mode
+# side.by.side=Side by Side
+# inline=Inline
+
+# extractable=Extractable
+
+# label.ocfs2=OCFS2
+
+# label.action.edit.host=Edit Host
+
+# network.rate=Network Rate
+
+# ICMP.type=ICMP Type
+# ICMP.code=ICMP Code
+
+# image.directory=Image Directory
+
+# label.action.create.template.from.vm=Create Template from VM
+# label.action.create.template.from.volume=Create Template from Volume
+
+# message.vm.create.template.confirm=Create Template will reboot the VM automatically.
+
+# label.action.manage.cluster=Manage Cluster
+# message.action.manage.cluster=Please confirm that you want to manage the cluster.
+# label.action.manage.cluster.processing=Managing Cluster....
+
+# label.action.unmanage.cluster=Unmanage Cluster
+# message.action.unmanage.cluster=Please confirm that you want to unmanage the cluster.
+# label.action.unmanage.cluster.processing=Unmanaging Cluster....
+
+# label.allocation.state=Allocation State
+# managed.state=Managed State
+
+# label.default.use=Default Use
+# label.host.tags=Host Tags
+
+# label.cidr=CIDR
+# label.cidr.list=Source CIDR
+
+# label.storage.tags=Storage Tags
+
+# label.redundant.router=Redundant Router
+# label.is.redundant.router=Redundant
+
+# force.delete=Force Delete
+# force.delete.domain.warning=Warning\\\: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
+
+# force.remove=Force Remove
+# 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.
+
+# force.stop=Force Stop
+# force.stop.instance.warning=Warning\\\: Forcing a stop on this instance should be your last option. It can lead to data loss as well as inconsistent behavior of the virtual machine state.
+
+# label.PreSetup=PreSetup
+# label.SR.name = SR Name-Label
+# label.SharedMountPoint=SharedMountPoint
+# label.clvm=CLVM
+# label.volgroup=Volume Group
+# label.VMFS.datastore=VMFS datastore
+
+# label.network.device=Network Device
+# label.add.network.device=Add Network Device
+# label.network.device.type=Network Device Type
+# label.DHCP.server.type=DHCP Server Type
+# label.Pxe.server.type=Pxe Server Type
+# label.PING.storage.IP=PING storage IP
+# label.PING.dir=PING Directory
+# label.TFTP.dir=TFTP Directory
+# label.PING.CIFS.username=PING CIFS username
+# label.PING.CIFS.password=PING CIFS password
+# label.CPU.cap=CPU Cap
+
+
+# label.action.enable.zone=Enable Zone
+# label.action.enable.zone.processing=Enabling Zone....
+# message.action.enable.zone=Please confirm that you want to enable this zone.
+# label.action.disable.zone=Disable Zone
+# label.action.disable.zone.processing=Disabling Zone....
+# message.action.disable.zone=Please confirm that you want to disable this zone.
+
+# label.action.enable.pod=Enable Pod
+# label.action.enable.pod.processing=Enabling Pod....
+# message.action.enable.pod=Please confirm that you want to enable this pod.
+# label.action.disable.pod=Disable Pod
+# label.action.disable.pod.processing=Disabling Pod....
+# message.action.disable.pod=Please confirm that you want to disable this pod.
+
+# label.action.enable.cluster=Enable Cluster
+# label.action.enable.cluster.processing=Enabling Cluster....
+# message.action.enable.cluster=Please confirm that you want to enable this cluster.
+# label.action.disable.cluster=Disable Cluster
+# label.action.disable.cluster.processing=Disabling Cluster....
+# message.action.disable.cluster=Please confirm that you want to disable this cluster.
+
+# label.account.id=Account ID
+# label.account.name=Account Name
+# label.account.specific=Account-Specific
+# label.account=Account
+# label.accounts=Accounts
+# label.acquire.new.ip=Acquire New IP
+# label.show.ingress.rule=Show Ingress Rule
+# label.hide.ingress.rule=Hide Ingress Rule
+# label.action.attach.disk.processing=Attaching Disk....
+# label.action.attach.disk=Attach Disk
+# label.action.attach.iso.processing=Attaching ISO....
+# label.action.attach.iso=Attach ISO
+# label.action.cancel.maintenance.mode.processing=Cancelling Maintenance Mode....
+# label.action.cancel.maintenance.mode=Cancel Maintenance Mode
+# label.action.change.password=Change Password
+# label.action.change.service.processing=Changing Service....
+# label.action.change.service=Change Service
+# label.action.copy.ISO.processing=Coping ISO....
+# label.action.copy.ISO=Copy ISO
+# label.action.copy.template.processing=Coping Template....
+# label.action.copy.template=Copy Template
+# label.action.create.template.processing=Creating Template....
+# label.action.create.template=Create Template
+# label.action.create.vm.processing=Creating VM....
+# label.action.create.vm=Create VM
+# label.action.create.volume.processing=Creating Volume....
+# label.action.create.volume=Create Volume
+# label.action.delete.IP.range.processing=Deleting IP Range....
+# label.action.delete.IP.range=Delete IP Range
+# label.action.delete.ISO.processing=Deleting ISO....
+# label.action.delete.ISO=Delete ISO
+# label.action.delete.account.processing=Deleting account....
+# label.action.delete.account=Delete account
+# label.action.delete.cluster.processing=Deleting Cluster....
+# label.action.delete.cluster=Delete Cluster
+# label.action.delete.disk.offering.processing=Deleting Disk Offering....
+# label.action.delete.disk.offering=Delete Disk Offering
+
+# label.action.update.resource.count=Update Resource Count
+# label.action.update.resource.count.processing=Updating Resource Count....
+
+# label.action.delete.domain=Delete Domain
+# label.action.delete.domain.processing=Deleting Domain....
+
+# label.action.delete.firewall.processing=Deleting Firewall....
+# label.action.delete.firewall=Delete firewall rule
+# label.action.delete.ingress.rule.processing=Deleting Ingress Rule....
+# label.action.delete.ingress.rule=Delete Ingress Rule
+# label.action.delete.load.balancer.processing=Deleting Load Balancer....
+# label.action.delete.load.balancer=Delete load balancer rule
+# label.action.edit.network.processing=Editing Network....
+# label.action.edit.network=Edit Network
+# label.action.delete.network.processing=Deleting Network....
+# label.action.delete.network=Delete Network
+# label.action.delete.pod.processing=Deleting Pod....
+# label.action.delete.pod=Delete Pod
+# label.action.delete.primary.storage.processing=Deleting Primary Storage....
+# label.action.delete.primary.storage=Delete Primary Storage
+# label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
+# label.action.delete.secondary.storage=Delete Secondary Storage
+# label.action.delete.security.group.processing=Deleting Security Group....
+# label.action.delete.security.group=Delete Security Group
+# label.action.delete.service.offering.processing=Deleting Service Offering....
+# label.action.delete.service.offering=Delete Service Offering
+# label.action.delete.snapshot.processing=Deleting Snapshot....
+# label.action.delete.snapshot=Delete Snapshot
+# label.action.delete.template.processing=Deleting Template....
+# label.action.delete.template=Delete Template
+# label.action.delete.user.processing=Deleting User....
+# label.action.delete.user=Delete User
+# label.action.delete.volume.processing=Deleting Volume....
+# label.action.delete.volume=Delete Volume
+# label.action.delete.zone.processing=Deleting Zone....
+# label.action.delete.zone=Delete Zone
+# label.action.destroy.instance.processing=Destroying Instance....
+# label.action.destroy.instance=Destroy Instance
+# label.action.destroy.systemvm.processing=Destroying System VM....
+# label.action.destroy.systemvm=Destroy System VM
+# label.action.detach.disk.processing=Detaching Disk....
+# label.action.detach.disk=Detach Disk
+# label.action.detach.iso.processing=Detaching ISO....
+# label.action.detach.iso=Detach ISO
+# label.action.disable.account.processing=Disabling account....
+# label.action.disable.account=Disable account
+# label.action.disable.static.NAT.processing=Disabling Static NAT....
+# label.action.disable.static.NAT=Disable Static NAT
+# label.action.disable.user.processing=Disabling User....
+# label.action.disable.user=Disable User
+# label.action.download.ISO=Download ISO
+# label.action.download.template=Download Template
+# label.action.download.volume.processing=Downloading Volume....
+# label.action.download.volume=Download Volume
+# label.action.edit.ISO=Edit ISO
+# label.action.edit.account=Edit account
+# label.action.edit.disk.offering=Edit Disk Offering
+# label.action.edit.domain=Edit Domain
+# label.action.edit.global.setting=Edit Global Setting
+# label.action.edit.instance=Edit Instance
+# label.action.edit.network.offering=Edit Network Offering
+# label.action.edit.pod=Edit Pod
+# label.action.edit.primary.storage=Edit Primary Storage
+# label.action.edit.resource.limits=Edit Resource Limits
+# label.action.edit.service.offering=Edit Service Offering
+# label.action.edit.template=Edit Template
+# label.action.edit.user=Edit User
+# label.action.edit.zone=Edit Zone
+# label.action.enable.account.processing=Enabling account....
+# label.action.enable.account=Enable account
+# label.action.enable.maintenance.mode.processing=Enabling Maintenance Mode....
+# label.action.enable.maintenance.mode=Enable Maintenance Mode
+# label.action.enable.static.NAT.processing=Enabling Static NAT....
+# label.action.enable.static.NAT=Enable Static NAT
+# label.action.enable.user.processing=Enabling User....
+# label.action.enable.user=Enable User
+# label.action.force.reconnect.processing=Reconnecting....
+# label.action.force.reconnect=Force Reconnect
+# label.action.generate.keys.processing=Generate Keys....
+# label.action.generate.keys=Generate Keys
+# label.action.lock.account.processing=Locking account....
+# label.action.lock.account=Lock account
+# label.action.migrate.instance=Migrate Instance
+# label.action.migrate.instance.processing=Migrating Instance....
+# label.action.reboot.instance.processing=Rebooting Instance....
+# label.action.reboot.instance=Reboot Instance
+# label.action.reboot.router.processing=Rebooting Router....
+# label.action.reboot.router=Reboot Router
+# label.action.reboot.systemvm.processing=Rebooting System VM....
+# label.action.reboot.systemvm=Reboot System VM
+# label.action.recurring.snapshot=Recurring Snapshots
+# label.action.release.ip.processing=Releasing IP....
+# label.action.release.ip=Release IP
+# label.action.remove.host.processing=Removing Host....
+# label.action.remove.host=Remove Host
+# label.action.reset.password.processing=Resetting Password....
+# label.action.reset.password=Reset Password
+# label.action.resource.limits=Resource limits
+# label.action.restore.instance.processing=Restoring Instance....
+# label.action.restore.instance=Restore Instance
+# label.action.start.instance.processing=Starting Instance....
+# label.action.start.instance=Start Instance
+# label.action.start.router.processing=Starting Router....
+# label.action.start.router=Start Router
+# label.action.start.systemvm.processing=Starting System VM....
+# label.action.start.systemvm=Start System VM
+# label.action.stop.instance.processing=Stopping Instance....
+# label.action.stop.instance=Stop Instance
+# label.action.stop.router.processing=Stopping Router....
+# label.action.stop.router=Stop Router
+# label.action.stop.systemvm.processing=Stopping System VM....
+# label.action.stop.systemvm=Stop System VM
+# label.action.take.snapshot.processing=Taking Snapshot....
+# label.action.take.snapshot=Take Snapshot
+# label.action.update.OS.preference.processing=Updating OS Preference....
+# label.action.update.OS.preference=Update OS Preference
+# label.actions=Actions
+# label.active.sessions=Active Sessions
+# label.add.account=Add Account
+# label.add.by.cidr=Add By CIDR
+# label.add.by.group=Add By Group
+# label.add.cluster=Add Cluster
+# label.add.direct.iprange=Add Direct Ip Range
+# label.add.disk.offering=Add Disk Offering
+# label.add.domain=Add Domain
+# label.add.firewall=Add firewall rule
+# label.add.host=Add Host
+# label.add.ingress.rule=Add Ingress Rule
+# label.add.ip.range=Add IP Range
+# label.add.load.balancer=Add Load Balancer
+# label.add.more=Add More
+# label.add.network=Add Network
+# label.add.pod=Add Pod
+# label.add.primary.storage=Add Primary Storage
+# label.add.secondary.storage=Add Secondary Storage
+# label.add.security.group=Add Security Group
+# label.add.service.offering=Add Service Offering
+# label.add.template=Add Template
+# label.add.user=Add User
+# label.add.vlan=Add VLAN
+# label.add.volume=Add Volume
+# label.add.zone=Add Zone
+# label.add=Add
+# label.adding.cluster=Adding Cluster
+# label.adding.failed=Adding Failed
+# label.adding.pod=Adding Pod
+# label.adding.processing=Adding....
+# label.adding.succeeded=Adding Succeeded
+# label.adding.user=Adding User
+# label.adding.zone=Adding Zone
+# label.adding=Adding
+# label.additional.networks=Additional Networks
+# label.admin.accounts=Admin Accounts
+# label.admin=Admin
+# label.advanced.mode=Advanced Mode
+# label.advanced.search=Advance Search
+# label.advanced=Advanced
+# label.alert=Alert
+# label.algorithm=Algorithm
+# label.allocated=Allocated
+# label.api.key=API Key
+# label.assign.to.load.balancer=Assigning instance to load balancer
+# label.assign=Assign
+# label.associated.network.id=Associated Network ID
+# label.attached.iso=Attached ISO
+# label.availability.zone=Availability Zone
+# label.availability=Availability
+# label.available.public.ips=Available Public IP Addresses
+# label.available=Available
+# label.back=Back
+# label.basic.mode=Basic Mode
+# label.bootable=Bootable
+# label.broadcast.domain.type=Broadcast Domain Type
+# label.by.account=By Account
+# label.by.availability=By Availability
+# label.by.domain=By Domain
+# label.by.end.date=By End Date
+# label.by.level=By Level
+# label.by.pod=By Pod
+# label.by.role=By Role
+# label.by.start.date=By Start Date
+# label.by.state=By State
+# label.by.traffic.type=By Traffic Type
+# label.by.type.id=By Type ID
+# label.by.type=By Type
+# label.by.zone=By Zone
+# label.bytes.received=Bytes Received
+# label.bytes.sent=Bytes Sent
+# label.cancel=Cancel
+# label.certificate=Certificate
+# label.privatekey=PKCS\\\#8 Private Key
+# label.domain.suffix=DNS Domain Suffix (i.e., xyz.com)
+# label.character=Character
+# label.cidr.account=CIDR or Account/Security Group
+# label.close=Close
+# label.cloud.console=Cloud Management Console
+# label.cloud.managed=Cloud.com Managed
+# label.cluster.type=Cluster Type
+# label.cluster=Cluster
+# label.code=Code
+# label.confirmation=Confirmation
+# label.cpu.allocated.for.VMs=CPU Allocated for VMs
+# label.cpu.allocated=CPU Allocated
+# label.cpu.utilized=CPU Utilized
+# label.cpu=CPU
+# label.created=Created
+# label.cross.zones=Cross Zones
+# label.custom.disk.size=Custom Disk Size
+# label.daily=Daily
+# label.data.disk.offering=Data Disk Offering
+# label.date=Date
+# label.day.of.month=Day of Month
+# label.day.of.week=Day of Week
+# label.delete=Delete
+# label.deleting.failed=Deleting Failed
+# label.deleting.processing=Deleting....
+# label.description=Description
+# label.detaching.disk=Detaching Disk
+# label.details=Details
+# label.device.id=Device ID
+# label.disabled=Disabled
+# label.disabling.vpn.access=Disabling VPN Access
+# label.disk.allocated=Disk Allocated
+# label.disk.offering=Disk Offering
+# label.disk.size.gb=Disk Size (in GB)
+# label.disk.size=Disk Size
+# label.disk.total=Disk Total
+# label.disk.volume=Disk Volume
+# label.display.text=Display Text
+# label.dns.1=DNS 1
+# label.dns.2=DNS 2
+# label.domain.admin=Domain Admin
+# label.domain.id=Domain ID
+# label.domain.name=Domain Name
+# label.domain=Domain
+# label.double.quotes.are.not.allowed=Double quotes are not allowed
+# label.download.progress=Download Progress
+# label.edit=Edit
+# label.email=Email
+# label.enabling.vpn.access=Enabling VPN Access
+# label.enabling.vpn=Enabling VPN
+# label.end.port=End Port
+# label.endpoint.or.operation=Endpoint or Operation
+# label.error.code=Error Code
+# label.error=Error
+# label.esx.host=ESX/ESXi Host
+# label.example=Example
+# label.failed=Failed
+# label.featured=Featured
+# label.firewall=Firewall
+# label.first.name=First Name
+# label.format=Format
+# label.friday=Friday
+# label.full=Full
+# label.gateway=Gateway
+# label.general.alerts=General Alerts
+# label.generating.url=Generating URL
+# label.go.step.2=Go to Step 2
+# label.go.step.3=Go to Step 3
+# label.go.step.4=Go to Step 4
+# label.go.step.5=Go to Step 5
+# label.group.optional=Group (Optional)
+# label.group=Group
+# label.guest.cidr=Guest CIDR
+# label.guest.gateway=Guest Gateway
+# label.guest.ip.range=Guest IP Range
+# label.guest.ip=Guest IP Address
+# label.guest.netmask=Guest Netmask
+# label.ha.enabled=HA Enabled
+# label.help=Help
+# label.host.alerts=Host Alerts
+# label.host.name=Host Name
+# label.host=Host
+# label.hosts=Hosts
+# label.hourly=Hourly
+# label.hypervisor.type=Hypervisor Type
+# label.hypervisor=Hypervisor
+# label.id=ID
+# label.info=Info
+# label.ingress.rule=Ingress Rule
+# label.initiated.by=Initiated By
+# label.instance.limits=Instance Limits
+# label.instance.name=Instance Name
+# label.instance=Instance
+# label.instances=Instances
+# label.internal.dns.1=Internal DNS 1
+# label.internal.dns.2=Internal DNS 2
+# label.interval.type=Interval Type
+# label.invalid.integer=Invalid Integer
+# label.invalid.number=Invalid Number
+# label.ip.address=IP Address
+# label.ip.allocations=IP Allocations
+# label.ip.limits=Public IP Limits
+# label.ip.or.fqdn=IP or FQDN
+# label.ip.range=IP Range
+# label.ip=IP
+# label.ips=IPs
+# label.is.default=Is Default
+# label.is.shared=Is Shared
+# label.is.system=Is System
+# label.iscsi=iSCSI
+# label.iso.boot=ISO Boot
+# label.iso=ISO
+# label.isolation.mode=Isolation Mode
+# label.keep=Keep
+# label.lang.chinese=Chinese (Simplified)
+# label.lang.english=English
+# label.lang.japanese=Japanese
+# label.lang.spanish=Spanish
+# label.lang.russian=Russian
+# label.lang.french=French
+# label.lang.brportugese=Brazilian Portugese
+# label.last.disconnected=Last Disconnected
+# label.last.name=Last Name
+# label.level=Level
+# label.linklocal.ip=Link Local IP Adddress
+# label.load.balancer=Load Balancer
+# label.loading=Loading
+# label.local=Local
+label.local.storage.enabled=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0645\u062d\u0644\u064a
+# label.login=Login
+# label.logout=Logout
+# label.lun=LUN
+# label.manage=Manage
+# label.maximum=Maximum
+# label.memory.allocated=Memory Allocated
+# label.memory.total=Memory Total
+# label.memory.used=Memory Used
+# label.memory=Memory
+# label.menu.accounts=Accounts
+label.menu.alerts=\u0627\u0644\u062a\u0646\u0628\u064a\u0647\u0627\u062a
+label.menu.all.accounts=\u062c\u0645\u064a\u0639 \u0627\u0644\u062d\u0633\u0627\u0628\u0627\u062a
+label.menu.all.instances=\u062c\u0645\u064a\u0639 \u0627\u0644\u062d\u0627\u0644\u0627\u062a
+label.menu.community.isos=\u0627\u0644\u062a\u0636\u0627\u0645\u0646 \u0627\u0644\u062f\u0648\u0644\u064a \u0627\u0644\u0645\u062c\u062a\u0645\u0639\u064a
+label.menu.community.templates=\u0642\u0648\u0627\u0644\u0628 \u0627\u0644\u0645\u062c\u062a\u0645\u0639
+label.menu.configuration=\u062a\u0631\u062a\u064a\u0628
+label.menu.dashboard=\u0644\u0648\u062d\u0629 \u0627\u0644\u0642\u064a\u0627\u062f\u0629
+label.menu.destroyed.instances=\u062d\u0627\u0644\u0627\u062a \u0627\u0644\u062a\u062f\u0645\u064a\u0631
+label.menu.disk.offerings=\u0639\u0631\u0648\u0636 \u0627\u0644\u0642\u0631\u0635
+label.menu.domains=\u0627\u0644\u0645\u062c\u0627\u0644\u0627\u062a
+label.menu.events=\u0623\u062d\u062f\u0627\u062b
+label.menu.featured.isos=\u0645\u0645\u064a\u0632\u0627\u062a \u0627\u0644\u062a\u0636\u0627\u0645\u0646 \u0627\u0644\u062f\u0648\u0644\u064a
+label.menu.featured.templates=\u0642\u0648\u0627\u0644\u0628 \u0645\u0645\u064a\u0632\u0629
+label.menu.global.settings=\u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0639\u0645\u0648\u0645\u064a\u0629
+label.menu.instances=\u0627\u0644\u062d\u0627\u0644\u0627\u062a
+# label.menu.ipaddresses=IP Addresses
+# label.menu.isos=ISOs
+# label.menu.my.accounts=My Accounts
+# label.menu.my.instances=My Instances
+# label.menu.my.isos=My ISOs
+# label.menu.my.templates=My Templates
+# label.menu.network.offerings=Network Offerings
+# label.menu.network=Network
+# label.menu.physical.resources=Physical Resources
+# label.menu.running.instances=Running Instances
+# label.menu.security.groups=Security Groups
+# label.menu.service.offerings=Service Offerings
+# label.menu.snapshots=Snapshots
+# label.menu.stopped.instances=Stopped Instances
+# label.menu.storage=Storage
+# label.menu.system.vms=System VMs
+# label.menu.system=System
+# label.menu.templates=Templates
+# label.menu.virtual.appliances=Virtual Appliances
+# label.menu.virtual.resources=Virtual Resources
+# label.menu.volumes=Volumes
+# label.migrate.instance.to=Migrate instance to
+# label.minimum=Minimum
+# label.minute.past.hour=minute(s) Past the Hour
+# label.monday=Monday
+# label.monthly=Monthly
+# label.more.templates=More Templates
+# label.my.account=My Account
+# label.name.optional=Name (Optional)
+# label.name=Name
+# label.netmask=Netmask
+# label.network.desc=Network Desc
+# label.network.domain=Network Domain
+# label.network.id=Network ID
+# label.network.name=Network Name
+# label.network.offering.display.text=Network Offering Display Text
+# label.network.offering.id=Network Offering ID
+# label.network.offering.name=Network Offering Name
+# label.network.offering=Network Offering
+# label.network.rate=Network Rate
+# label.network.rate.megabytes=Network Rate (Mb/s)
+# label.network.read=Network Read
+# label.network.type=Network Type
+# label.network.write=Network Write
+# label.network=Network
+# label.new.password=New Password
+# label.next=Next
+# label.nfs.server=NFS Server
+# label.nfs.storage=NFS Storage
+# label.nfs=NFS
+# label.nics=NICs
+# label.no.actions=No Available Actions
+# label.no.alerts=No Recent Alerts
+# label.no.errors=No Recent Errors
+# label.no.isos=No available ISOs
+# label.no.items=No Available Items
+# label.no.security.groups=No Available Security Groups
+label.no.thanks=\u0644\u0627\u061b \u0634\u0643\u0631\u0627\u064b
+# label.no=No
+# label.none=None
+# label.not.found=Not Found
+# label.num.cpu.cores=\\\# of CPU Cores
+# label.numretries=Number of Retries
+# label.offer.ha=Offer HA
+# label.optional=Optional
+# label.os.preference=OS Preference
+# label.os.type=OS Type
+# label.owned.public.ips=Owned Public IP Addresses
+# label.owner.account=Owner Account
+# label.owner.domain=Owner Domain
+# label.parent.domain=Parent Domain
+# label.password.enabled=Password Enabled
+# label.password=Password
+# label.path=Path
+# label.please.wait=Please Wait
+# label.pod=Pod
+# label.port.forwarding=Port Forwarding
+# label.port.range=Port Range
+# label.prev=Prev
+# label.primary.allocated=Primary Storage Allocated
+# label.primary.network=Primary Network
+# label.primary.storage=Primary Storage
+# label.primary.used=Primary Storage Used
+# label.priva
<TRUNCATED>
[29/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2113:System VM scaleUp UI support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bf67c9f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bf67c9f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bf67c9f
Branch: refs/heads/internallb
Commit: 6bf67c9f682740f22952a648d13e294cb97879c1
Parents: b633353
Author: Pranav Saxena <pr...@citrix.com>
Authored: Mon Apr 29 16:21:49 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Mon Apr 29 16:21:49 2013 +0530
----------------------------------------------------------------------
ui/scripts/system.js | 160 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 158 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bf67c9f/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 8c962fc..7aa0566 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5424,6 +5424,83 @@
poll: pollAsyncJobResult
}
},
+
+ scaleUp:{
+ label:'scaleUp System VM',
+ createForm: {
+ title: 'label.change.service.offering',
+ desc: '',
+ fields: {
+ serviceOfferingId: {
+ label: 'label.compute.offering',
+ select: function(args) {
+ var apiCmd = "listServiceOfferings&issystem=true";
+ if(args.context.systemVMs[0].systemvmtype == "secondarystoragevm")
+ apiCmd += "&systemvmtype=secondarystoragevm";
+ else if(args.context.systemVMs[0].systemvmtype == "consoleproxy")
+ apiCmd += "&systemvmtype=consoleproxy";
+ $.ajax({
+ url: createURL(apiCmd),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var serviceofferings = json.listserviceofferingsresponse.serviceoffering;
+ var items = [];
+ $(serviceofferings).each(function() {
+ if(this.id != args.context.systemVMs[0].serviceofferingid) {
+ items.push({id: this.id, description: this.name});
+ }
+ });
+ args.response.success({data: items});
+ }
+ });
+ }
+ }
+ }
+ },
+
+ action: function(args) {
+ $.ajax({
+ url: createURL("scaleVirtualMachine&id=" + args.context.systemVMs[0].id + "&serviceofferingid=" + args.data.serviceOfferingId),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.scalevirtualmachineresponse.jobid;
+ args.response.success(
+ {_custom:
+ {jobId: jid,
+ getUpdatedItem: function(json) {
+ return json.queryasyncjobresultresponse.jobresult.virtualmachine;
+ },
+ getActionFilter: function() {
+ return vmActionfilter;
+ }
+
+ }
+ }
+ );
+ },
+ error:function(json){
+ args.response.error(parseXMLHttpResponse(json));
+ }
+
+ });
+ },
+ messages: {
+ confirm: function(args) {
+ return 'Do you really want to scale up the system VM ?';
+ },
+ notification: function(args) {
+
+ return 'System VM Scaled Up';
+ }
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+
+ },
+
viewConsole: {
label: 'label.view.console',
@@ -6658,6 +6735,83 @@
}
},
+ scaleUp:{
+ label:'scaleUp System VM',
+ createForm: {
+ title: 'label.change.service.offering',
+ desc: '',
+ fields: {
+ serviceOfferingId: {
+ label: 'label.compute.offering',
+ select: function(args) {
+ var apiCmd = "listServiceOfferings&issystem=true";
+ if(args.context.systemVMs[0].systemvmtype == "secondarystoragevm")
+ apiCmd += "&systemvmtype=secondarystoragevm";
+ else if(args.context.systemVMs[0].systemvmtype == "consoleproxy")
+ apiCmd += "&systemvmtype=consoleproxy";
+ $.ajax({
+ url: createURL(apiCmd),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var serviceofferings = json.listserviceofferingsresponse.serviceoffering;
+ var items = [];
+ $(serviceofferings).each(function() {
+ if(this.id != args.context.systemVMs[0].serviceofferingid) {
+ items.push({id: this.id, description: this.name});
+ }
+ });
+ args.response.success({data: items});
+ }
+ });
+ }
+ }
+ }
+ },
+
+ action: function(args) {
+ $.ajax({
+ url: createURL("scaleVirtualMachine&id=" + args.context.systemVMs[0].id + "&serviceofferingid=" + args.data.serviceOfferingId),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.scalevirtualmachineresponse.jobid;
+ args.response.success(
+ {_custom:
+ {jobId: jid,
+ getUpdatedItem: function(json) {
+ return json.queryasyncjobresultresponse.jobresult.virtualmachine;
+ },
+ getActionFilter: function() {
+ return vmActionfilter;
+ }
+ }
+ }
+ );
+ },
+ error:function(json){
+ args.response.error(parseXMLHttpResponse(json));
+ }
+
+ });
+ },
+ messages: {
+ confirm: function(args) {
+ return 'Do you really want to scale up the system VM ?';
+ },
+ notification: function(args) {
+
+ return 'System VM Scaled Up';
+ }
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+
+ },
+
+
+
viewConsole: {
label: 'label.view.console',
action: {
@@ -11687,14 +11841,16 @@
if (jsonObj.state == 'Running') {
allowedActions.push("stop");
allowedActions.push("restart");
- allowedActions.push("remove");
+ allowedActions.push("remove");
+ allowedActions.push("scaleUp");
allowedActions.push("viewConsole");
if (isAdmin())
allowedActions.push("migrate");
}
else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
- allowedActions.push("changeService");
+ allowedActions.push("scaleUp");
+ allowedActions.push("changeService");
allowedActions.push("remove");
}
else if (jsonObj.state == 'Error') {
[38/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-847
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/02e5262a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/02e5262a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/02e5262a
Branch: refs/heads/internallb
Commit: 02e5262a61d96393fcd3e6d9a3ec86db67428712
Parents: 53d69d3
Author: Radhika PC <ra...@citrix.com>
Authored: Mon Apr 29 18:41:38 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Mon Apr 29 18:42:19 2013 +0530
----------------------------------------------------------------------
docs/en-US/guest-ip-ranges.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/02e5262a/docs/en-US/guest-ip-ranges.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/guest-ip-ranges.xml b/docs/en-US/guest-ip-ranges.xml
index 1f8c8a1..b3ebd76 100644
--- a/docs/en-US/guest-ip-ranges.xml
+++ b/docs/en-US/guest-ip-ranges.xml
@@ -21,8 +21,12 @@
specific language governing permissions and limitations
under the License.
-->
-
<section id="guest-ip-ranges">
- <title>Guest IP Ranges</title>
- <para>The IP ranges for guest network traffic are set on a per-account basis by the user. This allows the users to configure their network in a fashion that will enable VPN linking between their guest network and their clients.</para>
+ <title>Guest IP Ranges</title>
+ <para>The IP ranges for guest network traffic are set on a per-account basis by the user. This
+ allows the users to configure their network in a fashion that will enable VPN linking between
+ their guest network and their clients.</para>
+ <para>In shared networks in Basic zone and Security Group-enabled Advanced networks, you will have
+ the flexibility to add multiple guest IP ranges from different subnets. You can add or remove
+ one IP range at a time.</para>
</section>
[21/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Add VPN users automation tests
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/766b36f5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/766b36f5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/766b36f5
Branch: refs/heads/internallb
Commit: 766b36f57ca4dd089a709df42f86b1f23ae91b72
Parents: deaf910
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Sat Apr 27 13:21:36 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Apr 29 14:15:28 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_vpn_users.py | 447 +++++++++++++++++++++
1 files changed, 447 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/766b36f5/test/integration/component/test_vpn_users.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py
new file mode 100644
index 0000000..e18c538
--- /dev/null
+++ b/test/integration/component/test_vpn_users.py
@@ -0,0 +1,447 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+""" P1 tests for VPN users
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.integration.lib.base import (
+ Account,
+ ServiceOffering,
+ VirtualMachine,
+ PublicIPAddress,
+ Vpn,
+ VpnUser,
+ Configurations,
+ NATRule
+ )
+from marvin.integration.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ cleanup_resources,
+ )
+
+
+class Services:
+ """Test VPN users Services
+ """
+
+ def __init__(self):
+ self.services = {
+ "account": {
+ "email": "test@test.com",
+ "firstname": "Test",
+ "lastname": "User",
+ "username": "test",
+ # Random characters are appended for unique
+ # username
+ "password": "password",
+ },
+ "service_offering": {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100, # in MHz
+ "memory": 128, # In MBs
+ },
+ "disk_offering": {
+ "displaytext": "Small Disk Offering",
+ "name": "Small Disk Offering",
+ "disksize": 1
+ },
+ "virtual_machine": {
+ "displayname": "TestVM",
+ "username": "root",
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'KVM',
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+ },
+ "vpn_user": {
+ "username": "test",
+ "password": "test",
+ },
+ "natrule": {
+ "privateport": 1701,
+ "publicport": 1701,
+ "protocol": "UDP"
+ },
+ "ostype": 'CentOS 5.5 (64-bit)',
+ "sleep": 60,
+ "timeout": 10,
+ # Networking mode: Advanced, Basic
+ }
+
+
+class TestVPNUsers(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ cls.api_client = super(TestVPNUsers,
+ cls).getClsTestClient().getApiClient()
+ cls.services = Services().services
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services["mode"] = cls.zone.networktype
+
+ cls.template = get_template(
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
+
+ cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+ cls.service_offering = ServiceOffering.create(
+ cls.api_client,
+ cls.services["service_offering"]
+ )
+
+ cls._cleanup = [cls.service_offering, ]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ # Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.account = Account.create(
+ self.apiclient,
+ self.services["account"],
+ domainid=self.domain.id
+ )
+ self.virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ templateid=self.template.id,
+ accountid=self.account.account.name,
+ domainid=self.account.account.domainid,
+ serviceofferingid=self.service_offering.id
+ )
+ self.public_ip = PublicIPAddress.create(
+ self.apiclient,
+ self.virtual_machine.account,
+ self.virtual_machine.zoneid,
+ self.virtual_machine.domainid,
+ self.services["virtual_machine"]
+ )
+ self.cleanup = [
+ self.account,
+ ]
+ return
+
+ def tearDown(self):
+ try:
+ # Clean up, terminate the created instance, volumes and snapshots
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def create_VPN(self, public_ip):
+ """Creates VPN for the network"""
+
+ self.debug("Creating VPN with public IP: %s" % public_ip.ipaddress.id)
+ try:
+ # Assign VPN to Public IP
+ vpn = Vpn.create(self.apiclient,
+ self.public_ip.ipaddress.id,
+ account=self.account.account.name,
+ domainid=self.account.account.domainid)
+
+ self.debug("Verifying the remote VPN access")
+ vpns = Vpn.list(self.apiclient,
+ publicipid=public_ip.ipaddress.id,
+ listall=True)
+ self.assertEqual(
+ isinstance(vpns, list),
+ True,
+ "List VPNs shall return a valid response"
+ )
+ return vpn
+ except Exception as e:
+ self.fail("Failed to create remote VPN access: %s" % e)
+
+ def create_VPN_Users(self, rand_name=True, api_client=None):
+ """Creates VPN users for the network"""
+
+ self.debug("Creating VPN users for account: %s" %
+ self.account.account.name)
+ if api_client is None:
+ api_client = self.apiclient
+ try:
+ vpnuser = VpnUser.create(
+ api_client,
+ self.services["vpn_user"]["username"],
+ self.services["vpn_user"]["password"],
+ account=self.account.account.name,
+ domainid=self.account.account.domainid,
+ rand_name=rand_name
+ )
+
+ self.debug("Verifying the remote VPN access")
+ vpn_users = VpnUser.list(self.apiclient,
+ id=vpnuser.id,
+ listall=True)
+ self.assertEqual(
+ isinstance(vpn_users, list),
+ True,
+ "List VPNs shall return a valid response"
+ )
+ return vpnuser
+ except Exception as e:
+ self.fail("Failed to create remote VPN users: %s" % e)
+
+ @attr(tags=["advanced", "advancedns"])
+ @attr(configuration='remote.access.vpn.user.limit')
+ def test_01_VPN_user_limit(self):
+ """VPN remote access user limit tests"""
+
+ # Validate the following
+ # prerequisite: change management configuration setting of
+ # remote.access.vpn.user.limit
+ # 1. provision more users than is set in the limit
+ # Provisioning of users after the limit should failProvisioning of
+ # users after the limit should fail
+
+ self.debug("Fetching the limit for remote access VPN users")
+ configs = Configurations.list(
+ self.apiclient,
+ name='remote.access.vpn.user.limit',
+ listall=True)
+ self.assertEqual(isinstance(configs, list),
+ True,
+ "List configs should return a valid response")
+
+ limit = int(configs[0].value)
+
+ self.debug("Enabling the VPN access for IP: %s" %
+ self.public_ip.ipaddress.ipaddress)
+
+ self.create_VPN(self.public_ip)
+ self.debug("Creating %s VPN users" % limit)
+ for x in range(limit):
+ self.create_VPN_Users()
+
+ self.debug("Adding another user exceeding limit for remote VPN users")
+ with self.assertRaises(Exception):
+ self.create_VPN_Users()
+ self.debug("Limit exceeded exception raised!")
+ return
+
+ @attr(tags=["advanced", "advancedns"])
+ def test_02_use_vpn_port(self):
+ """Test create VPN when L2TP port in use"""
+
+ # Validate the following
+ # 1. set a port forward for UDP: 1701 and enable VPN
+ # 2. set port forward rule for the udp port 1701 over which L2TP works
+ # 3. port forward should prevent VPN from being enabled
+
+ self.debug("Creating a port forwarding rule on port 1701")
+ # Create NAT rule
+ nat_rule = NATRule.create(
+ self.apiclient,
+ self.virtual_machine,
+ self.services["natrule"],
+ self.public_ip.ipaddress.id)
+
+ self.debug("Verifying the NAT rule created")
+ nat_rules = NATRule.list(self.apiclient, id=nat_rule.id, listall=True)
+
+ self.assertEqual(isinstance(nat_rules, list),
+ True,
+ "List NAT rules should return a valid response")
+
+ self.debug("Enabling the VPN connection for IP: %s" %
+ self.public_ip.ipaddress.ipaddress)
+ with self.assertRaises(Exception):
+ self.create_VPN(self.public_ip)
+ self.debug("Create VPN connection failed! Test successful!")
+ return
+
+ @attr(tags=["advanced", "advancedns"])
+ def test_03_enable_vpn_use_port(self):
+ """Test create NAT rule when VPN when L2TP enabled"""
+
+ # Validate the following
+ # 1. Enable a VPN connection on source NAT
+ # 2. Add a VPN user
+ # 3. add a port forward rule for UDP port 1701. Should result in error
+ # saying that VPN is enabled over port 1701
+
+ self.debug("Enabling the VPN connection for IP: %s" %
+ self.public_ip.ipaddress.ipaddress)
+ self.create_VPN(self.public_ip)
+
+ self.debug("Creating a port forwarding rule on port 1701")
+ # Create NAT rule
+ with self.assertRaises(Exception):
+ NATRule.create(
+ self.apiclient,
+ self.virtual_machine,
+ self.services["natrule"],
+ self.public_ip.ipaddress.id)
+
+ self.debug("Create NAT rule failed! Test successful!")
+ return
+
+ @attr(tags=["advanced", "advancedns"])
+ def test_04_add_new_users(self):
+ """Test add new users to existing VPN"""
+
+ # Validate the following
+ # 1. Enable a VPN connection on source NAT
+ # 2. Add new user to VPN when there are already existing users.
+ # 3. We should be able to successfully establish a VPN connection using
+ # the newly added user credential.
+
+ self.debug("Enabling the VPN connection for IP: %s" %
+ self.public_ip.ipaddress.ipaddress)
+ self.create_VPN(self.public_ip)
+
+ try:
+ self.debug("Adding new VPN user to account: %s" %
+ self.account.account.name)
+ self.create_VPN_Users()
+
+ # TODO: Verify the VPN connection
+ self.debug("Adding another user to account")
+ self.create_VPN_Users()
+
+ # TODO: Verify the VPN connection with new user
+ except Exception as e:
+ self.fail("Failed to create new VPN user: %s" % e)
+ return
+
+ @attr(tags=["advanced", "advancedns"])
+ def test_05_add_duplicate_user(self):
+ """Test add duplicate user to existing VPN"""
+
+ # Validate the following
+ # 1. Enable a VPN connection on source NAT
+ # 2. Add a VPN user say "abc" that already an added user to the VPN.
+ # 3. Adding this VPN user should fail.
+
+ self.debug("Enabling the VPN connection for IP: %s" %
+ self.public_ip.ipaddress.ipaddress)
+ self.create_VPN(self.public_ip)
+
+ self.debug("Adding new VPN user to account: %s" %
+ self.account.account.name)
+ self.create_VPN_Users(rand_name=False)
+
+ # TODO: Verify the VPN connection
+ self.debug("Adding another user to account with same username")
+ with self.assertRaises(Exception):
+ self.create_VPN_Users(rand_name=False)
+ return
+
+ @attr(tags=["advanced", "advancedns"])
+ def test_06_add_VPN_user_global_admin(self):
+ """Test as global admin, add a new VPN user to an existing VPN entry
+ that was created by another account."""
+
+ # Steps for verification
+ # 1. Create a new user and deploy few Vms.
+ # 2. Enable VPN access. Add few VPN users.
+ # 3. Make sure that VPN access works as expected.
+ # 4. As global Admin , add VPN user to this user's existing VPN entry.
+ # Validate the following
+ # 1. The newly added VPN user should get configured to the router of
+ # user account.
+ # 2. We should be able to use this newly created user credential to
+ # establish VPN connection that will give access all VMs of this user
+
+ self.debug("Enabling VPN connection to account: %s" %
+ self.account.account.name)
+ self.create_VPN(self.public_ip)
+ self.debug("Creating VPN user for the account: %s" %
+ self.account.account.name)
+ self.create_VPN_Users()
+
+ self.debug("Creating a global admin account")
+ admin = Account.create(self.apiclient,
+ self.services["account"],
+ admin=True,
+ domainid=self.account.account.domainid)
+ self.cleanup.append(admin)
+ self.debug("Creating API client for newly created user")
+ api_client = self.testClient.createUserApiClient(
+ UserName=self.account.account.name,
+ DomainName=self.account.account.domain)
+
+ self.debug("Adding new user to VPN as a global admin: %s" %
+ admin.account.name)
+ try:
+ self.create_VPN_Users(api_client=api_client)
+ except Exception as e:
+ self.fail("Global admin should be allowed to create VPN user: %s" %
+ e)
+ return
+
+ @attr(tags=["advanced", "advancedns"])
+ def test_07_add_VPN_user_domain_admin(self):
+ """Test as domain admin, add a new VPN user to an existing VPN entry
+ that was created by another account."""
+
+ # Steps for verification
+ # 1. Create a new user and deploy few Vms.
+ # 2. Enable VPN access. Add few VPN users.
+ # 3. Make sure that VPN access works as expected.
+ # 4. As domain Admin , add VPN user to this user's existing VPN entry.
+ # Validate the following
+ # 1. The newly added VPN user should get configured to the router of
+ # user account.
+ # 2. We should be able to use this newly created user credential to
+ # establish VPN connection that will give access all VMs of this user
+
+ self.debug("Enabling VPN connection to account: %s" %
+ self.account.account.name)
+ self.create_VPN(self.public_ip)
+ self.debug("Creating VPN user for the account: %s" %
+ self.account.account.name)
+ self.create_VPN_Users()
+
+ self.debug("Creating a domain admin account")
+ admin = Account.create(self.apiclient,
+ self.services["account"],
+ domainid=self.account.account.domainid)
+ self.cleanup.append(admin)
+ self.debug("Creating API client for newly created user")
+ api_client = self.testClient.createUserApiClient(
+ UserName=self.account.account.name,
+ DomainName=self.account.account.domain)
+
+ self.debug("Adding new user to VPN as a domain admin: %s" %
+ admin.account.name)
+ try:
+ self.create_VPN_Users(api_client=api_client)
+ except Exception as e:
+ self.fail("Domain admin should be allowed to create VPN user: %s" %
+ e)
+ return
[08/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - API: extend listSnapshots API to to take in zonetype.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7cf312a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7cf312a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7cf312a7
Branch: refs/heads/internallb
Commit: 7cf312a7707040c5f214b0c99c4189cf690c82b1
Parents: 1adec81
Author: Jessica Wang <je...@apache.org>
Authored: Fri Apr 26 11:18:42 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Apr 26 11:19:35 2013 -0700
----------------------------------------------------------------------
.../command/user/snapshot/ListSnapshotsCmd.java | 7 +++
.../storage/snapshot/SnapshotManagerImpl.java | 32 ++++++++++-----
2 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cf312a7/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
index 17f20ae..d7e6bc8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
@@ -58,6 +58,9 @@ public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd {
@Parameter(name=ApiConstants.VOLUME_ID, type=CommandType.UUID, entityType = VolumeResponse.class,
description="the ID of the disk volume")
private Long volumeId;
+
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
@@ -83,6 +86,10 @@ public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd {
return volumeId;
}
+ public String getZoneType() {
+ return zoneType;
+ }
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cf312a7/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 490948b..7dafe4a 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -58,6 +58,7 @@ import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.domain.dao.DomainDao;
@@ -571,6 +572,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
String keyword = cmd.getKeyword();
String snapshotTypeStr = cmd.getSnapshotType();
String intervalTypeStr = cmd.getIntervalType();
+ String zoneType = cmd.getZoneType();
Map<String, String> tags = cmd.getTags();
Account caller = UserContext.current().getCaller();
@@ -602,17 +604,23 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
sb.and("snapshotTypeNEQ", sb.entity().getsnapshotType(), SearchCriteria.Op.NEQ);
if (tags != null && !tags.isEmpty()) {
- SearchBuilder<ResourceTagVO> tagSearch = _resourceTagDao.createSearchBuilder();
- for (int count=0; count < tags.size(); count++) {
- tagSearch.or().op("key" + String.valueOf(count), tagSearch.entity().getKey(), SearchCriteria.Op.EQ);
- tagSearch.and("value" + String.valueOf(count), tagSearch.entity().getValue(), SearchCriteria.Op.EQ);
- tagSearch.cp();
- }
- tagSearch.and("resourceType", tagSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
- sb.groupBy(sb.entity().getId());
- sb.join("tagSearch", tagSearch, sb.entity().getId(), tagSearch.entity().getResourceId(), JoinBuilder.JoinType.INNER);
- }
+ SearchBuilder<ResourceTagVO> tagSearch = _resourceTagDao.createSearchBuilder();
+ for (int count=0; count < tags.size(); count++) {
+ tagSearch.or().op("key" + String.valueOf(count), tagSearch.entity().getKey(), SearchCriteria.Op.EQ);
+ tagSearch.and("value" + String.valueOf(count), tagSearch.entity().getValue(), SearchCriteria.Op.EQ);
+ tagSearch.cp();
+ }
+ tagSearch.and("resourceType", tagSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
+ sb.groupBy(sb.entity().getId());
+ sb.join("tagSearch", tagSearch, sb.entity().getId(), tagSearch.entity().getResourceId(), JoinBuilder.JoinType.INNER);
+ }
+ if(zoneType != null) {
+ SearchBuilder<DataCenterVO> zoneSb = _dcDao.createSearchBuilder();
+ zoneSb.and("zoneNetworkType", zoneSb.entity().getNetworkType(), SearchCriteria.Op.EQ);
+ sb.join("zoneSb", zoneSb, sb.entity().getDataCenterId(), zoneSb.entity().getId(), JoinBuilder.JoinType.INNER);
+ }
+
SearchCriteria<SnapshotVO> sc = sb.create();
_accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
@@ -630,6 +638,10 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
}
}
+ if(zoneType != null) {
+ sc.setJoinParameters("zoneSb", "zoneNetworkType", zoneType);
+ }
+
if (name != null) {
sc.setParameters("name", "%" + name + "%");
}
[12/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - API: extend listTemplates, listIsos API to to take in zonetype.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/45dbd9cd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/45dbd9cd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/45dbd9cd
Branch: refs/heads/internallb
Commit: 45dbd9cdc6d0adc7f69bf1e3fa7b5964ac916fe5
Parents: 1f0863f
Author: Jessica Wang <je...@citrix.com>
Authored: Sat Apr 27 11:02:02 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Sat Apr 27 11:02:02 2013 -0700
----------------------------------------------------------------------
.../api/command/user/iso/ListIsosCmd.java | 7 +++++++
.../command/user/template/ListTemplatesCmd.java | 8 ++++++++
.../src/com/cloud/server/ManagementServerImpl.java | 12 ++++++------
.../src/com/cloud/storage/dao/VMTemplateDao.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 11 +++++++----
5 files changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45dbd9cd/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
index 3219601..f872c12 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
@@ -78,6 +78,9 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
description="the ID of the zone")
private Long zoneId;
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -115,6 +118,10 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
return zoneId;
}
+ public String getZoneType() {
+ return zoneType;
+ }
+
public boolean listInReadyState() {
Account account = UserContext.current().getCaller();
// It is account specific if account is admin type and domainId and accountName are not null
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45dbd9cd/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
index aeb76f5..f0fc241 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
@@ -68,6 +68,10 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class,
description="list templates by zoneId")
private Long zoneId;
+
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -92,6 +96,10 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
return zoneId;
}
+ public String getZoneType() {
+ return zoneType;
+ }
+
public boolean listInReadyState() {
Account account = UserContext.current().getCaller();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45dbd9cd/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 16127a2..0da8d4f 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1309,7 +1309,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
return listTemplates(cmd.getId(), cmd.getIsoName(), cmd.getKeyword(), isoFilter, true, cmd.isBootable(), cmd.getPageSizeVal(),
cmd.getStartIndex(), cmd.getZoneId(), hypervisorType, true, cmd.listInReadyState(), permittedAccounts, caller,
- listProjectResourcesCriteria, tags);
+ listProjectResourcesCriteria, tags, cmd.getZoneType());
}
@Override
@@ -1342,12 +1342,12 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
return listTemplates(id, cmd.getTemplateName(), cmd.getKeyword(), templateFilter, false, null, cmd.getPageSizeVal(), cmd.getStartIndex(),
- cmd.getZoneId(), hypervisorType, showDomr, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria, tags);
+ cmd.getZoneId(), hypervisorType, showDomr, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria, tags, cmd.getZoneType());
}
private Set<Pair<Long, Long>> listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso,
Boolean bootable, Long pageSize, Long startIndex, Long zoneId, HypervisorType hyperType, boolean showDomr, boolean onlyReady,
- List<Account> permittedAccounts, Account caller, ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags) {
+ List<Account> permittedAccounts, Account caller, ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags, String zoneType) {
VMTemplateVO template = null;
if (templateId != null) {
@@ -1388,7 +1388,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, tags);
Set<Pair<Long, Long>> templateZonePairSet2 = new HashSet<Pair<Long, Long>>();
templateZonePairSet2 = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, hypers, bootable, domain, pageSize,
- startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, listProjectResourcesCriteria, tags);
+ startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, listProjectResourcesCriteria, tags, zoneType);
for (Pair<Long, Long> tmpltPair : templateZonePairSet2) {
if (!templateZonePairSet.contains(new Pair<Long, Long>(tmpltPair.first(), -1L))) {
@@ -1412,7 +1412,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
Set<Pair<Long, Long>> templateZonePairSet2 = new HashSet<Pair<Long, Long>>();
templateZonePairSet2 = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, hypers,
bootable, domain, pageSize, startIndex, zoneId, hyperType, onlyReady, showDomr,
- permittedAccounts, caller, listProjectResourcesCriteria, tags);
+ permittedAccounts, caller, listProjectResourcesCriteria, tags, zoneType);
for (Pair<Long, Long> tmpltPair : templateZonePairSet2) {
if (!templateZonePairSet.contains(new Pair<Long, Long>(tmpltPair.first(), -1L))) {
@@ -1430,7 +1430,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
} else {
if (template == null) {
templateZonePairSet = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, hypers, bootable, domain, pageSize,
- startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, listProjectResourcesCriteria, tags);
+ startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, listProjectResourcesCriteria, tags, zoneType);
} else {
// if template is not public, perform permission check here
if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45dbd9cd/server/src/com/cloud/storage/dao/VMTemplateDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateDao.java b/server/src/com/cloud/storage/dao/VMTemplateDao.java
index 7263371..3f1fe93 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateDao.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateDao.java
@@ -56,7 +56,7 @@ public interface VMTemplateDao extends GenericDao<VMTemplateVO, Long>, StateDao<
public Set<Pair<Long, Long>> searchTemplates(String name, String keyword, TemplateFilter templateFilter, boolean isIso,
List<HypervisorType> hypers, Boolean bootable, DomainVO domain, Long pageSize, Long startIndex, Long zoneId,
HypervisorType hyperType, boolean onlyReady, boolean showDomr, List<Account> permittedAccounts, Account caller,
- ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags);
+ ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags, String zoneType);
public Set<Pair<Long, Long>> searchSwiftTemplates(String name, String keyword, TemplateFilter templateFilter,
boolean isIso, List<HypervisorType> hypers, Boolean bootable, DomainVO domain, Long pageSize, Long startIndex,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45dbd9cd/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
index d9a26d3..3b37f24 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
@@ -520,7 +520,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
public Set<Pair<Long, Long>> searchTemplates(String name, String keyword, TemplateFilter templateFilter,
boolean isIso, List<HypervisorType> hypers, Boolean bootable, DomainVO domain, Long pageSize, Long startIndex,
Long zoneId, HypervisorType hyperType, boolean onlyReady, boolean showDomr,List<Account> permittedAccounts,
- Account caller, ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags) {
+ Account caller, ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags, String zoneType) {
StringBuilder builder = new StringBuilder();
if (!permittedAccounts.isEmpty()) {
for (Account permittedAccount : permittedAccounts) {
@@ -561,7 +561,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
sql = SELECT_TEMPLATE_HOST_REF;
groupByClause = " GROUP BY t.id, h.data_center_id ";
}
- if ((templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.community)) {
+ if (((templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.community)) ||(zoneType != null && zoneId != null)) {
dataCenterJoin = " INNER JOIN data_center dc on (h.data_center_id = dc.id)";
}
@@ -691,7 +691,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
}
sql += whereClause + getExtrasWhere(templateFilter, name, keyword, isIso, bootable, hyperType, zoneId,
- onlyReady, showDomr) + groupByClause + getOrderByLimit(pageSize, startIndex);
+ onlyReady, showDomr, zoneType) + groupByClause + getOrderByLimit(pageSize, startIndex);
pstmt = txn.prepareStatement(sql);
rs = pstmt.executeQuery();
@@ -752,7 +752,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
return templateZonePairList;
}
- private String getExtrasWhere(TemplateFilter templateFilter, String name, String keyword, boolean isIso, Boolean bootable, HypervisorType hyperType, Long zoneId, boolean onlyReady, boolean showDomr) {
+ private String getExtrasWhere(TemplateFilter templateFilter, String name, String keyword, boolean isIso, Boolean bootable, HypervisorType hyperType, Long zoneId, boolean onlyReady, boolean showDomr, String zoneType) {
String sql = "";
if (keyword != null) {
sql += " t.name LIKE \"%" + keyword + "%\" AND";
@@ -783,6 +783,9 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
}
}else if (zoneId != null){
sql += " AND tzr.zone_id = " +zoneId+ " AND tzr.removed is null" ;
+ if (zoneType != null){
+ sql += " AND dc.networktype = " + zoneType;
+ }
}else{
sql += " AND tzr.removed is null ";
}
[19/50] [abbrv] CLOUDSTACK-741: Granular Global Parameters and adding
fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deaf9106/test/integration/smoke/test_global_settings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_global_settings.py b/test/integration/smoke/test_global_settings.py
index 12b35d7..ec18cea 100644
--- a/test/integration/smoke/test_global_settings.py
+++ b/test/integration/smoke/test_global_settings.py
@@ -39,22 +39,22 @@ class TestUpdateConfigWithScope(cloudstackTestCase):
updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
updateConfigurationCmd.name = "use.external.dns"
updateConfigurationCmd.value = "true"
- updateConfigurationCmd.scope = "zone"
- updateConfigurationCmd.id = 1
+ updateConfigurationCmd.scopename = "zone"
+ updateConfigurationCmd.scopeid = 1
updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd)
self.debug("updated the parameter %s with value %s"%(updateConfigurationResponse.name, updateConfigurationResponse.value))
listConfigurationsCmd = listConfigurations.listConfigurationsCmd()
listConfigurationsCmd.cfgName = updateConfigurationResponse.name
- listConfigurationsCmd.scope = "zone"
- listConfigurationsCmd.id = 1
+ listConfigurationsCmd.scopename = "zone"
+ listConfigurationsCmd.scopeid = 1
listConfigurationsResponse = self.apiClient.listConfigurations(listConfigurationsCmd)
self.assertNotEqual(len(listConfigurationsResponse), 0, "Check if the list API \
returns a non-empty response")
- configParam = listConfigurationsResponse[0]
+ configParam = listConfigurationsResponse[2]
self.assertEqual(configParam.value, updateConfigurationResponse.value, "Check if the update API returned \
is the same as the one we got in the list API")
@@ -67,6 +67,6 @@ class TestUpdateConfigWithScope(cloudstackTestCase):
updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
updateConfigurationCmd.name = "use.external.dns"
updateConfigurationCmd.value = "false"
- updateConfigurationCmd.scope = "zone"
- updateConfigurationCmd.id = 1
+ updateConfigurationCmd.scopename = "zone"
+ updateConfigurationCmd.scopeid = 1
self.apiClient.updateConfiguration(updateConfigurationCmd)
[50/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
backend support for Internal LB
Signed-off-by: Chiradeep Vittal <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c22c911
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c22c911
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c22c911
Branch: refs/heads/internallb
Commit: 4c22c911a9ca5d7e05e9eaf0e971cbe56345fa52
Parents: 7b24a76
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Mon Apr 29 15:56:00 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Apr 29 17:31:30 2013 -0700
----------------------------------------------------------------------
.../debian/config/etc/init.d/cloud-early-config | 27 ++++++++++++
.../debian/config/etc/iptables/iptables-ilbvm | 33 +++++++++++++++
.../debian/config/opt/cloud/bin/patchsystemvm.sh | 23 ++++++++++
.../lb/InternalLoadBalancerVMManagerImpl.java | 2 +-
4 files changed, 84 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c22c911/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 6ffd648..bdba38d 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -898,6 +898,29 @@ setup_elbvm() {
chkconfig portmap off
}
+setup_ilbvm() {
+ log_it "Setting up Internal Load Balancer system vm"
+ local hyp=$1
+ setup_common eth0 eth1
+ #eth0 = guest network, eth1=control network
+
+ cp /etc/iptables/iptables-ilbvm /etc/iptables/rules
+ if [ "$SSHONGUEST" == "true" ]
+ then
+ setup_sshd $ETH0_IP "eth0"
+ else
+ setup_sshd $ETH1_IP "eth1"
+ fi
+
+ enable_fwding 0
+ enable_svc haproxy 1
+ enable_svc dnsmasq 0
+ enable_svc cloud-passwd-srvr 0
+ enable_svc cloud 0
+ chkconfig nfs-common off
+ chkconfig portmap off
+}
+
setup_default() {
cat > /etc/network/interfaces << EOF
auto lo
@@ -948,6 +971,10 @@ start() {
[ "$NAME" == "" ] && NAME=elb
setup_elbvm
;;
+ ilbvm)
+ [ "$NAME" == "" ] && NAME=ilb
+ setup_ilbvm
+ ;;
unknown)
[ "$NAME" == "" ] && NAME=systemvm
setup_default;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c22c911/patches/systemvm/debian/config/etc/iptables/iptables-ilbvm
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-ilbvm b/patches/systemvm/debian/config/etc/iptables/iptables-ilbvm
new file mode 100755
index 0000000..8d5ca65
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/iptables/iptables-ilbvm
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+*nat
+:PREROUTING ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
+*filter
+:INPUT DROP [0:0]
+:FORWARD DROP [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -i eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -i eth1 -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -i eth1 -p tcp -m state --state NEW --dport 3922 -j ACCEPT
+COMMIT
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c22c911/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
index 8816ad7..9cb0250 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
@@ -135,6 +135,19 @@ elbvm_svcs() {
echo "cloud dnsmasq cloud-passwd-srvr apache2 nfs-common portmap" > /var/cache/cloud/disabled_svcs
}
+
+ilbvm_svcs() {
+ chkconfig cloud off
+ chkconfig haproxy on ;
+ chkconfig ssh on
+ chkconfig nfs-common off
+ chkconfig portmap off
+ chkconfig keepalived off
+ chkconfig conntrackd off
+ echo "ssh haproxy" > /var/cache/cloud/enabled_svcs
+ echo "cloud dnsmasq cloud-passwd-srvr apache2 nfs-common portmap" > /var/cache/cloud/disabled_svcs
+}
+
enable_pcihotplug() {
sed -i -e "/acpiphp/d" /etc/modules
sed -i -e "/pci_hotplug/d" /etc/modules
@@ -253,4 +266,14 @@ then
fi
fi
+if [ "$TYPE" == "ilbvm" ]
+then
+ ilbvm_svcs
+ if [ $? -gt 0 ]
+ then
+ printf "Failed to execute ilbvm svcs\n" >$logfile
+ exit 9
+ fi
+fi
+
exit $?
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c22c911/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
index f373621..34fab30 100644
--- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
+++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
@@ -236,7 +236,7 @@ InternalLoadBalancerVMManager, VirtualMachineGuru<DomainRouterVO> {
}
//FIXME - fix the type once earlyconfig and patchsystem vm scripts are fixed
- String type = "elbvm";
+ String type = "ilbvm";
buf.append(" type=" + type);
//FIXME - change it to DEBUG level later.
[09/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - UI: make global function changeURL() to pass zonetype to API calls based on selected option in zone type dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e2eb597
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e2eb597
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e2eb597
Branch: refs/heads/internallb
Commit: 3e2eb59723f6aa58170e8650ca8ef03a8b2d6b45
Parents: 7cf312a
Author: Jessica Wang <je...@apache.org>
Authored: Fri Apr 26 11:26:21 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Apr 26 11:26:21 2013 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e2eb597/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 7467531..a018406 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -114,6 +114,10 @@ function createURL(apiName, options) {
if (cloudStack.context && cloudStack.context.projects && !options.ignoreProject) {
urlString = urlString + '&projectid=' + cloudStack.context.projects[0].id;
}
+
+ if(cloudStack.context != null && cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
+ urlString = urlString + '&zonetype=' + cloudStack.context.zoneType;
+ }
return urlString;
}
[18/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-702: Tests for Multiple IP Ranges
1. Adding a cidr in existing subnet
2. Adding a cidr in new subnet
Signed-off-by: sanjeevneelarapu <sa...@citrix.com>
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b2fdd5e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b2fdd5e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b2fdd5e2
Branch: refs/heads/internallb
Commit: b2fdd5e2a23b44e5976c7135632d1ca6ade57663
Parents: ef00f1b
Author: sanjeevneelarapu <sa...@citrix.com>
Authored: Fri Apr 26 17:10:37 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Apr 29 11:24:40 2013 +0530
----------------------------------------------------------------------
.../component/test_multiple_ip_ranges.py | 238 +++++++++++++++
1 files changed, 238 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b2fdd5e2/test/integration/component/test_multiple_ip_ranges.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ip_ranges.py b/test/integration/component/test_multiple_ip_ranges.py
new file mode 100644
index 0000000..489e7ca
--- /dev/null
+++ b/test/integration/component/test_multiple_ip_ranges.py
@@ -0,0 +1,238 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+""" Tests for Multiple IP Ranges feature
+"""
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
+from netaddr import *
+
+from nose.plugins.attrib import attr
+
+class Services:
+ """Test Multiple IP Ranges
+ """
+ def __init__(self):
+ self.services = {
+ "account": {
+ "email": "test@test.com",
+ "firstname": "Test",
+ "lastname": "User",
+ "username": "test",
+ # Random characters are appended for unique
+ # username
+ "password": "password",
+ },
+ "service_offering": {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 200, # in MHz
+ "memory": 256, # In MBs
+ },
+ "disk_offering": {
+ "displaytext": "Small Disk",
+ "name": "Small Disk",
+ "disksize": 1
+ },
+ "templates": {
+ "displaytext": 'Template',
+ "name": 'Template',
+ "ostype": "CentOS 5.3 (64-bit)",
+ "templatefilter": 'self',
+ },
+ "vlan_ip_range": {
+ "startip": "",
+ "endip": "",
+ "netmask": "",
+ "gateway": "",
+ "forvirtualnetwork": "false",
+ "vlan": "untagged",
+ }
+ }
+
+class TestMultipleIpRanges(cloudstackTestCase):
+ """Test Multiple IP Ranges for guest network
+ """
+
+
+ @classmethod
+ def setUpClass(cls):
+ cls.api_client = super(TestMultipleIpRanges, cls).getClsTestClient().getApiClient()
+ cls.services = Services().services
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.services)
+ cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.services['mode'] = cls.zone.networktype
+ cls.services["domainid"] = cls.domain.id
+ cls.services["zoneid"] = cls.zone.id
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ domainid=cls.domain.id
+ )
+ cls.services["account"] = cls.account.account.name
+ cls._cleanup = [
+ cls.account,
+ ]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ #Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = [ ]
+ return
+
+ def tearDown(self):
+ try:
+ #Clean up, terminate the resources created
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def increment_cidr(self):
+ """Takes CIDR as input and will increment by one and returns the new CIDR
+ """
+ publicIpRange = PublicIpRange.list(self.apiclient)
+ self.startIp = publicIpRange[0].startip
+ self.endIp = publicIpRange[0].endip
+ self.gateway = publicIpRange[0].gateway
+ self.netmask = publicIpRange[0].netmask
+ #Pass ip address and mask length to IPNetwork to findout the CIDR
+ ip = IPNetwork(self.startIp+"/"+self.netmask)
+ new_cidr = ip.__iadd__(1)
+ ip2 = IPNetwork(new_cidr)
+ return ip2
+
+ def verify_vlan_range(self,vlan,services):
+ #compare vlan_list response with configured values
+ self.assertEqual(
+ isinstance(vlan, list),
+ True,
+ "Check list response returned a valid list"
+ )
+ self.assertNotEqual(
+ len(vlan),
+ 0,
+ "check list vlan response"
+ )
+ self.assertEqual(
+ vlan[0].startip,
+ services["startip"],
+ "Start IP in vlan ip range is not matched with the configured start ip"
+ )
+ self.assertEqual(
+ vlan[0].endip,
+ services["endip"],
+ "End IP in vlan ip range is not matched with the configured end ip"
+ )
+ self.assertEqual(
+ vlan[0].gateway,
+ services["gateway"],
+ "gateway in vlan ip range is not matched with the configured gateway"
+ )
+ self.assertEqual(
+ vlan[0].netmask,
+ services["netmask"],
+ "netmask in vlan ip range is not matched with the configured netmask"
+ )
+ return
+
+ @attr(tags=["advanced_sg", "sg"])
+ def test_01_add_ip_same_cidr(self):
+ """Test add guest ip range in the existing cidr
+ """
+ #call increment_cidr function to get exiting cidr from the setup and increment it
+ ip2 = self.increment_cidr()
+ test_nw = ip2.network
+ #Add IP range(5 IPs) in the new CIDR
+ test_gateway = test_nw+1
+ test_startIp = test_nw+2
+ test_endIp = test_startIp+5
+ test_startIp2= test_endIp+5
+ test_endIp2 = test_startIp2+5
+ #Populating services with new IP range
+ self.services["vlan_ip_range"]["startip"] = test_startIp
+ self.services["vlan_ip_range"]["endip"] = test_endIp
+ self.services["vlan_ip_range"]["gateway"] = test_gateway
+ self.services["vlan_ip_range"]["netmask"] = self.netmask
+ self.services["vlan_ip_range"]["zoneid"] = self.zone.id
+ self.services["vlan_ip_range"]["podid"] = self.pod.id
+ #create new vlan ip range
+ new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
+ self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ self.cleanup.append(new_vlan)
+ new_vlan_res = new_vlan.list(self.apiclient,new_vlan.id)
+ #Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
+ #Add few more ips in the same CIDR
+ self.services["vlan_ip_range"]["startip"] = test_startIp2
+ self.services["vlan_ip_range"]["endip"] = test_endIp2
+ new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
+ self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp2,test_endIp2))
+ self.cleanup.append(new_vlan2)
+ #list new vlan ip range
+ new_vlan2_res = new_vlan2.list(self.apiclient,new_vlan2.id)
+ #Compare list output with configured values
+ self.verify_vlan_range(new_vlan2_res,self.services["vlan_ip_range"])
+ return
+
+ @attr(tags=["advanced_sg", "sg"])
+ def test_02_add_ip_diff_cidr(self):
+ """Test add ip range in a new cidr
+
+ Steps:
+ 1.Get public vlan range (guest cidr) from the setup
+ 2.Add IP range to a new cidr
+ """
+ #call increment_cidr function to get exiting cidr from the setup and increment it
+ ip2 = self.increment_cidr()
+ test_nw = ip2.network
+ #Add IP range(5 IPs) in the new CIDR
+ test_gateway = test_nw+1
+ test_startIp = test_nw+2
+ test_endIp = test_startIp+5
+ #Populating services with new IP range
+ self.services["vlan_ip_range"]["startip"] = test_startIp
+ self.services["vlan_ip_range"]["endip"] = test_endIp
+ self.services["vlan_ip_range"]["gateway"] = test_gateway
+ self.services["vlan_ip_range"]["netmask"] = self.netmask
+ self.services["vlan_ip_range"]["zoneid"] = self.zone.id
+ self.services["vlan_ip_range"]["podid"] = self.pod.id
+ #create new vlan ip range
+ new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
+ self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ self.cleanup.append(new_vlan)
+ new_vlan_res = new_vlan.list(self.apiclient,new_vlan.id)
+ #Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
+ return
+
+
[35/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
remove a \n char
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4ebe0469
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4ebe0469
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4ebe0469
Branch: refs/heads/internallb
Commit: 4ebe0469ea17c331e8f02e06dd70b584130bd06a
Parents: 77ae066
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 12:06:25 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 12:06:25 2013 +0100
----------------------------------------------------------------------
.../classes/resources/messages_ar.properties | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ebe0469/client/WEB-INF/classes/resources/messages_ar.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ar.properties b/client/WEB-INF/classes/resources/messages_ar.properties
index b4b1974..aa8e441 100644
--- a/client/WEB-INF/classes/resources/messages_ar.properties
+++ b/client/WEB-INF/classes/resources/messages_ar.properties
@@ -48,7 +48,7 @@ label.s3.socket_timeout=\u0645\u0647\u0644\u0629 \u0627\u0644\u0645\u0642\u0628\
#modified labels (begin) *****************************************************************************************
label.site.to.site.VPN=\u0645\u0648\u0642\u0639 \u0625\u0644\u0649 \u0645\u0648\u0642\u0639-\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u064a\u0629 VPN
-message.zoneWizard.enable.local.storage=\u062a\u062d\u0630\u064a\u0631\\\: \u0625\u0630\u0627 \u0642\u0645\u062a \u0628\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0645\u062d\u0644\u064a\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0637\u0627\u0642 \u064a\u062c\u0628 \u0639\u0644\u064a\u0643 \u0639\u0645\u0644 \u0627\u0644\u0622\u062a\u064a \u060c \u0625\u0639\u062a\u0645\u0627\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0645\u0643\u0627\u0646 \u0627\u0644\u0630\u064a \u062a\u0631\u063a\u0628 \u0623\u0646 \u064a\u0646\u0637\u0644\u0642 \u0645\u0646\u0647 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \\\: </br><br/> \n1.\u0625\u0630\u0627 \u0643\u0627\u0646 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u064a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0625\u0628\u062
a\u062f\u0627\u0626\u064a\u0629
+message.zoneWizard.enable.local.storage=\u062a\u062d\u0630\u064a\u0631\\\: \u0625\u0630\u0627 \u0642\u0645\u062a \u0628\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0645\u062d\u0644\u064a\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0637\u0627\u0642 \u064a\u062c\u0628 \u0639\u0644\u064a\u0643 \u0639\u0645\u0644 \u0627\u0644\u0622\u062a\u064a \u060c \u0625\u0639\u062a\u0645\u0627\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0645\u0643\u0627\u0646 \u0627\u0644\u0630\u064a \u062a\u0631\u063a\u0628 \u0623\u0646 \u064a\u0646\u0637\u0644\u0642 \u0645\u0646\u0647 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \\\: </br><br/> 1.\u0625\u0630\u0627 \u0643\u0627\u0646 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u064a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0625\u0628\u062a\
u062f\u0627\u0626\u064a\u0629
#modified labels (end) *******************************************************************************************
label.configure.network.ACLs=\u0636\u0628\u0637 \u0634\u0628\u0643\u0629 ACLs
[39/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-847 api changes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35b41661
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35b41661
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35b41661
Branch: refs/heads/internallb
Commit: 35b416616e451b984d85f198d721b8f0fdb3a47b
Parents: 02e5262
Author: Radhika PC <ra...@citrix.com>
Authored: Mon Apr 29 18:56:52 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Mon Apr 29 18:56:52 2013 +0530
----------------------------------------------------------------------
docs/en-US/changed-API-commands-4.2.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35b41661/docs/en-US/changed-API-commands-4.2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changed-API-commands-4.2.xml b/docs/en-US/changed-API-commands-4.2.xml
index 26f10ff..2dd5a3b 100644
--- a/docs/en-US/changed-API-commands-4.2.xml
+++ b/docs/en-US/changed-API-commands-4.2.xml
@@ -30,6 +30,15 @@
</thead>
<tbody>
<row>
+ <entry><para>createVlanIpRange</para></entry>
+ <entry>
+ <para>No new parameter has been added. However, the current functionality has been
+ extended to add guest IPs from a different subnet in shared networks in a Basic zone.
+ Ensure that you provide netmask and gateway if you are adding guest IPs from a
+ different subnet. </para>
+ </entry>
+ </row>
+ <row>
<entry><para>updateResourceLimit</para></entry>
<entry>
<para>Added the following resource types to the <parameter>resourcetype</parameter>
@@ -113,8 +122,10 @@
<para>removelan (removes the specified VLAN range)</para>
</listitem>
</itemizedlist>
- <note><para>The removevlan and vlan parameters can be used together. If the VLAN range that you are trying
- to remove is in use, the operation will not succeed.</para></note>
+ <note>
+ <para>The removevlan and vlan parameters can be used together. If the VLAN range that
+ you are trying to remove is in use, the operation will not succeed.</para>
+ </note>
</entry>
</row>
</tbody>
[04/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Correcting the case for secondary storage limit
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a9001bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a9001bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a9001bf
Branch: refs/heads/internallb
Commit: 3a9001bfb6f44f322b55da41c67d748ac7528f89
Parents: c65ad6b
Author: Pranav Saxena <pr...@citrix.com>
Authored: Fri Apr 26 14:18:40 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Fri Apr 26 14:18:40 2013 +0530
----------------------------------------------------------------------
ui/scripts/domains.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a9001bf/ui/scripts/domains.js
----------------------------------------------------------------------
diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
index 8ee0ee6..e82f8ff 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -530,7 +530,7 @@
case "10":
domainObj["primaryStorageLimit"] = limit.max;
break;
- case "7":
+ case "11":
domainObj["secondaryStorageLimit"] = limit.max;
break;
}
[16/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - API: extend listPods API to to take in zonetype.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/271f8759
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/271f8759
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/271f8759
Branch: refs/heads/internallb
Commit: 271f8759be06a6a150809f454b469d2301c25d1b
Parents: 2ec28ce
Author: Jessica Wang <je...@citrix.com>
Authored: Sat Apr 27 18:29:46 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Sat Apr 27 18:30:21 2013 -0700
----------------------------------------------------------------------
.../api/command/admin/pod/ListPodsByCmd.java | 7 +++
.../src/com/cloud/server/ManagementServerImpl.java | 42 ++++++++++-----
2 files changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/271f8759/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
index 3dace42..db233ae 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
@@ -55,6 +55,9 @@ public class ListPodsByCmd extends BaseListCmd {
@Parameter(name=ApiConstants.ALLOCATION_STATE, type=CommandType.STRING, description="list pods by allocation state")
private String allocationState;
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
+
@Parameter(name=ApiConstants.SHOW_CAPACITIES, type=CommandType.BOOLEAN, description="flag to display the capacity of the pods")
private Boolean showCapacities;
@@ -78,6 +81,10 @@ public class ListPodsByCmd extends BaseListCmd {
return allocationState;
}
+ public String getZoneType() {
+ return zoneType;
+ }
+
public Boolean getShowCapacities() {
return showCapacities;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/271f8759/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 050f57b..5db8329 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1068,17 +1068,29 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public Pair<List<? extends Pod>, Integer> searchForPods(ListPodsByCmd cmd) {
- Filter searchFilter = new Filter(HostPodVO.class, "dataCenterId", true, cmd.getStartIndex(), cmd.getPageSizeVal());
- SearchCriteria<HostPodVO> sc = _hostPodDao.createSearchCriteria();
-
String podName = cmd.getPodName();
Long id = cmd.getId();
- Long zoneId = cmd.getZoneId();
+ Long zoneId = cmd.getZoneId();
Object keyword = cmd.getKeyword();
Object allocationState = cmd.getAllocationState();
-
+ String zoneType = cmd.getZoneType();
zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), zoneId);
+
+ Filter searchFilter = new Filter(HostPodVO.class, "dataCenterId", true, cmd.getStartIndex(), cmd.getPageSizeVal());
+ SearchBuilder<HostPodVO> sb = _hostPodDao.createSearchBuilder();
+ sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+ sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
+ sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+ sb.and("allocationState", sb.entity().getAllocationState(), SearchCriteria.Op.EQ);
+
+ if(zoneType != null) {
+ SearchBuilder<DataCenterVO> zoneSb = _dcDao.createSearchBuilder();
+ zoneSb.and("zoneNetworkType", zoneSb.entity().getNetworkType(), SearchCriteria.Op.EQ);
+ sb.join("zoneSb", zoneSb, sb.entity().getDataCenterId(), zoneSb.entity().getId(), JoinBuilder.JoinType.INNER);
+ }
+
+ SearchCriteria<HostPodVO> sc = sb.create();
if (keyword != null) {
SearchCriteria<HostPodVO> ssc = _hostPodDao.createSearchCriteria();
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
@@ -1088,21 +1100,25 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
if (id != null) {
- sc.addAnd("id", SearchCriteria.Op.EQ, id);
+ sc.setParameters("id", id);
}
-
+
if (podName != null) {
- sc.addAnd("name", SearchCriteria.Op.LIKE, "%" + podName + "%");
+ sc.setParameters("name", "%" + podName + "%");
}
-
+
if (zoneId != null) {
- sc.addAnd("dataCenterId", SearchCriteria.Op.EQ, zoneId);
+ sc.setParameters("dataCenterId", zoneId);
}
-
+
if (allocationState != null) {
- sc.addAnd("allocationState", SearchCriteria.Op.EQ, allocationState);
+ sc.setParameters("allocationState", allocationState);
+ }
+
+ if(zoneType != null) {
+ sc.setJoinParameters("zoneSb", "zoneNetworkType", zoneType);
}
-
+
Pair<List<HostPodVO>, Integer> result = _hostPodDao.searchAndCount(sc, searchFilter);
return new Pair<List<? extends Pod>, Integer>(result.first(), result.second());
}
[05/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-1794 Throwing error when configuring egress rules for shared networks
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/318c7f2a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/318c7f2a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/318c7f2a
Branch: refs/heads/internallb
Commit: 318c7f2af0a664c057ec1ed057ccaad608339f62
Parents: 3a9001b
Author: Jayapal <ja...@citrix.com>
Authored: Fri Apr 26 14:28:02 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Fri Apr 26 15:09:41 2013 +0530
----------------------------------------------------------------------
.../network/firewall/FirewallManagerImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/318c7f2a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index 080f7b0..4ad8868 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -27,6 +27,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.network.dao.*;
import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -56,10 +57,6 @@ import com.cloud.network.Networks.TrafficType;
import com.cloud.network.NetworkManager;
import com.cloud.network.NetworkModel;
import com.cloud.network.NetworkRuleApplier;
-import com.cloud.network.dao.FirewallRulesCidrsDao;
-import com.cloud.network.dao.FirewallRulesDao;
-import com.cloud.network.dao.IPAddressDao;
-import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.element.FirewallServiceProvider;
import com.cloud.network.element.NetworkACLServiceProvider;
import com.cloud.network.element.PortForwardingServiceProvider;
@@ -127,6 +124,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Inject
ResourceTagDao _resourceTagDao;
@Inject
+ NetworkDao _networkDao;
+ @Inject
VpcManager _vpcMgr;
@Inject List<FirewallServiceProvider> _firewallElements;
@@ -150,6 +149,11 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Override
public FirewallRule createEgressFirewallRule(FirewallRule rule) throws NetworkRuleConflictException {
Account caller = UserContext.current().getCaller();
+
+ Network network = _networkDao.findById(rule.getNetworkId());
+ if (network.getGuestType() == Network.GuestType.Shared) {
+ throw new InvalidParameterValueException("Egress firewall rules are not supported for " + network.getGuestType() + " networks");
+ }
return createFirewallRule(null, caller, rule.getXid(), rule.getSourcePortStart(),
rule.getSourcePortEnd(), rule.getProtocol(), rule.getSourceCidrList(), rule.getIcmpCode(),
[36/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2138 - Add Arabic L10N, fix a issue with sed on OSX, detab some lines
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e5186da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e5186da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e5186da
Branch: refs/heads/internallb
Commit: 8e5186daf1ffdf6a8c011dd803bd7b7094af1654
Parents: 4ebe046
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 12:40:13 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 12:40:13 2013 +0100
----------------------------------------------------------------------
tools/transifex/sync-transifex-ui.sh | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e5186da/tools/transifex/sync-transifex-ui.sh
----------------------------------------------------------------------
diff --git a/tools/transifex/sync-transifex-ui.sh b/tools/transifex/sync-transifex-ui.sh
index 5fb4e57..daba88d 100755
--- a/tools/transifex/sync-transifex-ui.sh
+++ b/tools/transifex/sync-transifex-ui.sh
@@ -17,7 +17,7 @@
# under the License.
SRCLANG=en
-LIST_LANG="ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU zh_CN"
+LIST_LANG="ar ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU zh_CN"
DIRECTORY_RESOURCES="../../client/WEB-INF/classes/resources"
WORKDIR="./work-dir"
@@ -49,8 +49,8 @@ doUploadL10NLangs()
for CODELANG in ${LIST_LANG} ; do
if [ -f "${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties" ]; then
native2ascii -reverse -encoding UTF-8 ${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties ${WORKDIR}/messages_${CODELANG}.properties
- sed -i "s/\\\\\\\'/'/g" ${WORKDIR}/messages_${CODELANG}.properties
- tx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties
+ sed -i"" "s/\\\\\\\'/'/g" ${WORKDIR}/messages_${CODELANG}.properties
+ tx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties
tx push -t -r ${ARGUMENTS} -l ${CODELANG}
else
echo "Warning: the resource file for language ${CODELANG} doesn't exist."
@@ -64,8 +64,8 @@ doDownloadL10NLangs()
for CODELANG in ${LIST_LANG} ; do
if [ -f "${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties" ]; then
native2ascii -reverse -encoding UTF-8 ${DIRECTORY_RESOURCES}/messages_${CODELANG}.properties ${WORKDIR}/messages_${CODELANG}.properties
- sed -i "s/\\\\\\\'/'/g" ${WORKDIR}/messages_${CODELANG}.properties
- tx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties
+ sed -i"" "s/\\\\\\\'/'/g" ${WORKDIR}/messages_${CODELANG}.properties
+ tx set -r ${ARGUMENTS} -l ${CODELANG} ${WORKDIR}/messages_${CODELANG}.properties
else
echo "Warning: the resource file for language ${CODELANG} doesn't exist."
fi
@@ -92,11 +92,11 @@ doUploadSourceLang()
# Source language
if [ -f ${DIRECTORY_RESOURCES}/messages.properties ]; then
native2ascii -reverse -encoding UTF-8 ${DIRECTORY_RESOURCES}/messages.properties ${WORKDIR}/messages.properties
- sed -i "s/\\\\\\\'/'/g" ${WORKDIR}/messages.properties
+ sed -i"" "s/\\\\\\\'/'/g" ${WORKDIR}/messages.properties
tx set --source -r ${ARGUMENTS} -l ${SRCLANG} ${WORKDIR}/messages.properties
tx push -s -r ${ARGUMENTS}
else
- echo "Warning: the source language doesn't exist!"
+ echo "Warning: the source language doesn't exist!"
fi
}
@@ -110,8 +110,8 @@ doDownloadSourceLang()
grep -v "^#" ${WORKDIR}/messages.properties.tmp1 | sort -f | uniq | sed "s/'/\\\\\\\\\'/g" > ${WORKDIR}/messages.properties.tmp2
echo "$AL2_STRING" | cat - ${WORKDIR}/messages.properties.tmp2 > ${DIRECTORY_RESOURCES}/messages.properties
else
- echo "Warning: the source language hasn't been retrieve!"
- fi
+ echo "Warning: the source language hasn't been retrieve!"
+ fi
}
if [ $# -ne 2 ]; then
@@ -119,7 +119,7 @@ if [ $# -ne 2 ]; then
else
COMMAND="$1"
ARGUMENTS="$2"
- doMakeWdir
+ doMakeWdir
fi
case "$COMMAND" in
[44/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Needs to force the download of l10n resource files
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/87cafdcb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/87cafdcb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/87cafdcb
Branch: refs/heads/internallb
Commit: 87cafdcbc42a6b33b91073c7f024640ccba7cde4
Parents: 137fd18
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 16:18:11 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 16:18:11 2013 +0100
----------------------------------------------------------------------
tools/transifex/sync-transifex-ui.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87cafdcb/tools/transifex/sync-transifex-ui.sh
----------------------------------------------------------------------
diff --git a/tools/transifex/sync-transifex-ui.sh b/tools/transifex/sync-transifex-ui.sh
index ed10809..9124ed6 100755
--- a/tools/transifex/sync-transifex-ui.sh
+++ b/tools/transifex/sync-transifex-ui.sh
@@ -74,7 +74,7 @@ doDownloadL10NLangs()
done
# get all resource files from transifex
- tx pull -r ${ARGUMENTS}
+ tx pull -f -r ${ARGUMENTS}
# l10n languages
for CODELANG in ${LIST_LANG} ; do
[17/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - API: extend listClusters API to to take in zonetype.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef00f1b0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef00f1b0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef00f1b0
Branch: refs/heads/internallb
Commit: ef00f1b04f8d9e4f7ea981c3174ae9f4a84d4a58
Parents: 271f875
Author: Jessica Wang <je...@citrix.com>
Authored: Sat Apr 27 21:38:03 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Sat Apr 27 21:38:03 2013 -0700
----------------------------------------------------------------------
.../api/command/admin/cluster/ListClustersCmd.java | 8 ++-
.../src/com/cloud/server/ManagementServerImpl.java | 47 +++++++++++----
2 files changed, 41 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef00f1b0/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
index 0417b18..f2dd349 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -70,6 +70,9 @@ public class ListClustersCmd extends BaseListCmd {
@Parameter(name=ApiConstants.MANAGED_STATE, type=CommandType.STRING, description="whether this cluster is managed by cloudstack")
private String managedState;
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
+
@Parameter(name=ApiConstants.SHOW_CAPACITIES, type=CommandType.BOOLEAN, description="flag to display the capacity of the clusters")
private Boolean showCapacities;
@@ -114,7 +117,10 @@ public class ListClustersCmd extends BaseListCmd {
this.managedState = managedstate;
}
-
+ public String getZoneType() {
+ return zoneType;
+ }
+
public Boolean getShowCapacities() {
return showCapacities;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef00f1b0/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 5db8329..1799f77 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -616,48 +616,69 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Override
public Pair<List<? extends Cluster>, Integer> searchForClusters(ListClustersCmd cmd) {
- Filter searchFilter = new Filter(ClusterVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
- SearchCriteria<ClusterVO> sc = _clusterDao.createSearchCriteria();
-
- Object id = cmd.getId();
+ Object id = cmd.getId();
Object name = cmd.getClusterName();
Object podId = cmd.getPodId();
Long zoneId = cmd.getZoneId();
Object hypervisorType = cmd.getHypervisorType();
Object clusterType = cmd.getClusterType();
Object allocationState = cmd.getAllocationState();
+ String zoneType = cmd.getZoneType();
String keyword = cmd.getKeyword();
-
zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), zoneId);
-
+
+
+ Filter searchFilter = new Filter(ClusterVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
+
+ SearchBuilder<ClusterVO> sb = _clusterDao.createSearchBuilder();
+ sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+ sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
+ sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
+ sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+ sb.and("hypervisorType", sb.entity().getHypervisorType(), SearchCriteria.Op.EQ);
+ sb.and("clusterType", sb.entity().getClusterType(), SearchCriteria.Op.EQ);
+ sb.and("allocationState", sb.entity().getAllocationState(), SearchCriteria.Op.EQ);
+
+ if(zoneType != null) {
+ SearchBuilder<DataCenterVO> zoneSb = _dcDao.createSearchBuilder();
+ zoneSb.and("zoneNetworkType", zoneSb.entity().getNetworkType(), SearchCriteria.Op.EQ);
+ sb.join("zoneSb", zoneSb, sb.entity().getDataCenterId(), zoneSb.entity().getId(), JoinBuilder.JoinType.INNER);
+ }
+
+
+ SearchCriteria<ClusterVO> sc = sb.create();
if (id != null) {
- sc.addAnd("id", SearchCriteria.Op.EQ, id);
+ sc.setParameters("id", id);
}
if (name != null) {
- sc.addAnd("name", SearchCriteria.Op.LIKE, "%" + name + "%");
+ sc.setParameters("name", "%" + name + "%");
}
if (podId != null) {
- sc.addAnd("podId", SearchCriteria.Op.EQ, podId);
+ sc.setParameters("podId", podId);
}
if (zoneId != null) {
- sc.addAnd("dataCenterId", SearchCriteria.Op.EQ, zoneId);
+ sc.setParameters("dataCenterId", zoneId);
}
if (hypervisorType != null) {
- sc.addAnd("hypervisorType", SearchCriteria.Op.EQ, hypervisorType);
+ sc.setParameters("hypervisorType", hypervisorType);
}
if (clusterType != null) {
- sc.addAnd("clusterType", SearchCriteria.Op.EQ, clusterType);
+ sc.setParameters("clusterType", clusterType);
}
if (allocationState != null) {
- sc.addAnd("allocationState", SearchCriteria.Op.EQ, allocationState);
+ sc.setParameters("allocationState", allocationState);
}
+ if(zoneType != null) {
+ sc.setJoinParameters("zoneSb", "zoneNetworkType", zoneType);
+ }
+
if (keyword != null) {
SearchCriteria<ClusterVO> ssc = _clusterDao.createSearchCriteria();
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
[24/50] [abbrv] CLOUDSTACK-2138 - first automate sync with Transifex.
1/ Upload the lastest EN resource file on Transifex. 2/ Download the lastest
L10N resource file for "ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU
zh_CN" form Transifex to CS repo
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_ja.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 2380e91..e4ea794 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -15,873 +15,874 @@
# specific language governing permissions and limitations
# under the License.
-changed.item.properties=\u9805\u76EE\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5909\u66F4
+
+changed.item.properties=\u9805\u76ee\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5909\u66f4
confirm.enable.s3=S3\u57fa\u76e4\u30bb\u30ab\u30f3\u30c0\u30ea\u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u6709\u52b9\u5316\u3059\u308b\u305f\u3081\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044
-confirm.enable.swift=Swift1 \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.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
-error.login=\u30E6\u30FC\u30B6\u30FC\u540D/\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u8A18\u9332\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
+confirm.enable.swift=Swift1 \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.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
+error.login=\u30e6\u30fc\u30b6\u30fc\u540d/\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u8a18\u9332\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
error.menu.select=\u00e3\u0082\u00a2\u00e3\u0082\u00a4\u00e3\u0083\u0086\u00e3\u0083\u00a0\u00e3\u0081\u008c\u00e9\u0081\u00b8\u00e6\u008a\u009e\u00e3\u0081\u0095\u00e3\u0082\u008c\u00e3\u0081\u00a6\u00e3\u0081\u0084\u00e3\u0081\u00aa\u00e3\u0081\u0084\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0082\u00a2\u00e3\u0082\u00af\u00e3\u0082\u00b7\u00e3\u0083\u00a7\u00e3\u0083\u00b3\u00e3\u0082\u0092\u00e5\u00ae\u009f\u00e8\u00a1\u008c\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u0093\u00e3\u0081\u00a8\u00e3\u0081\u008c\u00e3\u0081\u00a7\u00e3\u0081\u008d\u00e3\u0081\u00be\u00e3\u0081\u009b\u00e3\u0082\u0093
-error.mgmt.server.inaccessible=\u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002\u5F8C\u3067\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-error.password.not.match=\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093
-error.please.specify.physical.network.tags=\u3053\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u30BF\u30B0\u3092\u6307\u5B9A\u3057\u306A\u3051\u308C\u3070\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-error.session.expired=\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u6709\u52B9\u671F\u9650\u304C\u5207\u308C\u307E\u3057\u305F\u3002
-error.something.went.wrong.please.correct.the.following=\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u6B21\u306E\u5185\u5BB9\u3092\u4FEE\u6B63\u3057\u3066\u304F\u3060\u3055\u3044
-error.unable.to.reach.management.server=\u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u3068\u901A\u4FE1\u3067\u304D\u307E\u305B\u3093
+error.mgmt.server.inaccessible=\u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002\u5f8c\u3067\u518d\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+error.password.not.match=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093
+error.please.specify.physical.network.tags=\u3053\u306e\u7269\u7406\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u30bf\u30b0\u3092\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+error.session.expired=\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u6709\u52b9\u671f\u9650\u304c\u5207\u308c\u307e\u3057\u305f\u3002
+error.something.went.wrong.please.correct.the.following=\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u6b21\u306e\u5185\u5bb9\u3092\u4fee\u6b63\u3057\u3066\u304f\u3060\u3055\u3044
+error.unable.to.reach.management.server=\u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u3068\u901a\u4fe1\u3067\u304d\u307e\u305b\u3093
error.unresolved.internet.name=\u3042\u306a\u305f\u306e\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u540d\u306f\u89e3\u6c7a\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-extractable=\u62BD\u51FA\u53EF\u80FD
-force.delete.domain.warning=\u8B66\u544A\: \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u5B50\u30C9\u30E1\u30A4\u30F3\u304A\u3088\u3073\u95A2\u9023\u3059\u308B\u3059\u3079\u3066\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u3068\u305D\u306E\u30EA\u30BD\u30FC\u30B9\u304C\u524A\u9664\u3055\u308C\u307E\u3059\u3002
-force.delete=\u5F37\u5236\u524A\u9664
-force.remove.host.warning=\u8B66\u544A\: \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u5B9F\u884C\u4E2D\u306E\u3059\u3079\u3066\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C\u5F37\u5236\u7684\u306B\u505C\u6B62\u3055\u308C\u3001\u30AF\u30E9\u30B9\u30BF\u30FC\u304B\u3089\u3053\u306E\u30DB\u30B9\u30C8\u304C\u5F37\u5236\u7684\u306B\u89E3\u9664\u3055\u308C\u307E\u3059\u3002
-force.remove=\u5F37\u5236\u89E3\u9664
-force.stop.instance.warning=\u8B66\u544A\: \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u5F37\u5236\u505C\u6B62\u306F\u3001\u6700\u7D42\u624B\u6BB5\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30C7\u30FC\u30BF\u3092\u640D\u5931\u3059\u308B\u3060\u3051\u3067\u306A\u304F\u3001\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u52D5\u4F5C\u304C\u4E00\u8CAB\u3057\u306A\u304F\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-force.stop=\u5F37\u5236\u505C\u6B62
-ICMP.code=ICMP \u30B3\u30FC\u30C9
-ICMP.type=ICMP \u306E\u7A2E\u985E
-image.directory=\u753B\u50CF\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
-inline=\u76F4\u5217
-instances.actions.reboot.label=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u518D\u8D77\u52D5
-label.accept.project.invitation=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u306E\u62DB\u5F85\u306E\u627F\u8AFE
-label.account.and.security.group=\u30A2\u30AB\u30A6\u30F3\u30C8\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7
-label.account.id=\u30A2\u30AB\u30A6\u30F3\u30C8 ID
-label.account.name=\u30A2\u30AB\u30A6\u30F3\u30C8\u540D
-label.account.specific=\u30A2\u30AB\u30A6\u30F3\u30C8\u56FA\u6709
-label.accounts=\u30A2\u30AB\u30A6\u30F3\u30C8
-label.account=\u30A2\u30AB\u30A6\u30F3\u30C8
-label.acquire.new.ip=\u65B0\u3057\u3044 IP \u30A2\u30C9\u30EC\u30B9\u306E\u53D6\u5F97
-label.action.attach.disk.processing=\u30C7\u30A3\u30B9\u30AF\u3092\u30A2\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059...
-label.action.attach.disk=\u30C7\u30A3\u30B9\u30AF\u306E\u30A2\u30BF\u30C3\u30C1
-label.action.attach.iso=ISO \u306E\u30A2\u30BF\u30C3\u30C1
-label.action.attach.iso.processing=ISO \u3092\u30A2\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059...
-label.action.cancel.maintenance.mode.processing=\u4FDD\u5B88\u30E2\u30FC\u30C9\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u3044\u307E\u3059...
-label.action.cancel.maintenance.mode=\u4FDD\u5B88\u30E2\u30FC\u30C9\u306E\u30AD\u30E3\u30F3\u30BB\u30EB
-label.action.change.password=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u5909\u66F4
-label.action.change.service.processing=\u30B5\u30FC\u30D3\u30B9\u3092\u5909\u66F4\u3057\u3066\u3044\u307E\u3059...
-label.action.change.service=\u30B5\u30FC\u30D3\u30B9\u306E\u5909\u66F4
-label.action.copy.ISO=ISO \u306E\u30B3\u30D4\u30FC
-label.action.copy.ISO.processing=ISO \u3092\u30B3\u30D4\u30FC\u3057\u3066\u3044\u307E\u3059...
-label.action.copy.template.processing=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u30B3\u30D4\u30FC\u3057\u3066\u3044\u307E\u3059...
-label.action.copy.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30B3\u30D4\u30FC
-label.action.create.template.from.vm=VM \u304B\u3089\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u4F5C\u6210
-label.action.create.template.from.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u304B\u3089\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u4F5C\u6210
-label.action.create.template.processing=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-label.action.create.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u4F5C\u6210
-label.action.create.vm.processing=VM \u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-label.action.create.vm=VM \u306E\u4F5C\u6210
-label.action.create.volume.processing=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-label.action.create.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u4F5C\u6210
-label.action.delete.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u524A\u9664
-label.action.delete.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u524A\u9664
-label.action.delete.disk.offering.processing=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u524A\u9664
-label.action.delete.domain.processing=\u30C9\u30E1\u30A4\u30F3\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.domain=\u30C9\u30E1\u30A4\u30F3\u306E\u524A\u9664
-label.action.delete.firewall.processing=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.firewall=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u898F\u5247\u306E\u524A\u9664
-label.action.delete.ingress.rule.processing=\u53D7\u4FE1\u898F\u5247\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.ingress.rule=\u53D7\u4FE1\u898F\u5247\u306E\u524A\u9664
-label.action.delete.IP.range=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u524A\u9664
-label.action.delete.IP.range.processing=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.ISO=ISO \u306E\u524A\u9664
-label.action.delete.ISO.processing=ISO \u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.load.balancer.processing=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.load.balancer=\u8CA0\u8377\u5206\u6563\u898F\u5247\u306E\u524A\u9664
-label.action.delete.network.processing=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u524A\u9664
-label.action.delete.nexusVswitch=Nexus 1000V \u306E\u524A\u9664
-label.action.delete.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u524A\u9664
-label.action.delete.pod.processing=\u30DD\u30C3\u30C9\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.pod=\u30DD\u30C3\u30C9\u306E\u524A\u9664
-label.action.delete.primary.storage.processing=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u524A\u9664
-label.action.delete.secondary.storage.processing=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.secondary.storage=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u524A\u9664
-label.action.delete.security.group.processing=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.security.group=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u306E\u524A\u9664
-label.action.delete.service.offering.processing=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u524A\u9664
-label.action.delete.snapshot.processing=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.snapshot=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u524A\u9664
-label.action.delete.system.service.offering=\u30B7\u30B9\u30C6\u30E0 \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u524A\u9664
-label.action.delete.template.processing=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u524A\u9664
-label.action.delete.user.processing=\u30E6\u30FC\u30B6\u30FC\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.user=\u30E6\u30FC\u30B6\u30FC\u306E\u524A\u9664
-label.action.delete.volume.processing=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u524A\u9664
-label.action.delete.zone.processing=\u30BE\u30FC\u30F3\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.delete.zone=\u30BE\u30FC\u30F3\u306E\u524A\u9664
-label.action.destroy.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u7834\u68C4\u3057\u3066\u3044\u307E\u3059...
-label.action.destroy.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u7834\u68C4
-label.action.destroy.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u7834\u68C4\u3057\u3066\u3044\u307E\u3059...
-label.action.destroy.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u7834\u68C4
-label.action.detach.disk.processing=\u30C7\u30A3\u30B9\u30AF\u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059...
-label.action.detach.disk=\u30C7\u30A3\u30B9\u30AF\u306E\u30C7\u30BF\u30C3\u30C1
-label.action.detach.iso=ISO \u306E\u30C7\u30BF\u30C3\u30C1
-label.action.detach.iso.processing=ISO \u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059...
-label.action.disable.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.disable.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u7121\u52B9\u5316
-label.action.disable.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.disable.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7121\u52B9\u5316
-label.action.disable.nexusVswitch=Nexus 1000V \u306E\u7121\u52B9\u5316
-label.action.disable.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u7121\u52B9\u5316
-label.action.disable.pod.processing=\u30DD\u30C3\u30C9\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.disable.pod=\u30DD\u30C3\u30C9\u306E\u7121\u52B9\u5316
-label.action.disable.static.NAT.processing=\u9759\u7684 NAT \u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.disable.static.NAT=\u9759\u7684 NAT \u306E\u7121\u52B9\u5316
-label.action.disable.user.processing=\u30E6\u30FC\u30B6\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.disable.user=\u30E6\u30FC\u30B6\u30FC\u306E\u7121\u52B9\u5316
-label.action.disable.zone.processing=\u30BE\u30FC\u30F3\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.disable.zone=\u30BE\u30FC\u30F3\u306E\u7121\u52B9\u5316
-label.action.download.ISO=ISO \u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
-label.action.download.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
-label.action.download.volume.processing=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u3044\u307E\u3059...
-label.action.download.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
-label.action.edit.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u7DE8\u96C6
-label.action.edit.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u7DE8\u96C6
-label.action.edit.domain=\u30C9\u30E1\u30A4\u30F3\u306E\u7DE8\u96C6
-label.action.edit.global.setting=\u30B0\u30ED\u30FC\u30D0\u30EB\u8A2D\u5B9A\u306E\u7DE8\u96C6
-label.action.edit.host=\u30DB\u30B9\u30C8\u306E\u7DE8\u96C6
-label.action.edit.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u7DE8\u96C6
-label.action.edit.ISO=ISO \u306E\u7DE8\u96C6
-label.action.edit.network.offering=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u7DE8\u96C6
-label.action.edit.network.processing=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u7DE8\u96C6\u3057\u3066\u3044\u307E\u3059...
-label.action.edit.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u7DE8\u96C6
-label.action.edit.pod=\u30DD\u30C3\u30C9\u306E\u7DE8\u96C6
-label.action.edit.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u7DE8\u96C6
-label.action.edit.resource.limits=\u30EA\u30BD\u30FC\u30B9\u5236\u9650\u306E\u7DE8\u96C6
-label.action.edit.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u7DE8\u96C6
-label.action.edit.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u7DE8\u96C6
-label.action.edit.user=\u30E6\u30FC\u30B6\u30FC\u306E\u7DE8\u96C6
-label.action.edit.zone=\u30BE\u30FC\u30F3\u306E\u7DE8\u96C6
-label.action.enable.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.enable.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u6709\u52B9\u5316
-label.action.enable.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.enable.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u6709\u52B9\u5316
-label.action.enable.maintenance.mode.processing=\u4FDD\u5B88\u30E2\u30FC\u30C9\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.enable.maintenance.mode=\u4FDD\u5B88\u30E2\u30FC\u30C9\u306E\u6709\u52B9\u5316
-label.action.enable.nexusVswitch=Nexus 1000V \u306E\u6709\u52B9\u5316
-label.action.enable.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u6709\u52B9\u5316
-label.action.enable.pod.processing=\u30DD\u30C3\u30C9\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.enable.pod=\u30DD\u30C3\u30C9\u306E\u6709\u52B9\u5316
-label.action.enable.static.NAT.processing=\u9759\u7684 NAT \u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.enable.static.NAT=\u9759\u7684 NAT \u306E\u6709\u52B9\u5316
-label.action.enable.user.processing=\u30E6\u30FC\u30B6\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.enable.user=\u30E6\u30FC\u30B6\u30FC\u306E\u6709\u52B9\u5316
-label.action.enable.zone.processing=\u30BE\u30FC\u30F3\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.enable.zone=\u30BE\u30FC\u30F3\u306E\u6709\u52B9\u5316
-label.action.force.reconnect.processing=\u518D\u63A5\u7D9A\u3057\u3066\u3044\u307E\u3059...
-label.action.force.reconnect=\u5F37\u5236\u518D\u63A5\u7D9A
-label.action.generate.keys.processing=\u30AD\u30FC\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059...
-label.action.generate.keys=\u30AD\u30FC\u306E\u751F\u6210
-label.action.list.nexusVswitch=Nexus 1000V \u306E\u4E00\u89A7\u8868\u793A
-label.action.lock.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u30ED\u30C3\u30AF\u3057\u3066\u3044\u307E\u3059...
-label.action.lock.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30ED\u30C3\u30AF
-label.action.manage.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u7BA1\u7406\u5BFE\u8C61\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.manage.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7BA1\u7406\u5BFE\u8C61\u5316
-label.action.migrate.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u79FB\u884C\u3057\u3066\u3044\u307E\u3059...
-label.action.migrate.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u79FB\u884C
-label.action.migrate.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u79FB\u884C\u3057\u3066\u3044\u307E\u3059...
-label.action.migrate.router=\u30EB\u30FC\u30BF\u30FC\u306E\u79FB\u884C
-label.action.migrate.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u79FB\u884C\u3057\u3066\u3044\u307E\u3059...
-label.action.migrate.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u79FB\u884C
-label.action.reboot.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059...
-label.action.reboot.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u518D\u8D77\u52D5
-label.action.reboot.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059...
-label.action.reboot.router=\u30EB\u30FC\u30BF\u30FC\u306E\u518D\u8D77\u52D5
-label.action.reboot.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059...
-label.action.reboot.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u518D\u8D77\u52D5
-label.action.recurring.snapshot=\u5B9A\u671F\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8
-label.action.register.iso=ISO \u306E\u767B\u9332
-label.action.register.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u767B\u9332
-label.action.release.ip=IP \u30A2\u30C9\u30EC\u30B9\u306E\u89E3\u653E
-label.action.release.ip.processing=IP \u30A2\u30C9\u30EC\u30B9\u3092\u89E3\u653E\u3057\u3066\u3044\u307E\u3059...
-label.action.remove.host.processing=\u30DB\u30B9\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.action.remove.host=\u30DB\u30B9\u30C8\u306E\u524A\u9664
-label.action.reset.password.processing=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u3044\u307E\u3059...
-label.action.reset.password=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u30EA\u30BB\u30C3\u30C8
-label.action.resource.limits=\u30EA\u30BD\u30FC\u30B9\u5236\u9650
-label.action.restore.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u5FA9\u5143\u3057\u3066\u3044\u307E\u3059...
-label.action.restore.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u5FA9\u5143
-label.action.start.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059...
-label.action.start.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u8D77\u52D5
-label.action.start.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059...
-label.action.start.router=\u30EB\u30FC\u30BF\u30FC\u306E\u8D77\u52D5
-label.action.start.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059...
-label.action.start.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u8D77\u52D5
-label.action.stop.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u505C\u6B62\u3057\u3066\u3044\u307E\u3059...
-label.action.stop.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u505C\u6B62
-label.action.stop.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u505C\u6B62\u3057\u3066\u3044\u307E\u3059...
-label.action.stop.router=\u30EB\u30FC\u30BF\u30FC\u306E\u505C\u6B62
-label.action.stop.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u505C\u6B62\u3057\u3066\u3044\u307E\u3059...
-label.action.stop.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u505C\u6B62
-label.actions=\u64CD\u4F5C
-label.action.take.snapshot.processing=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059....
-label.action.take.snapshot=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u4F5C\u6210
-label.action.unmanage.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u975E\u7BA1\u7406\u5BFE\u8C61\u306B\u3057\u3066\u3044\u307E\u3059...
-label.action.unmanage.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u975E\u7BA1\u7406\u5BFE\u8C61\u5316
-label.action.update.OS.preference=OS \u57FA\u672C\u8A2D\u5B9A\u306E\u66F4\u65B0
-label.action.update.OS.preference.processing=OS \u57FA\u672C\u8A2D\u5B9A\u3092\u66F4\u65B0\u3057\u3066\u3044\u307E\u3059...
-label.action.update.resource.count.processing=\u30EA\u30BD\u30FC\u30B9\u6570\u3092\u66F4\u65B0\u3057\u3066\u3044\u307E\u3059...
-label.action.update.resource.count=\u30EA\u30BD\u30FC\u30B9\u6570\u306E\u66F4\u65B0
-label.activate.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30A2\u30AF\u30C6\u30A3\u30D6\u5316
-label.active.sessions=\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30BB\u30C3\u30B7\u30E7\u30F3
-label.add.accounts.to=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u8FFD\u52A0\u5148\:
-label.add.accounts=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u8FFD\u52A0
-label.add.account.to.project=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u306E\u8FFD\u52A0
-label.add.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u8FFD\u52A0
-label.add.ACL=ACL \u306E\u8FFD\u52A0
-label.add.by.cidr=CIDR \u3067\u8FFD\u52A0
-label.add.by.group=\u30B0\u30EB\u30FC\u30D7\u3067\u8FFD\u52A0
-label.add.by=\u8FFD\u52A0\u5358\u4F4D
-label.add.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u8FFD\u52A0
-label.add.compute.offering=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0
-label.add.direct.iprange=\u76F4\u63A5 IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u8FFD\u52A0
-label.add.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0
-label.add.domain=\u30C9\u30E1\u30A4\u30F3\u306E\u8FFD\u52A0
-label.add.egress.rule=\u9001\u4FE1\u898F\u5247\u306E\u8FFD\u52A0
-label.add.F5.device=F5 \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0
-label.add.firewall=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u898F\u5247\u306E\u8FFD\u52A0
-label.add.guest.network=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8FFD\u52A0
-label.add.host=\u30DB\u30B9\u30C8\u306E\u8FFD\u52A0
-label.adding.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059
-label.adding.failed=\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-label.adding.pod=\u30DD\u30C3\u30C9\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059
-label.adding.processing=\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059...
-label.add.ingress.rule=\u53D7\u4FE1\u898F\u5247\u306E\u8FFD\u52A0
-label.adding.succeeded=\u8FFD\u52A0\u3057\u307E\u3057\u305F
-label.adding=\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059
-label.adding.user=\u30E6\u30FC\u30B6\u30FC\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059
-label.adding.zone=\u30BE\u30FC\u30F3\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059
-label.add.ip.range=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u8FFD\u52A0
-label.additional.networks=\u8FFD\u52A0\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF
-label.add.load.balancer=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u306E\u8FFD\u52A0
-label.add.more=\u305D\u306E\u307B\u304B\u306E\u9805\u76EE\u306E\u8FFD\u52A0
-label.add.netScaler.device=Netscaler \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0
-label.add.network.ACL=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ACL \u306E\u8FFD\u52A0
-label.add.network.device=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0
-label.add.network.offering=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0
-label.add.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8FFD\u52A0
-label.add.new.F5=\u65B0\u3057\u3044 F5 \u306E\u8FFD\u52A0
-label.add.new.gateway=\u65B0\u3057\u3044\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u8FFD\u52A0
-label.add.new.NetScaler=\u65B0\u3057\u3044 NetScaler \u306E\u8FFD\u52A0
-label.add.new.SRX=\u65B0\u3057\u3044 SRX \u306E\u8FFD\u52A0
-label.add.new.tier=\u65B0\u3057\u3044\u968E\u5C64\u306E\u8FFD\u52A0
+extractable=\u62bd\u51fa\u53ef\u80fd
+force.delete.domain.warning=\u8b66\u544a\: \u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3059\u308b\u3068\u3001\u3059\u3079\u3066\u306e\u5b50\u30c9\u30e1\u30a4\u30f3\u304a\u3088\u3073\u95a2\u9023\u3059\u308b\u3059\u3079\u3066\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u3068\u305d\u306e\u30ea\u30bd\u30fc\u30b9\u304c\u524a\u9664\u3055\u308c\u307e\u3059\u3002
+force.delete=\u5f37\u5236\u524a\u9664
+force.remove.host.warning=\u8b66\u544a\: \u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3059\u308b\u3068\u3001\u5b9f\u884c\u4e2d\u306e\u3059\u3079\u3066\u306e\u4eee\u60f3\u30de\u30b7\u30f3\u304c\u5f37\u5236\u7684\u306b\u505c\u6b62\u3055\u308c\u3001\u30af\u30e9\u30b9\u30bf\u30fc\u304b\u3089\u3053\u306e\u30db\u30b9\u30c8\u304c\u5f37\u5236\u7684\u306b\u89e3\u9664\u3055\u308c\u307e\u3059\u3002
+force.remove=\u5f37\u5236\u89e3\u9664
+force.stop.instance.warning=\u8b66\u544a\: \u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u5f37\u5236\u505c\u6b62\u306f\u3001\u6700\u7d42\u624b\u6bb5\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30c7\u30fc\u30bf\u3092\u640d\u5931\u3059\u308b\u3060\u3051\u3067\u306a\u304f\u3001\u4eee\u60f3\u30de\u30b7\u30f3\u306e\u52d5\u4f5c\u304c\u4e00\u8cab\u3057\u306a\u304f\u306a\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
+force.stop=\u5f37\u5236\u505c\u6b62
+ICMP.code=ICMP \u30b3\u30fc\u30c9
+ICMP.type=ICMP \u306e\u7a2e\u985e
+image.directory=\u753b\u50cf\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
+inline=\u76f4\u5217
+instances.actions.reboot.label=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u518d\u8d77\u52d5
+label.accept.project.invitation=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3078\u306e\u62db\u5f85\u306e\u627f\u8afe
+label.account.and.security.group=\u30a2\u30ab\u30a6\u30f3\u30c8\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7
+label.account.id=\u30a2\u30ab\u30a6\u30f3\u30c8 ID
+label.account.name=\u30a2\u30ab\u30a6\u30f3\u30c8\u540d
+label.account.specific=\u30a2\u30ab\u30a6\u30f3\u30c8\u56fa\u6709
+label.accounts=\u30a2\u30ab\u30a6\u30f3\u30c8
+label.account=\u30a2\u30ab\u30a6\u30f3\u30c8
+label.acquire.new.ip=\u65b0\u3057\u3044 IP \u30a2\u30c9\u30ec\u30b9\u306e\u53d6\u5f97
+label.action.attach.disk.processing=\u30c7\u30a3\u30b9\u30af\u3092\u30a2\u30bf\u30c3\u30c1\u3057\u3066\u3044\u307e\u3059...
+label.action.attach.disk=\u30c7\u30a3\u30b9\u30af\u306e\u30a2\u30bf\u30c3\u30c1
+label.action.attach.iso=ISO \u306e\u30a2\u30bf\u30c3\u30c1
+label.action.attach.iso.processing=ISO \u3092\u30a2\u30bf\u30c3\u30c1\u3057\u3066\u3044\u307e\u3059...
+label.action.cancel.maintenance.mode.processing=\u4fdd\u5b88\u30e2\u30fc\u30c9\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u3066\u3044\u307e\u3059...
+label.action.cancel.maintenance.mode=\u4fdd\u5b88\u30e2\u30fc\u30c9\u306e\u30ad\u30e3\u30f3\u30bb\u30eb
+label.action.change.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4
+label.action.change.service.processing=\u30b5\u30fc\u30d3\u30b9\u3092\u5909\u66f4\u3057\u3066\u3044\u307e\u3059...
+label.action.change.service=\u30b5\u30fc\u30d3\u30b9\u306e\u5909\u66f4
+label.action.copy.ISO=ISO \u306e\u30b3\u30d4\u30fc
+label.action.copy.ISO.processing=ISO \u3092\u30b3\u30d4\u30fc\u3057\u3066\u3044\u307e\u3059...
+label.action.copy.template.processing=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u30b3\u30d4\u30fc\u3057\u3066\u3044\u307e\u3059...
+label.action.copy.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30b3\u30d4\u30fc
+label.action.create.template.from.vm=VM \u304b\u3089\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u4f5c\u6210
+label.action.create.template.from.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u304b\u3089\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u4f5c\u6210
+label.action.create.template.processing=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059...
+label.action.create.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u4f5c\u6210
+label.action.create.vm.processing=VM \u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059...
+label.action.create.vm=VM \u306e\u4f5c\u6210
+label.action.create.volume.processing=\u30dc\u30ea\u30e5\u30fc\u30e0\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059...
+label.action.create.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u4f5c\u6210
+label.action.delete.account.processing=\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u524a\u9664
+label.action.delete.cluster.processing=\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u306e\u524a\u9664
+label.action.delete.disk.offering.processing=\u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.disk.offering=\u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u524a\u9664
+label.action.delete.domain.processing=\u30c9\u30e1\u30a4\u30f3\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.domain=\u30c9\u30e1\u30a4\u30f3\u306e\u524a\u9664
+label.action.delete.firewall.processing=\u30d5\u30a1\u30a4\u30a2\u30a6\u30a9\u30fc\u30eb\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.firewall=\u30d5\u30a1\u30a4\u30a2\u30a6\u30a9\u30fc\u30eb\u898f\u5247\u306e\u524a\u9664
+label.action.delete.ingress.rule.processing=\u53d7\u4fe1\u898f\u5247\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.ingress.rule=\u53d7\u4fe1\u898f\u5247\u306e\u524a\u9664
+label.action.delete.IP.range=IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u524a\u9664
+label.action.delete.IP.range.processing=IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.ISO=ISO \u306e\u524a\u9664
+label.action.delete.ISO.processing=ISO \u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.load.balancer.processing=\u8ca0\u8377\u5206\u6563\u88c5\u7f6e\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.load.balancer=\u8ca0\u8377\u5206\u6563\u898f\u5247\u306e\u524a\u9664
+label.action.delete.network.processing=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.network=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u524a\u9664
+label.action.delete.nexusVswitch=Nexus 1000V \u306e\u524a\u9664
+label.action.delete.physical.network=\u7269\u7406\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u524a\u9664
+label.action.delete.pod.processing=\u30dd\u30c3\u30c9\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.pod=\u30dd\u30c3\u30c9\u306e\u524a\u9664
+label.action.delete.primary.storage.processing=\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.primary.storage=\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u524a\u9664
+label.action.delete.secondary.storage.processing=\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.secondary.storage=\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u524a\u9664
+label.action.delete.security.group.processing=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.security.group=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664
+label.action.delete.service.offering.processing=\u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.service.offering=\u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u524a\u9664
+label.action.delete.snapshot.processing=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.snapshot=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u524a\u9664
+label.action.delete.system.service.offering=\u30b7\u30b9\u30c6\u30e0 \u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u524a\u9664
+label.action.delete.template.processing=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u524a\u9664
+label.action.delete.user.processing=\u30e6\u30fc\u30b6\u30fc\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.user=\u30e6\u30fc\u30b6\u30fc\u306e\u524a\u9664
+label.action.delete.volume.processing=\u30dc\u30ea\u30e5\u30fc\u30e0\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u524a\u9664
+label.action.delete.zone.processing=\u30be\u30fc\u30f3\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.delete.zone=\u30be\u30fc\u30f3\u306e\u524a\u9664
+label.action.destroy.instance.processing=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u7834\u68c4\u3057\u3066\u3044\u307e\u3059...
+label.action.destroy.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u7834\u68c4
+label.action.destroy.systemvm.processing=\u30b7\u30b9\u30c6\u30e0 VM \u3092\u7834\u68c4\u3057\u3066\u3044\u307e\u3059...
+label.action.destroy.systemvm=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u7834\u68c4
+label.action.detach.disk.processing=\u30c7\u30a3\u30b9\u30af\u3092\u30c7\u30bf\u30c3\u30c1\u3057\u3066\u3044\u307e\u3059...
+label.action.detach.disk=\u30c7\u30a3\u30b9\u30af\u306e\u30c7\u30bf\u30c3\u30c1
+label.action.detach.iso=ISO \u306e\u30c7\u30bf\u30c3\u30c1
+label.action.detach.iso.processing=ISO \u3092\u30c7\u30bf\u30c3\u30c1\u3057\u3066\u3044\u307e\u3059...
+label.action.disable.account.processing=\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u7121\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.disable.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u7121\u52b9\u5316
+label.action.disable.cluster.processing=\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u7121\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.disable.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u306e\u7121\u52b9\u5316
+label.action.disable.nexusVswitch=Nexus 1000V \u306e\u7121\u52b9\u5316
+label.action.disable.physical.network=\u7269\u7406\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u7121\u52b9\u5316
+label.action.disable.pod.processing=\u30dd\u30c3\u30c9\u3092\u7121\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.disable.pod=\u30dd\u30c3\u30c9\u306e\u7121\u52b9\u5316
+label.action.disable.static.NAT.processing=\u9759\u7684 NAT \u3092\u7121\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.disable.static.NAT=\u9759\u7684 NAT \u306e\u7121\u52b9\u5316
+label.action.disable.user.processing=\u30e6\u30fc\u30b6\u30fc\u3092\u7121\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.disable.user=\u30e6\u30fc\u30b6\u30fc\u306e\u7121\u52b9\u5316
+label.action.disable.zone.processing=\u30be\u30fc\u30f3\u3092\u7121\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.disable.zone=\u30be\u30fc\u30f3\u306e\u7121\u52b9\u5316
+label.action.download.ISO=ISO \u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
+label.action.download.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
+label.action.download.volume.processing=\u30dc\u30ea\u30e5\u30fc\u30e0\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059...
+label.action.download.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
+label.action.edit.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u7de8\u96c6
+label.action.edit.disk.offering=\u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u7de8\u96c6
+label.action.edit.domain=\u30c9\u30e1\u30a4\u30f3\u306e\u7de8\u96c6
+label.action.edit.global.setting=\u30b0\u30ed\u30fc\u30d0\u30eb\u8a2d\u5b9a\u306e\u7de8\u96c6
+label.action.edit.host=\u30db\u30b9\u30c8\u306e\u7de8\u96c6
+label.action.edit.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u7de8\u96c6
+label.action.edit.ISO=ISO \u306e\u7de8\u96c6
+label.action.edit.network.offering=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u7de8\u96c6
+label.action.edit.network.processing=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u7de8\u96c6\u3057\u3066\u3044\u307e\u3059...
+label.action.edit.network=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u7de8\u96c6
+label.action.edit.pod=\u30dd\u30c3\u30c9\u306e\u7de8\u96c6
+label.action.edit.primary.storage=\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u7de8\u96c6
+label.action.edit.resource.limits=\u30ea\u30bd\u30fc\u30b9\u5236\u9650\u306e\u7de8\u96c6
+label.action.edit.service.offering=\u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u7de8\u96c6
+label.action.edit.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u7de8\u96c6
+label.action.edit.user=\u30e6\u30fc\u30b6\u30fc\u306e\u7de8\u96c6
+label.action.edit.zone=\u30be\u30fc\u30f3\u306e\u7de8\u96c6
+label.action.enable.account.processing=\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.enable.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u6709\u52b9\u5316
+label.action.enable.cluster.processing=\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.enable.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u306e\u6709\u52b9\u5316
+label.action.enable.maintenance.mode.processing=\u4fdd\u5b88\u30e2\u30fc\u30c9\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.enable.maintenance.mode=\u4fdd\u5b88\u30e2\u30fc\u30c9\u306e\u6709\u52b9\u5316
+label.action.enable.nexusVswitch=Nexus 1000V \u306e\u6709\u52b9\u5316
+label.action.enable.physical.network=\u7269\u7406\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u6709\u52b9\u5316
+label.action.enable.pod.processing=\u30dd\u30c3\u30c9\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.enable.pod=\u30dd\u30c3\u30c9\u306e\u6709\u52b9\u5316
+label.action.enable.static.NAT.processing=\u9759\u7684 NAT \u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.enable.static.NAT=\u9759\u7684 NAT \u306e\u6709\u52b9\u5316
+label.action.enable.user.processing=\u30e6\u30fc\u30b6\u30fc\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.enable.user=\u30e6\u30fc\u30b6\u30fc\u306e\u6709\u52b9\u5316
+label.action.enable.zone.processing=\u30be\u30fc\u30f3\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.enable.zone=\u30be\u30fc\u30f3\u306e\u6709\u52b9\u5316
+label.action.force.reconnect.processing=\u518d\u63a5\u7d9a\u3057\u3066\u3044\u307e\u3059...
+label.action.force.reconnect=\u5f37\u5236\u518d\u63a5\u7d9a
+label.action.generate.keys.processing=\u30ad\u30fc\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059...
+label.action.generate.keys=\u30ad\u30fc\u306e\u751f\u6210
+label.action.list.nexusVswitch=Nexus 1000V \u306e\u4e00\u89a7\u8868\u793a
+label.action.lock.account.processing=\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u30ed\u30c3\u30af\u3057\u3066\u3044\u307e\u3059...
+label.action.lock.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30ed\u30c3\u30af
+label.action.manage.cluster.processing=\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u7ba1\u7406\u5bfe\u8c61\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.manage.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u306e\u7ba1\u7406\u5bfe\u8c61\u5316
+label.action.migrate.instance.processing=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u79fb\u884c\u3057\u3066\u3044\u307e\u3059...
+label.action.migrate.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u79fb\u884c
+label.action.migrate.router.processing=\u30eb\u30fc\u30bf\u30fc\u3092\u79fb\u884c\u3057\u3066\u3044\u307e\u3059...
+label.action.migrate.router=\u30eb\u30fc\u30bf\u30fc\u306e\u79fb\u884c
+label.action.migrate.systemvm.processing=\u30b7\u30b9\u30c6\u30e0 VM \u3092\u79fb\u884c\u3057\u3066\u3044\u307e\u3059...
+label.action.migrate.systemvm=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u79fb\u884c
+label.action.reboot.instance.processing=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u518d\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059...
+label.action.reboot.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u518d\u8d77\u52d5
+label.action.reboot.router.processing=\u30eb\u30fc\u30bf\u30fc\u3092\u518d\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059...
+label.action.reboot.router=\u30eb\u30fc\u30bf\u30fc\u306e\u518d\u8d77\u52d5
+label.action.reboot.systemvm.processing=\u30b7\u30b9\u30c6\u30e0 VM \u3092\u518d\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059...
+label.action.reboot.systemvm=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u518d\u8d77\u52d5
+label.action.recurring.snapshot=\u5b9a\u671f\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8
+label.action.register.iso=ISO \u306e\u767b\u9332
+label.action.register.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u767b\u9332
+label.action.release.ip=IP \u30a2\u30c9\u30ec\u30b9\u306e\u89e3\u653e
+label.action.release.ip.processing=IP \u30a2\u30c9\u30ec\u30b9\u3092\u89e3\u653e\u3057\u3066\u3044\u307e\u3059...
+label.action.remove.host.processing=\u30db\u30b9\u30c8\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.action.remove.host=\u30db\u30b9\u30c8\u306e\u524a\u9664
+label.action.reset.password.processing=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u30ea\u30bb\u30c3\u30c8\u3057\u3066\u3044\u307e\u3059...
+label.action.reset.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u30ea\u30bb\u30c3\u30c8
+label.action.resource.limits=\u30ea\u30bd\u30fc\u30b9\u5236\u9650
+label.action.restore.instance.processing=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u5fa9\u5143\u3057\u3066\u3044\u307e\u3059...
+label.action.restore.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u5fa9\u5143
+label.action.start.instance.processing=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059...
+label.action.start.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u8d77\u52d5
+label.action.start.router.processing=\u30eb\u30fc\u30bf\u30fc\u3092\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059...
+label.action.start.router=\u30eb\u30fc\u30bf\u30fc\u306e\u8d77\u52d5
+label.action.start.systemvm.processing=\u30b7\u30b9\u30c6\u30e0 VM \u3092\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059...
+label.action.start.systemvm=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u8d77\u52d5
+label.action.stop.instance.processing=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u505c\u6b62\u3057\u3066\u3044\u307e\u3059...
+label.action.stop.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u505c\u6b62
+label.action.stop.router.processing=\u30eb\u30fc\u30bf\u30fc\u3092\u505c\u6b62\u3057\u3066\u3044\u307e\u3059...
+label.action.stop.router=\u30eb\u30fc\u30bf\u30fc\u306e\u505c\u6b62
+label.action.stop.systemvm.processing=\u30b7\u30b9\u30c6\u30e0 VM \u3092\u505c\u6b62\u3057\u3066\u3044\u307e\u3059...
+label.action.stop.systemvm=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u505c\u6b62
+label.actions=\u64cd\u4f5c
+label.action.take.snapshot.processing=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059....
+label.action.take.snapshot=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u4f5c\u6210
+label.action.unmanage.cluster.processing=\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u975e\u7ba1\u7406\u5bfe\u8c61\u306b\u3057\u3066\u3044\u307e\u3059...
+label.action.unmanage.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u306e\u975e\u7ba1\u7406\u5bfe\u8c61\u5316
+label.action.update.OS.preference=OS \u57fa\u672c\u8a2d\u5b9a\u306e\u66f4\u65b0
+label.action.update.OS.preference.processing=OS \u57fa\u672c\u8a2d\u5b9a\u3092\u66f4\u65b0\u3057\u3066\u3044\u307e\u3059...
+label.action.update.resource.count.processing=\u30ea\u30bd\u30fc\u30b9\u6570\u3092\u66f4\u65b0\u3057\u3066\u3044\u307e\u3059...
+label.action.update.resource.count=\u30ea\u30bd\u30fc\u30b9\u6570\u306e\u66f4\u65b0
+label.activate.project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30af\u30c6\u30a3\u30d6\u5316
+label.active.sessions=\u30a2\u30af\u30c6\u30a3\u30d6\u306a\u30bb\u30c3\u30b7\u30e7\u30f3
+label.add.accounts.to=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u8ffd\u52a0\u5148\:
+label.add.accounts=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u8ffd\u52a0
+label.add.account.to.project=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3078\u306e\u8ffd\u52a0
+label.add.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u8ffd\u52a0
+label.add.ACL=ACL \u306e\u8ffd\u52a0
+label.add.by.cidr=CIDR \u3067\u8ffd\u52a0
+label.add.by.group=\u30b0\u30eb\u30fc\u30d7\u3067\u8ffd\u52a0
+label.add.by=\u8ffd\u52a0\u5358\u4f4d
+label.add.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u306e\u8ffd\u52a0
+label.add.compute.offering=\u30b3\u30f3\u30d4\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8ffd\u52a0
+label.add.direct.iprange=\u76f4\u63a5 IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u8ffd\u52a0
+label.add.disk.offering=\u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8ffd\u52a0
+label.add.domain=\u30c9\u30e1\u30a4\u30f3\u306e\u8ffd\u52a0
+label.add.egress.rule=\u9001\u4fe1\u898f\u5247\u306e\u8ffd\u52a0
+label.add.F5.device=F5 \u30c7\u30d0\u30a4\u30b9\u306e\u8ffd\u52a0
+label.add.firewall=\u30d5\u30a1\u30a4\u30a2\u30a6\u30a9\u30fc\u30eb\u898f\u5247\u306e\u8ffd\u52a0
+label.add.guest.network=\u30b2\u30b9\u30c8 \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u8ffd\u52a0
+label.add.host=\u30db\u30b9\u30c8\u306e\u8ffd\u52a0
+label.adding.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
+label.adding.failed=\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+label.adding.pod=\u30dd\u30c3\u30c9\u3092\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
+label.adding.processing=\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059...
+label.add.ingress.rule=\u53d7\u4fe1\u898f\u5247\u306e\u8ffd\u52a0
+label.adding.succeeded=\u8ffd\u52a0\u3057\u307e\u3057\u305f
+label.adding=\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
+label.adding.user=\u30e6\u30fc\u30b6\u30fc\u3092\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
+label.adding.zone=\u30be\u30fc\u30f3\u3092\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
+label.add.ip.range=IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u8ffd\u52a0
+label.additional.networks=\u8ffd\u52a0\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af
+label.add.load.balancer=\u8ca0\u8377\u5206\u6563\u88c5\u7f6e\u306e\u8ffd\u52a0
+label.add.more=\u305d\u306e\u307b\u304b\u306e\u9805\u76ee\u306e\u8ffd\u52a0
+label.add.netScaler.device=Netscaler \u30c7\u30d0\u30a4\u30b9\u306e\u8ffd\u52a0
+label.add.network.ACL=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af ACL \u306e\u8ffd\u52a0
+label.add.network.device=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30c7\u30d0\u30a4\u30b9\u306e\u8ffd\u52a0
+label.add.network.offering=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8ffd\u52a0
+label.add.network=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u8ffd\u52a0
+label.add.new.F5=\u65b0\u3057\u3044 F5 \u306e\u8ffd\u52a0
+label.add.new.gateway=\u65b0\u3057\u3044\u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u306e\u8ffd\u52a0
+label.add.new.NetScaler=\u65b0\u3057\u3044 NetScaler \u306e\u8ffd\u52a0
+label.add.new.SRX=\u65b0\u3057\u3044 SRX \u306e\u8ffd\u52a0
+label.add.new.tier=\u65b0\u3057\u3044\u968e\u5c64\u306e\u8ffd\u52a0
label.add.NiciraNvp.device=NVP\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u8ffd\u52a0
-label.add.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8FFD\u52A0
-label.add.pod=\u30DD\u30C3\u30C9\u306E\u8FFD\u52A0
-label.add.port.forwarding.rule=\u30DD\u30FC\u30C8\u8EE2\u9001\u898F\u5247\u306E\u8FFD\u52A0
-label.add.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u8FFD\u52A0
-label.add.resources=\u30EA\u30BD\u30FC\u30B9\u306E\u8FFD\u52A0
-label.add.route=\u30EB\u30FC\u30C8\u306E\u8FFD\u52A0
-label.add.rule=\u898F\u5247\u306E\u8FFD\u52A0
-label.add.secondary.storage=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u8FFD\u52A0
-label.add.security.group=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u306E\u8FFD\u52A0
-label.add.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0
-label.add.SRX.device=SRX \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0
-label.add.static.nat.rule=\u9759\u7684 NAT \u898F\u5247\u306E\u8FFD\u52A0
-label.add.static.route=\u9759\u7684\u30EB\u30FC\u30C8\u306E\u8FFD\u52A0
-label.add.system.service.offering=\u30B7\u30B9\u30C6\u30E0 \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0
-label.add.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u8FFD\u52A0
-label.add.to.group=\u30B0\u30EB\u30FC\u30D7\u3078\u306E\u8FFD\u52A0
-label.add=\u8FFD\u52A0
-label.add.user=\u30E6\u30FC\u30B6\u30FC\u306E\u8FFD\u52A0
-label.add.vlan=VLAN \u306E\u8FFD\u52A0
-label.add.vms.to.lb=\u8CA0\u8377\u5206\u6563\u898F\u5247\u3078\u306E VM \u306E\u8FFD\u52A0
-label.add.vms=VM \u306E\u8FFD\u52A0
-label.add.VM.to.tier=\u968E\u5C64\u3078\u306E VM \u306E\u8FFD\u52A0
-label.add.vm=VM \u306E\u8FFD\u52A0
-label.add.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u8FFD\u52A0
-label.add.vpc=VPC \u306E\u8FFD\u52A0
-label.add.vpn.customer.gateway=VPN \u30AB\u30B9\u30BF\u30DE\u30FC \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u8FFD\u52A0
-label.add.VPN.gateway=VPN \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u8FFD\u52A0
-label.add.vpn.user=VPN \u30E6\u30FC\u30B6\u30FC\u306E\u8FFD\u52A0
-label.add.zone=\u30BE\u30FC\u30F3\u306E\u8FFD\u52A0
-label.admin.accounts=\u7BA1\u7406\u8005\u30A2\u30AB\u30A6\u30F3\u30C8
-label.admin=\u7BA1\u7406\u8005
-label.advanced.mode=\u62E1\u5F35\u30E2\u30FC\u30C9
-label.advanced.search=\u9AD8\u5EA6\u306A\u691C\u7D22
-label.advanced=\u62E1\u5F35
-label.agent.password=\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8 \u30D1\u30B9\u30EF\u30FC\u30C9
-label.agent.username=\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8 \u30E6\u30FC\u30B6\u30FC\u540D
-label.agree=\u540C\u610F\u3059\u308B
-label.alert=\u30A2\u30E9\u30FC\u30C8
-label.algorithm=\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0
-label.allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F
-label.allocation.state=\u5272\u308A\u5F53\u3066\u72B6\u614B
-label.api.key=API \u30AD\u30FC
+label.add.physical.network=\u7269\u7406\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u8ffd\u52a0
+label.add.pod=\u30dd\u30c3\u30c9\u306e\u8ffd\u52a0
+label.add.port.forwarding.rule=\u30dd\u30fc\u30c8\u8ee2\u9001\u898f\u5247\u306e\u8ffd\u52a0
+label.add.primary.storage=\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u8ffd\u52a0
+label.add.resources=\u30ea\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0
+label.add.route=\u30eb\u30fc\u30c8\u306e\u8ffd\u52a0
+label.add.rule=\u898f\u5247\u306e\u8ffd\u52a0
+label.add.secondary.storage=\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u8ffd\u52a0
+label.add.security.group=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u306e\u8ffd\u52a0
+label.add.service.offering=\u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8ffd\u52a0
+label.add.SRX.device=SRX \u30c7\u30d0\u30a4\u30b9\u306e\u8ffd\u52a0
+label.add.static.nat.rule=\u9759\u7684 NAT \u898f\u5247\u306e\u8ffd\u52a0
+label.add.static.route=\u9759\u7684\u30eb\u30fc\u30c8\u306e\u8ffd\u52a0
+label.add.system.service.offering=\u30b7\u30b9\u30c6\u30e0 \u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8ffd\u52a0
+label.add.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u8ffd\u52a0
+label.add.to.group=\u30b0\u30eb\u30fc\u30d7\u3078\u306e\u8ffd\u52a0
+label.add=\u8ffd\u52a0
+label.add.user=\u30e6\u30fc\u30b6\u30fc\u306e\u8ffd\u52a0
+label.add.vlan=VLAN \u306e\u8ffd\u52a0
+label.add.vms.to.lb=\u8ca0\u8377\u5206\u6563\u898f\u5247\u3078\u306e VM \u306e\u8ffd\u52a0
+label.add.vms=VM \u306e\u8ffd\u52a0
+label.add.VM.to.tier=\u968e\u5c64\u3078\u306e VM \u306e\u8ffd\u52a0
+label.add.vm=VM \u306e\u8ffd\u52a0
+label.add.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u8ffd\u52a0
+label.add.vpc=VPC \u306e\u8ffd\u52a0
+label.add.vpn.customer.gateway=VPN \u30ab\u30b9\u30bf\u30de\u30fc \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u306e\u8ffd\u52a0
+label.add.VPN.gateway=VPN \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u306e\u8ffd\u52a0
+label.add.vpn.user=VPN \u30e6\u30fc\u30b6\u30fc\u306e\u8ffd\u52a0
+label.add.zone=\u30be\u30fc\u30f3\u306e\u8ffd\u52a0
+label.admin.accounts=\u7ba1\u7406\u8005\u30a2\u30ab\u30a6\u30f3\u30c8
+label.admin=\u7ba1\u7406\u8005
+label.advanced.mode=\u62e1\u5f35\u30e2\u30fc\u30c9
+label.advanced.search=\u9ad8\u5ea6\u306a\u691c\u7d22
+label.advanced=\u62e1\u5f35
+label.agent.password=\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8 \u30d1\u30b9\u30ef\u30fc\u30c9
+label.agent.username=\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8 \u30e6\u30fc\u30b6\u30fc\u540d
+label.agree=\u540c\u610f\u3059\u308b
+label.alert=\u30a2\u30e9\u30fc\u30c8
+label.algorithm=\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0
+label.allocated=\u5272\u308a\u5f53\u3066\u6e08\u307f
+label.allocation.state=\u5272\u308a\u5f53\u3066\u72b6\u614b
+label.api.key=API \u30ad\u30fc
label.apply=\u9069\u7528
-label.assign.to.load.balancer=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u5272\u308A\u5F53\u3066\u3066\u3044\u307E\u3059
-label.assign=\u5272\u308A\u5F53\u3066
-label.associated.network.id=\u95A2\u9023\u3065\u3051\u3089\u308C\u305F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ID
-label.associated.network=\u95A2\u9023\u3065\u3051\u3089\u308C\u305F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF
-label.attached.iso=\u30A2\u30BF\u30C3\u30C1\u3055\u308C\u305F ISO
-label.availability=\u53EF\u7528\u6027
-label.availability.zone=\u5229\u7528\u53EF\u80FD\u30BE\u30FC\u30F3
-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
-label.back=\u623B\u308B
-label.bandwidth=\u5E2F\u57DF\u5E45
-label.basic.mode=\u57FA\u672C\u30E2\u30FC\u30C9
-label.basic=\u57FA\u672C
-label.bootable=\u8D77\u52D5\u53EF\u80FD
-label.broadcast.domain.range=\u30D6\u30ED\u30FC\u30C9\u30AD\u30E3\u30B9\u30C8 \u30C9\u30E1\u30A4\u30F3\u306E\u7BC4\u56F2
-label.broadcast.domain.type=\u30D6\u30ED\u30FC\u30C9\u30AD\u30E3\u30B9\u30C8 \u30C9\u30E1\u30A4\u30F3\u306E\u7A2E\u985E
+label.assign.to.load.balancer=\u8ca0\u8377\u5206\u6563\u88c5\u7f6e\u306b\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u5272\u308a\u5f53\u3066\u3066\u3044\u307e\u3059
+label.assign=\u5272\u308a\u5f53\u3066
+label.associated.network.id=\u95a2\u9023\u3065\u3051\u3089\u308c\u305f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af ID
+label.associated.network=\u95a2\u9023\u3065\u3051\u3089\u308c\u305f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af
+label.attached.iso=\u30a2\u30bf\u30c3\u30c1\u3055\u308c\u305f ISO
+label.availability=\u53ef\u7528\u6027
+label.availability.zone=\u5229\u7528\u53ef\u80fd\u30be\u30fc\u30f3
+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
+label.back=\u623b\u308b
+label.bandwidth=\u5e2f\u57df\u5e45
+label.basic.mode=\u57fa\u672c\u30e2\u30fc\u30c9
+label.basic=\u57fa\u672c
+label.bootable=\u8d77\u52d5\u53ef\u80fd
+label.broadcast.domain.range=\u30d6\u30ed\u30fc\u30c9\u30ad\u30e3\u30b9\u30c8 \u30c9\u30e1\u30a4\u30f3\u306e\u7bc4\u56f2
+label.broadcast.domain.type=\u30d6\u30ed\u30fc\u30c9\u30ad\u30e3\u30b9\u30c8 \u30c9\u30e1\u30a4\u30f3\u306e\u7a2e\u985e
label.broadcast.uri=Broadcast URI
-label.by.account=\u30A2\u30AB\u30A6\u30F3\u30C8
-label.by.availability=\u53EF\u7528\u6027
-label.by.domain=\u30C9\u30E1\u30A4\u30F3
-label.by.end.date=\u7D42\u4E86\u65E5
-label.by.level=\u30EC\u30D9\u30EB
-label.by.pod=\u30DD\u30C3\u30C9
-label.by.role=\u5F79\u5272
-label.by.start.date=\u958B\u59CB\u65E5
-label.by.state=\u72B6\u614B
-label.bytes.received=\u53D7\u4FE1\u30D0\u30A4\u30C8
-label.bytes.sent=\u9001\u4FE1\u30D0\u30A4\u30C8
-label.by.traffic.type=\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E
-label.by.type.id=\u7A2E\u985E ID
-label.by.type=\u7A2E\u985E
-label.by.zone=\u30BE\u30FC\u30F3
-label.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-label.capacity=\u51E6\u7406\u80FD\u529B
-label.certificate=\u8A3C\u660E\u66F8
-label.change.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u5909\u66F4
-label.change.value=\u5024\u306E\u5909\u66F4
-label.character=\u6587\u5B57
-label.checksum=MD5 \u30C1\u30A7\u30C3\u30AF\u30B5\u30E0
-label.cidr.account=CIDR \u307E\u305F\u306F\u30A2\u30AB\u30A6\u30F3\u30C8/\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7
+label.by.account=\u30a2\u30ab\u30a6\u30f3\u30c8
+label.by.availability=\u53ef\u7528\u6027
+label.by.domain=\u30c9\u30e1\u30a4\u30f3
+label.by.end.date=\u7d42\u4e86\u65e5
+label.by.level=\u30ec\u30d9\u30eb
+label.by.pod=\u30dd\u30c3\u30c9
+label.by.role=\u5f79\u5272
+label.by.start.date=\u958b\u59cb\u65e5
+label.by.state=\u72b6\u614b
+label.bytes.received=\u53d7\u4fe1\u30d0\u30a4\u30c8
+label.bytes.sent=\u9001\u4fe1\u30d0\u30a4\u30c8
+label.by.traffic.type=\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u306e\u7a2e\u985e
+label.by.type.id=\u7a2e\u985e ID
+label.by.type=\u7a2e\u985e
+label.by.zone=\u30be\u30fc\u30f3
+label.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+label.capacity=\u51e6\u7406\u80fd\u529b
+label.certificate=\u8a3c\u660e\u66f8
+label.change.service.offering=\u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u5909\u66f4
+label.change.value=\u5024\u306e\u5909\u66f4
+label.character=\u6587\u5b57
+label.checksum=MD5 \u30c1\u30a7\u30c3\u30af\u30b5\u30e0
+label.cidr.account=CIDR \u307e\u305f\u306f\u30a2\u30ab\u30a6\u30f3\u30c8/\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7
label.cidr=CIDR
-label.CIDR.list=CIDR \u4E00\u89A7
-label.cidr.list=\u9001\u4FE1\u5143 CIDR
-label.CIDR.of.destination.network=\u5B9B\u5148\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E CIDR
-label.clean.up=\u30AF\u30EA\u30FC\u30F3 \u30A2\u30C3\u30D7
-label.clear.list=\u4E00\u89A7\u306E\u6D88\u53BB
-label.close=\u9589\u3058\u308B
-label.cloud.console=\u30AF\u30E9\u30A6\u30C9\u7BA1\u7406\u30B3\u30F3\u30BD\u30FC\u30EB
-label.cloud.managed=Cloud.com \u306B\u3088\u308B\u7BA1\u7406
-label.cluster.name=\u30AF\u30E9\u30B9\u30BF\u30FC\u540D
-label.clusters=\u30AF\u30E9\u30B9\u30BF\u30FC
-label.cluster.type=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7A2E\u985E
-label.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC
+label.CIDR.list=CIDR \u4e00\u89a7
+label.cidr.list=\u9001\u4fe1\u5143 CIDR
+label.CIDR.of.destination.network=\u5b9b\u5148\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e CIDR
+label.clean.up=\u30af\u30ea\u30fc\u30f3 \u30a2\u30c3\u30d7
+label.clear.list=\u4e00\u89a7\u306e\u6d88\u53bb
+label.close=\u9589\u3058\u308b
+label.cloud.console=\u30af\u30e9\u30a6\u30c9\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb
+label.cloud.managed=Cloud.com \u306b\u3088\u308b\u7ba1\u7406
+label.cluster.name=\u30af\u30e9\u30b9\u30bf\u30fc\u540d
+label.clusters=\u30af\u30e9\u30b9\u30bf\u30fc
+label.cluster.type=\u30af\u30e9\u30b9\u30bf\u30fc\u306e\u7a2e\u985e
+label.cluster=\u30af\u30e9\u30b9\u30bf\u30fc
label.clvm=CLVM
-label.code=\u30B3\u30FC\u30C9
-label.community=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3
-label.compute.and.storage=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0\u3068\u30B9\u30C8\u30EC\u30FC\u30B8
-label.compute.offerings=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0
-label.compute.offering=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0
-label.compute=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0
-label.configuration=\u69CB\u6210
-label.configure.network.ACLs=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ACL \u306E\u69CB\u6210
-label.configure=\u69CB\u6210
-label.configure.vpc=VPC \u306E\u69CB\u6210
-label.confirmation=\u78BA\u8A8D
-label.confirm.password=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u78BA\u8A8D\u5165\u529B
-label.congratulations=\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u306F\u3053\u308C\u3067\u5B8C\u4E86\u3067\u3059\u3002
-label.conserve.mode=\u7BC0\u7D04\u30E2\u30FC\u30C9
-label.console.proxy=\u30B3\u30F3\u30BD\u30FC\u30EB \u30D7\u30ED\u30AD\u30B7
-label.continue.basic.install=\u57FA\u672C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7D9A\u884C\u3059\u308B
-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.code=\u30b3\u30fc\u30c9
+label.community=\u30b3\u30df\u30e5\u30cb\u30c6\u30a3
+label.compute.and.storage=\u30b3\u30f3\u30d4\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0\u3068\u30b9\u30c8\u30ec\u30fc\u30b8
+label.compute.offerings=\u30b3\u30f3\u30d4\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
+label.compute.offering=\u30b3\u30f3\u30d4\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
+label.compute=\u30b3\u30f3\u30d4\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0
+label.configuration=\u69cb\u6210
+label.configure.network.ACLs=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af ACL \u306e\u69cb\u6210
+label.configure=\u69cb\u6210
+label.configure.vpc=VPC \u306e\u69cb\u6210
+label.confirmation=\u78ba\u8a8d
+label.confirm.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u78ba\u8a8d\u5165\u529b
+label.congratulations=\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u306f\u3053\u308c\u3067\u5b8c\u4e86\u3067\u3059\u3002
+label.conserve.mode=\u7bc0\u7d04\u30e2\u30fc\u30c9
+label.console.proxy=\u30b3\u30f3\u30bd\u30fc\u30eb \u30d7\u30ed\u30ad\u30b7
+label.continue.basic.install=\u57fa\u672c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u7d9a\u884c\u3059\u308b
+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 \u5236\u9650
label.cpu=CPU
label.cpu.mhz=CPU (MHz)
-label.cpu.utilized=CPU \u4F7F\u7528\u7387
-label.created.by.system=\u30B7\u30B9\u30C6\u30E0\u4F5C\u6210
-label.created=\u4F5C\u6210\u65E5\u6642
-label.create.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210
-label.create.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u4F5C\u6210
-label.create.VPN.connection=VPN \u63A5\u7D9A\u306E\u4F5C\u6210
-label.cross.zones=\u30AF\u30ED\u30B9 \u30BE\u30FC\u30F3
-label.custom.disk.size=\u30AB\u30B9\u30BF\u30E0 \u30C7\u30A3\u30B9\u30AF \u30B5\u30A4\u30BA
-label.daily=\u6BCE\u65E5
-label.data.disk.offering=\u30C7\u30FC\u30BF \u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0
-label.date=\u65E5\u6642
-label.day.of.month=\u6BCE\u6708\u6307\u5B9A\u65E5
-label.day.of.week=\u6BCE\u9031\u6307\u5B9A\u65E5
-label.dead.peer.detection=\u505C\u6B62\u30D4\u30A2\u306E\u691C\u51FA
-label.decline.invitation=\u62DB\u5F85\u306E\u8F9E\u9000
-label.dedicated=\u5C02\u7528
-label.default=\u30C7\u30D5\u30A9\u30EB\u30C8
-label.default.use=\u30C7\u30D5\u30A9\u30EB\u30C8\u4F7F\u7528
-label.default.view=\u30C7\u30D5\u30A9\u30EB\u30C8 \u30D3\u30E5\u30FC
-label.delete.F5=F5 \u306E\u524A\u9664
-label.delete.gateway=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u524A\u9664
-label.delete.NetScaler=NetScaler \u306E\u524A\u9664
+label.cpu.utilized=CPU \u4f7f\u7528\u7387
+label.created.by.system=\u30b7\u30b9\u30c6\u30e0\u4f5c\u6210
+label.created=\u4f5c\u6210\u65e5\u6642
+label.create.project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4f5c\u6210
+label.create.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u4f5c\u6210
+label.create.VPN.connection=VPN \u63a5\u7d9a\u306e\u4f5c\u6210
+label.cross.zones=\u30af\u30ed\u30b9 \u30be\u30fc\u30f3
+label.custom.disk.size=\u30ab\u30b9\u30bf\u30e0 \u30c7\u30a3\u30b9\u30af \u30b5\u30a4\u30ba
+label.daily=\u6bce\u65e5
+label.data.disk.offering=\u30c7\u30fc\u30bf \u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
+label.date=\u65e5\u6642
+label.day.of.month=\u6bce\u6708\u6307\u5b9a\u65e5
+label.day.of.week=\u6bce\u9031\u6307\u5b9a\u65e5
+label.dead.peer.detection=\u505c\u6b62\u30d4\u30a2\u306e\u691c\u51fa
+label.decline.invitation=\u62db\u5f85\u306e\u8f9e\u9000
+label.dedicated=\u5c02\u7528
+label.default=\u30c7\u30d5\u30a9\u30eb\u30c8
+label.default.use=\u30c7\u30d5\u30a9\u30eb\u30c8\u4f7f\u7528
+label.default.view=\u30c7\u30d5\u30a9\u30eb\u30c8 \u30d3\u30e5\u30fc
+label.delete.F5=F5 \u306e\u524a\u9664
+label.delete.gateway=\u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u306e\u524a\u9664
+label.delete.NetScaler=NetScaler \u306e\u524a\u9664
label.delete.NiciraNvp=NVP\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u524a\u9664
-label.delete.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u524A\u9664
-label.delete.SRX=SRX \u306E\u524A\u9664
-label.delete=\u524A\u9664
-label.delete.VPN.connection=VPN \u63A5\u7D9A\u306E\u524A\u9664
-label.delete.VPN.customer.gateway=VPN \u30AB\u30B9\u30BF\u30DE\u30FC \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u524A\u9664
-label.delete.VPN.gateway=VPN \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u524A\u9664
-label.delete.vpn.user=VPN \u30E6\u30FC\u30B6\u30FC\u306E\u524A\u9664
-label.deleting.failed=\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-label.deleting.processing=\u524A\u9664\u3057\u3066\u3044\u307E\u3059...
-label.description=\u8AAC\u660E
-label.destination.physical.network.id=\u30D6\u30EA\u30C3\u30B8\u5148\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ID
-label.destination.zone=\u30B3\u30D4\u30FC\u5148\u30BE\u30FC\u30F3
-label.destroy.router=\u30EB\u30FC\u30BF\u30FC\u306E\u7834\u68C4
+label.delete.project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u524a\u9664
+label.delete.SRX=SRX \u306e\u524a\u9664
+label.delete=\u524a\u9664
+label.delete.VPN.connection=VPN \u63a5\u7d9a\u306e\u524a\u9664
+label.delete.VPN.customer.gateway=VPN \u30ab\u30b9\u30bf\u30de\u30fc \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u306e\u524a\u9664
+label.delete.VPN.gateway=VPN \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u306e\u524a\u9664
+label.delete.vpn.user=VPN \u30e6\u30fc\u30b6\u30fc\u306e\u524a\u9664
+label.deleting.failed=\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+label.deleting.processing=\u524a\u9664\u3057\u3066\u3044\u307e\u3059...
+label.description=\u8aac\u660e
+label.destination.physical.network.id=\u30d6\u30ea\u30c3\u30b8\u5148\u7269\u7406\u30cd\u30c3\u30c8\u30ef\u30fc\u30af ID
+label.destination.zone=\u30b3\u30d4\u30fc\u5148\u30be\u30fc\u30f3
+label.destroy.router=\u30eb\u30fc\u30bf\u30fc\u306e\u7834\u68c4
label.destroy=\u7834\u68c4
-label.detaching.disk=\u30C7\u30A3\u30B9\u30AF\u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059
-label.details=\u8A73\u7D30
-label.device.id=\u30C7\u30D0\u30A4\u30B9 ID
-label.devices=\u30C7\u30D0\u30A4\u30B9
+label.detaching.disk=\u30c7\u30a3\u30b9\u30af\u3092\u30c7\u30bf\u30c3\u30c1\u3057\u3066\u3044\u307e\u3059
+label.details=\u8a73\u7d30
+label.device.id=\u30c7\u30d0\u30a4\u30b9 ID
+label.devices=\u30c7\u30d0\u30a4\u30b9
label.dhcp=DHCP
-label.DHCP.server.type=DHCP \u30B5\u30FC\u30D0\u30FC\u306E\u7A2E\u985E
-label.direct.ips=\u76F4\u63A5 IP \u30A2\u30C9\u30EC\u30B9
-label.disabled=\u7121\u52B9
-label.disable.provider=\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u306E\u7121\u52B9\u5316
-label.disable.vpn=VPN \u306E\u7121\u52B9\u5316
-label.disabling.vpn.access=VPN \u30A2\u30AF\u30BB\u30B9\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059
-label.disk.allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F\u306E\u30C7\u30A3\u30B9\u30AF
-label.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0
-label.disk.size.gb=\u30C7\u30A3\u30B9\u30AF \u30B5\u30A4\u30BA (GB \u5358\u4F4D)
-label.disk.size=\u30C7\u30A3\u30B9\u30AF \u30B5\u30A4\u30BA
-label.disk.total=\u30C7\u30A3\u30B9\u30AF\u5408\u8A08
-label.disk.volume=\u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0
-label.display.name=\u8868\u793A\u540D
-label.display.text=\u8868\u793A\u30C6\u30AD\u30B9\u30C8
+label.DHCP.server.type=DHCP \u30b5\u30fc\u30d0\u30fc\u306e\u7a2e\u985e
+label.direct.ips=\u76f4\u63a5 IP \u30a2\u30c9\u30ec\u30b9
+label.disabled=\u7121\u52b9
+label.disable.provider=\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc\u306e\u7121\u52b9\u5316
+label.disable.vpn=VPN \u306e\u7121\u52b9\u5316
+label.disabling.vpn.access=VPN \u30a2\u30af\u30bb\u30b9\u3092\u7121\u52b9\u306b\u3057\u3066\u3044\u307e\u3059
+label.disk.allocated=\u5272\u308a\u5f53\u3066\u6e08\u307f\u306e\u30c7\u30a3\u30b9\u30af
+label.disk.offering=\u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
+label.disk.size.gb=\u30c7\u30a3\u30b9\u30af \u30b5\u30a4\u30ba (GB \u5358\u4f4d)
+label.disk.size=\u30c7\u30a3\u30b9\u30af \u30b5\u30a4\u30ba
+label.disk.total=\u30c7\u30a3\u30b9\u30af\u5408\u8a08
+label.disk.volume=\u30c7\u30a3\u30b9\u30af \u30dc\u30ea\u30e5\u30fc\u30e0
+label.display.name=\u8868\u793a\u540d
+label.display.text=\u8868\u793a\u30c6\u30ad\u30b9\u30c8
label.dns.1=DNS 1
label.dns.2=DNS 2
label.dns=DNS
-label.DNS.domain.for.guest.networks=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E DNS \u30C9\u30E1\u30A4\u30F3
-label.domain.admin=\u30C9\u30E1\u30A4\u30F3\u7BA1\u7406\u8005
-label.domain.id=\u30C9\u30E1\u30A4\u30F3 ID
-label.domain.name=\u30C9\u30E1\u30A4\u30F3\u540D
-label.domain.router=\u30C9\u30E1\u30A4\u30F3 \u30EB\u30FC\u30BF\u30FC
-label.domain.suffix=DNS \u30C9\u30E1\u30A4\u30F3 \u30B5\u30D5\u30A3\u30C3\u30AF\u30B9 (\u4F8B\: xyz.com)
-label.domain=\u30C9\u30E1\u30A4\u30F3
-label.done=\u5B8C\u4E86
-label.double.quotes.are.not.allowed=\u4E8C\u91CD\u5F15\u7528\u7B26\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-label.download.progress=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u306E\u9032\u6357\u72B6\u6CC1
-label.drag.new.position=\u65B0\u3057\u3044\u4F4D\u7F6E\u306B\u30C9\u30E9\u30C3\u30B0
-label.edit.lb.rule=\u8CA0\u8377\u5206\u6563\u898F\u5247\u306E\u7DE8\u96C6
-label.edit.network.details=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8A73\u7D30\u306E\u7DE8\u96C6
-label.edit.project.details=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u8A73\u7D30\u306E\u7DE8\u96C6
-label.edit.tags=\u30BF\u30B0\u306E\u7DE8\u96C6
-label.edit.traffic.type=\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E\u306E\u7DE8\u96C6
-label.edit=\u7DE8\u96C6
-label.edit.vpc=VPC \u306E\u7DE8\u96C6
+label.DNS.domain.for.guest.networks=\u30b2\u30b9\u30c8 \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e DNS \u30c9\u30e1\u30a4\u30f3
+label.domain.admin=\u30c9\u30e1\u30a4\u30f3\u7ba1\u7406\u8005
+label.domain.id=\u30c9\u30e1\u30a4\u30f3 ID
+label.domain.name=\u30c9\u30e1\u30a4\u30f3\u540d
+label.domain.router=\u30c9\u30e1\u30a4\u30f3 \u30eb\u30fc\u30bf\u30fc
+label.domain.suffix=DNS \u30c9\u30e1\u30a4\u30f3 \u30b5\u30d5\u30a3\u30c3\u30af\u30b9 (\u4f8b\: xyz.com)
+label.domain=\u30c9\u30e1\u30a4\u30f3
+label.done=\u5b8c\u4e86
+label.double.quotes.are.not.allowed=\u4e8c\u91cd\u5f15\u7528\u7b26\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
+label.download.progress=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306e\u9032\u6357\u72b6\u6cc1
+label.drag.new.position=\u65b0\u3057\u3044\u4f4d\u7f6e\u306b\u30c9\u30e9\u30c3\u30b0
+label.edit.lb.rule=\u8ca0\u8377\u5206\u6563\u898f\u5247\u306e\u7de8\u96c6
+label.edit.network.details=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u8a73\u7d30\u306e\u7de8\u96c6
+label.edit.project.details=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a73\u7d30\u306e\u7de8\u96c6
+label.edit.tags=\u30bf\u30b0\u306e\u7de8\u96c6
+label.edit.traffic.type=\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u306e\u7a2e\u985e\u306e\u7de8\u96c6
+label.edit=\u7de8\u96c6
+label.edit.vpc=VPC \u306e\u7de8\u96c6
label.egress.rules=\u9001\u4fe1\u30eb\u30fc\u30eb
-label.egress.rule=\u9001\u4FE1\u898F\u5247
-label.elastic.IP=\u30A8\u30E9\u30B9\u30C6\u30A3\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9
-label.elastic.LB=\u30A8\u30E9\u30B9\u30C6\u30A3\u30C3\u30AF\u8CA0\u8377\u5206\u6563
-label.elastic=\u30A8\u30E9\u30B9\u30C6\u30A3\u30C3\u30AF
-label.email=\u96FB\u5B50\u30E1\u30FC\u30EB
-label.enable.provider=\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u306E\u6709\u52B9\u5316
+label.egress.rule=\u9001\u4fe1\u898f\u5247
+label.elastic.IP=\u30a8\u30e9\u30b9\u30c6\u30a3\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9
+label.elastic.LB=\u30a8\u30e9\u30b9\u30c6\u30a3\u30c3\u30af\u8ca0\u8377\u5206\u6563
+label.elastic=\u30a8\u30e9\u30b9\u30c6\u30a3\u30c3\u30af
+label.email=\u96fb\u5b50\u30e1\u30fc\u30eb
+label.enable.provider=\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc\u306e\u6709\u52b9\u5316
label.enable.s3=S3\u57fa\u76e4\u30bb\u30ab\u30f3\u30c0\u30ea\u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u6709\u52b9\u5316
-label.enable.swift=Swift \u306E\u6709\u52B9\u5316
-label.enable.vpn=VPN \u306E\u6709\u52B9\u5316
-label.enabling.vpn.access=VPN \u30A2\u30AF\u30BB\u30B9\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059
-label.enabling.vpn=VPN \u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059
-label.end.IP=\u7D42\u4E86 IP \u30A2\u30C9\u30EC\u30B9
-label.endpoint.or.operation=\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u307E\u305F\u306F\u64CD\u4F5C
+label.enable.swift=Swift \u306e\u6709\u52b9\u5316
+label.enable.vpn=VPN \u306e\u6709\u52b9\u5316
+label.enabling.vpn.access=VPN \u30a2\u30af\u30bb\u30b9\u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059
+label.enabling.vpn=VPN \u3092\u6709\u52b9\u306b\u3057\u3066\u3044\u307e\u3059
+label.end.IP=\u7d42\u4e86 IP \u30a2\u30c9\u30ec\u30b9
+label.endpoint.or.operation=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u307e\u305f\u306f\u64cd\u4f5c
label.endpoint=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8
-label.end.port=\u7D42\u4E86\u30DD\u30FC\u30C8
-label.end.reserved.system.IP=\u4E88\u7D04\u6E08\u307F\u7D42\u4E86\u30B7\u30B9\u30C6\u30E0 IP \u30A2\u30C9\u30EC\u30B9
-label.end.vlan=\u7D42\u4E86 VLAN
-label.enter.token=\u30C8\u30FC\u30AF\u30F3\u306E\u5165\u529B
-label.error.code=\u30A8\u30E9\u30FC \u30B3\u30FC\u30C9
-label.error=\u30A8\u30E9\u30FC
-label.ESP.encryption=ESP \u6697\u53F7\u5316
-label.ESP.hash=ESP \u30CF\u30C3\u30B7\u30E5
-label.ESP.policy=ESP \u30DD\u30EA\u30B7\u30FC
-label.esx.host=ESX/ESXi \u30DB\u30B9\u30C8
-label.example=\u4F8B
+label.end.port=\u7d42\u4e86\u30dd\u30fc\u30c8
+label.end.reserved.system.IP=\u4e88\u7d04\u6e08\u307f\u7d42\u4e86\u30b7\u30b9\u30c6\u30e0 IP \u30a2\u30c9\u30ec\u30b9
+label.end.vlan=\u7d42\u4e86 VLAN
+label.enter.token=\u30c8\u30fc\u30af\u30f3\u306e\u5165\u529b
+label.error.code=\u30a8\u30e9\u30fc \u30b3\u30fc\u30c9
+label.error=\u30a8\u30e9\u30fc
+label.ESP.encryption=ESP \u6697\u53f7\u5316
+label.ESP.hash=ESP \u30cf\u30c3\u30b7\u30e5
+label.ESP.policy=ESP \u30dd\u30ea\u30b7\u30fc
+label.esx.host=ESX/ESXi \u30db\u30b9\u30c8
+label.example=\u4f8b
label.f5=F5
label.failed=\u5931\u6557
-label.featured=\u304A\u3059\u3059\u3081
-label.fetch.latest=\u6700\u65B0\u60C5\u5831\u306E\u53D6\u5F97
-label.filterBy=\u30D5\u30A3\u30EB\u30BF\u30FC
-label.firewall=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB
-label.first.name=\u540D
-label.format=\u5F62\u5F0F
-label.friday=\u91D1\u66DC\u65E5
-label.full.path=\u30D5\u30EB \u30D1\u30B9
-label.full=\u5B8C\u5168
-label.gateway=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4
-label.general.alerts=\u4E00\u822C\u30A2\u30E9\u30FC\u30C8
-label.generating.url=URL \u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059
-label.go.step.2=\u624B\u9806 2 \u306B\u9032\u3080
-label.go.step.3=\u624B\u9806 3 \u306B\u9032\u3080
-label.go.step.4=\u624B\u9806 4 \u306B\u9032\u3080
-label.go.step.5=\u624B\u9806 5 \u306B\u9032\u3080
-label.group.optional=\u30B0\u30EB\u30FC\u30D7 (\u30AA\u30D7\u30B7\u30E7\u30F3)
-label.group=\u30B0\u30EB\u30FC\u30D7
-label.guest.cidr=\u30B2\u30B9\u30C8 CIDR
-label.guest.end.ip=\u30B2\u30B9\u30C8\u306E\u7D42\u4E86 IP \u30A2\u30C9\u30EC\u30B9
-label.guest.gateway=\u30B2\u30B9\u30C8 \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4
-label.guest.ip.range=\u30B2\u30B9\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2
-label.guest.ip=\u30B2\u30B9\u30C8 IP \u30A2\u30C9\u30EC\u30B9
-label.guest.netmask=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30DE\u30B9\u30AF
-label.guest.networks=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF
-label.guest.start.ip=\u30B2\u30B9\u30C8\u306E\u958B\u59CB IP \u30A2\u30C9\u30EC\u30B9
-label.guest.traffic=\u30B2\u30B9\u30C8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF
-label.guest.type=\u30B2\u30B9\u30C8\u306E\u7A2E\u985E
-label.guest=\u30B2\u30B9\u30C8
-label.ha.enabled=\u9AD8\u53EF\u7528\u6027\u6709\u52B9
-label.help=\u30D8\u30EB\u30D7
-label.hide.ingress.rule=\u53D7\u4FE1\u898F\u5247\u3092\u96A0\u3059
-label.hints=\u30D2\u30F3\u30C8
-label.host.alerts=\u30DB\u30B9\u30C8 \u30A2\u30E9\u30FC\u30C8
-label.host.MAC=\u30DB\u30B9\u30C8\u306E MAC
-label.host.name=\u30DB\u30B9\u30C8\u540D
-label.hosts=\u30DB\u30B9\u30C8
+label.featured=\u304a\u3059\u3059\u3081
+label.fetch.latest=\u6700\u65b0\u60c5\u5831\u306e\u53d6\u5f97
+label.filterBy=\u30d5\u30a3\u30eb\u30bf\u30fc
+label.firewall=\u30d5\u30a1\u30a4\u30a2\u30a6\u30a9\u30fc\u30eb
+label.first.name=\u540d
+label.format=\u5f62\u5f0f
+label.friday=\u91d1\u66dc\u65e5
+label.full.path=\u30d5\u30eb \u30d1\u30b9
+label.full=\u5b8c\u5168
+label.gateway=\u30b2\u30fc\u30c8\u30a6\u30a7\u30a4
+label.general.alerts=\u4e00\u822c\u30a2\u30e9\u30fc\u30c8
+label.generating.url=URL \u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059
+label.go.step.2=\u624b\u9806 2 \u306b\u9032\u3080
+label.go.step.3=\u624b\u9806 3 \u306b\u9032\u3080
+label.go.step.4=\u624b\u9806 4 \u306b\u9032\u3080
+label.go.step.5=\u624b\u9806 5 \u306b\u9032\u3080
+label.group.optional=\u30b0\u30eb\u30fc\u30d7 (\u30aa\u30d7\u30b7\u30e7\u30f3)
+label.group=\u30b0\u30eb\u30fc\u30d7
+label.guest.cidr=\u30b2\u30b9\u30c8 CIDR
+label.guest.end.ip=\u30b2\u30b9\u30c8\u306e\u7d42\u4e86 IP \u30a2\u30c9\u30ec\u30b9
+label.guest.gateway=\u30b2\u30b9\u30c8 \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4
+label.guest.ip.range=\u30b2\u30b9\u30c8 IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2
+label.guest.ip=\u30b2\u30b9\u30c8 IP \u30a2\u30c9\u30ec\u30b9
+label.guest.netmask=\u30b2\u30b9\u30c8 \u30cd\u30c3\u30c8\u30de\u30b9\u30af
+label.guest.networks=\u30b2\u30b9\u30c8 \u30cd\u30c3\u30c8\u30ef\u30fc\u30af
+label.guest.start.ip=\u30b2\u30b9\u30c8\u306e\u958b\u59cb IP \u30a2\u30c9\u30ec\u30b9
+label.guest.traffic=\u30b2\u30b9\u30c8 \u30c8\u30e9\u30d5\u30a3\u30c3\u30af
+label.guest.type=\u30b2\u30b9\u30c8\u306e\u7a2e\u985e
+label.guest=\u30b2\u30b9\u30c8
+label.ha.enabled=\u9ad8\u53ef\u7528\u6027\u6709\u52b9
+label.help=\u30d8\u30eb\u30d7
+label.hide.ingress.rule=\u53d7\u4fe1\u898f\u5247\u3092\u96a0\u3059
+label.hints=\u30d2\u30f3\u30c8
+label.host.alerts=\u30db\u30b9\u30c8 \u30a2\u30e9\u30fc\u30c8
+label.host.MAC=\u30db\u30b9\u30c8\u306e MAC
+label.host.name=\u30db\u30b9\u30c8\u540d
+label.hosts=\u30db\u30b9\u30c8
label.host.tags=\u00e3\u0083\u009b\u00e3\u0082\u00b9\u00e3\u0083\u0088\u00e3\u0082\u00bf\u00e3\u0082\u00b0
-label.host=\u30DB\u30B9\u30C8
-label.hourly=\u6BCE\u6642
-label.hypervisor.capabilities=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u306E\u6A5F\u80FD
-label.hypervisor.type=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u306E\u7A2E\u985E
-label.hypervisor=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC
-label.hypervisor.version=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
+label.host=\u30db\u30b9\u30c8
+label.hourly=\u6bce\u6642
+label.hypervisor.capabilities=\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u306e\u6a5f\u80fd
+label.hypervisor.type=\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u306e\u7a2e\u985e
+label.hypervisor=\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc
+label.hypervisor.version=\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u306e\u30d0\u30fc\u30b8\u30e7\u30f3
label.id=ID
label.IKE.DH=IKE DH
-label.IKE.encryption=IKE \u6697\u53F7\u5316
-label.IKE.hash=IKE \u30CF\u30C3\u30B7\u30E5
-label.IKE.policy=IKE \u30DD\u30EA\u30B7\u30FC
-label.info=\u60C5\u5831
-label.ingress.rule=\u53D7\u4FE1\u898F\u5247
-label.initiated.by=\u958B\u59CB\u30E6\u30FC\u30B6\u30FC
-label.installWizard.addClusterIntro.subtitle=\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u3064\u3044\u3066
-label.installWizard.addClusterIntro.title=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046
-label.installWizard.addHostIntro.subtitle=\u30DB\u30B9\u30C8\u306B\u3064\u3044\u3066
-label.installWizard.addHostIntro.title=\u30DB\u30B9\u30C8\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046
-label.installWizard.addPodIntro.subtitle=\u30DD\u30C3\u30C9\u306B\u3064\u3044\u3066
-label.installWizard.addPodIntro.title=\u30DD\u30C3\u30C9\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046
-label.installWizard.addPrimaryStorageIntro.subtitle=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306B\u3064\u3044\u3066
-label.installWizard.addPrimaryStorageIntro.title=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046
+label.IKE.encryption=IKE \u6697\u53f7\u5316
+label.IKE.hash=IKE \u30cf\u30c3\u30b7\u30e5
+label.IKE.policy=IKE \u30dd\u30ea\u30b7\u30fc
+label.info=\u60c5\u5831
+label.ingress.rule=\u53d7\u4fe1\u898f\u5247
+label.initiated.by=\u958b\u59cb\u30e6\u30fc\u30b6\u30fc
+label.installWizard.addClusterIntro.subtitle=\u30af\u30e9\u30b9\u30bf\u30fc\u306b\u3064\u3044\u3066
+label.installWizard.addClusterIntro.title=\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u8ffd\u52a0\u3057\u307e\u3057\u3087\u3046
+label.installWizard.addHostIntro.subtitle=\u30db\u30b9\u30c8\u306b\u3064\u3044\u3066
+label.installWizard.addHostIntro.title=\u30db\u30b9\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u3087\u3046
+label.installWizard.addPodIntro.subtitle=\u30dd\u30c3\u30c9\u306b\u3064\u3044\u3066
+label.installWizard.addPodIntro.title=\u30dd\u30c3\u30c9\u3092\u8ffd\u52a0\u3057\u307e\u3057\u3087\u3046
+label.installWizard.addPrimaryStorageIntro.subtitle=\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306b\u3064\u3044\u3066
+label.installWizard.addPrimaryStorageIntro.title=\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u3087\u3046
label.installWizard.addSecondaryStorageIntro.subtitle=\u30bb\u30ab\u30f3\u30c0\u30ea\u30fc\u30b9\u30c8\u30ec\u30fc\u30b8\u3068\u306f\uff1f
-label.installWizard.addSecondaryStorageIntro.title=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046
-label.installWizard.addZoneIntro.subtitle=\u30BE\u30FC\u30F3\u306B\u3064\u3044\u3066
-label.installWizard.addZoneIntro.title=\u30BE\u30FC\u30F3\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046
-label.installWizard.addZone.title=\u30BE\u30FC\u30F3\u306E\u8FFD\u52A0
-label.installWizard.click.launch=[\u8D77\u52D5] \u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-label.installWizard.subtitle=\u3053\u306E\u30AC\u30A4\u30C9 \u30C4\u30A2\u30FC\u306F CloudStack&\#8482; \u74B0\u5883\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u306B\u5F79\u7ACB\u3061\u307E\u3059
-label.installWizard.title=CloudStack&\#8482; \u3078\u3088\u3046\u3053\u305D
-label.instance.limits=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5236\u9650
-label.instance.name=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u540D
-label.instances=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9
-label.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9
-label.internal.dns.1=\u5185\u90E8 DNS 1
-label.internal.dns.2=\u5185\u90E8 DNS 2
-label.internal.name=\u5185\u90E8\u540D
-label.interval.type=\u9593\u9694\u306E\u7A2E\u985E
-label.introduction.to.cloudstack=CloudStack&\#8482; \u306E\u7D39\u4ECB
-label.invalid.integer=\u7121\u52B9\u306A\u6574\u6570
-label.invalid.number=\u7121\u52B9\u306A\u6570
-label.invitations=\u62DB\u5F85\u72B6
-label.invited.accounts=\u62DB\u5F85\u6E08\u307F\u30A2\u30AB\u30A6\u30F3\u30C8
-label.invite.to=\u62DB\u5F85\u3059\u308B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\:
-label.invite=\u62DB\u5F85
-label.ip.address=IP \u30A2\u30C9\u30EC\u30B9
-label.ipaddress=IP \u30A2\u30C9\u30EC\u30B9
-label.ip.allocations=IP \u30A2\u30C9\u30EC\u30B9\u306E\u5272\u308A\u5F53\u3066
+label.installWizard.addSecondaryStorageIntro.title=\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u3087\u3046
+label.installWizard.addZoneIntro.subtitle=\u30be\u30fc\u30f3\u306b\u3064\u3044\u3066
+label.installWizard.addZoneIntro.title=\u30be\u30fc\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u3087\u3046
+label.installWizard.addZone.title=\u30be\u30fc\u30f3\u306e\u8ffd\u52a0
+label.installWizard.click.launch=[\u8d77\u52d5] \u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+label.installWizard.subtitle=\u3053\u306e\u30ac\u30a4\u30c9 \u30c4\u30a2\u30fc\u306f CloudStack&\#8482; \u74b0\u5883\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u306b\u5f79\u7acb\u3061\u307e\u3059
+label.inst
<TRUNCATED>
[49/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Merge branch 'master' into internallb1
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
setup/db/db/schema-410to420.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b24a764
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b24a764
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b24a764
Branch: refs/heads/internallb
Commit: 7b24a7640c53e5b5ab4493de309b43714f4646c6
Parents: 440e848 a0dbf89
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Apr 29 15:49:48 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Apr 29 16:12:10 2013 -0700
----------------------------------------------------------------------
agent/conf/agent.properties | 2 +-
.../com/cloud/agent/api/UnregisterVMCommand.java | 34 +
.../cloud/configuration/ConfigurationService.java | 15 +-
api/src/com/cloud/hypervisor/HypervisorGuru.java | 9 +
api/src/com/cloud/network/NetworkModel.java | 2 +-
api/src/com/cloud/network/NetworkService.java | 2 +-
.../region/ha/GlobalLoadBalancingRulesService.java | 3 +
api/src/com/cloud/vm/UserVmService.java | 27 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 24 +
.../apache/cloudstack/api/ResponseGenerator.java | 4 +-
.../api/command/admin/cluster/ListClustersCmd.java | 8 +-
.../api/command/admin/config/ListCfgsByCmd.java | 44 +-
.../api/command/admin/config/UpdateCfgCmd.java | 47 +-
.../api/command/admin/host/ListHostsCmd.java | 7 +
.../admin/internallb/ListInternalLBVMsCmd.java | 7 +
.../api/command/admin/pod/ListPodsByCmd.java | 7 +
.../api/command/admin/router/ListRoutersCmd.java | 7 +
.../command/admin/storage/ListStoragePoolsCmd.java | 7 +
.../command/admin/systemvm/ListSystemVMsCmd.java | 7 +
.../api/command/user/iso/ListIsosCmd.java | 7 +
.../api/command/user/network/ListNetworksCmd.java | 7 +
.../command/user/snapshot/ListSnapshotsCmd.java | 7 +
.../command/user/template/ListTemplatesCmd.java | 8 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 9 +-
.../api/command/user/vm/DeployVMCmd.java | 12 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 10 +-
.../api/command/user/vm/UpdateVMCmd.java | 2 +-
.../api/command/user/volume/ListVolumesCmd.java | 7 +
.../api/command/user/zone/ListZonesByCmd.java | 8 +
.../api/response/ConfigurationResponse.java | 3 +
.../api/response/GlobalLoadBalancerResponse.java | 10 +
.../api/command/test/AddIpToVmNicTest.java | 6 +-
.../com/cloud/bridge/service/core/s3/S3Engine.java | 2 +-
.../WEB-INF/classes/resources/messages.properties | 561 ++--
.../classes/resources/messages_ar.properties | 285 ++
.../classes/resources/messages_ca.properties | 307 ++
.../classes/resources/messages_de_DE.properties | 748 ++++
.../classes/resources/messages_es.properties | 862 +++++
.../classes/resources/messages_fr_FR.properties | 1842 +++++-----
.../classes/resources/messages_it_IT.properties | 618 +++
.../classes/resources/messages_ja.properties | 2904 +++++++-------
.../classes/resources/messages_ko_KR.properties | 2883 +++++++-------
.../classes/resources/messages_nb_NO.properties | 366 ++
.../classes/resources/messages_pt_BR.properties | 2092 +++++------
.../classes/resources/messages_ru_RU.properties | 2890 +++++++--------
.../classes/resources/messages_zh_CN.properties | 2986 +++++++--------
client/pom.xml | 11 +-
client/tomcatconf/applicationContext.xml.in | 4 +
core/src/com/cloud/async/AsyncJobVO.java | 1 +
core/src/com/cloud/vm/UserVmVO.java | 6 +-
docs/en-US/about-working-with-vms.xml | 85 +-
docs/en-US/added-API-commands-4.2.xml | 24 +
docs/en-US/append-displayname-vms.xml | 84 +
docs/en-US/changed-API-commands-4.2.xml | 27 +
docs/en-US/creating-network-offerings.xml | 45 +
docs/en-US/delete-event-alerts.xml | 59 +
docs/en-US/elastic-ip.xml | 90 +
docs/en-US/events.xml | 5 +-
docs/en-US/guest-ip-ranges.xml | 10 +-
docs/en-US/images/add-vlan-icon.png | Bin 0 -> 860 bytes
docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 55568 bytes
docs/en-US/network-offerings.xml | 83 +-
docs/en-US/networks.xml | 1 +
docs/en-US/non-contiguous-vlan.xml | 68 +
docs/en-US/set-up-network-for-users.xml | 13 +-
docs/en-US/using-netscaler-load-balancers.xml | 132 +-
docs/en-US/virtual-machines.xml | 1 +
docs/en-US/vlan-provisioning.xml | 2 +
packaging/centos63/package.sh | 4 +-
.../debian/config/etc/init.d/cloud-early-config | 8 +
.../hypervisor/kvm/resource/KVMHAMonitor.java | 7 +-
.../hypervisor/kvm/resource/LibvirtConnection.java | 14 +-
.../kvm/storage/KVMStoragePoolManager.java | 12 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 9 +
.../hypervisor/vmware/resource/VmwareResource.java | 44 +-
scripts/vm/network/security_group.py | 2 +-
server/src/com/cloud/alert/AlertManagerImpl.java | 27 +-
server/src/com/cloud/api/ApiDBUtils.java | 11 +-
server/src/com/cloud/api/ApiDispatcher.java | 9 -
server/src/com/cloud/api/ApiResponseHelper.java | 69 +-
server/src/com/cloud/api/ApiServer.java | 155 +-
server/src/com/cloud/api/ApiServerService.java | 1 +
server/src/com/cloud/api/ApiServlet.java | 6 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 45 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 6 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 6 +-
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 6 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 6 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +-
.../src/com/cloud/api/query/vo/AccountJoinVO.java | 6 +-
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 6 +-
server/src/com/cloud/api/query/vo/HostJoinVO.java | 6 +-
.../cloud/api/query/vo/SecurityGroupJoinVO.java | 6 +-
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 6 +-
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 6 +-
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 6 +-
.../src/com/cloud/api/query/vo/VolumeJoinVO.java | 6 +-
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 | 175 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 25 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 5 +
.../network/ExternalFirewallDeviceManagerImpl.java | 2 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 8 +-
server/src/com/cloud/network/NetworkModelImpl.java | 11 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 39 +-
.../network/firewall/FirewallManagerImpl.java | 12 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 2 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 6 +-
.../com/cloud/server/ConfigurationServerImpl.java | 11 +-
server/src/com/cloud/server/Criteria.java | 1 +
.../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 +-
.../storage/snapshot/SnapshotManagerImpl.java | 32 +-
.../com/cloud/template/TemplateAdapterBase.java | 7 +-
.../com/cloud/template/TemplateManagerImpl.java | 10 +-
.../upgrade/PremiumDatabaseUpgradeChecker.java | 75 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 111 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 26 +
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 14 +
.../com/cloud/network/MockNetworkManagerImpl.java | 3 +-
.../com/cloud/network/MockNetworkModelImpl.java | 2 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 48 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 45 +-
.../test/com/cloud/vm/dao/UserVmDaoImplTest.java | 43 +-
.../cloud/vm/dao/UserVmDaoTestConfiguration.java | 50 +
.../cloud/vpc/MockConfigurationManagerImpl.java | 8 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 3 +-
.../test/com/cloud/vpc/MockNetworkModelImpl.java | 2 +-
.../affinity/AffinityApiTestConfiguration.java | 29 +-
.../networkoffering/ChildTestConfiguration.java | 38 +-
server/test/resources/UserVMDaoTestContext.xml | 44 +
.../resource/NfsSecondaryStorageResource.java | 22 +
setup/db/db/schema-410to420.sql | 116 +-
.../component/test_multiple_ip_ranges.py | 238 ++
test/integration/component/test_vpn_users.py | 447 +++
test/integration/smoke/test_affinity_groups.py | 10 +-
.../smoke/test_deploy_vm_with_userdata.py | 144 +
test/integration/smoke/test_global_settings.py | 14 +-
test/integration/smoke/test_public_ip_range.py | 6 +-
test/integration/smoke/test_vm_life_cycle.py | 28 +-
tools/marvin/marvin/asyncJobMgr.py | 70 +-
tools/marvin/marvin/cloudstackConnection.py | 49 +-
tools/marvin/marvin/cloudstackTestClient.py | 53 +-
tools/marvin/marvin/codegenerator.py | 4 +-
tools/marvin/marvin/dbConnection.py | 6 +-
tools/marvin/marvin/deployDataCenter.py | 7 +
tools/marvin/marvin/integration/lib/base.py | 607 +++-
tools/marvin/marvin/integration/lib/utils.py | 17 +-
tools/marvin/marvin/remoteSSHClient.py | 18 +-
tools/transifex/.tx/config | 32 +
tools/transifex/README-transifex.txt | 71 +
tools/transifex/sync-transifex-ui.sh | 160 +
ui/css/cloudstack3.css | 83 +-
ui/dictionary.jsp | 1710 +++++-----
ui/images/icons.png | Bin 50745 -> 50052 bytes
ui/images/sprites.png | Bin 188552 -> 192407 bytes
ui/index.jsp | 27 +-
ui/scripts/affinity.js | 183 +
ui/scripts/cloudStack.js | 9 +-
ui/scripts/domains.js | 2 +-
ui/scripts/events.js | 8 +-
ui/scripts/instanceWizard.js | 941 +++---
ui/scripts/instances.js | 165 +-
ui/scripts/regions.js | 112 +-
ui/scripts/sharedFunctions.js | 4 +
ui/scripts/storage.js | 14 +-
ui/scripts/system.js | 450 ++-
ui/scripts/ui-custom/affinity.js | 173 +
ui/scripts/ui-custom/instanceWizard.js | 19 +
ui/scripts/ui/widgets/detailView.js | 29 +-
ui/scripts/ui/widgets/listView.js | 10 +-
181 files changed, 17443 insertions(+), 10706 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/api/src/com/cloud/network/NetworkModel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/api/src/org/apache/cloudstack/api/ResponseGenerator.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/ResponseGenerator.java
index 6512516,cbf8bb2..571901d
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@@ -19,8 -19,8 +19,9 @@@ package org.apache.cloudstack.api
import java.text.DecimalFormat;
import java.util.EnumSet;
import java.util.List;
+import java.util.Map;
+ import com.cloud.vm.NicSecondaryIp;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
@@@ -415,12 -390,9 +416,11 @@@ public interface ResponseGenerator
TrafficMonitorResponse createTrafficMonitorResponse(Host trafficMonitor);
VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot);
- NicSecondaryIpResponse createSecondaryIPToNicResponse(String ip,
- Long nicId, Long networkId);
+ NicSecondaryIpResponse createSecondaryIPToNicResponse(NicSecondaryIp result);
public NicResponse createNicResponse(Nic result);
+ ApplicationLoadBalancerResponse createLoadBalancerContainerReponse(ApplicationLoadBalancerRule lb, Map<Ip, UserVm> lbInstances);
+
AffinityGroupResponse createAffinityGroupResponse(AffinityGroup group);
Long getAffinityGroupId(String name, long entityOwnerId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
index 5c80e58,0000000..e314b32
mode 100644,000000..100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
@@@ -1,144 -1,0 +1,151 @@@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.internallb;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.DomainRouterResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
+import org.apache.cloudstack.api.response.PodResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VpcResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.log4j.Logger;
+
+import com.cloud.async.AsyncJob;
+import com.cloud.network.router.VirtualRouter.Role;
+
+@APICommand(name = "listInternalLoadBalancerVMs", description="List internal LB VMs.", responseObject=DomainRouterResponse.class)
+public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd {
+ public static final Logger s_logger = Logger.getLogger(ListInternalLBVMsCmd.class.getName());
+
+ private static final String s_name = "listinternallbvmssresponse";
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name=ApiConstants.HOST_ID, type=CommandType.UUID, entityType=HostResponse.class,
+ description="the host ID of the Internal LB VM")
+ private Long hostId;
+
+ @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=UserVmResponse.class,
+ description="the ID of the Internal LB VM")
+ private Long id;
+
+ @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the name of the Internal LB VM")
+ private String routerName;
+
+ @Parameter(name=ApiConstants.POD_ID, type=CommandType.UUID, entityType=PodResponse.class,
+ description="the Pod ID of the Internal LB VM")
+ private Long podId;
+
+ @Parameter(name=ApiConstants.STATE, type=CommandType.STRING, description="the state of the Internal LB VM")
+ private String state;
+
+ @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class,
+ description="the Zone ID of the Internal LB VM")
+ private Long zoneId;
+
+ @Parameter(name=ApiConstants.NETWORK_ID, type=CommandType.UUID, entityType=NetworkResponse.class,
+ description="list by network id")
+ private Long networkId;
+
+ @Parameter(name=ApiConstants.VPC_ID, type=CommandType.UUID, entityType=VpcResponse.class,
+ description="List Internal LB VMs by VPC")
+ private Long vpcId;
+
+ @Parameter(name=ApiConstants.FOR_VPC, type=CommandType.BOOLEAN, description="if true is passed for this parameter, list only VPC Internal LB VMs")
+ private Boolean forVpc;
+
++ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
++ private String zoneType;
++
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getHostId() {
+ return hostId;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getRouterName() {
+ return routerName;
+ }
+
+ public Long getPodId() {
+ return podId;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public Long getNetworkId() {
+ return networkId;
+ }
+
+ public Long getVpcId() {
+ return vpcId;
+ }
+
+ public Boolean getForVpc() {
+ return forVpc;
+ }
+
+ public String getRole() {
+ return Role.INTERNAL_LB_VM.toString();
+ }
++
++ public String getZoneType() {
++ return zoneType;
++ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ @Override
+ public AsyncJob.Type getInstanceType() {
+ return AsyncJob.Type.DomainRouter;
+ }
+
+ @Override
+ public void execute(){
+ ListResponse<DomainRouterResponse> response = _queryService.searchForInternalLbVms(this);
+ response.setResponseName(getCommandName());
+ this.setResponseObject(response);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/client/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/client/tomcatconf/applicationContext.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiDBUtils.java
index 9c8fd68,e291c84..f071ffd
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@@ -493,9 -495,9 +496,10 @@@ public class ApiDBUtils
@Inject private VMSnapshotDao vmSnapshotDao;
@Inject private NicSecondaryIpDao nicSecondaryIpDao;
@Inject private VpcProvisioningService vpcProvSvc;
+ @Inject private ApplicationLoadBalancerRuleDao _appLbDao;
@Inject private AffinityGroupDao affinityGroupDao;
@Inject private AffinityGroupJoinDao affinityGroupJoinDao;
+ @Inject private GlobalLoadBalancingRulesService gslbService;
@PostConstruct
void init() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiResponseHelper.java
index 2162fda,6090ff0..f88f7c8
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@@ -34,10 -34,9 +34,11 @@@ import java.util.TimeZone
import javax.inject.Inject;
+ import com.cloud.vm.*;
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+import org.apache.cloudstack.affinity.AffinityGroup;
+import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.BaseCmd;
@@@ -273,19 -264,40 +274,42 @@@ import com.cloud.user.UserContext
import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
import com.cloud.utils.StringUtils;
+import com.cloud.utils.net.Ip;
import com.cloud.utils.net.NetUtils;
import com.cloud.vm.VirtualMachine.Type;
import com.cloud.vm.dao.NicSecondaryIpVO;
import com.cloud.vm.snapshot.VMSnapshot;
+
+ import org.apache.cloudstack.acl.ControlledEntity;
+ import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+ import org.apache.cloudstack.affinity.AffinityGroup;
+ import org.apache.cloudstack.affinity.AffinityGroupResponse;
+ import org.apache.cloudstack.api.ApiConstants.HostDetails;
+ import org.apache.cloudstack.api.ApiConstants.VMDetails;
+ import org.apache.cloudstack.api.BaseCmd;
+ import org.apache.cloudstack.api.ResponseGenerator;
+ import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
+ import org.apache.cloudstack.api.response.*;
+ import org.apache.cloudstack.region.Region;
+ import org.apache.cloudstack.usage.Usage;
+ import org.apache.cloudstack.usage.UsageService;
+ import org.apache.cloudstack.usage.UsageTypes;
+ import com.cloud.vm.dao.UserVmData;
+ import com.cloud.vm.dao.UserVmData.NicData;
+ import com.cloud.vm.dao.UserVmData.SecurityGroupData;
+ import com.cloud.vm.snapshot.VMSnapshot;
+ import org.apache.cloudstack.api.ResponseGenerator;
+ import org.apache.cloudstack.api.response.VMSnapshotResponse;
+ import org.apache.log4j.Logger;
+
+ import java.text.DecimalFormat;
+ import java.util.*;
+
+ import javax.inject.Inject;
+
+ import static java.util.Collections.emptyList;
+ import static java.util.Collections.singletonList;
+
@Component
public class ApiResponseHelper implements ResponseGenerator {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/QueryManagerImpl.java
index 3edbc94,50018e5..808b1ef
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@@ -975,32 -981,27 +983,32 @@@ public class QueryManagerImpl extends M
@Override
public ListResponse<DomainRouterResponse> searchForRouters(ListRoutersCmd cmd) {
- Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd);
+ Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(),
+ cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(),
- cmd.getVpcId(), cmd.getForVpc(), cmd.getRole());
++ cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getZoneType());
ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
response.setResponses(routerResponses, result.second());
return response;
}
+
+ @Override
+ public ListResponse<DomainRouterResponse> searchForInternalLbVms(ListInternalLBVMsCmd cmd) {
+ Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(),
+ cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(),
- cmd.getVpcId(), cmd.getForVpc(), cmd.getRole());
++ cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getZoneType());
+ ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
+ List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
+ response.setResponses(routerResponses, result.second());
+ return response;
+ }
- private Pair<List<DomainRouterJoinVO>, Integer> searchForRoutersInternal(ListRoutersCmd cmd) {
- Long id = cmd.getId();
- String name = cmd.getRouterName();
- String state = cmd.getState();
- Long zoneId = cmd.getZoneId();
- String zoneType = cmd.getZoneType();
- Long pod = cmd.getPodId();
- Long hostId = cmd.getHostId();
- String keyword = cmd.getKeyword();
- Long networkId = cmd.getNetworkId();
- Long vpcId = cmd.getVpcId();
- Boolean forVpc = cmd.getForVpc();
+
+ private Pair<List<DomainRouterJoinVO>, Integer> searchForRoutersInternal(BaseListProjectAndAccountResourcesCmd cmd, Long id,
- String name, String state, Long zoneId, Long podId, Long hostId, String keyword, Long networkId, Long vpcId, Boolean forVpc, String role) {
++ String name, String state, Long zoneId, Long podId, Long hostId, String keyword, Long networkId, Long vpcId, Boolean forVpc, String role, String zoneType) {
+
Account caller = UserContext.current().getCaller();
List<Long> permittedAccounts = new ArrayList<Long>();
@@@ -1072,10 -1073,14 +1081,15 @@@
sc.setParameters("dataCenterId", zoneId);
}
+ if (podId != null) {
+ sc.setParameters("podId", podId);
+ }
+
+ if (zoneType != null) {
+ sc.setParameters("dataCenterType", zoneType);
+ }
+
- if (pod != null) {
- sc.setParameters("podId", pod);
- }
+
if (hostId != null) {
sc.setParameters("hostId", hostId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
index 80398f4,125db17..a7a83de
--- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
@@@ -157,18 -156,14 +157,20 @@@ public class DomainRouterJoinDaoImpl ex
routerResponse.setIp6Dns2(router.getIp6Dns2());
routerResponse.setVpcId(router.getVpcUuid());
+
+ routerResponse.setRole(router.getRole().toString());
// set async job
- routerResponse.setJobId(router.getJobUuid());
- routerResponse.setJobStatus(router.getJobStatus());
+ if (router.getJobId() != null) {
+ routerResponse.setJobId(router.getJobUuid());
+ routerResponse.setJobStatus(router.getJobStatus());
+ }
- routerResponse.setObjectName("router");
+ if (router.getRole() == Role.INTERNAL_LB_VM) {
+ routerResponse.setObjectName("internalloadbalancervm");
+ } else {
+ routerResponse.setObjectName("router");
+ }
return routerResponse;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/configuration/ConfigurationManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index f281b14,068a586..4425f28
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@@ -39,6 -39,9 +39,10 @@@ import javax.naming.NamingException
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
++
+ import com.cloud.dc.*;
+ import com.cloud.dc.dao.*;
+ import com.cloud.user.*;
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.api.ApiConstants.LDAPParams;
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
@@@ -71,29 -78,8 +79,19 @@@ import com.cloud.api.ApiDBUtils
import com.cloud.capacity.dao.CapacityDao;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
- import com.cloud.dc.AccountVlanMapVO;
- import com.cloud.dc.ClusterVO;
- import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
- import com.cloud.dc.DataCenterIpAddressVO;
- import com.cloud.dc.DataCenterLinkLocalIpAddressVO;
- import com.cloud.dc.DataCenterVO;
- import com.cloud.dc.DcDetailVO;
- import com.cloud.dc.HostPodVO;
- import com.cloud.dc.Pod;
- import com.cloud.dc.PodVlanMapVO;
- import com.cloud.dc.Vlan;
import com.cloud.dc.Vlan.VlanType;
+import com.cloud.dc.VlanVO;
+import com.cloud.dc.dao.AccountVlanMapDao;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.DataCenterIpAddressDao;
+import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao;
+import com.cloud.dc.dao.DcDetailsDao;
+import com.cloud.dc.dao.HostPodDao;
+import com.cloud.dc.dao.PodVlanMapDao;
+import com.cloud.dc.dao.VlanDao;
++
import com.cloud.deploy.DataCenterDeployment;
import com.cloud.domain.Domain;
import com.cloud.domain.DomainVO;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/NetworkManagerImpl.java
index 3b644b7,4a8b38f..175974a
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@@ -162,7 -155,7 +163,8 @@@ public class NetworkManagerImpl extend
@Inject
PodVlanMapDao _podVlanMapDao;
@Inject
+ NetworkOfferingDetailsDao _ntwkOffDetailsDao;
+ ConfigurationServer _configServer;
List<NetworkGuru> _networkGurus;
public List<NetworkGuru> getNetworkGurus() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/NetworkServiceImpl.java
index 9f222a3,2dcb47d..8b77528
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@@ -143,28 -76,34 +143,29 @@@ import com.cloud.utils.Journal
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.db.*;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.JoinBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
-import com.cloud.vm.*;
-import com.cloud.vm.dao.*;
-import org.apache.cloudstack.acl.ControlledEntity.ACLType;
-import org.apache.cloudstack.acl.SecurityChecker;
-import org.apache.cloudstack.acl.SecurityChecker.AccessType;
-import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;
-import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
-import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
-import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
-import org.apache.cloudstack.api.command.user.vm.ListNicsCmd;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.security.InvalidParameterException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
+import com.cloud.vm.Nic;
++import com.cloud.vm.NicSecondaryIp;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.ReservationContextImpl;
+import com.cloud.vm.SecondaryStorageVmVO;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.NicSecondaryIpDao;
+import com.cloud.vm.dao.NicSecondaryIpVO;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VMInstanceDao;
/**
* NetworkServiceImpl implements NetworkService.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index 9a425e1,4ad8868..def4c1e
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@@ -27,7 -27,7 +27,8 @@@ import javax.ejb.Local
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.cloudstack.api.command.user.firewall.ListEgressFirewallRulesCmd;
+ import com.cloud.network.dao.*;
import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/network/guru/GuestNetworkGuru.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/test/com/cloud/network/MockNetworkManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/test/com/cloud/network/MockNetworkModelImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/server/test/com/cloud/vpc/MockNetworkModelImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b24a764/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-410to420.sql
index 2ba5165,a6913b6..c714dee
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@@ -836,7 -838,7 +838,8 @@@ CREATE VIEW `cloud`.`domain_router_view
domain_router.scripts_version scripts_version,
domain_router.is_redundant_router is_redundant_router,
domain_router.redundant_state redundant_state,
-- domain_router.stop_pending stop_pending
++ domain_router.stop_pending stop_pending,
++ domain_router.role role
from
`cloud`.`domain_router`
inner join
@@@ -1107,143 -1109,8 +1110,42 @@@ CREATE VIEW `cloud`.`account_view` A
and async_job.instance_type = 'Account'
and async_job.job_status = 0;
+
+
+ALTER TABLE `cloud`.`load_balancing_rules` ADD COLUMN `source_ip_address` varchar(40) COMMENT 'source ip address for the load balancer rule';
+ALTER TABLE `cloud`.`load_balancing_rules` ADD COLUMN `source_ip_address_network_id` bigint unsigned COMMENT 'the id of the network where source ip belongs to';
+ALTER TABLE `cloud`.`load_balancing_rules` ADD COLUMN `scheme` varchar(40) NOT NULL COMMENT 'load balancer scheme; can be Internal or Public';
+UPDATE `cloud`.`load_balancing_rules` SET `scheme`='Public';
+
+
- -- Add role to the domain router view
- ALTER VIEW `cloud`.`domain_router_view` AS
- select
- vm_instance.id id,
- vm_instance.name name,
- account.id account_id,
- account.uuid account_uuid,
- account.account_name account_name,
- account.type account_type,
- domain.id domain_id,
- domain.uuid domain_uuid,
- domain.name domain_name,
- domain.path domain_path,
- projects.id project_id,
- projects.uuid project_uuid,
- projects.name project_name,
- vm_instance.uuid uuid,
- vm_instance.created created,
- vm_instance.state state,
- vm_instance.removed removed,
- vm_instance.pod_id pod_id,
- vm_instance.instance_name instance_name,
- host_pod_ref.uuid pod_uuid,
- data_center.id data_center_id,
- data_center.uuid data_center_uuid,
- data_center.name data_center_name,
- data_center.dns1 dns1,
- data_center.dns2 dns2,
- data_center.ip6_dns1 ip6_dns1,
- data_center.ip6_dns2 ip6_dns2,
- host.id host_id,
- host.uuid host_uuid,
- host.name host_name,
- vm_template.id template_id,
- vm_template.uuid template_uuid,
- service_offering.id service_offering_id,
- disk_offering.uuid service_offering_uuid,
- disk_offering.name service_offering_name,
- nics.id nic_id,
- nics.uuid nic_uuid,
- nics.network_id network_id,
- nics.ip4_address ip_address,
- nics.ip6_address ip6_address,
- nics.ip6_gateway ip6_gateway,
- nics.ip6_cidr ip6_cidr,
- nics.default_nic is_default_nic,
- nics.gateway gateway,
- nics.netmask netmask,
- nics.mac_address mac_address,
- nics.broadcast_uri broadcast_uri,
- nics.isolation_uri isolation_uri,
- vpc.id vpc_id,
- vpc.uuid vpc_uuid,
- networks.uuid network_uuid,
- networks.name network_name,
- networks.network_domain network_domain,
- networks.traffic_type traffic_type,
- networks.guest_type guest_type,
- async_job.id job_id,
- async_job.uuid job_uuid,
- async_job.job_status job_status,
- async_job.account_id job_account_id,
- domain_router.template_version template_version,
- domain_router.scripts_version scripts_version,
- domain_router.is_redundant_router is_redundant_router,
- domain_router.redundant_state redundant_state,
- domain_router.stop_pending stop_pending,
- domain_router.role role
- from
- `cloud`.`domain_router`
- inner join
- `cloud`.`vm_instance` ON vm_instance.id = domain_router.id
- inner join
- `cloud`.`account` ON vm_instance.account_id = account.id
- inner join
- `cloud`.`domain` ON vm_instance.domain_id = domain.id
- left join
- `cloud`.`host_pod_ref` ON vm_instance.pod_id = host_pod_ref.id
- left join
- `cloud`.`projects` ON projects.project_account_id = account.id
- left join
- `cloud`.`data_center` ON vm_instance.data_center_id = data_center.id
- left join
- `cloud`.`host` ON vm_instance.host_id = host.id
- left join
- `cloud`.`vm_template` ON vm_instance.vm_template_id = vm_template.id
- left join
- `cloud`.`service_offering` ON vm_instance.service_offering_id = service_offering.id
- left join
- `cloud`.`disk_offering` ON vm_instance.service_offering_id = disk_offering.id
- left join
- `cloud`.`volumes` ON vm_instance.id = volumes.instance_id
- left join
- `cloud`.`storage_pool` ON volumes.pool_id = storage_pool.id
- left join
- `cloud`.`nics` ON vm_instance.id = nics.instance_id
- left join
- `cloud`.`networks` ON nics.network_id = networks.id
- left join
- `cloud`.`vpc` ON domain_router.vpc_id = vpc.id
- left join
- `cloud`.`async_job` ON async_job.instance_id = vm_instance.id
- and async_job.instance_type = 'DomainRouter'
- and async_job.job_status = 0;
-
+
+-- Add details talbe for the network offering
+CREATE TABLE `cloud`.`network_offering_details` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `network_offering_id` bigint unsigned NOT NULL COMMENT 'network offering id',
+ `name` varchar(255) NOT NULL,
+ `value` varchar(1024) NOT NULL,
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_network_offering_details__network_offering_id` FOREIGN KEY `fk_network_offering_details__network_offering_id`(`network_offering_id`) REFERENCES `network_offerings`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- Change the constraint for the network service map table. Now we support multiple provider for the same service
+ALTER TABLE `cloud`.`ntwk_service_map` DROP FOREIGN KEY `fk_ntwk_service_map__network_id`;
+ALTER TABLE `cloud`.`ntwk_service_map` DROP INDEX `network_id`;
+
+ALTER TABLE `cloud`.`ntwk_service_map` ADD UNIQUE `network_id` (`network_id`,`service`,`provider`);
+ALTER TABLE `cloud`.`ntwk_service_map` ADD CONSTRAINT `fk_ntwk_service_map__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks` (`id`) ON DELETE CASCADE;
+
+
+ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `internal_lb` int(1) unsigned NOT NULL DEFAULT '0' COMMENT 'true if the network offering supports Internal lb service';
+ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `public_lb` int(1) unsigned NOT NULL DEFAULT '0' COMMENT 'true if the network offering supports Public lb service';
+UPDATE `cloud`.`network_offerings` SET public_lb=1 where id IN (SELECT DISTINCT network_offering_id FROM `cloud`.`ntwk_offering_service_map` WHERE service='Lb');
+
- alter table `cloud_usage`.`usage_network_offering` add column nic_id bigint(20) unsigned NOT NULL;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'NetworkManager', 'internallbvm.service.offering', null, 'Uuid of the service offering used by internal lb vm; if NULL - default system internal lb offering will be used');
+
+ alter table `cloud_usage`.`usage_network_offering` add column nic_id bigint(20) unsigned NOT NULL;
+ ALTER TABLE `cloud`.`data_center_details` MODIFY value varchar(1024);
+ ALTER TABLE `cloud`.`cluster_details` MODIFY value varchar(255);
+ ALTER TABLE `cloud`.`storage_pool_details` MODIFY value varchar(255);
+ ALTER TABLE `cloud`.`account_details` MODIFY value varchar(255);
[11/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - API: extend listNetworks API to to take in zonetype.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f0863f7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f0863f7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f0863f7
Branch: refs/heads/internallb
Commit: 1f0863f75b629b60770626006ba3a94ad05b53a4
Parents: a20ed3a
Author: Jessica Wang <je...@citrix.com>
Authored: Fri Apr 26 15:23:30 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Fri Apr 26 15:23:30 2013 -0700
----------------------------------------------------------------------
.../api/command/user/network/ListNetworksCmd.java | 7 +++++
.../src/com/cloud/network/NetworkServiceImpl.java | 19 +++++++++-----
2 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f0863f7/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index afce092..d25e2c0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -48,6 +48,9 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
description="the Zone ID of the network")
private Long zoneId;
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
+
@Parameter(name=ApiConstants.TYPE, type=CommandType.STRING, description="the type of the network. Supported values are: Isolated and Shared")
private String guestIpType;
@@ -96,6 +99,10 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
return zoneId;
}
+ public String getZoneType() {
+ return zoneType;
+ }
+
public String getGuestIpType() {
return guestIpType;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f0863f7/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 7bc2e54..2dcb47d 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1158,6 +1158,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
Long id = cmd.getId();
String keyword = cmd.getKeyword();
Long zoneId = cmd.getZoneId();
+ String zoneType = cmd.getZoneType();
Account caller = UserContext.current().getCaller();
Long domainId = cmd.getDomainId();
String accountName = cmd.getAccountName();
@@ -1306,39 +1307,39 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
//get account level networks
networksToReturn.addAll(listAccountSpecificNetworks(
buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType,
- physicalNetworkId, aclType, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags), searchFilter,
+ physicalNetworkId, aclType, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags, zoneType), searchFilter,
permittedAccounts));
//get domain level networks
if (domainId != null) {
networksToReturn
.addAll(listDomainLevelNetworks(
buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType,
- physicalNetworkId, aclType, true, restartRequired, specifyIpRanges, vpcId, tags), searchFilter,
+ physicalNetworkId, aclType, true, restartRequired, specifyIpRanges, vpcId, tags, zoneType), searchFilter,
domainId, false));
}
} else {
//add account specific networks
networksToReturn.addAll(listAccountSpecificNetworksByDomainPath(
buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType,
- physicalNetworkId, aclType, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags), searchFilter, path,
+ physicalNetworkId, aclType, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags, zoneType), searchFilter, path,
isRecursive));
//add domain specific networks of domain + parent domains
networksToReturn.addAll(listDomainSpecificNetworksByDomainPath(
buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType,
- physicalNetworkId, aclType, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags), searchFilter, path,
+ physicalNetworkId, aclType, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags, zoneType), searchFilter, path,
isRecursive));
//add networks of subdomains
if (domainId == null) {
networksToReturn
.addAll(listDomainLevelNetworks(
buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType,
- physicalNetworkId, aclType, true, restartRequired, specifyIpRanges, vpcId, tags), searchFilter,
+ physicalNetworkId, aclType, true, restartRequired, specifyIpRanges, vpcId, tags, zoneType), searchFilter,
caller.getDomainId(), true));
}
}
} else {
networksToReturn = _networksDao.search(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId,
- guestIpType, trafficType, physicalNetworkId, null, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags),
+ guestIpType, trafficType, physicalNetworkId, null, skipProjectNetworks, restartRequired, specifyIpRanges, vpcId, tags, zoneType),
searchFilter);
}
@@ -1383,7 +1384,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
private SearchCriteria<NetworkVO> buildNetworkSearchCriteria(SearchBuilder<NetworkVO> sb, String keyword, Long id,
Boolean isSystem, Long zoneId, String guestIpType, String trafficType, Long physicalNetworkId,
- String aclType, boolean skipProjectNetworks, Boolean restartRequired, Boolean specifyIpRanges, Long vpcId, Map<String, String> tags) {
+ String aclType, boolean skipProjectNetworks, Boolean restartRequired, Boolean specifyIpRanges, Long vpcId, Map<String, String> tags, String zoneType) {
SearchCriteria<NetworkVO> sc = sb.create();
@@ -1405,6 +1406,10 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
sc.addAnd("dataCenterId", SearchCriteria.Op.EQ, zoneId);
}
+ if(zoneType != null) {
+ sc.setJoinParameters("zoneSearch", "networkType", zoneType);
+ }
+
if (guestIpType != null) {
sc.addAnd("guestType", SearchCriteria.Op.EQ, guestIpType);
}
[46/50] [abbrv] Update l10n resource file Web-UI with latest version
from transifex.
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_es.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index c0680b3..16cfc1c 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -16,7 +16,7 @@
# under the License.
-error.installWizard.message=Algo salio mal, debes ir para atr\u00e1s y corregir los error.
+error.installWizard.message=Algo salio mal, debes ir para atr\u00e1s y corregir los error.
error.login=Su nombre de usuario / contrase\u00c3\u00b1a no coincide con nuestros registros.
error.mgmt.server.inaccessible=El Servidor de Gesti\u00c3\u00b3n es inaccesible. Por favor, int\u00c3\u00a9ntelo de nuevo m\u00c3\u00a1s tarde.
error.session.expired=Su sesi\u00c3\u00b3n ha caducado.
@@ -32,133 +32,133 @@ ICMP.code=ICMP C\u00c3\u00b3digo
ICMP.type=Tipo ICMP
image.directory=Directorio de la imagen
inline=en l\u00c3\u00adnea
-label.account=Cuenta
-label.account.id=ID de la cuenta
-label.account.name=Nombre de la cuenta
+label.account=Cuenta
+label.account.id=ID de la cuenta
+label.account.name=Nombre de la cuenta
label.accounts=Cuentas
-label.account.specific=espec\u00c3\u00adficas de la cuenta
+label.account.specific=espec\u00c3\u00adficas de la cuenta
label.acquire.new.ip=adquirir nuevas IP
-label.action.attach.disk=Conecte el disco
-label.action.attach.disk.processing=disco Fijaci\u00c3\u00b3n ....
-label.action.attach.iso=Adjuntar ISO
-label.action.attach.iso.processing=Colocaci\u00c3\u00b3n de la norma ISO ....
-label.action.cancel.maintenance.mode=Cancelar modo de mantenimiento
-label.action.cancel.maintenance.mode.processing=Cancelaci\u00c3\u00b3n del modo de mantenimiento ....
-label.action.change.password=Cambiar contrase\u00c3\u00b1a
-label.action.change.service=Cambio de Servicio
-label.action.change.service.processing=Cambio de servicio ....
-label.action.copy.ISO=Copia de la ISO
-label.action.copy.ISO.processing=hacer frente ISO ....
-label.action.copy.template=Copia de plantilla
-label.action.copy.template.processing=hacer frente plantilla ....
-label.action.create.template=Crear plantilla
+label.action.attach.disk=Conecte el disco
+label.action.attach.disk.processing=disco Fijaci\u00c3\u00b3n ....
+label.action.attach.iso=Adjuntar ISO
+label.action.attach.iso.processing=Colocaci\u00c3\u00b3n de la norma ISO ....
+label.action.cancel.maintenance.mode=Cancelar modo de mantenimiento
+label.action.cancel.maintenance.mode.processing=Cancelaci\u00c3\u00b3n del modo de mantenimiento ....
+label.action.change.password=Cambiar contrase\u00c3\u00b1a
+label.action.change.service=Cambio de Servicio
+label.action.change.service.processing=Cambio de servicio ....
+label.action.copy.ISO=Copia de la ISO
+label.action.copy.ISO.processing=hacer frente ISO ....
+label.action.copy.template=Copia de plantilla
+label.action.copy.template.processing=hacer frente plantilla ....
+label.action.create.template=Crear plantilla
label.action.create.template.from.vm=Crear plantilla de VM
label.action.create.template.from.volume=Crear plantilla de volumen
-label.action.create.template.processing=Creaci\u00c3\u00b3n de plantillas ....
-label.action.create.vm=Crear VM
-label.action.create.vm.processing=Creaci\u00c3\u00b3n de m\u00c3\u00a1quina virtual ....
-label.action.create.volume=Crear volumen
-label.action.create.volume.processing=Crear volumen ....
-label.action.delete.account=Eliminar cuenta
-label.action.delete.account.processing=Eliminar cuentas ....
-label.action.delete.cluster=Borrar Grupo
-label.action.delete.cluster.processing=Borrar Grupo ....
-label.action.delete.disk.offering=Borrar disco Ofrenda
-label.action.delete.disk.offering.processing=Borrar disco ofrece ....
-label.action.delete.domain=Eliminar de dominio
-label.action.delete.domain.processing=Eliminaci\u00c3\u00b3n de dominio ....
-label.action.delete.firewall=Eliminar servidor de seguridad
-label.action.delete.firewall.processing=Eliminaci\u00c3\u00b3n de firewall ....
-label.action.delete.ingress.rule=Borrar ingreso Regla
-label.action.delete.ingress.rule.processing=Eliminaci\u00c3\u00b3n de ingreso regla ....
-label.action.delete.IP.range=Eliminar Rango de IP
-label.action.delete.IP.range.processing=Eliminar Rango de IP ....
-label.action.delete.ISO=Eliminar ISO
-label.action.delete.ISO.processing=Eliminaci\u00c3\u00b3n de la norma ISO ....
-label.action.delete.load.balancer=Eliminar equilibrador de carga
+label.action.create.template.processing=Creaci\u00c3\u00b3n de plantillas ....
+label.action.create.vm=Crear VM
+label.action.create.vm.processing=Creaci\u00c3\u00b3n de m\u00c3\u00a1quina virtual ....
+label.action.create.volume=Crear volumen
+label.action.create.volume.processing=Crear volumen ....
+label.action.delete.account=Eliminar cuenta
+label.action.delete.account.processing=Eliminar cuentas ....
+label.action.delete.cluster=Borrar Grupo
+label.action.delete.cluster.processing=Borrar Grupo ....
+label.action.delete.disk.offering=Borrar disco Ofrenda
+label.action.delete.disk.offering.processing=Borrar disco ofrece ....
+label.action.delete.domain=Eliminar de dominio
+label.action.delete.domain.processing=Eliminaci\u00c3\u00b3n de dominio ....
+label.action.delete.firewall=Eliminar servidor de seguridad
+label.action.delete.firewall.processing=Eliminaci\u00c3\u00b3n de firewall ....
+label.action.delete.ingress.rule=Borrar ingreso Regla
+label.action.delete.ingress.rule.processing=Eliminaci\u00c3\u00b3n de ingreso regla ....
+label.action.delete.IP.range=Eliminar Rango de IP
+label.action.delete.IP.range.processing=Eliminar Rango de IP ....
+label.action.delete.ISO=Eliminar ISO
+label.action.delete.ISO.processing=Eliminaci\u00c3\u00b3n de la norma ISO ....
+label.action.delete.load.balancer=Eliminar equilibrador de carga
label.action.delete.load.balancer.processing=Eliminaci\u00c3\u00b3n del equilibrador de carga ....
-label.action.delete.network=Eliminar Red
-label.action.delete.network.processing=Eliminaci\u00c3\u00b3n de red ....
-label.action.delete.pod=Eliminar Pod
-label.action.delete.pod.processing=Eliminar Pod ....
-label.action.delete.primary.storage=Almacenamiento primario Eliminar
-label.action.delete.primary.storage.processing=Eliminaci\u00c3\u00b3n de almacenamiento primaria ....
-label.action.delete.secondary.storage.processing=Eliminaci\u00c3\u00b3n de almacenamiento secundario ....
-label.action.delete.secondary.storage=secundaria almacenamiento Eliminar
-label.action.delete.security.group=Borrar Grupo de Seguridad
-label.action.delete.security.group.processing=Eliminar grupo de seguridad ....
-label.action.delete.service.offering=Eliminar Oferta de Servicio
-label.action.delete.service.offering.processing=Eliminaci\u00c3\u00b3n de Oferta de Servicio ....
-label.action.delete.snapshot=Eliminar instant\u00c3\u00a1nea
-label.action.delete.snapshot.processing=Eliminar instant\u00c3\u00a1nea ....
-label.action.delete.template=Eliminar plantilla
-label.action.delete.template.processing=Eliminar plantilla ....
-label.action.delete.user=Eliminar usuario
-label.action.delete.user.processing=Eliminar usuario ....
-label.action.delete.volume=Eliminar volumen
-label.action.delete.volume.processing=Eliminar volumen ....
-label.action.delete.zone=Eliminar Zona
-label.action.delete.zone.processing=Eliminaci\u00c3\u00b3n de la Zona ....
-label.action.destroy.instance=Destruye Instancia
-label.action.destroy.instance.processing=Destrucci\u00c3\u00b3n Instancia ....
+label.action.delete.network=Eliminar Red
+label.action.delete.network.processing=Eliminaci\u00c3\u00b3n de red ....
+label.action.delete.pod=Eliminar Pod
+label.action.delete.pod.processing=Eliminar Pod ....
+label.action.delete.primary.storage=Almacenamiento primario Eliminar
+label.action.delete.primary.storage.processing=Eliminaci\u00c3\u00b3n de almacenamiento primaria ....
+label.action.delete.secondary.storage.processing=Eliminaci\u00c3\u00b3n de almacenamiento secundario ....
+label.action.delete.secondary.storage=secundaria almacenamiento Eliminar
+label.action.delete.security.group=Borrar Grupo de Seguridad
+label.action.delete.security.group.processing=Eliminar grupo de seguridad ....
+label.action.delete.service.offering=Eliminar Oferta de Servicio
+label.action.delete.service.offering.processing=Eliminaci\u00c3\u00b3n de Oferta de Servicio ....
+label.action.delete.snapshot=Eliminar instant\u00c3\u00a1nea
+label.action.delete.snapshot.processing=Eliminar instant\u00c3\u00a1nea ....
+label.action.delete.template=Eliminar plantilla
+label.action.delete.template.processing=Eliminar plantilla ....
+label.action.delete.user=Eliminar usuario
+label.action.delete.user.processing=Eliminar usuario ....
+label.action.delete.volume=Eliminar volumen
+label.action.delete.volume.processing=Eliminar volumen ....
+label.action.delete.zone=Eliminar Zona
+label.action.delete.zone.processing=Eliminaci\u00c3\u00b3n de la Zona ....
+label.action.destroy.instance=Destruye Instancia
+label.action.destroy.instance.processing=Destrucci\u00c3\u00b3n Instancia ....
label.action.destroy.systemvm=destruir el sistema VM
label.action.destroy.systemvm.processing=Destrucci\u00c3\u00b3n del sistema VM ....
-label.action.detach.disk.processing=Extracci\u00c3\u00b3n disco ....
-label.action.detach.disk=Separar disco
-label.action.detach.iso.processing=Extracci\u00c3\u00b3n ISO ....
-label.action.detach.iso=Separar ISO
-label.action.disable.account=Desactivar cuenta
-label.action.disable.account.processing=Deshabilitar cuenta ....
-label.action.disable.cluster=Deshabilitar cl\u00c3\u00baster
-label.action.disable.cluster.processing=Desactivaci\u00c3\u00b3n de Cluster Server ....
-label.action.disable.pod=Deshabilitar Pod
-label.action.disable.pod.processing=Deshabilitar Pod ....
-label.action.disable.static.NAT=Deshabilitar NAT est\u00c3\u00a1tica
-label.action.disable.static.NAT.processing=Deshabilitar NAT est\u00c3\u00a1tica ....
-label.action.disable.user=Deshabilitar usuario
-label.action.disable.user.processing=Desactivaci\u00c3\u00b3n de usuario ....
-label.action.disable.zone=Deshabilitar la zona
-label.action.disable.zone.processing=Desactivaci\u00c3\u00b3n de la zona ....
-label.action.download.ISO=ISO Descargar
-label.action.download.template=Descargar plantilla
-label.action.download.volume=Descargar Volumen
-label.action.download.volume.processing=Volumen Descargar ....
-label.action.edit.account=Editar cuenta
-label.action.edit.disk.offering=Editar disco Ofrenda
-label.action.edit.domain=Editar Dominio
-label.action.edit.global.setting=Editar Mundial Marco
+label.action.detach.disk.processing=Extracci\u00c3\u00b3n disco ....
+label.action.detach.disk=Separar disco
+label.action.detach.iso.processing=Extracci\u00c3\u00b3n ISO ....
+label.action.detach.iso=Separar ISO
+label.action.disable.account=Desactivar cuenta
+label.action.disable.account.processing=Deshabilitar cuenta ....
+label.action.disable.cluster=Deshabilitar cl\u00c3\u00baster
+label.action.disable.cluster.processing=Desactivaci\u00c3\u00b3n de Cluster Server ....
+label.action.disable.pod=Deshabilitar Pod
+label.action.disable.pod.processing=Deshabilitar Pod ....
+label.action.disable.static.NAT=Deshabilitar NAT est\u00c3\u00a1tica
+label.action.disable.static.NAT.processing=Deshabilitar NAT est\u00c3\u00a1tica ....
+label.action.disable.user=Deshabilitar usuario
+label.action.disable.user.processing=Desactivaci\u00c3\u00b3n de usuario ....
+label.action.disable.zone=Deshabilitar la zona
+label.action.disable.zone.processing=Desactivaci\u00c3\u00b3n de la zona ....
+label.action.download.ISO=ISO Descargar
+label.action.download.template=Descargar plantilla
+label.action.download.volume=Descargar Volumen
+label.action.download.volume.processing=Volumen Descargar ....
+label.action.edit.account=Editar cuenta
+label.action.edit.disk.offering=Editar disco Ofrenda
+label.action.edit.domain=Editar Dominio
+label.action.edit.global.setting=Editar Mundial Marco
label.action.edit.host=edici\u00c3\u00b3n Anfitri\u00c3\u00b3n
-label.action.edit.instance=Editar Instancia
-label.action.edit.ISO=Editar ISO
+label.action.edit.instance=Editar Instancia
+label.action.edit.ISO=Editar ISO
label.action.edit.network=Edici\u00c3\u00b3n de redes
-label.action.edit.network.offering=Editar Red ofrece
-label.action.edit.pod=Editar Pod
-label.action.edit.primary.storage=Editar Almacenamiento primario
-label.action.edit.resource.limits=Editar l\u00c3\u00admites de recursos
-label.action.edit.service.offering=Editar Oferta de Servicio
-label.action.edit.template=Editar plantilla
-label.action.edit.user=Editar usuario
-label.action.edit.zone=Edici\u00c3\u00b3n Zona
-label.action.enable.account=Habilitar cuenta
-label.action.enable.account.processing=cuenta de Habilitaci\u00c3\u00b3n ....
-label.action.enable.cluster=Habilitar cl\u00c3\u00baster
-label.action.enable.cluster.processing=Habilitar cl\u00c3\u00baster ....
-label.action.enable.maintenance.mode=Activar el modo de mantenimiento
-label.action.enable.maintenance.mode.processing=Habilitaci\u00c3\u00b3n del modo de mantenimiento ....
-label.action.enable.pod=Habilitar Pod
-label.action.enable.pod.processing=Habilitaci\u00c3\u00b3n Pod ....
-label.action.enable.static.NAT=Habilitar NAT est\u00c3\u00a1tica
-label.action.enable.static.NAT.processing=Habilitar NAT est\u00c3\u00a1tica ....
-label.action.enable.user.processing=Habilitaci\u00c3\u00b3n del usuario ....
-label.action.enable.user=usuario Activar
+label.action.edit.network.offering=Editar Red ofrece
+label.action.edit.pod=Editar Pod
+label.action.edit.primary.storage=Editar Almacenamiento primario
+label.action.edit.resource.limits=Editar l\u00c3\u00admites de recursos
+label.action.edit.service.offering=Editar Oferta de Servicio
+label.action.edit.template=Editar plantilla
+label.action.edit.user=Editar usuario
+label.action.edit.zone=Edici\u00c3\u00b3n Zona
+label.action.enable.account=Habilitar cuenta
+label.action.enable.account.processing=cuenta de Habilitaci\u00c3\u00b3n ....
+label.action.enable.cluster=Habilitar cl\u00c3\u00baster
+label.action.enable.cluster.processing=Habilitar cl\u00c3\u00baster ....
+label.action.enable.maintenance.mode=Activar el modo de mantenimiento
+label.action.enable.maintenance.mode.processing=Habilitaci\u00c3\u00b3n del modo de mantenimiento ....
+label.action.enable.pod=Habilitar Pod
+label.action.enable.pod.processing=Habilitaci\u00c3\u00b3n Pod ....
+label.action.enable.static.NAT=Habilitar NAT est\u00c3\u00a1tica
+label.action.enable.static.NAT.processing=Habilitar NAT est\u00c3\u00a1tica ....
+label.action.enable.user.processing=Habilitaci\u00c3\u00b3n del usuario ....
+label.action.enable.user=usuario Activar
label.action.enable.zone=Habilitar la zona
-label.action.enable.zone.processing=Habilitaci\u00c3\u00b3n de zona ....
-label.action.force.reconnect=Fuerza Vuelva a conectar
-label.action.force.reconnect.processing=Reconectando ....
-label.action.generate.keys=Generar Claves
-label.action.generate.keys.processing=Generar claves ....
-label.action.lock.account=Bloqueo de cuenta
-label.action.lock.account.processing=Bloqueo de cuenta ....
+label.action.enable.zone.processing=Habilitaci\u00c3\u00b3n de zona ....
+label.action.force.reconnect=Fuerza Vuelva a conectar
+label.action.force.reconnect.processing=Reconectando ....
+label.action.generate.keys=Generar Claves
+label.action.generate.keys.processing=Generar claves ....
+label.action.lock.account=Bloqueo de cuenta
+label.action.lock.account.processing=Bloqueo de cuenta ....
label.action.manage.cluster=gestionar racimo
label.action.manage.cluster.processing=La gesti\u00c3\u00b3n de cl\u00c3\u00basteres ....
label.action.migrate.instance=Migrar Instancia
@@ -167,650 +167,650 @@ label.action.migrate.router=migrar Router
label.action.migrate.router.processing=Migraci\u00c3\u00b3n router ....
label.action.migrate.systemvm=Migrar del sistema VM
label.action.migrate.systemvm.processing=La migraci\u00c3\u00b3n de VM del sistema ....
-label.action.reboot.instance.processing=Reiniciar Instancia ....
-label.action.reboot.instance=Reiniciar Instancia
-label.action.reboot.router.processing=Reiniciar router ....
-label.action.reboot.router=Reiniciar router
-label.action.reboot.systemvm.processing=reinicio del sistema VM ....
-label.action.reboot.systemvm=Reiniciar sistema VM
-label.action.recurring.snapshot=recurrente instant\u00c3\u00a1neas
-label.action.release.ip=estreno IP
-label.action.release.ip.processing=Liberar IP ....
-label.action.remove.host.processing=Extracci\u00c3\u00b3n de host ....
-label.action.remove.host=Quitar host
-label.action.reset.password.processing=Restablecimiento de la contrase\u00c3\u00b1a ....
-label.action.reset.password=Restablecer contrase\u00c3\u00b1a
-label.action.resource.limits=Recursos l\u00c3\u00admites
-label.action.restore.instance.processing=Restaurar Instancia ....
-label.action.restore.instance=Restaurar Instancia
-label.actions=Acciones
-label.action.start.instance=Iniciar Instancia
-label.action.start.instance.processing=A partir Instancia ....
-label.action.start.router=inicio del router
-label.action.start.router.processing=A partir del router ....
-label.action.start.systemvm=Inicio del sistema VM
-label.action.start.systemvm.processing=A partir del sistema VM ....
-label.action.stop.instance=Detener Instancia
-label.action.stop.instance.processing=Detener Instancia ....
-label.action.stop.router=Detener router
-label.action.stop.router.processing=Detener router ....
-label.action.stop.systemvm=parada del sistema VM
-label.action.stop.systemvm.processing=Detener sistema VM ....
-label.action.take.snapshot.processing=Tomar instant\u00c3\u00a1neas ....
-label.action.take.snapshot=Tomar instant\u00c3\u00a1nea
+label.action.reboot.instance.processing=Reiniciar Instancia ....
+label.action.reboot.instance=Reiniciar Instancia
+label.action.reboot.router.processing=Reiniciar router ....
+label.action.reboot.router=Reiniciar router
+label.action.reboot.systemvm.processing=reinicio del sistema VM ....
+label.action.reboot.systemvm=Reiniciar sistema VM
+label.action.recurring.snapshot=recurrente instant\u00c3\u00a1neas
+label.action.release.ip=estreno IP
+label.action.release.ip.processing=Liberar IP ....
+label.action.remove.host.processing=Extracci\u00c3\u00b3n de host ....
+label.action.remove.host=Quitar host
+label.action.reset.password.processing=Restablecimiento de la contrase\u00c3\u00b1a ....
+label.action.reset.password=Restablecer contrase\u00c3\u00b1a
+label.action.resource.limits=Recursos l\u00c3\u00admites
+label.action.restore.instance.processing=Restaurar Instancia ....
+label.action.restore.instance=Restaurar Instancia
+label.actions=Acciones
+label.action.start.instance=Iniciar Instancia
+label.action.start.instance.processing=A partir Instancia ....
+label.action.start.router=inicio del router
+label.action.start.router.processing=A partir del router ....
+label.action.start.systemvm=Inicio del sistema VM
+label.action.start.systemvm.processing=A partir del sistema VM ....
+label.action.stop.instance=Detener Instancia
+label.action.stop.instance.processing=Detener Instancia ....
+label.action.stop.router=Detener router
+label.action.stop.router.processing=Detener router ....
+label.action.stop.systemvm=parada del sistema VM
+label.action.stop.systemvm.processing=Detener sistema VM ....
+label.action.take.snapshot.processing=Tomar instant\u00c3\u00a1neas ....
+label.action.take.snapshot=Tomar instant\u00c3\u00a1nea
label.action.unmanage.cluster.processing=Unmanaging Grupo ....
label.action.unmanage.cluster=Unmanage racimo
-label.action.update.OS.preference=Actualizar OS Preferencia
-label.action.update.OS.preference.processing=Actualizaci\u00c3\u00b3n de sistema operativo preferencia ....
+label.action.update.OS.preference=Actualizar OS Preferencia
+label.action.update.OS.preference.processing=Actualizaci\u00c3\u00b3n de sistema operativo preferencia ....
label.action.update.resource.count=Actualizaci\u00c3\u00b3n de recursos Conde
label.action.update.resource.count.processing=Actualizaci\u00c3\u00b3n de Conde de recursos ....
-label.active.sessions=Sesiones activas
-label.add.account=A\u00c3\u00b1adir cuenta
-label.add=Agregar
-label.add.by.cidr=A\u00c3\u00b1adir Por CIDR
-label.add.by.group=A\u00c3\u00b1adir Por el Grupo de
-label.add.cluster=A\u00c3\u00b1adir Grupo
-label.add.direct.iprange=A\u00c3\u00b1adir Direct IP Gama
-label.add.disk.offering=A\u00c3\u00b1adir disco Ofrenda
-label.add.domain=Agregar dominio
-label.add.firewall=Agregar Servidor de seguridad
-label.add.host=Agregar host
-label.adding=Agregar
-label.adding.cluster=Adici\u00c3\u00b3n de cl\u00c3\u00baster
-label.adding.failed=No se pudo agregar
-label.adding.pod=Agregar Pod
-label.adding.processing=A\u00c3\u00b1adir ....
-label.add.ingress.rule=A\u00c3\u00b1adir regla del ingreso
-label.adding.succeeded=Agregar Sucesor
-label.adding.user=Agregar usuario
-label.adding.zone=Agregar la zona
-label.add.ip.range=A\u00c3\u00b1adir Rango de IP
-label.additional.networks=Redes adicional
-label.add.load.balancer=A\u00c3\u00b1adir equilibrador de carga
-label.add.more=A\u00c3\u00b1adir m\u00c3\u00a1s
-label.add.network=Agregar sitios de red
+label.active.sessions=Sesiones activas
+label.add.account=A\u00c3\u00b1adir cuenta
+label.add=Agregar
+label.add.by.cidr=A\u00c3\u00b1adir Por CIDR
+label.add.by.group=A\u00c3\u00b1adir Por el Grupo de
+label.add.cluster=A\u00c3\u00b1adir Grupo
+label.add.direct.iprange=A\u00c3\u00b1adir Direct IP Gama
+label.add.disk.offering=A\u00c3\u00b1adir disco Ofrenda
+label.add.domain=Agregar dominio
+label.add.firewall=Agregar Servidor de seguridad
+label.add.host=Agregar host
+label.adding=Agregar
+label.adding.cluster=Adici\u00c3\u00b3n de cl\u00c3\u00baster
+label.adding.failed=No se pudo agregar
+label.adding.pod=Agregar Pod
+label.adding.processing=A\u00c3\u00b1adir ....
+label.add.ingress.rule=A\u00c3\u00b1adir regla del ingreso
+label.adding.succeeded=Agregar Sucesor
+label.adding.user=Agregar usuario
+label.adding.zone=Agregar la zona
+label.add.ip.range=A\u00c3\u00b1adir Rango de IP
+label.additional.networks=Redes adicional
+label.add.load.balancer=A\u00c3\u00b1adir equilibrador de carga
+label.add.more=A\u00c3\u00b1adir m\u00c3\u00a1s
+label.add.network=Agregar sitios de red
label.add.network.device=A\u00c3\u00b1adir dispositivo de red
-label.add.pod=A\u00c3\u00b1adir Pod
-label.add.primary.storage=A\u00c3\u00b1adir Almacenamiento primario
-label.add.secondary.storage=A\u00c3\u00b1adir secundaria almacenamiento
-label.add.security.group=Agregar grupo de seguridad
-label.add.service.offering=A\u00c3\u00b1adir Servicio de Oferta
-label.add.template=A\u00c3\u00b1adir plantilla
+label.add.pod=A\u00c3\u00b1adir Pod
+label.add.primary.storage=A\u00c3\u00b1adir Almacenamiento primario
+label.add.secondary.storage=A\u00c3\u00b1adir secundaria almacenamiento
+label.add.security.group=Agregar grupo de seguridad
+label.add.service.offering=A\u00c3\u00b1adir Servicio de Oferta
+label.add.template=A\u00c3\u00b1adir plantilla
label.add.to.group=Agregar al grupo
-label.add.user=Agregar usuario
-label.add.vlan=A\u00c3\u00b1adir VLAN
-label.add.volume=A\u00c3\u00b1adir volumen
-label.add.zone=A\u00c3\u00b1adir Zona
-label.admin.accounts=Administrador de Cuentas
-label.admin=Admin
-label.advanced=Avanzado
-label.advanced.mode=Modo avanzado
-label.advanced.search=B\u00c3\u00basqueda Avanzada
+label.add.user=Agregar usuario
+label.add.vlan=A\u00c3\u00b1adir VLAN
+label.add.volume=A\u00c3\u00b1adir volumen
+label.add.zone=A\u00c3\u00b1adir Zona
+label.admin.accounts=Administrador de Cuentas
+label.admin=Admin
+label.advanced=Avanzado
+label.advanced.mode=Modo avanzado
+label.advanced.search=B\u00c3\u00basqueda Avanzada
label.alert=Alerta
-label.algorithm=Algoritmo
-label.allocated=Asignados
-label.api.key=clave de API
-label.assign=Asignar
-label.assign.to.load.balancer=instancia de Asignaci\u00c3\u00b3n de equilibrador de carga
-label.associated.network.id=ID de red asociados
-label.attached.iso=adjunta ISO
-label.availability=Disponibilidad
-label.availability.zone=Disponibilidad de la zona
+label.algorithm=Algoritmo
+label.allocated=Asignados
+label.api.key=clave de API
+label.assign=Asignar
+label.assign.to.load.balancer=instancia de Asignaci\u00c3\u00b3n de equilibrador de carga
+label.associated.network.id=ID de red asociados
+label.attached.iso=adjunta ISO
+label.availability=Disponibilidad
+label.availability.zone=Disponibilidad de la zona
label.available=Disponible
-label.available.public.ips=Disponible direcciones IP p\u00c3\u00bablicas
-label.back=Volver
-label.basic.mode=Modo b\u00c3\u00a1sico
-label.bootable=arranque
-label.broadcast.domain.type=Tipo de dominio de difusi\u00c3\u00b3n
+label.available.public.ips=Disponible direcciones IP p\u00c3\u00bablicas
+label.back=Volver
+label.basic.mode=Modo b\u00c3\u00a1sico
+label.bootable=arranque
+label.broadcast.domain.type=Tipo de dominio de difusi\u00c3\u00b3n
label.by.account=Por Cuenta
-label.by.availability=Por Disponibilidad
+label.by.availability=Por Disponibilidad
label.by.domain=Por dominio
label.by.end.date=Por Fecha de finalizaci\u00c3\u00b3n
-label.by.level=por Nivel
+label.by.level=por Nivel
label.by.pod=Por Pod
-label.by.role=por funci\u00c3\u00b3n
+label.by.role=por funci\u00c3\u00b3n
label.by.start.date=Por Fecha de inicio
-label.by.state=Por Estado
-label.bytes.received=Bytes recibidos
-label.bytes.sent=Bytes enviados
-label.by.traffic.type=Por tipo de tr\u00c3\u00a1fico
+label.by.state=Por Estado
+label.bytes.received=Bytes recibidos
+label.bytes.sent=Bytes enviados
+label.by.traffic.type=Por tipo de tr\u00c3\u00a1fico
label.by.type.id=Por tipo de identificaci\u00c3\u00b3n
-label.by.type=Por tipo
+label.by.type=Por tipo
label.by.zone=Por Zona
-label.cancel=Cancelar
-label.certificate=Certificado
-label.character=Personaje
-label.cidr.account=CIDR o de cuenta / Grupo de Seguridad
+label.cancel=Cancelar
+label.certificate=Certificado
+label.character=Personaje
+label.cidr.account=CIDR o de cuenta / Grupo de Seguridad
label.cidr=CIDR
label.cidr.list=fuente CIDR
-label.close=Cerrar
-label.cloud.console=Cloud Management Console
-label.cloud.managed=Cloud.com Gestionado
-label.cluster=Grupo
-label.cluster.type=Tipo de Cluster Server
+label.close=Cerrar
+label.cloud.console=Cloud Management Console
+label.cloud.managed=Cloud.com Gestionado
+label.cluster=Grupo
+label.cluster.type=Tipo de Cluster Server
label.clvm=CLVM
-label.code=C\u00c3\u00b3digo
-label.configuration=Configuraci\u00c3\u00b3n
+label.code=C\u00c3\u00b3digo
+label.configuration=Configuraci\u00c3\u00b3n
label.confirmation=Confirmation
-label.congratulations=Felicitaciones \!
+label.congratulations=Felicitaciones \!
label.cpu.allocated=CPU asignado
label.cpu.allocated.for.VMs=CPU asignado para m\u00c3\u00a1quinas virtuales
label.CPU.cap=CPU Cap
-label.cpu=CPU
+label.cpu=CPU
label.cpu.utilized=CPU Utilizado
-label.created=creaci\u00c3\u00b3n
-label.cross.zones=Cruz Zonas
-label.custom.disk.size=Personal Disk Size
-label.daily=diario
+label.created=creaci\u00c3\u00b3n
+label.cross.zones=Cruz Zonas
+label.custom.disk.size=Personal Disk Size
+label.daily=diario
label.data.disk.offering=Datos Disco Offering
-label.date=Fecha
-label.day.of.month=D\u00c3\u00ada del mes
-label.day.of.week=d\u00c3\u00ada de la semana
+label.date=Fecha
+label.day.of.month=D\u00c3\u00ada del mes
+label.day.of.week=d\u00c3\u00ada de la semana
label.default.use=Usar por defecto
-label.delete=Eliminar
-label.deleting.failed=No se pudo eliminar
-label.deleting.processing=Eliminar ....
-label.description=Descripci\u00c3\u00b3n
-label.destroy=Destroy
-label.detaching.disk=Extracci\u00c3\u00b3n del disco
-label.details=Detalles
-label.device.id=ID de dispositivo
+label.delete=Eliminar
+label.deleting.failed=No se pudo eliminar
+label.deleting.processing=Eliminar ....
+label.description=Descripci\u00c3\u00b3n
+label.destroy=Destroy
+label.detaching.disk=Extracci\u00c3\u00b3n del disco
+label.details=Detalles
+label.device.id=ID de dispositivo
label.DHCP.server.type=Tipo de servidor DHCP
-label.disabled=personas de movilidad reducida
-label.disabling.vpn.access=Desactivaci\u00c3\u00b3n de VPN de acceso
-label.disk.allocated=disco asignado
-label.disk.offering=disco Ofrenda
-label.disk.size.gb=tama\u00c3\u00b1o de disco (en GB)
-label.disk.size=tama\u00c3\u00b1o de disco
-label.disk.total=disco Total
-label.disk.volume=volumen de disco
-label.display.text=visualizaci\u00c3\u00b3n de texto
-label.dns.1=DNS 1
-label.dns.2=DNS 2
-label.domain.admin=Administrador de dominio
-label.domain=dominio
-label.domain.id=ID de dominio
-label.domain.name=Nombre de dominio
+label.disabled=personas de movilidad reducida
+label.disabling.vpn.access=Desactivaci\u00c3\u00b3n de VPN de acceso
+label.disk.allocated=disco asignado
+label.disk.offering=disco Ofrenda
+label.disk.size.gb=tama\u00c3\u00b1o de disco (en GB)
+label.disk.size=tama\u00c3\u00b1o de disco
+label.disk.total=disco Total
+label.disk.volume=volumen de disco
+label.display.text=visualizaci\u00c3\u00b3n de texto
+label.dns.1=DNS 1
+label.dns.2=DNS 2
+label.domain.admin=Administrador de dominio
+label.domain=dominio
+label.domain.id=ID de dominio
+label.domain.name=Nombre de dominio
label.domain.suffix=DNS sufijo de dominio (es decir, xyz.com)
-label.double.quotes.are.not.allowed=comillas dobles no se permite
+label.double.quotes.are.not.allowed=comillas dobles no se permite
label.download.progress=Progreso de la descarga
-label.edit=Editar
-label.email=correo electr\u00c3\u00b3nico
-label.enabling.vpn.access=Habilitaci\u00c3\u00b3n de Acceso VPN
-label.enabling.vpn=Habilitaci\u00c3\u00b3n VPN
-label.endpoint.or.operation=punto final o de Operaci\u00c3\u00b3n
-label.end.port=Puerto final
-label.error.code=C\u00c3\u00b3digo de error
-label.error=Error
-label.esx.host=ESX / ESXi anfitri\u00c3\u00b3n
-label.example=Ejemplo
-label.failed=Error
-label.featured=destacados
-label.firewall=Servidor de seguridad
-label.first.name=Nombre
-label.format=Formato
-label.friday=Viernes
+label.edit=Editar
+label.email=correo electr\u00c3\u00b3nico
+label.enabling.vpn.access=Habilitaci\u00c3\u00b3n de Acceso VPN
+label.enabling.vpn=Habilitaci\u00c3\u00b3n VPN
+label.endpoint.or.operation=punto final o de Operaci\u00c3\u00b3n
+label.end.port=Puerto final
+label.error.code=C\u00c3\u00b3digo de error
+label.error=Error
+label.esx.host=ESX / ESXi anfitri\u00c3\u00b3n
+label.example=Ejemplo
+label.failed=Error
+label.featured=destacados
+label.firewall=Servidor de seguridad
+label.first.name=Nombre
+label.format=Formato
+label.friday=Viernes
label.full=completo
-label.gateway=puerta de enlace
-label.general.alerts=General de Alertas
-label.generating.url=Generar URL
-label.go.step.2=Ir al paso 2
-label.go.step.3=Ir al paso 3
-label.go.step.4=Ir al paso 4
-label.go.step.5=Ir al paso 5
-label.group=Grupo
-label.group.optional=Grupo (Opcional)
-label.guest.cidr=Habitaci\u00c3\u00b3n CIDR
-label.guest.gateway=Habitaci\u00c3\u00b3n Gateway
-label.guest.ip=Habitaci\u00c3\u00b3n direcci\u00c3\u00b3n IP
-label.guest.ip.range=Habitaci\u00c3\u00b3n Rango de IP
-label.guest.netmask=Habitaci\u00c3\u00b3n m\u00c3\u00a1scara de red
-label.ha.enabled=HA Activado
-label.help=Ayuda
+label.gateway=puerta de enlace
+label.general.alerts=General de Alertas
+label.generating.url=Generar URL
+label.go.step.2=Ir al paso 2
+label.go.step.3=Ir al paso 3
+label.go.step.4=Ir al paso 4
+label.go.step.5=Ir al paso 5
+label.group=Grupo
+label.group.optional=Grupo (Opcional)
+label.guest.cidr=Habitaci\u00c3\u00b3n CIDR
+label.guest.gateway=Habitaci\u00c3\u00b3n Gateway
+label.guest.ip=Habitaci\u00c3\u00b3n direcci\u00c3\u00b3n IP
+label.guest.ip.range=Habitaci\u00c3\u00b3n Rango de IP
+label.guest.netmask=Habitaci\u00c3\u00b3n m\u00c3\u00a1scara de red
+label.ha.enabled=HA Activado
+label.help=Ayuda
label.hide.ingress.rule=Ocultar el art\u00c3\u00adculo ingreso
-label.host.alerts=Host Alertas
-label.host=Ej\u00c3\u00a9rcitos
-label.host.name=nombre de host
-label.hosts=Ej\u00c3\u00a9rcitos
-label.hourly=por hora
-label.hypervisor=Hypervisor
-label.hypervisor.type=Tipo Hypervisor
-label.id=ID
-label.info=Informaci\u00c3\u00b3n
-label.ingress.rule=ingreso Regla
-label.initiated.by=Iniciado por
-label.installWizard.click.launch=Click en el bot\u00f3n de lanzar.
-label.instance=Instancia
-label.instance.limits=Instancia L\u00c3\u00admites
-label.instance.name=Nombre de instancia
-label.instances=Instancias
-label.internal.dns.1=DNS interno una
-label.internal.dns.2=DNS interno 2
-label.interval.type=Tipo de intervalo
-label.invalid.integer=entero no v\u00c3\u00a1lido
-label.invalid.number=N\u00c3\u00bamero no v\u00c3\u00a1lido
+label.host.alerts=Host Alertas
+label.host=Ej\u00c3\u00a9rcitos
+label.host.name=nombre de host
+label.hosts=Ej\u00c3\u00a9rcitos
+label.hourly=por hora
+label.hypervisor=Hypervisor
+label.hypervisor.type=Tipo Hypervisor
+label.id=ID
+label.info=Informaci\u00c3\u00b3n
+label.ingress.rule=ingreso Regla
+label.initiated.by=Iniciado por
+label.installWizard.click.launch=Click en el bot\u00f3n de lanzar.
+label.instance=Instancia
+label.instance.limits=Instancia L\u00c3\u00admites
+label.instance.name=Nombre de instancia
+label.instances=Instancias
+label.internal.dns.1=DNS interno una
+label.internal.dns.2=DNS interno 2
+label.interval.type=Tipo de intervalo
+label.invalid.integer=entero no v\u00c3\u00a1lido
+label.invalid.number=N\u00c3\u00bamero no v\u00c3\u00a1lido
label.invite=Invitar
label.invite.to=Invitar a .
-label.ip.address=Direcci\u00c3\u00b3n IP
-label.ipaddress=Direcci\u00c3\u00b3n IP
-label.ip.allocations=IP asignaciones
-label.ip=IP
-label.ip.limits=IP p\u00c3\u00bablica L\u00c3\u00admites
-label.ip.or.fqdn=IP o FQDN
-label.ip.range=Rango de IP
-label.ips=IP
-label.iscsi=iSCSI
-label.is.default=Es por defecto
-label.iso.boot=ISO de arranque
-label.iso=ISO
+label.ip.address=Direcci\u00c3\u00b3n IP
+label.ipaddress=Direcci\u00c3\u00b3n IP
+label.ip.allocations=IP asignaciones
+label.ip=IP
+label.ip.limits=IP p\u00c3\u00bablica L\u00c3\u00admites
+label.ip.or.fqdn=IP o FQDN
+label.ip.range=Rango de IP
+label.ips=IP
+label.iscsi=iSCSI
+label.is.default=Es por defecto
+label.iso.boot=ISO de arranque
+label.iso=ISO
label.isolation.mode=modo de aislamiento
label.is.redundant.router=redundante
-label.is.shared=es compartido
-label.is.system=es el Sistema
-label.keep=Mantener
-label.lang.chinese=Chino (simplificado)
-label.lang.english=Ingl\u00c3\u00a9s
-label.lang.japanese=japon\u00c3\u00a9s
-label.lang.spanish=Espa\u00c3\u00b1ol
-label.last.disconnected=\u00c3\u009altima Desconectado
-label.last.name=Apellido
+label.is.shared=es compartido
+label.is.system=es el Sistema
+label.keep=Mantener
+label.lang.chinese=Chino (simplificado)
+label.lang.english=Ingl\u00c3\u00a9s
+label.lang.japanese=japon\u00c3\u00a9s
+label.lang.spanish=Espa\u00c3\u00b1ol
+label.last.disconnected=\u00c3\u009altima Desconectado
+label.last.name=Apellido
label.launch=Lanzar
label.launch.vm=Lanzar maquina virtual
-label.level=Nivel
-label.load.balancer=equilibrador de carga
-label.loading=Carga
-label.local=local
-label.login=Login
-label.logout=Cerrar sesi\u00c3\u00b3n
-label.lun=LUN
-label.manage=Administrar
-label.maximum=m\u00c3\u00a1ximo
+label.level=Nivel
+label.load.balancer=equilibrador de carga
+label.loading=Carga
+label.local=local
+label.login=Login
+label.logout=Cerrar sesi\u00c3\u00b3n
+label.lun=LUN
+label.manage=Administrar
+label.maximum=m\u00c3\u00a1ximo
label.max.volumes=Maxima cantidad de Volumes
-label.memory.allocated=memoria asignada
-label.memory=memoria (en MB)
-label.memory.total=Total de memoria
-label.memory.used=memoria usada
+label.memory.allocated=memoria asignada
+label.memory=memoria (en MB)
+label.memory.total=Total de memoria
+label.memory.used=memoria usada
label.menu.accounts=Cuentas
-label.menu.alerts=Alertas
-label.menu.all.accounts=Todas las cuentas
-label.menu.all.instances=todas las instancias
-label.menu.community.isos=Comunidad ISOs
-label.menu.community.templates=plantillas de la comunidad
-label.menu.configuration=Configuraci\u00c3\u00b3n
-label.menu.dashboard=Interfaz
-label.menu.destroyed.instances=Destruir instancias
-label.menu.disk.offerings=disco ofertas
-label.menu.domains=dominio
-label.menu.events=Eventos
-label.menu.featured.isos=destacados ISO
-label.menu.featured.templates=destacados plantillas
-label.menu.global.settings=Configuraci\u00c3\u00b3n global
-label.menu.instances=Instancias
-label.menu.ipaddresses=Direcciones IP
-label.menu.isos=ISO
-label.menu.my.accounts=Mis cuentas
-label.menu.my.instances=Mi instancias
-label.menu.my.isos=Mi ISOs
-label.menu.my.templates=Mis plantillas
-label.menu.network.offerings=Red de ofertas
-label.menu.network=Red
-label.menu.physical.resources=Recursos F\u00c3\u00adsicos
-label.menu.running.instances=Ejecuci\u00c3\u00b3n de instancias
-label.menu.security.groups=Grupos de seguridad
-label.menu.service.offerings=Ofertas de Servicios
-label.menu.snapshots=instant\u00c3\u00a1neas
-label.menu.stopped.instances=Detenido instancias
-label.menu.storage=Almacenamiento
-label.menu.system=Sistema
-label.menu.system.vms=Sistema de m\u00c3\u00a1quinas virtuales
-label.menu.templates=plantillas
-label.menu.virtual.appliances=Virtual Appliances
-label.menu.virtual.resources=Virtual de Recursos
-label.menu.volumes=Vol\u00c3\u00bamenes
+label.menu.alerts=Alertas
+label.menu.all.accounts=Todas las cuentas
+label.menu.all.instances=todas las instancias
+label.menu.community.isos=Comunidad ISOs
+label.menu.community.templates=plantillas de la comunidad
+label.menu.configuration=Configuraci\u00c3\u00b3n
+label.menu.dashboard=Interfaz
+label.menu.destroyed.instances=Destruir instancias
+label.menu.disk.offerings=disco ofertas
+label.menu.domains=dominio
+label.menu.events=Eventos
+label.menu.featured.isos=destacados ISO
+label.menu.featured.templates=destacados plantillas
+label.menu.global.settings=Configuraci\u00c3\u00b3n global
+label.menu.instances=Instancias
+label.menu.ipaddresses=Direcciones IP
+label.menu.isos=ISO
+label.menu.my.accounts=Mis cuentas
+label.menu.my.instances=Mi instancias
+label.menu.my.isos=Mi ISOs
+label.menu.my.templates=Mis plantillas
+label.menu.network.offerings=Red de ofertas
+label.menu.network=Red
+label.menu.physical.resources=Recursos F\u00c3\u00adsicos
+label.menu.running.instances=Ejecuci\u00c3\u00b3n de instancias
+label.menu.security.groups=Grupos de seguridad
+label.menu.service.offerings=Ofertas de Servicios
+label.menu.snapshots=instant\u00c3\u00a1neas
+label.menu.stopped.instances=Detenido instancias
+label.menu.storage=Almacenamiento
+label.menu.system=Sistema
+label.menu.system.vms=Sistema de m\u00c3\u00a1quinas virtuales
+label.menu.templates=plantillas
+label.menu.virtual.appliances=Virtual Appliances
+label.menu.virtual.resources=Virtual de Recursos
+label.menu.volumes=Vol\u00c3\u00bamenes
label.migrate.instance.to.host=Migrar instancia a otro host.
label.migrate.instance.to=Migraci\u00c3\u00b3n de ejemplo para
label.migrate.instance.to.ps=Migrar instancia a otro primary storage.
label.migrate.router.to=Router para migrar
label.migrate.systemvm.to=Migrar m\u00c3\u00a1quina virtual del sistema para
-label.minimum=M\u00c3\u00adnimo
-label.minute.past.hour=Minuto (s) despu\u00c3\u00a9s de la hora
-label.monday=lunes
-label.monthly=mensual
-label.more.templates=plantillas \= M\u00c3\u00a1s
-label.my.account=Mi Cuenta
+label.minimum=M\u00c3\u00adnimo
+label.minute.past.hour=Minuto (s) despu\u00c3\u00a9s de la hora
+label.monday=lunes
+label.monthly=mensual
+label.more.templates=plantillas \= M\u00c3\u00a1s
+label.my.account=Mi Cuenta
label.my.templates=Mis plantillas
-label.name=Nombre
-label.name.optional=Nombre (Opcional)
-label.netmask=m\u00c3\u00a1scara de red
-label.network.desc=Red de Desc
+label.name=Nombre
+label.name.optional=Nombre (Opcional)
+label.netmask=m\u00c3\u00a1scara de red
+label.network.desc=Red de Desc
label.network.device=De dispositivos de red
label.network.device.type=Tipo de red de dispositivos
label.network.domain=red de dominio
-label.network.id=ID de red
-label.network.name=Nombre de red
-label.network.offering.display.text=Red ofrece visualizaci\u00c3\u00b3n de texto
-label.network.offering.id=Red ofrece ID
-label.network.offering.name=Red ofrece Nombre
-label.network.offering=Red ofrece
-label.network.rate=Tasa de Red
-label.network.read=Leer de la red
-label.network=Red
+label.network.id=ID de red
+label.network.name=Nombre de red
+label.network.offering.display.text=Red ofrece visualizaci\u00c3\u00b3n de texto
+label.network.offering.id=Red ofrece ID
+label.network.offering.name=Red ofrece Nombre
+label.network.offering=Red ofrece
+label.network.rate=Tasa de Red
+label.network.read=Leer de la red
+label.network=Red
label.networks=Redes
-label.network.type=Tipo de red
-label.network.write=Escribir en la red
+label.network.type=Tipo de red
+label.network.write=Escribir en la red
label.new=Nuevo
-label.new.password=Nueva contrase\u00c3\u00b1a
+label.new.password=Nueva contrase\u00c3\u00b1a
label.new.vm=Nueva maquina virtual
-label.next=Siguiente
-label.nfs=NFS
-label.nfs.server=servidor NFS
-label.nfs.storage=NFS Almacenamiento
-label.nics=NIC
-label.no.actions=No Acciones disponibles
-label.no.alerts=No alertas recientes
-label.no.errors=No recientes errores
-label.no.isos=No ISOs disponibles
-label.no.items=No art\u00c3\u00adculos disponibles
+label.next=Siguiente
+label.nfs=NFS
+label.nfs.server=servidor NFS
+label.nfs.storage=NFS Almacenamiento
+label.nics=NIC
+label.no.actions=No Acciones disponibles
+label.no.alerts=No alertas recientes
+label.no.errors=No recientes errores
+label.no.isos=No ISOs disponibles
+label.no.items=No art\u00c3\u00adculos disponibles
label.none=Ninguno
-label.no=No
-label.no.security.groups=No hay grupos disponibles de Seguridad
+label.no=No
+label.no.security.groups=No hay grupos disponibles de Seguridad
label.not.found=No se ha encontrado
-label.no.thanks=No, gracias
-label.num.cpu.cores=n\u00c3\u00bamero de n\u00c3\u00bacleos de CPU
+label.no.thanks=No, gracias
+label.num.cpu.cores=n\u00c3\u00bamero de n\u00c3\u00bacleos de CPU
label.numretries=N\u00c3\u00bamero de reintentos
label.ocfs2=OCFS2
-label.offer.ha=Oferta HA
-label.optional=Opcional
-label.os.preference=OS Preferencia
-label.os.type=tipo de Sistema Operativo
-label.owned.public.ips=propiedad p\u00c3\u00bablica Direcciones IP
-label.owner.account=titular de la cuenta
-label.parent.domain=Padres de dominio
-label.password=Contrase\u00c3\u00b1a
-label.password.enabled=Contrase\u00c3\u00b1a Activado
-label.path=Ruta
+label.offer.ha=Oferta HA
+label.optional=Opcional
+label.os.preference=OS Preferencia
+label.os.type=tipo de Sistema Operativo
+label.owned.public.ips=propiedad p\u00c3\u00bablica Direcciones IP
+label.owner.account=titular de la cuenta
+label.parent.domain=Padres de dominio
+label.password=Contrase\u00c3\u00b1a
+label.password.enabled=Contrase\u00c3\u00b1a Activado
+label.path=Ruta
label.PING.CIFS.password=PING CIFS contrase\u00c3\u00b1a
label.PING.CIFS.username=PING CIFS nombre de usuario
label.PING.dir=PING Directorio
label.PING.storage.IP=PING almacenamiento IP
-label.please.wait=Por favor espere
-label.pod=Pod
-label.port.forwarding=Port Forwarding
-label.port.range=rango de puertos
+label.please.wait=Por favor espere
+label.pod=Pod
+label.port.forwarding=Port Forwarding
+label.port.range=rango de puertos
label.PreSetup=PreSetup
-label.prev=Anterior
+label.prev=Anterior
label.previous=Previo
-label.primary.allocated=primaria asignado de almacenamiento
-label.primary.network=Red Primaria
-label.primary.storage=Almacenamiento Primario
-label.primary.used=Primaria Almacenado
-label.private.interface=Interfaz privada
-label.private.ip=direcci\u00c3\u00b3n IP privada
-label.private.ip.range=IP privada Gama
-label.private.ips=direcciones IP privadas
+label.primary.allocated=primaria asignado de almacenamiento
+label.primary.network=Red Primaria
+label.primary.storage=Almacenamiento Primario
+label.primary.used=Primaria Almacenado
+label.private.interface=Interfaz privada
+label.private.ip=direcci\u00c3\u00b3n IP privada
+label.private.ip.range=IP privada Gama
+label.private.ips=direcciones IP privadas
label.privatekey=PKCS\#8 la clave privada
-label.private.port=Puerto privado
-label.private.zone=Zona Privada
+label.private.port=Puerto privado
+label.private.zone=Zona Privada
label.project.name=Nombre del Proyecto
-label.protocol=Protocolo
-label.public.interface=interfaz p\u00c3\u00bablica
-label.public.ip=direcci\u00c3\u00b3n IP p\u00c3\u00bablica
-label.public.ips=direcciones IP p\u00c3\u00bablicas
-label.public.port=Puerto P\u00c3\u00bablico
-label.public=P\u00c3\u00bablica
-label.public.zone=Zona P\u00c3\u00bablica
+label.protocol=Protocolo
+label.public.interface=interfaz p\u00c3\u00bablica
+label.public.ip=direcci\u00c3\u00b3n IP p\u00c3\u00bablica
+label.public.ips=direcciones IP p\u00c3\u00bablicas
+label.public.port=Puerto P\u00c3\u00bablico
+label.public=P\u00c3\u00bablica
+label.public.zone=Zona P\u00c3\u00bablica
label.Pxe.server.type=Tipo de servidor Pxe
-label.reboot=Reiniciar
-label.recent.errors=recientes errores
+label.reboot=Reiniciar
+label.recent.errors=recientes errores
label.redundant.router=enrutador redundante
-label.refresh=Actualizar
-label.related=relacionados
-label.remind.later=Recordar mas tarde
-label.remove.from.load.balancer=ejemplo Eliminaci\u00c3\u00b3n de equilibrador de carga
+label.refresh=Actualizar
+label.related=relacionados
+label.remind.later=Recordar mas tarde
+label.remove.from.load.balancer=ejemplo Eliminaci\u00c3\u00b3n de equilibrador de carga
label.removing=Borrando.
-label.removing.user=Eliminar usuario
-label.required=Requerido
-label.reserved.system.ip=Reservados sistema de PI
-label.resource.limits=L\u00c3\u00admites de Recursos
-label.resource=Recursos
-label.resources=Recursos
-label.role=Papel
+label.removing.user=Eliminar usuario
+label.required=Requerido
+label.reserved.system.ip=Reservados sistema de PI
+label.resource.limits=L\u00c3\u00admites de Recursos
+label.resource=Recursos
+label.resources=Recursos
+label.role=Papel
label.root.disk.offering=Root Disco Offering
-label.running.vms=Ejecuci\u00c3\u00b3n de m\u00c3\u00a1quinas virtuales
-label.s3.secret_key=clave secreta
-label.saturday=s\u00c3\u00a1bado
-label.save=Guardar
-label.saving.processing=ahorro ....
-label.scope=Alcance
-label.search=Buscar
-label.secondary.storage=Almacenamiento secundario
-label.secondary.used=Secundaria Almacenado
-label.secret.key=clave secreta
-label.security.group=Grupo de Seguridad
-label.security.group.name=Nombre de grupo de seguridad
+label.running.vms=Ejecuci\u00c3\u00b3n de m\u00c3\u00a1quinas virtuales
+label.s3.secret_key=clave secreta
+label.saturday=s\u00c3\u00a1bado
+label.save=Guardar
+label.saving.processing=ahorro ....
+label.scope=Alcance
+label.search=Buscar
+label.secondary.storage=Almacenamiento secundario
+label.secondary.used=Secundaria Almacenado
+label.secret.key=clave secreta
+label.security.group=Grupo de Seguridad
+label.security.group.name=Nombre de grupo de seguridad
label.security.groups.enabled=Los grupos de seguridad habilitado
-label.security.groups=Grupos de seguridad
+label.security.groups=Grupos de seguridad
label.select.a.zone=Seleccione una zona.
-label.sent=Enviados
-label.server=Servidor
-label.service.offering=Oferta de Servicio
+label.sent=Enviados
+label.server=Servidor
+label.service.offering=Oferta de Servicio
label.session.expired=Session Caducado
-label.shared=compartidas
-label.SharedMountPoint=SharedMountPoint
+label.shared=compartidas
+label.SharedMountPoint=SharedMountPoint
label.show.ingress.rule=Mostrar la regla del ingreso
-label.size=Tama\u00c3\u00b1o
-label.snapshot=Instant\u00c3\u00a1nea
-label.snapshot.limits=instant\u00c3\u00a1neas L\u00c3\u00admites
-label.snapshot.name=Nombre de instant\u00c3\u00a1neas
-label.snapshot.schedule=Lista de instant\u00c3\u00a1neas
-label.snapshot.s=Instant\u00c3\u00a1nea (s)
-label.snapshots=instant\u00c3\u00a1neas
-label.source.nat=NAT Fuente
-label.specify.vlan=Especifique VLAN
+label.size=Tama\u00c3\u00b1o
+label.snapshot=Instant\u00c3\u00a1nea
+label.snapshot.limits=instant\u00c3\u00a1neas L\u00c3\u00admites
+label.snapshot.name=Nombre de instant\u00c3\u00a1neas
+label.snapshot.schedule=Lista de instant\u00c3\u00a1neas
+label.snapshot.s=Instant\u00c3\u00a1nea (s)
+label.snapshots=instant\u00c3\u00a1neas
+label.source.nat=NAT Fuente
+label.specify.vlan=Especifique VLAN
label.SR.name = SR Nombre de etiqueta
-label.start.port=Iniciar Puerto
-label.state=Estado
-label.static.nat=NAT est\u00c3\u00a1tica
-label.static.nat.to=est\u00c3\u00a1tico NAT para
-label.statistics=Estad\u00c3\u00adsticas
-label.status=Estado
-label.step.1=Paso 1
-label.step.1.title=Paso 1\: <strong> Seleccione una plantilla </strong>
-label.step.2=Paso 2
-label.step.2.title=Paso 2\: <strong> Oferta de Servicio </strong>
-label.step.3=Paso 3
-label.step.3.title=Paso 3\: <strong id\="step3_label"> Seleccione un disco Ofrenda </strong>
-label.step.4=Paso 4
-label.step.4.title=Paso 4\: <strong> Red </strong>
-label.step.5=Paso 5
-label.step.5.title=Paso 5\: Revisi\u00c3\u00b3n <strong> </strong>
-label.sticky.domain=dominio
+label.start.port=Iniciar Puerto
+label.state=Estado
+label.static.nat=NAT est\u00c3\u00a1tica
+label.static.nat.to=est\u00c3\u00a1tico NAT para
+label.statistics=Estad\u00c3\u00adsticas
+label.status=Estado
+label.step.1=Paso 1
+label.step.1.title=Paso 1\: <strong> Seleccione una plantilla </strong>
+label.step.2=Paso 2
+label.step.2.title=Paso 2\: <strong> Oferta de Servicio </strong>
+label.step.3=Paso 3
+label.step.3.title=Paso 3\: <strong id\="step3_label"> Seleccione un disco Ofrenda </strong>
+label.step.4=Paso 4
+label.step.4.title=Paso 4\: <strong> Red </strong>
+label.step.5=Paso 5
+label.step.5.title=Paso 5\: Revisi\u00c3\u00b3n <strong> </strong>
+label.sticky.domain=dominio
label.sticky.mode=modo
-label.stop=Detener
-label.stopped.vms=Detenido m\u00c3\u00a1quinas virtuales
-label.storage=Almacenamiento
+label.stop=Detener
+label.stopped.vms=Detenido m\u00c3\u00a1quinas virtuales
+label.storage=Almacenamiento
label.storage.tags=Etiquetas de almacenamiento
-label.storage.type=Tipo de almacenamiento
-label.submit=Enviar
-label.submitted.by=[Enviado por\: <span id\="submitted_by"> </span>]
-label.succeeded=Sucesor
-label.sunday=domingo
-label.system.capacity=Capacidad de todo el sistema
-label.system.vm=Sistema de VM
-label.system.vms=Sistema de m\u00c3\u00a1quinas virtuales
-label.system.vm.type=Tipo de sistema VM
-label.tagged=etiqueta
-label.tags=Etiquetas
-label.target.iqn=Objetivo IQN
-label.task.completed=Tarea finalizada.
-label.template.limits=Plantilla L\u00c3\u00admites
-label.template=plantilla
+label.storage.type=Tipo de almacenamiento
+label.submit=Enviar
+label.submitted.by=[Enviado por\: <span id\="submitted_by"> </span>]
+label.succeeded=Sucesor
+label.sunday=domingo
+label.system.capacity=Capacidad de todo el sistema
+label.system.vm=Sistema de VM
+label.system.vms=Sistema de m\u00c3\u00a1quinas virtuales
+label.system.vm.type=Tipo de sistema VM
+label.tagged=etiqueta
+label.tags=Etiquetas
+label.target.iqn=Objetivo IQN
+label.task.completed=Tarea finalizada.
+label.template.limits=Plantilla L\u00c3\u00admites
+label.template=plantilla
label.TFTP.dir=Directorio de TFTP
-label.theme.default=Tema Por Defecto
+label.theme.default=Tema Por Defecto
label.theme.grey=Personal - Gris
label.theme.lightblue=Personal - Azul
-label.thursday=Jueves
+label.thursday=Jueves
label.timeout.in.second = Tiempo de espera (segundos)
-label.time=Tiempo
-label.time.zone=Zona horaria
-label.timezone=Zona horaria
+label.time=Tiempo
+label.time.zone=Zona horaria
+label.timezone=Zona horaria
label.total.cpu=Total CPU
label.total.CPU=Total CPU
-label.total.vms=Total de m\u00c3\u00a1quinas virtuales
-label.traffic.type=Tipo de Tr\u00c3\u00a1fico
-label.tuesday=martes
-label.type.id=Tipo de identificaci\u00c3\u00b3n
-label.type=Tipo
-label.unavailable=no disponible
+label.total.vms=Total de m\u00c3\u00a1quinas virtuales
+label.traffic.type=Tipo de Tr\u00c3\u00a1fico
+label.tuesday=martes
+label.type.id=Tipo de identificaci\u00c3\u00b3n
+label.type=Tipo
+label.unavailable=no disponible
label.unlimited=Unlimited
-label.untagged=sin etiquetar
-label.updating=Actualizar
+label.untagged=sin etiquetar
+label.updating=Actualizar
label.url=URL
-label.usage.interface=Interfaz de uso
-label.used=Usado
-label.username=Nombre de usuario
-label.users=usuario
-label.user=Usuario
-label.value=Valor
-label.vcenter.cluster=vCenter cl\u00c3\u00baster
-label.vcenter.datacenter=vCenter de centros de datos
-label.vcenter.datastore=vCenter almac\u00c3\u00a9n de datos
-label.vcenter.host=vCenter anfitri\u00c3\u00b3n
-label.vcenter.password=vCenter Contrase\u00c3\u00b1a
-label.vcenter.username=vCenter Nombre de usuario
-label.version=Versi\u00c3\u00b3n
-label.virtual.appliances=Virtual Appliances
-label.virtual.appliance=Virtual Appliance
+label.usage.interface=Interfaz de uso
+label.used=Usado
+label.username=Nombre de usuario
+label.users=usuario
+label.user=Usuario
+label.value=Valor
+label.vcenter.cluster=vCenter cl\u00c3\u00baster
+label.vcenter.datacenter=vCenter de centros de datos
+label.vcenter.datastore=vCenter almac\u00c3\u00a9n de datos
+label.vcenter.host=vCenter anfitri\u00c3\u00b3n
+label.vcenter.password=vCenter Contrase\u00c3\u00b1a
+label.vcenter.username=vCenter Nombre de usuario
+label.version=Versi\u00c3\u00b3n
+label.virtual.appliances=Virtual Appliances
+label.virtual.appliance=Virtual Appliance
label.virtual.machines=Maquinas virtuales
-label.virtual.network=Red Virtual
-label.vlan.id=ID de VLAN
-label.vlan.range=VLAN Gama
-label.vlan=VLAN
-label.vm.add=A\u00c3\u00b1adir Instancia
-label.vm.destroy=Destroy
+label.virtual.network=Red Virtual
+label.vlan.id=ID de VLAN
+label.vlan.range=VLAN Gama
+label.vlan=VLAN
+label.vm.add=A\u00c3\u00b1adir Instancia
+label.vm.destroy=Destroy
label.VMFS.datastore=VMFS de datos tienda
-label.vmfs=VMFS
-label.vm.reboot=Reiniciar
-label.vmsnapshot.type=Tipo
-label.vm.start=Inicio
-label.vm.stop=Detener
-label.vms=VM
+label.vmfs=VMFS
+label.vm.reboot=Reiniciar
+label.vmsnapshot.type=Tipo
+label.vm.start=Inicio
+label.vm.stop=Detener
+label.vms=VM
label.volgroup=Volume Group
-label.volume.limits=l\u00c3\u00admites de volumen
-label.volume.name=Nombre de Volumen
-label.volumes=Vol\u00c3\u00bamenes
-label.volume=Volumen
-label.vpn=VPN
-label.vsphere.managed=Gestionado \= vSphere
-label.waiting=Esperando
-label.warn=Advertir
-label.wednesday=mi\u00c3\u00a9rcoles
-label.weekly=Semanal
-label.welcome=Bienvenido
-label.welcome.cloud.console=Bienvenido a la consola de administraci\u00c3\u00b3n
-label.yes=S\u00c3\u00ad
-label.zone.id=Zona de identificaci\u00c3\u00b3n
-label.zone.step.1.title=Paso 1\: <strong> Seleccione una red </strong>
-label.zone.step.2.title=Paso 2\: <strong>A\u00c3\u00b1adir una zona </strong>
-label.zone.step.3.title=Paso 3\: <strong>A\u00c3\u00b1adir una vaina </strong>
-label.zone.step.4.title=Paso 4\: <strong>A\u00c3\u00b1adir un rango de IP </strong>
-label.zone.wide=Zona para todo el
+label.volume.limits=l\u00c3\u00admites de volumen
+label.volume.name=Nombre de Volumen
+label.volumes=Vol\u00c3\u00bamenes
+label.volume=Volumen
+label.vpn=VPN
+label.vsphere.managed=Gestionado \= vSphere
+label.waiting=Esperando
+label.warn=Advertir
+label.wednesday=mi\u00c3\u00a9rcoles
+label.weekly=Semanal
+label.welcome=Bienvenido
+label.welcome.cloud.console=Bienvenido a la consola de administraci\u00c3\u00b3n
+label.yes=S\u00c3\u00ad
+label.zone.id=Zona de identificaci\u00c3\u00b3n
+label.zone.step.1.title=Paso 1\: <strong> Seleccione una red </strong>
+label.zone.step.2.title=Paso 2\: <strong>A\u00c3\u00b1adir una zona </strong>
+label.zone.step.3.title=Paso 3\: <strong>A\u00c3\u00b1adir una vaina </strong>
+label.zone.step.4.title=Paso 4\: <strong>A\u00c3\u00b1adir un rango de IP </strong>
+label.zone.wide=Zona para todo el
label.zone=Zona
managed.state=Estado logr\u00c3\u00b3
-message.acquire.public.ip=Por favor seleccione una zona de la que desea adquirir su nueva IP.
-message.action.cancel.maintenance.mode=Por favor, confirme que desea cancelar el mantenimiento
+message.acquire.public.ip=Por favor seleccione una zona de la que desea adquirir su nueva IP.
+message.action.cancel.maintenance.mode=Por favor, confirme que desea cancelar el mantenimiento
message.action.cancel.maintenance=Su acogida ha sido cancelado con \u00c3\u00a9xito para el mantenimiento. Este proceso puede tardar hasta varios minutos.
-message.action.delete.cluster=Por favor, confirme que desea eliminar del cl\u00c3\u00baster
-message.action.delete.disk.offering=Por favor, confirme que desea eliminar ofreciendo disco
-message.action.delete.domain=Por favor, confirme que desea eliminar de dominio
+message.action.delete.cluster=Por favor, confirme que desea eliminar del cl\u00c3\u00baster
+message.action.delete.disk.offering=Por favor, confirme que desea eliminar ofreciendo disco
+message.action.delete.domain=Por favor, confirme que desea eliminar de dominio
message.action.delete.external.firewall=Por favor, confirme que desea quitar este servidor de seguridad externo. Advertencia\: Si usted est\u00c3\u00a1 planeando volver a agregar el servidor de seguridad externo mismo, debe restablecer los datos de uso en el dispositivo.
message.action.delete.external.load.balancer=Por favor, confirme que desea eliminar este equilibrador de carga externa. Advertencia\: Si usted est\u00c3\u00a1 planeando volver a agregar la misma equilibrador de carga externo, debe restablecer los datos de uso en el dispositivo.
-message.action.delete.ingress.rule=Por favor, confirme que desea eliminar la regla de ingreso
-message.action.delete.ISO.for.all.zones=La ISO es utilizado por todas las zonas. Por favor, confirme que desea eliminar de todas las zonas.
-message.action.delete.ISO=Por favor, confirme que desea eliminar la norma ISO
-message.action.delete.network=Por favor, confirme que desea eliminar de la red
-message.action.delete.pod=Por favor, confirme que desea eliminar de la vaina
-message.action.delete.primary.storage=Por favor, confirme que desea eliminar el almacenamiento primario
-message.action.delete.secondary.storage=Por favor, confirme que desea eliminar de almacenamiento secundario
-message.action.delete.security.group=Por favor, confirme que desea eliminar el grupo de seguridad
-message.action.delete.service.offering=Por favor, confirme que desea eliminar oferta de servicios
+message.action.delete.ingress.rule=Por favor, confirme que desea eliminar la regla de ingreso
+message.action.delete.ISO.for.all.zones=La ISO es utilizado por todas las zonas. Por favor, confirme que desea eliminar de todas las zonas.
+message.action.delete.ISO=Por favor, confirme que desea eliminar la norma ISO
+message.action.delete.network=Por favor, confirme que desea eliminar de la red
+message.action.delete.pod=Por favor, confirme que desea eliminar de la vaina
+message.action.delete.primary.storage=Por favor, confirme que desea eliminar el almacenamiento primario
+message.action.delete.secondary.storage=Por favor, confirme que desea eliminar de almacenamiento secundario
+message.action.delete.security.group=Por favor, confirme que desea eliminar el grupo de seguridad
+message.action.delete.service.offering=Por favor, confirme que desea eliminar oferta de servicios
message.action.delete.snapshot=Por favor, confirme que desea eliminar instant\u00c3\u00a1neas
-message.action.delete.template.for.all.zones=La plantilla es utilizada por todas las zonas. Por favor, confirme que desea eliminar de todas las zonas.
-message.action.delete.template=Por favor, confirme que desea eliminar la plantilla
-message.action.delete.volume=Por favor, confirme que desea eliminar el volumen
-message.action.delete.zone=Por favor, confirme que desea eliminar la zona
-message.action.destroy.instance=Por favor, confirme que desea destruir ejemplo
+message.action.delete.template.for.all.zones=La plantilla es utilizada por todas las zonas. Por favor, confirme que desea eliminar de todas las zonas.
+message.action.delete.template=Por favor, confirme que desea eliminar la plantilla
+message.action.delete.volume=Por favor, confirme que desea eliminar el volumen
+message.action.delete.zone=Por favor, confirme que desea eliminar la zona
+message.action.destroy.instance=Por favor, confirme que desea destruir ejemplo
message.action.destroy.systemvm=Por favor, confirme que desea destruir la m\u00c3\u00a1quina virtual del sistema.
message.action.disable.cluster=Por favor, confirme que desea desactivar este grupo.
message.action.disable.pod=Por favor, confirme que desea desactivar esta vaina.
-message.action.disable.static.NAT=Por favor, confirme que desea desactivar NAT est\u00c3\u00a1tica
+message.action.disable.static.NAT=Por favor, confirme que desea desactivar NAT est\u00c3\u00a1tica
message.action.disable.zone=Por favor, confirme que desea desactivar esta zona.
message.action.enable.cluster=Por favor, confirme que desea habilitar este grupo.
message.action.enable.maintenance=Su acogida ha sido preparado con \u00c3\u00a9xito para el mantenimiento. Este proceso puede tardar hasta varios minutos o m\u00c3\u00a1s dependiendo de c\u00c3\u00b3mo las m\u00c3\u00a1quinas virtuales se encuentran actualmente en este servidor.
-message.action.enable.pod=Por favor, confirme que desea habilitar esta vaina.
-message.action.enable.zone=Por favor, confirme que desea habilitar esta zona.
-message.action.force.reconnect=Por favor, confirme que desea forzar una reconexi\u00c3\u00b3n para el anfitri\u00c3\u00b3n
-message.action.host.enable.maintenance.mode=mode \= mantenimiento de Habilitaci\u00c3\u00b3n provocar\u00c3\u00a1 una migraci\u00c3\u00b3n en vivo de todas las instancias que se ejecutan en el sistema para cualquier m\u00c3\u00a1quina disponible.
+message.action.enable.pod=Por favor, confirme que desea habilitar esta vaina.
+message.action.enable.zone=Por favor, confirme que desea habilitar esta zona.
+message.action.force.reconnect=Por favor, confirme que desea forzar una reconexi\u00c3\u00b3n para el anfitri\u00c3\u00b3n
+message.action.host.enable.maintenance.mode=mode \= mantenimiento de Habilitaci\u00c3\u00b3n provocar\u00c3\u00a1 una migraci\u00c3\u00b3n en vivo de todas las instancias que se ejecutan en el sistema para cualquier m\u00c3\u00a1quina disponible.
message.action.manage.cluster=Por favor, confirme que desea para administrar el cl\u00c3\u00baster.
-message.action.primarystorage.enable.maintenance.mode=Advertencia\: colocar el almacenamiento principal en modo de mantenimiento har\u00c3\u00a1 que todas las m\u00c3\u00a1quinas virtuales utilizando vol\u00c3\u00bamenes de que sea detenido. \u00c2\u00bfDesea continuar?
-message.action.reboot.instance=Por favor, confirme que desea reiniciar el ejemplo
-message.action.reboot.systemvm=Por favor, confirme que desea reiniciar el sistema VM
-message.action.release.ip=Por favor, confirme que desea liberar IP
+message.action.primarystorage.enable.maintenance.mode=Advertencia\: colocar el almacenamiento principal en modo de mantenimiento har\u00c3\u00a1 que todas las m\u00c3\u00a1quinas virtuales utilizando vol\u00c3\u00bamenes de que sea detenido. \u00c2\u00bfDesea continuar?
+message.action.reboot.instance=Por favor, confirme que desea reiniciar el ejemplo
+message.action.reboot.systemvm=Por favor, confirme que desea reiniciar el sistema VM
+message.action.release.ip=Por favor, confirme que desea liberar IP
message.action.reset.password.off=Su ejemplo en la actualidad no es compatible con esta funci\u00c3\u00b3n.
message.action.reset.password.warning=Su ejemplo debe ser detenido antes de intentar cambiar su contrase\u00c3\u00b1a actual.
-message.action.restore.instance=Por favor, confirme que desea restaurar ejemplo
-message.action.start.instance=Por favor, confirme que desea iniciar la instancia
-message.action.start.router=Por favor, confirme que desea iniciar router
-message.action.start.systemvm=Por favor, confirme que desea iniciar el sistema VM
-message.action.stop.instance=Por favor, confirme que desea detener la instancia
-message.action.stop.systemvm=Por favor, confirme que desea detener sistema VM
-message.action.take.snapshot=Por favor, confirme que desea tomar instant\u00c3\u00a1neas
+message.action.restore.instance=Por favor, confirme que desea restaurar ejemplo
+message.action.start.instance=Por favor, confirme que desea iniciar la instancia
+message.action.start.router=Por favor, confirme que desea iniciar router
+message.action.start.systemvm=Por favor, confirme que desea iniciar el sistema VM
+message.action.stop.instance=Por favor, confirme que desea detener la instancia
+message.action.stop.systemvm=Por favor, confirme que desea detener sistema VM
+message.action.take.snapshot=Por favor, confirme que desea tomar instant\u00c3\u00a1neas
message.action.unmanage.cluster=Por favor, confirme que desea unmanage del cl\u00c3\u00baster.
-message.add.cluster=A\u00c3\u00b1adir un hipervisor administradas por cl\u00c3\u00baster de <b> zona <span id\="zone_name"> </span> </b>, la consola de <b> <span id\="pod_name"> </span> </b>
-message.add.cluster.zone=A\u00c3\u00b1adir un hipervisor administradas por cl\u00c3\u00baster de <b> zona <span id\="zone_name"> </span> </b>
-message.add.disk.offering=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo disco que ofrece
-message.add.firewall=A\u00c3\u00b1adir un servidor de seguridad a la zona
-message.add.host=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo host
-message.add.ip.range=A\u00c3\u00b1adir un rango de IP a la red p\u00c3\u00bablica en la zona
-message.add.ip.range.direct.network=A\u00c3\u00b1adir un rango de IP para dirigir <b> red <span id\="directnetwork_name"> </span> </b> en la zona <b> <span id \= "zone_name" > </span> </b>
-message.add.ip.range.to.pod=<p> A\u00c3\u00b1adir un rango de IP de la vaina\: <b><span id\="pod_name_label"> </span> </b> </p>
-message.additional.networks.desc=Por favor seleccione de red adicionales (s) que la instancia virtual estar\u00c3\u00a1 conectado.
-message.add.load.balancer=A\u00c3\u00b1adir un equilibrador de carga a la zona
-message.add.network=Agregar una nueva red para la zona\: <b><span id\="zone_name"> </span> </b>
-message.add.pod=Agregar una vaina nueva <b> zona <span id\="add_pod_zone_name"> </span> </b>
-message.add.primary=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo almacenamiento primario
-message.add.primary.storage=Agregar una nueva almacenamiento primario para <b> zona <span id\="zone_name"> </span> </b>, la consola de <b> <span id\="pod_name"> </span> </b>
-message.add.secondary.storage=A\u00c3\u00b1adir un nuevo almacenamiento de <b> zona <span id\="zone_name"> </span> </b>
-message.add.service.offering=Por favor, rellene los siguientes datos para agregar una nueva oferta de servicio.
-message.add.template=Por favor ingrese los siguientes datos para crear la nueva plantilla
-message.add.volume=Por favor, rellene los siguientes datos para agregar un nuevo volumen.
-message.advanced.mode.desc=Seleccione este modelo de red si desea habilitar soporte VLAN. Este modelo de red proporciona la m\u00c3\u00a1xima flexibilidad al permitir a los administradores proporcionar ofertas personalizadas de la red como el suministro de firewall, VPN, o el apoyo equilibrador de carga, as\u00c3\u00ad como permitir vs directa de redes virtuales.
+message.add.cluster=A\u00c3\u00b1adir un hipervisor administradas por cl\u00c3\u00baster de <b> zona <span id\="zone_name"> </span> </b>, la consola de <b> <span id\="pod_name"> </span> </b>
+message.add.cluster.zone=A\u00c3\u00b1adir un hipervisor administradas por cl\u00c3\u00baster de <b> zona <span id\="zone_name"> </span> </b>
+message.add.disk.offering=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo disco que ofrece
+message.add.firewall=A\u00c3\u00b1adir un servidor de seguridad a la zona
+message.add.host=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo host
+message.add.ip.range=A\u00c3\u00b1adir un rango de IP a la red p\u00c3\u00bablica en la zona
+message.add.ip.range.direct.network=A\u00c3\u00b1adir un rango de IP para dirigir <b> red <span id\="directnetwork_name"> </span> </b> en la zona <b> <span id \= "zone_name" > </span> </b>
+message.add.ip.range.to.pod=<p> A\u00c3\u00b1adir un rango de IP de la vaina\: <b><span id\="pod_name_label"> </span> </b> </p>
+message.additional.networks.desc=Por favor seleccione de red adicionales (s) que la instancia virtual estar\u00c3\u00a1 conectado.
+message.add.load.balancer=A\u00c3\u00b1adir un equilibrador de carga a la zona
+message.add.network=Agregar una nueva red para la zona\: <b><span id\="zone_name"> </span> </b>
+message.add.pod=Agregar una vaina nueva <b> zona <span id\="add_pod_zone_name"> </span> </b>
+message.add.primary=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo almacenamiento primario
+message.add.primary.storage=Agregar una nueva almacenamiento primario para <b> zona <span id\="zone_name"> </span> </b>, la consola de <b> <span id\="pod_name"> </span> </b>
+message.add.secondary.storage=A\u00c3\u00b1adir un nuevo almacenamiento de <b> zona <span id\="zone_name"> </span> </b>
+message.add.service.offering=Por favor, rellene los siguientes datos para agregar una nueva oferta de servicio.
+message.add.template=Por favor ingrese los siguientes datos para crear la nueva plantilla
+message.add.volume=Por favor, rellene los siguientes datos para agregar un nuevo volumen.
+message.advanced.mode.desc=Seleccione este modelo de red si desea habilitar soporte VLAN. Este modelo de red proporciona la m\u00c3\u00a1xima flexibilidad al permitir a los administradores proporcionar ofertas personalizadas de la red como el suministro de firewall, VPN, o el apoyo equilibrador de carga, as\u00c3\u00ad como permitir vs directa de redes virtuales.
message.advanced.security.group=Elija esta opci\u00c3\u00b3n si desea utilizar grupos de seguridad para proporcionar resultados de aislamiento VM.
message.advanced.virtual=Elija esta opci\u00c3\u00b3n si desea utilizar VLAN toda la zona para proporcionar el aislamiento VM invitado.
-message.allow.vpn.access=Por favor, introduzca un nombre de usuario y la contrase\u00c3\u00b1a del usuario que desea permitir el acceso de VPN.
+message.allow.vpn.access=Por favor, introduzca un nombre de usuario y la contrase\u00c3\u00b1a del usuario que desea permitir el acceso de VPN.
message.apply.snapshot.policy=Ha actualizado su pol\u00c3\u00adtica instant\u00c3\u00a1nea actual.
-message.attach.iso.confirm=Por favor, confirme que desea conectar el ISO a la instancia virtual
-message.attach.volume=Por favor, rellene los siguientes datos para fijar un nuevo volumen. Si est\u00c3\u00a1 colocando un volumen de disco a una m\u00c3\u00a1quina virtual de Windows basado, usted tendr\u00c3\u00a1 que reiniciar la instancia para ver el disco adjunto.
-message.basic.mode.desc=Seleccione este modelo de red si lo haces * <b> no <u> </u> * </b> desea habilitar cualquier soporte VLAN. Todas las instancias virtuales creados en virtud de este modelo de red se le asignar\u00c3\u00a1 una direcci\u00c3\u00b3n IP directamente desde la red y grupos de seguridad se utilizan para proporcionar la seguridad y la segregaci\u00c3\u00b3n.
-message.change.offering.confirm=Por favor, confirme que desea cambiar la oferta de servicio de la instancia virtual.
-message.copy.iso.confirm=Por favor, confirme que desea copiar el ISO a
-message.copy.template=Copia plantilla <b id\="copy_template_name_text"> XXX </b> de la zona <b id\="copy_template_source_zone_text"> </b>
-message.create.template.vm=Crear VM de la plantilla <b id\="p_name"> </b>
-message.create.template.volume=Por favor, especifique la siguiente informaci\u00c3\u00b3n antes de crear una plantilla de su volumen de disco\: <b> <span id\="volume_name"> </span> </b>. Creaci\u00c3\u00b3n de la plantilla puede oscilar entre varios minutos m\u00c3\u00a1s, dependiendo del tama\u00c3\u00b1o del volumen.
-message.delete.account=Por favor, confirme que desea eliminar esta cuenta.
-message.detach.iso.confirm=Por favor, confirme que desea quitar el ISO de la instancia virtual
+message.attach.iso.confirm=Por favor, confirme que desea conectar el ISO a la instancia virtual
+message.attach.volume=Por favor, rellene los siguientes datos para fijar un nuevo volumen. Si est\u00c3\u00a1 colocando un volumen de disco a una m\u00c3\u00a1quina virtual de Windows basado, usted tendr\u00c3\u00a1 que reiniciar la instancia para ver el disco adjunto.
+message.basic.mode.desc=Seleccione este modelo de red si lo haces * <b> no <u> </u> * </b> desea habilitar cualquier soporte VLAN. Todas las instancias virtuales creados en virtud de este modelo de red se le asignar\u00c3\u00a1 una direcci\u00c3\u00b3n IP directamente desde la red y grupos de seguridad se utilizan para proporcionar la seguridad y la segregaci\u00c3\u00b3n.
+message.change.offering.confirm=Por favor, confirme que desea cambiar la oferta de servicio de la instancia virtual.
+message.copy.iso.confirm=Por favor, confirme que desea copiar el ISO a
+message.copy.template=Copia plantilla <b id\="copy_template_name_text"> XXX </b> de la zona <b id\="copy_template_source_zone_text"> </b>
+message.create.template.vm=Crear VM de la plantilla <b id\="p_name"> </b>
+message.create.template.volume=Por favor, especifique la siguiente informaci\u00c3\u00b3n antes de crear una plantilla de su volumen de disco\: <b> <span id\="volume_name"> </span> </b>. Creaci\u00c3\u00b3n de la plantilla puede oscilar entre varios minutos m\u00c3\u00a1s, dependiendo del tama\u00c3\u00b1o del volumen.
+message.delete.account=Por favor, confirme que desea eliminar esta cuenta.
+message.detach.iso.confirm=Por favor, confirme que desea quitar el ISO de la instancia virtual
message.disable.snapshot.policy=Ha desactivado su pol\u00c3\u00adtica instant\u00c3\u00a1nea actual.
message.disable.vpn.access=Por favor, confirme que desea desactivar VPN de acceso.
message.download.volume=Por favor, haga clic <a href\="\#">00000</a> para bajar el volumen
-message.edit.confirm=Por favor confirmar los cambios antes de hacer clic en "Guardar"
-message.edit.limits=Por favor, especifique los l\u00c3\u00admites de los recursos siguientes. A "-1" indica que no hay l\u00c3\u00admite a la cantidad de los recursos de crear.
-message.enable.account=Por favor, confirme que desea habilitar esta cuenta.
-message.enabled.vpn.ip.sec=La clave pre-compartida IPSec es
-message.enabled.vpn=Su acceso a la VPN est\u00c3\u00a1 habilitado y se puede acceder a trav\u00c3\u00a9s de la IP
-message.enable.vpn.access=VPN \= est\u00c3\u00a1 desactivado para esta direcci\u00c3\u00b3n IP. \u00c2\u00bfTe gustar\u00c3\u00ada que permitan el acceso VPN?
-message.enable.vpn=VPN de acceso actualmente no est\u00c3\u00a1 habilitado. Por favor, <a href\="\#" id\="enable_vpn_link"> haga clic aqu\u00c3\u00ad </a> para habilitar VPN.
+message.edit.confirm=Por favor confirmar los cambios antes de hacer clic en "Guardar"
+message.edit.limits=Por favor, especifique los l\u00c3\u00admites de los recursos siguientes. A "-1" indica que no hay l\u00c3\u00admite a la cantidad de los recursos de crear.
+message.enable.account=Por favor, confirme que desea habilitar esta cuenta.
+message.enabled.vpn.ip.sec=La clave pre-compartida IPSec es
+message.enabled.vpn=Su acceso a la VPN est\u00c3\u00a1 habilitado y se puede acceder a trav\u00c3\u00a9s de la IP
+message.enable.vpn.access=VPN \= est\u00c3\u00a1 desactivado para esta direcci\u00c3\u00b3n IP. \u00c2\u00bfTe gustar\u00c3\u00ada que permitan el acceso VPN?
+message.enable.vpn=VPN de acceso actualmente no est\u00c3\u00a1 habilitado. Por favor, <a href\="\#" id\="enable_vpn_link"> haga clic aqu\u00c3\u00ad </a> para habilitar VPN.
message.installWizard.click.retry=Haz click en el bot\u00f3n para re-intentar el lanzamiento de la instancia.
-message.installWizard.tooltip.addCluster.name=Nombre del Cluster. Puede ser alfanum\u00e9rico .Este no es usado por CloudStack
+message.installWizard.tooltip.addCluster.name=Nombre del Cluster. Puede ser alfanum\u00e9rico .Este no es usado por CloudStack
message.installWizard.tooltip.addHost.hostname=El nombre DNS o direcci\u00f3n IP del host
message.installWizard.tooltip.addHost.username=Generalmente root
message.installWizard.tooltip.addPod.name=Nombre del POD
@@ -819,44 +819,44 @@ message.installWizard.tooltip.addPrimaryStorage.name=\ Nombre para el storage
message.installWizard.tooltip.addSecondaryStorage.nfsServer=Direcci\u00f3n IP del servidor NFS que contiene el secondary storage
message.installWizard.tooltip.addZone.name=Nombre de la zona.
message.installWizard.tooltip.configureGuestTraffic.description=Una breve descripci\u00f3n para su red.
-message.installWizard.tooltip.configureGuestTraffic.guestGateway=El gatway, puerta de enlace, que las maquinas guest deben usar.
-message.installWizard.tooltip.configureGuestTraffic.name=Nombre de su RED
-message.lock.account=Por favor, confirme que desea bloquear esta cuenta. Al bloquear la cuenta, todos los usuarios de esta cuenta ya no ser\u00c3\u00a1 capaz de gestionar sus recursos de la nube. Los recursos existentes todav\u00c3\u00ada se puede acceder.
+message.installWizard.tooltip.configureGuestTraffic.guestGateway=El gatway, puerta de enlace, que las maquinas guest deben usar.
+message.installWizard.tooltip.configureGuestTraffic.name=Nombre de su RED
+message.lock.account=Por favor, confirme que desea bloquear esta cuenta. Al bloquear la cuenta, todos los usuarios de esta cuenta ya no ser\u00c3\u00a1 capaz de gestionar sus recursos de la nube. Los recursos existentes todav\u00c3\u00ada se puede acceder.
message.migrate.instance.confirm=Por favor, confirme el anfitri\u00c3\u00b3n desea migrar la instancia virtual.
message.migrate.instance.to.host=Por favor, confirmar que desea mover la instancia a otro host.
message.migrate.instance.to.ps=Por favor, confirmar que desea mover la instancia a otro primary storage.
message.migrate.router.confirm=Por favor, confirme el hu\u00c3\u00a9sped que desea migrar el router\:
message.migrate.systemvm.confirm=Por favor, confirme el hu\u00c3\u00a9sped que desea migrar la m\u00c3\u00a1quina virtual de sistema\:
message.no.network.support.configuration.not.true=Usted no tiene ninguna zona que ha permitido a grupo de seguridad. Por lo tanto, no hay funciones de red adicionales. Por favor, contin\u00c3\u00bae con el paso 5.
-message.no.network.support=El hipervisor seleccionado, vSphere, no tiene funciones de red adicionales. Por favor, contin\u00c3\u00bae con el paso 5.
-message.number.clusters=<h2> <span> \# de </span> Grupos </h2>
-message.number.hosts=<h2> <span> \# de </span> Anfitri\u00c3\u00b3n </h2>
-message.number.pods=<h2> <span> \# de </span> Las vainas </h2>
-message.number.storage=<h2> <span> \# de </span> Almacenamiento primario </h2>
-message.number.zones=<h2> <span> \# de </span> Zonas </h2>
-message.remove.vpn.access=Por favor, confirme que desea eliminar el acceso VPN desde el siguiente usuario
-message.restart.mgmt.server=Por favor, reinicie el servidor de administraci\u00c3\u00b3n (s) para la nueva configuraci\u00c3\u00b3n surta efecto.
-message.security.group.usage=(Uso <strong> pulse Ctrl </strong> para seleccionar todos los grupos de seguridad se aplica)
-message.select.item=Por favor, seleccionar un item .
+message.no.network.support=El hipervisor seleccionado, vSphere, no tiene funciones de red adicionales. Por favor, contin\u00c3\u00bae con el paso 5.
+message.number.clusters=<h2> <span> \# de </span> Grupos </h2>
+message.number.hosts=<h2> <span> \# de </span> Anfitri\u00c3\u00b3n </h2>
+message.number.pods=<h2> <span> \# de </span> Las vainas </h2>
+message.number.storage=<h2> <span> \# de </span> Almacenamiento primario </h2>
+message.number.zones=<h2> <span> \# de </span> Zonas </h2>
+message.remove.vpn.access=Por favor, confirme que desea eliminar el acceso VPN desde el siguiente usuario
+message.restart.mgmt.server=Por favor, reinicie el servidor de administraci\u00c3\u00b3n (s) para la nueva configuraci\u00c3\u00b3n surta efecto.
+message.security.group.usage=(Uso <strong> pulse Ctrl </strong> para seleccionar todos los grupos de seguridad se aplica)
+message.select.item=Por favor, seleccionar un item .
message.setup.successful=La configuraci\u00f3n de la cloud finalizo satisfactoriamente.
-message.snapshot.schedule=Puede horarios de configuraci\u00c3\u00b3n recurrente instant\u00c3\u00a1neas mediante la selecci\u00c3\u00b3n de las opciones disponibles a continuaci\u00c3\u00b3n y la aplicaci\u00c3\u00b3n de su preferencia pol\u00c3\u00adtica
-message.step.1.continue=Por favor seleccione una plantilla o ISO para continuar
-message.step.1.desc=Por favor seleccione una plantilla para la instancia virtual. Tambi\u00c3\u00a9n puede optar por seleccionar una plantilla en blanco desde el que puede ser una imagen ISO instalado en.
-message.step.2.continue=Por favor seleccione una oferta de servicio para continuar
+message.snapshot.schedule=Puede horarios de configuraci\u00c3\u00b3n recurrente instant\u00c3\u00a1neas mediante la selecci\u00c3\u00b3n de las opciones disponibles a continuaci\u00c3\u00b3n y la aplicaci\u00c3\u00b3n de su preferencia pol\u00c3\u00adtica
+message.step.1.continue=Por favor seleccione una plantilla o ISO para continuar
+message.step.1.desc=Por favor seleccione una plantilla para la instancia virtual. Tambi\u00c3\u00a9n puede optar por seleccionar una plantilla en blanco desde el que puede ser una imagen ISO instalado en.
+message.step.2.continue=Por favor seleccione una oferta de servicio para continuar
message.step.2.desc=
-message.step.3.continue=Por favor seleccione una oferta en disco para continuar
+message.step.3.continue=Por favor seleccione una oferta en disco para continuar
message.step.3.desc=
message.step.4.continue=Por favor seleccione al menos una red social para continuar
-message.step.4.desc=Por favor, seleccione la red primaria que la instancia virtual estar\u00c3\u00a1 conectado.
-message.update.os.preference=Por favor seleccione un sistema operativo de preferencia para este equipo. Todas las instancias virtuales con preferencias similares ser\u00c3\u00a1n los primeros asignados a este equipo antes de elegir otro.
-message.update.ssl=Por favor, env\u00c3\u00ade una nueva X.509 compatible con certificado SSL que se actualizar\u00c3\u00a1 a cada instancia virtual de la consola del servidor proxy\:
-message.virtual.network.desc=Una red dedicada virtualizados para su cuenta. El dominio de difusi\u00c3\u00b3n est\u00c3\u00a1 contenida dentro de una VLAN y todos los acceso a la red p\u00c3\u00bablica se encamina a cabo por un router virtual.
+message.step.4.desc=Por favor, seleccione la red primaria que la instancia virtual estar\u00c3\u00a1 conectado.
+message.update.os.preference=Por favor seleccione un sistema operativo de preferencia para este equipo. Todas las instancias virtuales con preferencias similares ser\u00c3\u00a1n los primeros asignados a este equipo antes de elegir otro.
+message.update.ssl=Por favor, env\u00c3\u00ade una nueva X.509 compatible con certificado SSL que se actualizar\u00c3\u00a1 a cada instancia virtual de la consola del servidor proxy\:
+message.virtual.network.desc=Una red dedicada virtualizados para su cuenta. El dominio de difusi\u00c3\u00b3n est\u00c3\u00a1 contenida dentro de una VLAN y todos los acceso a la red p\u00c3\u00bablica se encamina a cabo por un router virtual.
message.vm.create.template.confirm=Crear plantilla de la m\u00c3\u00a1quina virtual se reiniciar\u00c3\u00a1 autom\u00c3\u00a1ticamente.
-message.volume.create.template.confirm=Por favor, confirme que desea crear una plantilla para este volumen de disco. Creaci\u00c3\u00b3n de la plantilla puede oscilar entre varios minutos m\u00c3\u00a1s, dependiendo del tama\u00c3\u00b1o del volumen.
-message.zone.step.1.desc=Por favor seleccione un modelo de red para su zona.
+message.volume.create.template.confirm=Por favor, confirme que desea crear una plantilla para este volumen de disco. Creaci\u00c3\u00b3n de la plantilla puede oscilar entre varios minutos m\u00c3\u00a1s, dependiendo del tama\u00c3\u00b1o del volumen.
+message.zone.step.1.desc=Por favor seleccione un modelo de red para su zona.
mode=modo
-network.rate=Tasa de Red
+network.rate=Tasa de Red
side.by.side=Juntos
-state.Allocated=Asignados
-state.Disabled=personas de movilidad reducida
-state.Error=Error
+state.Allocated=Asignados
+state.Disabled=personas de movilidad reducida
+state.Error=Error
[15/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Sort in alphabetical order (to avoid duplicate key) and better compare with l10n ressource files (already in alphabetical order)
Remove duplicate keys:
label.add.system.service.offering
label.dead.peer.detection
label.ESP.lifetime
label.IKE.lifetime
label.no.thanks
label.remove.project.account
label.tier
message.add.guest.network
message.enable.vpn
message.installWizard.copy.whatIsACluster
label.no.thanks
label.remove.project.account
message.enable.vpn
Remove bad keys name:
label.local.storage.enabled=Local Storage Enabled
label.totoal.of.ip
Signed-off-by: Milamber <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ec28ce1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ec28ce1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ec28ce1
Branch: refs/heads/internallb
Commit: 2ec28ce19c2c887f7c93d303d566bc1da2c3d96f
Parents: 774b2eb
Author: Milamber <mi...@apache.org>
Authored: Sat Apr 27 18:36:42 2013 +0000
Committer: Milamber <mi...@apache.org>
Committed: Sat Apr 27 19:05:37 2013 +0000
----------------------------------------------------------------------
ui/dictionary.jsp | 1720 ++++++++++++++++++++++++------------------------
1 files changed, 854 insertions(+), 866 deletions(-)
----------------------------------------------------------------------
[42/50] [abbrv] Adding latest arabic resource file
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/137fd188/client/WEB-INF/classes/resources/messages_ar.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ar.properties b/client/WEB-INF/classes/resources/messages_ar.properties
index aa8e441..f0b7796 100644
--- a/client/WEB-INF/classes/resources/messages_ar.properties
+++ b/client/WEB-INF/classes/resources/messages_ar.properties
@@ -16,1150 +16,82 @@
# under the License.
-#new labels (begin) **********************************************************************************************
-label.egress.rules=\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u062e\u0631\u0648\u062c
-message.acquire.new.ip.vpc=\u064a\u0631\u062c\u0649 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0628\u0648\u0631\u062a\u0648\u0643\u0648\u0644 \u0625\u0646\u062a\u0631\u0646\u062a \u062c\u062f\u064a\u062f \u0644\u0647\u0630\u0627 \u0627\u0644\u062d\u0627\u0633\u0648\u0628 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a.
-label.zoneWizard.trafficType.management=\u0625\u062f\u0627\u0631\u0629\\\: \u0627\u0644\u062d\u0631\u0643\u0629 \u0628\u064a\u0646 \u0627\u0644\u0645\u0648\u0627\u0631\u062f \u0627\u0644\u062f\u0627\u062e\u0644\u064a\u0629 \u0644 \u0643\u0644\u0627\u0648\u062f \u0633\u062a\u0627\u0643 \u060c \u0645\u062a\u0636\u0645\u0646\u0629 \u0623\u064a \u062c\u0632\u0621 \u064a\u062a\u0635\u0644 \u0628\u062e\u0627\u062f\u0645\\\u0633\u064a\u0631\u0641\u0631 \u0627\u0644\u0625\u062f\u0627\u0631\u0629 \u060c \u0645\u062b\u0644 \u0627\u0644\u0645\u0636\u064a\u0641\u0627\u062a \u0648 \u0623\u0646\u0638\u0645\u0629 \u0643\u0644\u0627\u0648\u062f \u0633\u062a\u0627\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629.
-label.zoneWizard.trafficType.public=\u0627\u0644\u0639\u0627\u0645\u0629 \\\: \u0627\u0644\u0645\u0631\u0648\u0631 \u0628\u064a\u0646 \u0627\u0644\u0625\u0646\u062a\u0631\u0646\u062a \u0648\u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u064a\u0629 \u0641\u064a \u0627\u0644\u0633\u062d\u0627\u0628\u0629.
-label.zoneWizard.trafficType.guest=\u0627\u0644\u0636\u064a\u0641 \\\: \u0627\u0644\u062d\u0631\u0643\u0629 \u0628\u064a\u0646 \u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0646\u0647\u0627\u0626\u064a.
-label.zoneWizard.trafficType.storage=\u0627\u0644\u062a\u062e\u0632\u064a\u0646 \\\: \u0627\u0644\u0645\u0631\u0648\u0631 \u0628\u064a\u0646 \u0645\u0644\u0642\u0645\u0627\u062a \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0627\u0628\u062a\u062f\u0627\u0626\u064a\u0629 \u0648\u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629\u060c \u0645\u062b\u0644 \u0642\u0648\u0627\u0644\u0628 VM \u0648\u0627\u0644\u0644\u0642\u0637\u0627\u062a
-label.quickview=\u0646\u0638\u0631\u0629 \u0633\u0631\u064a\u0639\u0629
-label.migrate.to.host=\u0627\u0644\u062a\u062d\u0648\u0644 \u0625\u0644\u0649 \u0627\u0644\u0645\u0636\u064a\u0641
-label.migrate.to.storage=\u0627\u0644\u062a\u062d\u0648\u0644 \u0625\u0644\u0649 \u0627\u0644\u062a\u062e\u0632\u064a\u0646
-label.stop=\u062a\u0648\u0642\u0641
-label.reboot=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644
-label.destroy=\u0647\u062f\u0645
-label.restore=\u0625\u0633\u062a\u0639\u0627\u062f\u0629
-label.isolation.uri=\u0639\u0632\u0644 \u0627\u0644\u0631\u0627\u0628\u0637
-label.broadcast.uri=\u0628\u062b \u0627\u0644\u0631\u0627\u0628\u0637
-label.enable.s3=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u0648\u064a S3
+changed.item.properties=\u062a\u063a\u064a\u0631 \u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0639\u0646\u0635\u0631
confirm.enable.s3=\u0641\u0636\u0644\u0627 \u0642\u0645 \u0628\u062a\u0639\u0628\u0626\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u0642\u0627\u062f\u0645\u0629 \u0644\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 S3 \u0644\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629.
-message.after.enable.s3=\u062a\u0645 \u0625\u0639\u062f\u0627\u062f \u0627\u0644\u062a\u062e\u0632\u064a\u0646 S3 \u0644\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062b\u0627\u0646\u0648\u064a\u0629. \u062a\u0646\u0648\u064a\u0647 \: \u0639\u0646\u062f \u0645\u063a\u0627\u062f\u0631\u062a\u0643 \u0644\u0647\u0630\u0647 \u0627\u0644\u0635\u0641\u062d\u0629 \u0644\u0646 \u064a\u0643\u0648\u0646 \u0628\u0625\u0645\u0643\u0627\u0646\u0643 \u0625\u0639\u0627\u062f\u0629 \u0636\u0628\u0637 S3 \u0645\u0631\u0629 \u0623\u062e\u0631\u0649.
-label.s3.access_key=\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u0648\u0635\u0648\u0644
-label.s3.secret_key=\u0627\u0644\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u0633\u0631\u064a
-label.s3.bucket=\u062f\u0644\u0648
-label.s3.endpoint=\u0646\u0642\u0637\u0629 \u0627\u0644\u0646\u0647\u0627\u064a\u0629
-label.s3.use_https=\u0627\u0633\u062a\u062e\u062f\u0645 HTTPS
-label.s3.connection_timeout=\u0645\u0647\u0644\u0629 \u0627\u0644\u0627\u062a\u0635\u0627\u0644
-label.s3.max_error_retry=\u0623\u0642\u0635\u0649 \u062e\u0637\u0623 \u0641\u064a \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629
-label.s3.socket_timeout=\u0645\u0647\u0644\u0629 \u0627\u0644\u0645\u0642\u0628\u0633
-#new labels (end) ************************************************************************************************
-
-
-#modified labels (begin) *****************************************************************************************
-label.site.to.site.VPN=\u0645\u0648\u0642\u0639 \u0625\u0644\u0649 \u0645\u0648\u0642\u0639-\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u064a\u0629 VPN
-message.zoneWizard.enable.local.storage=\u062a\u062d\u0630\u064a\u0631\\\: \u0625\u0630\u0627 \u0642\u0645\u062a \u0628\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0645\u062d\u0644\u064a\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0637\u0627\u0642 \u064a\u062c\u0628 \u0639\u0644\u064a\u0643 \u0639\u0645\u0644 \u0627\u0644\u0622\u062a\u064a \u060c \u0625\u0639\u062a\u0645\u0627\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0645\u0643\u0627\u0646 \u0627\u0644\u0630\u064a \u062a\u0631\u063a\u0628 \u0623\u0646 \u064a\u0646\u0637\u0644\u0642 \u0645\u0646\u0647 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \\\: </br><br/> 1.\u0625\u0630\u0627 \u0643\u0627\u0646 \u0646\u0638\u0627\u0645\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u064a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u0625\u0628\u062a\
u062f\u0627\u0626\u064a\u0629
-#modified labels (end) *******************************************************************************************
-
-label.configure.network.ACLs=\u0636\u0628\u0637 \u0634\u0628\u0643\u0629 ACLs
-label.network.ACLs=\u0634\u0628\u0643\u0629 ACLs
-label.add.network.ACL=\u0625\u0636\u0627\u0641\u0629 \u0634\u0628\u0643\u0629 ACL
-label.private.Gateway=\u0645\u0646\u0641\u0630\\Gateway \u062e\u0627\u0635
-label.VPC.router.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u062c\u0647\u0627\u0632 \u0627\u0644\u062a\u0648\u062c\u064a\u0647 VPC
-label.VMs.in.tier=\u0627\u0644\u0623\u062c\u0647\u0632\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0641\u064a \u0637\u0628\u0642\u0629
-label.local.storage.enabled=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0645\u062d\u0644\u064a
-label.tier.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0637\u0628\u0642\u0629
-label.edit.tags=\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0639\u0644\u0627\u0645\u0627\u062a
-label.action.enable.physical.network=\u062a\u0645\u0643\u064a\u0646 \u0634\u0628\u0643\u0629 \u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
+instances.actions.reboot.label=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+label.accept.project.invitation=\u0642\u0628\u0648\u0644 \u062f\u0639\u0648\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+label.action.delete.system.service.offering=\u062d\u0630\u0641 \u0646\u0638\u0627\u0645 \u062a\u0642\u062f\u064a\u0645 \u0627\u0644\u062e\u062f\u0645\u0629
label.action.disable.physical.network=\u062a\u0639\u0637\u064a\u0644 \u0634\u0628\u0643\u0629 \u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
-message.action.enable.physical.network=\u0641\u0636\u0644\u0627 \u060c \u0623\u0643\u0651\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062a\u0645\u0643\u064a\u0646 \u0647\u0630\u0647 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
-message.action.disable.physical.network=\u0641\u0636\u0644\u0627 \u060c \u0623\u0643\u0651\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0647 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
-
-label.select.tier=\u062d\u062f\u062f \u0637\u0628\u0642\u0629
+label.action.enable.physical.network=\u062a\u0645\u0643\u064a\u0646 \u0634\u0628\u0643\u0629 \u0641\u064a\u0632\u064a\u0627\u0626\u064a\u0629
+label.activate.project=\u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
+label.add.account.to.project=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
+label.add.accounts.to=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a \u0625\u0644\u0649
+label.add.accounts=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
label.add.ACL=\u0625\u0636\u0627\u0641\u0629 ACL
-label.remove.ACL=\u0625\u0632\u0627\u0644\u0629 ACL
-label.tier=\u0637\u0628\u0642\u0629
-label.network.ACL=\u0634\u0628\u0643\u0629 ACL
-label.network.ACL.total=\u0625\u062c\u0645\u0627\u0644 \u0634\u0628\u0643\u0629 ACL
+label.add.network.ACL=\u0625\u0636\u0627\u0641\u0629 \u0634\u0628\u0643\u0629 ACL
label.add.new.gateway=\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u062c\u062f\u064a\u062f\u0629
-message.add.new.gateway.to.vpc=\u0641\u0636\u0644\u0627 \u062d\u062f\u062f \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0644\u0625\u0636\u0627\u0641\u0629 \u0628\u0648\u0627\u0628\u0629 gateway \u0644\u0647\u0630\u0647 \u0627\u0644\u0633\u062d\u0627\u0628\u0629 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u062e\u0627\u0635\u0629 VPC
-label.delete.gateway=\u0627\u062d\u0630\u0641 \u0627\u0644\u0628\u0648\u0627\u0628\u0629
-message.delete.gateway=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u0628\u0648\u0627\u0628\u0629
-label.CIDR.of.destination.network=CIDR \u0627\u0644\u062e\u0627\u0635 \u0628\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0648\u062c\u0647\u0629.
+label.add.new.tier=\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629 \u062c\u062f\u064a\u062f\u0629
+label.add.port.forwarding.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629 \u0645\u0646\u0641\u0630 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647
label.add.route=\u0625\u0636\u0627\u0641\u0629 \u0645\u0633\u0627\u0631
+label.add.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629
label.add.static.route=\u0625\u0636\u0627\u0641\u0629 \u062a\u0648\u062c\u064a\u0647 \u062b\u0627\u0628\u062a
-label.remove.static.route=\u0625\u0632\u0627\u0644\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647 \u062b\u0627\u0628\u062a
-label.add.VPN.gateway=\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-# message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
-label.VPN.gateway=\u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-label.delete.VPN.gateway=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-message.delete.VPN.gateway=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-label.VPN.connection=\u0625\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-label.IPsec.preshared.key=\u0645\u0641\u062a\u0627\u062d \u0623\u0645\u0646 \u0628\u0631\u0648\u062a\u0648\u0643\u0648\u0644 \u0627\u0644\u0625\u0646\u062a\u0631\u0646\u062a \u062a\u0645\u062a \u0645\u0634\u0627\u0631\u0643\u062a\u0647 \u0645\u0633\u0628\u0642\u0627
-label.IKE.policy=\u0633\u064a\u0627\u0633\u0629 IKE
-label.ESP.policy=\u0633\u064a\u0627\u0633\u0629 ESP
-label.create.VPN.connection=\u0625\u0646\u0634\u0627\u0621 \u0627\u062a\u0635\u0627\u0644 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-label.VPN.customer.gateway=\u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0644\u0644\u0639\u0645\u064a\u0644
-label.CIDR.list=\u0642\u0627\u0626\u0645\u0629 CIDR
-label.IKE.lifetime=\u0639\u0645\u0631 IKE (\u062b\u0627\u0646\u064a\u0629)
-label.ESP.lifetime=\u0639\u0645\u0631 ESP (\u062b\u0627\u0646\u064a\u0629)
-label.dead.peer.detection=\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f
-label.reset.VPN.connection=\u0625\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0627\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-message.reset.VPN.connection=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0625\u0639\u0627\u062f\u0629-\u0636\u0628\u0637 \u0625\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 VPN
-label.delete.VPN.connection=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
-# message.delete.VPN.connection=Please confirm that you want to delete VPN connection
-label.add.new.tier=\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629 \u062c\u062f\u064a\u062f\u0629
+label.add.to.group=\u0625\u0636\u0627\u0641\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629
label.add.VM.to.tier=\u0625\u0636\u0627\u0641\u0629 \u062c\u0647\u0627\u0632 \u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0641\u064a \u0637\u0628\u0642\u0629
-label.remove.tier=\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629
-
-label.local.storage.enabled=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0645\u062d\u0644\u064a
-label.associated.network=\u0634\u0628\u0643\u0629 \u0645\u0631\u062a\u0628\u0637\u0629
-label.add.port.forwarding.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629 \u0645\u0646\u0641\u0630 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0648\u062c\u064a\u0647
-label.dns=\u0646\u0638\u0627\u0645 \u062a\u0633\u0645\u064a\u0629 \u0627\u0644\u0645\u062c\u0627\u0644 DNS
-
-label.vpc=\u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629 VPC
-label.vpc.id=\u0647\u0648\u064a\u0629 \u062e\u0627\u0635\u0629 \u0628\u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629
-label.tier=\u0637\u0628\u0642\u0629
label.add.vpc=\u0625\u0636\u0627\u0641\u0629 \u0633\u062d\u0627\u0628\u0629 \u0625\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u062e\u0627\u0635\u0629
-label.super.cidr.for.guest.networks=CIDR \u0645\u0645\u062a\u0627\u0632 \u0644\u0634\u0628\u0643\u0627\u062a \u0627\u0644\u0636\u064a\u0641.
-# label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
-# label.configure.vpc=Configure VPC
-# label.edit.vpc=Edit VPC
-# label.restart.vpc=restart VPC
-# message.restart.vpc=Please confirm that you want to restart the VPC
-# label.remove.vpc=remove VPC
-# message.remove.vpc=Please confirm that you want to remove the VPC
-# label.vpn.customer.gateway=VPN Customer Gateway
-# label.add.vpn.customer.gateway=Add VPN Customer Gateway
-# label.IKE.encryption=IKE Encryption
-# label.IKE.hash=IKE Hash
-# label.IKE.DH=IKE DH
-# label.ESP.encryption=ESP Encryption
-# label.ESP.hash=ESP Hash
-# label.perfect.forward.secrecy=Perfect Forward Secrecy
-label.IKE.lifetime=\u0639\u0645\u0631 IKE (\u062b\u0627\u0646\u064a\u0629)
-label.ESP.lifetime=\u0639\u0645\u0631 ESP (\u062b\u0627\u0646\u064a\u0629)
-label.dead.peer.detection=\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f
-label.delete.VPN.customer.gateway=\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 VPN \u0627\u0644\u0645\u062e\u0635\u0635\u0629
-# message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway
-
-# label.network.domain.text=Network domain
-label.memory.mb=\u0627\u0644\u0630\u0627\u0643\u0631\u0629 ( \u0628\u0627\u0644\u0645\u064a\u062c\u0627\u0628\u0627\u064a\u0628\u062a)
-label.cpu.mhz=\u0648\u062d\u062f\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062c\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064a\u0629 (\u0628\u0627\u0644\u0645\u064a\u063a\u0627\u0647\u064a\u0631\u062a\u0632)
-
-# message.action.remove.host=Please confirm that you want to remove this host.
-
-# message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
-# message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
-# message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network.
-
-
-# label.ipaddress=IP Address
-# label.vcdcname=vCenter DC name
-# label.vcipaddress=vCenter IP Address
-# label.vsmctrlvlanid=Control VLAN ID
-# label.vsmpktvlanid=Packet VLAN ID
-# label.vsmstoragevlanid=Storage VLAN ID
-# label.nexusVswitch=Nexus 1000v
-# label.action.delete.nexusVswitch=Delete Nexus 1000v
-# label.action.enable.nexusVswitch=Enable Nexus 1000v
-# label.action.disable.nexusVswitch=Disable Nexus 1000v
-# label.action.list.nexusVswitch=List Nexus 1000v
-# message.action.delete.nexusVswitch=Please confirm that you want to delete this nexus 1000v
-# message.action.enable.nexusVswitch=Please confirm that you want to enable this nexus 1000v
-# message.action.disable.nexusVswitch=Please confirm that you want to disable this nexus 1000v
-# message.specify.url=Please specify URL
-# label.select.instance.to.attach.volume.to=Select instance to attach volume to
-label.upload=\u0631\u0641\u0639
-# label.upload.volume=Upload volume
-# label.virtual.routers=Virtual Routers
-# label.primary.storage.count=Primary Storage Pools
-# label.secondary.storage.count=Secondary Storage Pools
-# label.number.of.system.vms=Number of System VMs
-# label.number.of.virtual.routers=Number of Virtual Routers
-# label.action.register.iso=Register ISO
-# label.isolation.method=Isolation method
-# label.action.register.template=Register template
-# label.checksum=MD5 checksum
-# label.vpn=VPN
-# label.vlan=VLAN
-
-
-# label.management.ips=Management IP Addresses
-label.devices=\u0627\u0644\u0623\u062c\u0647\u0632\u0629
-# label.rules=Rules
-# label.traffic.label=Traffic label
-# label.vm.state=VM state
-# message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
-# label.domain.router=Domain router
-# label.console.proxy=Console proxy
-# label.secondary.storage.vm=Secondary storage VM
-# label.add.netScaler.device=Add Netscaler device
-# label.add.F5.device=Add F5 device
-# label.add.SRX.device=Add SRX device
-# label.account.and.security.group=Account, Security group
-# label.fetch.latest=Fetch latest
-# label.system.offering=System Offering
-# 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.
-
-
-# label.isolated.networks=Isolated networks
-# label.latest.events=Latest events
-# state.Enabled=Enabled
-# label.system.wide.capacity=System-wide capacity
-# label.network.service.providers=Network Service Providers
-# message.launch.zone=Zone is ready to launch; please proceed to the next step.
-# error.unable.to.reach.management.server=Unable to reach Management Server
-# label.internal.name=Internal name
-# message.configure.all.traffic.types=You have multiple physical networks; please configure labels for each traffic type by clicking on the Edit button.
-# message.edit.traffic.type=Please specify the traffic label you want associated with this traffic type.
-# label.edit.traffic.type=Edit traffic type
-# label.label=Label
-# label.max.networks=Max. networks
-# error.invalid.username.password=Invalid username or password
-# message.enabling.security.group.provider=Enabling Security Group provider
-# message.adding.Netscaler.provider=Adding Netscaler provider
-# message.creating.guest.network=Creating guest network
-# label.action.delete.physical.network=Delete physical network
-# message.action.delete.physical.network=Please confirm that you want to delete this physical network
-# message.installWizard.copy.whatIsAHost=A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack&\\\#8482; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.
-
-
-# label.add.compute.offering=Add compute offering
-# label.compute.offering=Compute offering
-# label.compute.offerings=Compute offerings
-# label.select.offering=Select offering
-# label.menu.infrastructure=Infrastructure
-label.sticky.tablesize=\u062d\u062c\u0645 \u0627\u0644\u062c\u062f\u0648\u0644
-# label.sticky.expire=Expires
-# label.sticky.cookie-name=Cookie name
-# label.sticky.mode=Mode
-# label.sticky.length=Length
-# label.sticky.holdtime=Hold time
-# label.sticky.request-learn=Request learn
-# label.sticky.prefix=Prefix
-# label.sticky.nocache=No cache
-# label.sticky.indirect=Indirect
-# label.sticky.postonly=Post only
-# label.sticky.domain=Domain
-# state.Allocating=Allocating
-# state.Migrating=Migrating
-# error.please.specify.physical.network.tags=Network offerings is not available until you specify tags for this physical network.
-
-
-# state.Stopping=Stopping
-# message.add.load.balancer.under.ip=The load balancer rule has been added under IP\\\:
-# message.select.instance=Please select an instance.
-# label.select=Select
-# label.select.vm.for.static.nat=Select VM for static NAT
-# label.select.instance=Select instance
-# label.nat.port.range=NAT Port Range
-# label.static.nat.vm.details=Static NAT VM Details
-# label.edit.lb.rule=Edit LB rule
-# message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
-# label.migrate.instance.to.host=Migrate instance to another host
-# message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
-# label.migrate.instance.to.ps=Migrate instance to another primary storage
-# label.corrections.saved=Corrections saved
-# message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following\\\:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>
-# message.installWizard.copy.whatIsPrimaryStorage=A CloudStack&\\\#8482; cloud infrastructure makes use of two types of storage\\\: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts.
-# message.installWizard.copy.whatIsACluster=A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack&\\\#8482; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack&\\\#8482; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.
-# message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack&\\\#8482; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.
-# message.installWizard.copy.whatIsAZone=A zone is the largest organizational unit within a CloudStack&\\\#8482; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).
-# message.installWizard.copy.whatIsCloudStack=CloudStack&\\\#8482 is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack&\\\#8482 manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack&\\\#8482 to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack&\\\#8482 provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features.
-# message.installWizard.tooltip.addSecondaryStorage.path=The exported path, located on the server you specified above
-# message.installWizard.tooltip.addSecondaryStorage.nfsServer=The IP address of the NFS server hosting the secondary storage
-# message.installWizard.tooltip.addPrimaryStorage.path=(for NFS) In NFS this is the exported path from the server. Path (for SharedMountPoint). With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".
-# message.installWizard.tooltip.addPrimaryStorage.server=(for NFS, iSCSI, or PreSetup) The IP address or DNS name of the storage device.
-# message.installWizard.tooltip.addPrimaryStorage.name=The name for the storage device.
-# message.installWizard.tooltip.addHost.password=This is the password for the user named above (from your XenServer install).
-# message.installWizard.tooltip.addHost.username=Usually root.
-# message.installWizard.tooltip.addHost.hostname=The DNS name or IP address of the host.
-# message.installWizard.tooltip.addCluster.name=A name for the cluster. This can be text of your choosing and is not used by CloudStack.
-# message.installWizard.tooltip.addPod.reservedSystemEndIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
-# message.installWizard.tooltip.addPod.reservedSystemStartIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
-# message.installWizard.tooltip.addPod.reservedSystemNetmask=The netmask in use on the subnet the guests will use.
-# message.installWizard.tooltip.addPod.reservedSystemGateway=The gateway for the hosts in that pod.
-# message.installWizard.tooltip.addPod.name=A name for the pod
-# message.installWizard.tooltip.configureGuestTraffic.guestEndIp=The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
-# message.installWizard.tooltip.configureGuestTraffic.guestStartIp=The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
-# message.installWizard.tooltip.configureGuestTraffic.guestNetmask=The netmask in use on the subnet that the guests should use
-# message.installWizard.tooltip.configureGuestTraffic.guestGateway=The gateway that the guests should use
-# message.installWizard.tooltip.configureGuestTraffic.description=A description for your network
-# message.installWizard.tooltip.configureGuestTraffic.name=A name for your network
-# message.installWizard.tooltip.addZone.internaldns2=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
-# message.installWizard.tooltip.addZone.internaldns1=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
-# message.installWizard.tooltip.addZone.dns2=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
-# message.installWizard.tooltip.addZone.name=A name for the zone
-# message.installWizard.tooltip.addZone.dns1=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
-# message.setup.successful=Cloud setup successful\\\!
-# label.may.continue=You may now continue.
-# error.installWizard.message=Something went wrong; you may go back and correct any errors
-# message.installWizard.now.building=Now building your cloud...
-# message.installWizard.click.retry=Click the button to retry launch.
-# label.launch=Launch
-# label.installWizard.click.launch=Click the launch button.
-# label.congratulations=Congratulations\\\!
-# label.installWizard.addSecondaryStorageIntro.subtitle=What is secondary storage?
-# label.installWizard.addSecondaryStorageIntro.title=Let’s add secondary storage
-# label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage?
-# label.installWizard.addPrimaryStorageIntro.title=Let’s add primary storage
-# label.installWizard.addHostIntro.subtitle=What is a host?
-# label.installWizard.addHostIntro.title=Let’s add a host
-# label.installWizard.addClusterIntro.subtitle=What is a cluster?
-# label.installWizard.addClusterIntro.title=Let’s add a cluster
-# label.installWizard.addPodIntro.subtitle=What is a pod?
-# label.installWizard.addPodIntro.title=Let’s add a pod
-# label.installWizard.addZone.title=Add zone
-# label.installWizard.addZoneIntro.subtitle=What is a zone?
-# label.installWizard.addZoneIntro.title=Let’s add a zone
-# error.password.not.match=The password fields do not match
-# label.confirm.password=Confirm password
-# message.change.password=Please change your password.
-# label.save.and.continue=Save and continue
-# label.skip.guide=I have used CloudStack before, skip this guide
-# label.continue.basic.install=Continue with basic installation
-# label.introduction.to.cloudstack=Introduction to CloudStack&\\\#8482
-# label.what.is.cloudstack=What is CloudStack&\\\#8482?
-# label.hints=Hints
-# label.installWizard.subtitle=This tour will aid you in setting up your CloudStack&\\\#8482 installation
-# label.continue=Continue
-# label.installWizard.title=Hello and Welcome to CloudStack&\\\#8482
-# label.agree=Agree
-# label.manage.resources=Manage Resources
-# label.port.forwarding.policies=Port forwarding policies
-# label.load.balancing.policies=Load balancing policies
-# label.networking.and.security=Networking and security
-# label.bandwidth=Bandwidth
-# label.virtual.machines=Virtual machines
-# label.compute.and.storage=Compute and Storage
-# label.task.completed=Task completed
-# label.update.project.resources=Update project resources
-# label.remove.project.account=Remove project account
-# label.item.listing=Item listing
-# message.select.item=Please select an item.
-# label.removing=Removing
-# label.invite=Invite
-# label.add.by=Add by
-# label.max.vms=Max. user VMs
-# label.max.public.ips=Max. public IPs
-# label.max.volumes=Max. volumes
-# label.max.snapshots=Max. snapshots
-# label.max.templates=Max. templates
-# label.max.vpcs=Max. VPCs
-# label.project.dashboard=Project dashboard
-label.remind.later=\u0630\u0643\u0631\u0646\u064a \u0644\u0627\u062d\u0642\u0627\u064b
-label.invited.accounts=\u062f\u0639\u0648\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
-label.invite.to=\u062f\u0639\u0648\u0629 \u0644\u0640
-label.add.accounts.to=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a \u0625\u0644\u0649
-label.add.accounts=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
-label.project.name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.create.project=\u0623\u0646\u0634\u0626 \u0645\u0634\u0631\u0648\u0639
-label.networks=\u0627\u0644\u0634\u0628\u0643\u0627\u062a
-# label.launch.vm=Launch VM
-# label.new.vm=New VM
-label.previous=\u0627\u0644\u0633\u0627\u0628\u0642
-label.add.to.group=\u0625\u0636\u0627\u0641\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629
-message.vm.review.launch=\u064a\u0631\u062c\u0649 \u0645\u0631\u0627\u062c\u0639\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0648\u062a\u0623\u0643\u062f \u0623\u0646 \u0645\u062b\u0627\u0644\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0635\u062d\u064a\u062d \u0642\u0628\u0644 \u0627\u0644\u0625\u0646\u0637\u0644\u0627\u0642
-# message.select.security.groups=Please select security group(s) for your new VM
-label.new=\u062c\u062f\u064a\u062f
-message.please.select.networks=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u0634\u0628\u0643\u0627\u062a \u0644\u062c\u0647\u0627\u0632\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
-# message.please.proceed=Please proceed to the next step.
-# message.zone.no.network.selection=The zone you selected does not have any choices for network selection.
-label.no.thanks=\u0644\u0627\u061b \u0634\u0643\u0631\u0627\u064b
-label.my.templates=\u0642\u0648\u0627\u0644\u0628\u064a
-message.select.template=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0642\u0627\u0644\u0628 \u0644\u0645\u062b\u0627\u0644\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a \u0627\u0644\u062c\u062f\u064a\u062f
-# message.select.iso=Please select an ISO for your new virtual instance.
-# message.template.desc=OS image that can be used to boot VMs
-# message.iso.desc=Disc image containing data or bootable media for OS
-# label.select.iso.or.template=Select ISO or template
-# message.select.a.zone=A zone typically corresponds to a single datacenter. Multiple zones help make the cloud more reliable by providing physical isolation and redundancy.
-# label.select.a.zone=Select a zone
-label.review=\u0645\u0631\u0627\u062c\u0639\u0629
-label.select.a.template=\u0627\u062e\u062a\u0631 \u0642\u0627\u0644\u0628
-label.setup=\u0627\u0644\u062a\u062b\u0628\u064a\u062a
-state.Allocated=\u062a\u062e\u0635\u064a\u0635
-changed.item.properties=\u062a\u063a\u064a\u0631 \u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0639\u0646\u0635\u0631
+label.add.VPN.gateway=\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
label.apply=\u062a\u0637\u0628\u064a\u0642
-label.default=\u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
-label.viewing=\u0639\u0631\u0636
-label.move.to.top=\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0623\u0639\u0644\u0649
-label.move.up.row=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0639\u0644\u0649 \u0628\u0635\u0641 \u0648\u0627\u062d\u062f
-label.move.down.row=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0633\u0641\u0644 \u0628\u0635\u0641 \u0648\u0627\u062d\u062f
-label.move.to.bottom=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u0623\u0633\u0641\u0644
-label.drag.new.position=\u0627\u0633\u062d\u0628 \u0644\u0645\u0648\u0642\u0641 \u062c\u062f\u064a\u062f
-label.order=\u062a\u0631\u062a\u064a\u0628
-label.no.data=\u0644\u0627 \u064a\u0648\u062c\u062f \u0628\u064a\u0627\u0646\u0627\u062a \u0644\u0644\u0639\u0631\u0636
+label.associated.network=\u0634\u0628\u0643\u0629 \u0645\u0631\u062a\u0628\u0637\u0629
+label.broadcast.uri=\u0628\u062b \u0627\u0644\u0631\u0627\u0628\u0637
label.change.value=\u062a\u063a\u064a\u0631 \u0627\u0644\u0642\u064a\u0645\u0629
+label.CIDR.list=\u0642\u0627\u0626\u0645\u0629 CIDR
+label.CIDR.of.destination.network=CIDR \u0627\u0644\u062e\u0627\u0635 \u0628\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0648\u062c\u0647\u0629.
+label.clean.up=\u062a\u0646\u0638\u064a\u0641
label.clear.list=\u0645\u0633\u062d \u0627\u0644\u0642\u0627\u0626\u0645\u0629
-label.full.path=\u0645\u0633\u0627\u0631 \u0643\u0627\u0645\u0644
-message.add.domain=\u064a\u0631\u062c\u0649 \u062a\u062d\u062f\u064a\u062f \u0627\u0644\u0645\u062c\u0627\u0644 \u0627\u0644\u0641\u0631\u0639\u064a \u0627\u0644\u0630\u064a \u062a\u0631\u064a\u062f \u0625\u0646\u0634\u0627\u0621 \u062a\u062d\u062a \u0647\u0630\u0627 \u0627\u0644\u0646\u0637\u0627\u0642
-message.delete.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062d\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
-message.enable.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062a\u0641\u0639\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
-message.disable.user=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
-message.generate.keys=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u0625\u0646\u0634\u0627\u0621 \u0645\u0641\u0627\u062a\u064a\u062d \u062c\u062f\u064a\u062f\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
-message.update.resource.count=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u062a\u062d\u062f\u064a\u062b \u0645\u0635\u0627\u062f\u0631 \u0627\u0644\u062d\u0633\u0627\u0628\u0627\u062a \u0644\u0647\u0630\u0627 \u0627\u0644\u062d\u0633\u0627\u0628
-# message.edit.account=Edit ("-1" indicates no limit to the amount of resources create)
-# label.total.of.vm=Total of VM
-# label.total.of.ip=Total of IP Address
-state.enabled=\u062a\u0645\u0643\u064a\u0646
-# message.action.download.iso=Please confirm that you want to download this ISO.
-# message.action.download.template=Please confirm that you want to download this template.
-# label.destination.zone=Destination Zone
-label.keyboard.type=\u0646\u0648\u0639 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0641\u0627\u062a\u064a\u062d
-# label.nic.adapter.type=NIC adapter type
-# label.root.disk.controller=Root disk controller
-# label.community=Community
-# label.remove.egress.rule=Remove egress rule
-# label.add.egress.rule=Add egress rule
-# label.egress.rule=Egress rule
-# label.remove.ingress.rule=Remove ingress rule
-# label.delete.vpn.user=Delete VPN user
-# label.add.vpn.user=Add VPN user
-# label.remove.pf=Remove port forwarding rule
-# label.remove.vm.from.lb=Remove VM from load balancer rule
-# label.add.vms.to.lb=Add VM(s) to load balancer rule
-# label.add.vm=Add VM
-# label.remove.static.nat.rule=Remove static NAT rule
-# label.remove.rule=Remove rule
-# label.add.static.nat.rule=Add static NAT rule
-label.add.rule=\u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0639\u062f\u0629
label.configuration=\u0627\u0644\u062a\u0643\u0648\u064a\u0646
-# message.disable.vpn=Are you sure you want to disable VPN?
-# label.disable.vpn=Disable VPN
-# message.enable.vpn=Please confirm that you want VPN access enabled for this IP address.
-# label.enable.vpn=Enable VPN
-# message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
-label.elastic=\u0645\u0631\u0646
-label.my.network=\u0634\u0628\u0643\u062a\u064a
-# label.add.vms=Add VMs
+label.configure.network.ACLs=\u0636\u0628\u0637 \u0634\u0628\u0643\u0629 ACLs
label.configure=\u0642\u0645 \u0628\u062a\u0643\u0648\u064a\u0646
-# label.stickiness=Stickiness
-label.source=\u0645\u0635\u062f\u0631
-label.least.connections=\u0623\u0642\u0644 \u0627\u0644\u0625\u062a\u0635\u0627\u0644\u0627\u062a
-# label.round.robin=Round-robin
-label.restart.required=\u0645\u0637\u0644\u0648\u0628 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0634\u063a\u064a\u0644
-label.clean.up=\u062a\u0646\u0638\u064a\u0641
-label.restart.network=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
-label.edit.network.details=\u062a\u062d\u0631\u064a\u0631 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
-# label.add.guest.network=Add guest network
-# label.guest.networks=Guest networks
-# message.ip.address.changed=Your IP addresses may have changed; would you like to refresh the listing? Note that in this case the details pane will close.
-# state.BackingUp=Backing Up
-# state.BackedUp=Backed Up
-# label.done=Done
-# label.vm.name=VM name
-# message.migrate.volume=Please confirm that you want to migrate volume to another primary storage.
-# label.migrate.volume=Migrate volume to another primary storage
-# message.create.template=Are you sure you want to create template?
-# label.create.template=Create template
-# message.download.volume.confirm=Please confirm that you want to download this volume
-message.detach.disk=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0641\u0635\u0644 \u0647\u0630\u0627 \u0627\u0644\u0642\u0631\u0635\u061f
-state.ready=\u062c\u0627\u0647\u0632
-state.Ready=\u062c\u0627\u0647\u0632
-# label.vm.display.name=VM display name
-label.select-view=\u062d\u062f\u062f \u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636
-# label.local.storage=Local Storage
-label.direct.ips=\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0634\u062a\u0631\u0643\u0629 IPs
-label.view.all=\u0639\u0631\u0636 \u0627\u0644\u0643\u0644
-label.zone.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
-# message.alert.state.detected=Alert state detected
-# state.Starting=Starting
-state.Expunging=\u0645\u062d\u0648
-state.Creating=\u0625\u0646\u0634\u0627\u0621
-message.decline.invitation=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0631\u0641\u0636 \u0647\u0630\u0647 \u0627\u0644\u062f\u0639\u0648\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639\u061f
+label.cpu.mhz=\u0648\u062d\u062f\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062c\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064a\u0629 (\u0628\u0627\u0644\u0645\u064a\u063a\u0627\u0647\u064a\u0631\u062a\u0632)
+label.create.project=\u0623\u0646\u0634\u0626 \u0645\u0634\u0631\u0648\u0639
+label.create.VPN.connection=\u0625\u0646\u0634\u0627\u0621 \u0627\u062a\u0635\u0627\u0644 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.dead.peer.detection=\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f
label.decline.invitation=\u0631\u0641\u0636 \u0627\u0644\u062f\u0639\u0648\u0629
-message.confirm.join.project=\u0646\u0631\u062c\u0648 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629 \u0641\u064a \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-message.join.project=\u0644\u0642\u062f \u0627\u0646\u0636\u0645\u0645\u062a \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639. \u064a\u0631\u062c\u0649 \u0627\u0644\u062a\u0628\u062f\u064a\u0644 \u0625\u0644\u0649 \u0637\u0631\u064a\u0642\u0629 \u0639\u0631\u0636 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0644\u0631\u0624\u064a\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.accept.project.invitation=\u0642\u0628\u0648\u0644 \u062f\u0639\u0648\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-# label.token=Token
-# label.project.id=Project ID
-# message.enter.token=Please enter the token that you were given in your invite e-mail.
-# label.enter.token=Enter token
-state.Accepted=\u062a\u0645 \u0627\u0644\u0642\u0628\u0648\u0644
-state.Pending=\u0641\u064a \u0627\u0644\u0627\u0646\u062a\u0638\u0627\u0631
-state.Completed=\u062a\u0645 \u0627\u0644\u0627\u0643\u0645\u0627\u0644
-state.Declined=\u062a\u0645 \u0627\u0644\u0631\u0641\u0636
-label.project=\u0645\u0634\u0631\u0648\u0639
-label.invitations=\u062f\u0639\u0648\u0627\u062a
+label.default.view=\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629
+label.default=\u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
+label.delete.gateway=\u0627\u062d\u0630\u0641 \u0627\u0644\u0628\u0648\u0627\u0628\u0629
label.delete.project=\u062d\u0630\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-message.delete.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u061f
-message.activate.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062a\u0641\u0639\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u061f
-label.activate.project=\u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.suspend.project=\u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-message.suspend.project=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0625\u064a\u0642\u0627\u0641 \u0647\u0630\u0627 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u061f
-state.Suspended=\u062a\u0645 \u0627\u0644\u0625\u064a\u0642\u0627\u0641
+label.delete.VPN.connection=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.delete.VPN.customer.gateway=\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 VPN \u0627\u0644\u0645\u062e\u0635\u0635\u0629
+label.delete.VPN.gateway=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629
+label.destroy=\u0647\u062f\u0645
+label.devices=\u0627\u0644\u0623\u062c\u0647\u0632\u0629
+label.direct.ips=\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0634\u062a\u0631\u0643\u0629 IPs
+label.display.name=\u0639\u0631\u0636 \u0627\u0644\u0627\u0633\u0645
+label.dns=\u0646\u0638\u0627\u0645 \u062a\u0633\u0645\u064a\u0629 \u0627\u0644\u0645\u062c\u0627\u0644 DNS
+label.drag.new.position=\u0627\u0633\u062d\u0628 \u0644\u0645\u0648\u0642\u0641 \u062c\u062f\u064a\u062f
+label.edit.network.details=\u062a\u062d\u0631\u064a\u0631 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
label.edit.project.details=\u0627\u0636\u0627\u0641\u0629 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.new.project=\u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f
-state.Active=\u0646\u0634\u0637
-# state.Disabled=Disabled
-label.projects=\u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639
-label.make.project.owner=\u062c\u0639\u0644 \u0627\u0644\u062d\u0633\u0627\u0628 \u0645\u0627\u0644\u0643 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
-# label.remove.project.account=Remove project account
-message.project.invite.sent=\u062a\u0645 \u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u062f\u0639\u0648\u0629 ; \u0633\u064a\u062a\u0645 \u0625\u0636\u0627\u0641\u062a\u0647\u0645 \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0645\u062c\u0631\u062f \u0642\u0628\u0648\u0644 \u0627\u0644\u062f\u0639\u0648\u0629
-label.add.account.to.project=\u0625\u0636\u0627\u0641\u0629 \u062d\u0633\u0627\u0628 \u0644\u0644\u0645\u0634\u0631\u0648\u0639
-label.revoke.project.invite=\u0625\u0644\u063a\u0627\u0621 \u0627\u0644\u062f\u0639\u0648\u0629
-label.project.invite=\u062f\u0639\u0648\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-label.select.project=\u062d\u062f\u062f \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-message.no.projects=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0645\u0634\u0627\u0631\u064a\u0639. <br/> \u064a\u0631\u062c\u0649 \u0625\u0646\u0634\u0627\u0621 \u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f \u0645\u0646 \u0642\u0633\u0645 \u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639.
-message.no.projects.adminOnly=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0645\u0634\u0627\u0631\u064a\u0639. <br/> \u0627\u0644\u0631\u062c\u0627\u0621 \u0637\u0644\u0628 \u0645\u0646 \u0627\u0644\u0645\u0633\u0624\u0648\u0644 \u0625\u0646\u0634\u0627\u0621 \u0645\u0634\u0631\u0648\u0639 \u062c\u062f\u064a\u062f.
-message.pending.projects.1=\u0644\u062f\u064a\u0643 \u062f\u0639\u0648\u0627\u062a \u0645\u0634\u0631\u0648\u0639 \u0645\u0639\u0644\u0642\u0629/\:
-message.pending.projects.2=\u0644\u0639\u0631\u0636\u060c \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u0630\u0647\u0627\u0628 \u0625\u0644\u0649 \u0642\u0633\u0645 \u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639\u060c \u062b\u0645 \u062d\u062f\u062f \u062f\u0639\u0648\u0627\u062a \u0645\u0646 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0646\u0633\u062f\u0644\u0629.
-message.instanceWizard.noTemplates=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0623\u064a \u0642\u0648\u0627\u0644\u0628 \u0645\u062a\u0627\u062d\u0629\u061b \u064a\u0631\u062c\u0649 \u0625\u0636\u0627\u0641\u0629 \u0642\u0627\u0644\u0628 \u0645\u062a\u0648\u0627\u0641\u0642\u060c \u0648\u0625\u0639\u0627\u062f\u0629 \u0625\u0637\u0644\u0627\u0642 \u0627\u0644\u0645\u0639\u0627\u0644\u062c .
-label.view=\u0639\u0631\u0636
-instances.actions.reboot.label=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+label.edit.tags=\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0639\u0644\u0627\u0645\u0627\u062a
+label.egress.rules=\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u062e\u0631\u0648\u062c
+label.elastic=\u0645\u0631\u0646
+label.enable.s3=\u062a\u0645\u0643\u064a\u0646 \u0627\u0644\u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u0648\u064a S3
+label.ESP.lifetime=\u0639\u0645\u0631 ESP (\u062b\u0627\u0646\u064a\u0629)
+label.ESP.policy=\u0633\u064a\u0627\u0633\u0629 ESP
label.filterBy=\u062a\u0635\u0641\u064a\u0629 \u062d\u0633\u0628
-label.ok=\u0645\u0648\u0627\u0641\u0642
-notification.reboot.instance=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
-notification.start.instance=\u0628\u062f\u0621 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
-notification.stop.instance=\u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
-label.display.name=\u0639\u0631\u0636 \u0627\u0644\u0627\u0633\u0645
-label.zone.name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
-ui.listView.filters.all=\u0627\u0644\u0643\u0644
-# ui.listView.filters.mine=Mine
-# state.Running=Running
-state.Stopped=\u062a\u0648\u0642\u0641
-state.Destroyed=\u062f\u0645\u0631
-state.Error=\u062e\u0637\u0623
-message.reset.password.warning.notPasswordEnabled=\u0627\u0644\u0642\u0627\u0644\u0628 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u062a\u0645 \u0627\u0646\u0634\u0627\u0626\u0647 \u0645\u0646 \u062f\u0648\u0646 \u0643\u0644\u0645\u0629 \u0645\u0631\u0648\u0631 \u0645\u0645\u0643\u0646\u0629
-message.reset.password.warning.notStopped=\u064a\u062c\u0628 \u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u062e\u0627\u0635 \u0628\u0643 \u0642\u0628\u0644 \u0645\u062d\u0627\u0648\u0644\u0629 \u062a\u063a\u064a\u064a\u0631 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 \u0627\u0644\u062d\u0627\u0644\u064a\u0629
-label.notifications=\u0627\u0644\u062a\u0646\u0628\u064a\u0647\u0627\u062a
-label.default.view=\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629
-label.project.view=\u0639\u0631\u0636 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-
-message.add.system.service.offering=\u0627\u0644\u0631\u062c\u0627\u0621 \u062a\u0639\u0628\u0626\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0644\u0625\u0636\u0627\u0641\u0629 \u0646\u0638\u0627\u0645 \u062c\u062f\u064a\u062f \u0644\u0637\u0631\u062d
-message.action.delete.system.service.offering=\u0627\u0644\u0631\u062c\u0627\u0621 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u062e\u062f\u0645\u0629 \u0627\u0644\u0646\u0638\u0627\u0645 \u0627\u0644\u0645\u0642\u062f\u0645\u0629.
-label.action.delete.system.service.offering=\u062d\u0630\u0641 \u0646\u0638\u0627\u0645 \u062a\u0642\u062f\u064a\u0645 \u0627\u0644\u062e\u062f\u0645\u0629
-# label.hypervisor.capabilities=Hypervisor capabilities
-# label.hypervisor.version=Hypervisor version
-label.max.guest.limit=\u0627\u0644\u062d\u062f \u0627\u0644\u0623\u0642\u0635\u0627\u0621 \u0644\u0636\u064a\u0641
-# label.add.network.offering=Add network offering
-label.supported.services=\t\u0627\u0644\u062e\u062f\u0645\u0627\u062a \u0627\u0644\u0645\u062f\u0639\u0648\u0645\u0629
-label.service.capabilities=\u0642\u062f\u0631\u0627\u062a \u0627\u0644\u062e\u062f\u0645\u0629
+label.full.path=\u0645\u0633\u0627\u0631 \u0643\u0627\u0645\u0644
label.guest.type=\u0646\u0648\u0639 \u0627\u0644\u0636\u064a\u0641
-label.specify.IP.ranges=\u062a\u062d\u062f\u064a\u062f \u0646\u0637\u0627\u0642\u0627\u062a IP
-# label.conserve.mode=Conserve mode
-# label.created.by.system=Created by system
-# label.menu.system.service.offerings=System Offerings
-# label.add.system.service.offering=Add System Service Offering
-# label.redundant.router.capability=Redundant router capability
-# label.supported.source.NAT.type=Supported Source NAT type
-# label.elastic.LB=Elastic LB
-# label.LB.isolation=LB isolation
-# label.elastic.IP=Elastic IP
-# label.network.label.display.for.blank.value=Use default gateway
-# label.xen.traffic.label=XenServer traffic label
-# label.kvm.traffic.label=KVM traffic label
-# label.vmware.traffic.label=VMware traffic label
-# label.start.IP=Start IP
-# label.end.IP=End IP
-# label.remove.ip.range=Remove IP range
-# label.ip.ranges=IP Ranges
-# label.start.vlan=Start Vlan
-# label.end.vlan=End Vlan
-# label.broadcast.domain.range=Broadcast domain range
-# label.compute=Compute
-# message.add.guest.network=Please confirm that you would like to add a guest network
-# label.subdomain.access=Subdomain Access
-# label.guest.start.ip=Guest start IP
-# label.guest.end.ip=Guest end IP
-# label.virtual.router=Virtual Router
-# label.physical.network.ID=Physical network ID
-# label.destination.physical.network.id=Destination physical network ID
-# label.dhcp=DHCP
-# label.destroy.router=Destroy router
-# message.confirm.destroy.router=Please confirm that you would like to destroy this router
-# label.change.service.offering=Change service offering
-# label.view.console=View console
-# label.redundant.state=Redundant state
-# label.enable.provider=Enable provider
-# message.confirm.enable.provider=Please confirm that you would like to enable this provider
-# label.disable.provider=Disable provider
-# message.confirm.disable.provider=Please confirm that you would like to disable this provider
-# label.shutdown.provider=Shutdown provider
-# message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
-# label.netScaler=NetScaler
-# label.add.new.NetScaler=Add new NetScaler
-# label.capacity=Capacity
-# label.dedicated=Dedicated
-# label.f5=F5
-# label.add.new.F5=Add new F5
-# label.srx=SRX
-# label.providers=Providers
-# label.add.new.SRX=Add new SRX
-# label.timeout=Timeout
-# label.public.network=Public network
-# label.private.network=Private network
-# label.enable.swift=Enable Swift
-# confirm.enable.swift=Please fill in the following information to enable support for Swift
-# message.after.enable.swift=Swift configured. Note\\\: When you leave this page, you will not be able to re-configure Swift again.
-# label.key=Key
-# label.delete.NetScaler=Delete NetScaler
-# message.confirm.delete.NetScaler=Please confirm that you would like to delete NetScaler
-# label.delete.F5=Delete F5
-# message.confirm.delete.F5=Please confirm that you would like to delete F5
-# label.delete.SRX=Delete SRX
-# message.confirm.delete.SRX=Please confirm that you would like to delete SRX
-# label.pods=Pods
-# label.pod.name=Pod name
-# label.reserved.system.gateway=Reserved system gateway
-# label.reserved.system.netmask=Reserved system netmask
-# label.start.reserved.system.IP=Start Reserved system IP
-# label.end.reserved.system.IP=End Reserved system IP
-# label.clusters=Clusters
-# label.cluster.name=Cluster Name
-# label.host.MAC=Host MAC
-# label.agent.username=Agent Username
-# label.agent.password=Agent Password
-# message.confirm.action.force.reconnect=Please confirm that you want to force reconnect this host.
-# label.resource.state=Resource state
-# label.LUN.number=LUN \\\#
-# message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
-# message.tooltip.zone.name=A name for the zone.
-# message.tooltip.dns.1=Name of a DNS server for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
-# message.tooltip.dns.2=A second DNS server name for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
-# message.tooltip.internal.dns.1=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
-# message.tooltip.internal.dns.2=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
-# message.tooltip.network.domain=A DNS suffix that will create a custom domain name for the network that is accessed by guest VMs.
-# message.tooltip.pod.name=A name for this pod.
-# message.tooltip.reserved.system.gateway=The gateway for the hosts in the pod.
-# message.tooltip.reserved.system.netmask=The network prefix that defines the pod subnet. Uses CIDR notation.
-# message.creating.zone=Creating zone
-# message.creating.physical.networks=Creating physical networks
-# message.configuring.physical.networks=Configuring physical networks
-# message.adding.Netscaler.device=Adding Netscaler device
-# message.creating.pod=Creating pod
-# message.configuring.public.traffic=Configuring public traffic
-# message.configuring.storage.traffic=Configuring storage traffic
-# message.configuring.guest.traffic=Configuring guest traffic
-# message.creating.cluster=Creating cluster
-# message.adding.host=Adding host
-# message.creating.primary.storage=Creating primary storage
-# message.creating.secondary.storage=Creating secondary storage
-# message.Zone.creation.complete=Zone creation complete
-# message.enabling.zone=Enabling zone
-# error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following
-# error.could.not.enable.zone=Could not enable zone
-# message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone?
-# message.please.add.at.lease.one.traffic.range=Please add at least one traffic range.
-# message.you.must.have.at.least.one.physical.network=You must have at least one physical network
-# message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing
-
-# label.zone.type=Zone Type
-# label.setup.zone=Setup Zone
-# label.setup.network=Setup Network
-# label.add.resources=Add Resources
-# label.launch=Launch
-# label.set.up.zone.type=Set up zone type
-# message.please.select.a.configuration.for.your.zone=Please select a configuration for your zone.
-# message.desc.basic.zone=Provide a single network where each VM instance is assigned an IP directly from the network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).
-# label.basic=Basic
-# message.desc.advanced.zone=For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks and providing custom network offerings such as firewall, VPN, or load balancer support.
-# label.advanced=Advanced
-# message.desc.zone=A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.
-# label.physical.network=Physical Network
-# label.public.traffic=Public traffic
-# label.guest.traffic=Guest Traffic
-# label.storage.traffic=Storage Traffic
-# message.setup.physical.network.during.zone.creation=When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.
-# label.add.physical.network=Add physical network
-# label.traffic.types=Traffic Types
-# label.management=Management
-# label.guest=Guest
-# label.please.specify.netscaler.info=Please specify Netscaler info
-# message.public.traffic.in.advanced.zone=Public traffic is generated when VMs in the cloud access the internet. Publicly-accessible IPs must be allocated for this purpose. End users can use the CloudStack UI to acquire these IPs to implement NAT between their guest network and their public network.<br/><br/>Provide at least one range of IP addresses for internet traffic.
-# message.public.traffic.in.basic.zone=Public traffic is generated when VMs in the cloud access the Internet or provide services to clients over the Internet. Publicly accessible IPs must be allocated for this purpose. When a instance is created, an IP from this set of Public IPs will be allocated to the instance in addition to the guest IP address. Static 1-1 NAT will be set up automatically between the public IP and the guest IP. End users can also use the CloudStack UI to acquire additional IPs to implement static NAT between their instances and the public IP.
-# message.add.pod.during.zone.creation=Each zone must contain in one or more pods, and we will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack's internal management traffic. The reserved IP range must be unique for each zone in the cloud.
-# message.guest.traffic.in.advanced.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.
-# message.guest.traffic.in.basic.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.
-# message.storage.traffic=Traffic between CloudStack's internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
-# message.desc.cluster=Each pod must contain one or more clusters, and we will add the first cluster now. A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Each cluster consists of one or more hosts and one or more primary storage servers.
-# message.desc.host=Each cluster must contain at least one host (computer) for guest VMs to run on, and we will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
-# message.desc.primary.storage=Each cluster must contain one or more primary storage servers, and we will add the first one now. Primary storage contains the disk volumes for all the VMs running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.
-# message.desc.secondary.storage=Each zone must have at least one NFS or secondary storage server, and we will add the first one now. Secondary storage stores VM templates, ISO images, and VM disk volume snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.
-# label.launch.zone=Launch zone
-# message.please.wait.while.zone.is.being.created=Please wait while your zone is being created; this may take a while...
-
-# label.load.balancing=Load Balancing
-# label.static.nat.enabled=Static NAT Enabled
-# label.zones=Zones
-# label.view.more=View more
-# label.number.of.zones=Number of Zones
-# label.number.of.pods=Number of Pods
-# label.number.of.clusters=Number of Clusters
-# label.number.of.hosts=Number of Hosts
-# label.total.hosts=Total Hosts
-# label.total.CPU=Total CPU
-# label.total.memory=Total Memory
-# label.total.storage=Total Storage
-# label.purpose=Purpose
-
-
-
-
-# label.action.migrate.router=Migrate Router
-# label.action.migrate.router.processing=Migrating Router....
-# message.migrate.router.confirm=Please confirm the host you wish to migrate the router to\\\:
-# label.migrate.router.to=Migrate Router to
-
-# label.action.migrate.systemvm=Migrate System VM
-# label.action.migrate.systemvm.processing=Migrating System VM....
-# message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to\\\:
-# label.migrate.systemvm.to=Migrate System VM to
-
-
-# mode=Mode
-# side.by.side=Side by Side
-# inline=Inline
-
-# extractable=Extractable
-
-# label.ocfs2=OCFS2
-
-# label.action.edit.host=Edit Host
-
-# network.rate=Network Rate
-
-# ICMP.type=ICMP Type
-# ICMP.code=ICMP Code
-
-# image.directory=Image Directory
-
-# label.action.create.template.from.vm=Create Template from VM
-# label.action.create.template.from.volume=Create Template from Volume
-
-# message.vm.create.template.confirm=Create Template will reboot the VM automatically.
-
-# label.action.manage.cluster=Manage Cluster
-# message.action.manage.cluster=Please confirm that you want to manage the cluster.
-# label.action.manage.cluster.processing=Managing Cluster....
-
-# label.action.unmanage.cluster=Unmanage Cluster
-# message.action.unmanage.cluster=Please confirm that you want to unmanage the cluster.
-# label.action.unmanage.cluster.processing=Unmanaging Cluster....
-
-# label.allocation.state=Allocation State
-# managed.state=Managed State
-
-# label.default.use=Default Use
-# label.host.tags=Host Tags
-
-# label.cidr=CIDR
-# label.cidr.list=Source CIDR
-
-# label.storage.tags=Storage Tags
-
-# label.redundant.router=Redundant Router
-# label.is.redundant.router=Redundant
-
-# force.delete=Force Delete
-# force.delete.domain.warning=Warning\\\: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
-
-# force.remove=Force Remove
-# 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.
-
-# force.stop=Force Stop
-# force.stop.instance.warning=Warning\\\: Forcing a stop on this instance should be your last option. It can lead to data loss as well as inconsistent behavior of the virtual machine state.
-
-# label.PreSetup=PreSetup
-# label.SR.name = SR Name-Label
-# label.SharedMountPoint=SharedMountPoint
-# label.clvm=CLVM
-# label.volgroup=Volume Group
-# label.VMFS.datastore=VMFS datastore
-
-# label.network.device=Network Device
-# label.add.network.device=Add Network Device
-# label.network.device.type=Network Device Type
-# label.DHCP.server.type=DHCP Server Type
-# label.Pxe.server.type=Pxe Server Type
-# label.PING.storage.IP=PING storage IP
-# label.PING.dir=PING Directory
-# label.TFTP.dir=TFTP Directory
-# label.PING.CIFS.username=PING CIFS username
-# label.PING.CIFS.password=PING CIFS password
-# label.CPU.cap=CPU Cap
-
-
-# label.action.enable.zone=Enable Zone
-# label.action.enable.zone.processing=Enabling Zone....
-# message.action.enable.zone=Please confirm that you want to enable this zone.
-# label.action.disable.zone=Disable Zone
-# label.action.disable.zone.processing=Disabling Zone....
-# message.action.disable.zone=Please confirm that you want to disable this zone.
-
-# label.action.enable.pod=Enable Pod
-# label.action.enable.pod.processing=Enabling Pod....
-# message.action.enable.pod=Please confirm that you want to enable this pod.
-# label.action.disable.pod=Disable Pod
-# label.action.disable.pod.processing=Disabling Pod....
-# message.action.disable.pod=Please confirm that you want to disable this pod.
-
-# label.action.enable.cluster=Enable Cluster
-# label.action.enable.cluster.processing=Enabling Cluster....
-# message.action.enable.cluster=Please confirm that you want to enable this cluster.
-# label.action.disable.cluster=Disable Cluster
-# label.action.disable.cluster.processing=Disabling Cluster....
-# message.action.disable.cluster=Please confirm that you want to disable this cluster.
-
-# label.account.id=Account ID
-# label.account.name=Account Name
-# label.account.specific=Account-Specific
-# label.account=Account
-# label.accounts=Accounts
-# label.acquire.new.ip=Acquire New IP
-# label.show.ingress.rule=Show Ingress Rule
-# label.hide.ingress.rule=Hide Ingress Rule
-# label.action.attach.disk.processing=Attaching Disk....
-# label.action.attach.disk=Attach Disk
-# label.action.attach.iso.processing=Attaching ISO....
-# label.action.attach.iso=Attach ISO
-# label.action.cancel.maintenance.mode.processing=Cancelling Maintenance Mode....
-# label.action.cancel.maintenance.mode=Cancel Maintenance Mode
-# label.action.change.password=Change Password
-# label.action.change.service.processing=Changing Service....
-# label.action.change.service=Change Service
-# label.action.copy.ISO.processing=Coping ISO....
-# label.action.copy.ISO=Copy ISO
-# label.action.copy.template.processing=Coping Template....
-# label.action.copy.template=Copy Template
-# label.action.create.template.processing=Creating Template....
-# label.action.create.template=Create Template
-# label.action.create.vm.processing=Creating VM....
-# label.action.create.vm=Create VM
-# label.action.create.volume.processing=Creating Volume....
-# label.action.create.volume=Create Volume
-# label.action.delete.IP.range.processing=Deleting IP Range....
-# label.action.delete.IP.range=Delete IP Range
-# label.action.delete.ISO.processing=Deleting ISO....
-# label.action.delete.ISO=Delete ISO
-# label.action.delete.account.processing=Deleting account....
-# label.action.delete.account=Delete account
-# label.action.delete.cluster.processing=Deleting Cluster....
-# label.action.delete.cluster=Delete Cluster
-# label.action.delete.disk.offering.processing=Deleting Disk Offering....
-# label.action.delete.disk.offering=Delete Disk Offering
-
-# label.action.update.resource.count=Update Resource Count
-# label.action.update.resource.count.processing=Updating Resource Count....
-
-# label.action.delete.domain=Delete Domain
-# label.action.delete.domain.processing=Deleting Domain....
-
-# label.action.delete.firewall.processing=Deleting Firewall....
-# label.action.delete.firewall=Delete firewall rule
-# label.action.delete.ingress.rule.processing=Deleting Ingress Rule....
-# label.action.delete.ingress.rule=Delete Ingress Rule
-# label.action.delete.load.balancer.processing=Deleting Load Balancer....
-# label.action.delete.load.balancer=Delete load balancer rule
-# label.action.edit.network.processing=Editing Network....
-# label.action.edit.network=Edit Network
-# label.action.delete.network.processing=Deleting Network....
-# label.action.delete.network=Delete Network
-# label.action.delete.pod.processing=Deleting Pod....
-# label.action.delete.pod=Delete Pod
-# label.action.delete.primary.storage.processing=Deleting Primary Storage....
-# label.action.delete.primary.storage=Delete Primary Storage
-# label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
-# label.action.delete.secondary.storage=Delete Secondary Storage
-# label.action.delete.security.group.processing=Deleting Security Group....
-# label.action.delete.security.group=Delete Security Group
-# label.action.delete.service.offering.processing=Deleting Service Offering....
-# label.action.delete.service.offering=Delete Service Offering
-# label.action.delete.snapshot.processing=Deleting Snapshot....
-# label.action.delete.snapshot=Delete Snapshot
-# label.action.delete.template.processing=Deleting Template....
-# label.action.delete.template=Delete Template
-# label.action.delete.user.processing=Deleting User....
-# label.action.delete.user=Delete User
-# label.action.delete.volume.processing=Deleting Volume....
-# label.action.delete.volume=Delete Volume
-# label.action.delete.zone.processing=Deleting Zone....
-# label.action.delete.zone=Delete Zone
-# label.action.destroy.instance.processing=Destroying Instance....
-# label.action.destroy.instance=Destroy Instance
-# label.action.destroy.systemvm.processing=Destroying System VM....
-# label.action.destroy.systemvm=Destroy System VM
-# label.action.detach.disk.processing=Detaching Disk....
-# label.action.detach.disk=Detach Disk
-# label.action.detach.iso.processing=Detaching ISO....
-# label.action.detach.iso=Detach ISO
-# label.action.disable.account.processing=Disabling account....
-# label.action.disable.account=Disable account
-# label.action.disable.static.NAT.processing=Disabling Static NAT....
-# label.action.disable.static.NAT=Disable Static NAT
-# label.action.disable.user.processing=Disabling User....
-# label.action.disable.user=Disable User
-# label.action.download.ISO=Download ISO
-# label.action.download.template=Download Template
-# label.action.download.volume.processing=Downloading Volume....
-# label.action.download.volume=Download Volume
-# label.action.edit.ISO=Edit ISO
-# label.action.edit.account=Edit account
-# label.action.edit.disk.offering=Edit Disk Offering
-# label.action.edit.domain=Edit Domain
-# label.action.edit.global.setting=Edit Global Setting
-# label.action.edit.instance=Edit Instance
-# label.action.edit.network.offering=Edit Network Offering
-# label.action.edit.pod=Edit Pod
-# label.action.edit.primary.storage=Edit Primary Storage
-# label.action.edit.resource.limits=Edit Resource Limits
-# label.action.edit.service.offering=Edit Service Offering
-# label.action.edit.template=Edit Template
-# label.action.edit.user=Edit User
-# label.action.edit.zone=Edit Zone
-# label.action.enable.account.processing=Enabling account....
-# label.action.enable.account=Enable account
-# label.action.enable.maintenance.mode.processing=Enabling Maintenance Mode....
-# label.action.enable.maintenance.mode=Enable Maintenance Mode
-# label.action.enable.static.NAT.processing=Enabling Static NAT....
-# label.action.enable.static.NAT=Enable Static NAT
-# label.action.enable.user.processing=Enabling User....
-# label.action.enable.user=Enable User
-# label.action.force.reconnect.processing=Reconnecting....
-# label.action.force.reconnect=Force Reconnect
-# label.action.generate.keys.processing=Generate Keys....
-# label.action.generate.keys=Generate Keys
-# label.action.lock.account.processing=Locking account....
-# label.action.lock.account=Lock account
-# label.action.migrate.instance=Migrate Instance
-# label.action.migrate.instance.processing=Migrating Instance....
-# label.action.reboot.instance.processing=Rebooting Instance....
-# label.action.reboot.instance=Reboot Instance
-# label.action.reboot.router.processing=Rebooting Router....
-# label.action.reboot.router=Reboot Router
-# label.action.reboot.systemvm.processing=Rebooting System VM....
-# label.action.reboot.systemvm=Reboot System VM
-# label.action.recurring.snapshot=Recurring Snapshots
-# label.action.release.ip.processing=Releasing IP....
-# label.action.release.ip=Release IP
-# label.action.remove.host.processing=Removing Host....
-# label.action.remove.host=Remove Host
-# label.action.reset.password.processing=Resetting Password....
-# label.action.reset.password=Reset Password
-# label.action.resource.limits=Resource limits
-# label.action.restore.instance.processing=Restoring Instance....
-# label.action.restore.instance=Restore Instance
-# label.action.start.instance.processing=Starting Instance....
-# label.action.start.instance=Start Instance
-# label.action.start.router.processing=Starting Router....
-# label.action.start.router=Start Router
-# label.action.start.systemvm.processing=Starting System VM....
-# label.action.start.systemvm=Start System VM
-# label.action.stop.instance.processing=Stopping Instance....
-# label.action.stop.instance=Stop Instance
-# label.action.stop.router.processing=Stopping Router....
-# label.action.stop.router=Stop Router
-# label.action.stop.systemvm.processing=Stopping System VM....
-# label.action.stop.systemvm=Stop System VM
-# label.action.take.snapshot.processing=Taking Snapshot....
-# label.action.take.snapshot=Take Snapshot
-# label.action.update.OS.preference.processing=Updating OS Preference....
-# label.action.update.OS.preference=Update OS Preference
-# label.actions=Actions
-# label.active.sessions=Active Sessions
-# label.add.account=Add Account
-# label.add.by.cidr=Add By CIDR
-# label.add.by.group=Add By Group
-# label.add.cluster=Add Cluster
-# label.add.direct.iprange=Add Direct Ip Range
-# label.add.disk.offering=Add Disk Offering
-# label.add.domain=Add Domain
-# label.add.firewall=Add firewall rule
-# label.add.host=Add Host
-# label.add.ingress.rule=Add Ingress Rule
-# label.add.ip.range=Add IP Range
-# label.add.load.balancer=Add Load Balancer
-# label.add.more=Add More
-# label.add.network=Add Network
-# label.add.pod=Add Pod
-# label.add.primary.storage=Add Primary Storage
-# label.add.secondary.storage=Add Secondary Storage
-# label.add.security.group=Add Security Group
-# label.add.service.offering=Add Service Offering
-# label.add.template=Add Template
-# label.add.user=Add User
-# label.add.vlan=Add VLAN
-# label.add.volume=Add Volume
-# label.add.zone=Add Zone
-# label.add=Add
-# label.adding.cluster=Adding Cluster
-# label.adding.failed=Adding Failed
-# label.adding.pod=Adding Pod
-# label.adding.processing=Adding....
-# label.adding.succeeded=Adding Succeeded
-# label.adding.user=Adding User
-# label.adding.zone=Adding Zone
-# label.adding=Adding
-# label.additional.networks=Additional Networks
-# label.admin.accounts=Admin Accounts
-# label.admin=Admin
-# label.advanced.mode=Advanced Mode
-# label.advanced.search=Advance Search
-# label.advanced=Advanced
-# label.alert=Alert
-# label.algorithm=Algorithm
-# label.allocated=Allocated
-# label.api.key=API Key
-# label.assign.to.load.balancer=Assigning instance to load balancer
-# label.assign=Assign
-# label.associated.network.id=Associated Network ID
-# label.attached.iso=Attached ISO
-# label.availability.zone=Availability Zone
-# label.availability=Availability
-# label.available.public.ips=Available Public IP Addresses
-# label.available=Available
-# label.back=Back
-# label.basic.mode=Basic Mode
-# label.bootable=Bootable
-# label.broadcast.domain.type=Broadcast Domain Type
-# label.by.account=By Account
-# label.by.availability=By Availability
-# label.by.domain=By Domain
-# label.by.end.date=By End Date
-# label.by.level=By Level
-# label.by.pod=By Pod
-# label.by.role=By Role
-# label.by.start.date=By Start Date
-# label.by.state=By State
-# label.by.traffic.type=By Traffic Type
-# label.by.type.id=By Type ID
-# label.by.type=By Type
-# label.by.zone=By Zone
-# label.bytes.received=Bytes Received
-# label.bytes.sent=Bytes Sent
-# label.cancel=Cancel
-# label.certificate=Certificate
-# label.privatekey=PKCS\\\#8 Private Key
-# label.domain.suffix=DNS Domain Suffix (i.e., xyz.com)
-# label.character=Character
-# label.cidr.account=CIDR or Account/Security Group
-# label.close=Close
-# label.cloud.console=Cloud Management Console
-# label.cloud.managed=Cloud.com Managed
-# label.cluster.type=Cluster Type
-# label.cluster=Cluster
-# label.code=Code
-# label.confirmation=Confirmation
-# label.cpu.allocated.for.VMs=CPU Allocated for VMs
-# label.cpu.allocated=CPU Allocated
-# label.cpu.utilized=CPU Utilized
-# label.cpu=CPU
-# label.created=Created
-# label.cross.zones=Cross Zones
-# label.custom.disk.size=Custom Disk Size
-# label.daily=Daily
-# label.data.disk.offering=Data Disk Offering
-# label.date=Date
-# label.day.of.month=Day of Month
-# label.day.of.week=Day of Week
-# label.delete=Delete
-# label.deleting.failed=Deleting Failed
-# label.deleting.processing=Deleting....
-# label.description=Description
-# label.detaching.disk=Detaching Disk
-# label.details=Details
-# label.device.id=Device ID
-# label.disabled=Disabled
-# label.disabling.vpn.access=Disabling VPN Access
-# label.disk.allocated=Disk Allocated
-# label.disk.offering=Disk Offering
-# label.disk.size.gb=Disk Size (in GB)
-# label.disk.size=Disk Size
-# label.disk.total=Disk Total
-# label.disk.volume=Disk Volume
-# label.display.text=Display Text
-# label.dns.1=DNS 1
-# label.dns.2=DNS 2
-# label.domain.admin=Domain Admin
-# label.domain.id=Domain ID
-# label.domain.name=Domain Name
-# label.domain=Domain
-# label.double.quotes.are.not.allowed=Double quotes are not allowed
-# label.download.progress=Download Progress
-# label.edit=Edit
-# label.email=Email
-# label.enabling.vpn.access=Enabling VPN Access
-# label.enabling.vpn=Enabling VPN
-# label.end.port=End Port
-# label.endpoint.or.operation=Endpoint or Operation
-# label.error.code=Error Code
-# label.error=Error
-# label.esx.host=ESX/ESXi Host
-# label.example=Example
-# label.failed=Failed
-# label.featured=Featured
-# label.firewall=Firewall
-# label.first.name=First Name
-# label.format=Format
-# label.friday=Friday
-# label.full=Full
-# label.gateway=Gateway
-# label.general.alerts=General Alerts
-# label.generating.url=Generating URL
-# label.go.step.2=Go to Step 2
-# label.go.step.3=Go to Step 3
-# label.go.step.4=Go to Step 4
-# label.go.step.5=Go to Step 5
-# label.group.optional=Group (Optional)
-# label.group=Group
-# label.guest.cidr=Guest CIDR
-# label.guest.gateway=Guest Gateway
-# label.guest.ip.range=Guest IP Range
-# label.guest.ip=Guest IP Address
-# label.guest.netmask=Guest Netmask
-# label.ha.enabled=HA Enabled
-# label.help=Help
-# label.host.alerts=Host Alerts
-# label.host.name=Host Name
-# label.host=Host
-# label.hosts=Hosts
-# label.hourly=Hourly
-# label.hypervisor.type=Hypervisor Type
-# label.hypervisor=Hypervisor
-# label.id=ID
-# label.info=Info
-# label.ingress.rule=Ingress Rule
-# label.initiated.by=Initiated By
-# label.instance.limits=Instance Limits
-# label.instance.name=Instance Name
-# label.instance=Instance
-# label.instances=Instances
-# label.internal.dns.1=Internal DNS 1
-# label.internal.dns.2=Internal DNS 2
-# label.interval.type=Interval Type
-# label.invalid.integer=Invalid Integer
-# label.invalid.number=Invalid Number
-# label.ip.address=IP Address
-# label.ip.allocations=IP Allocations
-# label.ip.limits=Public IP Limits
-# label.ip.or.fqdn=IP or FQDN
-# label.ip.range=IP Range
-# label.ip=IP
-# label.ips=IPs
-# label.is.default=Is Default
-# label.is.shared=Is Shared
-# label.is.system=Is System
-# label.iscsi=iSCSI
-# label.iso.boot=ISO Boot
-# label.iso=ISO
-# label.isolation.mode=Isolation Mode
-# label.keep=Keep
-# label.lang.chinese=Chinese (Simplified)
-# label.lang.english=English
-# label.lang.japanese=Japanese
-# label.lang.spanish=Spanish
-# label.lang.russian=Russian
-# label.lang.french=French
-# label.lang.brportugese=Brazilian Portugese
-# label.last.disconnected=Last Disconnected
-# label.last.name=Last Name
-# label.level=Level
-# label.linklocal.ip=Link Local IP Adddress
-# label.load.balancer=Load Balancer
-# label.loading=Loading
-# label.local=Local
+label.IKE.lifetime=\u0639\u0645\u0631 IKE (\u062b\u0627\u0646\u064a\u0629)
+label.IKE.policy=\u0633\u064a\u0627\u0633\u0629 IKE
+label.invitations=\u062f\u0639\u0648\u0627\u062a
+label.invite.to=\u062f\u0639\u0648\u0629 \u0644\u0640
+label.invited.accounts=\u062f\u0639\u0648\u0629 \u062d\u0633\u0627\u0628\u0627\u062a
+label.IPsec.preshared.key=\u0645\u0641\u062a\u0627\u062d \u0623\u0645\u0646 \u0628\u0631\u0648\u062a\u0648\u0643\u0648\u0644 \u0627\u0644\u0625\u0646\u062a\u0631\
<TRUNCATED>
[34/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/77ae066c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77ae066c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77ae066c
Branch: refs/heads/internallb
Commit: 77ae066c6574c8dce31e5a6a083920880647cbe9
Parents: 134704b d3c82b3
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Apr 29 06:56:51 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Apr 29 06:56:51 2013 -0400
----------------------------------------------------------------------
agent/conf/agent.properties | 2 +-
.../cloud/configuration/ConfigurationService.java | 15 +-
api/src/com/cloud/network/NetworkModel.java | 2 +-
api/src/com/cloud/network/NetworkService.java | 2 +-
.../apache/cloudstack/api/ResponseGenerator.java | 4 +-
.../api/command/admin/cluster/ListClustersCmd.java | 8 +-
.../api/command/admin/config/ListCfgsByCmd.java | 44 +-
.../api/command/admin/config/UpdateCfgCmd.java | 47 +-
.../api/command/admin/host/ListHostsCmd.java | 7 +
.../api/command/admin/pod/ListPodsByCmd.java | 7 +
.../api/command/admin/router/ListRoutersCmd.java | 7 +
.../command/admin/systemvm/ListSystemVMsCmd.java | 7 +
.../api/command/user/iso/ListIsosCmd.java | 7 +
.../api/command/user/network/ListNetworksCmd.java | 7 +
.../command/user/snapshot/ListSnapshotsCmd.java | 7 +
.../command/user/template/ListTemplatesCmd.java | 8 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 9 +-
.../api/command/user/zone/ListZonesByCmd.java | 8 +
.../api/response/ConfigurationResponse.java | 3 +
.../api/command/test/AddIpToVmNicTest.java | 6 +-
.../WEB-INF/classes/resources/messages.properties | 15 +-
.../classes/resources/messages_ca.properties | 1 +
.../classes/resources/messages_de_DE.properties | 1 +
.../classes/resources/messages_es.properties | 1 +
.../classes/resources/messages_fr_FR.properties | 1788 +++++-----
.../classes/resources/messages_it_IT.properties | 1 +
.../classes/resources/messages_ja.properties | 2679 ++++++++-------
.../classes/resources/messages_ko_KR.properties | 1 +
.../classes/resources/messages_nb_NO.properties | 1 +
.../classes/resources/messages_pt_BR.properties | 1 +
.../classes/resources/messages_ru_RU.properties | 3 +-
.../classes/resources/messages_zh_CN.properties | 1 +
client/pom.xml | 11 +-
client/tomcatconf/applicationContext.xml.in | 4 +
core/src/com/cloud/async/AsyncJobVO.java | 1 +
docs/en-US/added-API-commands-4.2.xml | 24 +
docs/en-US/delete-event-alerts.xml | 12 +
docs/en-US/events.xml | 2 +-
docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 55568 bytes
packaging/centos63/package.sh | 4 +-
.../debian/config/etc/init.d/cloud-early-config | 8 +
server/src/com/cloud/alert/AlertManagerImpl.java | 27 +-
server/src/com/cloud/api/ApiDBUtils.java | 2 +-
server/src/com/cloud/api/ApiResponseHelper.java | 32 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 21 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 6 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 6 +-
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 6 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 6 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +-
.../src/com/cloud/api/query/vo/AccountJoinVO.java | 6 +-
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 6 +-
server/src/com/cloud/api/query/vo/HostJoinVO.java | 6 +-
.../cloud/api/query/vo/SecurityGroupJoinVO.java | 6 +-
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 6 +-
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 6 +-
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 6 +-
.../src/com/cloud/api/query/vo/VolumeJoinVO.java | 6 +-
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 | 25 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 7 +-
server/src/com/cloud/network/NetworkModelImpl.java | 11 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 36 +-
.../network/firewall/FirewallManagerImpl.java | 12 +-
.../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 +-
.../storage/snapshot/SnapshotManagerImpl.java | 32 +-
.../com/cloud/template/TemplateAdapterBase.java | 7 +-
.../com/cloud/template/TemplateManagerImpl.java | 10 +-
.../upgrade/PremiumDatabaseUpgradeChecker.java | 75 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 11 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +
.../com/cloud/network/MockNetworkManagerImpl.java | 2 +-
.../com/cloud/network/MockNetworkModelImpl.java | 2 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 8 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkModelImpl.java | 2 +-
.../affinity/AffinityApiTestConfiguration.java | 29 +-
.../networkoffering/ChildTestConfiguration.java | 38 +-
setup/db/db/schema-410to420.sql | 4 +
.../component/test_multiple_ip_ranges.py | 238 ++
test/integration/component/test_vpn_users.py | 447 +++
test/integration/smoke/test_global_settings.py | 14 +-
tools/marvin/marvin/asyncJobMgr.py | 70 +-
tools/marvin/marvin/cloudstackConnection.py | 17 +-
tools/marvin/marvin/cloudstackTestClient.py | 53 +-
tools/marvin/marvin/dbConnection.py | 6 +-
tools/marvin/marvin/deployDataCenter.py | 7 +
tools/marvin/marvin/integration/lib/base.py | 600 +++-
tools/marvin/marvin/integration/lib/utils.py | 17 +-
tools/marvin/marvin/remoteSSHClient.py | 18 +-
tools/transifex/.tx/config | 31 +
tools/transifex/README-transifex.txt | 71 +
tools/transifex/sync-transifex-ui.sh | 158 +
ui/css/cloudstack3.css | 71 +-
ui/dictionary.jsp | 1710 +++++-----
ui/images/icons.png | Bin 50745 -> 50052 bytes
ui/images/sprites.png | Bin 188552 -> 192407 bytes
ui/index.jsp | 19 +-
ui/scripts/affinity.js | 183 +
ui/scripts/cloudStack.js | 9 +-
ui/scripts/domains.js | 2 +-
ui/scripts/instanceWizard.js | 941 +++---
ui/scripts/instances.js | 151 +-
ui/scripts/regions.js | 27 +-
ui/scripts/sharedFunctions.js | 4 +
ui/scripts/storage.js | 2 +-
ui/scripts/system.js | 348 ++-
ui/scripts/ui-custom/affinity.js | 173 +
ui/scripts/ui-custom/instanceWizard.js | 19 +
ui/scripts/ui/widgets/detailView.js | 29 +-
ui/scripts/ui/widgets/listView.js | 10 +-
124 files changed, 6950 insertions(+), 4172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77ae066c/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --cc client/WEB-INF/classes/resources/messages.properties
index 9f84c5a,ad8f42b..bab65de
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@@ -627,11 -637,13 +637,14 @@@ label.lang.catalan=Catala
label.lang.chinese=Chinese (Simplified)
label.lang.english=English
label.lang.french=French
+ label.lang.german=German
+ label.lang.italian=Italian
label.lang.japanese=Japanese
label.lang.korean=Korean
+ label.lang.norwegian=Norwegian
label.lang.russian=Russian
label.lang.spanish=Spanish
+label.lang.arabic=Arabic
label.last.disconnected=Last Disconnected
label.last.name=Last Name
label.latest.events=Latest events
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77ae066c/ui/index.jsp
----------------------------------------------------------------------
[23/50] [abbrv] CLOUDSTACK-2138 - first automate sync with Transifex.
1/ Upload the lastest EN resource file on Transifex. 2/ Download the lastest
L10N resource file for "ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU
zh_CN" form Transifex to CS repo
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_ko_KR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ko_KR.properties b/client/WEB-INF/classes/resources/messages_ko_KR.properties
index 757871a..0a4f990 100644
--- a/client/WEB-INF/classes/resources/messages_ko_KR.properties
+++ b/client/WEB-INF/classes/resources/messages_ko_KR.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
changed.item.properties=\ud56d\ubaa9 \uc18d\uc131 \ubcc0\uacbd
confirm.enable.swift=Swift \uae30\uc220 \uc9c0\uc6d0\ub97c \uc0ac\uc6a9 \ud558\ub824\uba74 \ub2e4\uc74c \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624.
error.could.not.enable.zone=Zone\uc744 \uc0ac\uc6a9 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_nb_NO.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties b/client/WEB-INF/classes/resources/messages_nb_NO.properties
index be41244..8fba48c 100644
--- a/client/WEB-INF/classes/resources/messages_nb_NO.properties
+++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
changed.item.properties=Endrede egenskaper
error.could.not.enable.zone=Kunne ikke aktivere sonen
error.installWizard.message=Noe gikk galt. G\u00e5 tilbake og korriger feilene.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index fd24f54..780b844 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
changed.item.properties=Alteradas propriedades do item
confirm.enable.s3=Por favor preencha as informa\u00e7\u00f5es abaixo para habilitar suporte a storage secund\u00e1ria fornecida por S3
confirm.enable.swift=Por favor preencha as informa\u00e7\u00f5es abaixo para habilitar suporte ao Swift
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_ru_RU.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties
index b28f6b6..5f492c0 100644
--- a/client/WEB-INF/classes/resources/messages_ru_RU.properties
+++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
changed.item.properties=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u044b
confirm.enable.swift=\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u043d\u0438\u0436\u0435\u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0434\u043b\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438 Swift
error.could.not.enable.zone=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u043e\u043d\u0443
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/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 f62439d..c842979 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
changed.item.properties=\u66f4\u6539\u9879\u76ee\u5c5e\u6027
confirm.enable.s3=\u8bf7\u586b\u5199\u4e0b\u5217\u4fe1\u606f\u4ee5\u542f\u7528\u652f\u6301S3\u7684\u4e8c\u7ea7\u5b58\u50a8
confirm.enable.swift=\u8bf7\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u542f\u7528\u5bf9 SWIFT \u7684\u652f\u6301
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/tools/transifex/.tx/config
----------------------------------------------------------------------
diff --git a/tools/transifex/.tx/config b/tools/transifex/.tx/config
index 171d9b1..80c02aa 100644
--- a/tools/transifex/.tx/config
+++ b/tools/transifex/.tx/config
@@ -15,5 +15,17 @@ source_lang = en
[CloudStack_UI.42xmessagesproperties]
file_filter = translations/CloudStack_UI.42xmessagesproperties/<lang>.properties
+source_file = work-dir/messages.properties
source_lang = en
+trans.ca = work-dir/messages_ca.properties
+trans.de_DE = work-dir/messages_de_DE.properties
+trans.es = work-dir/messages_es.properties
+trans.fr_FR = work-dir/messages_fr_FR.properties
+trans.it_IT = work-dir/messages_it_IT.properties
+trans.ja = work-dir/messages_ja.properties
+trans.ko_KR = work-dir/messages_ko_KR.properties
+trans.nb_NO = work-dir/messages_nb_NO.properties
+trans.pt_BR = work-dir/messages_pt_BR.properties
+trans.ru_RU = work-dir/messages_ru_RU.properties
+trans.zh_CN = work-dir/messages_zh_CN.properties
[30/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d3c82b31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3c82b31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3c82b31
Branch: refs/heads/internallb
Commit: d3c82b31b6265c0fa32f6ab17b94aea40be47f91
Parents: 6bf67c9 0f2a249
Author: Pranav Saxena <pr...@citrix.com>
Authored: Mon Apr 29 16:22:37 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Mon Apr 29 16:22:37 2013 +0530
----------------------------------------------------------------------
tools/transifex/README-transifex.txt | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
[13/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2120: mixed zone management - API: extend listSystemVMs API to to take in zonetype.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/774b2ebf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/774b2ebf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/774b2ebf
Branch: refs/heads/internallb
Commit: 774b2ebf9d2faacde31973b35384cf0450865e9d
Parents: 45dbd9c
Author: Jessica Wang <je...@citrix.com>
Authored: Sat Apr 27 11:41:53 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Sat Apr 27 11:41:53 2013 -0700
----------------------------------------------------------------------
.../command/admin/systemvm/ListSystemVMsCmd.java | 7 +++++++
.../src/com/cloud/server/ManagementServerImpl.java | 11 +++++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/774b2ebf/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
index f230a20..b5a0f3f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
@@ -74,6 +74,9 @@ public class ListSystemVMsCmd extends BaseListCmd {
description="the storage ID where vm's volumes belong to", since="3.0.1")
private Long storageId;
+ @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to")
+ private String zoneType;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -110,6 +113,10 @@ public class ListSystemVMsCmd extends BaseListCmd {
return storageId;
}
+ public String getZoneType() {
+ return zoneType;
+ }
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/774b2ebf/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 0da8d4f..050f57b 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2640,6 +2640,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
public Pair<List<? extends VirtualMachine>, Integer> searchForSystemVm(ListSystemVMsCmd cmd) {
String type = cmd.getSystemVmType();
Long zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), cmd.getZoneId());
+ String zoneType = cmd.getZoneType();
Long id = cmd.getId();
String name = cmd.getSystemVmName();
String state = cmd.getState();
@@ -2666,6 +2667,12 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
sb.join("volumeSearch", volumeSearch, sb.entity().getId(), volumeSearch.entity().getInstanceId(), JoinBuilder.JoinType.INNER);
}
+ if(zoneType != null) {
+ SearchBuilder<DataCenterVO> zoneSb = _dcDao.createSearchBuilder();
+ zoneSb.and("zoneNetworkType", zoneSb.entity().getNetworkType(), SearchCriteria.Op.EQ);
+ sb.join("zoneSb", zoneSb, sb.entity().getDataCenterId(), zoneSb.entity().getId(), JoinBuilder.JoinType.INNER);
+ }
+
SearchCriteria<VMInstanceVO> sc = sb.create();
if (keyword != null) {
@@ -2706,6 +2713,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
sc.setJoinParameters("volumeSearch", "poolId", storageId);
}
+ if(zoneType != null) {
+ sc.setJoinParameters("zoneSb", "zoneNetworkType", zoneType);
+ }
+
Pair<List<VMInstanceVO>, Integer> result = _vmInstanceDao.searchAndCount(sc, searchFilter);
return new Pair<List<? extends VirtualMachine>, Integer>(result.first(), result.second());
}
[31/50] [abbrv] [TRANSLATION] Adding arabic strings
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/134704bb/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 12cb955..69341fd 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -81,6 +81,7 @@ under the License.
<option value="de_DE"><fmt:message key="label.lang.german"/></option>
<option value="it_IT"><fmt:message key="label.lang.italian"/></option>
<option value="nb_NO"><fmt:message key="label.lang.norwegian"/></option>
+ <option value="ar"><fmt:message key="label.lang.arabic"/></option>
</select>
</div>
</div>
[26/50] [abbrv] CLOUDSTACK-2138 - first automate sync with Transifex.
1/ Upload the lastest EN resource file on Transifex. 2/ Download the lastest
L10N resource file for "ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU
zh_CN" form Transifex to CS repo
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b633353f/client/WEB-INF/classes/resources/messages_fr_FR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 6a7cc9a..6d86048 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -15,78 +15,46 @@
# specific language governing permissions and limitations
# under the License.
-#Stored by I18NEdit, may be edited!
-ICMP.code=Code ICMP
-ICMP.type=Type ICMP
-changed.item.properties=Propri\u00E9t\u00E9s de l\\'\u00E9l\u00E9ment modifi\u00E9es
+
+changed.item.properties=Propri\u00e9t\u00e9s de l\\'\u00e9l\u00e9ment modifi\u00e9es
confirm.enable.s3=Remplir les informations suivantes pour activer le support de stockage secondaire S3
confirm.enable.swift=Remplir les informations suivantes pour activer Swift
error.could.not.enable.zone=Impossible d\\'activer la zone
-error.installWizard.message=Une erreur s\\'est produite ; vous pouvez retourner en arri\u00E8re et corriger les erreurs
+error.installWizard.message=Une erreur s\\'est produite ; vous pouvez retourner en arri\u00e8re et corriger les erreurs
error.invalid.username.password=Utilisateur ou mot de passe invalide
-error.login=Votre nom d\\'utilisateur / mot de passe ne correspond pas \u00E0 nos donn\u00E9es.
-error.menu.select=\u00C9chec de l\\'action car il n\\'y a aucun \u00E9l\u00E9ment s\u00E9lectionn\u00E9.
+error.login=Votre nom d\\'utilisateur / mot de passe ne correspond pas \u00e0 nos donn\u00e9es.
+error.menu.select=\u00c9chec de l\\'action car il n\\'y a aucun \u00e9l\u00e9ment s\u00e9lectionn\u00e9.
error.mgmt.server.inaccessible=Le serveur de gestion est indisponible. Essayez plus tard.
error.password.not.match=Les mots de passe ne correspondent pas
-error.please.specify.physical.network.tags=L\\'offre r\u00E9seau ne sera pas disponible tant que des libell\u00E9s n\\'auront pas \u00E9t\u00E9 renseign\u00E9s pour ce r\u00E9seau physique.
-error.session.expired=Votre session a expir\u00E9e.
+error.please.specify.physical.network.tags=L\\'offre r\u00e9seau ne sera pas disponible tant que des libell\u00e9s n\\'auront pas \u00e9t\u00e9 renseign\u00e9s pour ce r\u00e9seau physique.
+error.session.expired=Votre session a expir\u00e9e.
error.something.went.wrong.please.correct.the.following=Erreur; corriger le point suivant
error.unable.to.reach.management.server=Impossible de joindre le serveur d\\'administration
-error.unresolved.internet.name=Votre nom Internet ne peut pas \u00EAtre r\u00E9solu.
-extractable=D\u00E9compressable
+error.unresolved.internet.name=Votre nom Internet ne peut pas \u00eatre r\u00e9solu.
+extractable=D\u00e9compressable
+force.delete.domain.warning=Attention \: Choisir cette option entra\u00eenera la suppression de tous les domaines issus et l\\'ensemble des comptes associ\u00e9s, ainsi que de leur ressources
force.delete=Forcer la suppression
-force.delete.domain.warning=Attention \: Choisir cette option entra\u00EEnera la suppression de tous les domaines issus et l\\'ensemble des comptes associ\u00E9s, ainsi que de leur ressources
force.remove=Forcer la suppression
-force.remove.host.warning=Attention \: Choisir cette option entra\u00EEnera CloudStack \u00E0\u00A0arr\u00EAter l\\'ensemble des machines virtuelles avant d\\'enlever l\\'h\u00F4te du cluster
-force.stop=Forcer l\\'arr\u00EAt
-force.stop.instance.warning=Attention \: un arr\u00EAt forc\u00E9 sur cette instance est la dernier option. Cela peut engendrer des pertes de donn\u00E9es et/ou un comportement inconsistant de votre instance.
-image.directory=R\u00E9pertoire d\\'images
-inline=Align\u00E9
-instances.actions.reboot.label=Red\u00E9marrer l\\'instance
-label.CIDR.list=Liste CIDR
-label.CIDR.of.destination.network=CIDR du r\u00E9seau de destination
-label.CPU.cap=Limitation CPU
-label.DHCP.server.type=Serveur DHCP
-label.DNS.domain.for.guest.networks=Domaine DNS pour les r\u00E9seaux invit\u00E9s
-label.ESP.encryption=Chiffrement ESP
-label.ESP.hash=Empreinte ESP
-label.ESP.lifetime=Dur\u00E9e de vie ESP (secondes)
-label.ESP.policy=Mode ESP
-label.IKE.DH=DH IKE
-label.IKE.encryption=Chiffrement IKE
-label.IKE.hash=Empreinte IKE
-label.IKE.lifetime=Dur\u00E9e de vie IKE (secondes)
-label.IKE.policy=Mode IKE
-label.IPsec.preshared.key=Cl\u00E9 partag\u00E9e IPsec
-label.LB.isolation=R\u00E9partition de charge isol\u00E9e
-label.LUN.number=N\u00B0 LUN
-label.PING.CIFS.password=Mot de passe CIFS PING
-label.PING.CIFS.username=Identifiant CIFS PING
-label.PING.dir=R\u00E9pertoire PING
-label.PING.storage.IP=IP stockage PING
-label.PreSetup=PreSetup
-label.Pxe.server.type=Serveur PXE
-label.SR.name=Nom du point de montage
-label.SharedMountPoint=Point de montage partag\u00E9
-label.TFTP.dir=R\u00E9pertoire TFTP
-label.VMFS.datastore=Magasin de donn\u00E9es VMFS
-label.VMs.in.tier=Machines virtuelles dans le tiers
-label.VPC.router.details=D\u00E9tails routeur VPC
-label.VPN.connection=Connexion VPN
-label.VPN.customer.gateway=Passerelle VPN client
-label.VPN.gateway=Passerelle VPN
+force.remove.host.warning=Attention \: Choisir cette option entra\u00eenera CloudStack \u00e0\u00a0arr\u00eater l\\'ensemble des machines virtuelles avant d\\'enlever l\\'h\u00f4te du cluster
+force.stop=Forcer l\\'arr\u00eat
+force.stop.instance.warning=Attention \: un arr\u00eat forc\u00e9 sur cette instance est la dernier option. Cela peut engendrer des pertes de donn\u00e9es et/ou un comportement inconsistant de votre instance.
+ICMP.code=Code ICMP
+ICMP.type=Type ICMP
+image.directory=R\u00e9pertoire d\\'images
+inline=Align\u00e9
+instances.actions.reboot.label=Red\u00e9marrer l\\'instance
label.accept.project.invitation=Accepter l\\'invitation au projet
+label.account.and.security.group=Compte, groupe de s\u00e9curit\u00e9
label.account=Compte
-label.account.and.security.group=Compte, groupe de s\u00E9curit\u00E9
label.account.id=ID du Compte
label.account.name=Nom du compte
-label.account.specific=Sp\u00E9cifique au compte
label.accounts=Comptes
-label.acquire.new.ip=Acqu\u00E9rir une nouvelle adresse IP
-label.action.attach.disk=Rattacher un disque
+label.account.specific=Sp\u00e9cifique au compte
+label.acquire.new.ip=Acqu\u00e9rir une nouvelle adresse IP
label.action.attach.disk.processing=Rattachement du Disque...
-label.action.attach.iso=Rattacher une image ISO
+label.action.attach.disk=Rattacher un disque
label.action.attach.iso.processing=Rattachement de l\\'image ISO
+label.action.attach.iso=Rattacher une image ISO
label.action.cancel.maintenance.mode=Annuler le mode maintenance
label.action.cancel.maintenance.mode.processing=Annulation du mode maintenance...
label.action.change.password=Changer le mot de passe
@@ -94,100 +62,100 @@ label.action.change.service=Changer d\\'offre de service
label.action.change.service.processing=Changement de d\\'offre de service...
label.action.copy.ISO=Copier une image ISO
label.action.copy.ISO.processing=Copie de l\\'image ISO...
-label.action.copy.template=Copier un mod\u00E8le
-label.action.copy.template.processing=Copie du Mod\u00E8le...
-label.action.create.template=Cr\u00E9er un mod\u00E8le
-label.action.create.template.from.vm=Cr\u00E9er un mod\u00E8le depuis la VM
-label.action.create.template.from.volume=Cr\u00E9er un mod\u00E8le depuis le volume
-label.action.create.template.processing=Cr\u00E9ation du Mod\u00E8le...
-label.action.create.vm=Cr\u00E9er une VM
-label.action.create.vm.processing=Cr\u00E9ation de la VM...
-label.action.create.volume=Cr\u00E9er un Volume
-label.action.create.volume.processing=Cr\u00E9ation du Volume...
-label.action.delete.IP.range=Supprimer la plage IP
-label.action.delete.IP.range.processing=Suppression de la plage IP...
-label.action.delete.ISO=Supprimer l\\'image ISO
-label.action.delete.ISO.processing=Suppression de l\\'image ISO...
-label.action.delete.account=Supprimer un compte
+label.action.copy.template=Copier un mod\u00e8le
+label.action.copy.template.processing=Copie du Mod\u00e8le...
+label.action.create.template=Cr\u00e9er un mod\u00e8le
+label.action.create.template.from.vm=Cr\u00e9er un mod\u00e8le depuis la VM
+label.action.create.template.from.volume=Cr\u00e9er un mod\u00e8le depuis le volume
+label.action.create.template.processing=Cr\u00e9ation du Mod\u00e8le...
+label.action.create.vm=Cr\u00e9er une VM
+label.action.create.vm.processing=Cr\u00e9ation de la VM...
+label.action.create.volume=Cr\u00e9er un Volume
+label.action.create.volume.processing=Cr\u00e9ation du Volume...
label.action.delete.account.processing=Suppression du compte...
-label.action.delete.cluster=Supprimer le Cluster
+label.action.delete.account=Supprimer un compte
label.action.delete.cluster.processing=Suppression du Cluster...
-label.action.delete.disk.offering=Supprimer l\\'offre Disque
+label.action.delete.cluster=Supprimer le Cluster
label.action.delete.disk.offering.processing=Suppression de l\\'offre Disque...
-label.action.delete.domain=Supprimer le domaine
+label.action.delete.disk.offering=Supprimer l\\'offre Disque
label.action.delete.domain.processing=Suppression du domaine...
-label.action.delete.firewall=Supprimer la r\u00E8gle de pare-feu
+label.action.delete.domain=Supprimer le domaine
label.action.delete.firewall.processing=Suppression du Pare-feu...
-label.action.delete.ingress.rule=Supprimer la r\u00E8gle d\\'entr\u00E9e
-label.action.delete.ingress.rule.processing=Suppression de la r\u00E8gle d\\'entr\u00E9e..
-label.action.delete.load.balancer=Supprimer la r\u00E8gle de r\u00E9partition de charge
-label.action.delete.load.balancer.processing=Suppression du r\u00E9partiteur de charge...
-label.action.delete.network=Supprimer le r\u00E9seau
-label.action.delete.network.processing=Suppression du r\u00E9seau...
+label.action.delete.firewall=Supprimer la r\u00e8gle de pare-feu
+label.action.delete.ingress.rule.processing=Suppression de la r\u00e8gle d\\'entr\u00e9e..
+label.action.delete.ingress.rule=Supprimer la r\u00e8gle d\\'entr\u00e9e
+label.action.delete.IP.range.processing=Suppression de la plage IP...
+label.action.delete.IP.range=Supprimer la plage IP
+label.action.delete.ISO.processing=Suppression de l\\'image ISO...
+label.action.delete.ISO=Supprimer l\\'image ISO
+label.action.delete.load.balancer.processing=Suppression du r\u00e9partiteur de charge...
+label.action.delete.load.balancer=Supprimer la r\u00e8gle de r\u00e9partition de charge
+label.action.delete.network.processing=Suppression du r\u00e9seau...
+label.action.delete.network=Supprimer le r\u00e9seau
label.action.delete.nexusVswitch=Supprimer le Nexus 1000v
-label.action.delete.physical.network=Supprimer le r\u00E9seau physique
-label.action.delete.pod=Supprimer le Pod
+label.action.delete.physical.network=Supprimer le r\u00e9seau physique
label.action.delete.pod.processing=Suppression du pod...
-label.action.delete.primary.storage=Supprimer le stockage principal
+label.action.delete.pod=Supprimer le Pod
label.action.delete.primary.storage.processing=Suppression du stockage principal...
-label.action.delete.secondary.storage=Supprimer le stockage secondaire
+label.action.delete.primary.storage=Supprimer le stockage principal
label.action.delete.secondary.storage.processing=Suppression du stockage secondaire...
-label.action.delete.security.group=Supprimer le groupe de s\u00E9curit\u00E9
-label.action.delete.security.group.processing=Suppression du groupe de s\u00E9curit\u00E9
-label.action.delete.service.offering=Supprimer l\\'offre de service
+label.action.delete.secondary.storage=Supprimer le stockage secondaire
+label.action.delete.security.group.processing=Suppression du groupe de s\u00e9curit\u00e9
+label.action.delete.security.group=Supprimer le groupe de s\u00e9curit\u00e9
label.action.delete.service.offering.processing=Suppression de l\\'offre de service...
-label.action.delete.snapshot=Supprimer l\\'instantan\u00E9
-label.action.delete.snapshot.processing=Suppression de l\\'instantan\u00E9...
-label.action.delete.system.service.offering=Supprimer l\\'offre syst\u00E8me
-label.action.delete.template=Supprimer le mod\u00E8le
-label.action.delete.template.processing=Suppression du mod\u00E8le...
-label.action.delete.user=Supprimer l\\'utilisateur
+label.action.delete.service.offering=Supprimer l\\'offre de service
+label.action.delete.snapshot.processing=Suppression de l\\'instantan\u00e9...
+label.action.delete.snapshot=Supprimer l\\'instantan\u00e9
+label.action.delete.system.service.offering=Supprimer l\\'offre syst\u00e8me
+label.action.delete.template.processing=Suppression du mod\u00e8le...
+label.action.delete.template=Supprimer le mod\u00e8le
label.action.delete.user.processing=Suppression de l\\'utilisateur...
-label.action.delete.volume=Supprimer le volume
+label.action.delete.user=Supprimer l\\'utilisateur
label.action.delete.volume.processing=Suppression du volume...
-label.action.delete.zone=Supprimer la zone
+label.action.delete.volume=Supprimer le volume
label.action.delete.zone.processing=Suppression de la zone...
-label.action.destroy.instance=Supprimer l\\'instance
+label.action.delete.zone=Supprimer la zone
label.action.destroy.instance.processing=Suppression de l\\'instance...
-label.action.destroy.systemvm=Supprimer la VM Syst\u00E8me
-label.action.destroy.systemvm.processing=Suppression de la VM Syst\u00E8me...
-label.action.detach.disk=D\u00E9tacher le disque
-label.action.detach.disk.processing=D\u00E9tachement du disque...
-label.action.detach.iso=D\u00E9tacher l\\'image ISO
-label.action.detach.iso.processing=D\u00E9tachement de l\\'image ISO...
-label.action.disable.account=D\u00E9sactiver le compte
-label.action.disable.account.processing=D\u00E9sactivation du compte...
-label.action.disable.cluster=D\u00E9sactiver le cluster
-label.action.disable.cluster.processing=D\u00E9sactivation du cluster...
-label.action.disable.nexusVswitch=D\u00E9sactiver le Nexus 1000v
-label.action.disable.physical.network=D\u00E9sactiver le r\u00E9seau physique
-label.action.disable.pod=D\u00E9sactiver le Pod
-label.action.disable.pod.processing=D\u00E9sactivation du Pod...
-label.action.disable.static.NAT=D\u00E9sactiver le NAT Statique
-label.action.disable.static.NAT.processing=D\u00E9sactivation du NAT Statique...
-label.action.disable.user=D\u00E9sactiver l\\'utilisateur
-label.action.disable.user.processing=D\u00E9sactivation de l\\'utilisateur...
-label.action.disable.zone=D\u00E9sactivation de la zone
-label.action.disable.zone.processing=D\u00E9sactivation de la zone...
-label.action.download.ISO=T\u00E9l\u00E9charger une image ISO
-label.action.download.template=T\u00E9l\u00E9charger un mod\u00E8le
-label.action.download.volume=T\u00E9l\u00E9charger un volume
-label.action.download.volume.processing=T\u00E9l\u00E9chargement du volume...
-label.action.edit.ISO=Modifier l\\'image ISO
+label.action.destroy.instance=Supprimer l\\'instance
+label.action.destroy.systemvm.processing=Suppression de la VM Syst\u00e8me...
+label.action.destroy.systemvm=Supprimer la VM Syst\u00e8me
+label.action.detach.disk=D\u00e9tacher le disque
+label.action.detach.disk.processing=D\u00e9tachement du disque...
+label.action.detach.iso=D\u00e9tacher l\\'image ISO
+label.action.detach.iso.processing=D\u00e9tachement de l\\'image ISO...
+label.action.disable.account=D\u00e9sactiver le compte
+label.action.disable.account.processing=D\u00e9sactivation du compte...
+label.action.disable.cluster=D\u00e9sactiver le cluster
+label.action.disable.cluster.processing=D\u00e9sactivation du cluster...
+label.action.disable.nexusVswitch=D\u00e9sactiver le Nexus 1000v
+label.action.disable.physical.network=D\u00e9sactiver le r\u00e9seau physique
+label.action.disable.pod=D\u00e9sactiver le Pod
+label.action.disable.pod.processing=D\u00e9sactivation du Pod...
+label.action.disable.static.NAT=D\u00e9sactiver le NAT Statique
+label.action.disable.static.NAT.processing=D\u00e9sactivation du NAT Statique...
+label.action.disable.user=D\u00e9sactiver l\\'utilisateur
+label.action.disable.user.processing=D\u00e9sactivation de l\\'utilisateur...
+label.action.disable.zone=D\u00e9sactivation de la zone
+label.action.disable.zone.processing=D\u00e9sactivation de la zone...
+label.action.download.ISO=T\u00e9l\u00e9charger une image ISO
+label.action.download.template=T\u00e9l\u00e9charger un mod\u00e8le
+label.action.download.volume.processing=T\u00e9l\u00e9chargement du volume...
+label.action.download.volume=T\u00e9l\u00e9charger un volume
label.action.edit.account=Modifier le Compte
label.action.edit.disk.offering=Modifier l\\'offre de disque
label.action.edit.domain=Modifier le domaine
label.action.edit.global.setting=Modifier la configuration globale
-label.action.edit.host=Modifier l\\'h\u00F4te
+label.action.edit.host=Modifier l\\'h\u00f4te
label.action.edit.instance=Modifier l\\'instance
-label.action.edit.network=Modifier le r\u00E9seau
-label.action.edit.network.offering=Modifier l\\'offre de service r\u00E9seau
-label.action.edit.network.processing=Modification du R\u00E9seau...
+label.action.edit.ISO=Modifier l\\'image ISO
+label.action.edit.network=Modifier le r\u00e9seau
+label.action.edit.network.offering=Modifier l\\'offre de service r\u00e9seau
+label.action.edit.network.processing=Modification du R\u00e9seau...
label.action.edit.pod=Modifier le pod
label.action.edit.primary.storage=Modifier le stockage principal
label.action.edit.resource.limits=Modifier les limites de ressources
label.action.edit.service.offering=Modifier l\\'offre de service
-label.action.edit.template=Modifier le mod\u00E8le
+label.action.edit.template=Modifier le mod\u00e8le
label.action.edit.user=Modifier l\\'utilisateur
label.action.edit.zone=Modifier la zone
label.action.enable.account=Activer le compte
@@ -197,7 +165,7 @@ label.action.enable.cluster.processing=Activation du cluster...
label.action.enable.maintenance.mode=Activer le mode maintenance
label.action.enable.maintenance.mode.processing=Activation du mode maintenance...
label.action.enable.nexusVswitch=Activer le Nexus 1000v
-label.action.enable.physical.network=Activer le r\u00E9seau physique
+label.action.enable.physical.network=Activer le r\u00e9seau physique
label.action.enable.pod=Activer le Pod
label.action.enable.pod.processing=Activation du Pod...
label.action.enable.static.NAT=Activer le NAT Statique
@@ -208,74 +176,69 @@ label.action.enable.zone=Activer la zone
label.action.enable.zone.processing=Activation de la zone...
label.action.force.reconnect=Forcer la reconnexion
label.action.force.reconnect.processing=Reconnexion en cours...
-label.action.generate.keys=G\u00E9n\u00E9rer les cl\u00E9s
-label.action.generate.keys.processing=G\u00E9n\u00E9ration des cl\u00E9s...
+label.action.generate.keys=G\u00e9n\u00e9rer les cl\u00e9s
+label.action.generate.keys.processing=G\u00e9n\u00e9ration des cl\u00e9s...
label.action.list.nexusVswitch=Liste des Nexus 1000v
-label.action.lock.account=Verrouiller le compte
label.action.lock.account.processing=Verrouillage du compte...
-label.action.manage.cluster=G\u00E9rer le Cluster
+label.action.lock.account=Verrouiller le compte
+label.action.manage.cluster=G\u00e9rer le Cluster
label.action.manage.cluster.processing=Gestion du cluster...
label.action.migrate.instance=Migrer l\\'instance
label.action.migrate.instance.processing=Migration de l\\'instance...
label.action.migrate.router=Migration routeur
label.action.migrate.router.processing=Migration routeur en cours...
-label.action.migrate.systemvm=Migration VM syst\u00E8me
-label.action.migrate.systemvm.processing=Migration VM syst\u00E8me en cours ...
-label.action.reboot.instance=Red\u00E9marrer l\\'instance
-label.action.reboot.instance.processing=Red\u00E9marrage de l\\'instance...
-label.action.reboot.router=Red\u00E9marrer le routeur
-label.action.reboot.router.processing=Red\u00E9marrage du routeur...
-label.action.reboot.systemvm=Red\u00E9marrer la VM Syst\u00E8me
-label.action.reboot.systemvm.processing=Red\u00E9marrage de la VM Syst\u00E8me...
-label.action.recurring.snapshot=Instantan\u00E9s r\u00E9currents
+label.action.migrate.systemvm=Migration VM syst\u00e8me
+label.action.migrate.systemvm.processing=Migration VM syst\u00e8me en cours ...
+label.action.reboot.instance.processing=Red\u00e9marrage de l\\'instance...
+label.action.reboot.instance=Red\u00e9marrer l\\'instance
+label.action.reboot.router.processing=Red\u00e9marrage du routeur...
+label.action.reboot.router=Red\u00e9marrer le routeur
+label.action.reboot.systemvm.processing=Red\u00e9marrage de la VM Syst\u00e8me...
+label.action.reboot.systemvm=Red\u00e9marrer la VM Syst\u00e8me
+label.action.recurring.snapshot=Instantan\u00e9s r\u00e9currents
label.action.register.iso=Enregistrer ISO
-label.action.register.template=Enregistrer mod\u00E8le
-label.action.release.ip=Lib\u00E9rer l\\'adresse IP
-label.action.release.ip.processing=Lib\u00E9ration de l\\'adresse IP...
-label.action.remove.host=Supprimer l\\'h\u00F4te
-label.action.remove.host.processing=Suppression de l\\'h\u00F4te...
-label.action.reset.password=R\u00E9-initialiser le mot de passe
-label.action.reset.password.processing=R\u00E9-initialisation du mot de passe...
-label.action.resize.volume=Redimensionner Volume
+label.action.register.template=Enregistrer mod\u00e8le
+label.action.release.ip=Lib\u00e9rer l\\'adresse IP
+label.action.release.ip.processing=Lib\u00e9ration de l\\'adresse IP...
+label.action.remove.host.processing=Suppression de l\\'h\u00f4te...
+label.action.remove.host=Supprimer l\\'h\u00f4te
+label.action.reset.password.processing=R\u00e9-initialisation du mot de passe...
+label.action.reset.password=R\u00e9-initialiser le mot de passe
label.action.resize.volume.processing=Redimensionnement en cours...
+label.action.resize.volume=Redimensionner Volume
label.action.resource.limits=Limites de ressources
-label.action.restore.instance=Restaurer l\\'instance
label.action.restore.instance.processing=Restauration de l\\'instance...
-label.action.start.instance=D\u00E9marrer l\\'instance
-label.action.start.instance.processing=D\u00E9marrage de l\\'instance...
-label.action.start.router=D\u00E9marrer le routeur
-label.action.start.router.processing=D\u00E9marrage du routeur...
-label.action.start.systemvm=D\u00E9marrer la VM syst\u00E8me
-label.action.start.systemvm.processing=D\u00E9marrage de la VM syst\u00E8me...
-label.action.stop.instance=Arr\u00EAter l\\'Instance
-label.action.stop.instance.processing=Arr\u00EAt de l\\'Instance...
-label.action.stop.router=Arr\u00EAter le routeur
-label.action.stop.router.processing=Arr\u00EAt du routeur...
-label.action.stop.systemvm=Arr\u00EAter la VM syst\u00E8me
-label.action.stop.systemvm.processing=Arr\u00EAt de la VM syst\u00E8me...
-label.action.take.snapshot=Prendre un instantan\u00E9
-label.action.take.snapshot.processing=Prise de l\\'instantan\u00E9...
-label.action.unmanage.cluster=Ne plus g\u00E9rer le Cluster
-label.action.unmanage.cluster.processing=Arr\u00EAt de la gestion du Cluster
-label.action.update.OS.preference=Mettre \u00E0 jour les pr\u00E9f\u00E9rences d\\'OS
-label.action.update.OS.preference.processing=Mise \u00E0 jour des pr\u00E9f\u00E9rences d\\'OS...
-label.action.update.resource.count=Mettre \u00E0 jour le compteur des ressources
-label.action.update.resource.count.processing=Mise \u00E0 jour du compteur...
+label.action.restore.instance=Restaurer l\\'instance
label.actions=Actions
+label.action.start.instance=D\u00e9marrer l\\'instance
+label.action.start.instance.processing=D\u00e9marrage de l\\'instance...
+label.action.start.router=D\u00e9marrer le routeur
+label.action.start.router.processing=D\u00e9marrage du routeur...
+label.action.start.systemvm=D\u00e9marrer la VM syst\u00e8me
+label.action.start.systemvm.processing=D\u00e9marrage de la VM syst\u00e8me...
+label.action.stop.instance=Arr\u00eater l\\'Instance
+label.action.stop.instance.processing=Arr\u00eat de l\\'Instance...
+label.action.stop.router=Arr\u00eater le routeur
+label.action.stop.router.processing=Arr\u00eat du routeur...
+label.action.stop.systemvm=Arr\u00eater la VM syst\u00e8me
+label.action.stop.systemvm.processing=Arr\u00eat de la VM syst\u00e8me...
+label.action.take.snapshot=Prendre un instantan\u00e9
+label.action.take.snapshot.processing=Prise de l\\'instantan\u00e9...
+label.action.unmanage.cluster=Ne plus g\u00e9rer le Cluster
+label.action.unmanage.cluster.processing=Arr\u00eat de la gestion du Cluster
+label.action.update.OS.preference=Mettre \u00e0 jour les pr\u00e9f\u00e9rences d\\'OS
+label.action.update.OS.preference.processing=Mise \u00e0 jour des pr\u00e9f\u00e9rences d\\'OS...
+label.action.update.resource.count=Mettre \u00e0 jour le compteur des ressources
+label.action.update.resource.count.processing=Mise \u00e0 jour du compteur...
label.activate.project=Activer projet
label.active.sessions=Sessions actives
-label.add=Ajouter
-label.add.ACL=Ajouter r\u00E8gle ACL
-label.add.F5.device=Ajouter un F5
-label.add.NiciraNvp.device=Ajouter un contr\u00F4leur Nvp
-label.add.SRX.device=Ajouter un SRX
-label.add.VM.to.tier=Ajouter une machine virtuelle au tiers
-label.add.VPN.gateway=Ajouter une passerelle VPN
label.add.account=Ajouter un compte
-label.add.account.to.project=Ajouter un compte au projet
label.add.accounts=Ajouter des comptes
label.add.accounts.to=Ajouter des comptes sur
-label.add.by=Ajout\u00E9 par
+label.add.account.to.project=Ajouter un compte au projet
+label.add.ACL=Ajouter r\u00e8gle ACL
+label.add=Ajouter
+label.add.by=Ajout\u00e9 par
label.add.by.cidr=Ajouter par CIDR
label.add.by.group=Ajouter par groupe
label.add.cluster=Ajouter un cluster
@@ -283,308 +246,327 @@ label.add.compute.offering=Ajouter une offre de calcul
label.add.direct.iprange=Ajouter une plage d\\'adresse IP directe
label.add.disk.offering=Ajouter une offre disque
label.add.domain=Ajouter un domaine
-label.add.egress.rule=Ajouter la r\u00E8gle sortante
-label.add.firewall=Ajouter une r\u00E8gle de pare-feu
-label.add.guest.network=Ajouter un r\u00E9seau d\\'invit\u00E9
-label.add.host=Ajouter un h\u00F4te
-label.add.ingress.rule=Ajouter une r\u00E8gle d\\'entr\u00E9e
+label.add.egress.rule=Ajouter la r\u00e8gle sortante
+label.add.F5.device=Ajouter un F5
+label.add.firewall=Ajouter une r\u00e8gle de pare-feu
+label.add.guest.network=Ajouter un r\u00e9seau d\\'invit\u00e9
+label.add.host=Ajouter un h\u00f4te
+label.adding=Ajout
+label.adding.cluster=Ajout du Cluster
+label.adding.failed=\u00c9chec de l\\'ajout
+label.adding.pod=Ajout du Pod
+label.adding.processing=Ajout...
+label.add.ingress.rule=Ajouter une r\u00e8gle d\\'entr\u00e9e
+label.adding.succeeded=Ajout r\u00e9ussi
+label.adding.user=Ajout de l\\'utilisateur
+label.adding.zone=Ajout de la zone
label.add.ip.range=Ajouter une plage IP
-label.add.load.balancer=Ajouter un r\u00E9partiteur de charge
+label.additional.networks=R\u00e9seaux additionnels
+label.add.load.balancer=Ajouter un r\u00e9partiteur de charge
label.add.more=Ajouter plus
label.add.netScaler.device=Ajouter un Netscaler
-label.add.network=Ajouter un r\u00E9seau
-label.add.network.ACL=Ajouter une r\u00E8gle d\\'acc\u00E8s r\u00E9seau ACL
-label.add.network.device=Ajouter un \u00E9quipement r\u00E9seau
-label.add.network.offering=Ajouter une offre r\u00E9seau
+label.add.network.ACL=Ajouter une r\u00e8gle d\\'acc\u00e8s r\u00e9seau ACL
+label.add.network=Ajouter un r\u00e9seau
+label.add.network.device=Ajouter un \u00e9quipement r\u00e9seau
+label.add.network.offering=Ajouter une offre r\u00e9seau
label.add.new.F5=Ajouter un F5
+label.add.new.gateway=Ajouter une nouvelle passerelle
label.add.new.NetScaler=Ajouter un Netscaler
label.add.new.SRX=Ajouter un SRX
-label.add.new.gateway=Ajouter une nouvelle passerelle
label.add.new.tier=Ajouter un nouveau tiers
-label.add.physical.network=Ajouter un r\u00E9seau physique
+label.add.NiciraNvp.device=Ajouter un contr\u00f4leur Nvp
+label.add.physical.network=Ajouter un r\u00e9seau physique
label.add.pod=Ajouter un pod
-label.add.port.forwarding.rule=Ajouter une r\u00E8gle de transfert de port
+label.add.port.forwarding.rule=Ajouter une r\u00e8gle de transfert de port
label.add.primary.storage=Ajouter un stockage principal
label.add.resources=Ajouter ressources
label.add.route=Ajouter route
-label.add.rule=Ajouter r\u00E8gle
+label.add.rule=Ajouter r\u00e8gle
label.add.secondary.storage=Ajouter un stockage secondaire
-label.add.security.group=Ajouter un groupe de s\u00E9curit\u00E9
+label.add.security.group=Ajouter un groupe de s\u00e9curit\u00e9
label.add.service.offering=Ajouter une offre de service
-label.add.static.nat.rule=Ajouter une r\u00E8gle de NAT statique
+label.add.SRX.device=Ajouter un SRX
+label.add.static.nat.rule=Ajouter une r\u00e8gle de NAT statique
label.add.static.route=Ajouter une route statique
-label.add.system.service.offering=Ajouter une offre de service syst\u00E8me
-label.add.template=Ajouter un mod\u00E8le
+label.add.system.service.offering=Ajouter une offre de service syst\u00e8me
+label.add.template=Ajouter un mod\u00e8le
label.add.to.group=Ajouter au groupe
label.add.user=Ajouter un utilisateur
label.add.vlan=Ajouter un VLAN
label.add.vm=Ajouter VM
label.add.vms=Ajouter VMs
-label.add.vms.to.lb=Ajouter une/des VM(s) \u00E0 la r\u00E8gle de r\u00E9partition de charge
+label.add.vms.to.lb=Ajouter une/des VM(s) \u00e0 la r\u00e8gle de r\u00e9partition de charge
+label.add.VM.to.tier=Ajouter une machine virtuelle au tiers
label.add.volume=Ajouter un volume
label.add.vpc=Ajouter un VPC
label.add.vpn.customer.gateway=Ajouter une passerelle VPN cliente
+label.add.VPN.gateway=Ajouter une passerelle VPN
label.add.vpn.user=Ajouter un utilisateur VPN
label.add.zone=Ajouter une zone
-label.adding=Ajout
-label.adding.cluster=Ajout du Cluster
-label.adding.failed=\u00C9chec de l\\'ajout
-label.adding.pod=Ajout du Pod
-label.adding.processing=Ajout...
-label.adding.succeeded=Ajout r\u00E9ussi
-label.adding.user=Ajout de l\\'utilisateur
-label.adding.zone=Ajout de la zone
-label.additional.networks=R\u00E9seaux additionnels
-label.admin=Administrateur
label.admin.accounts=Comptes Administrateur
-label.advanced=Avanc\u00E9
-label.advanced.mode=Mode avanc\u00E9
-label.advanced.search=Recherche avanc\u00E9e
+label.admin=Administrateur
+label.advanced=Avanc\u00e9
+label.advanced.mode=Mode avanc\u00e9
+label.advanced.search=Recherche avanc\u00e9e
label.agent.password=Mot de passe Agent
label.agent.username=Identifiant Agent
label.agree=Accepter
label.alert=Alerte
label.algorithm=Algorithme
-label.allocated=Allou\u00E9
-label.allocation.state=\u00C9tat
-label.api.key=Cl\u00E9 d\\'API
+label.allocated=Allou\u00e9
+label.allocation.state=\u00c9tat
+label.api.key=Cl\u00e9 d\\'API
label.apply=Appliquer
label.assign=Assigner
-label.assign.to.load.balancer=Assigner l\\'instance au r\u00E9partiteur de charge
-label.associated.network=R\u00E9seau associ\u00E9
-label.associated.network.id=ID du r\u00E9seau associ\u00E9
-label.attached.iso=Image ISO attach\u00E9e
-label.availability=Disponibilit\u00E9
-label.availability.zone=Zone de disponibilit\u00E9
+label.assign.to.load.balancer=Assigner l\\'instance au r\u00e9partiteur de charge
+label.associated.network.id=ID du r\u00e9seau associ\u00e9
+label.associated.network=R\u00e9seau associ\u00e9
+label.attached.iso=Image ISO attach\u00e9e
+label.availability=Disponibilit\u00e9
+label.availability.zone=Zone de disponibilit\u00e9
label.available=Disponible
label.available.public.ips=Adresses IP publiques disponibles
label.back=Retour
label.bandwidth=Bande passante
label.basic=Basique
label.basic.mode=Mode basique
-label.bootable=Amor\u00E7able
+label.bootable=Amor\u00e7able
label.broadcast.domain.range=Plage du domaine multi-diffusion
label.broadcast.domain.type=Type de domaine de multi-diffusion
label.broadcast.uri=URI multi-diffusion
label.by.account=Par compte
-label.by.availability=Par disponibilit\u00E9
+label.by.availability=Par disponibilit\u00e9
label.by.domain=Par domaine
label.by.end.date=Par date de fin
label.by.level=Par niveau
label.by.pod=Par Pod
-label.by.role=Par r\u00F4le
-label.by.start.date=Par date de d\u00E9but
-label.by.state=Par \u00E9tat
+label.by.role=Par r\u00f4le
+label.by.start.date=Par date de d\u00e9but
+label.by.state=Par \u00e9tat
+label.bytes.received=Octets re\u00e7us
+label.bytes.sent=Octets envoy\u00e9s
label.by.traffic.type=Par type de trafic
-label.by.type=Par type
label.by.type.id=Par type d\\'ID
+label.by.type=Par type
label.by.zone=Par zone
-label.bytes.received=Octets re\u00E7us
-label.bytes.sent=Octets envoy\u00E9s
label.cancel=Annuler
-label.capacity=Capacit\u00E9
+label.capacity=Capacit\u00e9
label.certificate=Certificat
label.change.service.offering=Modifier l\\'offre de service
label.change.value=Modifier la valeur
-label.character=Caract\u00E8re
-label.checksum=Somme de contr\u00F4le MD5
+label.character=Caract\u00e8re
+label.checksum=Somme de contr\u00f4le MD5
+label.cidr.account=CIDR ou Compte/Groupe de s\u00e9curit\u00e9
label.cidr=CIDR
-label.cidr.account=CIDR ou Compte/Groupe de s\u00E9curit\u00E9
label.cidr.list=CIDR Source
+label.CIDR.list=Liste CIDR
+label.CIDR.of.destination.network=CIDR du r\u00e9seau de destination
label.clean.up=Nettoyage
label.clear.list=Purger la liste
label.close=Fermer
label.cloud.console=Console d\\'Administration du Cloud
-label.cloud.managed=G\u00E9r\u00E9 par Cloud.com
+label.cloud.managed=G\u00e9r\u00e9 par Cloud.com
label.cluster=Cluster
label.cluster.name=Nom du cluster
-label.cluster.type=Type de Cluster
label.clusters=Clusters
+label.cluster.type=Type de Cluster
label.clvm=CLVM
label.code=Code
-label.community=Communaut\u00E9
-label.compute=Processeur
+label.community=Communaut\u00e9
label.compute.and.storage=Calcul et Stockage
label.compute.offering=Offre de calcul
label.compute.offerings=Offres de calcul
+label.compute=Processeur
label.configuration=Configuration
label.configure=Configurer
-label.configure.network.ACLs=Configurer les r\u00E8gles d\\'acc\u00E8s r\u00E9seau ACL
+label.configure.network.ACLs=Configurer les r\u00e8gles d\\'acc\u00e8s r\u00e9seau ACL
label.configure.vpc=Configurer le VPC
-label.confirm.password=Confirmer le mot de passe
label.confirmation=Confirmation
-label.congratulations=F\u00E9licitations \!
+label.confirm.password=Confirmer le mot de passe
+label.congratulations=F\u00e9licitations \!
label.conserve.mode=Conserver le mode
label.console.proxy=Console proxy
-label.continue=Continuer
label.continue.basic.install=Continuer avec l\\'installation basique
-label.corrections.saved=Modifications enregistr\u00E9es
+label.continue=Continuer
+label.corrections.saved=Modifications enregistr\u00e9es
+label.cpu.allocated=CPU allou\u00e9e
+label.cpu.allocated.for.VMs=CPU allou\u00e9e aux VMs
+label.CPU.cap=Limitation CPU
label.cpu=CPU
-label.cpu.allocated=CPU allou\u00E9e
-label.cpu.allocated.for.VMs=CPU allou\u00E9e aux VMs
label.cpu.mhz=CPU (en MHz)
-label.cpu.utilized=CPU utilis\u00E9e
-label.create.VPN.connection=Cr\u00E9er une connexion VPN
-label.create.project=Cr\u00E9er un projet
-label.create.template=Cr\u00E9er un mod\u00E8le
-label.created=Cr\u00E9\u00E9
-label.created.by.system=Cr\u00E9\u00E9 par le syst\u00E8me
+label.cpu.utilized=CPU utilis\u00e9e
+label.created.by.system=Cr\u00e9\u00e9 par le syst\u00e8me
+label.created=Cr\u00e9\u00e9
+label.create.project=Cr\u00e9er un projet
+label.create.template=Cr\u00e9er un mod\u00e8le
+label.create.VPN.connection=Cr\u00e9er une connexion VPN
label.cross.zones=Multi Zones
-label.custom.disk.size=Taille de disque personnalis\u00E9e
+label.custom.disk.size=Taille de disque personnalis\u00e9e
label.daily=Quotidien
-label.data.disk.offering=Offre de disque de donn\u00E9es
+label.data.disk.offering=Offre de disque de donn\u00e9es
label.date=Date
label.day.of.month=Jour du mois
label.day.of.week=Jour de la semaine
-label.dead.peer.detection=D\u00E9tection de pair mort
+label.dead.peer.detection=D\u00e9tection de pair mort
label.decline.invitation=Refuser l\\'invitation
-label.dedicated=D\u00E9di\u00E9
-label.default=Par d\u00E9faut
-label.default.use=Utilisation par d\u00E9faut
-label.default.view=Vue par d\u00E9faut
-label.delete=Supprimer
+label.dedicated=D\u00e9di\u00e9
+label.default=Par d\u00e9faut
+label.default.use=Utilisation par d\u00e9faut
+label.default.view=Vue par d\u00e9faut
label.delete.F5=Supprimer F5
+label.delete.gateway=Supprimer la passerelle
label.delete.NetScaler=Supprimer Netscaler
-label.delete.NiciraNvp=Supprimer un contr\u00F4leur Nvp
+label.delete.NiciraNvp=Supprimer un contr\u00f4leur Nvp
+label.delete.project=Supprimer projet
label.delete.SRX=Supprimer SRX
+label.delete=Supprimer
label.delete.VPN.connection=Supprimer la connexion VPN
label.delete.VPN.customer.gateway=Supprimer la passerelle VPN client
label.delete.VPN.gateway=Supprimer la passerelle VPN
-label.delete.gateway=Supprimer la passerelle
-label.delete.project=Supprimer projet
label.delete.vpn.user=Supprimer l\\'utilisateur VPN
-label.deleting.failed=Suppression \u00E9chou\u00E9e
+label.deleting.failed=Suppression \u00e9chou\u00e9e
label.deleting.processing=Suppression...
label.description=Description
-label.destination.physical.network.id=Identifiant du r\u00E9seau physique de destination
+label.destination.physical.network.id=Identifiant du r\u00e9seau physique de destination
label.destination.zone=Zone de destination
-label.destroy=D\u00E9truire
+label.destroy=D\u00e9truire
label.destroy.router=Supprimer le routeur
-label.detaching.disk=D\u00E9tacher le disque
-label.details=D\u00E9tails
-label.device.id=ID du p\u00E9riph\u00E9rique
+label.detaching.disk=D\u00e9tacher le disque
+label.details=D\u00e9tails
+label.device.id=ID du p\u00e9riph\u00e9rique
label.devices=Machines
label.dhcp=DHCP
-label.direct.ips=Adresses IP du r\u00E9seau partag\u00E9
-label.disable.provider=D\u00E9sactiver ce fournisseur
-label.disable.vpn=D\u00E9sactiver le VPN
-label.disabled=D\u00E9sactiv\u00E9
-label.disabling.vpn.access=D\u00E9sactiver l\\'acc\u00E8s VPN
-label.disk.allocated=Disque Allou\u00E9
+label.DHCP.server.type=Serveur DHCP
+label.direct.ips=Adresses IP du r\u00e9seau partag\u00e9
+label.disabled=D\u00e9sactiv\u00e9
+label.disable.provider=D\u00e9sactiver ce fournisseur
+label.disable.vpn=D\u00e9sactiver le VPN
+label.disabling.vpn.access=D\u00e9sactiver l\\'acc\u00e8s VPN
+label.disk.allocated=Disque Allou\u00e9
label.disk.offering=Offre de Disque
-label.disk.size=Taille du disque
label.disk.size.gb=Taille du disque (en Go)
+label.disk.size=Taille du disque
label.disk.total=Espace disque total
label.disk.volume=Volume disque
label.display.name=Nom commun
-label.display.text=Texte affich\u00E9
-label.dns=DNS
+label.display.text=Texte affich\u00e9
label.dns.1=DNS 1
label.dns.2=DNS 2
-label.domain=Domaine
+label.dns=DNS
+label.DNS.domain.for.guest.networks=Domaine DNS pour les r\u00e9seaux invit\u00e9s
label.domain.admin=Administrateur du domaine
+label.domain=Domaine
label.domain.id=ID du domaine
label.domain.name=Nom de domaine
label.domain.router=Routeur du domaine
label.domain.suffix=Suffixe de domaine DNS (i.e., xyz.com)
-label.done=Termin\u00E9
-label.double.quotes.are.not.allowed=Les guillemets ne sont pas autoris\u00E9es
-label.download.progress=Progression du t\u00E9l\u00E9chargement
-label.drag.new.position=D\u00E9placer sur une autre position
+label.done=Termin\u00e9
+label.double.quotes.are.not.allowed=Les guillemets ne sont pas autoris\u00e9es
+label.download.progress=Progression du t\u00e9l\u00e9chargement
+label.drag.new.position=D\u00e9placer sur une autre position
+label.edit.lb.rule=Modifier la r\u00e8gle LB
label.edit=Modifier
-label.edit.lb.rule=Modifier la r\u00E8gle LB
-label.edit.network.details=Modifier les param\u00E8tres r\u00E9seau
-label.edit.project.details=Modifier les d\u00E9tails du projet
+label.edit.network.details=Modifier les param\u00e8tres r\u00e9seau
+label.edit.project.details=Modifier les d\u00e9tails du projet
label.edit.tags=Modifier les balises
label.edit.traffic.type=Modifier le type de trafic
label.edit.vpc=Modifier le VPC
-label.egress.rule=R\u00E8gle sortante
-label.egress.rules=R\u00E8gles de sortie
-label.elastic=\u00C9lastique
+label.egress.rule=R\u00e8gle sortante
+label.egress.rules=R\u00e8gles de sortie
label.elastic.IP=IP extensible
-label.elastic.LB=R\u00E9partition de charge extensible
+label.elastic.LB=R\u00e9partition de charge extensible
+label.elastic=\u00c9lastique
label.email=Email
label.enable.provider=Activer le fournisseur
label.enable.s3=Activer le stockage secondaire de type S3
label.enable.swift=Activer Swift
label.enable.vpn=Activer VPN
+label.enabling.vpn.access=Activation de l\\'acc\u00e8s VPN
label.enabling.vpn=Activation du VPN
-label.enabling.vpn.access=Activation de l\\'acc\u00E8s VPN
label.end.IP=Fin de plage IP
+label.endpoint.or.operation=Terminaison ou Op\u00e9ration
label.end.port=Port de fin
-label.end.reserved.system.IP=Adresse IP de fin r\u00E9serv\u00E9e Syst\u00E8me
+label.end.reserved.system.IP=Adresse IP de fin r\u00e9serv\u00e9e Syst\u00e8me
label.end.vlan=VLAN de fin
-label.endpoint.or.operation=Terminaison ou Op\u00E9ration
label.enter.token=Entrez le jeton unique
-label.error=Erreur
label.error.code=Code d\\'erreur
-label.esx.host=H\u00F4te ESX/ESXi
+label.error=Erreur
+label.ESP.encryption=Chiffrement ESP
+label.ESP.hash=Empreinte ESP
+label.ESP.lifetime=Dur\u00e9e de vie ESP (secondes)
+label.ESP.policy=Mode ESP
+label.esx.host=H\u00f4te ESX/ESXi
label.example=Exemple
label.f5=F5
-label.failed=\u00C9chou\u00E9
-label.featured=Sponsoris\u00E9
-label.fetch.latest=Rafra\u00EEchir
+label.failed=\u00c9chou\u00e9
+label.featured=Sponsoris\u00e9
+label.fetch.latest=Rafra\u00eechir
label.filterBy=Filtre
label.firewall=Pare-feu
-label.first.name=Pr\u00E9nom
+label.first.name=Pr\u00e9nom
label.format=Format
label.friday=Vendredi
label.full=Complet
label.full.path=Chemin complet
label.gateway=Passerelle
-label.general.alerts=Alertes g\u00E9n\u00E9rales
-label.generating.url=G\u00E9n\u00E9ration de l\\'URL
-label.go.step.2=Aller \u00E0 l\\'\u00E9tape 2
-label.go.step.3=Aller \u00E0 l\\'\u00E9tape 3
-label.go.step.4=Aller \u00E0 l\\'\u00E9tape 4
-label.go.step.5=Aller \u00E0 l\\'\u00E9tape 5
+label.general.alerts=Alertes g\u00e9n\u00e9rales
+label.generating.url=G\u00e9n\u00e9ration de l\\'URL
+label.go.step.2=Aller \u00e0 l\\'\u00e9tape 2
+label.go.step.3=Aller \u00e0 l\\'\u00e9tape 3
+label.go.step.4=Aller \u00e0 l\\'\u00e9tape 4
+label.go.step.5=Aller \u00e0 l\\'\u00e9tape 5
label.group=Groupe
label.group.optional=Groupe (optionnel)
-label.guest=Invit\u00E9
-label.guest.cidr=CIDR invit\u00E9
-label.guest.end.ip=Adresse IP de fin pour les invit\u00E9s
-label.guest.gateway=Passerelle pour les invit\u00E9s
-label.guest.ip=Adresse IP des invit\u00E9s
-label.guest.ip.range=Plage d\\'adresses IP des invit\u00E9s
-label.guest.netmask=Masque de r\u00E9seau des invit\u00E9s
-label.guest.networks=R\u00E9seaux d\\'invit\u00E9
-label.guest.start.ip=Adresse IP de d\u00E9but pour les invit\u00E9s
-label.guest.traffic=Trafic invit\u00E9
-label.guest.type=Type d\\'invit\u00E9
-label.ha.enabled=Haute disponibilit\u00E9 activ\u00E9e
+label.guest.cidr=CIDR invit\u00e9
+label.guest.end.ip=Adresse IP de fin pour les invit\u00e9s
+label.guest.gateway=Passerelle pour les invit\u00e9s
+label.guest=Invit\u00e9
+label.guest.ip=Adresse IP des invit\u00e9s
+label.guest.ip.range=Plage d\\'adresses IP des invit\u00e9s
+label.guest.netmask=Masque de r\u00e9seau des invit\u00e9s
+label.guest.networks=R\u00e9seaux d\\'invit\u00e9
+label.guest.start.ip=Adresse IP de d\u00e9but pour les invit\u00e9s
+label.guest.traffic=Trafic invit\u00e9
+label.guest.type=Type d\\'invit\u00e9
+label.ha.enabled=Haute disponibilit\u00e9 activ\u00e9e
label.help=Aide
-label.hide.ingress.rule=Cacher la r\u00E8gle d\\'entr\u00E9e
+label.hide.ingress.rule=Cacher la r\u00e8gle d\\'entr\u00e9e
label.hints=Astuces
-label.host=H\u00F4te
-label.host.MAC=Adresse MAC h\u00F4te
-label.host.alerts=Alertes des h\u00F4tes
-label.host.name=Nom d\\'h\u00F4te
-label.host.tags=\u00C9tiquettes d\\'h\u00F4te
-label.hosts=H\u00F4tes
+label.host.alerts=Alertes des h\u00f4tes
+label.host=H\u00f4te
+label.host.MAC=Adresse MAC h\u00f4te
+label.host.name=Nom d\\'h\u00f4te
+label.hosts=H\u00f4tes
+label.host.tags=\u00c9tiquettes d\\'h\u00f4te
label.hourly=Chaque heure
-label.hypervisor=Hyperviseur
label.hypervisor.capabilities=Fonctions hyperviseur
+label.hypervisor=Hyperviseur
label.hypervisor.type=Type d\\'hyperviseur
label.hypervisor.version=Version hyperviseur
label.id=ID
+label.IKE.DH=DH IKE
+label.IKE.encryption=Chiffrement IKE
+label.IKE.hash=Empreinte IKE
+label.IKE.lifetime=Dur\u00e9e de vie IKE (secondes)
+label.IKE.policy=Mode IKE
label.info=Information
-label.ingress.rule=R\u00E8gle d\\'entr\u00E9e
-label.initiated.by=Initi\u00E9 par
+label.ingress.rule=R\u00e8gle d\\'entr\u00e9e
+label.initiated.by=Initi\u00e9 par
label.installWizard.addClusterIntro.subtitle=Qu\\'est ce qu\\'un cluster ?
label.installWizard.addClusterIntro.title=Ajoutons un cluster
-label.installWizard.addHostIntro.subtitle=Qu\\'est ce qu\\'un h\u00F4te ?
-label.installWizard.addHostIntro.title=Ajoutons un h\u00F4te
+label.installWizard.addHostIntro.subtitle=Qu\\'est ce qu\\'un h\u00f4te ?
+label.installWizard.addHostIntro.title=Ajoutons un h\u00f4te
label.installWizard.addPodIntro.subtitle=Qu\\'est ce qu\\'un pod ?
label.installWizard.addPodIntro.title=Ajoutons un pod
label.installWizard.addPrimaryStorageIntro.subtitle=Qu\\'est ce que le stockage principal ?
label.installWizard.addPrimaryStorageIntro.title=Ajoutons du stockage principal
label.installWizard.addSecondaryStorageIntro.subtitle=Qu\\'est ce que le stockage secondaire ?
label.installWizard.addSecondaryStorageIntro.title=Ajoutons du stockage secondaire
-label.installWizard.addZone.title=Ajouter une zone
label.installWizard.addZoneIntro.subtitle=Qu\\'est ce qu\\'une zone ?
label.installWizard.addZoneIntro.title=Ajoutons une zone
-label.installWizard.click.launch=Appuyer sur le bouton d\u00E9marrer.
-label.installWizard.subtitle=Ce tutoriel vous aidera \u00E0 configurer votre installation CloudStack&\#8482;
+label.installWizard.addZone.title=Ajouter une zone
+label.installWizard.click.launch=Appuyer sur le bouton d\u00e9marrer.
+label.installWizard.subtitle=Ce tutoriel vous aidera \u00e0 configurer votre installation CloudStack&\#8482;
label.installWizard.title=Bonjour et bienvenue dans CloudStack&\#8482;
label.instance=Instance
label.instance.limits=Limites des instances
@@ -594,105 +576,108 @@ label.internal.dns.1=DNS interne 1
label.internal.dns.2=DNS interne 2
label.internal.name=Nom interne
label.interval.type=Type d\\'intervalle
-label.introduction.to.cloudstack=Introduction \u00E0 CloudStack&\#8482;
+label.introduction.to.cloudstack=Introduction \u00e0 CloudStack&\#8482;
label.invalid.integer=Nombre entier invalide
label.invalid.number=Nombre invalide
label.invitations=Invitations
+label.invited.accounts=Comptes invit\u00e9s
label.invite=Inviter
label.invite.to=Inviter sur
-label.invited.accounts=Comptes invit\u00E9s
-label.ip=IP
label.ip.address=Adresse IP
+label.ipaddress=Adresse IP
label.ip.allocations=Allocations de IPs
+label.ip=IP
label.ip.limits=Limite de IPs publiques
label.ip.or.fqdn=IP ou FQDN
label.ip.range=Plage IP
label.ip.ranges=Plages IP
-label.ipaddress=Adresse IP
+label.IPsec.preshared.key=Cl\u00e9 partag\u00e9e IPsec
label.ips=IPs
-label.is.default=Est par d\u00E9faut
-label.is.redundant.router=Redondant
-label.is.shared=Est partag\u00E9
-label.is.system=Est Syst\u00E8me
label.iscsi=iSCSI
+label.is.default=Est par d\u00e9faut
+label.iso.boot=D\u00e9marrage par ISO
label.iso=ISO
-label.iso.boot=D\u00E9marrage par ISO
-label.isolated.networks=R\u00E9seaux isol\u00E9s
-label.isolation.method=M\u00E9thode de s\u00E9paration
+label.isolated.networks=R\u00e9seaux isol\u00e9s
+label.isolation.method=M\u00e9thode de s\u00e9paration
label.isolation.mode=Mode d\\'isolation
label.isolation.uri=URI d\\'isolation
-label.item.listing=Liste des \u00E9l\u00E9ments
+label.is.redundant.router=Redondant
+label.is.shared=Est partag\u00e9
+label.is.system=Est Syst\u00e8me
+label.item.listing=Liste des \u00e9l\u00e9ments
label.keep=Conserver
-label.key=Clef
label.keyboard.type=Type de clavier
-label.kvm.traffic.label=Libell\u00E9 pour le trafic KVM
-label.label=Libell\u00E9
-label.lang.brportugese=Portuguais Br\u00E9sil
+label.key=Clef
+label.kvm.traffic.label=Libell\u00e9 pour le trafic KVM
+label.label=Libell\u00e9
+label.lang.brportugese=Portuguais Br\u00e9sil
label.lang.catalan=Catalan
-label.lang.chinese=Chinois (simplifi\u00E9)
+label.lang.chinese=Chinois (simplifi\u00e9)
label.lang.english=Anglais
-label.lang.french=Fran\u00E7ais
+label.lang.french=Fran\u00e7ais
label.lang.german=Allemand
label.lang.italian=Italien
label.lang.japanese=Japonais
-label.lang.korean=Cor\u00E9en
-label.lang.norwegian=Norv\u00E9gien
+label.lang.korean=Cor\u00e9en
+label.lang.norwegian=Norv\u00e9gien
label.lang.russian=Russe
label.lang.spanish=Espagnol
-label.last.disconnected=Derni\u00E8re D\u00E9connexion
+label.last.disconnected=Derni\u00e8re D\u00e9connexion
label.last.name=Nom
-label.latest.events=Derniers \u00E9v\u00E9nements
-label.launch=D\u00E9marrer
-label.launch.vm=D\u00E9marrer VM
-label.launch.zone=D\u00E9marrer la zone
+label.latest.events=Derniers \u00e9v\u00e9nements
+label.launch=D\u00e9marrer
+label.launch.vm=D\u00e9marrer VM
+label.launch.zone=D\u00e9marrer la zone
+label.LB.isolation=R\u00e9partition de charge isol\u00e9e
label.least.connections=Le moins de connexions
label.level=Niveau
label.linklocal.ip=Adresse IP de lien local
-label.load.balancer=R\u00E9partiteur de charge
-label.load.balancing=R\u00E9partition de charge
-label.load.balancing.policies=R\u00E8gles de r\u00E9partition de charge
+label.load.balancer=R\u00e9partiteur de charge
+label.load.balancing.policies=R\u00e8gles de r\u00e9partition de charge
+label.load.balancing=R\u00e9partition de charge
label.loading=Chargement en cours
label.local=Local
+label.local.storage.enabled=Stockage local activ\u00e9
label.local.storage=Stockage local
-label.local.storage.enabled=Stockage local activ\u00E9
label.login=Connexion
-label.logout=D\u00E9connexion
+label.logout=D\u00e9connexion
label.lun=LUN
-label.make.project.owner=Devenir propri\u00E9taire du projet
-label.manage=G\u00E9r\u00E9
-label.manage.resources=G\u00E9rer les ressources
+label.LUN.number=N\u00b0 LUN
+label.make.project.owner=Devenir propri\u00e9taire du projet
+label.manage=G\u00e9r\u00e9
label.management=Administration
label.management.ips=Adresses IP de gestion
-label.max.guest.limit=Nombre maximum d\\'invit\u00E9s
-label.max.networks=R\u00E9seaux Max.
+label.manage.resources=G\u00e9rer les ressources
+label.max.guest.limit=Nombre maximum d\\'invit\u00e9s
+label.maximum=Maximum
+label.max.networks=R\u00e9seaux Max.
label.max.public.ips=Max. IP publiques
-label.max.snapshots=Max instantan\u00E9es
-label.max.templates=Max. mod\u00E8les
+label.max.snapshots=Max instantan\u00e9es
+label.max.templates=Max. mod\u00e8les
label.max.vms=Max. VMs utilisateur
label.max.volumes=Max. volumes
label.max.vpcs=Max. VPCs
-label.maximum=Maximum
label.may.continue=Vous pouvez continuer.
-label.memory=M\u00E9moire (en Mo)
-label.memory.allocated=M\u00E9moire allou\u00E9e
-label.memory.mb=M\u00E9moire (en MB)
-label.memory.total=M\u00E9moire totale
-label.memory.used=M\u00E9moire utilis\u00E9e
+label.memory.allocated=M\u00e9moire allou\u00e9e
+label.memory.mb=M\u00e9moire (en MB)
+label.memory=M\u00e9moire (en Mo)
+label.memory.total=M\u00e9moire totale
+label.memory.used=M\u00e9moire utilis\u00e9e
label.menu.accounts=Comptes
label.menu.alerts=Alertes
label.menu.all.accounts=Tous les comptes
label.menu.all.instances=Toutes les instances
-label.menu.community.isos=ISO de la communaut\u00E9
-label.menu.community.templates=Mod\u00E8les de la communaut\u00E9
+label.menu.community.isos=ISO de la communaut\u00e9
+label.menu.community.templates=Mod\u00e8les de la communaut\u00e9
label.menu.configuration=Configuration
label.menu.dashboard=Tableau de bord
-label.menu.destroyed.instances=Instances d\u00E9truites
+label.menu.destroyed.instances=Instances d\u00e9truites
label.menu.disk.offerings=Offres de disque
label.menu.domains=Domaines
-label.menu.events=\u00C9v\u00E9nements
-label.menu.featured.isos=ISOs Sponsoris\u00E9es
-label.menu.featured.templates=Mod\u00E8les sponsoris\u00E9s
-label.menu.global.settings=Param\u00E8tres globaux
+label.menu.events=\u00c9v\u00e9nements
+label.menu.featured.isos=ISOs Sponsoris\u00e9es
+label.menu.featured.templates=Mod\u00e8les sponsoris\u00e9s
+label.menu.global.settings=Param\u00e8tres globaux
label.menu.infrastructure=Infrastructure
label.menu.instances=Instances
label.menu.ipaddresses=Adresses IP
@@ -700,72 +685,72 @@ label.menu.isos=ISOs
label.menu.my.accounts=Mes comptes
label.menu.my.instances=Mes instances
label.menu.my.isos=Mes ISOs
-label.menu.my.templates=Mes mod\u00E8les
-label.menu.network=R\u00E9seau
-label.menu.network.offerings=Offres de Service R\u00E9seau
+label.menu.my.templates=Mes mod\u00e8les
+label.menu.network.offerings=Offres de Service R\u00e9seau
+label.menu.network=R\u00e9seau
label.menu.physical.resources=Ressources physiques
label.menu.running.instances=Instances actives
-label.menu.security.groups=Groupes de s\u00E9curit\u00E9
+label.menu.security.groups=Groupes de s\u00e9curit\u00e9
label.menu.service.offerings=Offres de Service
-label.menu.snapshots=Instantan\u00E9s
-label.menu.stopped.instances=Instances Arr\u00EAt\u00E9es
+label.menu.snapshots=Instantan\u00e9s
+label.menu.stopped.instances=Instances Arr\u00eat\u00e9es
label.menu.storage=Stockage
-label.menu.system=Syst\u00E8me
-label.menu.system.service.offerings=Offres syst\u00E8me
-label.menu.system.vms=\ VMs Syst\u00E8mes
-label.menu.templates=Mod\u00E8les
+label.menu.system.service.offerings=Offres syst\u00e8me
+label.menu.system=Syst\u00e8me
+label.menu.system.vms=\ VMs Syst\u00e8mes
+label.menu.templates=Mod\u00e8les
label.menu.virtual.appliances=Appliances Virtuelles
label.menu.virtual.resources=Ressources Virtuelles
label.menu.volumes=Volumes
+label.migrate.instance.to.host=Migration de l\\'instance sur un autre h\u00f4te
label.migrate.instance.to=Migrer l\\'instance vers
-label.migrate.instance.to.host=Migration de l\\'instance sur un autre h\u00F4te
label.migrate.instance.to.ps=Migration de l\\'instance sur un autre stockage principal
label.migrate.router.to=Migrer le routeur vers
-label.migrate.systemvm.to=Migrer la VM syst\u00E8me vers
-label.migrate.to.host=Migrer vers un h\u00F4te
+label.migrate.systemvm.to=Migrer la VM syst\u00e8me vers
+label.migrate.to.host=Migrer vers un h\u00f4te
label.migrate.to.storage=Migrer vers un stockage
label.migrate.volume=Migration du volume vers un autre stockage principal
label.minimum=Minimum
label.minute.past.hour=minute(s)
label.monday=Lundi
label.monthly=Mensuel
-label.more.templates=Plus de mod\u00E8les
+label.more.templates=Plus de mod\u00e8les
label.move.down.row=Descendre d\\'un cran
-label.move.to.bottom=D\u00E9placer en bas
+label.move.to.bottom=D\u00e9placer en bas
label.move.to.top=Placer au dessus
label.move.up.row=Monter d\\'un cran
label.my.account=Mon compte
-label.my.network=Mon r\u00E9seau
-label.my.templates=Mes mod\u00E8les
+label.my.network=Mon r\u00e9seau
+label.my.templates=Mes mod\u00e8les
label.name=Nom
label.name.optional=Nom (optionnel)
label.nat.port.range=Plage de port NAT
+label.netmask=Masque de r\u00e9seau
label.netScaler=NetScaler
-label.netmask=Masque de r\u00E9seau
-label.network=R\u00E9seau
-label.network.ACL=R\u00E8gles d\\'acc\u00E8s r\u00E9seau ACL
-label.network.ACL.total=Total R\u00E8gles d\\'acc\u00E8s r\u00E9seau
-label.network.ACLs=R\u00E8gles d\\'acc\u00E8s r\u00E9seau
-label.network.desc=Description r\u00E9seau
-label.network.device=\u00C9quipement R\u00E9seau
-label.network.device.type=Type d\\'\u00E9quipement r\u00E9seau
+label.network.ACL=R\u00e8gles d\\'acc\u00e8s r\u00e9seau ACL
+label.network.ACLs=R\u00e8gles d\\'acc\u00e8s r\u00e9seau
+label.network.ACL.total=Total R\u00e8gles d\\'acc\u00e8s r\u00e9seau
+label.network.desc=Description r\u00e9seau
+label.network.device.type=Type d\\'\u00e9quipement r\u00e9seau
+label.network.device=\u00c9quipement R\u00e9seau
label.network.domain=Nom de domaine
-label.network.domain.text=Domaine r\u00E9seau
-label.network.id=ID r\u00E9seau
-label.network.label.display.for.blank.value=Utiliser la passerelle par d\u00E9faut
-label.network.name=Nom du r\u00E9seau
-label.network.offering=Offre de Service R\u00E9seau
-label.network.offering.display.text=Texte affich\u00E9 d\\'Offre de R\u00E9seau
-label.network.offering.id=ID de l\\'Offre de Service R\u00E9seau
-label.network.offering.name=Nom de l\\'Offre de Service R\u00E9seau
-label.network.rate=D\u00E9bit R\u00E9seau
-label.network.rate.megabytes=D\u00E9bit r\u00E9seau (Mo/s)
-label.network.read=Lecture r\u00E9seau
-label.network.service.providers=Fournisseurs de service r\u00E9seau
-label.network.type=Type de r\u00E9seau
-label.network.write=\u00C9criture r\u00E9seau
-label.networking.and.security=R\u00E9seau et s\u00E9curit\u00E9
-label.networks=R\u00E9seaux
+label.network.domain.text=Domaine r\u00e9seau
+label.network.id=ID r\u00e9seau
+label.networking.and.security=R\u00e9seau et s\u00e9curit\u00e9
+label.network.label.display.for.blank.value=Utiliser la passerelle par d\u00e9faut
+label.network.name=Nom du r\u00e9seau
+label.network.offering.display.text=Texte affich\u00e9 d\\'Offre de R\u00e9seau
+label.network.offering.id=ID de l\\'Offre de Service R\u00e9seau
+label.network.offering.name=Nom de l\\'Offre de Service R\u00e9seau
+label.network.offering=Offre de Service R\u00e9seau
+label.network.rate=D\u00e9bit R\u00e9seau
+label.network.rate.megabytes=D\u00e9bit r\u00e9seau (Mo/s)
+label.network.read=Lecture r\u00e9seau
+label.network=R\u00e9seau
+label.network.service.providers=Fournisseurs de service r\u00e9seau
+label.networks=R\u00e9seaux
+label.network.type=Type de r\u00e9seau
+label.network.write=\u00c9criture r\u00e9seau
label.new=Nouveau
label.new.password=Nouveau mot de passe
label.new.project=Nouveau projet
@@ -775,220 +760,228 @@ label.nexusVswitch=Nexus 1000v
label.nfs=NFS
label.nfs.server=Serveur NFS
label.nfs.storage=Stockage NFS
-label.nic.adapter.type=Type de carte r\u00E9seau
-label.nicira.controller.address=Adresse du contr\u00F4leur
+label.nic.adapter.type=Type de carte r\u00e9seau
+label.nicira.controller.address=Adresse du contr\u00f4leur
label.nicira.l3gatewayserviceuuid=Uuid du service passerelle L3
label.nicira.transportzoneuuid=Uuid de la Zone Transport
label.nics=Cartes NIC
-label.no=Non
label.no.actions=Aucune action disponible
-label.no.alerts=Aucune alerte r\u00E9cente
-label.no.data=Aucune donn\u00E9e
-label.no.errors=Aucune erreur r\u00E9cente
+label.no.alerts=Aucune alerte r\u00e9cente
+label.no.data=Aucune donn\u00e9e
+label.no.errors=Aucune erreur r\u00e9cente
label.no.isos=Aucun ISOs disponible
-label.no.items=Aucun \u00E9l\u00E9ment disponible
-label.no.security.groups=Aucun groupe de s\u00E9curit\u00E9 disponible
-label.no.thanks=Non merci
+label.no.items=Aucun \u00e9l\u00e9ment disponible
label.none=Aucun
+label.no=Non
+label.no.security.groups=Aucun groupe de s\u00e9curit\u00e9 disponible
label.not.found=Introuvable
+label.no.thanks=Non merci
label.notifications=Messages
-label.num.cpu.cores=Nombre de c\u0153urs
label.number.of.clusters=Nombre de clusters
-label.number.of.hosts=Nombre d\\'H\u00F4tes
+label.number.of.hosts=Nombre d\\'H\u00f4tes
label.number.of.pods=Nombre de Pods
-label.number.of.system.vms=Nombre de VM Syst\u00E8me
+label.number.of.system.vms=Nombre de VM Syst\u00e8me
label.number.of.virtual.routers=Nombre de routeurs virtuels
label.number.of.zones=Nombre de zones
+label.num.cpu.cores=Nombre de c\u0153urs
label.numretries=Nombre de tentatives
label.ocfs2=OCFS2
-label.offer.ha=Offrir la haute disponibilit\u00E9
+label.offer.ha=Offrir la haute disponibilit\u00e9
label.ok=OK
label.optional=Facultatif
label.order=Ordre
-label.os.preference=Pr\u00E9f\u00E9rence OS
+label.os.preference=Pr\u00e9f\u00e9rence OS
label.os.type=Type du OS
-label.owned.public.ips=Adresses IP Publiques d\u00E9tenues
-label.owner.account=Propri\u00E9taire
-label.owner.domain=Propri\u00E9taire
+label.owned.public.ips=Adresses IP Publiques d\u00e9tenues
+label.owner.account=Propri\u00e9taire
+label.owner.domain=Propri\u00e9taire
label.parent.domain=Parent du Domaine
+label.password.enabled=Mot de passe activ\u00e9
label.password=Mot de passe
-label.password.enabled=Mot de passe activ\u00E9
label.path=Chemin
-label.perfect.forward.secrecy=Confidentialit\u00E9 persistante
-label.physical.network=R\u00E9seau physique
-label.physical.network.ID=Identifiant du r\u00E9seau physique
+label.perfect.forward.secrecy=Confidentialit\u00e9 persistante
+label.physical.network.ID=Identifiant du r\u00e9seau physique
+label.physical.network=R\u00e9seau physique
+label.PING.CIFS.password=Mot de passe CIFS PING
+label.PING.CIFS.username=Identifiant CIFS PING
+label.PING.dir=R\u00e9pertoire PING
+label.PING.storage.IP=IP stockage PING
label.please.specify.netscaler.info=Renseigner les informations sur le Netscaler
label.please.wait=Patientez s\\'il vous plait
-label.pod=Pod
label.pod.name=Nom du pod
+label.pod=Pod
label.pods=Pods
+label.port.forwarding.policies=R\u00e8gles de transfert de port
label.port.forwarding=Redirection de port
-label.port.forwarding.policies=R\u00E8gles de transfert de port
label.port.range=Plage de ports
-label.prev=Pr\u00E9c\u00E9dent
+label.PreSetup=PreSetup
label.previous=Retour
-label.primary.allocated=Stockage principal allou\u00E9
-label.primary.network=R\u00E9seau principal
-label.primary.storage=Premier stockage
+label.prev=Pr\u00e9c\u00e9dent
+label.primary.allocated=Stockage principal allou\u00e9
+label.primary.network=R\u00e9seau principal
label.primary.storage.count=Groupes de stockage principal
-label.primary.used=Stockage principal utilis\u00E9
-label.private.Gateway=Passerelle priv\u00E9e
-label.private.interface=Interface priv\u00E9e
-label.private.ip=Adresse IP Priv\u00E9e
-label.private.ip.range=Plage d\\'adresses IP Priv\u00E9es
-label.private.ips=Adresses IP Priv\u00E9es
-label.private.network=R\u00E9seau priv\u00E9
-label.private.port=Port priv\u00E9
-label.private.zone=Zone Priv\u00E9e
-label.privatekey=Cl\u00E9 priv\u00E9e PKCS\#8
-label.project=Projet
+label.primary.storage=Premier stockage
+label.primary.used=Stockage principal utilis\u00e9
+label.private.Gateway=Passerelle priv\u00e9e
+label.private.interface=Interface priv\u00e9e
+label.private.ip=Adresse IP Priv\u00e9e
+label.private.ip.range=Plage d\\'adresses IP Priv\u00e9es
+label.private.ips=Adresses IP Priv\u00e9es
+label.privatekey=Cl\u00e9 priv\u00e9e PKCS\#8
+label.private.network=R\u00e9seau priv\u00e9
+label.private.port=Port priv\u00e9
+label.private.zone=Zone Priv\u00e9e
label.project.dashboard=Tableau de bord projet
label.project.id=ID projet
label.project.invite=Inviter sur le projet
label.project.name=Nom du projet
-label.project.view=Vue projet
+label.project=Projet
label.projects=Projets
+label.project.view=Vue projet
label.protocol=Protocole
label.providers=Fournisseurs
-label.public=Publique
label.public.interface=Interface publique
label.public.ip=Adresse IP publique
label.public.ips=Adresses IP publiques
-label.public.network=R\u00E9seau public
+label.public.network=R\u00e9seau public
label.public.port=Port public
+label.public=Publique
label.public.traffic=Trafic public
label.public.zone=Zone publique
-label.purpose=R\u00F4le
-label.quickview=Aper\u00E7u
-label.reboot=Red\u00E9marrer
-label.recent.errors=Erreurs r\u00E9centes
-label.redundant.router=Routeur redondant
+label.purpose=R\u00f4le
+label.Pxe.server.type=Serveur PXE
+label.quickview=Aper\u00e7u
+label.reboot=Red\u00e9marrer
+label.recent.errors=Erreurs r\u00e9centes
label.redundant.router.capability=Router redondant
-label.redundant.state=\u00C9tat de la redondance
+label.redundant.router=Routeur redondant
+label.redundant.state=\u00c9tat de la redondance
label.refresh=Actualiser
label.related=Connexes
label.remind.later=Rappeler moi plus tard
-label.remove.ACL=Supprimer une r\u00E8gle ACL
-label.remove.egress.rule=Supprimer la r\u00E8gle sortante
-label.remove.from.load.balancer=Supprimer l\\'instance du r\u00E9partiteur de charge
-label.remove.ingress.rule=Supprimer la r\u00E8gle entrante
+label.remove.ACL=Supprimer une r\u00e8gle ACL
+label.remove.egress.rule=Supprimer la r\u00e8gle sortante
+label.remove.from.load.balancer=Supprimer l\\'instance du r\u00e9partiteur de charge
+label.remove.ingress.rule=Supprimer la r\u00e8gle entrante
label.remove.ip.range=Supprimer la plage IP
-label.remove.pf=Supprimer la r\u00E8gle de transfert de port
+label.remove.pf=Supprimer la r\u00e8gle de transfert de port
label.remove.project.account=Supprimer le compte projet
-label.remove.rule=Supprimer la r\u00E8gle
+label.remove.rule=Supprimer la r\u00e8gle
label.remove.static.nat.rule=Supprimer le NAT statique
label.remove.static.route=Supprimer une route statique
label.remove.tier=Supprimer le tiers
-label.remove.vm.from.lb=Supprimer la VM de la r\u00E8gle de r\u00E9partition de charge
+label.remove.vm.from.lb=Supprimer la VM de la r\u00e8gle de r\u00e9partition de charge
label.remove.vpc=Supprimer le VPC
label.removing=Suppression
label.removing.user=Retrait de l\\'utilisateur
label.required=Requis
-label.reserved.system.gateway=Passerelle r\u00E9serv\u00E9e Syst\u00E8me
-label.reserved.system.ip=Adresse IP Syst\u00E8me r\u00E9serv\u00E9e
-label.reserved.system.netmask=Masque de sous-r\u00E9seau r\u00E9serv\u00E9 Syst\u00E8me
-label.reset.VPN.connection=R\u00E9-initialiser la connexion VPN
+label.reserved.system.gateway=Passerelle r\u00e9serv\u00e9e Syst\u00e8me
+label.reserved.system.ip=Adresse IP Syst\u00e8me r\u00e9serv\u00e9e
+label.reserved.system.netmask=Masque de sous-r\u00e9seau r\u00e9serv\u00e9 Syst\u00e8me
+label.reset.VPN.connection=R\u00e9-initialiser la connexion VPN
label.resize.new.offering.id=Nouvelle Offre
label.resize.new.size=Nouvelle Taille (Go)
-label.resize.shrink.ok=R\u00E9duction OK
-label.resource=Ressource
+label.resize.shrink.ok=R\u00e9duction OK
label.resource.limits=Limite des ressources
-label.resource.state=\u00C9tat des ressources
+label.resource=Ressource
label.resources=Ressources
-label.restart.network=Red\u00E9marrage du r\u00E9seau
-label.restart.required=Red\u00E9marrage n\u00E9cessaire
-label.restart.vpc=Red\u00E9marrer le VPC
+label.resource.state=\u00c9tat des ressources
+label.restart.network=Red\u00e9marrage du r\u00e9seau
+label.restart.required=Red\u00e9marrage n\u00e9cessaire
+label.restart.vpc=Red\u00e9marrer le VPC
label.restore=Restaurer
label.review=Revoir
-label.revoke.project.invite=R\u00E9voquer l\\'invitation
-label.role=R\u00F4le
-label.root.disk.controller=Contr\u00F4leur de disque principal
+label.revoke.project.invite=R\u00e9voquer l\\'invitation
+label.role=R\u00f4le
+label.root.disk.controller=Contr\u00f4leur de disque principal
label.root.disk.offering=Offre de disque racine
-label.round.robin=Al\u00E9atoire
-label.rules=R\u00E8gles
+label.round.robin=Al\u00e9atoire
+label.rules=R\u00e8gles
label.running.vms=VMs actives
-label.s3.access_key=Cl\u00E9 d\\'Acc\u00E8s
+label.s3.access_key=Cl\u00e9 d\\'Acc\u00e8s
label.s3.bucket=Seau
-label.s3.connection_timeout=D\u00E9lai d\\'expiration de connexion
+label.s3.connection_timeout=D\u00e9lai d\\'expiration de connexion
label.s3.endpoint=Terminaison
label.s3.max_error_retry=Nombre d\\'essai en erreur max.
-label.s3.secret_key=Cl\u00E9 Priv\u00E9e
-label.s3.socket_timeout=D\u00E9lai d\\'expiration de la socket
+label.s3.secret_key=Cl\u00e9 Priv\u00e9e
+label.s3.socket_timeout=D\u00e9lai d\\'expiration de la socket
label.s3.use_https=Utiliser HTTPS
label.saturday=Samedi
-label.save=Sauvegarder
label.save.and.continue=Enregistrer et continuer
+label.save=Sauvegarder
label.saving.processing=Sauvegarde en cours...
-label.scope=Port\u00E9e
+label.scope=Port\u00e9e
label.search=Rechercher
-label.secondary.storage=Stockage secondaire
label.secondary.storage.count=Groupes de stockage secondaire
+label.secondary.storage=Stockage secondaire
label.secondary.storage.vm=VM stockage secondaire
-label.secondary.used=Stockage secondaire utilis\u00E9
-label.secret.key=Cl\u00E9 priv\u00E9e
-label.security.group=Groupe de s\u00E9curit\u00E9
-label.security.group.name=Nom du groupe de s\u00E9curit\u00E9
-label.security.groups=Groupes de s\u00E9curit\u00E9
-label.security.groups.enabled=Groupes de s\u00E9curit\u00E9 Activ\u00E9s
-label.select=S\u00E9lectionner
-label.select-view=S\u00E9lectionner la vue
-label.select.a.template=S\u00E9lectionner un mod\u00E8le
-label.select.a.zone=S\u00E9lectionner une zone
-label.select.instance=S\u00E9lectionner une instance
-label.select.instance.to.attach.volume.to=S\u00E9lectionner l\\'instance \u00E0 laquelle rattacher ce volume
-label.select.iso.or.template=S\u00E9lectionner un ISO ou un mod\u00E8le
-label.select.offering=S\u00E9lectionner une offre
-label.select.project=S\u00E9lectionner un projet
-label.select.tier=S\u00E9lectionner le tiers
-label.select.vm.for.static.nat=S\u00E9lectionner une VM pour le NAT statique
-label.sent=Envoy\u00E9
+label.secondary.used=Stockage secondaire utilis\u00e9
+label.secret.key=Cl\u00e9 priv\u00e9e
+label.security.group=Groupe de s\u00e9curit\u00e9
+label.security.group.name=Nom du groupe de s\u00e9curit\u00e9
+label.security.groups.enabled=Groupes de s\u00e9curit\u00e9 Activ\u00e9s
+label.security.groups=Groupes de s\u00e9curit\u00e9
+label.select.a.template=S\u00e9lectionner un mod\u00e8le
+label.select.a.zone=S\u00e9lectionner une zone
+label.select.instance=S\u00e9lectionner une instance
+label.select.instance.to.attach.volume.to=S\u00e9lectionner l\\'instance \u00e0 laquelle rattacher ce volume
+label.select.iso.or.template=S\u00e9lectionner un ISO ou un mod\u00e8le
+label.select.offering=S\u00e9lectionner une offre
+label.select.project=S\u00e9lectionner un projet
+label.select=S\u00e9lectionner
+label.select.tier=S\u00e9lectionner le tiers
+label.select-view=S\u00e9lectionner la vue
+label.select.vm.for.static.nat=S\u00e9lectionner une VM pour le NAT statique
+label.sent=Envoy\u00e9
label.server=Serveur
label.service.capabilities=Fonctions disponibles
label.service.offering=Offre de Service
-label.session.expired=Session expir\u00E9e
-label.set.up.zone.type=Configurer le type de zone
+label.session.expired=Session expir\u00e9e
label.setup=Configuration
-label.setup.network=Configurer le r\u00E9seau
+label.setup.network=Configurer le r\u00e9seau
label.setup.zone=Configurer la zone
+label.set.up.zone.type=Configurer le type de zone
label.shared=En partage
-label.show.ingress.rule=Montrer la r\u00E8gle d\\'entr\u00E9e
-label.shutdown.provider=\u00C9teindre ce fournisseur
-label.site.to.site.VPN=VPN Site-\u00E0-Site
+label.SharedMountPoint=Point de montage partag\u00e9
+label.show.ingress.rule=Montrer la r\u00e8gle d\\'entr\u00e9e
+label.shutdown.provider=\u00c9teindre ce fournisseur
+label.site.to.site.VPN=VPN Site-\u00e0-Site
label.size=Taille
-label.skip.guide=J\\'ai d\u00E9j\u00E0 utilis\u00E9 CloudStack avant, passer ce tutoriel
-label.snapshot=Instantan\u00E9
-label.snapshot.limits=Limites d\\'instantan\u00E9s
-label.snapshot.name=Nom Instantan\u00E9
-label.snapshot.s=Instantan\u00E9(s)
-label.snapshot.schedule=Configurer un instantan\u00E9 r\u00E9current
-label.snapshots=Instantan\u00E9s
-label.source=Origine
+label.skip.guide=J\\'ai d\u00e9j\u00e0 utilis\u00e9 CloudStack avant, passer ce tutoriel
+label.snapshot=Instantan\u00e9
+label.snapshot.limits=Limites d\\'instantan\u00e9s
+label.snapshot.name=Nom Instantan\u00e9
+label.snapshot.schedule=Configurer un instantan\u00e9 r\u00e9current
+label.snapshot.s=Instantan\u00e9(s)
+label.snapshots=Instantan\u00e9s
label.source.nat=NAT Source
-label.specify.IP.ranges=Sp\u00E9cifier des plages IP
-label.specify.vlan=Pr\u00E9ciser le VLAN
+label.source=Origine
+label.specify.IP.ranges=Sp\u00e9cifier des plages IP
+label.specify.vlan=Pr\u00e9ciser le VLAN
+label.SR.name=Nom du point de montage
label.srx=SRX
-label.start.IP=Plage de d\u00E9but IP
-label.start.port=Port de d\u00E9but
-label.start.reserved.system.IP=Adresse IP de d\u00E9but r\u00E9serv\u00E9e Syst\u00E8me
-label.start.vlan=VLAN de d\u00E9part
-label.state=\u00C9tat
+label.start.IP=Plage de d\u00e9but IP
+label.start.port=Port de d\u00e9but
+label.start.reserved.system.IP=Adresse IP de d\u00e9but r\u00e9serv\u00e9e Syst\u00e8me
+label.start.vlan=VLAN de d\u00e9part
+label.state=\u00c9tat
+label.static.nat.enabled=NAT statique activ\u00e9
label.static.nat=NAT Statique
-label.static.nat.enabled=NAT statique activ\u00E9
label.static.nat.to=NAT Statique vers
-label.static.nat.vm.details=D\u00E9tails des NAT statique VM
+label.static.nat.vm.details=D\u00e9tails des NAT statique VM
label.statistics=Statistiques
label.status=Statut
-label.step.1=\u00C9tape 1
-label.step.1.title=\u00C9tape 1 \: <strong>S\u00E9lectionnez un mod\u00E8le</strong>
-label.step.2=\u00C9tape 2
-label.step.2.title=\u00C9tape 2 \: <strong>Offre de Service</strong>
-label.step.3=\u00C9tape 3
-label.step.3.title=\u00C9tape 3 \: <strong id\="step3_label">S\u00E9lectionnez une offre de service</strong>
-label.step.4=\u00C9tape 4
-label.step.4.title=\u00C9tape 4 \: <strong>R\u00E9seau</strong>
-label.step.5=\u00C9tape 5
-label.step.5.title=\u00C9tape 5 \: <strong>V\u00E9rification</strong>
-label.stickiness=Fid\u00E9lit\u00E9
+label.step.1.title=\u00c9tape 1 \: <strong>S\u00e9lectionnez un mod\u00e8le</strong>
+label.step.1=\u00c9tape 1
+label.step.2.title=\u00c9tape 2 \: <strong>Offre de Service</strong>
+label.step.2=\u00c9tape 2
+label.step.3.title=\u00c9tape 3 \: <strong id\="step3_label">S\u00e9lectionnez une offre de service</strong>
+label.step.3=\u00c9tape 3
+label.step.4.title=\u00c9tape 4 \: <strong>R\u00e9seau</strong>
+label.step.4=\u00c9tape 4
+label.step.5.title=\u00c9tape 5 \: <strong>V\u00e9rification</strong>
+label.step.5=\u00c9tape 5
+label.stickiness=Fid\u00e9lit\u00e9
label.sticky.cookie-name=Nom du cookie
label.sticky.domain=Domaine
label.sticky.expire=Expiration
@@ -997,127 +990,134 @@ label.sticky.indirect=Indirect
label.sticky.length=Longueur
label.sticky.mode=Mode
label.sticky.nocache=Pas de cache
-label.sticky.postonly=Apr\u00E8s seulement
-label.sticky.prefix=Pr\u00E9fixe
-label.sticky.request-learn=Apprendre la requ\u00EAte
+label.sticky.postonly=Apr\u00e8s seulement
+label.sticky.prefix=Pr\u00e9fixe
+label.sticky.request-learn=Apprendre la requ\u00eate
label.sticky.tablesize=Taille du tableau
-label.stop=Arr\u00EAter
-label.stopped.vms=VMs arr\u00EAt\u00E9es
+label.stop=Arr\u00eater
+label.stopped.vms=VMs arr\u00eat\u00e9es
label.storage=Stockage
-label.storage.tags=\u00C9tiquettes de stockage
+label.storage.tags=\u00c9tiquettes de stockage
label.storage.traffic=Trafic stockage
label.storage.type=Type de stockage
-label.subdomain.access=Acc\u00E8s sous-domaine
+label.subdomain.access=Acc\u00e8s sous-domaine
label.submit=Envoyer
label.submitted.by=[Soumis par \: <span id\="submitted_by"></span>]
-label.succeeded=R\u00E9ussi
+label.succeeded=R\u00e9ussi
label.sunday=Dimanche
-label.super.cidr.for.guest.networks=Super CIDR pour les r\u00E9seaux invit\u00E9s
-label.supported.services=Services support\u00E9s
-label.supported.source.NAT.type=Type de NAT support\u00E9
+label.super.cidr.for.guest.networks=Super CIDR pour les r\u00e9seaux invit\u00e9s
+label.supported.services=Services support\u00e9s
+label.supported.source.NAT.type=Type de NAT support\u00e9
label.suspend.project=Suspendre projet
-label.system.capacity=Capacit\u00E9 syst\u00E8me
-label.system.offering=Offre de syst\u00E8me
-label.system.service.offering=Offre de Service Syst\u00E8me
-label.system.vm=VM Syst\u00E8me
-label.system.vm.type=Type de VM syst\u00E8me
-label.system.vms=\ VMs Syst\u00E8mes
-label.system.wide.capacity=Capacit\u00E9 globale
-label.tagged=\u00C9tiquet\u00E9
-label.tags=\u00C9tiquette
+label.system.capacity=Capacit\u00e9 syst\u00e8me
+label.system.offering=Offre de syst\u00e8me
+label.system.service.offering=Offre de Service Syst\u00e8me
+label.system.vms=\ VMs Syst\u00e8mes
+label.system.vm.type=Type de VM syst\u00e8me
+label.system.vm=VM Syst\u00e8me
+label.system.wide.capacity=Capacit\u00e9 globale
+label.tagged=\u00c9tiquet\u00e9
+label.tags=\u00c9tiquette
label.target.iqn=Cible IQN
-label.task.completed=T\u00E2che termin\u00E9e
-label.template=Mod\u00E8le
-label.template.limits=Limites de mod\u00E8le
-label.theme.default=Th\u00E8me par d\u00E9faut
-label.theme.grey=Personnalis\u00E9 - Gris
-label.theme.lightblue=Personnalis\u00E9 - Bleu clair
+label.task.completed=T\u00e2che termin\u00e9e
+label.template.limits=Limites de mod\u00e8le
+label.template=Mod\u00e8le
+label.TFTP.dir=R\u00e9pertoire TFTP
+label.theme.default=Th\u00e8me par d\u00e9faut
+label.theme.grey=Personnalis\u00e9 - Gris
+label.theme.lightblue=Personnalis\u00e9 - Bleu clair
label.thursday=Jeudi
+label.tier.details=D\u00e9tails du tiers
label.tier=Tiers
-label.tier.details=D\u00E9tails du tiers
+label.timeout=D\u00e9lai d\\'expiration
+label.timeout.in.second=D\u00e9lai d\\'expiration (secondes)
label.time=Temps
label.time.zone=Fuseau horaire
-label.timeout=D\u00E9lai d\\'expiration
-label.timeout.in.second=D\u00E9lai d\\'expiration (secondes)
label.timezone=Fuseau horaire
label.token=Jeton unique
-label.total.CPU=Capacit\u00E9 totale en CPU
-label.total.cpu=Capacit\u00E9 Totale en CPU
-label.total.hosts=Total H\u00F4tes
-label.total.memory=Total m\u00E9moire
+label.total.cpu=Capacit\u00e9 Totale en CPU
+label.total.CPU=Capacit\u00e9 totale en CPU
+label.total.hosts=Total H\u00f4tes
+label.total.memory=Total m\u00e9moire
label.total.of.ip=Total adresses IP
label.total.of.vm=Total VM
label.total.storage=Total stockage
label.total.vms=Nombre total de VMs
-label.traffic.label=Libell\u00E9 de trafic
-label.traffic.type=Type de Trafic
+label.traffic.label=Libell\u00e9 de trafic
label.traffic.types=Types de trafic
+label.traffic.type=Type de Trafic
label.tuesday=Mardi
-label.type=Type
label.type.id=ID du Type
+label.type=Type
label.unavailable=Indisponible
-label.unlimited=Illimit\u00E9
-label.untagged=Non Tagg\u00E9
-label.update.project.resources=Mettre \u00E0 jour les ressources du projet
-label.update.ssl=Certificat SSL
+label.unlimited=Illimit\u00e9
+label.untagged=Non Tagg\u00e9
+label.update.project.resources=Mettre \u00e0 jour les ressources du projet
label.update.ssl.cert=Certificat SSL
-label.updating=Mise \u00E0 jour
+label.update.ssl=Certificat SSL
+label.updating=Mise \u00e0 jour
label.upload=Charger
label.upload.volume=Charger un volume
label.url=URL
label.usage.interface=Interface Utilisation
-label.used=Utilis\u00E9
-label.user=Utilisateur
+label.used=Utilis\u00e9
label.username=Nom d\\'Utilisateur
label.users=Utilisateurs
+label.user=Utilisateur
label.value=Valeur
label.vcdcname=Nom du DC vCenter
label.vcenter.cluster=Cluster vCenter
label.vcenter.datacenter=Datacenter vCenter
label.vcenter.datastore=Datastore vCenter
-label.vcenter.host=H\u00F4te vCenter
+label.vcenter.host=H\u00f4te vCenter
label.vcenter.password=Mot de passe vCenter
label.vcenter.username=Nom d\\'utilisateur vCenter
label.vcipaddress=Adresse IP vCenter
label.version=Version
-label.view=Voir
label.view.all=Voir tout
label.view.console=Voir la console
-label.view.more=Voir plus
label.viewing=Consultation en cours
+label.view.more=Voir plus
+label.view=Voir
label.virtual.appliance=Appliance Virtuelle
label.virtual.appliances=Appliances Virtuelles
label.virtual.machines=Machines virtuelles
-label.virtual.network=R\u00E9seau virtuel
+label.virtual.network=R\u00e9seau virtuel
label.virtual.router=Routeur Virtuel
label.virtual.routers=Routeurs virtuels
-label.vlan=VLAN
label.vlan.id=ID du VLAN
label.vlan.range=Plage du VLAN
+label.vlan=VLAN
label.vm.add=Ajouter une instance
-label.vm.destroy=D\u00E9truire
+label.vm.destroy=D\u00e9truire
label.vm.display.name=Nom commun VM
-label.vm.name=Nom de la VM
-label.vm.reboot=Red\u00E9marrer
-label.vm.start=D\u00E9marrer
-label.vm.state=\u00C9tat VM
-label.vm.stop=Arr\u00EAter
+label.VMFS.datastore=Magasin de donn\u00e9es VMFS
label.vmfs=VMFS
+label.vm.name=Nom de la VM
+label.vm.reboot=Red\u00e9marrer
+label.VMs.in.tier=Machines virtuelles dans le tiers
+label.vm.start=D\u00e9marrer
+label.vm.state=\u00c9tat VM
+label.vm.stop=Arr\u00eater
label.vms=VMs
-label.vmware.traffic.label=Libell\u00E9 pour le trafic VMware
+label.vmware.traffic.label=Libell\u00e9 pour le trafic VMware
label.volgroup=Groupe de Volume
-label.volume=Volume
label.volume.limits=Limites des volumes
label.volume.name=Nom du volume
label.volumes=Volumes
-label.vpc=VPC
+label.volume=Volume
label.vpc.id=ID VPC
-label.vpn=VPN
+label.VPC.router.details=D\u00e9tails routeur VPC
+label.vpc=VPC
+label.VPN.connection=Connexion VPN
label.vpn.customer.gateway=Passerelle VPN client
-label.vsmctrlvlanid=\ ID VLAN Contr\u00F4le
+label.VPN.customer.gateway=Passerelle VPN client
+label.VPN.gateway=Passerelle VPN
+label.vpn=VPN
+label.vsmctrlvlanid=\ ID VLAN Contr\u00f4le
label.vsmpktvlanid=ID VLAN Paquet
label.vsmstoragevlanid=VLAN ID Stockage
-label.vsphere.managed=G\u00E9r\u00E9e par vSphere
+label.vsphere.managed=G\u00e9r\u00e9e par vSphere
label.waiting=En attente
label.warn=Avertissement
label.wednesday=Mercredi
@@ -1125,353 +1125,353 @@ label.weekly=Hebdomadaire
label.welcome=Bienvenue
label.welcome.cloud.console=Bienvenue dans la Console d\\'Administration
label.what.is.cloudstack=Qu\\'est-ce-que CloudStack&\#8482; ?
-label.xen.traffic.label=Libell\u00E9 pour le trafic XenServer
+label.xen.traffic.label=Libell\u00e9 pour le trafic XenServer
label.yes=Oui
-label.zone=Zone
-label.zone.details=D\u00E9tails de la zone
+label.zone.details=D\u00e9tails de la zone
label.zone.id=ID de la zone
label.zone.name=Nom de zone
-label.zone.step.1.title=\u00C9tape 1 \: <strong>S\u00E9lectionnez un r\u00E9seau</strong>
-label.zone.step.2.title=\u00C9tape 2 \: <strong>Ajoutez une zone</strong>
-label.zone.step.3.title=\u00C9tape 3 \: <strong>Ajoutez un Pod</strong>
-label.zone.step.4.title=\u00C9tape 4 \: <strong>Ajoutez une plage d\\'adresses IP</strong>
+label.zone.step.1.title=\u00c9tape 1 \: <strong>S\u00e9lectionnez un r\u00e9seau</strong>
+label.zone.step.2.title=\u00c9tape 2 \: <strong>Ajoutez une zone</strong>
+label.zone.step.3.title=\u00c9tape 3 \: <strong>Ajoutez un Pod</strong>
+label.zone.step.4.title=\u00c9tape 4 \: <strong>Ajoutez une plage d\\'adresses IP</strong>
+label.zones=Zones
label.zone.type=Type de zone
-label.zone.wide=Transverse \u00E0 la zone
-label.zoneWizard.trafficType.guest=Invit\u00E9 \: Trafic entre les machines virtuelles utilisateurs
-label.zoneWizard.trafficType.management=Administration \: Trafic entre les ressources internes de CloudStack, incluant tous les composants qui communiquent avec le serveur d\\'administration, tels que les h\u00F4tes and les machines virtuelles Syst\u00E8mes CloudStack
+label.zone.wide=Transverse \u00e0 la zone
+label.zoneWizard.trafficType.guest=Invit\u00e9 \: Trafic entre les machines virtuelles utilisateurs
+label.zoneWizard.trafficType.management=Administration \: Trafic entre les ressources internes de CloudStack, incluant tous les composants qui communiquent avec le serveur d\\'administration, tels que les h\u00f4tes and les machines virtuelles Syst\u00e8mes CloudStack
label.zoneWizard.trafficType.public=Public \: Trafic entre Internet et les machines virtuelles dans le nuage
-label.zoneWizard.trafficType.storage=Stockage \: Trafic entre les serveurs de stockages principaux et secondaires, tel que le transfert de machines virtuelles mod\u00E8les et des instantan\u00E9s de disques
-label.zones=Zones
-managed.state=\u00C9tat de la gestion
-message.Zone.creation.complete=Cr\u00E9ation de la zone termin\u00E9e
-message.acquire.new.ip=Confirmer l\\'acquisition d\\'une nouvelle adresse IP pour ce r\u00E9seau.
+label.zoneWizard.trafficType.storage=Stockage \: Trafic entre les serveurs de stockages principaux et secondaires, tel que le transfert de machines virtuelles mod\u00e8les et des instantan\u00e9s de disques
+label.zone=Zone
+managed.state=\u00c9tat de la gestion
+message.acquire.new.ip=Confirmer l\\'acquisition d\\'une nouvelle adresse IP pour ce r\u00e9seau.
message.acquire.new.ip.vpc=Veuillez confirmer que vous voulez une nouvelle adresse IP pour ce VPC
-message.acquire.public.ip=S\u00E9lectionnez la zone dans laquelle vous voulez acqu\u00E9rir votre nouvelle adresse IP.
-message.action.cancel.maintenance=Votre h\u00F4te a quitt\u00E9 la maintenance. Ce processus peut prendre jusqu\\'\u00E0 plusieurs minutes.
+message.acquire.public.ip=S\u00e9lectionnez la zone dans laquelle vous voulez acqu\u00e9rir votre nouvelle adresse IP.
message.action.cancel.maintenance.mode=Confirmer l\\'annulation de cette maintenance.
-message.action.change.service.warning.for.instance=Votre instance doit \u00EAtre arr\u00EAt\u00E9e avant d\\'essayer de changer son offre de service.
-message.action.change.service.warning.for.router=Votre routeur doit \u00EAtre arr\u00EAt\u00E9 avant d\\'essayer de changer son offre de service.
-message.action.delete.ISO=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette ISO.
-message.action.delete.ISO.for.all.zones=L\\'ISO est utilis\u00E9 par toutes les zones. S\\'il vous pla\u00EEt confirmer que vous voulez le supprimer de toutes les zones.
-message.action.delete.cluster=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce cluster.
-message.action.delete.disk.offering=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette offre de disque.
-message.action.delete.domain=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce domaine.
-message.action.delete.external.firewall=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce pare-feu externe. Attention \: Si vous pr\u00E9voyez de rajouter le m\u00EAme pare-feu externe de nouveau, vous devez r\u00E9-initialiser les donn\u00E9es d\\'utilisation sur l\\'appareil.
-message.action.delete.external.load.balancer=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce r\u00E9partiteur de charge externe. Attention \: Si vous pensez ajouter le m\u00EAme r\u00E9partiteur de charge plus tard, vous devez remettre \u00E0 z\u00E9ro les statistiques d\\'utilisation de cet \u00E9quipement.
-message.action.delete.ingress.rule=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette r\u00E8gle d\\'entr\u00E9e.
-message.action.delete.network=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce r\u00E9seau.
+message.action.cancel.maintenance=Votre h\u00f4te a quitt\u00e9 la maintenance. Ce processus peut prendre jusqu\\'\u00e0 plusieurs minutes.
+message.action.change.service.warning.for.instance=Votre instance doit \u00eatre arr\u00eat\u00e9e avant d\\'essayer de changer son offre de service.
+message.action.change.service.warning.for.router=Votre routeur doit \u00eatre arr\u00eat\u00e9 avant d\\'essayer de changer son offre de service.
+message.action.delete.cluster=\u00cates-vous s\u00fbr que vous voulez supprimer ce cluster.
+message.action.delete.disk.offering=\u00cates-vous s\u00fbr que vous souhaitez supprimer cette offre de disque.
+message.action.delete.domain=\u00cates-vous s\u00fbr que vous voulez supprimer ce domaine.
+message.action.delete.external.firewall=\u00cates-vous s\u00fbr que vous souhaitez supprimer ce pare-feu externe. Attention \: Si vous pr\u00e9voyez de rajouter le m\u00eame pare-feu externe de nouveau, vous devez r\u00e9-initialiser les donn\u00e9es d\\'utilisation sur l\\'appareil.
+message.action.delete.external.load.balancer=\u00cates-vous s\u00fbr que vous souhaitez supprimer ce r\u00e9partiteur de charge externe. Attention \: Si vous pensez ajouter le m\u00eame r\u00e9partiteur de charge plus tard, vous devez remettre \u00e0 z\u00e9ro les statistiques d\\'utilisation de cet \u00e9quipement.
+message.action.delete.ingress.rule=\u00cates-vous s\u00fbr que vous souhaitez supprimer cette r\u00e8gle d\\'entr\u00e9e.
+message.action.delete.ISO.for.all.zones=L\\'ISO est utilis\u00e9 par toutes les zones. S\\'il vous pla\u00eet confirmer que vous voulez le supprimer de toutes les zones.
+message.action.delete.ISO=\u00cates-vous s\u00fbr que vous souhaitez supprimer cette ISO.
+message.action.delete.network=\u00cates-vous s\u00fbr que vous voulez supprimer ce r\u00e9seau.
message.action.delete.nexusVswitch=Confirmer la suppession de ce Nexus 1000v
-message.action.delete.physical.network=Confirmer la suppression du r\u00E9seau physique
-message.action.delete.pod=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce pod.
-message.action.delete.primary.storage=\u
<TRUNCATED>
[45/50] [abbrv] Update l10n resource file Web-UI with latest version
from transifex.
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_fr_FR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 6d86048..8be438a 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -195,7 +195,7 @@ label.action.reboot.router.processing=Red\u00e9marrage du routeur...
label.action.reboot.router=Red\u00e9marrer le routeur
label.action.reboot.systemvm.processing=Red\u00e9marrage de la VM Syst\u00e8me...
label.action.reboot.systemvm=Red\u00e9marrer la VM Syst\u00e8me
-label.action.recurring.snapshot=Instantan\u00e9s r\u00e9currents
+label.action.recurring.snapshot=Instantan\u00e9s r\u00e9currents
label.action.register.iso=Enregistrer ISO
label.action.register.template=Enregistrer mod\u00e8le
label.action.release.ip=Lib\u00e9rer l\\'adresse IP
@@ -230,6 +230,9 @@ label.action.update.OS.preference=Mettre \u00e0 jour les pr\u00e9f\u00e9rences d
label.action.update.OS.preference.processing=Mise \u00e0 jour des pr\u00e9f\u00e9rences d\\'OS...
label.action.update.resource.count=Mettre \u00e0 jour le compteur des ressources
label.action.update.resource.count.processing=Mise \u00e0 jour du compteur...
+label.action.vmsnapshot.create=Prendre un instantan\u00e9 VM
+label.action.vmsnapshot.delete=Supprimer l\\'instantan\u00e9 VM
+label.action.vmsnapshot.revert=Revenir \u00e0 un instantan\u00e9 VM
label.activate.project=Activer projet
label.active.sessions=Sessions actives
label.add.account=Ajouter un compte
@@ -237,7 +240,9 @@ label.add.accounts=Ajouter des comptes
label.add.accounts.to=Ajouter des comptes sur
label.add.account.to.project=Ajouter un compte au projet
label.add.ACL=Ajouter r\u00e8gle ACL
+label.add.affinity.group=Ajouter nouvea groupe d\\'affinit\u00e9
label.add=Ajouter
+label.add.BigSwitchVns.device=Ajouter contr\u00f4leur BigSwitch Vns
label.add.by=Ajout\u00e9 par
label.add.by.cidr=Ajouter par CIDR
label.add.by.group=Ajouter par groupe
@@ -279,6 +284,7 @@ label.add.physical.network=Ajouter un r\u00e9seau physique
label.add.pod=Ajouter un pod
label.add.port.forwarding.rule=Ajouter une r\u00e8gle de transfert de port
label.add.primary.storage=Ajouter un stockage principal
+label.add.region=Ajouter R\u00e9gion
label.add.resources=Ajouter ressources
label.add.route=Ajouter route
label.add.rule=Ajouter r\u00e8gle
@@ -308,6 +314,9 @@ label.admin=Administrateur
label.advanced=Avanc\u00e9
label.advanced.mode=Mode avanc\u00e9
label.advanced.search=Recherche avanc\u00e9e
+label.affinity=Affinit\u00e9
+label.affinity.group=Groupe d\\'Affinit\u00e9
+label.affinity.groups=Groups d\\'Affinit\u00e9
label.agent.password=Mot de passe Agent
label.agent.username=Identifiant Agent
label.agree=Accepter
@@ -315,6 +324,9 @@ label.alert=Alerte
label.algorithm=Algorithme
label.allocated=Allou\u00e9
label.allocation.state=\u00c9tat
+label.anti.affinity=Anti-affinit\u00e9
+label.anti.affinity.group=Groupe d\\'Anti-affinit\u00e9
+label.anti.affinity.groups=Groupes d\\'Anti-affinit\u00e9
label.api.key=Cl\u00e9 d\\'API
label.apply=Appliquer
label.assign=Assigner
@@ -322,6 +334,8 @@ label.assign.to.load.balancer=Assigner l\\'instance au r\u00e9partiteur de charg
label.associated.network.id=ID du r\u00e9seau associ\u00e9
label.associated.network=R\u00e9seau associ\u00e9
label.attached.iso=Image ISO attach\u00e9e
+label.author.email=Email auteur
+label.author.name=Nom auteur
label.availability=Disponibilit\u00e9
label.availability.zone=Zone de disponibilit\u00e9
label.available=Disponible
@@ -330,6 +344,7 @@ label.back=Retour
label.bandwidth=Bande passante
label.basic=Basique
label.basic.mode=Mode basique
+label.bigswitch.controller.address=Adresse du contr\u00f4leur BigSwitch Vns
label.bootable=Amor\u00e7able
label.broadcast.domain.range=Plage du domaine multi-diffusion
label.broadcast.domain.type=Type de domaine de multi-diffusion
@@ -393,6 +408,7 @@ label.cpu.allocated=CPU allou\u00e9e
label.cpu.allocated.for.VMs=CPU allou\u00e9e aux VMs
label.CPU.cap=Limitation CPU
label.cpu=CPU
+label.cpu.limits=Limites CPU
label.cpu.mhz=CPU (en MHz)
label.cpu.utilized=CPU utilis\u00e9e
label.created.by.system=Cr\u00e9\u00e9 par le syst\u00e8me
@@ -413,6 +429,8 @@ label.dedicated=D\u00e9di\u00e9
label.default=Par d\u00e9faut
label.default.use=Utilisation par d\u00e9faut
label.default.view=Vue par d\u00e9faut
+label.delete.affinity.group=Supprimer le groupe d\\'affinit\u00e9
+label.delete.BigSwitchVns=Supprimer contr\u00f4leur BigSwitch Vns
label.delete.F5=Supprimer F5
label.delete.gateway=Supprimer la passerelle
label.delete.NetScaler=Supprimer Netscaler
@@ -464,6 +482,7 @@ label.done=Termin\u00e9
label.double.quotes.are.not.allowed=Les guillemets ne sont pas autoris\u00e9es
label.download.progress=Progression du t\u00e9l\u00e9chargement
label.drag.new.position=D\u00e9placer sur une autre position
+label.edit.affinity.group=Modifier le groupe d\\'affinit\u00e9
label.edit.lb.rule=Modifier la r\u00e8gle LB
label.edit=Modifier
label.edit.network.details=Modifier les param\u00e8tres r\u00e9seau
@@ -485,6 +504,7 @@ label.enabling.vpn.access=Activation de l\\'acc\u00e8s VPN
label.enabling.vpn=Activation du VPN
label.end.IP=Fin de plage IP
label.endpoint.or.operation=Terminaison ou Op\u00e9ration
+label.endpoint=Terminaison
label.end.port=Port de fin
label.end.reserved.system.IP=Adresse IP de fin r\u00e9serv\u00e9e Syst\u00e8me
label.end.vlan=VLAN de fin
@@ -497,6 +517,7 @@ label.ESP.lifetime=Dur\u00e9e de vie ESP (secondes)
label.ESP.policy=Mode ESP
label.esx.host=H\u00f4te ESX/ESXi
label.example=Exemple
+label.external.link=Lien externe
label.f5=F5
label.failed=\u00c9chou\u00e9
label.featured=Sponsoris\u00e9
@@ -610,6 +631,7 @@ label.keyboard.type=Type de clavier
label.key=Clef
label.kvm.traffic.label=Libell\u00e9 pour le trafic KVM
label.label=Libell\u00e9
+label.lang.arabic=Arabe
label.lang.brportugese=Portuguais Br\u00e9sil
label.lang.catalan=Catalan
label.lang.chinese=Chinois (simplifi\u00e9)
@@ -648,10 +670,14 @@ label.manage=G\u00e9r\u00e9
label.management=Administration
label.management.ips=Adresses IP de gestion
label.manage.resources=G\u00e9rer les ressources
+label.max.cpus=Nombre coeurs CPU max.
label.max.guest.limit=Nombre maximum d\\'invit\u00e9s
label.maximum=Maximum
+label.max.memory=M\u00e9moire max. (Mo)
label.max.networks=R\u00e9seaux Max.
+label.max.primary.storage=Principal max. (Go)
label.max.public.ips=Max. IP publiques
+label.max.secondary.storage=Secondaire max. (Go)
label.max.snapshots=Max instantan\u00e9es
label.max.templates=Max. mod\u00e8les
label.max.vms=Max. VMs utilisateur
@@ -659,6 +685,7 @@ label.max.volumes=Max. volumes
label.max.vpcs=Max. VPCs
label.may.continue=Vous pouvez continuer.
label.memory.allocated=M\u00e9moire allou\u00e9e
+label.memory.limits=Limites m\u00e9moire (Mo)
label.memory.mb=M\u00e9moire (en MB)
label.memory=M\u00e9moire (en Mo)
label.memory.total=M\u00e9moire totale
@@ -689,6 +716,7 @@ label.menu.my.templates=Mes mod\u00e8les
label.menu.network.offerings=Offres de Service R\u00e9seau
label.menu.network=R\u00e9seau
label.menu.physical.resources=Ressources physiques
+label.menu.regions=R\u00e9gions
label.menu.running.instances=Instances actives
label.menu.security.groups=Groupes de s\u00e9curit\u00e9
label.menu.service.offerings=Offres de Service
@@ -705,8 +733,8 @@ label.menu.volumes=Volumes
label.migrate.instance.to.host=Migration de l\\'instance sur un autre h\u00f4te
label.migrate.instance.to=Migrer l\\'instance vers
label.migrate.instance.to.ps=Migration de l\\'instance sur un autre stockage principal
-label.migrate.router.to=Migrer le routeur vers
-label.migrate.systemvm.to=Migrer la VM syst\u00e8me vers
+label.migrate.router.to=Migrer le routeur vers
+label.migrate.systemvm.to=Migrer la VM syst\u00e8me vers
label.migrate.to.host=Migrer vers un h\u00f4te
label.migrate.to.storage=Migrer vers un stockage
label.migrate.volume=Migration du volume vers un autre stockage principal
@@ -808,6 +836,8 @@ label.PING.dir=R\u00e9pertoire PING
label.PING.storage.IP=IP stockage PING
label.please.specify.netscaler.info=Renseigner les informations sur le Netscaler
label.please.wait=Patientez s\\'il vous plait
+label.plugin.details=D\u00e9tails extension
+label.plugins=Extensions
label.pod.name=Nom du pod
label.pod=Pod
label.pods=Pods
@@ -820,6 +850,7 @@ label.prev=Pr\u00e9c\u00e9dent
label.primary.allocated=Stockage principal allou\u00e9
label.primary.network=R\u00e9seau principal
label.primary.storage.count=Groupes de stockage principal
+label.primary.storage.limits=Limites stockage principal (Go)
label.primary.storage=Premier stockage
label.primary.used=Stockage principal utilis\u00e9
label.private.Gateway=Passerelle priv\u00e9e
@@ -857,6 +888,7 @@ label.redundant.router.capability=Router redondant
label.redundant.router=Routeur redondant
label.redundant.state=\u00c9tat de la redondance
label.refresh=Actualiser
+label.region=R\u00e9gion
label.related=Connexes
label.remind.later=Rappeler moi plus tard
label.remove.ACL=Supprimer une r\u00e8gle ACL
@@ -866,6 +898,7 @@ label.remove.ingress.rule=Supprimer la r\u00e8gle entrante
label.remove.ip.range=Supprimer la plage IP
label.remove.pf=Supprimer la r\u00e8gle de transfert de port
label.remove.project.account=Supprimer le compte projet
+label.remove.region=Supprimer r\u00e9gion
label.remove.rule=Supprimer la r\u00e8gle
label.remove.static.nat.rule=Supprimer le NAT statique
label.remove.static.route=Supprimer une route statique
@@ -902,7 +935,7 @@ label.s3.access_key=Cl\u00e9 d\\'Acc\u00e8s
label.s3.bucket=Seau
label.s3.connection_timeout=D\u00e9lai d\\'expiration de connexion
label.s3.endpoint=Terminaison
-label.s3.max_error_retry=Nombre d\\'essai en erreur max.
+label.s3.max_error_retry=Nombre d\\'essai en erreur max.
label.s3.secret_key=Cl\u00e9 Priv\u00e9e
label.s3.socket_timeout=D\u00e9lai d\\'expiration de la socket
label.s3.use_https=Utiliser HTTPS
@@ -913,6 +946,7 @@ label.saving.processing=Sauvegarde en cours...
label.scope=Port\u00e9e
label.search=Rechercher
label.secondary.storage.count=Groupes de stockage secondaire
+label.secondary.storage.limits=Limites stockage secondaire (Go)
label.secondary.storage=Stockage secondaire
label.secondary.storage.vm=VM stockage secondaire
label.secondary.used=Stockage secondaire utilis\u00e9
@@ -930,7 +964,7 @@ label.select.offering=S\u00e9lectionner une offre
label.select.project=S\u00e9lectionner un projet
label.select=S\u00e9lectionner
label.select.tier=S\u00e9lectionner le tiers
-label.select-view=S\u00e9lectionner la vue
+label.select-view=S\u00e9lectionner la vue
label.select.vm.for.static.nat=S\u00e9lectionner une VM pour le NAT statique
label.sent=Envoy\u00e9
label.server=Serveur
@@ -958,7 +992,7 @@ label.source.nat=NAT Source
label.source=Origine
label.specify.IP.ranges=Sp\u00e9cifier des plages IP
label.specify.vlan=Pr\u00e9ciser le VLAN
-label.SR.name=Nom du point de montage
+label.SR.name = Nom du point de montage
label.srx=SRX
label.start.IP=Plage de d\u00e9but IP
label.start.port=Port de d\u00e9but
@@ -1013,9 +1047,9 @@ label.system.capacity=Capacit\u00e9 syst\u00e8me
label.system.offering=Offre de syst\u00e8me
label.system.service.offering=Offre de Service Syst\u00e8me
label.system.vms=\ VMs Syst\u00e8mes
-label.system.vm.type=Type de VM syst\u00e8me
+label.system.vm.type=Type de VM syst\u00e8me
label.system.vm=VM Syst\u00e8me
-label.system.wide.capacity=Capacit\u00e9 globale
+label.system.wide.capacity=Capacit\u00e9 globale
label.tagged=\u00c9tiquet\u00e9
label.tags=\u00c9tiquette
label.target.iqn=Cible IQN
@@ -1030,7 +1064,7 @@ label.thursday=Jeudi
label.tier.details=D\u00e9tails du tiers
label.tier=Tiers
label.timeout=D\u00e9lai d\\'expiration
-label.timeout.in.second=D\u00e9lai d\\'expiration (secondes)
+label.timeout.in.second = D\u00e9lai d\\'expiration (secondes)
label.time=Temps
label.time.zone=Fuseau horaire
label.timezone=Fuseau horaire
@@ -1053,8 +1087,8 @@ label.unavailable=Indisponible
label.unlimited=Illimit\u00e9
label.untagged=Non Tagg\u00e9
label.update.project.resources=Mettre \u00e0 jour les ressources du projet
-label.update.ssl.cert=Certificat SSL
-label.update.ssl=Certificat SSL
+label.update.ssl.cert= Certificat SSL
+label.update.ssl= Certificat SSL
label.updating=Mise \u00e0 jour
label.upload=Charger
label.upload.volume=Charger un volume
@@ -1064,6 +1098,7 @@ label.used=Utilis\u00e9
label.username=Nom d\\'Utilisateur
label.users=Utilisateurs
label.user=Utilisateur
+label.use.vm.ip=Utiliser IP VM \:
label.value=Valeur
label.vcdcname=Nom du DC vCenter
label.vcenter.cluster=Cluster vCenter
@@ -1096,11 +1131,16 @@ label.vmfs=VMFS
label.vm.name=Nom de la VM
label.vm.reboot=Red\u00e9marrer
label.VMs.in.tier=Machines virtuelles dans le tiers
+label.vmsnapshot.current=estCourant
+label.vmsnapshot=Instantan\u00e9s VM
+label.vmsnapshot.memory=M\u00e9more instantan\u00e9
+label.vmsnapshot.parentname=Parent
+label.vmsnapshot.type=Type
label.vm.start=D\u00e9marrer
label.vm.state=\u00c9tat VM
label.vm.stop=Arr\u00eater
label.vms=VMs
-label.vmware.traffic.label=Libell\u00e9 pour le trafic VMware
+label.vmware.traffic.label=Libell\u00e9 pour le trafic VMware
label.volgroup=Groupe de Volume
label.volume.limits=Limites des volumes
label.volume.name=Nom du volume
@@ -1209,13 +1249,15 @@ message.action.stop.router=Tous les services fournit par ce routeur virtuel vont
message.action.stop.systemvm=\u00cates-vous s\u00fbr que vous souhaitez arr\u00eater cette VM.
message.action.take.snapshot=Confirmer la prise d\\'un instantan\u00e9 pour ce volume.
message.action.unmanage.cluster=Confirmez que vous ne voulez plus g\u00e9rer le cluster
+message.action.vmsnapshot.delete=Confirmez que vous souhaitez supprimer cet instantan\u00e9 VM.
+message.action.vmsnapshot.revert=Revenir \u00e0 un instantan\u00e9 VM
message.activate.project=\u00cates-vous s\u00fbr de vouloir activer ce projet ?
message.add.cluster=Ajouter un cluster d\\'hyperviseurs g\u00e9r\u00e9 pour cette zone <b><span id\="zone_name"></span></b>, pod <b><span id\="pod_name"></span></b>
message.add.cluster.zone=Ajouter un cluster d\\'hyperviseurs g\u00e9r\u00e9 pour cette zone <b><span id\="zone_name"></span></b>
message.add.disk.offering=Renseignez les param\u00e8tres suivants pour ajouter un offre de service de disques
message.add.domain=Sp\u00e9cifier le sous domaine que vous souhaitez cr\u00e9er sous ce domaine
message.add.firewall=Ajouter un pare-feu \u00e0 cette zone
-message.add.guest.network=Confirmer l\\'ajout du r\u00e9seau invit\u00e9
+message.add.guest.network=Confirmer l\\'ajout du r\u00e9seau invit\u00e9
message.add.host=Renseignez les param\u00e8tres suivants pour ajouter une h\u00f4te
message.adding.host=Ajout un h\u00f4te
message.adding.Netscaler.device=Ajouter un Netscaler
@@ -1229,9 +1271,10 @@ message.add.load.balancer.under.ip=La r\u00e8gle de r\u00e9partition de charge \
message.add.network=Ajouter un nouveau r\u00e9seau \u00e0 la zone\: <b><span id\="zone_name"></span></b>
message.add.new.gateway.to.vpc=Renseigner les informations suivantes pour ajouter une nouvelle passerelle pour ce VPC
message.add.pod=Ajouter un nouveau pod \u00e0 la zone <b><span id\="add_pod_zone_name"></span></b>
-message.add.pod.during.zone.creation=Chaque zone doit contenir un ou plusieurs pods, et le premier pod sera ajout\u00e9 maintenant. Une pod contient les h\u00f4tes et les serveurs de stockage principal, qui seront ajout\u00e9s dans une \u00e9tape ult\u00e9rieure. Configurer une plage d\\'adresses IP r\u00e9serv\u00e9es pour le trafic de gestion interne de CloudStack. La plage d\\'IP r\u00e9serv\u00e9e doit \u00eatre unique pour chaque zone dans le nuage.
+message.add.pod.during.zone.creation=Chaque zone doit contenir un ou plusieurs pods, et le premier pod sera ajout\u00e9 maintenant. Une pod contient les h\u00f4tes et les serveurs de stockage primaire, qui seront ajout\u00e9s dans une \u00e9tape ult\u00e9rieure. Configurer une plage d\\'adresses IP r\u00e9serv\u00e9es pour le trafic de gestion interne de CloudStack. La plage d\\'IP r\u00e9serv\u00e9e doit \u00eatre unique pour chaque zone dans le nuage.
message.add.primary=Renseignez les param\u00e8tres suivants pour ajouter un stockage principal
message.add.primary.storage=Ajouter un nouveau stockage principal \u00e0 la zone <b><span id\="zone_name"></span></b>, pod <b><span id\="pod_name"></span></b>
+message.add.region=Renseigner les informations suivantes pour ajouter une nouvelle r\u00e9gion.
message.add.secondary.storage=Ajouter un nouveau stockage pour la zone <b><span id\="zone_name"></span></b>
message.add.service.offering=Renseigner les informations suivantes pour ajouter une nouvelle offre de service de calcul.
message.add.system.service.offering=Ajouter les informations suivantes pour cr\u00e9er une nouvelle offre syst\u00e8me.
@@ -1280,6 +1323,7 @@ message.creating.secondary.storage=Cr\u00e9ation du stockage secondaire
message.creating.zone=Cr\u00e9ation de la zone
message.decline.invitation=Voulez-vous refuser cette invitation au projet ?
message.delete.account=\u00cates-vous s\u00fbr que vous souhaitez supprimer ce compte.
+message.delete.affinity.group=Confirmer la supression de ce groupe d\\'affinit\u00e9.
message.delete.gateway=\u00cates-vous s\u00fbr que vous voulez supprimer cette passerelle
message.delete.project=\u00cates-vous s\u00fbr de vouloir supprimer ce projet ?
message.delete.user=\u00cates-vous s\u00fbr que vous voulez supprimer cet utilisateur.
@@ -1289,7 +1333,7 @@ message.delete.VPN.gateway=\u00cates-vous s\u00fbr que vous voulez supprimer cet
message.desc.advanced.zone=Pour des topologies de r\u00e9seau plus sophistiqu\u00e9es. Ce mod\u00e8le de r\u00e9seau permet plus de flexibilit\u00e9 dans la d\u00e9finition des r\u00e9seaux d\\'invit\u00e9s et propose des offres personnalis\u00e9es telles que le support de pare-feu, VPN ou d\\'\u00e9quilibrage de charge.
message.desc.basic.zone=Fournit un r\u00e9seau unique o\u00f9 chaque instance de machine virtuelle se voit attribuer une adresse IP directement depuis le r\u00e9seau. L\\'isolation des invit\u00e9s peut \u00eatre assur\u00e9 au niveau de la couche r\u00e9seau-3 tels que les groupes de s\u00e9curit\u00e9 (filtrage d\\'adresse IP source).
message.desc.cluster=Chaque pod doit contenir un ou plusieurs clusters, et le premier cluster sera ajout\u00e9 tout de suite. Un cluster est un regroupement pour h\u00f4tes. Les h\u00f4tes d\\'un cluster ont tous un mat\u00e9riel identique, ex\u00e9cutent le m\u00eame hyperviseur, sont dans le m\u00eame sous-r\u00e9seau, et acc\u00e8dent au m\u00eame stockage partag\u00e9. Chaque cluster comprend une ou plusieurs h\u00f4tes et un ou plusieurs serveurs de stockage principal.
-message.desc.host=Chaque cluster doit contenir au moins un h\u00f4te (machine) pour ex\u00e9cuter des machines virtuelles invit\u00e9es, et le premier h\u00f4te sera ajout\u00e9 tout de suite. Pour un h\u00f4te fonctionnant dans CloudStack, vous devez installer un logiciel hyperviseur sur l\\'h\u00f4te, attribuer une adresse IP \u00e0 l\\'h\u00f4te, et s\\'assurer que l\\'h\u00f4te est connect\u00e9 au serveur d\\'administration CloudStack.<br/><br/>Indiquer le nom de l\\'h\u00f4te ou son adresse IP, l\\'identifiant de connexion (g\u00e9n\u00e9ralement root) et le mot de passe ainsi que toutes les \u00e9tiquettes permettant de classer les h\u00f4tes.
+message.desc.host=Chaque cluster doit contenir au moins un h\u00f4te (machine) pour ex\u00e9ctuer des machines virtuelles invit\u00e9es, et le premier h\u00f4te sera ajout\u00e9e maintenant. Pour un h\u00f4te fonctionnant dans CloudStack, vous devez installer un logiciel hyperviseur sur l\\'h\u00f4te, attribuer une adresse IP \u00e0 l\\'h\u00f4te, et s\\'assurer que l\\'h\u00f4te est connect\u00e9 au serveur d\\'administration CloudStack.<br/><br/>Indiquer le nom de l\\'h\u00f4te ou son adresse IP, l\\'identifiant de connexion (g\u00e9n\u00e9ralement root) et le mot de passe ainsi que toutes les \u00e9tiquettes permettant de classer les h\u00f4tes.
message.desc.primary.storage=Chaque cluster doit contenir un ou plusieurs serveurs de stockage principal, et le premier sera ajout\u00e9 tout de suite. Le stockage principal contient les volumes de disque pour les machines virtuelles s\\'ex\u00e9cutant sur les h\u00f4tes dans le cluster. Utiliser les protocoles standards pris en charge par l\\'hyperviseur sous-jacent.
message.desc.secondary.storage=Chaque zone doit avoir au moins un serveur NFS ou un serveur de stockage secondaire, et sera ajout\u00e9 en premier tout de suite. Le stockage secondaire entrepose les mod\u00e8les de machines virtuelles, les images ISO et les images disques des volumes des machines virtuelles. Ce serveur doit \u00eatre accessible pour toutes les machines h\u00f4tes dans la zone.<br/><br/>Saisir l\\'adresse IP et le chemin d\\'export.
message.desc.zone=Une zone est la plus grande unit\u00e9 organisationnelle dans CloudStack, et correspond typiquement \u00e0 un centre de donn\u00e9es. Les zones fournissent un isolement physique et de la redondance. Une zone est constitu\u00e9e d\\'un ou plusieurs pods (dont chacun contient les h\u00f4tes et les serveurs de stockage principal) et un serveur de stockage secondaire qui est partag\u00e9e par tous les pods dans la zone.
@@ -1388,6 +1432,8 @@ message.please.wait.while.zone.is.being.created=Patienter pendant la cr\u00e9ati
message.project.invite.sent=Invitation envoy\u00e9e ; les utilisateurs seront ajout\u00e9s apr\u00e8s acceptation de l\\'invitation
message.public.traffic.in.advanced.zone=Le trafic public est g\u00e9n\u00e9r\u00e9 lorsque les machines virtuelles dans le nuage acc\u00e8dent \u00e0 Internet. Des adresses IP publiquement accessibles doivent \u00eatre pr\u00e9vues \u00e0 cet effet. Les utilisateurs peuvent utiliser l\\'interface d\\'administration de CloudStack pour acqu\u00e9rir ces adresses IP qui impl\u00e9menteront une translation d\\'adresse NAT entre le r\u00e9seau d\\'invit\u00e9 et le r\u00e9seau public.<br/><br/>Fournir au moins une plage d\\'adresses IP pour le trafic Internet.
message.public.traffic.in.basic.zone=Le trafic public est g\u00e9n\u00e9r\u00e9 lorsque les machines virtuelles dans le nuage acc\u00e8dent \u00e0 Internet ou fournissent des services \u00e0 des utilisateurs sur Internet. Des adresses IP publiquement accessibles doivent \u00eatre pr\u00e9vus \u00e0 cet effet. Quand une instance est cr\u00e9\u00e9e, une adresse IP publique depuis un ensemble d\\'adresses IP publiques sera allou\u00e9e \u00e0 l\\'instance, en plus de l\\'adresse IP de l\\'invit\u00e9. La translation d\\'adresses statique NAT 1-1 sera mises en place automatiquement entre l\\'adresse IP publique et l\\'adresse IP de l\\'invit\u00e9. Les utilisateurs peuvent \u00e9galement utiliser l\\'interface d\\'administration CloudStack pour acqu\u00e9rir des adresses IP suppl\u00e9mentaires pour ajouter une translation d\\'adresse statique NAT entre leurs instances et le r\u00e9seau d\\'adresses IP publiques.
+message.redirecting.region=Redirection vers r\u00e9gion...
+message.remove.region=Confirmer que vous souhaitez supprimer cette r\u00e9gion depuis ce serveur d\\'administration ?
message.remove.vpc=Confirmer la suppression du VPC
message.remove.vpn.access=\u00cates-vous s\u00fbr que vous souhaitez supprimer l\\'acc\u00e8s VPN \u00e0 l\\'utilisateur suivant.
message.reset.password.warning.notPasswordEnabled=Le mod\u00e8le de cette instance a \u00e9t\u00e9 cr\u00e9\u00e9 sans la gestion de mot de passe
@@ -1412,7 +1458,9 @@ message.specify.url=Renseigner l\\'URL
message.step.1.continue=S\u00e9lectionnez un mod\u00e8le ou une image ISO pour continuer
message.step.1.desc=S\u00e9lectionnez un mod\u00e8le pour votre nouvelle instance virtuelle. Vous pouvez \u00e9galement choisir un mod\u00e8le vierge sur lequel une image ISO pourra \u00eatre install\u00e9e.
message.step.2.continue=S\u00e9lectionnez une offre de service pour continuer
+message.step.2.desc=
message.step.3.continue=S\u00e9lectionnez un offre de service de disque pour continuer
+message.step.3.desc=
message.step.4.continue=S\u00e9lectionnez au moins un r\u00e9seau pour continuer
message.step.4.desc=S\u00e9lectionnez le r\u00e9seau principal auquel votre instance va \u00eatre connect\u00e9.
message.storage.traffic=Trafic entre les ressources internes de CloudStack, incluant tous les composants qui communiquent avec le serveur d\\'administration, tels que les h\u00f4tes et les machines virtuelles Syst\u00e8mes CloudStack. Veuillez configurer le trafic de stockage ici.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_it_IT.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties
index f0c6524..78323b0 100644
--- a/client/WEB-INF/classes/resources/messages_it_IT.properties
+++ b/client/WEB-INF/classes/resources/messages_it_IT.properties
@@ -433,7 +433,6 @@ label.zone.name=Nome Zona
label.zones=Zone
label.zone.type=Tipo di Zona
label.zoneWizard.trafficType.guest=Guest\: Traffico di rete tra le virtual machine dell\\'utente finale
-label.zoneWizard.trafficType.management=Management\: Traffico di rete tra le risorse interne di CloudStack, incluso qualsiasi componente che comunichi con il Management Server, come ad esempio gli host e le VM di Sistema di CloudStack
label.zoneWizard.trafficType.public=Public\: Traffico di rete tra la rete internet e le virtual machine nell\\'infrastruttura cloud.
label.zoneWizard.trafficType.storage=Storage\: Traffico di rete tra i server di primary e secondary storage, come ad esempio i template delle VM e le operazioni di snapshot
message.acquire.new.ip=Si prega di confermare di voler acquisire un nuovo indirizzo IP per questa rete.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_ja.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index e4ea794..e483a97 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -785,7 +785,7 @@ label.os.preference=OS \u57fa\u672c\u8a2d\u5b9a
label.os.type=OS \u306e\u7a2e\u985e
label.owned.public.ips=\u6240\u6709\u3059\u308b\u30d1\u30d6\u30ea\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9
label.owner.account=\u6240\u6709\u8005\u30a2\u30ab\u30a6\u30f3\u30c8
-label.owner.domain=\u00e6\u0089\u0080\u00e6\u009c\u0089\u00e8\u0080\u0085\u00e3\u0083\u0089\u00e3\u0083\u00a1\u00e3\u0082\u00a4\u00e3\u0083\u00b3
+label.owner.domain=\u00e6\u0089\u0080\u00e6\u009c\u0089\u00e8\u0080
label.parent.domain=\u89aa\u30c9\u30e1\u30a4\u30f3
label.password.enabled=\u30d1\u30b9\u30ef\u30fc\u30c9\u7ba1\u7406\u6709\u52b9
label.password=\u30d1\u30b9\u30ef\u30fc\u30c9
@@ -1125,7 +1125,6 @@ label.zone.type=\u30be\u30fc\u30f3\u306e\u7a2e\u985e
label.zone=\u30be\u30fc\u30f3
label.zone.wide=\u30be\u30fc\u30f3\u5168\u4f53
label.zoneWizard.trafficType.guest=\u30b2\u30b9\u30c8\: \u30a8\u30f3\u30c9\u30e6\u30fc\u30b6\u30fc\u4eee\u60f3\u30de\u30b7\u30f3\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af
-label.zoneWizard.trafficType.management=\u7ba1\u7406\: \u30db\u30b9\u30c8\u3084\u30b7\u30b9\u30c6\u30e0VM\u306a\u3069\u3001\u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u3068\u901a\u4fe1\u3059\u308b\u3042\u3089\u3086\u308b\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u542b\u3081\u305f\u3001CloudStack\u5185\u90e8\u306e\u30ea\u30bd\u30fc\u30b9\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af
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
label.zoneWizard.trafficType.storage=\u30b9\u30c8\u30ec\u30fc\u30b8\: VM\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u3088\u3046\u306a\u3001\u30d7\u30e9\u30a4\u30de\u30ea\u3068\u30bb\u30ab\u30f3\u30c0\u30ea\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d0\u30fc\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u3002
managed.state=\u7ba1\u7406\u5bfe\u8c61\u72b6\u614b
@@ -1214,7 +1213,6 @@ message.add.load.balancer=\u30be\u30fc\u30f3\u306b\u8ca0\u8377\u5206\u6563\u88c5
message.add.load.balancer.under.ip=\u8ca0\u8377\u5206\u6563\u898f\u5247\u304c\u6b21\u306e IP \u30a2\u30c9\u30ec\u30b9\u306b\u5bfe\u3057\u3066\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\:
message.add.network=\u30be\u30fc\u30f3 <b><span id\="zone_name"></span></b> \u306b\u65b0\u3057\u3044\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u8ffd\u52a0\u3057\u307e\u3059
message.add.new.gateway.to.vpc=\u3053\u306e VPC \u306b\u65b0\u3057\u3044\u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306e\u60c5\u5831\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-message.add.pod.during.zone.creation=\u5404\u30be\u30fc\u30f3\u306b\u306f 1 \u3064\u4ee5\u4e0a\u306e\u30dd\u30c3\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002\u4eca\u3053\u3053\u3067\u6700\u521d\u306e\u30dd\u30c3\u30c9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002\u30dd\u30c3\u30c9\u306f\u30db\u30b9\u30c8\u3068\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8 \u30b5\u30fc\u30d0\u30fc\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u304c\u3001\u3053\u308c\u3089\u306f\u5f8c\u306e\u624b\u9806\u3067\u8ffd\u52a0\u3057\u307e\u3059\u3002\u6700\u521d\u306b\u3001CloudStack \u306e\u5185\u90e8\u7ba1\u7406\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u306e\u305f\u3081\u306b IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u3092\u4e88\u7d04\u3057\u307e\u3059\u3002IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306f\u3001\u30af\u30e9\u30a6\u30c9\u5185\u306e\u5404\u30be\u30fc\u30f3\u3067\u91cd\u8907\u3057\u306a\u3044\u3088\u3046\u306b\u4e88\u7d04\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
message.add.pod=\u30be\u30fc\u30f3 <b><span id\="add_pod_zone_name"></span></b> \u306b\u65b0\u3057\u3044\u30dd\u30c3\u30c9\u3092\u8ffd\u52a0\u3057\u307e\u3059
message.add.primary.storage=\u30be\u30fc\u30f3 <b><span id\="zone_name"></span></b> \u306e\u30dd\u30c3\u30c9 <b><span id\="pod_name"></span></b> \u306b\u65b0\u3057\u3044\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3059
message.add.primary=\u65b0\u3057\u3044\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u3001\u6b21\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -1275,7 +1273,6 @@ message.delete.VPN.gateway=\u3053\u306e VPN \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4
message.desc.advanced.zone=\u3088\u308a\u6d17\u7df4\u3055\u308c\u305f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u6280\u8853\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002\u3053\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30e2\u30c7\u30eb\u3092\u9078\u629e\u3059\u308b\u3068\u3001\u3088\u308a\u67d4\u8edf\u306b\u30b2\u30b9\u30c8\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u5b9a\u7fa9\u3057\u3001\u30d5\u30a1\u30a4\u30a2\u30a6\u30a9\u30fc\u30eb\u3001VPN\u3001\u8ca0\u8377\u5206\u6563\u88c5\u7f6e\u306e\u30b5\u30dd\u30fc\u30c8\u306e\u3088\u3046\u306a\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u305f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u3092\u63d0\u4f9b\u3067\u304d\u307e\u3059\u3002
message.desc.basic.zone=\u5404 VM \u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b IP \u30a2\u30c9\u30ec\u30b9\u304c\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304b\u3089\u76f4\u63a5\u5272\u308a\u5f53\u3066\u3089\u308c\u308b\u3001\u5358\u4e00\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7 (\u9001\u4fe1\u5143 IP \u30a2\u30c9\u30ec\u30b9\u306e\u30d5\u30a3\u30eb\u30bf\u30fc) \u306e\u3088\u3046\u306a\u30ec\u30a4\u30e4\u30fc 3 \u30ec\u30d9\u30eb\u306e\u65b9\u6cd5\u3067\u30b2\u30b9\u30c8\u3092\u5206\u96e2\u3067\u304d\u307e\u3059\u3002
message.desc.cluster=\u5404\u30dd\u30c3\u30c9\u306b\u306f 1 \u3064\u4ee5\u4e0a\u306e\u30af\u30e9\u30b9\u30bf\u30fc\u304c\u5fc5\u8981\u3067\u3059\u3002\u4eca\u3053\u3053\u3067\u6700\u521d\u306e\u30af\u30e9\u30b9\u30bf\u30fc\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002\u30af\u30e9\u30b9\u30bf\u30fc\u306f\u30db\u30b9\u30c8\u3092\u30b0\u30eb\u30fc\u30d7\u5316\u3059\u308b\u65b9\u6cd5\u3067\u3059\u30021 \u3064\u306e\u30af\u30e9\u30b9\u30bf\u30fc\u5185\u306e\u30db\u30b9\u30c8\u306f\u3059\u3079\u3066\u540c\u4e00\u306e\u30cf\u30fc\u30c9\u30a6\u30a7\u30a2\u304b\u3089\u69cb\u6210\u3055\u308c\u3001\u540c\u3058\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u3092\u5b9f\u884c\u3057\u3001\u540c\u3058\u30b5\u30d6\u30cd\u30c3\u30c8\u4e0a\u306b\u3042\u308a\u3001\u540c\u3058\u5171\u6709\u30b9\u30c8\u30ec\u30fc\u30b8\u306b\u30a2\u30af\u30bb\u30b9\u3057\u307e\u3059\u3002\u5404\u30af\u30e9\u30b9\u30bf\u30fc\u306f 1 \u3064\u4ee5\u4e0a\u306e\u30db\u30b9\u30c8\u3068 1 \u3064\u4ee5\u4e0a\u306e\u30d7\u30e9\u30a
4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8 \u30b5\u30fc\u30d0\u30fc\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002
-message.desc.host=\u5404\u30af\u30e9\u30b9\u30bf\u30fc\u306b\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u3001\u30b2\u30b9\u30c8 VM \u3092\u5b9f\u884c\u3059\u308b\u305f\u3081\u306e\u30db\u30b9\u30c8 (\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u30fc) \u304c\u5fc5\u8981\u3067\u3059\u3002\u4eca\u3053\u3053\u3067\u6700\u521d\u306e\u30db\u30b9\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002CloudStack \u3067\u30db\u30b9\u30c8\u3092\u6a5f\u80fd\u3055\u305b\u308b\u306b\u306f\u3001\u30db\u30b9\u30c8\u306b\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066 IP \u30a2\u30c9\u30ec\u30b9\u3092\u5272\u308a\u5f53\u3066\u3001\u30db\u30b9\u30c8\u304c CloudStack \u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u307e\u3059\u3002<br/><br/>\u30db\u30b9\u30c8\u306e DNS \u540d\u307e\u305f\u306f IP \u30a2\u30c9\u30ec\u30b9\u3001\u30e6\u30fc\u30b6\u30fc\u540d (\u901a\u5e38\u306f root) \u3068\u30d1\
u30b9\u30ef\u30fc\u30c9\u3001\u304a\u3088\u3073\u30db\u30b9\u30c8\u306e\u5206\u985e\u306b\u4f7f\u7528\u3059\u308b\u30e9\u30d9\u30eb\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
message.desc.primary.storage=\u5404\u30af\u30e9\u30b9\u30bf\u30fc\u306b\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u3001\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8 \u30b5\u30fc\u30d0\u30fc\u304c\u5fc5\u8981\u3067\u3059\u3002\u4eca\u3053\u3053\u3067\u6700\u521d\u306e\u30b5\u30fc\u30d0\u30fc\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306f\u3001\u30af\u30e9\u30b9\u30bf\u30fc\u5185\u306e\u30db\u30b9\u30c8\u4e0a\u3067\u52d5\u4f5c\u3059\u308b\u3059\u3079\u3066\u306e VM \u306e\u30c7\u30a3\u30b9\u30af \u30dc\u30ea\u30e5\u30fc\u30e0\u3092\u683c\u7d0d\u3057\u307e\u3059\u3002\u57fa\u790e\u3068\u306a\u308b\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u308b\u3001\u6a19\u6e96\u306b\u6e96\u62e0\u3057\u305f\u30d7\u30ed\u30c8\u30b3\u30eb\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
message.desc.secondary.storage=\u5404\u30be\u30fc\u30f3\u306b\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u3001NFS \u3064\u307e\u308a\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8 \u30b5\u30fc\u30d0\u30fc\u304c\u5fc5\u8981\u3067\u3059\u3002\u4eca\u3053\u3053\u3067\u6700\u521d\u306e\u30b5\u30fc\u30d0\u30fc\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306f VM \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3001ISO \u30a4\u30e1\u30fc\u30b8\u3001\u304a\u3088\u3073VM \u30c7\u30a3\u30b9\u30af \u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u683c\u7d0d\u3057\u307e\u3059\u3002\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306f\u30be\u30fc\u30f3\u5185\u306e\u3059\u3079\u3066\u306e\u30db\u30b9\u30c8\u3067\u4f7f\u7528\u3067\u304d\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<br/><br/>IP \u30a2\u30c9\u30ec\u30b9\u3068\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3055\u308c\u305f\u30d1\u30b9\u3092\
u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
message.desc.zone=\u30be\u30fc\u30f3\u306f CloudStack \u74b0\u5883\u5185\u306e\u6700\u5927\u306e\u7d44\u7e54\u5358\u4f4d\u3067\u3001\u901a\u5e38\u3001\u5358\u4e00\u306e\u30c7\u30fc\u30bf\u30bb\u30f3\u30bf\u30fc\u306b\u76f8\u5f53\u3057\u307e\u3059\u3002\u30be\u30fc\u30f3\u306b\u3088\u3063\u3066\u7269\u7406\u7684\u306a\u5206\u96e2\u3068\u5197\u9577\u6027\u304c\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002\u30be\u30fc\u30f3\u306f 1 \u3064\u4ee5\u4e0a\u306e\u30dd\u30c3\u30c9 (\u5404\u30dd\u30c3\u30c9\u306f\u30db\u30b9\u30c8\u3068\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8 \u30b5\u30fc\u30d0\u30fc\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059) \u3068\u3001\u30be\u30fc\u30f3\u5185\u306e\u3059\u3079\u3066\u306e\u30dd\u30c3\u30c9\u3067\u5171\u6709\u3055\u308c\u308b\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8 \u30b5\u30fc\u30d0\u30fc\u304b\u3089\u69cb\u6210\u3055\u308c\u307e\u3059\u3002
@@ -1347,7 +1344,7 @@ message.migrate.instance.to.ps=\u5225\u306e\u30d7\u30e9\u30a4\u30de\u30ea \u30b9
message.migrate.router.confirm=\u30eb\u30fc\u30bf\u30fc\u306e\u79fb\u884c\u5148\u306f\u6b21\u306e\u30db\u30b9\u30c8\u3067\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
message.migrate.systemvm.confirm=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u79fb\u884c\u5148\u306f\u6b21\u306e\u30db\u30b9\u30c8\u3067\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
message.migrate.volume=\u5225\u306e\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306b\u30dc\u30ea\u30e5\u30fc\u30e0\u3092\u79fb\u884c\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-message.new.user=\u00e3\u0082\u00a2\u00e3\u0082\u00ab\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u0088\u00e3\u0081\u00ab\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084\u00e3\u0083\u00a6\u00e3\u0083\u00bc\u00e3\u0082\u00b6\u00e3\u0083\u00bc\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083\u0085\u00e5\u00a0\u00b1\u00e3\u0082\u0092\u00e8\u00a8\u00ad\u00e5\u00ae\u009a\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084
+message.new.user=\u00e3\u0082\u00a2\u00e3\u0082\u00ab\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u0088\u00e3\u0081\u00ab\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084\u00e3\u0083\u00a6\u00e3\u0083\u00bc\u00e3\u0082\u00b6\u00e3\u0083\u00bc\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083
message.no.network.support.configuration.not.true=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u304c\u6709\u52b9\u306a\u30be\u30fc\u30f3\u304c\u7121\u3044\u305f\u3081\u3001\u8ffd\u52a0\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u6a5f\u80fd\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u624b\u9806 5. \u306b\u9032\u3093\u3067\u304f\u3060\u3055\u3044\u3002
message.no.network.support=\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u3068\u3057\u3066 vSphere \u3092\u9078\u629e\u3057\u307e\u3057\u305f\u304c\u3001\u3053\u306e\u30cf\u30a4\u30d1\u30fc\u30d0\u30a4\u30b6\u30fc\u306b\u8ffd\u52a0\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u6a5f\u80fd\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u624b\u9806 5. \u306b\u9032\u3093\u3067\u304f\u3060\u3055\u3044\u3002
message.no.projects.adminOnly=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002<br/>\u7ba1\u7406\u8005\u306b\u65b0\u3057\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4f5c\u6210\u3092\u4f9d\u983c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -1397,7 +1394,6 @@ message.step.3.continue=\u7d9a\u884c\u3059\u308b\u306b\u306f\u30c7\u30a3\u30b9\u
message.step.3.desc=
message.step.4.continue=\u7d9a\u884c\u3059\u308b\u306b\u306f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
message.step.4.desc=\u4eee\u60f3\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u63a5\u7d9a\u3059\u308b\u30d7\u30e9\u30a4\u30de\u30ea \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-message.storage.traffic=\u30db\u30b9\u30c8\u3084 CloudStack \u30b7\u30b9\u30c6\u30e0 VM \u306a\u3069\u3001\u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u3068\u901a\u4fe1\u3059\u308b CloudStack \u306e\u5185\u90e8\u30ea\u30bd\u30fc\u30b9\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u3067\u3059\u3002\u3053\u3053\u3067\u30b9\u30c8\u30ec\u30fc\u30b8 \u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u3092\u69cb\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
message.suspend.project=\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4e00\u6642\u505c\u6b62\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
message.template.desc=VM \u306e\u8d77\u52d5\u306b\u4f7f\u7528\u3067\u304d\u308b OS \u30a4\u30e1\u30fc\u30b8
message.tooltip.dns.1=\u30be\u30fc\u30f3\u5185\u306e VM \u3067\u4f7f\u7528\u3059\u308b DNS \u30b5\u30fc\u30d0\u30fc\u306e\u540d\u524d\u3067\u3059\u3002\u30be\u30fc\u30f3\u306e\u30d1\u30d6\u30ea\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9\u304b\u3089\u3001\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u901a\u4fe1\u3067\u304d\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
@@ -1422,8 +1418,8 @@ message.Zone.creation.complete=\u30be\u30fc\u30f3\u304c\u4f5c\u6210\u3055\u308c\
message.zone.creation.complete.would.you.like.to.enable.this.zone=\u30be\u30fc\u30f3\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002\u3053\u306e\u30be\u30fc\u30f3\u3092\u6709\u52b9\u306b\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
message.zone.no.network.selection=\u9078\u629e\u3057\u305f\u30be\u30fc\u30f3\u3067\u306f\u3001\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3092\u9078\u629e\u3067\u304d\u307e\u305b\u3093\u3002
message.zone.step.1.desc=\u30be\u30fc\u30f3\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30e2\u30c7\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-message.zone.step.2.desc=\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084Zone\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083\u0085\u00e5\u00a0\u00b1\u00e3\u0082\u0092\u00e5\u0085\u00a5\u00e5\u008a\u009b\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084\u00e3\u0080\u0082
-message.zone.step.3.desc=\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084Pod\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083\u0085\u00e5\u00a0\u00b1\u00e3\u0082\u0092\u00e5\u0085\u00a5\u00e5\u008a\u009b\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084\u00e3\u0080\u0082
+message.zone.step.2.desc=\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084Zone\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083
+message.zone.step.3.desc=\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084Pod\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083
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\u307e\u305f\u3001\u7121\u52b9\u72b6\u614b\u306e\u30be\u30fc\u30f3\u3092\u8d77\u52d5\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\u3001system.vm.use.local.storage \u3092 true \u306b\u8a2d\u5b9a\u3057\u3066\u304b\u3089\u30be\u30fc\u30f3\u3092\u6709\u52b9\u306b\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?
mode=\u30e2\u30fc\u30c9
network.rate=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u901f\u5ea6
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_ko_KR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ko_KR.properties b/client/WEB-INF/classes/resources/messages_ko_KR.properties
index 0a4f990..766fc60 100644
--- a/client/WEB-INF/classes/resources/messages_ko_KR.properties
+++ b/client/WEB-INF/classes/resources/messages_ko_KR.properties
@@ -1194,7 +1194,6 @@ message.add.load.balancer.under.ip=\ub2e4\uc74c IP \uc8fc\uc18c\uc5d0 \ub300\ud5
message.add.load.balancer=Zone\uc5d0 \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4.
message.add.network=Zone <b><span id\="zone_name"></span></b>\uc5d0 \uc0c8\ub85c\uc6b4 \ub124\ud2b8\uc6cc\ud06c\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4.
message.add.new.gateway.to.vpc=\ud604\uc7ac VPC\uc5d0 \uc0c8\ub85c\uc6b4 \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ucd94\uac00\ud558\uae30 \uc704\ud55c \uc815\ubcf4\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624.
-message.add.pod.during.zone.creation=\uac01 Zone\uc5d0\ub294 \ud55c \uac1c \uc774\uc0c1 Pod\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 Pod\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. Pod\ub294 \ud638\uc2a4\ud2b8\uc640 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uc5d0\uc11c \uad6c\uc131\ud569\ub2c8\ub2e4\ub9cc \uc774\ub294 \ub2e4\uc74c \uc21c\uc11c\ub85c \ucd94\uac00\ud569\ub2c8\ub2e4. \ub9e8 \ucc98\uc74c CloudStack \ub0b4\ubd80 \uad00\ub9ac \ud2b8\ub798\ud53d\uc744 \uc704\ud574\uc11c IP \uc8fc\uc18c \ubc94\uc704\ub97c \uc608\uc57d\ud569\ub2c8\ub2e4. IP \uc8fc\uc18c \ubc94\uc704\ub294 \ud074\ub77c\uc6b0\ub4dc \ub0b4\ubd80 \uac01 Zone\uc5d0\uc11c \uc911\ubcf5 \ud558\uc9c0 \uc54a\uac8c \uc608\uc57d\ud560 \ud544\uc694\uac00 \uc788\uc2b5\ub2c8\ub2e4.
message.add.pod=Zone <b><span id\="add_pod_zone_name"></span></b>\uc5d0 \uc0c8\ub85c\uc6b4 Pod\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4.
message.add.primary.storage=Zone <b><span id\="zone_name"></span></b> Pod <b><span id\="pod_name"></span></b>\uc5d0 \uc0c8\ub85c\uc6b4 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4.
message.add.primary=\uc0c8\ub85c\uc6b4 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ucd94\uac00\ud558\uae30 \uc704\ud574 \uc544\ub798 \ud30c\ub77c\ubbf8\ud130\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624.
@@ -1254,7 +1253,6 @@ message.delete.VPN.gateway=\ud604\uc7ac VPN \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c
message.desc.advanced.zone=\ubcf4\ub2e4 \uc138\ub828\ub41c \ub124\ud2b8\uc6cc\ud06c \uae30\uc220\uc744 \uc9c0\uc6d0\ud569\ub2c8\ub2e4. \uc774 \ub124\ud2b8\uc6cc\ud06c \ubaa8\ub378\uc744 \uc120\ud0dd\ud558\uba74, \ubcf4\ub2e4 \uc720\uc5f0\ud558\uac8c \uac8c\uc2a4\ud2b8 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc815\ud558\uace0 \ubc29\ud654\ubcbd(fire wall), VPN, \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58 \uae30\uc220 \uc9c0\uc6d0\uc640 \uac19\uc740 \uc0ac\uc6a9\uc790 \uc9c0\uc815 \ud55c \ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5\uc744 \uc81c\uacf5\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
message.desc.basic.zone=\uac01 VM \uc778\uc2a4\ud134\uc2a4\uc5d0 IP \uc8fc\uc18c\uac00 \ub124\ud2b8\uc6cc\ud06c\uc5d0\uc11c \uc9c1\uc811 \ud560\ub2f9\ud560 \uc218 \uc788\ub294 \ub2e8\uc77c \ub124\ud2b8\uc6cc\ud06c\ub97c \uc81c\uacf5\ud569\ub2c8\ub2e4. \ubcf4\uc548 \uadf8\ub8f9 (\uc804\uc1a1\uc6d0 IP \uc8fc\uc18c \ud544\ud130)\uacfc \uac19\uc740 \uce35 \uc138 \uac00\uc9c0 \ub808\ubca8 \ubc29\ubc95\uc73c\ub85c \uac8c\uc2a4\ud2b8\ub97c \ubd84\ub9ac\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
message.desc.cluster=\uac01 Pod\uc5d0\ub294 \ud55c \uac1c \uc774\uc0c1 \ud074\ub7ec\uc2a4\ud130\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \ucd5c\ucd08 \ud074\ub7ec\uc2a4\ud130\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. \ud074\ub7ec\uc2a4\ud130\ub294 \ud638\uc2a4\ud2b8\ub97c \uadf8\ub8f9\ud654 \ud558\ub294 \ubc29\ubc95\uc785\ub2c8\ub2e4. \ud55c \ud074\ub7ec\uc2a4\ud130 \ub0b4\ubd80 \ud638\uc2a4\ud2b8\ub294 \ubaa8\ub450 \ub3d9\uc77c\ud55c \ud558\ub4dc\uc6e8\uc5b4\uc5d0\uc11c \uad6c\uc131\ub418\uc5b4 \uac19\uc740 \ud558\uc774\ud37c \ubc14\uc774\uc800\ub97c \uc2e4\ud589\ud558\uace0 \uac19\uc740 \uc11c\ube0c \ub124\ud2b8\uc6cc\ud06c\uc0c1\uc5d0 \uc788\uc5b4 \uac19\uc740 \uacf5\uc720 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \uc811\uadfc \ud569\ub2c8\ub2e4. \uac01 \ud074\ub7ec\uc2a4\ud130\ub294 \ud55c \uac1c \uc774\uc0c1 \ud638\uc2a4\ud2b8\uc640 \ud55c \uac1c \uc774\uc0c1 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uc5d0\uc11c \uad6c\uc131\ub429\ub2c8\ub2e4.
-message.desc.host=\uac01 \ud074\ub7ec\uc2a4\ud130\uc5d0\ub294 \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1 \uac8c\uc2a4\ud2b8 VM\ub97c \uc2e4\ud589\ud558\uae30 \uc704\ud55c \ud638\uc2a4\ud2b8 (\ucef4\ud4e8\ud130)\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 \ud638\uc2a4\ud2b8\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. CloudStack\uc73c\ub85c \ud638\uc2a4\ud2b8\ub97c \ub3d9\uc791\ud558\ub824\uba74 \ud638\uc2a4\ud2b8\uc5d0\uac8c \ud558\uc774\ud37c \ubc14\uc774\uc800\ub97c \uc124\uce58\ud558\uace0 IP \uc8fc\uc18c\ub97c \ud560\ub2f9\ud574 \ud638\uc2a4\ud2b8\uac00 CloudStack \uad00\ub9ac \uc11c\ubc84\uc5d0 \uc811\uc18d\ud558\ub3c4\ub85d \ud569\ub2c8\ub2e4. <br/><br/>\ud638\uc2a4\ud2b8 DNS \uba85 \ub610\ub294 IP \uc8fc\uc18c, \uc0ac\uc6a9\uc790\uba85(\uc6d0\ub798 root)\uacfc \uc554\ud638 \ubc0f \ud638\uc2a4\ud2b8 \ubd84\ub958\uc5d0 \uc0ac\uc6a9\ud558\ub294 \ub77c\ubca8\uc744 \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624.
message.desc.primary.storage=\uac01 \ud074\ub7ec\uc2a4\ud130\uc5d0\ub294 \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1\uc758 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 \uc11c\ubc84\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub294 \ud074\ub7ec\uc2a4\ud130 \ub0b4 \ubd80 \ud638\uc2a4\ud2b8\uc0c1\uc5d0\uc11c \ub3d9\uc791\ud558\ub294 \ubaa8\ub4e0 VM \ub514\uc2a4\ud06c \ubcfc\ub968\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4. \uae30\ubcf8\uc801\uc73c\ub85c \ud558\uc774\ud37c \ubc14\uc774\uc800\uc5d0\uc11c \uae30\uc220 \uc9c0\uc6d0\ub418\ub294 \ud45c\uc900\uc5d0 \uc900\uac70\ud55c \ud504\ub85c\ud1a0\ucf5c\uc744 \uc0ac\uc6a9\ud574 \uc8fc\uc2ed\uc2dc\uc624.
message.desc.secondary.storage=\uac01 Zone\uc5d0\ub294 \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1\uc758 NFS \uc989 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 \uc11c\ubc84\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\ub294 VM \ud15c\ud50c\ub9bf, ISO \uc774\ubbf8\uc9c0 \ubc0f VM \ub514\uc2a4\ud06c \ubcfc\ub968 \uc2a4\ub0c5\uc0f7\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4. \uc774 \uc11c\ubc84\ub294 Zone\ub0b4 \ubaa8\ub4e0 \ud638\uc2a4\ud2b8\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. <br/><br/>IP \uc8fc\uc18c\uc640 \ub0b4\ubcf4\ub0b4\ub0bc \uacbd\ub85c\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624.
message.desc.zone=Zone\uc740 CloudStack \ud658\uacbd\ub0b4 \ucd5c\ub300 \uc870\uc9c1 \ub2e8\uc704\ub85c \uc6d0\ub798 \ub2e8\uc77c \ub370\uc774\ud130 \uc13c\ud130\uc5d0 \ud574\ub2f9\ud569\ub2c8\ub2e4. Zone\uc5d0 \ud574\uc11c \ubb3c\ub9ac\uc801\uc778 \ubd84\ub9ac\uc640 \uc911\ubcf5\uc131\uc774 \uc81c\uacf5\ub429\ub2c8\ub2e4. Zone\uc740 \ud55c \uac1c \uc774\uc0c1 Pod( \uac01 Pod\ub294 \ud638\uc2a4\ud2b8\uc640 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uc5d0\uc11c \uad6c\uc131)\uc640 Zone\ub0b4 \ubaa8\ub4e0 Pod\ub85c \uacf5\uc720\ub418\ub294 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\ub85c \uad6c\uc131\ub429\ub2c8\ub2e4.
@@ -1382,7 +1380,6 @@ message.step.3.continue=\uc2e4\ud589\ud558\ub824\uba74 \ub514\uc2a4\ud06c\uc81c\
message.step.3.desc=
message.step.4.continue=\uc2e4\ud589\ud558\ub824\uba74 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624.
message.step.4.desc=\uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\uac00 \uc811\uc18d\ud558\ub294 \uae30\ubcf8 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624.
-message.storage.traffic=\ud638\uc2a4\ud2b8\ub098 CloudStack \uc2dc\uc2a4\ud15c VM \ub4f1 \uad00\ub9ac \uc11c\ubc84\uc640 \ud1b5\uc2e0\ud558\ub294 CloudStack \ub0b4\ubd80 \uc790\uc6d0\uac04 \ud2b8\ub798\ud53d\uc785\ub2c8\ub2e4. \uc5ec\uae30\uc11c \uc2a4\ud1a0\ub9ac\uc9c0 \ud2b8\ub798\ud53d\uc744 \uad6c\uc131\ud574 \uc8fc\uc2ed\uc2dc\uc624.
message.suspend.project=\ud604\uc7ac \ud504\ub85c\uc81d\ud2b8\ub97c \uc77c\uc2dc\uc815\uc9c0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
message.template.desc=VM\uc758 \uc2dc\uc791\uc5d0 \uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 OS \uc774\ubbf8\uc9c0
message.tooltip.dns.1=Zone\ub0b4 VM \ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84 \uc774\ub984\uc785\ub2c8\ub2e4. Zone \uacf5\uac1c IP \uc8fc\uc18c\uc5d0\uc11c \uc774 \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index 780b844..23123c1 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -1113,7 +1113,6 @@ label.zones=Zonas
label.zone.type=Tipo de Zona
label.zone.wide=Zone-Wide
label.zoneWizard.trafficType.guest=H\u00f3spede\: tr\u00e1fego entre m\u00e1quinas virtuais de usu\u00e1rios finais
-label.zoneWizard.trafficType.management=Ger\u00eancia\: tr\u00e1fego entre recursos internos do CloudStack, incluindo quaisquer componentes que se comunicam com o servidor de gerenciamento, tais como hosts e m\u00e1quinas virtuais de sistema do CloudStack
label.zoneWizard.trafficType.public=P\u00fablico\: tr\u00e1fego entre a internet e m\u00e1quinas virtuais na nuvem.
label.zoneWizard.trafficType.storage=Storage\: tr\u00e1fego entre servidores de storage prim\u00e1ria e secund\u00e1ria, tais como templates de m\u00e1quinas virtuais e snapshots
label.zone=Zona
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/client/WEB-INF/classes/resources/messages_ru_RU.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties
index 5f492c0..5818abc 100644
--- a/client/WEB-INF/classes/resources/messages_ru_RU.properties
+++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties
@@ -1131,7 +1131,6 @@ message.additional.networks.desc=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u044
message.add.load.balancer=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0443 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0432 \u0437\u043e\u043d\u0443
message.add.load.balancer.under.ip=\u041f\u0440\u0430\u0432\u0438\u043b\u043e \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0431\u044b\u043b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 IP\:
message.add.network=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u0441\u0435\u0442\u044c \u0434\u043b\u044f \u0437\u043e\u043d\u044b\: <b><span id\="zone_name"></span></b>
-message.add.pod.during.zone.creation=\u041a\u0430\u0436\u0434\u0430\u044f \u0437\u043e\u043d\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0441\u0442\u0435\u043d\u0434\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0441\u0435\u0439\u0447\u0430\u0441 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043f\u0435\u0440\u0432\u044b\u043c. \u0421\u0442\u0435\u043d\u0434 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0443\u0437\u043b\u044b \u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u044b \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u044b \u0432 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u043c \u0448\u0430\u0433\u0435. \u0414\u043b\u044f \u043d\u0430\u0447\u0430\u043b\u0430 \u043d\u043
5\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u044b\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432 IP \u0434\u043b\u044f \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0435\u0439 \u0441\u0435\u0442\u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f. \u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u044b\u0445 IP \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u043c \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0439 \u0437\u043e\u043d\u044b \u043e\u0431\u043b\u0430\u043a\u0430.
message.add.pod=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0441\u0442\u0435\u043d\u0434 \u0434\u043b\u044f \u0437\u043e\u043d\u044b <b><span id\="add_pod_zone_name"></span></b>
message.add.primary.storage=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0434\u043b\u044f \u0437\u043e\u043d\u044b <b><span id\="zone_name"></span></b>, \u0441\u0442\u0435\u043d\u0434\u0430 <b><span id\="pod_name"></span></b>
message.add.primary=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430
@@ -1186,7 +1185,6 @@ message.delete.user=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442
message.desc.advanced.zone=\u0414\u043b\u044f \u0431\u043e\u043b\u0435\u0435 \u0441\u043b\u043e\u0436\u043d\u044b\u0445 \u0441\u0435\u0442\u0435\u0432\u044b\u0445 \u0442\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u0439. \u042d\u0442\u0430 \u0441\u0435\u0442\u0435\u0432\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u0435\u0442 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0433\u0438\u0431\u043a\u043e\u0441\u0442\u044c \u0432 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0438 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0439 \u0441\u0435\u0442\u0438 \u0438 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0441\u043b\u0443\u0433, \u0442\u0430\u043a\u0438\u0445 \u043a\u0430\u043a \u043c\u0435\u0436\u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u044d\u043a\u0440\u0430\u043d, VPN, \u0438\u043b\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0
43a\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438.
message.desc.basic.zone=\u041f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0435\u0434\u0438\u0441\u0442\u0432\u0435\u043d\u043d\u0443\u044e \u0441\u0435\u0442\u044c, \u0433\u0434\u0435 \u043a\u0430\u0436\u0434\u0430\u044f \u0412\u041c \u0438\u043c\u0435\u0435\u0442 \u00ab\u0431\u0435\u043b\u044b\u0439\u00bb IP-\u0430\u0434\u0440\u0435\u0441 \u0441\u0435\u0442\u0438. \u0418\u0437\u043e\u043b\u044f\u0446\u0438\u0438 \u0433\u043e\u0441\u0442\u0435\u0439 \u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0438\u0442\u044c\u0441\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u0441\u0435\u0442\u0438 3-\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 (\u0444\u0438\u043b\u044c\u0442\u0440\u0430\u0446\u0438\u044f IP-\u0432\u0434\u0440\u0435\u0441\u043e\u0432)
message.desc.cluster=\u041a\u0430\u0436\u0434\u044b\u0439 \u0441\u0442\u0435\u043d\u0434 \u0434\u043e\u043b\u0436\u0435\u043d \u0438\u043c\u0435\u0442\u044c \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u043e\u0432, \u043f\u0435\u0440\u0432\u044b\u0439 \u0438\u0437 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0432\u044b \u0441\u0435\u0439\u0447\u0430\u0441 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435. \u041a\u043b\u0430\u0441\u0442\u0435\u0440 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0433\u0440\u0443\u043f\u043f\u0443 \u0443\u0437\u043b\u043e\u0432. \u0423\u0437\u043b\u044b \u0432 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0435 \u0438\u043c\u0435\u044e\u0442 \u043e\u0434\u0438\u043d\u0430\u043a\u043e\u0432\u043e\u0435 \u043e\u0431\u043e\u0440\u0443\u0434\u043e\u0432\u0430\u043d\u0438\u0435, \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f \u0447\u043
5\u0440\u0435\u0437 \u043e\u0434\u0438\u043d \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440, \u043d\u0430\u0445\u043e\u0434\u044f\u0442\u0441\u044f \u0432 \u043e\u0434\u043d\u043e\u0439 \u0441\u0435\u0442\u0438 \u0438 \u0438\u043c\u0435\u044e\u0442 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043e\u0434\u043d\u043e\u043c\u0443 \u0438 \u0442\u043e\u043c\u0443 \u0436\u0435 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c\u0443 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0443. \u041a\u0430\u0436\u0434\u044b\u0439 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0443\u0437\u043b\u043e\u0432, \u0430 \u0442\u0430\u043a\u0436\u0435 \u0438\u0435\u0442\u044c \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0445 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449.
-message.desc.host=\u041a\u0430\u0436\u0434\u044b\u0439 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0434\u043e\u043b\u0436\u0435\u043d \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c \u043e\u0434\u0438\u043d \u0443\u0437\u0435\u043b (\u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440) \u0434\u043b\u044f \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0412\u041c, \u043f\u0435\u0440\u0432\u044b\u0439 \u0438\u0437 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0432\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u0441\u0435\u0439\u0447\u0430\u0441. \u0414\u043b\u044f \u0440\u0430\u0431\u043e\u0442\u044b \u0443\u0437\u043b\u0430 \u0432 CloudStack \u0432\u0430\u0436\u043d\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430 \u043d\u0430 \u0443\u0437\u0435\u043b, \u043f\u0440\u0438\u0432\u044f\u0437\u043a\u0430 IP \u043a \u0443\u0437\u043b\
u0443 \u0438 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0443\u0437\u043b\u0430 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f CloudStack.<br/><br/>\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0438\u043c\u044f DNS \u0438\u043b\u0438 \u0430\u0434\u0440\u0435\u0441 IP, \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438 \u043f\u0430\u0440\u043e\u043b\u044c \u043a \u041e\u0421 (\u043e\u0431\u044b\u0447\u043d\u043e root), \u0430 \u0442\u0430\u043a\u0436\u0435 \u043c\u0435\u0442\u043a\u0438 \u0434\u043b\u044f \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0443\u0437\u043b\u043e\u0432.
message.desc.primary.storage=\u041a\u0430\u0436\u0434\u0430\u044f \u0433\u0440\u0443\u043f\u043f\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043f\u0435\u0440\u0432\u0438\u0447\u043d\u044b\u0445 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u0432 \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445, \u0438 \u043c\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u043f\u0435\u0440\u0432\u044b\u0439 \u0441\u0435\u0439\u0447\u0430\u0441. \u041f\u0435\u0440\u0432\u0438\u0447\u043d\u0430\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043b\u043e\u0433\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u044b \u0436\u0435\u0441\u0442\u043a\u043e\u0433\u043e \u0434\u0438\u0441\u043a\u0430 \u0434\u043b\u044f \u0432\u0441\u0435
\u0445 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d, \u0440\u0430\u0431\u043e\u0442\u0430\u044e\u0449\u0438\u0445 \u043d\u0430 \u0443\u0437\u043b\u0430\u0445 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430. \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u043b\u044e\u0431\u043e\u0439 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u044b\u0439 \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0435 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430.
message.desc.secondary.storage=\u041a\u0430\u0436\u0434\u0430\u044f \u0437\u043e\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u043e\u0431\u043b\u0430\u0434\u0430\u0442\u044c \u0445\u043e\u0442\u044f \u0431\u044b \u043e\u0434\u043d\u0438\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c NFS \u0438\u043b\u0438 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u043c \u0438 \u0438\u0445 \u043d\u0430\u0434\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u043f\u0435\u0440\u0432\u0443\u044e \u043e\u0447\u0435\u0440\u0435\u0434\u044c. \u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432 \u0412\u041c,
\u043e\u0431\u0440\u0430\u0437\u043e\u0432 ISO \u0438 \u0441\u043d\u0438\u043c\u043a\u043e\u0432 \u0412\u041c. \u042d\u0442\u043e\u0442 \u0441\u0435\u0440\u0432\u0435\u0440 \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0443\u0437\u043b\u043e\u0432 \u0437\u043e\u043d\u044b.<br/><br/>\u041f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c IP-\u0430\u0434\u0440\u0435\u0441 \u0438 \u043f\u0443\u0442\u044c.
message.desc.zone=layer 3
@@ -1311,7 +1309,6 @@ message.step.3.continue=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\
message.step.3.desc=
message.step.4.continue=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0445\u043e\u0442\u044f \u0431\u044b \u043e\u0434\u043d\u0443 \u0441\u0435\u0442\u044c \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u044f.
message.step.4.desc=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0441\u0435\u0442\u044c, \u043a \u043a\u043e\u0442\u043e\u0440\u043e\u0439 \u0431\u0443\u0434\u0435\u0442 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u043c\u0430\u0448\u0438\u043d\u0430.
-message.storage.traffic=\u0422\u0440\u0430\u0444\u0438\u043a \u043c\u0435\u0436\u0434\u0443 \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u043c\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u0430\u043c\u0438 CloudStack, \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u0432\u0441\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0432\u0437\u0430\u0438\u043c\u043e\u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0442 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f, \u0442\u0430\u043a\u0438\u0435 \u043a\u0430\u043a \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u0445\u043e\u0441\u0442\u044b \u0438 CloudStack \u0441\u0438\u0441\u0442\u0435\u043c\u044b. \u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u0442\u0440\u0430\u0444\u0438\u043a \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0437\u0434\u0435\u0441\u044c.
message.suspend.project=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442?
message.template.desc=\u041e\u0431\u0440\u0430\u0437 \u041e\u0421, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u043e\u0447\u043d\u043e\u0439 \u0432 \u0412\u041c
message.tooltip.dns.1=\u0418\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 DNS \u0434\u043b\u044f \u0412\u041c \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u0434\u043e \u044d\u0442\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8545e68a/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 c842979..687ef60 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -1165,7 +1165,6 @@ label.zone.type=\u533a\u57df\u7c7b\u578b
label.zone=\u533a\u57df
label.zone.wide=\u6574\u4e2a\u533a\u57df
label.zoneWizard.trafficType.guest=\u6765\u5bbe\u7f51\u7edc\: \u5ba2\u6237\u865a\u62df\u673a\u4e4b\u95f4\u7684\u7f51\u7edc\u6d41\u91cf
-label.zoneWizard.trafficType.management=\u7ba1\u7406\u7f51\: CloudStack\u5185\u90e8\u8d44\u6e90\u4e4b\u95f4\u7684\u7f51\u7edc\u6d41\u91cf, \u5305\u62ec\u4e0e\u7ba1\u7406\u670d\u52a1\u5668\u4ea4\u4e92\u7684\u4efb\u4f55\u7ec4\u4ef6, \u6bd4\u5982\u4e3b\u673a\u548cCloudStack\u7cfb\u7edf\u865a\u62df\u673a
label.zoneWizard.trafficType.public=\u516c\u5171\u7f51\u7edc\: \u4e91\u73af\u5883\u4e2d\u865a\u62df\u673a\u4e0e\u56e0\u7279\u7f51\u4e4b\u95f4\u7684\u7f51\u7edc\u6d41\u91cf.
label.zoneWizard.trafficType.storage=\u5b58\u50a8\u7f51\: \u4e3b\u5b58\u50a8\u4e0e\u4e8c\u7ea7\u5b58\u50a8\u670d\u52a1\u5668\u4e4b\u95f4\u7684\u6d41\u91cf, \u6bd4\u5982\u865a\u673a\u6a21\u677f\u548c\u5feb\u7167
managed.state=\u6258\u7ba1\u72b6\u6001
@@ -1256,7 +1255,6 @@ message.add.load.balancer=\u5411\u533a\u57df\u4e2d\u6dfb\u52a0\u4e00\u4e2a\u8d1f
message.add.load.balancer.under.ip=\u5df2\u5728\u4ee5\u4e0b IP \u4e0b\u6dfb\u52a0\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219\:
message.add.network=\u4e3a\u533a\u57df\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7f51\u7edc\: <b><span id\="zone_name"></span></b>
message.add.new.gateway.to.vpc=\u8bf7\u6307\u5b9a\u5c06\u65b0\u7f51\u5173\u6dfb\u52a0\u5230\u6b64 VPC \u6240\u9700\u7684\u4fe1\u606f\u3002
-message.add.pod.during.zone.creation=\u6bcf\u4e2a\u533a\u57df\u4e2d\u5fc5\u987b\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4f9b\u70b9\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u63d0\u4f9b\u70b9\u3002\u63d0\u4f9b\u70b9\u4e2d\u5305\u542b\u4e3b\u673a\u548c\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\uff0c\u60a8\u5c06\u5728\u968f\u540e\u7684\u67d0\u4e2a\u6b65\u9aa4\u4e2d\u6dfb\u52a0\u8fd9\u4e9b\u4e3b\u673a\u548c\u670d\u52a1\u5668\u3002\u9996\u5148\uff0c\u8bf7\u4e3a CloudStack \u7684\u5185\u90e8\u7ba1\u7406\u6d41\u91cf\u914d\u7f6e\u4e00\u4e2a\u9884\u7559 IP \u5730\u5740\u8303\u56f4\u3002\u9884\u7559\u7684 IP \u8303\u56f4\u5bf9\u4e91\u4e2d\u7684\u6bcf\u4e2a\u533a\u57df\u6765\u8bf4\u5fc5\u987b\u552f\u4e00\u3002
message.add.pod=\u4e3a\u533a\u57df <b><span id\="add_pod_zone_name"></span></b> \u6dfb\u52a0\u4e00\u4e2a\u65b0\u63d0\u4f9b\u70b9
message.add.primary.storage=\u4e3a\u533a\u57df <b><span id\="zone_name"></span></b>\u3001\u63d0\u4f9b\u70b9 <b><span id\="pod_name"></span></b> \u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u4e3b\u5b58\u50a8
message.add.primary=\u8bf7\u6307\u5b9a\u4ee5\u4e0b\u53c2\u6570\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u4e3b\u5b58\u50a8
@@ -1318,7 +1316,6 @@ message.delete.VPN.gateway=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u966
message.desc.advanced.zone=\u9002\u7528\u4e8e\u66f4\u52a0\u590d\u6742\u7684\u7f51\u7edc\u62d3\u6251\u3002\u6b64\u7f51\u7edc\u6a21\u5f0f\u5728\u5b9a\u4e49\u6765\u5bbe\u7f51\u7edc\u5e76\u63d0\u4f9b\u9632\u706b\u5899\u3001VPN \u6216\u8d1f\u8f7d\u5e73\u8861\u5668\u652f\u6301\u7b49\u81ea\u5b9a\u4e49\u7f51\u7edc\u65b9\u6848\u65b9\u9762\u63d0\u4f9b\u4e86\u6700\u5927\u7684\u7075\u6d3b\u6027\u3002
message.desc.basic.zone=\u63d0\u4f9b\u4e00\u4e2a\u7f51\u7edc\uff0c\u5c06\u76f4\u63a5\u4ece\u6b64\u7f51\u7edc\u4e2d\u4e3a\u6bcf\u4e2a VM \u5b9e\u4f8b\u5206\u914d\u4e00\u4e2a IP\u3002\u53ef\u4ee5\u901a\u8fc7\u5b89\u5168\u7ec4\u7b49\u7b2c 3 \u5c42\u65b9\u5f0f\u63d0\u4f9b\u6765\u5bbe\u9694\u79bb(IP \u5730\u5740\u6e90\u8fc7\u6ee4)\u3002
message.desc.cluster=\u6bcf\u4e2a\u63d0\u4f9b\u70b9\u4e2d\u5fc5\u987b\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u7fa4\u96c6\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u7fa4\u96c6\u3002\u7fa4\u96c6\u63d0\u4f9b\u4e86\u4e00\u79cd\u7f16\u7ec4\u4e3b\u673a\u7684\u65b9\u6cd5\u3002\u7fa4\u96c6\u4e2d\u7684\u6240\u6709\u4e3b\u673a\u90fd\u5177\u6709\u76f8\u540c\u7684\u786c\u4ef6\uff0c\u8fd0\u884c\u76f8\u540c\u7684\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\uff0c\u4f4d\u4e8e\u76f8\u540c\u7684\u5b50\u7f51\u4e2d\uff0c\u5e76\u8bbf\u95ee\u76f8\u540c\u7684\u5171\u4eab\u5b58\u50a8\u3002\u6bcf\u4e2a\u7fa4\u96c6\u7531\u4e00\u4e2a\u6216\u591a\u4e2a\u4e3b\u673a\u4ee5\u53ca\u4e00\u4e2a\u6216\u591a\u4e2a\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u7ec4\u6210\u3002
-message.desc.host=\u6bcf\u4e2a\u7fa4\u96c6\u4e2d\u5fc5\u987b\u81f3\u5c11\u5305\u542b\u4e00\u4e2a\u4e3b\u673a\u4ee5\u4f9b\u6765\u5bbe VM \u5728\u4e0a\u9762\u8fd0\u884c\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u4e3b\u673a\u3002\u8981\u4f7f\u4e3b\u673a\u5728 CloudStack \u4e2d\u8fd0\u884c\uff0c\u5fc5\u987b\u5728\u6b64\u4e3b\u673a\u4e0a\u5b89\u88c5\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u8f6f\u4ef6\uff0c\u4e3a\u5176\u5206\u914d\u4e00\u4e2a IP \u5730\u5740\uff0c\u5e76\u786e\u4fdd\u5c06\u5176\u8fde\u63a5\u5230 CloudStack \u7ba1\u7406\u670d\u52a1\u5668\u3002<br/><br/>\u8bf7\u63d0\u4f9b\u4e3b\u673a\u7684 DNS \u6216 IP \u5730\u5740\u3001\u7528\u6237\u540d(\u901a\u5e38\u4e3a root)\u548c\u5bc6\u7801\uff0c\u4ee5\u53ca\u7528\u4e8e\u5bf9\u4e3b\u673a\u8fdb\u884c\u5206\u7c7b\u7684\u4efb\u4f55\u6807\u7b7e\u3002
message.desc.primary.storage=\u6bcf\u4e2a\u7fa4\u96c6\u4e2d\u5fc5\u987b\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u3002\u4e3b\u5b58\u50a8\u4e2d\u5305\u542b\u5728\u7fa4\u96c6\u4e2d\u7684\u4e3b\u673a\u4e0a\u8fd0\u884c\u7684\u6240\u6709 VM \u7684\u78c1\u76d8\u5377\u3002\u8bf7\u4f7f\u7528\u5e95\u5c42\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u652f\u6301\u7684\u7b26\u5408\u6807\u51c6\u7684\u534f\u8bae\u3002
message.desc.secondary.storage=\u6bcf\u4e2a\u533a\u57df\u4e2d\u5fc5\u987b\u81f3\u5c11\u5305\u542b\u4e00\u4e2a NFS \u6216\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a NFS \u6216\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668\u3002\u8f85\u52a9\u5b58\u50a8\u7528\u4e8e\u5b58\u50a8 VM \u6a21\u677f\u3001ISO \u6620\u50cf\u548c VM \u78c1\u76d8\u5377\u5feb\u7167\u3002\u6b64\u670d\u52a1\u5668\u5fc5\u987b\u5bf9\u533a\u57df\u4e2d\u7684\u6240\u6709\u670d\u52a1\u5668\u53ef\u7528\u3002<br/><br/>\u8bf7\u63d0\u4f9b IP \u5730\u5740\u548c\u5bfc\u51fa\u8def\u5f84\u3002
message.desc.zone=\u533a\u57df\u662f CloudStack \u4e2d\u6700\u5927\u7684\u7ec4\u7ec7\u5355\u4f4d\uff0c\u4e00\u4e2a\u533a\u57df\u901a\u5e38\u4e0e\u4e00\u4e2a\u6570\u636e\u4e2d\u5fc3\u76f8\u5bf9\u5e94\u3002\u533a\u57df\u53ef\u63d0\u4f9b\u7269\u7406\u9694\u79bb\u548c\u5197\u4f59\u3002\u4e00\u4e2a\u533a\u57df\u7531\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4f9b\u70b9\u4ee5\u53ca\u7531\u533a\u57df\u4e2d\u7684\u6240\u6709\u63d0\u4f9b\u70b9\u5171\u4eab\u7684\u4e00\u4e2a\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668\u7ec4\u6210\uff0c\u5176\u4e2d\u6bcf\u4e2a\u63d0\u4f9b\u70b9\u4e2d\u5305\u542b\u591a\u4e2a\u4e3b\u673a\u548c\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u3002
@@ -1448,7 +1445,6 @@ message.step.3.continue=\u8bf7\u9009\u62e9\u4e00\u79cd\u78c1\u76d8\u65b9\u6848\u
message.step.3.desc=
message.step.4.continue=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u4e2a\u7f51\u7edc\u4ee5\u7ee7\u7eed
message.step.4.desc=\u8bf7\u9009\u62e9\u865a\u62df\u5b9e\u4f8b\u8981\u8fde\u63a5\u5230\u7684\u4e3b\u7f51\u7edc\u3002
-message.storage.traffic=CloudStack \u5185\u90e8\u8d44\u6e90(\u5305\u62ec\u4e0e\u7ba1\u7406\u670d\u52a1\u5668\u901a\u4fe1\u7684\u4efb\u4f55\u7ec4\u4ef6\uff0c\u4f8b\u5982\u4e3b\u673a\u548c CloudStack \u7cfb\u7edf VM)\u4e4b\u95f4\u7684\u6d41\u91cf\u3002\u8bf7\u5728\u6b64\u5904\u914d\u7f6e\u5b58\u50a8\u6d41\u91cf\u3002
message.suspend.project=\u662f\u5426\u786e\u5b9e\u8981\u6682\u505c\u6b64\u9879\u76ee?
message.template.desc=\u53ef\u7528\u4e8e\u542f\u52a8 VM \u7684\u64cd\u4f5c\u7cfb\u7edf\u6620\u50cf
message.tooltip.dns.1=\u4f9b\u533a\u57df\u4e2d\u7684 VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\u540d\u79f0\u3002\u533a\u57df\u7684\u516c\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u6b64\u670d\u52a1\u5668\u3002
[28/50] [abbrv] git commit: updated refs/heads/internallb to 4c22c91
Posted by al...@apache.org.
CLOUDSTACK-2138 - add requirements in README to use sync-transifex-ui.sh script
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f2a2494
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f2a2494
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f2a2494
Branch: refs/heads/internallb
Commit: 0f2a249411635fff6e27092b2982dfe4a4e9c594
Parents: b633353
Author: Milamber <mi...@apache.org>
Authored: Mon Apr 29 11:47:45 2013 +0100
Committer: Milamber <mi...@apache.org>
Committed: Mon Apr 29 11:47:45 2013 +0100
----------------------------------------------------------------------
tools/transifex/README-transifex.txt | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2a2494/tools/transifex/README-transifex.txt
----------------------------------------------------------------------
diff --git a/tools/transifex/README-transifex.txt b/tools/transifex/README-transifex.txt
index 986aed7..4b1cd8d 100644
--- a/tools/transifex/README-transifex.txt
+++ b/tools/transifex/README-transifex.txt
@@ -18,6 +18,12 @@
sync-transifex-ui is a script to automate the synchronisation between
Apache CloudStack L10N resource files and Transifex CloudStack project.
+Requirements to use this script:
+* A GNU/Linux or Unix machine
+* Transifex client installed
+http://support.transifex.com/customer/portal/topics/440187-transifex-client/articles
+On Debian/Ubuntu: apt-get install transifex-client
+
Commun usage is:
1/ Init and configure the transifex client CLI