Martin Mucha has uploaded a new change for review. Change subject: <core|userportal|webadmin>: added singular variant for messages. ......................................................................
<core|userportal|webadmin>: added singular variant for messages. changed messages not co contain plurals when dealing with sole item Change-Id: I75bc62e9de1eabe52481779638ecddade803604c Bug-Url: https://bugzilla.redhat.com/997197 Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties 23 files changed, 84 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/25737/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java index 96b0600..4597067 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java @@ -125,7 +125,7 @@ public ValidationResult clusterNetworkNotUsedByVms() { return networkNotUsed(getVmStaticDAO().getAllByGroupAndNetworkName(networkCluster.getClusterId(), network.getName()), - VdcBllMessages.VAR__ENTITIES__VMS); + VdcBllMessages.VAR__ENTITIES__VMS, VdcBllMessages.VAR__ENTITIES__VM); } public ValidationResult clusterNetworkNotUsedByTemplates() { @@ -137,7 +137,7 @@ } } } - return networkNotUsed(templatesUsingNetwork, VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES); + return networkNotUsed(templatesUsingNetwork, VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES, VdcBllMessages.VAR__ENTITIES__VM_TEMPLATE); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 13691fc..12de8c8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -244,7 +244,7 @@ } } - return networkNotUsed(runningVms, VdcBllMessages.VAR__ENTITIES__VMS); + return networkNotUsed(runningVms, VdcBllMessages.VAR__ENTITIES__VMS, VdcBllMessages.VAR__ENTITIES__VM); } public ValidationResult nonVmNetworkNotUsedByTemplates(Network updatedNetwork) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java index 1793fbf..6a48a74 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java @@ -146,13 +146,14 @@ : ValidationResult.VALID; } - protected ValidationResult networkNotUsed(List<? extends Nameable> entities, VdcBllMessages entitiesReplacement) { + protected ValidationResult networkNotUsed(List<? extends Nameable> entities, VdcBllMessages entitiesReplacementPlural, VdcBllMessages entitiesReplacementSingular) { if (entities.isEmpty()) { return ValidationResult.VALID; } Collection<String> replacements = ReplacementUtils.replaceWithNameable("ENTITIES_USING_NETWORK", entities); - replacements.add(entitiesReplacement.name()); + VdcBllMessages replacementMessageToUse = entities.size() == 1 ? entitiesReplacementSingular : entitiesReplacementPlural; + replacements.add(replacementMessageToUse.name()); return new ValidationResult(networkInUseValidationMessage(entities.size()), replacements); } @@ -165,7 +166,7 @@ * @return An error iff the network is in use by any VMs. */ public ValidationResult networkNotUsedByVms() { - return networkNotUsed(getVms(), VdcBllMessages.VAR__ENTITIES__VMS); + return networkNotUsed(getVms(), VdcBllMessages.VAR__ENTITIES__VMS, VdcBllMessages.VAR__ENTITIES__VM); } /** @@ -173,14 +174,14 @@ */ public ValidationResult networkNotUsedByHosts() { return networkNotUsed(getDbFacade().getVdsDao().getAllForNetwork(network.getId()), - VdcBllMessages.VAR__ENTITIES__HOSTS); + VdcBllMessages.VAR__ENTITIES__HOSTS, VdcBllMessages.VAR__ENTITIES__HOST); } /** * @return An error iff the network is in use by any templates. */ public ValidationResult networkNotUsedByTemplates() { - return networkNotUsed(getTemplates(), VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES); + return networkNotUsed(getTemplates(), VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES, VdcBllMessages.VAR__ENTITIES__VM_TEMPLATE); } /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java index 676817e..a9b9b5a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java @@ -75,12 +75,12 @@ } public ValidationResult vnicProfileNotUsedByVms() { - return vnicProfileNotUsed(getVmsUsingProfile(), VdcBllMessages.VAR__ENTITIES__VMS); + return vnicProfileNotUsed(getVmsUsingProfile(), VdcBllMessages.VAR__ENTITIES__VMS, VdcBllMessages.VAR__ENTITIES__VM); } public ValidationResult vnicProfileNotUsedByTemplates() { return vnicProfileNotUsed(getDbFacade().getVmTemplateDao().getAllForVnicProfile(vnicProfile.getId()), - VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES); + VdcBllMessages.VAR__ENTITIES__VM_TEMPLATES, VdcBllMessages.VAR__ENTITIES__VM_TEMPLATE); } public ValidationResult vnicProfileForVmNetworkOnly() { @@ -88,13 +88,14 @@ : new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_CANNOT_ADD_VNIC_PROFILE_TO_NON_VM_NETWORK); } - protected ValidationResult vnicProfileNotUsed(List<? extends Nameable> entities, VdcBllMessages entitiesReplacement) { + protected ValidationResult vnicProfileNotUsed(List<? extends Nameable> entities, VdcBllMessages entitiesReplacementPlural, VdcBllMessages entitiesReplacementSingular) { if (entities.isEmpty()) { return ValidationResult.VALID; } Collection<String> replacements = ReplacementUtils.replaceWithNameable("ENTITIES_USING_VNIC_PROFILE", entities); - replacements.add(entitiesReplacement.name()); + VdcBllMessages replacementMessageToUse = entities.size() == 1 ? entitiesReplacementSingular : entitiesReplacementPlural; + replacements.add(replacementMessageToUse.name()); return new ValidationResult(vNicProfileInUseValidationMessage(entities.size()), replacements); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index 02c0d60..9ee46b0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -5,12 +5,15 @@ Unassigned, VAR__TYPE__HOST, VAR__ENTITIES__HOSTS, + VAR__ENTITIES__HOST, VAR__TYPE__VM, VAR__ENTITIES__VMS, + VAR__ENTITIES__VM, VAR__TYPE__QUOTA, VAR__TYPE__VM__CLUSTER, VAR__TYPE__VM_TEMPLATE, VAR__ENTITIES__VM_TEMPLATES, + VAR__ENTITIES__VM_TEMPLATE, VAR__TYPE__SNAPSHOT, VAR__TYPE__DESKTOP_POOL, VAR__TYPE__VM_FROM_VM_POOL, diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index d0a850a..ab198a5 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -244,6 +244,7 @@ ACTION_TYPE_FAILED_CANNOT_RESIZE_DISK_SNAPSHOT=Cannot ${action} ${type}. Disk snapshot cannot be resized. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST=$entities host VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks VAR__TYPE__VNIC_PROFILE=$type VM network interface profile @@ -252,10 +253,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines +VAR__ENTITIES__VM=$entities virtual machine VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account VAR__TYPE__VM_TEMPLATE=$type Template VAR__ENTITIES__VM_TEMPLATES=$entities templates +VAR__ENTITIES__VM_TEMPLATE=$entities template VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM from VM-Pool diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 9815418..3489691 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -652,6 +652,9 @@ @DefaultStringValue("$entities hosts") String VAR__ENTITIES__HOSTS(); + @DefaultStringValue("$entities host") + String VAR__ENTITIES__HOST(); + @DefaultStringValue("$type Networks") String VAR__TYPE__NETWORKS(); @@ -676,6 +679,9 @@ @DefaultStringValue("$entities virtual machines") String VAR__ENTITIES__VMS(); + @DefaultStringValue("$entities virtual machine") + String VAR__ENTITIES__VM(); + @DefaultStringValue("$type Quota") String VAR__TYPE__QUOTA(); @@ -687,6 +693,9 @@ @DefaultStringValue("$entities templates") String VAR__ENTITIES__VM_TEMPLATES(); + + @DefaultStringValue("$entities template") + String VAR__ENTITIES__VM_TEMPLATE(); @DefaultStringValue("$type Snapshot") String VAR__TYPE__SNAPSHOT(); @@ -1342,7 +1351,7 @@ @DefaultStringValue("Cannot ${action} ${type}. The VM network interface profile's name is already used by an existing profile for the same network.\n-Please choose a different name.") String ACTION_TYPE_FAILED_VNIC_PROFILE_NAME_IN_USE(); - @DefaultStringValue("Cannot ${action} ${type}. This VM network interface profile is used by ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}): ${ENTITIES_USING_VNIC_PROFILE}.\\n - Please remove it from '${ENTITIES_USING_VNIC_PROFILE}' and try again.") + @DefaultStringValue("Cannot ${action} ${type}. This VM network interface profile is used by ${entities}: ${ENTITIES_USING_VNIC_PROFILE}.\\n - Please remove it from this ${entities} and try again.") String ACTION_TYPE_FAILED_VNIC_PROFILE_IN_ONE_USE(); @DefaultStringValue("Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}) are using this VM network interface profile:\n${ENTITIES_USING_VNIC_PROFILE}\n - Please remove it from all ${entities} that are using it and try again.") @@ -1405,7 +1414,7 @@ @DefaultStringValue("Cannot ${action} ${type}. The logical network's name is already used by an existing logical network in the same data-center.\n-Please choose a different name.") String ACTION_TYPE_FAILED_NETWORK_NAME_IN_USE(); - @DefaultStringValue("Cannot ${action} ${type}. This logical network is currently used by ${entities} (${ENTITIES_USING_NETWORK_COUNTER}): ${ENTITIES_USING_NETWORK}\\n - Please remove it from ${entities} using it and try again.") + @DefaultStringValue("Cannot ${action} ${type}. This logical network is currently used by ${entities}: ${ENTITIES_USING_NETWORK}\\n - Please remove it from this ${entities} and try again.") String ACTION_TYPE_FAILED_NETWORK_IN_ONE_USE(); @DefaultStringValue("Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_NETWORK_COUNTER}) are using this logical network:\n${ENTITIES_USING_NETWORK}\n - Please remove it from all ${entities} that are using it and try again.") diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index d28fb23..8e8cbb9 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -239,6 +239,7 @@ ACTION_TYPE_FAILED_CLOUD_INIT_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Cloud-Init is only supported on cluster compatibility version 3.3 and higher. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST=$entities host VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks VAR__TYPE__LABEL=$type Label @@ -247,10 +248,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines +VAR__ENTITIES__VM=$entities virtual machine VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account VAR__TYPE__VM_TEMPLATE=$type Template VAR__ENTITIES__VM_TEMPLATES=$entities templates +VAR__ENTITIES__VM_TEMPLATE=$entities template VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM from VM-Pool @@ -461,7 +464,7 @@ ACTION_TYPE_FAILED_NETWORK_QOS_NOT_EXISTS=The specified Network QoS doesn't exist. ACTION_TYPE_FAILED_VNIC_PROFILE_NOT_EXISTS=Cannot ${action} ${type}. The specified VM network interface profile doesn't exist. ACTION_TYPE_FAILED_VNIC_PROFILE_NAME_IN_USE=Cannot ${action} ${type}. The VM network interface profile's name is already used by an existing profile for the same network.\n-Please choose a different name. -ACTION_TYPE_FAILED_VNIC_PROFILE_IN_ONE_USE=Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}) are using this VM network interface profile:\n${ENTITIES_USING_VNIC_PROFILE}\n - Please remove it from all ${entities} that are using it and try again. +ACTION_TYPE_FAILED_VNIC_PROFILE_IN_ONE_USE=Cannot ${action} ${type}. This VM network interface profile is used by ${entities}: ${ENTITIES_USING_VNIC_PROFILE}.\n - Please remove it from this ${entities} and try again. ACTION_TYPE_FAILED_VNIC_PROFILE_IN_MANY_USES=Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}) are using this VM network interface profile:\n${ENTITIES_USING_VNIC_PROFILE}\n - Please remove it from all ${entities} that are using it and try again. ACTION_TYPE_FAILED_CANNOT_CHANGE_VNIC_PROFILE_NETWORK=Cannot ${action} ${type}. VM network interface profile's network cannot be changed. ACTION_TYPE_FAILED_CANNOT_ADD_VNIC_PROFILE_TO_NON_VM_NETWORK=Cannot ${action} ${type}. VM network interface profiles can be added to a VM network only. @@ -491,7 +494,7 @@ ACTION_TYPE_FAILED_NETWORK_NAME_IN_USE=Cannot ${action} ${type}. The logical network's name is already used by an existing logical network in the same data-center.\n\ -Please choose a different name. ACTION_TYPE_FAILED_NETWORK_IN_MANY_USES=Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_NETWORK_COUNTER}) are using this logical network:\n${ENTITIES_USING_NETWORK}\n - Please remove it from all ${entities} that are using it and try again. -ACTION_TYPE_FAILED_NETWORK_IN_ONE_USE=Cannot ${action} ${type}. This logical network is currently used by ${entities} (${ENTITIES_USING_NETWORK_COUNTER}): ${ENTITIES_USING_NETWORK}\n - Please remove it from ${entities} using it and try again. +ACTION_TYPE_FAILED_NETWORK_IN_ONE_USE=Cannot ${action} ${type}. This logical network is currently used by ${entities}: ${ENTITIES_USING_NETWORK}\n - Please remove it from this ${entities} and try again. ERROR_CANNOT_CREATE_STORAGE_DOMAIN_WITHOUT_VG_LV=Volume Group (VGs) and Logical Volumes (LVs) are not specified. NETWORK_INTERFACE_TEMPLATE_CANNOT_BE_SET=Cannot ${action} ${type}. VM Template ID must be empty. NETWORK_INTERFACE_VM_CANNOT_BE_SET=Cannot ${action} ${type}. VM ID must be empty. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties index 4d97b8d..ba87c7d 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties @@ -208,6 +208,7 @@ ACTION_TYPE_FAILED_CLOUD_INIT_IS_NOT_SUPPORTED=Kann nicht ${action} ${type}. Cloud-Init wird nur von Cluster-Kompatibilit\u00E4tsversion 3.3 und h\u00F6her unterst\u00FCtzt. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities Hosts +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type Netzwerk VAR__TYPE__NETWORKS=$type Netzwerke VAR__TYPE__LABEL=$type Bezeichnung @@ -216,10 +217,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type Provider Zertifikatskette VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities Virtuelle Maschinen +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Kontingent VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Konto VAR__TYPE__VM_TEMPLATE=$type Vorlage VAR__ENTITIES__VM_TEMPLATES=$entities Vorlagen +VAR__ENTITIES__VM_TEMPLATE= VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM vom VM-Pool diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties index fd3c9ec..23bb9ff 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties @@ -233,6 +233,7 @@ ACTION_TYPE_FAILED_CLOUD_INIT_IS_NOT_SUPPORTED=No se puede ${action} ${type}. Cloud-Init solo se soporta en la versi\u00F3n de compatibilidad del cl\u00FAster 3.3 y posteriores. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type Red VAR__TYPE__NETWORKS=$type Redes # auto translated by TM merge from project: oVirt, version: ovirt-3.4, DocId: frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors @@ -242,10 +243,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type cadena de certificados del proveedor VAR__TYPE__VM=$type MV VAR__ENTITIES__VMS=$entities m\u00E1quinas virtuales +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Cuota VAR__TYPE__COMPUTER_ACCOUNT=$type Cuenta del computador VAR__TYPE__VM_TEMPLATE=$type Plantilla VAR__ENTITIES__VM_TEMPLATES=$entities plantillas +VAR__ENTITIES__VM_TEMPLATE= VAR__TYPE__SNAPSHOT=$type Toma de pantalla VAR__TYPE__DESKTOP_POOL=$type MV-Pool VAR__TYPE__VM_FROM_VM_POOL=$type MV desde MV-Pool diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties index 908c9bf..24b65d1 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties @@ -233,6 +233,7 @@ ACTION_TYPE_FAILED_CLOUD_INIT_IS_NOT_SUPPORTED=Impossible de ${action} ${type}. Cloud-Init n'est pris en charge que sur le cluster de compatibilit\u00E9 version 3.3 ou sup\u00E9rieure. VAR__TYPE__HOST=$type H\u00F4te VAR__ENTITIES__HOSTS=$entities h\u00F4tes +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type R\u00E9seau VAR__TYPE__NETWORKS=$type R\u00E9seaux VAR__TYPE__LABEL=$type \u00C9tiquette @@ -241,10 +242,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type cha\u00EEne de certificat de fournisseur VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities machines virtuelles +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Compte informatique VAR__TYPE__VM_TEMPLATE=$type Mod\u00E8le VAR__ENTITIES__VM_TEMPLATES=$entities mod\u00E8les +VAR__ENTITIES__VM_TEMPLATE= VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type De VM \u00E0 VM-Pool diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties index 83ea059..62ca1fe 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties @@ -208,6 +208,7 @@ ACTION_TYPE_FAILED_CLOUD_INIT_IS_NOT_SUPPORTED=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002Cloud-Init \u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306F\u3001\u30AF\u30E9\u30B9\u30BF\u30FC\u4E92\u63DB\u30D0\u30FC\u30B8\u30E7\u30F3 3.3 \u4EE5\u964D\u306E\u307F\u3067\u3059\u3002 VAR__TYPE__HOST=$type \u30DB\u30B9\u30C8 VAR__ENTITIES__HOSTS=$entities \u30DB\u30B9\u30C8 +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF VAR__TYPE__NETWORKS=$type \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF VAR__TYPE__LABEL=$type \u30E9\u30D9\u30EB @@ -216,10 +217,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type \u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3 VAR__TYPE__VM=$type \u4EEE\u60F3\u30DE\u30B7\u30F3 VAR__ENTITIES__VMS=$entities \u4EEE\u60F3\u30DE\u30B7\u30F3 +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type \u30AF\u30A9\u30FC\u30BF VAR__TYPE__COMPUTER_ACCOUNT=$type \u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u30FC\u30A2\u30AB\u30A6\u30F3\u30C8 VAR__TYPE__VM_TEMPLATE=$type \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 VAR__ENTITIES__VM_TEMPLATES=$entities \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +VAR__ENTITIES__VM_TEMPLATE= VAR__TYPE__SNAPSHOT=$type \u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 VAR__TYPE__DESKTOP_POOL=$type \u4EEE\u60F3\u30DE\u30B7\u30F3\u30D7\u30FC\u30EB VAR__TYPE__VM_FROM_VM_POOL=$type \u4EEE\u60F3\u30DE\u30B7\u30F3\u30D7\u30FC\u30EB\u5185\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties index e7c99a2..f7b1475 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties @@ -160,14 +160,17 @@ ACTION_TYPE_FAILED_NO_VDS_IN_POOL=${type}\uC744/\uB97C ${action} \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uB370\uC774\uD130 \uC13C\uD130\uC5D0 \uD65C\uC131\uD654\uB41C \uD638\uC2A4\uD2B8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. VAR__TYPE__HOST=$type \uD638\uC2A4\uD2B8 VAR__ENTITIES__HOSTS=$entities \uD638\uC2A4\uD2B8 +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type \uB124\uD2B8\uC6CC\uD06C VAR__TYPE__NETWORKS=$type \uB124\uD2B8\uC6CC\uD06C VAR__TYPE__VM=$type \uAC00\uC0C1\uBA38\uC2E0 VAR__ENTITIES__VMS=$entities \uAC00\uC0C1\uBA38\uC2E0 +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type \uCFFC\uD130 VAR__TYPE__COMPUTER_ACCOUNT=$type \uCEF4\uD4E8\uD130 \uACC4\uC815 VAR__TYPE__VM_TEMPLATE=$type \uD15C\uD50C\uB9BF VAR__ENTITIES__VM_TEMPLATES=$entities \uD15C\uD50C\uB9BF +VAR__ENTITIES__VM_TEMPLATE= VAR__TYPE__SNAPSHOT=$type \uC2A4\uB0C5\uC0F7 VAR__TYPE__DESKTOP_POOL=$type \uAC00\uC0C1\uBA38\uC2E0 \uD480 VAR__TYPE__VM_FROM_VM_POOL=$type \uAC00\uC0C1\uBA38\uC2E0 \uD480\uC758 \uAC00\uC0C1\uBA38\uC2E0 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties index 9166fea..967a681 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties @@ -255,6 +255,7 @@ ACTION_TYPE_FAILED_CLOUD_INIT_IS_NOT_SUPPORTED=N\u00E3o foi poss\u00EDvel ${action} ${type}. O Cloud-Init est\u00E1 apenas suportado na vers\u00E3o 3.3 e mais atualizada de compatibilidade do cluster. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type Rede VAR__TYPE__NETWORKS=$type Redes # translation auto-copied from project oVirt, version ovirt-3.4, document frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors, author ldelima @@ -264,10 +265,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type corrente de certificado do provedor VAR__TYPE__VM=$type MV VAR__ENTITIES__VMS=$entities m\u00E1quinas virtuais +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Cota VAR__TYPE__COMPUTER_ACCOUNT=$type Conta do Computador VAR__TYPE__VM_TEMPLATE=$type Template VAR__ENTITIES__VM_TEMPLATES=$entities templates +VAR__ENTITIES__VM_TEMPLATE= VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type MV-Pool VAR__TYPE__VM_FROM_VM_POOL=$type MV a partir da MV-Pool diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties index 767347a..d0ef2c8 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties @@ -211,6 +211,7 @@ ACTION_TYPE_FAILED_CLOUD_INIT_IS_NOT_SUPPORTED=\u65E0\u6CD5 ${action} ${type}\u3002\u7FA4\u96C6\u517C\u5BB9\u6027\u7248\u672C 3.3 \u6216\u66F4\u9AD8\u624D\u652F\u6301 Cloud-init\u3002 VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks VAR__TYPE__LABEL=$type Label @@ -219,10 +220,11 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account VAR__TYPE__VM_TEMPLATE=$type Template -VAR__ENTITIES__VM_TEMPLATES=$entities templates +VAR__ENTITIES__VM_TEMPLATE= VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM from VM-Pool diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 83d0be5..89d5ac3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -241,6 +241,7 @@ ACTION_TYPE_FAILED_CANNOT_RESIZE_DISK_SNAPSHOT=Cannot ${action} ${type}. Disk snapshot cannot be resized. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST=$entities host VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks VAR__TYPE__LABEL=$type Label @@ -249,10 +250,12 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines +VAR__ENTITIES__VM=$entities virtual machine VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account VAR__TYPE__VM_TEMPLATE=$type Template -VAR__ENTITIES__VM_TEMPLATE=$entities templates +VAR__ENTITIES__VM_TEMPLATES=$entities templates +VAR__ENTITIES__VM_TEMPLATE=$entities template VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM from VM-Pool @@ -424,7 +427,7 @@ NETWORK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Network name already exists. ACTION_TYPE_FAILED_VNIC_PROFILE_NOT_EXISTS=Cannot ${action} ${type}. The specified VM network interface profile doesn't exist. ACTION_TYPE_FAILED_VNIC_PROFILE_NAME_IN_USE=Cannot ${action} ${type}. The VM network interface profile's name is already used by an existing profile for the same network.\n-Please choose a different name. -ACTION_TYPE_FAILED_VNIC_PROFILE_IN_ONE_USE=Cannot ${action} ${type}. This VM network interface profile is used by ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}): ${ENTITIES_USING_VNIC_PROFILE}.\n - Please remove it from '${ENTITIES_USING_VNIC_PROFILE}' and try again. +ACTION_TYPE_FAILED_VNIC_PROFILE_IN_ONE_USE=Cannot ${action} ${type}. This VM network interface profile is used by ${entities}: ${ENTITIES_USING_VNIC_PROFILE}.\n - Please remove it from this ${entities} and try again. ACTION_TYPE_FAILED_VNIC_PROFILE_IN_MANY_USES=Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}) are using this VM network interface profile:\n${ENTITIES_USING_VNIC_PROFILE}\n - Please remove it from all ${entities} that are using it and try again. ACTION_TYPE_FAILED_CANNOT_CHANGE_VNIC_PROFILE_NETWORK=Cannot ${action} ${type}. VM network interface profile's network cannot be changed. ACTION_TYPE_FAILED_CANNOT_ADD_VNIC_PROFILE_TO_NON_VM_NETWORK=Cannot ${action} ${type}. VM network interface profiles cannot be added to a non-VM network. Please make sure the network is a VM network. @@ -517,7 +520,7 @@ ACTION_TYPE_FAILED_NETWORK_NAME_IN_USE=Cannot ${action} ${type}. The logical network's name is already used by an existing logical network in the same data-center.\n\ -Please choose a different name. ACTION_TYPE_FAILED_NETWORK_IN_MANY_USES=Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_NETWORK_COUNTER}) are using this logical network:\n${ENTITIES_USING_NETWORK}\n - Please remove it from all ${entities} that are using it and try again. -ACTION_TYPE_FAILED_NETWORK_IN_ONE_USE=Cannot ${action} ${type}. This logical network is currently used by ${entities} (${ENTITIES_USING_NETWORK_COUNTER}): ${ENTITIES_USING_NETWORK}\n - Please remove it from ${entities} using it and try again. +ACTION_TYPE_FAILED_NETWORK_IN_ONE_USE=Cannot ${action} ${type}. This logical network is currently used by ${entities}: ${ENTITIES_USING_NETWORK}\n - Please remove it from this ${entities} and try again. ERROR_CANNOT_CREATE_STORAGE_DOMAIN_WITHOUT_VG_LV=Volume Group (VGs) and Logical Volumes (LVs) are not specified. NETWORK_INTERFACE_TEMPLATE_CANNOT_BE_SET=Cannot ${action} ${type}. VM Template ID must be empty. NETWORK_INTERFACE_VM_CANNOT_BE_SET=Cannot ${action} ${type}. VM ID must be empty. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties index 3efd0f8..fca0655 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties @@ -209,6 +209,7 @@ ACTION_TYPE_FAILED_CANNOT_RESIZE_DISK_SNAPSHOT=Kann ${type} nicht ${action}. Gr\u00F6\u00DFe des Disk-Schnappschuss kann nicht ge\u00E4ndert werden. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities Hosts +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type Netzwerk VAR__TYPE__NETWORKS=$type Netzwerke VAR__TYPE__LABEL=$type Bezeichnung @@ -217,9 +218,11 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type Provider Zertifikatskette VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities Virtuelle Maschinen +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Kontingent VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Konto VAR__TYPE__VM_TEMPLATE=$type Vorlage +VAR__ENTITIES__VM_TEMPLATES= VAR__ENTITIES__VM_TEMPLATE=$entities Vorlagen VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties index 9ef70f6..215bb3c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties @@ -221,6 +221,7 @@ ACTION_TYPE_FAILED_CANNOT_RESIZE_DISK_SNAPSHOT=No se puede ${action} ${type}. No se puede modificar el tama\u00F1o de la toma de pantalla del disco. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type Red VAR__TYPE__NETWORKS=$type Redes VAR__TYPE__LABEL=$type Etiqueta @@ -229,9 +230,11 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type cadena de certificados del proveedor VAR__TYPE__VM=$type MV VAR__ENTITIES__VMS=$entities m\u00E1quinas virtuales +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Cuota VAR__TYPE__COMPUTER_ACCOUNT=$type Cuenta del computador VAR__TYPE__VM_TEMPLATE=$type Plantilla +VAR__ENTITIES__VM_TEMPLATES= VAR__ENTITIES__VM_TEMPLATE=$entities plantillas VAR__TYPE__SNAPSHOT=$type Toma de pantalla VAR__TYPE__DESKTOP_POOL=$type MV-Pool diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties index 3e90ee5..8150b78 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties @@ -351,6 +351,7 @@ # auto translated by TM merge VAR__TYPE__HOST=$type H\u00F4te VAR__ENTITIES__HOSTS=$entities h\u00F4tes +VAR__ENTITIES__HOST= # auto translated by TM merge VAR__TYPE__NETWORK=$type R\u00E9seau # auto translated by TM merge @@ -362,12 +363,14 @@ # auto translated by TM merge VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities machines virtuelles +VAR__ENTITIES__VM= # auto translated by TM merge VAR__TYPE__QUOTA=$type Quota # auto translated by TM merge VAR__TYPE__COMPUTER_ACCOUNT=$type Compte informatique # auto translated by TM merge VAR__TYPE__VM_TEMPLATE=$type Mod\u00E8le +VAR__ENTITIES__VM_TEMPLATES= VAR__ENTITIES__VM_TEMPLATE=$entities mod\u00E8les # auto translated by TM merge VAR__TYPE__SNAPSHOT=$type Snapshot diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties index a0b4961..2fa7dc8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties @@ -209,6 +209,7 @@ ACTION_TYPE_FAILED_CANNOT_RESIZE_DISK_SNAPSHOT=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30C7\u30A3\u30B9\u30AF\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306F\u30B5\u30A4\u30BA\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002 VAR__TYPE__HOST=$type \u30DB\u30B9\u30C8 VAR__ENTITIES__HOSTS=$entities \u30DB\u30B9\u30C8 +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF VAR__TYPE__NETWORKS=$type \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF VAR__TYPE__LABEL=$type \u30E9\u30D9\u30EB @@ -217,9 +218,11 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type \u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3 VAR__TYPE__VM=$type \u4EEE\u60F3\u30DE\u30B7\u30F3 VAR__ENTITIES__VMS=$entities \u4EEE\u60F3\u30DE\u30B7\u30F3 +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type \u30AF\u30A9\u30FC\u30BF VAR__TYPE__COMPUTER_ACCOUNT=$type \u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u30FC\u30A2\u30AB\u30A6\u30F3\u30C8 VAR__TYPE__VM_TEMPLATE=$type \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +VAR__ENTITIES__VM_TEMPLATES= VAR__ENTITIES__VM_TEMPLATE=$entities \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 VAR__TYPE__SNAPSHOT=$type \u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 VAR__TYPE__DESKTOP_POOL=$type \u4EEE\u60F3\u30DE\u30B7\u30F3\u30D7\u30FC\u30EB diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties index c6d3ea0..6870012 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties @@ -158,13 +158,16 @@ ACTION_TYPE_FAILED_NO_VDS_IN_POOL=${type}\uC744/\uB97C ${action} \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uB370\uC774\uD130 \uC13C\uD130\uC5D0 \uD65C\uC131\uD654\uB41C \uD638\uC2A4\uD2B8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. VAR__TYPE__HOST=$type \uD638\uC2A4\uD2B8 VAR__ENTITIES__HOSTS=$entities \uD638\uC2A4\uD2B8 +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type \uB124\uD2B8\uC6CC\uD06C VAR__TYPE__NETWORKS=$type \uB124\uD2B8\uC6CC\uD06C VAR__TYPE__VM=$type \uAC00\uC0C1\uBA38\uC2E0 VAR__ENTITIES__VMS=$entities \uAC00\uC0C1\uBA38\uC2E0 +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type \uCFFC\uD130 VAR__TYPE__COMPUTER_ACCOUNT=$type \uCEF4\uD4E8\uD130 \uACC4\uC815 VAR__TYPE__VM_TEMPLATE=$type \uD15C\uD50C\uB9BF +VAR__ENTITIES__VM_TEMPLATES= VAR__ENTITIES__VM_TEMPLATE=$entities \uD15C\uD50C\uB9BF VAR__TYPE__SNAPSHOT=$type \uC2A4\uB0C5\uC0F7 VAR__TYPE__DESKTOP_POOL=$type \uAC00\uC0C1\uBA38\uC2E0 \uD480 diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties index 43178c8..a63a0fd 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties @@ -326,6 +326,7 @@ ACTION_TYPE_FAILED_CANNOT_RESIZE_DISK_SNAPSHOT=N\u00E3o foi poss\u00EDvel ${action} ${type}. O snapshot do disco n\u00E3o pode ser redimensionado. VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST= VAR__TYPE__NETWORK=$type Rede VAR__TYPE__NETWORKS=$type Redes # translation auto-copied from project oVirt, version ovirt-3.4, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors, author ldelima @@ -335,9 +336,11 @@ VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type corrente de certificado do provedor VAR__TYPE__VM=$type MV VAR__ENTITIES__VMS=$entities m\u00E1quinas virtuais +VAR__ENTITIES__VM= VAR__TYPE__QUOTA=$type Cota VAR__TYPE__COMPUTER_ACCOUNT=$type Conta do Computador VAR__TYPE__VM_TEMPLATE=$type Template +VAR__ENTITIES__VM_TEMPLATES= VAR__ENTITIES__VM_TEMPLATE=$entities templates VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type MV-Pool diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties index e94b8a0..b620b66 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties @@ -357,6 +357,7 @@ # auto translated by TM merge VAR__TYPE__HOST=$type Host VAR__ENTITIES__HOSTS=$entities hosts +VAR__ENTITIES__HOST= # auto translated by TM merge VAR__TYPE__NETWORK=$type Network # auto translated by TM merge @@ -369,12 +370,14 @@ # auto translated by TM merge VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines +VAR__ENTITIES__VM= # auto translated by TM merge VAR__TYPE__QUOTA=$type Quota # auto translated by TM merge VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account # auto translated by TM merge VAR__TYPE__VM_TEMPLATE=$type Template +VAR__ENTITIES__VM_TEMPLATES= VAR__ENTITIES__VM_TEMPLATE=$entities templates # auto translated by TM merge VAR__TYPE__SNAPSHOT=$type Snapshot -- To view, visit http://gerrit.ovirt.org/25737 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75bc62e9de1eabe52481779638ecddade803604c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
