Repository: cloudstack
Updated Branches:
  refs/heads/4.5 208a5655b -> 376b27a43


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_nl_NL.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_nl_NL.properties 
b/client/WEB-INF/classes/resources/messages_nl_NL.properties
index 35cd86c..3345d7f 100644
--- a/client/WEB-INF/classes/resources/messages_nl_NL.properties
+++ b/client/WEB-INF/classes/resources/messages_nl_NL.properties
@@ -252,7 +252,6 @@ label.add.account=Voeg Account toe
 label.add.ACL=Voeg ACL toe
 label.add.affinity.group=Nieuwe affinity groep toevoegen
 label.add.baremetal.dhcp.device=Voeg Baremetal DHCP Apparaat toe
-label.add.BigSwitchVns.device=Voeg BigSwitch Vns Controller toe
 label.add.by.cidr=Voeg toe door middel van CIDR
 label.add.by.group=Voeg toe door middel van Groep
 label.add.by=Voeg toe door middel van
@@ -261,7 +260,6 @@ label.add.compute.offering=Voeg Compute aanbieding toe
 label.add.direct.iprange=Voeg Direct IP Range toe
 label.add.disk.offering=Voeg Schijf Aanbieding toe
 label.add.domain=Voeg Domein toe
-label.added.new.bigswitch.vns.controller=Nieuwe BigSwitch VNS Controller 
toegevoegd
 label.added.nicira.nvp.controller=Nieuwe Nicira NVP Controller toegevoegd
 label.add.egress.rule=Voeg uitgaande regel toe
 label.addes.new.f5=Nieuwe F5 toegevoegd
@@ -384,8 +382,6 @@ label.baremetal.pxe.device=Voeg Baremetal PXE Apparaat toe
 label.baremetal.pxe.provider=Baremetal PXE Provider
 label.basic=Basis
 label.basic.mode=Basis Modus
-label.bigswitch.controller.address=BigSwitch Vns Controller Adres
-label.bigswitch.vns.details=BigSwitch VNS details
 label.blade.id=Blade ID
 label.blades=Blades
 label.bootable=Bootable
@@ -501,7 +497,6 @@ label.default.use=Standaard Gebruik
 label.default.view=Standaard Weergave
 label.delete.affinity.group=Verwijder Affinity Groep
 label.delete.alerts=Verwijder waarschuwingen
-label.delete.BigSwitchVns=Verwijder BigSwitch Vns Controller
 label.delete.ciscovnmc.resource=CiscoVNMC resource verwijderen
 label.delete.events=Verwijder gebeurtenissen
 label.delete.F5=Verwijder F5
@@ -565,7 +560,6 @@ label.disk.total=Schijf Totaal
 label.disk.volume=Schijf Volume
 label.disk.write.bytes=Schijf Schrijven (Bytes)
 label.disk.write.io=Schijf Schrijven (IO)
-label.display.name=Weergavenaam
 label.display.text=Weergavetekst
 label.distributedrouter=Gedistribueerde Router
 label.dns.1=DNS 1
@@ -733,7 +727,6 @@ label.installWizard.title=Hallo en welkom bij 
CloudStack&\#8482
 label.instance=Instantie
 label.instance.limits=Instantie Limieten
 label.instance.name=Instantie Naam
-label.instance.scaled.up=Instantie Omhoog Geschaald
 label.instances=Instanties
 label.instanciate.template.associate.profile.blade=Initieer Template en 
verbind Profiel met Blade
 label.internal.dns.1=Interne DNS 1
@@ -826,7 +819,6 @@ label.local.storage.enabled=Lokale opslag ingeschakeld
 label.local.storage=Lokale Opslag
 label.login=Login
 label.logout=Log uit
-label.saml.login=SAML Login
 label.lun=LUN
 label.LUN.number=LUN \#
 label.lxc.traffic.label=LXC verkeerslabel
@@ -906,6 +898,7 @@ label.migrate.router.to=Migreer Router naar
 label.migrate.systemvm.to=Migreer Systeem VM naar
 label.migrate.to.host=Migreer naar host
 label.migrate.to.storage=Migreer naar opslag
+label.migrate.volume.to.primary.storage=Migreer volume naar andere primaire 
opslag
 label.minimum=Minimum
 label.min.instances=Min Instances
 label.minute.past.hour=Minuten na het uur
@@ -1399,7 +1392,6 @@ label.view=Toon
 label.virtual.appliance.details=Virtual applicance details
 label.virtual.appliances=Virtueele Appliances
 label.virtual.appliance=Virtuele Appliance
-label.virtual.machines=Virtuele machines
 label.virtual.networking=Virtual Networking
 label.virtual.network=Virtueel Netwerk
 label.virtual.routers.group.account=Groepeer Virtuele Routers op account
@@ -1409,6 +1401,7 @@ label.virtual.routers.group.zone=Groepeer Virtuele 
Routers op zone
 label.virtual.routers=Virtuele Routers
 label.virtual.router=Virtuele Router
 label.vlan.id=VLAN/VNI ID
+label.vlan.only=VLAN
 label.vlan.range.details=VLAN Range details
 label.vlan.ranges=VLAN Range(s)
 label.vlan.range=VLAN/VNI Reeks
@@ -1482,7 +1475,6 @@ label.zone.dedicated=Zone toegewijd
 label.zone.details=Zone details
 label.zone.id=Zone ID
 label.zone.lower=zone
-label.zone.name=Zone naam
 label.zone.step.1.title=Stap 1\: <strong>Selecteer een Netwerk</strong>
 label.zone.step.2.title=Stap 2\: <strong>Zone toevoegen</strong>
 label.zone.step.3.title=Stap 3\: <strong>Pod toevoegen</strong>
@@ -1921,13 +1913,11 @@ state.Creating=Aanmaken
 state.Declined=Geweigerd
 state.Destroyed=Verwijderd
 state.Disabled=Uitgeschakeld
-state.enabled=Geactiveerd
 state.Enabled=Geactiveerd
 state.Error=Fout
 state.Expunging=Opruimen
 state.Migrating=MIgreren
 state.Pending=In afwachting
-state.ready=Klaar
 state.Ready=Klaar
 state.Running=Draaiend
 state.Starting=Starten

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_pl.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pl.properties 
b/client/WEB-INF/classes/resources/messages_pl.properties
index 0388b3f..ce9f3a9 100644
--- a/client/WEB-INF/classes/resources/messages_pl.properties
+++ b/client/WEB-INF/classes/resources/messages_pl.properties
@@ -227,7 +227,6 @@ label.disabled=Wy\u0142\u0105czony
 label.disable.vpn=Wy\u0142\u0105cz VPN
 label.disk.size.gb=Wielko\u015b\u0107 dysku (w GB)
 label.disk.size=Wielko\u015b\u0107 dysku
-label.display.name=Wy\u015bwietlana nazwa
 label.domain.admin=Administrator domeny
 label.domain=Domena
 label.domain.id=ID domeny
@@ -292,7 +291,6 @@ label.local.storage.enabled=Pami\u0119\u0107 lokalna 
w\u0142\u0105czona
 label.local.storage=Pami\u0119\u0107 lokalna
 label.login=Zaloguj
 label.logout=Wyloguj
-label.saml.login=SAML Zaloguj
 label.lun=LUN
 label.LUN.number=LUN \#
 label.max.guest.limit=Maksymalna liczba go\u015bci
@@ -427,6 +425,8 @@ label.user=U\u017cytkowni
 label.version=Wersja
 label.view.all=Zobacz wszystko
 label.view=Zobacz
+label.vlan.only=VLAN
+label.vlan=VLAN
 label.vm.add=Dodaj instancj\u0119
 label.vm.destroy=Zniszcz
 label.vmfs=VMFS
@@ -436,6 +436,7 @@ label.vmsnapshot.type=Wpisz
 label.vm.start=Rozpocznij
 label.vm.stop=Stop
 label.vms=VMs
+label.vnet=VLAN
 label.vpc=VPC
 label.vpn=VPN
 label.waiting=Czekanie
@@ -465,10 +466,8 @@ state.Creating=Tworzenie
 state.Declined=Odrzucono
 state.Destroyed=Zniszczono
 state.Disabled=Wy\u0142\u0105czony
-state.enabled=W\u0142\u0105czone
 state.Enabled=W\u0142\u0105czone
 state.Error=B\u0142\u0105d
-state.ready=Gotowe
 state.Ready=Gotowe
 state.Starting=Rozpoczynanie
 state.Stopped=Zatrzymano

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties 
b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index c925e6d..3d6fe4b 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -249,7 +249,6 @@ label.add.account.to.project=Adicionar conta ao projeto
 label.add.ACL=Adicionar ACL
 label.add=Adicionar
 label.add.affinity.group=Adicionar um grupo de afinidade
-label.add.BigSwitchVns.device=Adicionar BigSwitch Vns Controller
 label.add.by=Adicionado por
 label.add.by.cidr=Adicionar por CIDR
 label.add.by.group=Adicionar por Grupo
@@ -360,7 +359,6 @@ label.back=Voltar
 label.bandwidth=Bandwidth
 label.basic=B\u00e1sico
 label.basic.mode=Modo B\u00e1sico
-label.bigswitch.controller.address=Endere\u00e7o do Controlador BigSwitch Vns
 label.bootable=Inicializ\u00e1vel
 label.broadcast.domain.range=Range do dom\u00ednio de Broadcast
 label.broadcast.domain.type=Tipo de Dom\u00ednio Broadcast
@@ -455,7 +453,6 @@ label.default.use=Uso padr\u00e3o
 label.default.view=Vis\u00e3o Padr\u00e3o
 label.delete.affinity.group=Deletar Grupo de Afinidade
 label.delete.alerts=Remover alertas
-label.delete.BigSwitchVns=Remover Controlador BigSwitch Vns
 label.delete.events=Remover eventos
 label.delete.F5=Remover F5
 label.delete.gateway=delete gateway
@@ -506,7 +503,6 @@ label.disk.total=Disco Total
 label.disk.volume=Disco
 label.disk.write.bytes=Escrita no Disco (Bytes)
 label.disk.write.io=Escrita no Disco (I/O)
-label.display.name=Nome de exibi\u00e7\u00e3o
 label.display.text=Descri\u00e7\u00e3o
 label.dns.1=DNS 1
 label.dns.2=DNS 2
@@ -646,7 +642,6 @@ label.installWizard.title=Ol\u00e1, seja bem vindo ao 
CloudStack&\#8482
 label.instance=Inst\u00e2ncia
 label.instance.limits=Limites da Inst\u00e2ncia
 label.instance.name=Nome da Inst\u00e2ncia
-label.instance.scaled.up=Inst\u00e2ncia Escalada
 label.instances=Inst\u00e2ncias
 label.internal.dns.1=DNS 1 Interno
 label.internal.dns.2=DNS 2 Interno
@@ -728,7 +723,6 @@ label.local.storage.enabled=Storage local habilitada
 label.local.storage=Storage Local
 label.login=Entrar
 label.logout=Sair
-label.saml.login=SAML Entrar
 label.lun=LUN
 label.LUN.number=LUN \#
 label.make.project.owner=Criar propriet\u00e1rio de conta de projeto
@@ -804,6 +798,7 @@ label.migrate.router.to=Migrar Roteador para
 label.migrate.systemvm.to=Migrar VM de sistema para
 label.migrate.to.host=Migrar para outro host
 label.migrate.to.storage=Migrar para storage
+label.migrate.volume.to.primary.storage=Migrar volume para outro storage 
prim\u00e1rio
 label.minimum=M\u00ed\u00adnimo
 label.minute.past.hour=minuto(s) \u00daltima hora
 label.mode=Modo
@@ -1096,6 +1091,7 @@ label.specify.vxlan=Especificar VXLAN
 label.SR.name=SR Name-Label
 label.srx=SRX
 label.start.IP=IP do in\u00edcio
+label.start.lb.vm=Iniciar LB VM
 label.start.port=Porta de In\u00edcio
 label.start.reserved.system.IP=In\u00edcio dos IPs reservados para o sistema
 label.start.vlan=Vlan do in\u00edcio
@@ -1222,11 +1218,11 @@ label.view.secondary.ips=Visualizar os IPs 
secund\u00e1rios
 label.view=Visualizar
 label.virtual.appliance=Appliance Virtual
 label.virtual.appliances=Appliance Virtual
-label.virtual.machines=M\u00e1quinas virtuais
 label.virtual.network=Rede Virtual
 label.virtual.router=Roteador Virtual
 label.virtual.routers=Roteadores Virtuais
 label.vlan.id=VLAN ID
+label.vlan.only=VLAN
 label.vlan.range=Intervalo de VLAN
 label.vlan=VLAN
 label.vlan.vni.range=Intervalo de VLAN
@@ -1283,7 +1279,6 @@ label.xenserver.traffic.label=Etiqueta de tr\u00e1fego 
XenServer
 label.yes=Sim
 label.zone.details=Detalhes de zona
 label.zone.id=ID da Zona
-label.zone.name=Nome da zona
 label.zone.step.1.title=Passo 1\: <strong>Selecionar a Rede</strong>
 label.zone.step.2.title=Passo 2\: <strong>Adicionar a Zona</strong>
 label.zone.step.3.title=Passo 3\: <strong>Adicionar o POD</strong>
@@ -1633,13 +1628,11 @@ state.Creating=Criando
 state.Declined=Recusado
 state.Destroyed=Destru\u00eddo
 state.Disabled=Desativado
-state.enabled=Habilitado
 state.Enabled=Habilitado
 state.Error=Erro
 state.Expunging=Removendo
 state.Migrating=Migrando
 state.Pending=Pendente
-state.ready=Pronto
 state.Ready=Pronto
 state.Running=Executando
 state.Starting=Iniciando

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_ru_RU.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties 
b/client/WEB-INF/classes/resources/messages_ru_RU.properties
index 16427a1..8a43ff9 100644
--- a/client/WEB-INF/classes/resources/messages_ru_RU.properties
+++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties
@@ -245,7 +245,6 @@ 
label.add.account.to.project=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u
 label.add.account=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c 
\u0430\u043a\u043a\u0430\u0443\u043d\u0442
 label.add.ACL=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c ACL
 label.add.affinity.group=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c 
\u043d\u043e\u0432\u0443\u044e affinity group
-label.add.BigSwitchVns.device=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c 
BigSwitch Vns Controller
 label.add.by.cidr=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a CIDR
 label.add.by.group=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a 
\u0433\u0440\u0443\u043f\u043f\u0435
 label.add.by=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c
@@ -349,7 +348,6 @@ label.back=\u041d\u0430\u0437\u0430\u0434
 label.bandwidth=\u041f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u0430\u044f 
\u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c
 label.basic.mode=\u041f\u0440\u043e\u0441\u0442\u043e 
\u0440\u0435\u0436\u0438\u043c
 label.basic=\u041f\u0440\u043e\u0441\u0442\u043e\u0439
-label.bigswitch.controller.address=\u0410\u0434\u0440\u0435\u0441 
\u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440\u0430 BigSwitch VNC
 
label.bootable=\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0439
 label.broadcast.domain.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d 
\u0448\u0438\u0440\u043e\u043a\u043e\u0432\u0435\u0449\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e
 \u0434\u043e\u043c\u0435\u043d\u0430
 label.broadcast.domain.type=\u0422\u0438\u043f 
\u0448\u0438\u0440\u043e\u043a\u043e\u0432\u0435\u0449\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e
 \u0434\u043e\u043c\u0435\u043d\u0430
@@ -441,7 +439,6 @@ label.default.use=\u041f\u043e 
\u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\
 label.default.view=\u041e\u0431\u044b\u0447\u043d\u044b\u0439 
\u0432\u0438\u0434
 label.delete.affinity.group=\u0423\u0434\u0430\u043b\u0438\u0442\u044c 
affinity group
 label.delete.alerts=\u0423\u0434\u0430\u043b\u0438\u0442\u044c 
\u0442\u0440\u0435\u0432\u043e\u0433\u0438
-label.delete.BigSwitchVns=\u0423\u0434\u0430\u043b\u0438\u0442\u044c BigSwitch 
VNC \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440
 label.delete.events=\u0423\u0434\u0430\u043b\u0438\u0442\u044c 
\u0441\u043e\u0431\u044b\u0442\u0438\u044f
 label.delete.F5=\u0423\u0434\u0430\u043b\u0438\u0442\u044c F5
 label.delete.gateway=\u0423\u0434\u0430\u043b\u0438\u0442\u044c 
\u0448\u043b\u044e\u0437
@@ -490,7 +487,6 @@ label.disk.total=\u0412\u0441\u0435\u0433\u043e \u0432 
\u0434\u0438\u0441\u043a\
 label.disk.volume=\u0422\u043e\u043c \u0434\u0438\u0441\u043a\u0430
 label.disk.write.bytes=\u0417\u0430\u043f\u0438\u0441\u0430\u043d\u043e 
\u043d\u0430 \u0434\u0438\u0441\u043a (\u0411\u0430\u0439\u0442)
 label.disk.write.io=\u0417\u0430\u043f\u0438\u0441\u0430\u043d\u043e 
\u043d\u0430 \u0434\u0438\u0441\u043a (IO)
-label.display.name=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0435
 \u0438\u043c\u044f
 
label.display.text=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u044b\u0439
 \u0442\u0435\u043a\u0441\u0442
 label.dns.1=DNS 1
 label.dns.2=DNS 2
@@ -689,7 +685,6 @@ 
label.local.storage=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u044
 label.local=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439
 label.login=\u0412\u0445\u043e\u0434
 label.logout=\u0412\u044b\u0445\u043e\u0434
-label.saml.login=SAML \u0412\u0445\u043e\u0434
 label.lun=LUN
 label.LUN.number=LUN \#
 label.make.project.owner=\u0421\u0434\u0435\u043b\u0430\u0442\u044c 
\u0430\u043a\u043a\u0430\u0443\u043d\u0442 
\u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0435\u043c 
\u043f\u0440\u043e\u0435\u043a\u0442\u0430
@@ -765,6 +760,7 @@ 
label.migrate.router.to=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \
 
label.migrate.systemvm.to=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438
 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u0412\u041c \u0432
 label.migrate.to.host=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 
\u043d\u0430 \u0443\u0437\u0435\u043b
 
label.migrate.to.storage=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 
\u043d\u0430 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435
+label.migrate.volume.to.primary.storage=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438
 \u0442\u043e\u043c \u0432 \u0434\u0440\u0443\u0433\u043e\u0435 
\u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 
\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435
 label.minimum=\u041c\u0438\u043d\u0438\u043c\u0443\u043c
 label.minute.past.hour=\u041c\u0438\u043d\u0443\u0442\u0430
 label.mode=\u0420\u0435\u0436\u0438\u043c
@@ -1150,11 +1146,11 @@ 
label.view.secondary.ips=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0434
 label.view=\u0412\u0438\u0434
 
label.virtual.appliances=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435
 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430
 
label.virtual.appliance=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0435
 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e
-label.virtual.machines=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435
 \u043c\u0430\u0448\u0438\u043d\u044b
 
label.virtual.network=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u0430\u044f
 \u0441\u0435\u0442\u044c
 
label.virtual.routers=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0439
 \u0440\u043e\u0443\u0442\u0435\u0440
 
label.virtual.router=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0439
 \u0440\u043e\u0443\u0442\u0435\u0440
 label.vlan.id=ID VLAN
+label.vlan.only=VLAN
 label.vlan.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d VLAN
 label.vlan=VLAN
 label.vlan.vni.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d VLAN
@@ -1209,7 +1205,6 @@ 
label.xenserver.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\
 label.yes=\u0414\u0430
 
label.zone.details=\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438
 \u0437\u043e\u043d\u044b
 label.zone.id=ID \u0437\u043e\u043d\u044b
-label.zone.name=\u0418\u043c\u044f \u0437\u043e\u043d\u044b
 label.zone.step.1.title=\u0428\u0430\u0433 1\: 
<strong>\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 
\u0441\u0435\u0442\u044c</strong>
 label.zone.step.2.title=Step 2\: 
<strong>\u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 
\u0437\u043e\u043d\u0443</strong>
 label.zone.step.3.title=Step 3\: 
<strong>\u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 
\u0441\u0442\u0435\u043d\u0434</strong>
@@ -1554,13 +1549,11 @@ 
state.Creating=\u0421\u043e\u0437\u0434\u0430\u0435\u0442\u0441\u044f
 state.Declined=\u041e\u0442\u043a\u043b\u043e\u043d\u0435\u043d\u043e
 state.Destroyed=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0435\u043d\u043e
 state.Disabled=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043e
-state.enabled=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e
 state.Enabled=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e
 state.Error=\u041e\u0448\u0438\u0431\u043a\u0430
 state.Expunging=\u0423\u0434\u0430\u043b\u0451\u043d
 
state.Migrating=\u041c\u0438\u0433\u0440\u0438\u0440\u0443\u044e\u0449\u0438\u0439
 state.Pending=\u041e\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044f
-state.ready=\u0413\u043e\u0442\u043e\u0432
 state.Ready=\u0413\u043e\u0442\u043e\u0432
 state.Running=\u0417\u0430\u043f\u0443\u0449\u0435\u043d\u043e
 
state.Starting=\u0417\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_zh_CN.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties 
b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index f872778..23a99be 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -256,7 +256,6 @@ label.add.acl.list=\u6dfb\u52a0 ACL \u5217\u8868
 label.add.ACL=\u6dfb\u52a0 ACL
 label.add.affinity.group=\u6dfb\u52a0\u65b0\u5173\u8054\u6027\u7ec4
 label.add.baremetal.dhcp.device=\u6dfb\u52a0\u88f8\u673a DHCP \u8bbe\u5907
-label.add.BigSwitchVns.device=\u6dfb\u52a0 BigSwitch Vns \u63a7\u5236\u5668
 label.add.BrocadeVcs.device=\u6dfb\u52a0 Brocade Vcs \u4ea4\u6362\u673a
 label.add.by.cidr=\u6309 CIDR \u6dfb\u52a0
 label.add.by.group=\u6309\u7ec4\u6dfb\u52a0
@@ -268,7 +267,6 @@ label.add.direct.iprange=\u6dfb\u52a0\u76f4\u63a5 IP 
\u8303\u56f4
 label.add.disk.offering=\u6dfb\u52a0\u78c1\u76d8\u65b9\u6848
 label.add.domain=\u6dfb\u52a0\u57df
 label.added.brocade.vcs.switch=\u5df2\u6dfb\u52a0\u65b0 Brocade Vcs 
\u4ea4\u6362\u673a
-label.added.new.bigswitch.vns.controller=\u5df2\u6dfb\u52a0\u65b0 BigSwitch 
VNS \u63a7\u5236\u5668
 label.added.nicira.nvp.controller=\u5df2\u6dfb\u52a0\u65b0 Nicira NVP 
\u63a7\u5236\u5668
 label.add.egress.rule=\u6dfb\u52a0\u51fa\u53e3\u89c4\u5219
 label.addes.new.f5=\u5df2\u6dfb\u52a0\u65b0 F5
@@ -403,8 +401,6 @@ label.baremetal.pxe.device=\u6dfb\u52a0\u88f8\u673a PXE 
\u8bbe\u5907
 label.baremetal.pxe.provider=\u88f8\u673a PXE \u63d0\u4f9b\u7a0b\u5e8f
 label.basic.mode=\u57fa\u672c\u6a21\u5f0f
 label.basic=\u57fa\u672c
-label.bigswitch.controller.address=BigSwitch Vns \u63a7\u5236\u5668\u5730\u5740
-label.bigswitch.vns.details=BigSwitch VNS \u8be6\u7ec6\u4fe1\u606f
 label.blade.id=\u5200\u7247\u5f0f\u670d\u52a1\u5668 ID
 label.blades=\u5200\u7247\u5f0f\u670d\u52a1\u5668
 label.bootable=\u53ef\u542f\u52a8
@@ -527,7 +523,6 @@ label.default.view=\u9ed8\u8ba4\u89c6\u56fe
 label.delete.acl.list=\u5220\u9664 ACL \u5217\u8868
 label.delete.affinity.group=\u5220\u9664\u5173\u8054\u6027\u7ec4
 label.delete.alerts=\u5220\u9664\u8b66\u62a5
-label.delete.BigSwitchVns=\u79fb\u9664 BigSwitch Vns \u63a7\u5236\u5668
 label.delete.BrocadeVcs=\u5220\u9664 Brocade Vcs \u4ea4\u6362\u673a
 label.delete.ciscoASA1000v=\u5220\u9664 CiscoASA1000v
 label.delete.ciscovnmc.resource=\u5220\u9664 CiscoVNMC \u8d44\u6e90
@@ -598,7 +593,6 @@ label.disk.total=\u78c1\u76d8\u603b\u91cf
 label.disk.volume=\u78c1\u76d8\u5377
 label.disk.write.bytes=\u78c1\u76d8\u5199\u5165(\u5b57\u8282)
 label.disk.write.io=\u78c1\u76d8\u5199\u5165(IO)
-label.display.name=\u663e\u793a\u540d\u79f0
 label.display.text=\u663e\u793a\u6587\u672c
 label.distributedrouter=\u5206\u5e03\u5f0f\u8def\u7531\u5668
 label.dns.1=DNS 1
@@ -616,7 +610,6 @@ label.done=\u5b8c\u6210
 
label.double.quotes.are.not.allowed=\u4e0d\u5141\u8bb8\u4f7f\u7528\u53cc\u5f15\u53f7
 label.download.progress=\u4e0b\u8f7d\u8fdb\u5ea6
 label.drag.new.position=\u62d6\u52a8\u5230\u65b0\u4f4d\u7f6e
-label.duration.in.sec=\u6301\u7eed\u65f6\u95f4(\u79d2)
 label.dynamically.scalable=\u53ef\u52a8\u6001\u6269\u5c55
 label.edit.acl.rule=\u7f16\u8f91 ACL \u89c4\u5219
 label.edit.affinity.group=\u7f16\u8f91\u5173\u8054\u6027\u7ec4
@@ -778,7 +771,6 @@ 
label.installWizard.title=\u60a8\u597d\uff0c\u6b22\u8fce\u4f7f\u7528 CloudStack&
 label.instance.limits=\u5b9e\u4f8b\u9650\u5236
 label.instance.name=\u5b9e\u4f8b\u540d\u79f0
 label.instance.port=\u5b9e\u4f8b\u7aef\u53e3
-label.instance.scaled.up=\u5df2\u6269\u5c55\u5b9e\u4f8b
 label.instances=\u5b9e\u4f8b
 label.instance=\u5b9e\u4f8b
 
label.instanciate.template.associate.profile.blade=\u5c06\u6a21\u677f\u5b9e\u4f8b\u5316\u5e76\u5c06\u914d\u7f6e\u6587\u4ef6\u4e0e\u5200\u7247\u5f0f\u670d\u52a1\u5668\u5173\u8054
@@ -860,7 +852,7 @@ label.launch=\u542f\u52a8
 label.launch.vm=\u542f\u52a8 VM
 label.launch.zone=\u542f\u52a8\u8d44\u6e90\u57df
 label.lb.algorithm.leastconn=\u6700\u5c11\u8fde\u63a5\u7b97\u6cd5
-label.lb.algorithm.roundrobin=\u8f6e\u8be2\u7b97\u6cd5
+label.lb.algorithm.roundrobin=\u8f6e\u5faa
 label.lb.algorithm.source=\u6e90\u7b97\u6cd5
 label.LB.isolation=\u8d1f\u8f7d\u5e73\u8861\u5668\u9694\u79bb
 label.ldap.configuration=LDAP \u914d\u7f6e
@@ -878,7 +870,6 @@ label.local.storage=\u672c\u5730\u5b58\u50a8
 label.local=\u672c\u5730
 label.login=\u767b\u5f55
 label.logout=\u6ce8\u9500
-label.saml.login=SAML \u767b\u5f55
 label.lun=LUN
 label.LUN.number=LUN \u53f7
 label.lxc.traffic.label=LXC \u6d41\u91cf\u6807\u7b7e
@@ -960,7 +951,6 @@ label.migrate.router.to=\u8fc1\u79fb\u8def\u7531\u5668\u81f3
 label.migrate.systemvm.to=\u8fc1\u79fb\u7cfb\u7edf VM \u81f3
 label.migrate.to.host=\u8fc1\u79fb\u5230\u4e3b\u673a
 label.migrate.to.storage=\u8fc1\u79fb\u5230\u5b58\u50a8
-label.migrate.volume=\u8fc1\u79fb\u5377
 
label.migrate.volume.to.primary.storage=\u5c06\u5377\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8
 label.minimum=\u6700\u5c0f\u503c
 label.min.instances=\u6700\u5c0f\u5b9e\u4f8b\u6570
@@ -980,6 +970,7 @@ label.name.lower=\u540d\u79f0
 label.name.optional=\u540d\u79f0(\u53ef\u9009)
 label.name=\u540d\u79f0
 label.nat.port.range=NAT \u7aef\u53e3\u8303\u56f4
+label.na=\u65e0
 label.netmask=\u7f51\u7edc\u63a9\u7801
 label.netscaler.details=NetScaler \u8be6\u7ec6\u4fe1\u606f
 label.netScaler=NetScaler
@@ -1483,7 +1474,6 @@ label.view=\u67e5\u770b
 
label.virtual.appliance.details=\u865a\u62df\u8bbe\u5907\u8be6\u7ec6\u4fe1\u606f
 label.virtual.appliances=\u865a\u62df\u8bbe\u5907
 label.virtual.appliance=\u865a\u62df\u8bbe\u5907
-label.virtual.machines=\u865a\u62df\u673a
 label.virtual.networking=\u865a\u62df\u7f51\u7edc\u8fde\u63a5
 label.virtual.network=\u865a\u62df\u7f51\u7edc
 
label.virtual.routers.group.account=\u865a\u62df\u8def\u7531\u5668(\u6309\u5e10\u6237\u5206\u7ec4)
@@ -1493,6 +1483,7 @@ 
label.virtual.routers.group.zone=\u865a\u62df\u8def\u7531\u5668(\u6309\u8d44\u6e
 label.virtual.routers=\u865a\u62df\u8def\u7531\u5668
 label.virtual.router=\u865a\u62df\u8def\u7531\u5668
 label.vlan.id=VLAN/VNI ID
+label.vlan.only=VLAN
 label.vlan.range.details=VLAN \u8303\u56f4\u8be6\u7ec6\u4fe1\u606f
 label.vlan.ranges=VLAN \u8303\u56f4
 label.vlan.range=VLAN/VNI \u8303\u56f4
@@ -1574,7 +1565,6 @@ label.zone.dedicated=\u8d44\u6e90\u57df\u5df2\u4e13\u7528
 label.zone.details=\u8d44\u6e90\u57df\u8be6\u7ec6\u4fe1\u606f
 label.zone.id=\u8d44\u6e90\u57df ID
 label.zone.lower=\u8d44\u6e90\u57df
-label.zone.name=\u8d44\u6e90\u57df\u540d\u79f0
 label.zone.step.1.title=\u6b65\u9aa4 1\: 
<strong>\u9009\u62e9\u4e00\u4e2a\u7f51\u7edc</strong>
 label.zone.step.2.title=\u6b65\u9aa4 2\: 
<strong>\u6dfb\u52a0\u4e00\u4e2a\u8d44\u6e90\u57df</strong>
 label.zone.step.3.title=\u6b65\u9aa4 3\: 
<strong>\u6dfb\u52a0\u4e00\u4e2a\u63d0\u4f9b\u70b9</strong>
@@ -2037,13 +2027,11 @@ state.Declined=\u5df2\u62d2\u7edd
 state.Destroyed=\u5df2\u9500\u6bc1
 state.detached=\u5df2\u53d6\u6d88\u9644\u52a0
 state.Disabled=\u5df2\u7981\u7528
-state.enabled=\u5df2\u542f\u7528
 state.Enabled=\u5df2\u542f\u7528
 state.Error=\u9519\u8bef
 state.Expunging=\u6b63\u5728\u5220\u9664
 state.Migrating=\u6b63\u5728\u8fc1\u79fb
 state.Pending=\u5f85\u5b9a
-state.ready=\u5df2\u5c31\u7eea
 state.Ready=\u5df2\u5c31\u7eea
 state.Running=\u6b63\u5728\u8fd0\u884c
 state.Starting=\u6b63\u5728\u542f\u52a8

Reply via email to