Muli Salem has uploaded a new change for review. Change subject: engine: Change Error Messages (#871864) ......................................................................
engine: Change Error Messages (#871864) This patch adds the vlan id to the error NETWORK_VLAN_IN_USE, and changes the range of legal vlan ids in the error to match the actual allowed range. Change-Id: I095ecde03174fabafbb556ffc82ba22a8b443a36 Bug-Url: https://bugzilla.redhat.com/871864 Signed-off-by: Muli Salem <msa...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateNetworkCommand.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/utils/src/test/resources/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_es.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.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_es.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.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 17 files changed, 32 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/9311/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddNetworkCommand.java index b327adc..1a483c1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddNetworkCommand.java @@ -84,6 +84,7 @@ return false; } })) { + addCanDoActionMessage(String.format("$vlanId %d", getParameters().getNetwork().getvlan_id())); addCanDoActionMessage(VdcBllMessages.NETWORK_VLAN_IN_USE); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateNetworkCommand.java index 1c8e14e..aee61d2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateNetworkCommand.java @@ -81,6 +81,7 @@ return false; } })) { + addCanDoActionMessage(String.format("$vlanId %d", getParameters().getNetwork().getvlan_id())); addCanDoActionMessage(VdcBllMessages.NETWORK_VLAN_IN_USE); return false; } 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 227aac5..1d089b2 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -380,7 +380,7 @@ ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=In order to complete the operation a new master Storage Domain needs to be elected, which requires at least one active Host in the Data Center.\n\ -Please make sure one of the Hosts is active in the Data Center first. -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 2 and 4905 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 0 and 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Cannot attach Storage Domain.\n\ -Please attach Data Domain to the Data Center first. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which contains active/locked Storage Domains.\n\ @@ -429,7 +429,7 @@ Network definition cannot be detached unless all references to it are cleared. NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Cannot change Network Interface properties when the VM is not Down. NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Cannot add a Network Interface when VM is not Down, Up or Image-Locked. -NETWORK_VLAN_IN_USE=The specified VLAN ID is already in use. +NETWORK_VLAN_IN_USE=The specified VLAN ID (${vlanId}) is already in use. NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Cluster has Networks that doesn't exist in the Data Center.\n\ -Please remove those Networks first. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=The specified Logical Network doesn't exist in the current Cluster. diff --git a/backend/manager/modules/utils/src/test/resources/AppErrors.properties b/backend/manager/modules/utils/src/test/resources/AppErrors.properties index ac2491c..e1f9d50 100644 --- a/backend/manager/modules/utils/src/test/resources/AppErrors.properties +++ b/backend/manager/modules/utils/src/test/resources/AppErrors.properties @@ -260,7 +260,7 @@ NETWORK_INTERFACE_NOT_HAVE_DISPLAY_FLAG=The specified interface is not a display interface NETWORK_NOT_EXISTS=Specified network doesn't exist ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=Cannot remove master Storage from Repository without other Active Data Storage. -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 2 and 4905 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 0 and 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_AND_ISO_DOMAINS=Cannot create Repository - There must be at least one Data storage and one ISO storage. ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=The first storage in a Repository must be Data storage. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which contains active/locked Storage Domains. Please deactivate all domains and wait for tasks to finish before removing the Data Center. @@ -302,7 +302,7 @@ NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE=Network is in use by a Template NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Cannot change Network status when the VM is not Down NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Cannot add a Network Interface when VM is not Down, Up or Image-Locked. -NETWORK_VLAN_IN_USE=Specified VLAN ID is in use +NETWORK_VLAN_IN_USE=Specified VLAN ID (${vlanId}) is in use NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Cluster has Networks that doesn't exist in the Data Center. Please remove those Networks first. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=Network doesn't exist in the current Cluster 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 2c9554f..f233eff 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 @@ -1009,7 +1009,7 @@ @DefaultStringValue("In order to complete the operation a new master Storage Domain needs to be elected, which requires at least one active Host in the Data Center.\n-Please make sure one of the Hosts is active in the Data Center first.") String ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE(); - @DefaultStringValue("VLAN ID must be a number between 2 and 4905") + @DefaultStringValue("VLAN ID must be a number between 0 and 4905") String NETWORK_VLAN_OUT_OF_RANGE(); @DefaultStringValue("Cannot attach Storage Domain.\n-Please attach Data Domain to the Data Center first.") @@ -1129,7 +1129,7 @@ @DefaultStringValue("Cannot add a Network Interface when VM is not Down, Up or Image-Locked.") String NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED(); - @DefaultStringValue("The specified VLAN ID is already in use.") + @DefaultStringValue("The specified VLAN ID (${vlanId}) is already in use.") String NETWORK_VLAN_IN_USE(); @DefaultStringValue("Cluster has Networks that doesn't exist in the Data Center.\n-Please remove those Networks first.") 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 436964c..7db1161 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 @@ -376,7 +376,7 @@ ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=In order to complete the operation a new master Storage Domain needs to be elected, which requires at least one active Host in the Data Center.\n\ -Please make sure one of the Hosts is active in the Data Center first. -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 2 and 4905 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 0 and 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Cannot attach Storage Domain.\n\ -Please attach Data Domain to the Data Center first. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which contains active/locked Storage Domains.\n\ @@ -425,7 +425,7 @@ Network definition cannot be detached unless all references to it are cleared. NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Cannot change Network Interface properties when the VM is not Down. NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Cannot add a Network Interface when VM is not Down, Up or Image-Locked. -NETWORK_VLAN_IN_USE=The specified VLAN ID is already in use. +NETWORK_VLAN_IN_USE=The specified VLAN ID (${vlanId}) is already in use. NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Cluster has Networks that doesn't exist in the Data Center.\n\ -Please remove those Networks first. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=The specified Logical Network doesn't exist in the current Cluster. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties index 558e23e..1b7d710 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties @@ -317,7 +317,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=No se puede borrar el dominio de almacenamiento maestro del centro de datos sin que otro dominio de almacenamiento activo tome su lugar.\n-Active otro dominio de almacenamiento en el centro de datos o borre el centro de datos. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=No se puede destruir el dominio de almacenamiento maestro del centro de datos sin que otro dominio de almacenamiento activo tome su lugar.\n-Active otro dominio de almacenamiento en el centro de datos o borre el centro de datos.\n-Si tiene problemas con el dominio de datos maestro considere el seguir el proceso de recuperaci\u00F3n descrito en la documentaci\u00F3n o contacte su administrador de sistemas. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=Con el fin de completar la operaci\u00F3n es necesario seleccionar un nuevo dominio de almacenamiento maestro, el cual requiere por lo menos un host activo en el centro de datos.\n-Primero aseg\u00FArese de que uno de los hosts est\u00E9 activo en el centro de datos. -NETWORK_VLAN_OUT_OF_RANGE=El id del VLAN debe ser un n\u00FAmero entre 2 y 4905 +NETWORK_VLAN_OUT_OF_RANGE=El id del VLAN debe ser un n\u00FAmero entre 0 y 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=No se puede adjuntar el dominio de almacenamiento.\n-Primero adjunte el dominio de datos al centro de datos. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=No se puede borrar el centro de datos que contenga dominios de almacenamiento activos/bloqueados.\n-Desactive todos los dominios y espere a que las tareas terminen antes de borrar el centro de datos. VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=No se puede cambiar la asociaci\u00F3n del centro de datos cuando se modifica un cl\u00FAster. @@ -366,7 +366,7 @@ NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=No se pueden cambiar las propiedades de la interfaz cuando la MV no est\u00E9 apagada. # auto translated by TM merge NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=No se puede agregar una interfaz de red cuando la MV no est\u00E9 apagada, prendida o con bloqueo de im\u00E1genes. -NETWORK_VLAN_IN_USE=El id de VLAN especificado ya est\u00E1 en uso. +NETWORK_VLAN_IN_USE=El id de VLAN (${vlanId}) especificado ya est\u00E1 en uso. # auto translated by TM merge NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=El cl\u00FAster tiene redes que no existen en el centro de datos.\n-Primero borre esas redes. # auto translated by TM merge diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties index d6cf9cd..ecb2acf 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties @@ -317,7 +317,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=Impossible de supprimer le Domaine de stockage ma\u00EEtre du Centre de donn\u00E9es sans qu'un autre Domaine de stockage ne prenne sa place.\n-Soit activer un autre Domaine de stockage dans le Centre de donn\u00E9es, soit supprimer le Centre de donn\u00E9es. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=Impossible de supprimer le domaine de stockage ma\u00EEtre du centre de donn\u00E9es sans qu'un autre domaine de stockage ne prenne sa place.\n-Soit activer un autre domaine de stockage dans le centre de donn\u00E9es, soit supprimer le centre de donn\u00E9es.\n-Si vous avez des probl\u00E8mes avec le domaine de donn\u00E9es ma\u00EEtre, consid\u00E9rez le processus de r\u00E9cup\u00E9ration d\u00E9crit dans la documentation, ou bien contacter administrateur de syst\u00E8mes. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=Afin de compl\u00E9ter l'op\u00E9ration, un nouveau domaine de stockage ma\u00EEtre doit \u00EAtre \u00E9lu, qui exige au moins un h\u00F4te actif dans le Centre de donn\u00E9es. \n-Veuillez vous assurer qu'un des h\u00F4tes est actif dans le Centre de donn\u00E9es pour commencer. -NETWORK_VLAN_OUT_OF_RANGE=L'ID VLAN doit correspondre \u00E0 un nombre entre 2 et 4905 +NETWORK_VLAN_OUT_OF_RANGE=L'ID VLAN doit correspondre \u00E0 un nombre entre 0 et 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Impossible d'attacher un domaine de stockage.\n-Veuillez attacher le Domaine de donn\u00E9es au Centre de donn\u00E9es pour commencer. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Impossible de supprimer le Centre de donn\u00E9es qui contient des Domaines de stockage actifs/verrouill\u00E9s.\n-Veuillez supprimer tous les domaines et attendre que les t\u00E2ches se terminent avant de supprimer les donn\u00E9es du Centre de donn\u00E9es. VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=Impossible de modifier l'association du Centre de donn\u00E9es quand vous \u00E9ditez un Cluster. @@ -357,7 +357,7 @@ NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Impossible de modifier les propri\u00E9t\u00E9s d'Interface de r\u00E9seau quand la VM n'est pas Down. NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Impossible d'ajouter une Interface de r\u00E9seau quand la VM n'est pas Down, Up ou Image-Locked. # auto translated by TM merge -NETWORK_VLAN_IN_USE=L'ID VLAN indiqu\u00E9e est d\u00E9j\u00E0 en cours d'utilisation. +NETWORK_VLAN_IN_USE=L'ID VLAN (${vlanId}) indiqu\u00E9e est d\u00E9j\u00E0 en cours d'utilisation. NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Le cluster a des R\u00E9seaux qui n'existent que dans le Centre de donn\u00E9es.\n-Veuillez supprimer tous les r\u00E9seaux pour commencer. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=Le R\u00E9seau logique n'existe pas dans le Cluster en cours. NETWORKS_NOT_IN_SYNC=Impossible de ${action} ${type}. Les d\u00E9finitions des r\u00E9seaux suivants sur les Interfaces r\u00E9seau sont diff\u00E9rentes de celles sur les r\u00E9seaux logiques. Veuillez synchroniser les Interfaces de r\u00E9seau avant de modifier les r\u00E9seaux \: ${NETWORKS_NOT_IN_SYNC}. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties index e9d2636..3ae5cee 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties @@ -317,7 +317,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=\u4EE3\u308F\u308A\u3068\u306A\u308B\u5225\u306E\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u304C\u306A\u3044\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u304B\u3089\u306F\u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u524A\u9664\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\n- \u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306E\u5225\u306E\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u30A2\u30AF\u30C6\u30A3\u30D6\u5316\u3059\u308B\u304B\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=\u4EE3\u308F\u308A\u3068\u306A\u308B\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u304C\u4ED6\u306B\u306A\u3044\u5834\u5408\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u304B\u3089\u306F\u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u7834\u68C4\u3067\u304D\u307E\u305B\u3093\u3002\n- \u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306E\u5225\u306E\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u30A2\u30AF\u30C6\u30A3\u30D6\u5316\u3059\u308B\u304B\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n- \u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u306B\u554F\u984C\u304C\u3042\u308B\u5834\u5408\u306B\u306F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u306B\u8A18\u8F09\u306E\u30EA\u30AB\u30D0\u30EA\u30D7\u30ED\u30BB\u30B9\u306B\u5F93\u3046\u3! 04B\u3001\u30B7\u30B9\u30C6\u30E0\u7BA1\u7406\u8005\u306B\u9023\u7D61\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=\u64CD\u4F5C\u3092\u5B8C\u4E86\u3059\u308B\u306B\u306F\u3001\u65B0\u898F\u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306B\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30DB\u30B9\u30C8\u304C\u5C11\u306A\u304F\u3068\u3082 1 \u53F0\u5FC5\u8981\u3067\u3059\u3002\n- \u6700\u521D\u306B\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u3067\u30DB\u30B9\u30C8\u304C 1 \u53F0\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u72B6\u614B\u3068\u306A\u3063\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u306F 2 \u304B\u3089 4905 \u306E\u7BC4\u56F2\u5185\u306E\u6570\u5B57\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u306F 0 \u304B\u3089 4905 \u306E\u7BC4\u56F2\u5185\u306E\u6570\u5B57\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u30A2\u30BF\u30C3\u30C1\u3067\u304D\u307E\u305B\u3093\u3002\n- \u6700\u521D\u306B\u30C7\u30FC\u30BF\u30C9\u30E1\u30A4\u30F3\u3092\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306B\u30A2\u30BF\u30C3\u30C1\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=\u30A2\u30AF\u30C6\u30A3\u30D6\u307E\u305F\u306F\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u542B\u3080\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n- \u3059\u3079\u3066\u306E\u30C9\u30E1\u30A4\u30F3\u3092\u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u5316\u3057\u3001\u30BF\u30B9\u30AF\u304C\u7D42\u4E86\u3057\u3066\u304B\u3089\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\u3002 VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7DE8\u96C6\u4E2D\u306B\u306F\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306E\u95A2\u9023\u4ED8\u3051\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002 @@ -355,7 +355,7 @@ NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306F\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306B\u3088\u3063\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u5B9A\u7FA9\u306F\u3001\u305D\u308C\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u53C2\u7167\u3092\u6D88\u53BB\u3057\u306A\u3051\u308C\u3070\u3001\u30C7\u30BF\u30C3\u30C1\u3067\u304D\u307E\u305B\u3093\u3002 NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C Down \u306E\u72B6\u614B\u3067\u306A\u3044\u6642\u306B\u306F\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u306F\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002 NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C Down\u3001Up\u3001\u3082\u3057\u304F\u306F Image-Locked \u4EE5\u5916\u306E\u72B6\u614B\u306E\u6642\u306B\u306F\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u306F\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3002 -NETWORK_VLAN_IN_USE=\u6307\u5B9A\u306E VLAN ID \u306F\u65E2\u306B\u4F7F\u7528\u4E2D\u3067\u3059\u3002 +NETWORK_VLAN_IN_USE=\u6307\u5B9A\u306E VLAN ID (${vlanId}) \u306F\u65E2\u306B\u4F7F\u7528\u4E2D\u3067\u3059\u3002 NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u306F\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306B\u5B58\u5728\u3057\u306A\u3044\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304C\u3042\u308A\u307E\u3059\u3002\n- \u6700\u521D\u306B\u305D\u308C\u3089\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002 NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=\u73FE\u5728\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u6307\u5B9A\u306E\u8AD6\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093\u3002 NETWORKS_NOT_IN_SYNC=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u306B\u5BFE\u3059\u308B\u4EE5\u4E0B\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u5B9A\u7FA9\u306F\u3001\u8AD6\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306B\u5BFE\u3059\u308B\u5B9A\u7FA9\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u7DE8\u96C6\u524D\u306B\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u3092\u540C\u671F\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ${NETWORKS_NOT_IN_SYNC}\u3002 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 8d684c0..3557f95 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 @@ -335,7 +335,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=Cannot remove the master Storage Domain from the Data Center without another active Storage Domain to take its place.\n-Either activate another Storage Domain in the Data Center, or remove the Data Center. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=Cannot destroy the master Storage Domain from the Data Center without another active Storage Domain to take its place.\n-Either activate another Storage Domain in the Data Center, or remove the Data Center.\n-If you have problems with the master Data Domain, consider following the recovery process described in the documentation, or contact your system administrator. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=In order to complete the operation a new master Storage Domain needs to be elected, which requires at least one active Host in the Data Center.\n-Please make sure one of the Hosts is active in the Data Center first. -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 2 and 4905 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 0 and 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Cannot attach Storage Domain.\n-Please attach Data Domain to the Data Center first. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which contains active/locked Storage Domains.\n-Please deactivate all domains and wait for tasks to finish before removing the Data Center. VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=Cannot change Data Center association when editing a Cluster. @@ -377,7 +377,7 @@ NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE=Cannot ${action} ${type}. The Network is in use by a Template.\nNetwork definition cannot be detached unless all references to it are cleared. NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Cannot change Network Interface properties when the VM is not Down. NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Cannot add a Network Interface when VM is not Down, Up or Image-Locked. -NETWORK_VLAN_IN_USE=The specified VLAN ID is already in use. +NETWORK_VLAN_IN_USE=The specified VLAN ID (${vlanId}) is already in use. NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Cluster has Networks that doesn't exist in the Data Center.\n-Please remove those Networks first. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=The specified Logical Network doesn't exist in the current Cluster. NETWORKS_NOT_IN_SYNC=Cannot ${action} ${type}. The following Networks' definitions on the Network Interfaces are different than those on the Logical Networks. Please synchronize the Network Interfaces before editing the networks\: ${NETWORKS_NOT_IN_SYNC}. 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 c4412d7..67fbfb7 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 @@ -317,7 +317,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=\u5982\u679C\u6CA1\u6709\u53E6\u5916\u4E00\u4E2A\u6D3B\u52A8\u7684\u5B58\u50A8\u57DF\u6765\u66FF\u4EE3\uFF0C\u5219\u65E0\u6CD5\u4ECE\u6570\u636E\u4E2D\u5FC3\u91CC\u5220\u9664\u4E3B\u5B58\u50A8\u57DF\u3002\n- \u8BF7\u6FC0\u6D3B\u6570\u636E\u4E2D\u5FC3\u91CC\u7684\u53E6\u5916\u4E00\u4E2A\u5B58\u50A8\u57DF\u6216\u8005\u5220\u9664\u6570\u636E\u4E2D\u5FC3\u3002 ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=\u5982\u679C\u6CA1\u6709\u53E6\u5916\u4E00\u4E2A\u6D3B\u52A8\u7684\u5B58\u50A8\u57DF\u6765\u66FF\u4EE3\uFF0C\u5219\u65E0\u6CD5\u4ECE\u6570\u636E\u4E2D\u5FC3\u91CC\u9500\u6BC1\u4E3B\u5B58\u50A8\u57DF\u3002\n- \u8BF7\u6FC0\u6D3B\u6570\u636E\u4E2D\u5FC3\u91CC\u7684\u53E6\u5916\u4E00\u4E2A\u5B58\u50A8\u57DF\u6216\u8005\u5220\u9664\u6570\u636E\u4E2D\u5FC3\u3002\n- \u5982\u679C\u4E3B\u6570\u636E\u57DF\u6709\u95EE\u9898\uFF0C\u8BF7\u8003\u8651\u91C7\u53D6\u6587\u6863\u91CC\u4ECB\u7ECD\u7684\u6062\u590D\u6B65\u9AA4\uFF0C\u6216\u8005\u8054\u7CFB\u7CFB\u7EDF\u7BA1\u7406\u5458\u3002 ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=\u4E3A\u4E86\u5B8C\u6210\u64CD\u4F5C\uFF0C\u4F60\u9700\u8981\u63D0\u540D\u4E00\u4E2A\u65B0\u7684\u4E3B\u5B58\u50A8\u57DF\uFF0C\u5B83\u9700\u8981\u5728\u6570\u636E\u4E2D\u5FC3\u81F3\u5C11\u6709\u4E00\u4E2A\u6D3B\u52A8\u4E3B\u673A\u3002\n- \u8BF7\u5148\u786E\u4FDD\u6570\u636E\u4E2D\u5FC3\u91CC\u6709\u4E00\u4E2A\u4E3B\u673A\u662F\u6D3B\u52A8\u7684\u3002 -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u5FC5\u987B\u662F 2 \u5230 4905 \u4E4B\u95F4\u7684\u6570\u5B57\u3002 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u5FC5\u987B\u662F 0 \u5230 4905 \u4E4B\u95F4\u7684\u6570\u5B57\u3002 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=\u65E0\u6CD5\u9644\u52A0\u5B58\u50A8\u5230\u6570\u636E\u4E2D\u5FC3\u3002\n- \u8BF7\u5148\u5C06\u6570\u636E\u57DF\u9644\u52A0\u6570\u636E\u4E2D\u5FC3\u3002 ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=\u65E0\u6CD5\u5220\u9664\u5305\u542B\u6D3B\u52A8/\u9501\u5B9A\u7684\u5B58\u50A8\u57DF\u7684\u6570\u636E\u4E2D\u5FC3\u3002\n- \u8BF7\u53D6\u6D88\u6FC0\u6D3B\u6240\u6709\u57DF\u5E76\u5728\u5220\u9664\u6570\u636E\u4E2D\u5FC3\u524D\u7B49\u5F85\u4EFB\u52A1\u5B8C\u6210\u3002 VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=\u5F53\u7F16\u8F91\u7FA4\u96C6\u65F6\u65E0\u6CD5\u4FEE\u6539\u6570\u636E\u4E2D\u5FC3\u7684\u5173\u8054\u3002 @@ -355,7 +355,7 @@ NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE=\u65E0\u6CD5 ${action} ${type}\u3002\u7F51\u7EDC\u6B63\u88AB\u4E00\u4E2A\u6A21\u677F\u4F7F\u7528\u3002\n- \u65E0\u6CD5\u5206\u79BB\u7F51\u7EDC\u5B9A\u4E49\uFF0C\u9664\u975E\u6240\u6709\u5F15\u7528\u90FD\u5DF2\u6E05\u9664\u3002 NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=\u5F53 VM \u6CA1\u6709\u4E0B\u7EBF\u65F6\u65E0\u6CD5\u4FEE\u6539\u7F51\u7EDC\u63A5\u53E3\u7684\u5C5E\u6027\u3002 NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=\u5F53 VM \u4E0D\u5904\u4E8E Down\u3001Up \u6216 Image-Locked \u65F6\u65E0\u6CD5\u6DFB\u52A0\u7F51\u7EDC\u63A5\u53E3\u3002 -NETWORK_VLAN_IN_USE=\u6307\u5B9A\u7684 VLAN ID \u5DF2\u88AB\u4F7F\u7528\u3002 +NETWORK_VLAN_IN_USE=\u6307\u5B9A\u7684 VLAN ID (${vlanId}) \u5DF2\u88AB\u4F7F\u7528\u3002 NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=\u7FA4\u96C6\u91CC\u8FD8\u6709\u4E0D\u5B58\u5728\u6570\u636E\u4E2D\u5FC3\u91CC\u7684\u7F51\u7EDC\u3002\n- \u8BF7\u5148\u5220\u9664\u8FD9\u4E9B\u7F51\u7EDC\u3002 NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=\u6307\u5B9A\u7684\u7F51\u7EDC\u63A5\u53E3\u6CA1\u6709\u5B58\u5728\u4E8E\u5F53\u524D\u7684\u7FA4\u96C6\u91CC\u3002 NETWORKS_NOT_IN_SYNC=\u65E0\u6CD5 ${action} ${type}\u3002\u4E0B\u5217\u7F51\u7EDC\u63A5\u53E3\u7684\u7F51\u7EDC\u5B9A\u4E49\u548C\u903B\u8F91\u7F51\u7EDC\u7684\u5B9A\u4E49\u4E0D\u540C\u3002\u8BF7\u5728\u7F16\u8F91\u7F51\u7EDC ${NETWORKS_NOT_IN_SYNC}\u4E4B\u524D\u540C\u6B65\u7F51\u7EDC\u63A5\u53E3\u3002 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 d41dd64..412366b 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 @@ -374,7 +374,7 @@ ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=In order to complete the operation a new master Storage Domain needs to be elected, which requires at least one active Host in the Data Center.\n\ -Please make sure one of the Hosts is active in the Data Center first. -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 2 and 4905 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 0 and 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Cannot attach Storage Domain.\n\ -Please attach Data Domain to the Data Center first. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which contains active/locked Storage Domains.\n\ @@ -423,7 +423,7 @@ Network definition cannot be detached unless all references to it are cleared. NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Cannot change Network Interface properties when the VM is not Down. NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Cannot add a Network Interface when VM is not Down, Up or Image-Locked. -NETWORK_VLAN_IN_USE=The specified VLAN ID is already in use. +NETWORK_VLAN_IN_USE=The specified VLAN ID (${vlanId}) is already in use. NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Cluster has Networks that doesn't exist in the Data Center.\n\ -Please remove those Networks first. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=The specified Logical Network doesn't exist in the current Cluster. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties index f17e5cb..e1ae33d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es.properties @@ -316,7 +316,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=No se puede borrar el dominio de almacenamiento maestro del centro de datos sin que otro dominio de almacenamiento activo tome su lugar.\n-Active otro dominio de almacenamiento en el centro de datos o borre el centro de datos. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=No se puede destruir el dominio de almacenamiento maestro del centro de datos sin que otro dominio de almacenamiento activo tome su lugar.\n-Active otro dominio de almacenamiento en el centro de datos o borre el centro de datos.\n-Si tiene problemas con el dominio de datos maestro considere el seguir el proceso de recuperaci\u00F3n descrito en la documentaci\u00F3n o contacte su administrador de sistemas. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=Con el fin de completar la operaci\u00F3n es necesario seleccionar un nuevo dominio de almacenamiento maestro, el cual requiere por lo menos un host activo en el centro de datos.\n-Primero aseg\u00FArese de que uno de los hosts est\u00E9 activo en el centro de datos. -NETWORK_VLAN_OUT_OF_RANGE=El id del VLAN debe ser un n\u00FAmero entre 2 y 4905 +NETWORK_VLAN_OUT_OF_RANGE=El id del VLAN debe ser un n\u00FAmero entre 0 y 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=No se puede adjuntar el dominio de almacenamiento.\n-Primero adjunte el dominio de datos al centro de datos. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=No se puede borrar el centro de datos que contenga dominios de almacenamiento activos/bloqueados.\n-Desactive todos los dominios y espere a que las tareas terminen antes de borrar el centro de datos. VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=No se puede cambiar la asociaci\u00F3n del centro de datos cuando se modifica un cl\u00FAster. @@ -354,7 +354,7 @@ NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE=No se puede ${action} ${type}. Una plantilla est\u00E1 utilizando la red.\nLa definici\u00F3n de red no se puede separar a menos de que todas las referencias a esta se limpien. NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=No se pueden cambiar las propiedades de la interfaz cuando la MV no est\u00E9 apagada. NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=No se puede agregar una interfaz de red cuando la MV no est\u00E9 apagada, prendida o con bloqueo de im\u00E1genes. -NETWORK_VLAN_IN_USE=El id de VLAN especificado ya est\u00E1 en uso. +NETWORK_VLAN_IN_USE=El id de VLAN (${vlanId}) especificado ya est\u00E1 en uso. NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=El cl\u00FAster tiene redes que no existen en el centro de datos.\n-Primero borre esas redes. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=La red l\u00F3gica especificada no exise en el cl\u00FAster actual. NETWORKS_NOT_IN_SYNC=No se puede ${action} ${type}. Las siguientes definiciones de la red en las interfaces de red son diferentes de las que se encuentran en las redes l\u00F3gicas. Sincronice las interfaces de red antes de modificar las redes\: ${NETWORKS_NOT_IN_SYNC}. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties index 2c717a5..917dbd8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr.properties @@ -629,7 +629,7 @@ # auto translated by TM merge ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=Afin de compl\u00E9ter l'op\u00E9ration, un nouveau Domaine de stockage ma\u00EEtre doit \u00EAtre \u00E9lu, ce qui exige au moins un H\u00F4te actif dans le Centre de donn\u00E9es. \n-Commencer par vous assurer qu'un des H\u00F4tes est actif dans le Centre de donn\u00E9es. # auto translated by TM merge -NETWORK_VLAN_OUT_OF_RANGE=L'ID VLAN doit correspondre \u00E0 un nombre entre 2 et 4905 +NETWORK_VLAN_OUT_OF_RANGE=L'ID VLAN doit correspondre \u00E0 un nombre entre 0 et 4905 # auto translated by TM merge ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Impossible d'attacher un Domaine de stockage.\n-Commencer par attacher le Domaine de donn\u00E9es au Centre de donn\u00E9es. # auto translated by TM merge @@ -704,7 +704,7 @@ NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Impossible de modifier les propri\u00E9t\u00E9s d'Interface de r\u00E9seau quand la VM n'est pas Down (inactive). # auto translated by TM merge NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Impossible d'ajouter une Interface de r\u00E9seau quand la VM n'est pas Down, Up ou Image-Locked. -NETWORK_VLAN_IN_USE=L'ID VLAN indiqu\u00E9e est d\u00E9j\u00E0 en cours d'utilisation. +NETWORK_VLAN_IN_USE=L'ID VLAN (${vlanId}) indiqu\u00E9e est d\u00E9j\u00E0 en cours d'utilisation. # auto translated by TM merge NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Le Cluster a des R\u00E9seaux qui n'existent que dans le Centre de donn\u00E9es.\n-Commencer par supprimer tous les R\u00E9seaux. # auto translated by TM merge diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties index 6de0074..e3427c3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja.properties @@ -316,7 +316,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=\u4EE3\u308F\u308A\u3068\u306A\u308B\u5225\u306E\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u304C\u306A\u3044\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u304B\u3089\u306F\u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u524A\u9664\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\n- \u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306E\u5225\u306E\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u30A2\u30AF\u30C6\u30A3\u30D6\u5316\u3059\u308B\u304B\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=\u4EE3\u308F\u308A\u3068\u306A\u308B\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u304C\u4ED6\u306B\u306A\u3044\u5834\u5408\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u304B\u3089\u306F\u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u7834\u68C4\u3067\u304D\u307E\u305B\u3093\u3002\n- \u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306E\u5225\u306E\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u30A2\u30AF\u30C6\u30A3\u30D6\u5316\u3059\u308B\u304B\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n- \u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u306B\u554F\u984C\u304C\u3042\u308B\u5834\u5408\u306B\u306F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u306B\u8A18\u8F09\u306E\u30EA\u30AB\u30D0\u30EA\u30D7\u30ED\u30BB\u30B9\u306B\u5F93\u3046\u3! 04B\u3001\u30B7\u30B9\u30C6\u30E0\u7BA1\u7406\u8005\u306B\u9023\u7D61\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=\u64CD\u4F5C\u3092\u5B8C\u4E86\u3059\u308B\u306B\u306F\u3001\u65B0\u898F\u30DE\u30B9\u30BF\u30FC\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306B\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30DB\u30B9\u30C8\u304C\u5C11\u306A\u304F\u3068\u3082 1 \u53F0\u5FC5\u8981\u3067\u3059\u3002\n- \u6700\u521D\u306B\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u3067\u30DB\u30B9\u30C8\u304C 1 \u53F0\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u72B6\u614B\u3068\u306A\u3063\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u306F 2 \u304B\u3089 4905 \u306E\u7BC4\u56F2\u5185\u306E\u6570\u5B57\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u306F 0 \u304B\u3089 4905 \u306E\u7BC4\u56F2\u5185\u306E\u6570\u5B57\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u30A2\u30BF\u30C3\u30C1\u3067\u304D\u307E\u305B\u3093\u3002\n- \u6700\u521D\u306B\u30C7\u30FC\u30BF\u30C9\u30E1\u30A4\u30F3\u3092\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306B\u30A2\u30BF\u30C3\u30C1\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=\u30A2\u30AF\u30C6\u30A3\u30D6\u307E\u305F\u306F\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u3092\u542B\u3080\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n- \u3059\u3079\u3066\u306E\u30C9\u30E1\u30A4\u30F3\u3092\u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u5316\u3057\u3001\u30BF\u30B9\u30AF\u304C\u7D42\u4E86\u3059\u308B\u306E\u3092\u5F85\u3063\u305F\u4E0A\u3067\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\u3002 VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7DE8\u96C6\u4E2D\u306B\u306F\u3001\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306E\u95A2\u9023\u4ED8\u3051\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002 @@ -354,7 +354,7 @@ NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306F\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306B\u3088\u3063\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u5B9A\u7FA9\u306F\u3001\u305D\u308C\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u53C2\u7167\u3092\u6D88\u53BB\u3057\u306A\u3051\u308C\u3070\u3001\u30C7\u30BF\u30C3\u30C1\u3067\u304D\u307E\u305B\u3093\u3002 NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C Down \u306E\u72B6\u614B\u3067\u306A\u3044\u6642\u306B\u306F\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u306F\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002 NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C Down\u3001Up\u3001\u3082\u3057\u304F\u306F Image-Locked \u4EE5\u5916\u306E\u72B6\u614B\u306E\u6642\u306B\u306F\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u306F\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3002 -NETWORK_VLAN_IN_USE=\u6307\u5B9A\u306E VLAN ID \u306F\u65E2\u306B\u4F7F\u7528\u4E2D\u3067\u3059\u3002 +NETWORK_VLAN_IN_USE=\u6307\u5B9A\u306E VLAN ID (${vlanId}) \u306F\u65E2\u306B\u4F7F\u7528\u4E2D\u3067\u3059\u3002 NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u306F\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306B\u5B58\u5728\u3057\u306A\u3044\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304C\u3042\u308A\u307E\u3059\u3002\n- \u6700\u521D\u306B\u305D\u308C\u3089\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002 NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=\u73FE\u5728\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u6307\u5B9A\u306E\u8AD6\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093\u3002 NETWORKS_NOT_IN_SYNC=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u306B\u5BFE\u3059\u308B\u4EE5\u4E0B\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u5B9A\u7FA9\u306F\u3001\u8AD6\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306B\u5BFE\u3059\u308B\u5B9A\u7FA9\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u7DE8\u96C6\u524D\u306B\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u3092\u540C\u671F\u3057\u3066\u304F\u3060\u3055\u3044\u3002 ${NETWORKS_NOT_IN_SYNC}\u3002 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 1625632..7037be4 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 @@ -331,7 +331,7 @@ ERROR_CANNOT_DETACH_LAST_STORAGE_DOMAIN=Cannot remove the master Storage Domain from the Data Center without another active Storage Domain to take its place.\n-Either activate another Storage Domain in the Data Center, or remove the Data Center. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN=Cannot destroy the master Storage Domain from the Data Center without another active Storage Domain to take its place.\n-Either activate another Storage Domain in the Data Center, or remove the Data Center.\n-If you have problems with the master Data Domain, consider following the recovery process described in the documentation, or contact your system administrator. ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=In order to complete the operation a new master Storage Domain needs to be elected, which requires at least one active Host in the Data Center.\n-Please make sure one of the Hosts is active in the Data Center first. -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 2 and 4905 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID must be a number between 0 and 4905 ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=Cannot attach Storage Domain.\n-Please attach Data Domain to the Data Center first. ERROR_CANNOT_REMOVE_POOL_WITH_ACTIVE_DOMAINS=Cannot remove Data Center which contains active/locked Storage Domains.\n-Please deactivate all domains and wait for tasks to finish before removing the Data Center. VDS_GROUP_CANNOT_CHANGE_STORAGE_POOL=Cannot change Data Center association when editing a Cluster. @@ -369,7 +369,7 @@ NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE=Cannot ${action} ${type}. The Network is in use by a Template.\nNetwork definition cannot be detached unless all references to it are cleared. NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN=Cannot change Network Interface properties when the VM is not Down. NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=Cannot add a Network Interface when VM is not Down, Up or Image-Locked. -NETWORK_VLAN_IN_USE=The specified VLAN ID is already in use. +NETWORK_VLAN_IN_USE=The specified VLAN ID (${vlanId}) is already in use. NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=Cluster has Networks that doesn't exist in the Data Center.\n-Please remove those Networks first. NETWORK_NOT_EXISTS_IN_CURRENT_CLUSTER=The specified Logical Network doesn't exist in the current Cluster. NETWORKS_NOT_IN_SYNC=Cannot ${action} ${type}. The following Networks' definitions on the Network Interfaces are different than those on the Logical Networks. Please synchronize the Network Interfaces before editing the networks\: ${NETWORKS_NOT_IN_SYNC}. 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 7d24774..38b9f25 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 @@ -612,7 +612,7 @@ # auto translated by TM merge ERROR_CANNOT_DESTROY_LAST_STORAGE_DOMAIN_HOST_NOT_ACTIVE=\u4E3A\u4E86\u5B8C\u6210\u64CD\u4F5C\uFF0C\u4F60\u9700\u8981\u63D0\u540D\u4E00\u4E2A\u65B0\u7684\u4E3B\u5B58\u50A8\u57DF\uFF0C\u5B83\u9700\u8981\u5728\u6570\u636E\u4E2D\u5FC3\u81F3\u5C11\u6709\u4E00\u4E2A\u6D3B\u52A8\u4E3B\u673A\u3002\n- \u8BF7\u5148\u786E\u4FDD\u6570\u636E\u4E2D\u5FC3\u91CC\u6709\u4E00\u4E2A\u4E3B\u673A\u662F\u6D3B\u52A8\u7684\u3002 # auto translated by TM merge -NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u5FC5\u987B\u662F 2 \u5230 4905 \u4E4B\u95F4\u7684\u6570\u5B57\u3002 +NETWORK_VLAN_OUT_OF_RANGE=VLAN ID \u5FC5\u987B\u662F 0 \u5230 4905 \u4E4B\u95F4\u7684\u6570\u5B57\u3002 # auto translated by TM merge ERROR_CANNOT_ADD_STORAGE_POOL_WITHOUT_DATA_DOMAIN=\u65E0\u6CD5\u9644\u52A0\u5B58\u50A8\u5230\u6570\u636E\u4E2D\u5FC3\u3002\n- \u8BF7\u5148\u5C06\u6570\u636E\u57DF\u9644\u52A0\u6570\u636E\u4E2D\u5FC3\u3002 # auto translated by TM merge @@ -687,7 +687,7 @@ # auto translated by TM merge NETWORK_CANNOT_ADD_INTERFACE_WHEN_VM_STATUS_NOT_UP_DOWN_LOCKED=\u5F53 VM \u4E0D\u5904\u4E8E Down\u3001Up \u6216 Image-Locked \u65F6\u65E0\u6CD5\u6DFB\u52A0\u7F51\u7EDC\u63A5\u53E3\u3002 # auto translated by TM merge -NETWORK_VLAN_IN_USE=\u6307\u5B9A\u7684 VLAN ID \u5DF2\u88AB\u4F7F\u7528\u3002 +NETWORK_VLAN_IN_USE=\u6307\u5B9A\u7684 VLAN ID (${vlanId}) \u5DF2\u88AB\u4F7F\u7528\u3002 # auto translated by TM merge NETWORK_CLUSTER_HAVE_NOT_EXISTING_DATA_CENTER_NETWORK=\u7FA4\u96C6\u91CC\u8FD8\u6709\u4E0D\u5B58\u5728\u6570\u636E\u4E2D\u5FC3\u91CC\u7684\u7F51\u7EDC\u3002\n- \u8BF7\u5148\u5220\u9664\u8FD9\u4E9B\u7F51\u7EDC\u3002 # auto translated by TM merge -- To view, visit http://gerrit.ovirt.org/9311 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I095ecde03174fabafbb556ffc82ba22a8b443a36 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <msa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
