You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mi...@apache.org on 2015/04/19 11:09:20 UTC

[1/2] git commit: updated refs/heads/4.5 to 376b27a

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


[2/2] git commit: updated refs/heads/4.5 to 376b27a

Posted by mi...@apache.org.
Update L10N resource files on 4.5 branch (with 4.5 translation strings from Transifex)


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

Branch: refs/heads/4.5
Commit: 376b27a430717634e92148832f2968a1adf2aac2
Parents: 208a565
Author: Milamber <mi...@apache.org>
Authored: Sun Apr 19 10:07:51 2015 +0100
Committer: Milamber <mi...@apache.org>
Committed: Sun Apr 19 10:09:12 2015 +0100

----------------------------------------------------------------------
 .../classes/resources/messages_ar.properties    |   4 -
 .../classes/resources/messages_ca.properties    |   3 -
 .../classes/resources/messages_de_DE.properties | 153 +++++++++++++++++--
 .../classes/resources/messages_es.properties    |  17 ++-
 .../classes/resources/messages_fr_FR.properties | 102 +++++++------
 .../classes/resources/messages_it_IT.properties |   7 +-
 .../classes/resources/messages_ja_JP.properties |  37 ++---
 .../classes/resources/messages_ko_KR.properties |   9 +-
 .../classes/resources/messages_nb_NO.properties |  16 +-
 .../classes/resources/messages_nl_NL.properties |  14 +-
 .../classes/resources/messages_pl.properties    |   7 +-
 .../classes/resources/messages_pt_BR.properties |  13 +-
 .../classes/resources/messages_ru_RU.properties |  11 +-
 .../classes/resources/messages_zh_CN.properties |  18 +--
 14 files changed, 249 insertions(+), 162 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_ar.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ar.properties b/client/WEB-INF/classes/resources/messages_ar.properties
index de90c43..7a72709 100644
--- a/client/WEB-INF/classes/resources/messages_ar.properties
+++ b/client/WEB-INF/classes/resources/messages_ar.properties
@@ -69,7 +69,6 @@ label.delete.VPN.gateway=\u0627\u062d\u0630\u0641 \u0628\u0648\u0627\u0628\u0629
 label.destroy=\u0647\u062f\u0645
 label.devices=\u0627\u0644\u0623\u062c\u0647\u0632\u0629
 label.direct.ips=\u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0645\u0634\u062a\u0631\u0643\u0629 IPs
-label.display.name=\u0639\u0631\u0636 \u0627\u0644\u0627\u0633\u0645
 label.DNS.domain.for.guest.networks=\u0645\u062c\u0627\u0644 DNS \u0644\u0634\u0628\u0643\u0627\u062a \u0627\u0644\u0632\u0627\u0626\u0631
 label.dns=\u0646\u0638\u0627\u0645 \u062a\u0633\u0645\u064a\u0629 \u0627\u0644\u0645\u062c\u0627\u0644 DNS
 label.drag.new.position=\u0627\u0633\u062d\u0628 \u0644\u0645\u0648\u0642\u0641 \u062c\u062f\u064a\u062f
@@ -212,7 +211,6 @@ label.welcome.cloud.console=\u0645\u0631\u062d\u0628\u0627 \u0628\u0643\u0645 \u
 label.welcome=\u0645\u0631\u062d\u0628\u0627
 label.yes=\u0646\u0639\u0645
 label.zone.details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
-label.zone.name=\u0627\u0633\u0645 \u0627\u0644\u0645\u0646\u0637\u0642\u0629
 label.zone.step.1.title=\u0627\u0644\u062e\u0637\u0648\u0629 1 \\\: \u0639\u0644\u0649 .<\u0642\u0648\u064a> \u0627\u062e\u062a\u0631 \u0634\u0628\u0643\u0629 </ \u0642\u0648\u064a>
 label.zone.step.2.title=\u0627\u0644\u062e\u0637\u0648\u0629 2 \\\: <\u0642\u0648\u064a> \u0625\u0636\u0627\u0641\u0629 \u0645\u0646\u0637\u0642\u0629 </ \u0642\u0648\u064a>
 label.zone.step.3.title=\u0627\u0644\u062e\u0637\u0648\u0629 3 \\\: \u0639\u0644\u0649 <\u0642\u0648\u064a> \u0625\u0636\u0627\u0641\u0629 \u0628\u0648\u062f </ \u0642\u0648\u064a>
@@ -275,12 +273,10 @@ state.Completed=\u062a\u0645 \u0627\u0644\u0627\u0643\u0645\u0627\u0644
 state.Creating=\u0625\u0646\u0634\u0627\u0621
 state.Declined=\u062a\u0645 \u0627\u0644\u0631\u0641\u0636
 state.Destroyed=\u062f\u0645\u0631
-state.enabled=\u062a\u0645\u0643\u064a\u0646
 state.Enabled=\u062a\u0645\u0643\u064a\u0646
 state.Error=\u062e\u0637\u0623
 state.Expunging=\u0645\u062d\u0648
 state.Pending=\u0641\u064a \u0627\u0644\u0627\u0646\u062a\u0638\u0627\u0631
-state.ready=\u062c\u0627\u0647\u0632
 state.Ready=\u062c\u0627\u0647\u0632
 state.Stopped=\u062a\u0648\u0642\u0641
 state.Suspended=\u062a\u0645 \u0627\u0644\u0625\u064a\u0642\u0627\u0641

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_ca.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ca.properties b/client/WEB-INF/classes/resources/messages_ca.properties
index cfc09e3..65a580c 100644
--- a/client/WEB-INF/classes/resources/messages_ca.properties
+++ b/client/WEB-INF/classes/resources/messages_ca.properties
@@ -220,7 +220,6 @@ label.view.console=Veure consola
 label.viewing=Veient
 label.view.more=Veure m\u00e9s
 label.view=Veure
-label.virtual.machines=M\u00e0quines virtuals
 label.virtual.router=Router virtual
 label.what.is.cloudstack=Que \u00e9s CloudStack&\#8482?
 label.zone.details=Detalls de la zona
@@ -297,11 +296,9 @@ state.Completed=Complert
 state.Creating=Creant
 state.Declined=Declinat
 state.Disabled=Deshabilitat
-state.enabled=Habilitat
 state.Enabled=Habilitat
 state.Expunging=Esborrant
 state.Pending=Pendent
-state.ready=Preparat
 state.Ready=Preparat
 state.Starting=Arrencant
 state.Suspended=Susp\u00e9s

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_de_DE.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_de_DE.properties b/client/WEB-INF/classes/resources/messages_de_DE.properties
index bd36088..1315124 100644
--- a/client/WEB-INF/classes/resources/messages_de_DE.properties
+++ b/client/WEB-INF/classes/resources/messages_de_DE.properties
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+error.could.not.enable.zone=Zone konnte nicht aktiviert werden
 error.installWizard.message=Ein Fehler ist aufgetreten; Sie k\u00f6nnen zur\u00fcckgehen und den Fehler korregieren
 error.invalid.username.password=Ung\u00fcltiger Benutzername oder ung\u00fcltiges Passwort
 error.login=Ihr Benutzername / Passwort stimmt nicht mit uneren unseren Aufzeichnungen \u00fcberein.
@@ -40,6 +41,9 @@ label.account.name=Benutzerkonto-Name
 label.accounts=Benutzerkonten
 label.account.specific=Besonderheiten des Benutzerkontos
 label.acl=ACL
+label.acl.id=ACL-Kennung
+label.acl.name=ACL-Name
+label.acl.replaced=ACL ersetzt
 label.acquire.new.ip=Neue IP erwerben
 label.action=Aktion
 label.action.attach.disk=Festplatte hinzuf\u00fcgen
@@ -71,6 +75,7 @@ label.action.delete.disk.offering=Festplatten-Angebot l\u00f6schen
 label.action.delete.disk.offering.processing=L\u00f6schen des Festplatten-Angebots ....
 label.action.delete.domain=L\u00f6schen der Domain
 label.action.delete.domain.processing=L\u00f6schung der Domain ....
+label.action.delete.firewall=Firewall-Regel l\u00f6schen
 label.action.delete.firewall.processing=L\u00f6schung der Firewall ....
 label.action.delete.ingress.rule.processing=L\u00f6schen der Zutrittsregel ....
 label.action.delete.ingress.rule=Zutrittsregel l\u00f6schen
@@ -81,7 +86,9 @@ label.action.delete.ISO.processing=L\u00f6schen der ISO ....
 label.action.delete.load.balancer.processing=Beendigung der Serverlastverteilung....
 label.action.delete.network=L\u00f6schen des Netzwerks
 label.action.delete.network.processing=L\u00f6schung des Netzwerks ....
+label.action.delete.nexusVswitch=Nexus 1000v l\u00f6schen
 label.action.delete.nic=NIC entfernen
+label.action.delete.physical.network=Physikalisches Netzwerk l\u00f6schen
 label.action.delete.pod=Pod l\u00f6schen
 label.action.delete.pod.processing=L\u00f6schen des Pod ....
 label.action.delete.primary.storage=Hauptspeicher l\u00f6schen
@@ -114,6 +121,8 @@ label.action.disable.account=Benutzerkonto deaktivieren
 label.action.disable.account.processing=Deaktivierung des Benutzerkontos ....
 label.action.disable.cluster=Deaktivieren des Clusters
 label.action.disable.cluster.processing=Deaktivierung des Clusters....
+label.action.disable.nexusVswitch=Nexus 1000v deaktivieren
+label.action.disable.physical.network=Physikalisches Netzwerk deaktivieren
 label.action.disable.pod=Deaktiviere Pod
 label.action.disable.pod.processing=Deaktivierung des Pod....
 label.action.disable.static.NAT.processing=Deaktivieren der statischen NAT ....
@@ -149,6 +158,8 @@ label.action.enable.cluster=Aktivieren des Clusters
 label.action.enable.cluster.processing=Aktivierung des Clusters....
 label.action.enable.maintenance.mode.processing=Aktivieren des Wartungsmodus
 label.action.enable.maintenance.mode=Wartungsmodus aktivieren
+label.action.enable.nexusVswitch=Nexus 1000v aktivieren
+label.action.enable.physical.network=Physikalisches Netzwerk aktivieren
 label.action.enable.pod=Aktiviere Pod
 label.action.enable.pod.processing=Aktivierung des Pod....
 label.action.enable.static.NAT.processing=Aktivieren der statischen NAT ....
@@ -167,6 +178,7 @@ label.action.manage.cluster.processing=Verwaltung des Clusters....
 label.action.manage.cluster=Verwalte Cluster
 label.action.migrate.instance=Mit einer Instanz umziehen
 label.action.migrate.instance.processing=Umziehen einer Instanz
+label.action.migrate.router=Router migrieren
 label.action.reboot.instance=Instanz neustarten
 label.action.reboot.instance.processing=Neustarten der Instanz...
 label.action.reboot.router.processing=Neustart vom Router ....
@@ -207,13 +219,20 @@ label.activate.project=Projekt aktivieren
 label.active.sessions=Aktive Sitzungen
 label.add.account=Konto hinzuf\u00fcgen
 label.add.accounts=Konten hinzuf\u00fcgen
+label.add.accounts.to=Konten hinzuf\u00fcgen zu
+label.add.account.to.project=Konto zu Projekt hinzuf\u00fcgen
 label.add.ACL=ACL hinzuf\u00fcgen
 label.add.by.cidr=Hinzuf\u00fcgen durch CIDR
 label.add.by.group=Hinzuf\u00fcgen durch Gruppe
+label.add.ciscoASA1000v=CiscoASA1000v-Ressource hinzuf\u00fcgen
 label.add.cluster=Cluster hinzuf\u00fcgen
 label.add.direct.iprange=Direkten Ip-Bereich hinzuf\u00fcgen
 label.add.disk.offering=Festplatten-Angebot hinzuf\u00fcgen
 label.add.domain=Domain hinzuf\u00fcgen
+label.addes.new.f5=Neues F5 hinzugef\u00fcgt
+label.add.F5.device=F5-Ger\u00e4t hinzuf\u00fcgen
+label.add.firewall=Firewall-Regel hinzuf\u00fcgen
+label.add.gslb=GSLB hinzuf\u00fcgen
 label.add.guest.network=Gastnetzwerk hinzuf\u00fcgen
 label.add=Hinzuf\u00fcgen
 label.add.host=Host hinzuf\u00fcgen
@@ -233,8 +252,13 @@ label.add.more=Mehr hinzuf\u00fcgen
 label.add.network.ACL=Netzwerk-ACL hinzuf\u00fcgen
 label.add.network.device=Hinzuf\u00fcgen eines Netzwerkger\u00e4tes
 label.add.network=Netzwerk hinzuf\u00fcgen
+label.add.new.F5=Neues F5 hinzuf\u00fcgen
 label.add.new.gateway=Neues Gateway hinzuf\u00fcgen
+label.add.new.PA=Neues Palo Alto hinzuf\u00fcgen
+label.add.PA.device=Palo Alto-Ger\u00e4t hinzuf\u00fcgen
+label.add.physical.network=Physikalisches Netzwerk hinzuf\u00fcgen
 label.add.pod=Pod hinzuf\u00fcgen
+label.add.portable.ip.range=Portablen IP-Bereich hinzuf\u00fcgen
 label.add.primary.storage=Hauptspeicher hinzuf\u00fcgen
 label.add.region=Region hinzuf\u00fcgen
 label.add.resources=Ressourcen hinzuf\u00fcgen
@@ -244,6 +268,7 @@ label.add.secondary.storage=Sekund\u00e4rspeicher hinzuf\u00fcgen
 label.add.security.group=Sicherheitsgruppe hinzuf\u00fcgen
 label.add.service.offering=Service-Angebot hinzuf\u00fcgen
 label.add.SRX.device=SRX-Ger\u00e4t hinzuf\u00fcgen
+label.add.static.nat.rule=Statische NAT-Regel hinzuf\u00fcgen
 label.add.system.service.offering=System-Service-Angebot hinzuf\u00fcgen
 label.add.template=Vorlage hinzuf\u00fcgen
 label.add.to.group=Zur Gruppe hinzuf\u00fcgen
@@ -254,6 +279,7 @@ label.add.vm=VM hinzuf\u00fcgen
 label.add.vnmc.device=VNMC-Ger\u00e4t hinzuf\u00fcgen
 label.add.vnmc.provider=VNMC-Anbieter hinzuf\u00fcgen
 label.add.volume=Volume hinzuf\u00fcgen
+label.add.vpc.offering=VPC-Angebot hinzuf\u00fcgen
 label.add.vpc=VPC hinzuf\u00fcgen
 label.add.vpn.user=VPN-Benutzer hinzuf\u00fcgen
 label.add.vxlan=VXLAN hinzuf\u00fcgen
@@ -270,8 +296,10 @@ label.allocated=Zugeteilt
 label.allocation.state=Belegungszustand
 label.allow=Erlauben
 label.api.key=API Schl\u00fcssel
+label.api.version=API-Version
 label.apply=Anwenden
 label.app.name=CloudStack
+label.archive.alerts=Alarme archivieren
 label.archive.events=Ereignisse archivieren
 label.assign.to.load.balancer=Instanz zum Lastverteiler hinzuf\u00fcgen
 label.assign=Zuweisen
@@ -316,6 +344,10 @@ label.cidr=CIDR
 label.CIDR.list=CIDR-Liste
 label.cidr.list=Quelle CIDR
 label.CIDR.of.destination.network=CIDR des Zielnetzwerks
+label.cisco.nexus1000v.ip.address=Nexus 1000v-IP-Adresse
+label.cisco.nexus1000v.password=Nexus 1000v-Passwort
+label.cisco.nexus1000v.username=Nexus 1000v-Benutzername
+label.clean.up=Bereinigen
 label.clear.list=Liste l\u00f6schen
 label.close=Schliessen
 label.cloud.console=Cloud Management Konsole
@@ -326,6 +358,7 @@ label.clusters=Cluster
 label.cluster.type=Cluster-Typ
 label.clvm=CLVM
 label.code=Code
+label.community=Gemeinschaft
 label.configuration=Konfiguration
 label.configure=Konfigurieren
 label.configure.ldap=LDAP konfigurieren
@@ -335,6 +368,7 @@ label.confirm.password=Passwort best\u00e4tigen
 label.congratulations=Herzlichen Gl\u00fcckwunsch
 label.continue=Fortsetzen
 label.corrections.saved=Korrekturen gespeichert
+label.counter=Z\u00e4hler
 label.cpu.allocated=Zugeteilte CPU
 label.CPU.cap=CPU Obergrenze
 label.cpu=CPU
@@ -358,9 +392,14 @@ label.dc.name=DC-Name
 label.default=Standard
 label.default.use=Standardeinstellung nutzen
 label.default.view=Standardansicht
+label.delete.acl.list=ACL-Liste ersetzen
+label.delete.alerts=Alarme l\u00f6schen
+label.delete.ciscoASA1000v=CiscoASA1000v l\u00f6schen
 label.delete.events=Ereignisse l\u00f6schen
 label.delete.F5=F5 l\u00f6schen
 label.delete=L\u00f6schen
+label.delete.PA=Palo Alto l\u00f6schen
+label.delete.portable.ip.range=Portablen IP-Bereich l\u00f6schen
 label.delete.profile=Profil l\u00f6schen
 label.delete.project=Projekt l\u00f6schen
 label.delete.SRX=SRX l\u00f6schen
@@ -380,11 +419,15 @@ label.devices=Ger\u00e4te
 label.dhcp=DHCP
 label.DHCP.server.type=DHCP Server Type
 label.disabled=Deaktiviert
+label.disable.host=Host deaktivieren
+label.disable.network.offering=Netzwerkangebot deaktivieren
 label.disable.provider=Anbieter deaktivieren
 label.disable.vnmc.provider=VNMC-Anbieter deaktivieren
+label.disable.vpc.offering=VPC-Angebot deaktivieren
 label.disabling.vpn.access=Deaktivierung des VPN Zugangs
 label.disbale.vnmc.device=VNMC-Ger\u00e4t deaktivieren
 label.disk.allocated=Zugeordnete Festplatte
+label.disk.iops.total=Gesamte IOPS
 label.disk.offering=Festplatten-Angebot
 label.disk.size=Festplattengr\u00f6\u00dfe
 label.disk.size.gb=Festplattengr\u00f6\u00dfe (in GB)
@@ -410,8 +453,12 @@ label.edit.tags=Schlagw\u00f6rter bearbeiten
 label.edit.vpc=VPC bearbeiten
 label.email=E-Mail
 label.email.lower=E-Mail-Adresse
+label.enable.host=Host aktivieren
+label.enable.network.offering=Netzwerkangebot aktivieren
+label.enable.swift=Swift aktivieren
 label.enable.vnmc.device=VNMC-Ger\u00e4t aktivieren
 label.enable.vnmc.provider=VNMC-Anbieter aktivieren
+label.enable.vpc.offering=VPC-Angebot aktivieren
 label.enabling.vpn.access=Aktivieren des VPN-Zugriffs
 label.enabling.vpn=VPN aktivieren
 label.endpoint=Endpunkt
@@ -419,11 +466,15 @@ label.endpoint.or.operation=Endpunkt oder Bedienung
 label.end.port=Beende Port
 label.error.code=Fehlercode
 label.error=Fehler
+label.error.upper=FEHLER
 label.ESP.encryption=ESP-Verschl\u00fcsselung
 label.ESP.hash=ESP-Pr\u00fcfsumme
 label.ESP.lifetime=ESP-Lebensdauer (Sekunde)
 label.esx.host=ESX / ESXi-Host
+label.event.archived=Ereignis archiviert
+label.event.deleted=Ereignis gel\u00f6scht
 label.example=Beispiel
+label.external.link=Externer Link
 label.extractable=Extrahierbar
 label.f5.details=F5-Details
 label.f5=F5
@@ -438,7 +489,7 @@ label.friday=Freitag
 label.full.path=Vollst\u00e4ndiger Pfad
 label.full=Voll
 label.gateway=Schnittstelle
-label.general.alerts=Allgemeine Warnungen
+label.general.alerts=Allgemeine Alarme
 label.generating.url=Generieren der URL
 label.gluster.volume=Volume
 label.go.step.2=Gehe zu Schritt 2
@@ -446,10 +497,15 @@ label.go.step.3=Weiter zu Schritt 3
 label.go.step.4=Weiter mit Schritt 4
 label.go.step.5=Weiter mit Schritt 5
 label.gpu=GPU
+label.group.by.account=Nach Konto gruppieren
+label.group.by.cluster=Nach Cluster gruppieren
+label.group.by.zone=Nach Zone gruppieren
 label.group=Gruppe
 label.group.optional=Gruppe (optional)
 label.gslb.details=GSLB-Details
 label.gslb.service=GSLB-Dienst
+label.gslb.service.private.ip=GSLB-Dienst Private IP
+label.gslb.service.public.ip=GSLB-Dienst \u00d6ffentliche IP
 label.gslb.servicetype=Diensttyp
 label.guest.cidr=Gast CIDR
 label.guest=Gast
@@ -464,7 +520,7 @@ label.ha.enabled=HA aktiviert
 label.help=Hilfe
 label.hide.ingress.rule=Verstecke Regeln, die den Zutritt steuern
 label.hints=Hinweise
-label.host.alerts=Host Warnungen
+label.host.alerts=Host-Alarme
 label.host=Host
 label.host.MAC=Host-MAC
 label.host.name=Host Name
@@ -473,12 +529,15 @@ label.host.tags=Markierungen des Hosts
 label.hourly=St\u00fcndlich
 label.hvm=HVM
 label.hypervisor=Hypervisor
+label.hypervisors=Hypervisoren
 label.hypervisor.type=Hypervisor Typ
+label.hypervisor.version=Hypervisor-Version
 label.id=Identifikation
 label.IKE.encryption=IKE-Verschl\u00fcsselung
 label.IKE.hash=IKE-Pr\u00fcfsumme
 label.IKE.lifetime=IKE-Lebensdauer (Sekunde)
 label.info=Info
+label.info.upper=INFO
 label.ingress.rule=Zutrittsregel
 label.initiated.by=Initiiert durch
 label.installWizard.addClusterIntro.subtitle=Was ist ein Cluster?
@@ -517,6 +576,8 @@ label.ip.range=IP-Bereich
 label.ip.ranges=IP-Bereiche
 label.ips=IPs
 label.ipv4.cidr=IPv4 CIDR
+label.ipv4.dns1=IPv4 DNS1
+label.ipv4.dns2=IPv4 DNS2
 label.ipv4.end.ip=IPv4 End-IP
 label.ipv4.gateway=IPv4 Gateway
 label.ipv4.netmask=IPv4-Netzmaske
@@ -539,6 +600,7 @@ label.is.redundant.router=Redundant
 label.is.shared=Gemeinsam
 label.is.system=Ist System
 label.keep=Behalten
+label.keyboard.type=Tastaturtyp
 label.key=Schl\u00fcssel
 label.label=Bezeichnung
 label.lang.arabic=Arabisch
@@ -562,19 +624,23 @@ label.last.name=Nachname
 label.latest.events=Neueste Ereignisse
 label.launch=Start
 label.launch.vm=VM starten
+label.lb.algorithm.source=Quelle
 label.ldap.configuration=LDAP-Konfiguration
 label.ldap.group.name=LDAP-Gruppe
 label.ldap.port=LDAP-Port
 label.level=Ebene
 label.load.balancer=Serverlastverteilung
+label.load.balancer.type=Lastverteilungstyp
+label.load.balancing=Lastverteilung
 label.loading=Laden
 label.local=Lokal
+label.local.storage.enabled=Lokaler Speicher aktiviert
 label.local.storage=Lokaler Speicher
 label.login=Login
 label.logout=Abmelden
-label.saml.login=SAML Login
 label.lun=LUN
 label.LUN.number=LUN \#
+label.managed=Verwaltet
 label.management=Verwaltung
 label.manage.resources=Ressourcen verwalten
 label.manage=Verwalten
@@ -596,7 +662,7 @@ label.memory=Speicher (in MB)
 label.memory.total=Speicher insgesamt
 label.memory.used=Genutzter Speicher
 label.menu.accounts=Benutzerkonten
-label.menu.alerts=Warnungen
+label.menu.alerts=Alarme
 label.menu.all.accounts=Alle Konten
 label.menu.all.instances=Alle Instanzen
 label.menu.community.isos=Gemeinschaft ISOs
@@ -632,6 +698,7 @@ label.menu.system.vms=System VMs
 label.menu.templates=Vorlagen
 label.menu.virtual.resources=Virtuelle Ressourcen
 label.menu.volumes=Volumes
+label.menu.vpc.offerings=VPC-Angebote
 label.migrate.instance.to.host=Instanz auf einen anderen Host migrieren
 label.migrate.instance.to.ps=Instanz auf einen anderen Speicher migrieren
 label.minimum=Minimum
@@ -660,6 +727,7 @@ label.network.limits=Netzwerkbegrenzungen
 label.network.name=Netzwerk Name
 label.network=Netzwerk
 label.network.offering=Netzwerk-Angebot
+label.network.rate.megabytes=Netzwerkrate (MB/s)
 label.network.rate=Netzwerk-Rate
 label.networks=Netzwerke
 label.network.type=Netzwerk-Typ
@@ -674,8 +742,10 @@ label.nfs.server=NFS Server
 label.nfs.storage=NFS-Speicher
 label.nics=NICs
 label.no.actions=Nicht verf\u00fcgbare Aktionen
-label.no.alerts=Keine neuen Warnungen
+label.no.alerts=Keine aktuellen Alarme
+label.no.data=Keine anzuzeigenden Daten
 label.no.errors=Keine neuen Fehler
+label.no.grouping=(keine Gruppierung)
 label.no.isos=Kein verf\u00fcgbaren ISOs
 label.no.items=Keine verf\u00fcgbaren Eintr\u00e4ge
 label.no=Nein
@@ -684,6 +754,7 @@ label.no.security.groups=Keine verf\u00fcgbare Sicherheitsgruppe
 label.not.found=Nicht gefunden
 label.no.thanks=Nein, danke
 label.notifications=Benachrichtigungen
+label.number.of.clusters=Anzahl der Cluster
 label.number.of.hosts=Anzahl an Hosts
 label.number.of.zones=Anzahl an Zonen
 label.num.cpu.cores=Anzahl an CPU-Kernen
@@ -691,16 +762,24 @@ label.numretries=Anzahl von Wiederholungen
 label.ocfs2=OCFS2
 label.offer.ha=HA anbieten
 label.ok=OK
+label.openDaylight=OpenDaylight
+label.operator=Betreiber
 label.optional=optional
 label.os.preference=OS Pr\u00e4ferenz
 label.os.type=OS Typ
 label.ovs=OVS
 label.owner.account=Eigent\u00fcmerkonto
+label.palo.alto.details=Palo Alto-Details
+label.PA.log.profile=Palo Alto-Protokollprofil
+label.PA=Palo Alto
+label.passive=Passiv
 label.password.enabled=Passwort aktiviert
 label.password.lower=Passwort
 label.password=Passwort
 label.path=Pfad
 label.persistent=Persistent
+label.physical.network.ID=Physikalisches Netzwerkkennung
+label.physical.network=Physikalisches Netzwerk
 label.PING.CIFS.password=PING CIFS Passwort
 label.PING.CIFS.username=PING CIFS Benutzername
 label.PING.dir=PING-Verzeichnis
@@ -708,6 +787,8 @@ label.PING.storage.IP=IP des externen Speichers anpingen
 label.please.wait=Bitte warten
 label.pod=Pod
 label.pods=Pod
+label.portable.ip=Portable IP
+label.portable.ip.range.details=Details des portablen IP-Bereichs
 label.portable.ip.ranges=Portable IP-Bereiche
 label.portable.ips=Portable IPs
 label.port.forwarding=Portweiterleitung
@@ -730,6 +811,7 @@ label.private.network=Privates Netzwerk
 label.private.port=Privater Port
 label.private.zone=Private Zone
 label.profile=Profil
+label.project.dashboard=Projekt\u00fcbersichtsseite
 label.project.id=Projektkennung
 label.project.invite=Zum Projekt einladen
 label.project.name=Projektname
@@ -744,6 +826,7 @@ label.public.ips=\u00d6ffentliche IP-Adressen
 label.public.ip=\u00d6ffentliche IP-Adresse
 label.public.network=\u00d6ffentliches Netzwerk
 label.public.port=\u00d6ffentlicher Port
+label.public.traffic=\u00d6ffentlicher Datenverkehr
 label.public=\u00d6ffentlich
 label.public.zone=\u00d6ffentliche Zone
 label.Pxe.server.type=PXE Server Type
@@ -756,15 +839,21 @@ label.refresh=Aktualisieren
 label.region=Region
 label.reinstall.vm=VM neu installieren
 label.related=Verwandt
+label.remind.later=Sp\u00e4ter erinnern
 label.remove.ACL=ACL entfernen
 label.remove.ip.range=IP-Bereich entfernen
 label.remove.ldap=LDAP entfernen
+label.remove.network.offering=Netzwerkangebot entfernen
 label.remove.region=Region entfernen
 label.remove.rule=Regel entfernen
+label.remove.vpc.offering=VPC-Angebot entfernen
 label.removing.user=Entfernen von Benutzern
 label.reource.id=Ressourcenkennung
+label.replace.acl.list=ACL-Liste ersetzen
 label.required=Erforderlich
 label.resetVM=VM zur\u00fccksetzen
+label.reset.VPN.connection=VPN-Verbindung zur\u00fccksetzen
+label.resize.new.offering.id=Neues Angebot
 label.resize.new.size=Neue Gr\u00f6\u00dfe (GB)
 label.resource.name=Ressourcenname
 label.resource=Ressource
@@ -799,6 +888,7 @@ label.select=Ausw\u00e4hlen
 label.select.a.zone=Zone ausw\u00e4hlen
 label.select.instance=Instanz ausw\u00e4hlen
 label.select.iso.or.template=ISO oder Vorlage ausw\u00e4hlen
+label.select.offering=Angebot ausw\u00e4hlen
 label.select.project=Projekt ausw\u00e4hlen
 label.select.template=Vorlage ausw\u00e4hlen
 label.select-view=Ansicht ausw\u00e4hlen
@@ -806,6 +896,7 @@ label.sent=Versendet
 label.server=Server
 label.service.offering=Service-Angebot
 label.services=Dienste
+label.service.state=Dienststatus
 label.session.expired=Sitzung abgelaufen
 label.settings=Einstellungen
 label.setup=Konfiguration
@@ -814,6 +905,7 @@ label.set.up.zone.type=Zonentyp einrichten
 label.setup.zone=Zone einrichten
 label.shared=Gemeinsame
 label.SharedMountPoint=Geteilter Einh\u00e4ngepunkt
+label.show.advanced.settings=Erweiterte Einstellungen anzeigen
 label.show.ingress.rule=Zeige Regeln, die den Zutritt steuern
 label.size=Gr\u00f6\u00dfe
 label.smb.domain=SMB-Dom\u00e4ne
@@ -825,7 +917,7 @@ label.snapshot=Schnappschuss
 label.snapshots=Schnappsch\u00fcsse
 label.snapshot.s=Schnappschuss (Schnappsch\u00fcsse)
 label.SNMP.port=SNMP-Port
-label.source=Quelle
+label.sockets=CPU-Sockets
 label.srx.details=SRX-Details
 label.srx=SRX
 label.start.IP=Start-IP
@@ -835,11 +927,15 @@ label.static.nat=Statische NAT
 label.statistics=Statistiken
 label.status=Status
 label.step.1=Schritt 1
+label.step.1.title=Schritt 1\: <strong>W\u00e4hlen Sie eine Vorlage aus</strong>
 label.step.2=Schritt 2
+label.step.2.title=Schritt 2\: <strong>Dienstangebot</strong>
 label.step.3=Schritt 3
 label.step.4=Schritt 4
+label.step.4.title=Schritt 4\: <strong>Netzwerk</strong>
 label.step.5=Schritt 5
 label.sticky.domain=Domain
+label.sticky.expire=L\u00e4uft ab
 label.sticky.indirect=Indirekt
 label.sticky.length=L\u00e4nge
 label.sticky.mode=Modus
@@ -855,6 +951,7 @@ label.submit=\u00dcberreichen
 label.succeeded=Erfolgreich
 label.sunday=Sonntag
 label.supported.services=Unterst\u00fctzte Dienste
+label.system.offering=Systemangebot
 label.system.service.offering=System-Service-Angebot
 label.system.vms=System VMs
 label.system.vm=System-VM
@@ -864,12 +961,14 @@ label.tag.key=Schlagwortschl\u00fcssel
 label.tags=Markierungen
 label.tag.value=Schlagwortwert
 label.target.iqn=Ziel IQN
+label.task.completed=Aufgabe fertiggestellt
 label.template.limits=Vorlagen Grenzen
 label.template=Vorlage
 label.TFTP.dir=TFTP-Verzeichnis
 label.theme.default=Motiv-Standardeinstellung
 label.theme.grey=personalisiertes - grau
 label.theme.lightblue=personalisiertes - hellblau
+label.threshold=Schwellenwert
 label.thursday=Donnerstag
 label.timeout.in.second = Zeit\u00fcberschreitung (Sekunden)
 label.timeout=Zeit\u00fcberschreitung
@@ -879,6 +978,7 @@ label.timezone=Zeitzone
 label.total.cpu=Gesamtanzahl CPU
 label.total.CPU=Gesamtanzahl CPU
 label.total.memory=Gesamter Speicher
+label.total.storage=Gesamter Speicher
 label.total.vms=Insgesamte VMs
 label.traffic.type=Traffic Typ
 label.tuesday=Dienstag
@@ -907,15 +1007,20 @@ label.vcenter.datastore=vCenter Datenspeicher
 label.vcenter.host=vCenter Host
 label.vcenter.password=vCenter Passwort
 label.vcenter.username=vCenter Benutzername
+label.vcenter=vcenter
 label.version=Version
 label.vgpu.max.resolution=Maximale Aufl\u00f6sung
+label.vgpu.max.vgpu.per.gpu=vGPUs pro GPU
+label.vgpu.type=vGPU-Typ
 label.vgpu.video.ram=Video RAM
 label.view=Ansicht
 label.view.more=Ansichtsmodus
+label.view.secondary.ips=Sekund\u00e4re IPs ansehen
 label.virtual.network=Virtuelles Netzwerk
 label.virtual.routers=Virtuelle Router
 label.virtual.router=Virtueller Router
 label.vlan.id=VLAN ID
+label.vlan.only=VLAN
 label.vlan.range.details=VLAN-Bereichdetails
 label.vlan.ranges=VLAN-Bereich(e)
 label.vlan.range=VLAN Reichweite
@@ -945,6 +1050,8 @@ label.volumes=Volumes
 label.volume=Volume
 label.vpc.id=VPC-Kennung
 label.VPC.limits=VPC-Begrenzungen
+label.vpc.offering.details=Details des VPC-Angebots
+label.vpc.offering=VPC-Angebot
 label.vpc=VPC
 label.VPN.connection=VPN-Verbindung
 label.VPN.gateway=VPN-Gateway
@@ -953,6 +1060,7 @@ label.vxlan.id=VXLAN ID
 label.vxlan.range=VXLAN Reichweite
 label.vxlan=VXLAN
 label.waiting=Warten
+label.warn.upper=WARNEN
 label.warn=Warnen
 label.wednesday=Mittwoch
 label.weekly=W\u00f6chentlich
@@ -961,7 +1069,6 @@ label.yes=Ja
 label.zone.details=Zonendetails
 label.zone.id=Zone ID
 label.zone.lower=Zone
-label.zone.name=Zonenname
 label.zone.step.1.title=Schritt 1\: <strong>W\u00e4hlen Sie ein Netzwerk aus</strong>
 label.zone.step.2.title=Schritt 2\: <strong>F\u00fcgen Sie eine Zone hinzu</strong>
 label.zone.step.4.title=Schritt 4\: <strong>F\u00fcgen Sie einen IP-Bereich hinzu</strong>
@@ -1020,19 +1127,32 @@ message.add.load.balancer=Einen Lastverteiler zur Zone hinzuf\u00fcgen
 message.add.primary=Bitte spezifizieren Sie die folgenden Parameter, um einen neuen Hauptspeicher hinzuzuf\u00fcgen
 message.add.template=Bitte geben Sie die folgende Daten ein, um Ihre neue Vorlage zu erstellen
 message.add.volume=Bitte geben Sie die folgende Daten ein, um ein neues Volume hinzuzuf\u00fcgen.
+message.alert.state.detected=Alarmstatus erkannt
 message.allow.vpn.access=Bitte geben Sie einen Benutzernamen und ein Kennwort f\u00fcr den Benutzer ein, f\u00fcr den Sie VPN-Zugang m\u00f6chten.
 message.apply.snapshot.policy=Sie haben Ihre derzeitige Schnappschuss Richtlinie erfolgreich aktualisiert.
 message.attach.iso.confirm=Bitte best\u00e4tigen Sie, dass sie die ISO zu Ihrer virtuellen Instanz hinzuf\u00fcgen m\u00f6chten.
 message.change.offering.confirm=Bitte best\u00e4tigen Sie, dass Sie das Service-Angebot dieser virtuellen Instanz \u00e4ndern m\u00f6chten.
 message.copy.iso.confirm=Bitte best\u00e4tigen Sie, dass Sie Ihre ISO kopieren m\u00f6chten und zwar nach
+message.create.template=Sind Sie sicher, dass Sie eine Vorlage erstellen m\u00f6chten?
+message.creating.cluster=Cluster wird erstellt
+message.creating.guest.network=Gastnetzwerk wird erstellt
+message.creating.primary.storage=Hauptspeicher wird erstellt
+message.creating.secondary.storage=Sekund\u00e4rspeicher wird erstellt
+message.creating.zone=Zone wird erstellt
 message.delete.account=Bitte best\u00e4tigen Sie, dass Sie dieses Benutzerkonto l\u00f6schen m\u00f6chten.
 message.detach.iso.confirm=Bitte best\u00e4tigen Sie, dass Sie die ISO von der virtuellen Instanz trennen m\u00f6chten.
 message.disable.account=Bitte best\u00e4tigen Sie, dass Sie Ihr Benutzerkonto deaktivieren m\u00f6chten. Kein Nutzer dieses Kontos wird mehr Zugriff auf die Cloud Ressourcen haben. Alle laufenden virtuellen Maschinen werden sofort abgestellt.
 message.disable.snapshot.policy=Sie haben Ihre derzeitige Schnappschuss Richtlinie erfolgreich deaktiviert.
 message.disable.vpn.access=Bitte best\u00e4tigen Sie, dass Sie den VPN Zugriff deaktivieren m\u00f6chten.
+message.disabling.vpc.offering=VPC-Angebot wird deaktiviert
+message.disallowed.characters=Nicht erlaubte Zeichen\: \\<\\,\\>
+message.download.ISO=Bitte klicken Sie auf <a href\="\#">00000</a>, um das ISO herunterzuladen
+message.download.template=Bitte klicken Sie auf <a href\="\#">00000</a>, um die Vorlage herunterzuladen
+message.download.volume=Bitte klicken Sie auf <a href\="\#">00000</a>, um das Volumen herunterzuladen
 message.enable.account=Bitte best\u00e4tigen Sie, dass Sie dieses Konto aktivieren m\u00f6chten.
 message.enabled.vpn=Ihr VPN Zugriff ist zurzeit aktiv und via IP k\u00f6nnen Sie darauf zugreifen
 message.enable.vpn.access=VPN ist zurzeit nicht f\u00fcr diese IP Addresse aktiviert. M\u00f6chten Sie den VPN Zugriff aktivieren?
+message.enabling.vpc.offering=VPC-Angebot wird aktiviert
 message.enabling.zone.dots=Zone wird aktiviert...
 message.enabling.zone=Zone wird aktiviert
 message.installWizard.click.retry=Bitte den Start Button f\u00fcr einen neuen Versuch dr\u00fccken
@@ -1059,8 +1179,11 @@ message.migrate.instance.to.ps=Bitte best\u00e4tigen sie, dass sie die Instanz a
 message.new.user=Spezifieren Sie das folgende um einen neuen Nutzer dem Benutzerkonto hinzuzuf\u00fcgen
 message.number.clusters=<h2><span> \# of </span> Cluster</h2>
 message.number.hosts=<h2><span> \# of </span> Hosts</h2>
+message.number.storage=<h2><span> \# von </span> Hauptspeichervolumina</h2>
 message.number.zones=<h2><span> \# of </span> Zonen</h2>
 message.remove.vpn.access=Bitte best\u00e4tigen Sie, dass Sie den VPN-Zugriff vom folgenden Benutzer entfernen m\u00f6chten.
+message.select.instance=Bitte w\u00e4hlen Sie eine Instanz aus.
+message.select.item=Bitte w\u00e4hlen Sie ein Element aus.
 message.setup.successful=Cloud setup erfolgreich
 message.step.1.continue=Bitte w\u00e4hlen Sie eine Vorlage oder ISO, um fortzufahren
 message.step.2.continue=Bitte w\u00e4hlen Sie ein Service-Angebot, um fortzufahren
@@ -1069,9 +1192,22 @@ message.step.3.continue=Bitte w\u00e4hlen Sie ein Festplatten-Angebot, um fortzu
 message.step.3.desc=
 message.step.4.continue=Bitte w\u00e4hlen Sie mindestens ein Netzwerk, um fortzufahren
 message.step.4.desc=Bitte w\u00e4hlen Sie Ihr Hauptnetzwerk zu dem Ihre virtuelle Instanz verbunden sein wird.
+message.template.copying=Vorlage wird kopiert.
 message.tooltip.zone.name=Einen Namen f\u00fcr die Zone.
+message.validate.creditcard=Bitte geben Sie eine g\u00fcltige Kreditkartennummer ein.
+message.validate.date=Bitte geben Sie ein g\u00fcltiges Datum ein.
+message.validate.date.ISO=Bitte geben Sie ein g\u00fcltiges Datum (ISO) ein.
+message.validate.email.address=Bitte geben Sie eine g\u00fcltige E-Mail-Adresse ein.
+message.validate.equalto=Bitte geben Sie den gleichen Wert erneut ein.
 message.validate.fieldrequired=Dieses Feld wird ben\u00f6tigt
+message.validate.fixfield=Bitte korrigieren Sie dieses Feld.
+message.validate.maxlength=Bitte geben Sie nicht mehr als {0} Zeichen ein.
+message.validate.minlength=Bitte geben Sie mindestens {0} Zeichen ein.
+message.validate.number=Bitte geben Sie eine g\u00fcltige Nummer ein.
+message.validate.range=Bitte geben Sie einen Wert zwischen {0} und {1} ein.
+message.validate.URL=Bitte geben Sie eine g\u00fcltige URL ein.
 message.vm.create.template.confirm=Das Erstellen einer Vorlage f\u00fchrt automatisch zu einem Neustart der VM.
+message.your.cloudstack.is.ready=Ihr CloudStack ist bereit\!
 message.Zone.creation.complete=Zonenerstellung abgeschlossen
 message.zone.step.1.desc=Bitte w\u00e4hlen Sie ein Netzwerk-Modell f\u00fcr Ihre Zone.
 message.zone.step.2.desc=Bitte geben Sie die folgende Information ein, um eine neue Zone hinzuzuf\u00fcgen
@@ -1081,14 +1217,13 @@ network.rate=Netzwerk-Rate
 notification.reboot.instance=Instanz neu starten
 state.Active=Aktiv
 state.Allocated=Zugeteilt
+state.Completed=Fertiggestellt
 state.Declined=Abgelehnt
 state.Destroyed=Zerst\u00f6rt
 state.Disabled=Deaktiviert
-state.enabled=Aktiviert
 state.Enabled=Aktiviert
 state.Error=Fehler
 state.Pending=Ausstehend
-state.ready=Bereit
 state.Ready=Bereit
 state.Running=L\u00e4uft
 state.Starting=Startet

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_es.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 6b51c38..a904e37 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -346,6 +346,7 @@ label.community=Comunidad
 label.compute.and.storage=Computo y Almacenamiento
 label.configuration=Configuraci\u00c3\u00b3n
 label.configure=Configurar
+label.configure.ldap=Configurar LDAP
 label.configure.vpc=Configurar VPC
 label.confirmation=Confirmation
 label.confirm.password=Confirmar password
@@ -546,6 +547,8 @@ label.launch=Lanzar
 label.launch.vm=Lanzar maquina virtual
 label.lb.algorithm.roundrobin=Round-robin
 label.lb.algorithm.source=Fuente
+label.ldap.configuration=Configuraci\u00f3n de LADP
+label.ldap.port=Puerto de LDAP
 label.level=Nivel
 label.load.balancer=equilibrador de carga
 label.load.balancing=Balanceador de Carga
@@ -555,7 +558,6 @@ label.local=local
 label.local.storage=Almacenamiento Local
 label.login=Login
 label.logout=Cerrar sesi\u00c3\u00b3n
-label.saml.login=SAML Login
 label.lun=LUN
 label.LUN.number=LUN \#
 label.manage=Administrar
@@ -615,6 +617,7 @@ label.migrate.router.to=Router para migrar
 label.migrate.systemvm.to=Migrar m\u00c3\u00a1quina virtual del sistema para
 label.migrate.to.host=Migrar a host
 label.migrate.to.storage=Migrar a almacenamiento
+label.migrate.volume.to.primary.storage=Migrar volumen a otro almacenamiento primario
 label.minimum=M\u00c3\u00adnimo
 label.minute.past.hour=Minuto (s) despu\u00c3\u00a9s de la hora
 label.mode=modo
@@ -698,6 +701,7 @@ label.pod=Pod
 label.pods=Pod
 label.port.forwarding.policies=Pol\u00edticas de Port forwarding
 label.port.forwarding=Port Forwarding
+label.port=Puerto
 label.port.range=rango de puertos
 label.PreSetup=PreSetup
 label.prev=Anterior
@@ -733,14 +737,17 @@ label.Pxe.server.type=Tipo de servidor Pxe
 label.quickview=Vista R\u00e1pida
 label.reboot=Reiniciar
 label.recent.errors=recientes errores
+label.recover.vm=Recuperar la VM
 label.redundant.router=enrutador redundante
 label.refresh=Actualizar
+label.reinstall.vm=Reinstalar la VM
 label.related=relacionados
 label.remind.later=Recordar mas tarde
 label.remove.ACL=Remover ACL
 label.remove.egress.rule=Eliminar regla de salida
 label.remove.from.load.balancer=ejemplo Eliminaci\u00c3\u00b3n de equilibrador de carga
 label.remove.ingress.rule=Eliminar regla de entrada
+label.remove.ldap=Quitar LDAP
 label.remove.pf=Remover regla de port forwarding
 label.remove.rule=Remover regla
 label.remove.static.nat.rule=Remover regla NAT est\u00e1tica
@@ -897,6 +904,7 @@ label.used=Usado
 label.username=Nombre de usuario
 label.users=usuario
 label.user=Usuario
+label.use.vm.ips=Usar las IP de la VM
 label.value=Valor
 label.vcdcname=nombre
 label.vcenter.cluster=vCenter cl\u00c3\u00baster
@@ -912,10 +920,10 @@ label.view.more=Ver mas
 label.view.secondary.ips=Ver las IP secundarias
 label.virtual.appliances=Virtual Appliances
 label.virtual.appliance=Virtual Appliance
-label.virtual.machines=Maquinas virtuales
 label.virtual.network=Red Virtual
 label.virtual.routers=Routers Virtuales
 label.vlan.id=ID de VLAN
+label.vlan.only=VLAN
 label.vlan.range=VLAN Gama
 label.vlan=VLAN
 label.vlan.vni.range=VLAN Gama
@@ -923,6 +931,7 @@ label.vm.add=A\u00c3\u00b1adir Instancia
 label.vm.destroy=Destroy
 label.VMFS.datastore=VMFS de datos tienda
 label.vmfs=VMFS
+label.vm.ip=Direcci\u00f3n IP de la VM
 label.vm.name=Nombre VM
 label.vm.reboot=Reiniciar
 label.vmsnapshot.type=Tipo
@@ -1123,6 +1132,8 @@ message.number.storage=<h2> <span> \# de </span> Almacenamiento primario </h2>
 message.number.zones=<h2> <span> \# de </span> Zonas </h2>
 message.please.proceed=Por favor proceda a el siguiente paso.
 message.please.select.networks=Por favor seleccione la red para su maquina virtual.
+message.recover.vm=Confirme que quiere recuperar esta VM.
+message.reinstall.vm=NOTA\: Proceda con precauci\u00f3n. Esta acci\u00f3n har\u00e1 que la VM se vuelva a instalar usando la plantilla. Los datos en el disco de base se perder\u00e1n. Los vol\u00famenes de datos adicionales no se modificar\u00e1n.
 message.remove.vpc=Por favor confirme que usted quiere eliminar el VPC
 message.remove.vpn.access=Por favor, confirme que desea eliminar el acceso VPN desde el siguiente usuario
 message.restart.mgmt.server=Por favor, reinicie el servidor de administraci\u00c3\u00b3n (s) para la nueva configuraci\u00c3\u00b3n surta efecto.
@@ -1163,12 +1174,10 @@ state.Completed=Completado
 state.Creating=Creando
 state.Declined=Declinado
 state.Disabled=personas de movilidad reducida
-state.enabled=Habilitado
 state.Enabled=Habilitado
 state.Error=Error
 state.Migrating=Migrando
 state.Pending=pendiente
-state.ready=Listo
 state.Ready=Listo
 state.Starting=Iniciando
 state.Stopping=Parando

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_fr_FR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 9ba5f1d..e3d96c2 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -21,20 +21,20 @@ confirm.enable.swift=Remplir les informations suivantes pour activer Swift
 error.could.not.change.your.password.because.ldap.is.enabled=Erreur\: impossible de changer votre mot de passe car le mode LDAP est activ\u00e9.
 error.could.not.enable.zone=Impossible d\\'activer la zone
 error.installWizard.message=Une erreur s\\'est produite ; vous pouvez retourner en arri\u00e8re et corriger les erreurs
-error.invalid.username.password=Utilisateur ou mot de passe invalide
-error.login=Votre nom d\\'utilisateur / mot de passe ne correspond pas \u00e0 nos donn\u00e9es.
+error.invalid.username.password=Identifiant ou mot de passe invalide
+error.login=Votre identifiant / mot de passe ne correspond pas \u00e0 nos enregistrements.
 error.menu.select=\u00c9chec de l\\'action car il n\\'y a aucun \u00e9l\u00e9ment s\u00e9lectionn\u00e9.
-error.mgmt.server.inaccessible=Le serveur de gestion est indisponible. Essayez plus tard.
-error.password.not.match=Les mots de passe ne correspondent pas
+error.mgmt.server.inaccessible=Le serveur de gestion est inaccessible. Veuillez essayer plus tard.
+error.password.not.match=Les champs mot de passe ne correspondent pas
 error.please.specify.physical.network.tags=L\\'offre r\u00e9seau ne sera pas disponible tant que des libell\u00e9s n\\'auront pas \u00e9t\u00e9 renseign\u00e9s pour ce r\u00e9seau physique.
 error.session.expired=Votre session a expir\u00e9e.
-error.something.went.wrong.please.correct.the.following=Erreur; corriger le point suivant
-error.unable.to.reach.management.server=Impossible de joindre le serveur d\\'administration
+error.something.went.wrong.please.correct.the.following=Quelque chose s\\'est mal pass\u00e9e ; veuillez corriger le point suivant
+error.unable.to.reach.management.server=Impossible d\\'attendre le serveur de gestion
 error.unresolved.internet.name=Votre nom Internet ne peut pas \u00eatre r\u00e9solu.
 force.delete.domain.warning=Attention \: Choisir cette option entra\u00eenera la suppression de tous les domaines issus et l\\'ensemble des comptes associ\u00e9s, ainsi que de leur ressources
 force.delete=Forcer la suppression
-force.remove=Forcer la suppression
-force.remove.host.warning=Attention \: Choisir cette option entra\u00eenera CloudStack \u00e0\u00a0arr\u00eater l\\'ensemble des machines virtuelles avant d\\'enlever l\\'h\u00f4te du cluster
+force.remove.host.warning=Attention \: Choisir cette option entra\u00eenera CloudStack \u00e0\u00a0forecer l\\'arr\u00eat de l\\'ensemble des machines virtuelles avant d\\'enlever l\\'h\u00f4te du cluster
+force.remove=Suppression forc\u00e9e
 force.stop=Forcer l\\'arr\u00eat
 force.stop.instance.warning=Attention \: un arr\u00eat forc\u00e9 sur cette instance est la dernier option. Cela peut engendrer des pertes de donn\u00e9es et/ou un comportement inconsistant de votre instance.
 ICMP.code=Code ICMP
@@ -47,31 +47,31 @@ label.about=A propos de
 label.accept.project.invitation=Accepter l\\'invitation au projet
 label.account.and.security.group=Compte, groupe de s\u00e9curit\u00e9
 label.account=Compte
-label.account.id=ID du Compte
+label.account.id=ID de compte
 label.account.lower=compte
-label.account.name=Nom du compte
+label.account.name=Nom de compte
 label.accounts=Comptes
 label.account.specific=Sp\u00e9cifique au compte
 label.acl=ACL
 label.acl.id=ID ACL
 label.acl.name=Nom ACL
 label.acl.replaced=ACL remplac\u00e9e
-label.acquire.new.ip=Acqu\u00e9rir une nouvelle adresse IP
-label.acquire.new.secondary.ip=Acqu\u00e9rir une nouvelle IP secondaire
+label.acquire.new.ip=Acqu\u00e9rir nouvelle adr. IP
+label.acquire.new.secondary.ip=Acqu\u00e9rir nouvelle IP secondaire
 label.action=Action
-label.action.attach.disk.processing=Rattachement du Disque...
-label.action.attach.disk=Rattacher un disque
-label.action.attach.iso.processing=Rattachement de l\\'image ISO
-label.action.attach.iso=Rattacher une image ISO
-label.action.cancel.maintenance.mode=Annuler le mode maintenance
+label.action.attach.disk.processing=Rattachement du disque...
+label.action.attach.disk=Rattacher disque
+label.action.attach.iso.processing=Rattachement de l\\'image ISO...
+label.action.attach.iso=Rattacher image ISO
+label.action.cancel.maintenance.mode=Annuler mode maintenance
 label.action.cancel.maintenance.mode.processing=Annulation du mode maintenance...
 label.action.change.password=Changer le mot de passe
 label.action.change.service=Changer d\\'offre de service
 label.action.change.service.processing=Changement de d\\'offre de service...
 label.action.copy.ISO=Copier une image ISO
 label.action.copy.ISO.processing=Copie de l\\'image ISO...
-label.action.copy.template=Copier un mod\u00e8le
-label.action.copy.template.processing=Copie du Mod\u00e8le...
+label.action.copy.template=Copier mod\u00e8le
+label.action.copy.template.processing=Copie du mod\u00e8le...
 label.action.create.template=Cr\u00e9er un mod\u00e8le
 label.action.create.template.from.vm=Cr\u00e9er un mod\u00e8le depuis la VM
 label.action.create.template.from.volume=Cr\u00e9er un mod\u00e8le depuis le volume
@@ -257,7 +257,7 @@ label.add.acl.list=Ajouter Liste ACL
 label.add.affinity.group=Ajouter nouveau groupe d\\'affinit\u00e9
 label.add=Ajouter
 label.add.baremetal.dhcp.device=Ajouter un DHCP Baremetal
-label.add.BigSwitchVns.device=Ajouter contr\u00f4leur BigSwitch Vns
+label.add.BigSwitchVns.device=Ajouter un contr\u00f4leur BigSwitch Vns
 label.add.BrocadeVcs.device=Ajouter Switch Brocade Vcs
 label.add.by=Ajout\u00e9 par
 label.add.by.cidr=Ajouter par CIDR
@@ -290,6 +290,7 @@ label.adding.zone=Ajout de la zone
 label.add.intermediate.certificate=Ajouter certificat interm\u00e9diaire
 label.add.internal.lb=Ajouter LB interne
 label.add.ip.range=Ajouter une plage IP
+label.add.isolated.guest.network=Ajouter un r\u00e9seau d\\'invit\u00e9 isol\u00e9
 label.add.isolated.network=Ajouter un r\u00e9seau isol\u00e9
 label.additional.networks=R\u00e9seaux additionnels
 label.add.list.name=Nom Liste ACL
@@ -418,7 +419,7 @@ label.brocade.vcs.details=D\u00e9tails Switch Brocade Vcs
 label.by.account=Par compte
 label.by.alert.type=Par type d\\'alerte
 label.by.availability=Par disponibilit\u00e9
-label.by.date.end=par date (fin)
+label.by.date.end=Par date (fin)
 label.by.date.start=Par date (d\u00e9but)
 label.by.domain=Par domaine
 label.by.end.date=Par date de fin
@@ -501,7 +502,7 @@ label.create.project=Cr\u00e9er un projet
 label.create.template=Cr\u00e9er un mod\u00e8le
 label.create.VPN.connection=Cr\u00e9er une connexion VPN
 label.cross.zones=Multi Zones
-label.custom.disk.iops=IOPS personnalis\u00e9s
+label.custom.disk.iops=IOPS personnalis\u00e9
 label.custom.disk.size=Taille de disque personnalis\u00e9e
 label.custom=Personnalis\u00e9
 label.daily=Quotidien
@@ -598,7 +599,7 @@ label.disk.total=Espace disque total
 label.disk.volume=Volume disque
 label.disk.write.bytes=\u00c9criture Disque (Octets)
 label.disk.write.io=\u00c9criture Disque (IO)
-label.display.name=Nom commun
+label.display.name=Nom d\\'affichage
 label.display.text=Texte affich\u00e9
 label.distributedrouter=Routeur Distribu\u00e9
 label.dns.1=DNS 1
@@ -616,7 +617,7 @@ label.done=Termin\u00e9
 label.double.quotes.are.not.allowed=Les guillemets ne sont pas autoris\u00e9es
 label.download.progress=Progression du t\u00e9l\u00e9chargement
 label.drag.new.position=D\u00e9placer sur une autre position
-label.duration.in.sec=Dur\u00e9e (sec)
+label.duration.in.sec=Dur\u00e9e (en sec)
 label.dynamically.scalable=Dimensionnement dynamique
 label.edit.acl.rule=Modifier r\u00e8gle ACL
 label.edit.affinity.group=Modifier le groupe d\\'affinit\u00e9
@@ -648,7 +649,7 @@ label.enable.vpc.offering=Activer offre VPC
 label.enable.vpn=Activer VPN
 label.enabling.vpn.access=Activation de l\\'acc\u00e8s VPN
 label.enabling.vpn=Activation du VPN
-label.end.IP=Fin de plage IP
+label.end.IP=IP fin plage
 label.endpoint.or.operation=Terminaison ou Op\u00e9ration
 label.endpoint=Terminaison
 label.end.port=Port de fin
@@ -804,8 +805,8 @@ label.ip.limits=Limite de IPs publiques
 label.ip.or.fqdn=IP ou FQDN
 label.ip.range=Plage IP
 label.ip.ranges=Plages IP
+label.ips=Adresse IP
 label.IPsec.preshared.key=Cl\u00e9 partag\u00e9e IPsec
-label.ips=IPs
 label.ipv4.cidr=CIDR IPv4
 label.ipv4.dns1=DNS1 IPv4
 label.ipv4.dns2=DNS2 IPv4
@@ -825,7 +826,7 @@ label.is.default=Est par d\u00e9faut
 label.iso.boot=D\u00e9marrage par ISO
 label.iso=ISO
 label.isolated.networks=R\u00e9seaux isol\u00e9s
-label.isolation.method=M\u00e9thode de s\u00e9paration
+label.isolation.method=M\u00e9thode Isolation
 label.isolation.mode=Mode d\\'isolation
 label.isolation.uri=URI d\\'isolation
 label.is.redundant.router=Redondant
@@ -859,8 +860,8 @@ label.latest.events=Derniers \u00e9v\u00e9nements
 label.launch=D\u00e9marrer
 label.launch.vm=D\u00e9marrer VM
 label.launch.zone=D\u00e9marrer la zone
-label.lb.algorithm.round.robin=Al\u00e9atoire
 label.lb.algorithm.leastconn=Le moins de connexions
+label.lb.algorithm.roundrobin=Cyclique
 label.lb.algorithm.source=Origine
 label.LB.isolation=R\u00e9partition de charge isol\u00e9e
 label.ldap.configuration=Configuration LDAP
@@ -878,7 +879,6 @@ label.local.storage.enabled=Stockage local activ\u00e9
 label.local.storage=Stockage local
 label.login=Connexion
 label.logout=D\u00e9connexion
-label.saml.login=SAML Connexion
 label.lun=LUN
 label.LUN.number=N\u00b0 LUN
 label.lxc.traffic.label=Libell\u00e9 trafic LXC
@@ -960,8 +960,8 @@ label.migrate.router.to=Migrer le routeur vers
 label.migrate.systemvm.to=Migrer la VM syst\u00e8me vers
 label.migrate.to.host=Migrer vers un h\u00f4te
 label.migrate.to.storage=Migrer vers un stockage
-label.migrate.volume=Migration du volume
 label.migrate.volume.to.primary.storage=Migration du volume vers un autre stockage primaire
+label.migrate.volume=Volume Migr\u00e9
 label.minimum=Minimum
 label.min.instances=Instances Min.
 label.minute.past.hour=minute(s)
@@ -969,17 +969,17 @@ label.mode=Mode
 label.monday=Lundi
 label.monthly=Mensuel
 label.more.templates=Plus de mod\u00e8les
-label.move.down.row=Descendre d\\'un cran
+label.move.down.row=Descendre d\\'un niveau
 label.move.to.bottom=D\u00e9placer en bas
 label.move.to.top=Placer au dessus
-label.move.up.row=Monter d\\'un cran
+label.move.up.row=Monter d\\'un niveau
 label.my.account=Mon compte
 label.my.network=Mon r\u00e9seau
 label.my.templates=Mes mod\u00e8les
-label.na=N/D
-label.name.lower=nom
+label.name.lower=name
 label.name=Nom
 label.name.optional=Nom (optionnel)
+label.na=N/A
 label.nat.port.range=Plage de port NAT
 label.netmask=Masque de r\u00e9seau
 label.netscaler.details=D\u00e9tails NetScaler
@@ -1203,7 +1203,7 @@ label.reource.id=ID Ressource
 label.replace.acl.list=Remplacer Liste ACL
 label.replace.acl=Remplacer ACL
 label.required=Requis
-label.requires.upgrade=Mise \u00e0 niveau n\u00e9cessaire
+label.requires.upgrade=Mise \u00e0 jour n\u00e9cessaire
 label.reserved.ip.range=Plage IP r\u00e9serv\u00e9e
 label.reserved.system.gateway=Passerelle r\u00e9serv\u00e9e Syst\u00e8me
 label.reserved.system.ip=Adresse IP Syst\u00e8me r\u00e9serv\u00e9e
@@ -1243,11 +1243,12 @@ label.s3.bucket=Seau
 label.s3.connection_timeout=D\u00e9lai d\\'expiration de connexion
 label.s3.endpoint=Terminaison
 label.s3.max_error_retry=Nombre d\\'essai en erreur max.
-label.s3.nfs.path=S3 Chemin NFS
-label.s3.nfs.server=S3 Serveur NFS
+label.s3.nfs.path=Chemin NFS S3
+label.s3.nfs.server=Serveur NFS S3
 label.s3.secret_key=Cl\u00e9 Priv\u00e9e
 label.s3.socket_timeout=D\u00e9lai d\\'expiration de la socket
 label.s3.use_https=Utiliser HTTPS
+label.saml.login=Identifiant SAML
 label.saturday=Samedi
 label.save.and.continue=Enregistrer et continuer
 label.save=Sauvegarder
@@ -1314,7 +1315,7 @@ label.snapshot.s=Instantan\u00e9(s)
 label.snapshots=Instantan\u00e9s
 label.SNMP.community=Communaut\u00e9 SNMP
 label.SNMP.port=Port SNMP
-label.sockets=Sockets
+label.sockets=Sockets CPU
 label.source.ip.address=Adresse IP source
 label.source.nat=NAT Source
 label.source.nat.supported=Source NAT support\u00e9
@@ -1325,7 +1326,7 @@ label.specify.vxlan=Pr\u00e9ciser le VXLAN
 label.SR.name=Nom du point de montage
 label.srx.details=D\u00e9tails SRX
 label.srx=SRX
-label.start.IP=Plage de d\u00e9but IP
+label.start.IP=IP d\u00e9but plage
 label.start.lb.vm=D\u00e9marrer LB VM
 label.start.port=Port de d\u00e9but
 label.start.reserved.system.IP=Adresse IP de d\u00e9but r\u00e9serv\u00e9e Syst\u00e8me
@@ -1441,7 +1442,7 @@ label.update.project.resources=Mettre \u00e0 jour les ressources du projet
 label.update.ssl.cert= Certificat SSL
 label.update.ssl= Certificat SSL
 label.updating=Mise \u00e0 jour
-label.upgrade.required=Mise \u00e0 niveau n\u00e9cessaire
+label.upgrade.required=Une mise \u00e0 jour est n\u00e9cessaire
 label.upgrade.router.newer.template=Mette \u00e0 jour le routeur pour utiliser le mod\u00e8le le plus r\u00e9cent
 label.upload=Charger
 label.upload.volume=Charger un volume
@@ -1451,8 +1452,8 @@ label.usage.sanity.result=R\u00e9sultat de sant\u00e9 Usage
 label.usage.server=Serveur d\\'Usage
 label.used=Utilis\u00e9
 label.user.data=Donn\u00e9es utilisateur
-label.username.lower=nom d\\'utilisateur
-label.username=Nom d\\'Utilisateur
+label.username=Identifiant
+label.username.lower=identifiant
 label.users=Utilisateurs
 label.user=Utilisateur
 label.user.vm=Utilisateur VM
@@ -1465,7 +1466,7 @@ label.vcenter.datacenter=Datacenter vCenter
 label.vcenter.datastore=Datastore vCenter
 label.vcenter.host=H\u00f4te vCenter
 label.vcenter.password=Mot de passe vCenter
-label.vcenter.username=Nom d\\'utilisateur vCenter
+label.vcenter.username=Identifiant vCenter
 label.vcenter=vcenter
 label.vcipaddress=Adresse IP vCenter
 label.version=Version
@@ -1494,6 +1495,7 @@ label.virtual.routers.group.pod=Routeurs virtuels group\u00e9s par pod
 label.virtual.routers.group.zone=Routeurs virtuels group\u00e9s par zone
 label.virtual.routers=Routeurs virtuels
 label.vlan.id=ID du VLAN
+label.vlan.only=VLAN
 label.vlan.range.details=D\u00e9tails plage VLAN
 label.vlan.range=Plage du VLAN
 label.vlan.ranges=Plage(s) VLAN
@@ -1507,7 +1509,7 @@ label.VMFS.datastore=Magasin de donn\u00e9es VMFS
 label.vmfs=VMFS
 label.vm.id=ID VM
 label.vm.ip=Adresse IP VM
-label.vm.name=Nom de la VM
+label.vm.name=Nom VM
 label.vm.password=Le mot de passe de cette VM est
 label.vm.reboot=Red\u00e9marrer
 label.VMs.in.tier=Machines virtuelles dans le tiers
@@ -1575,7 +1577,7 @@ label.zone.dedicated=Zone d\u00e9di\u00e9e
 label.zone.details=D\u00e9tails de la zone
 label.zone.id=ID de la zone
 label.zone.lower=zone
-label.zone.name=Nom de zone
+label.zone.name=Nom de la zone
 label.zone.step.1.title=\u00c9tape 1 \: <strong>S\u00e9lectionnez un r\u00e9seau</strong>
 label.zone.step.2.title=\u00c9tape 2 \: <strong>Ajoutez une zone</strong>
 label.zone.step.3.title=\u00c9tape 3 \: <strong>Ajoutez un Pod</strong>
@@ -1682,7 +1684,7 @@ message.add.load.balancer.under.ip=La r\u00e8gle de r\u00e9partition de charge \
 message.add.network=Ajouter un nouveau r\u00e9seau \u00e0 la zone\: <b><span id\="zone_name"></span></b>
 message.add.new.gateway.to.vpc=Renseigner les informations suivantes pour ajouter une nouvelle passerelle pour ce VPC
 message.add.pod=Ajouter un nouveau pod \u00e0 la zone <b><span id\="add_pod_zone_name"></span></b>
-message.add.pod.during.zone.creation=Chaque zone doit contenir un ou plusieurs pods, le premier pod sera ajout\u00e9 maintenant. Un pod contient les h\u00f4tes et les serveurs de stockage primaire, que vous allez ajouter dans une \u00e9tape ult\u00e9rieure. Configurez une plage d\\'adresses IP r\u00e9serv\u00e9es pour le trafic de gestion interne de CloudStack. La plage d\\'IP r\u00e9serv\u00e9e doit \u00eatre unique pour chaque zone dans le nuage.
+message.add.pod.during.zone.creation=Chaque zone doit contenir un ou plusieurs pods, et le premier pod sera ajout\u00e9 maintenant. Une pod contient les h\u00f4tes et les serveurs de stockage primaire, qui seront ajout\u00e9s dans une \u00e9tape ult\u00e9rieure. Configurer une plage d\\'adresses IP r\u00e9serv\u00e9es pour le trafic de gestion interne de CloudStack. La plage d\\'IP r\u00e9serv\u00e9e doit \u00eatre unique pour chaque zone dans le nuage.
 message.add.primary=Renseignez les param\u00e8tres suivants pour ajouter un stockage primaire
 message.add.primary.storage=Ajouter un nouveau stockage primaire \u00e0 la zone <b><span id\="zone_name"></span></b>, pod <b><span id\="pod_name"></span></b>
 message.add.region=Renseigner les informations suivantes pour ajouter une nouvelle r\u00e9gion.
@@ -1699,7 +1701,7 @@ message.advanced.virtual=Choisissez ceci si vous souhaitez utiliser des VLANs po
 message.after.enable.s3=Le stockage secondaire S3 est configur\u00e9. Note \: Quand vous quitterez cette page, vous ne pourrez plus re-configurer le support S3.
 message.after.enable.swift=Swift configur\u00e9. Remarque \: une fois que vous quitterez cette page, il ne sera plus possible de re-configurer Swift \u00e0 nouveau.
 message.alert.state.detected=\u00c9tat d\\'alerte d\u00e9tect\u00e9
-message.allow.vpn.access=Entrez un nom d\\'utilisateur et un mot de passe pour l\\'utilisateur que vous souhaitez autoriser \u00e0 utiliser l\\'acc\u00e8s VPN.
+message.allow.vpn.access=Entrez un identifiant et un mot de passe pour l\\'utilisateur que vous souhaitez autoriser \u00e0 utiliser l\\'acc\u00e8s VPN.
 message.apply.snapshot.policy=Vous avez mis \u00e0 jour votre politique d\\'instantan\u00e9s avec succ\u00e8s.
 message.attach.iso.confirm=Attacher l\\'image ISO \u00e0 cette instance ?
 message.attach.volume=Renseignez les donn\u00e9es suivantes pour attacher un nouveau volume. Si vous attachez un volume disque \u00e0 une machine virtuelle sous Windows, vous aurez besoin de red\u00e9marrer l\\'instance pour voir le nouveau disque.
@@ -1867,7 +1869,7 @@ message.installWizard.tooltip.addPod.reservedSystemGateway=Passerelle pour les s
 message.installWizard.tooltip.addPod.reservedSystemNetmask=Le masque r\u00e9seau que les instances utiliseront sur le r\u00e9seau
 message.installWizard.tooltip.addPod.reservedSystemStartIp=Ceci est la plage d\\'adresses IP dans le r\u00e9seau priv\u00e9 que CloudStack utilise la gestion des VMs du stockage secondaire et les VMs Console Proxy. Ces adresses IP sont prises dans le m\u00eame sous-r\u00e9seau que les serveurs h\u00f4tes.
 message.installWizard.tooltip.addPrimaryStorage.name=Nom pour ce stockage
-message.installWizard.tooltip.addPrimaryStorage.path=(pour NFS) Dans NFS, ceci est le chemin d\\'export depuis le serveur. (pour SharedMountPoint) Le chemin. Avec KVM, c\\'est le chemin sur chaque h\u00f4te o\u00f9 ce stockage primaire est mont\u00e9. Par exemple, "/mnt/primary".
+message.installWizard.tooltip.addPrimaryStorage.path=(pour NFS) Dans NFS, c\\'est le chemin d\\'export depuis le serveur. Le chemin (pour SharedMountPoint). Avec KVM, c\\'est le chemin sur chaque h\u00f4te o\u00f9 ce stockage primaire est mont\u00e9. Par exemple, "/mnt/primary".
 message.installWizard.tooltip.addPrimaryStorage.server=(pour NFS, iSCSI ou PreSetup) Adresse IP ou nom DNS du stockage
 message.installWizard.tooltip.addSecondaryStorage.nfsServer=Adresse IP du serveur NFS supportant le stockage secondaire
 message.installWizard.tooltip.addSecondaryStorage.path=Le chemin export\u00e9, situ\u00e9 sur le serveur sp\u00e9cifi\u00e9 pr\u00e9c\u00e9demment
@@ -2039,8 +2041,8 @@ state.Declined=Refus\u00e9
 state.Destroyed=Supprim\u00e9e
 state.detached=D\u00e9tach\u00e9
 state.Disabled=D\u00e9sactiv\u00e9
-state.enabled=Actifs
 state.Enabled=Actifs
+state.enabled=Activ\u00e9
 state.Error=Erreur
 state.Expunging=Purge en cours
 state.Migrating=Migration en cours
@@ -2053,4 +2055,4 @@ state.Stopped=Arr\u00eat\u00e9e
 state.Stopping=Arr\u00eat en cours
 state.Suspended=Suspendu
 ui.listView.filters.all=Tous
-ui.listView.filters.mine=Mon
+ui.listView.filters.mine=Les miennes

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_it_IT.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties
index 053d6ab..5ab237d 100644
--- a/client/WEB-INF/classes/resources/messages_it_IT.properties
+++ b/client/WEB-INF/classes/resources/messages_it_IT.properties
@@ -324,7 +324,6 @@ label.direct.ips=Indirizzi IP di Rete condivisi
 label.disabled=Disabilitato
 label.disable.provider=Disabilitare il provider
 label.disable.vpn=Disabilitare VPN
-label.display.name=Nome visualizzato
 label.dns=DNS
 label.DNS.domain.for.guest.networks=Dominio DNS per Reti Guest
 label.domain=Dominio
@@ -439,6 +438,7 @@ label.migrate.instance.to.host=Migrare instance verso un altro host
 label.migrate.instance.to.ps=Migrare instance verso un altro primary storage
 label.migrate.to.host=Migrare verso un host
 label.migrate.to.storage=Migrare verso uno storage
+label.migrate.volume.to.primary.storage=Migrare un volume verso un altro primary storage
 label.mode=Modalit\u00e0
 label.move.down.row=Sposta gi\u00f9 di una riga
 label.move.to.bottom=Sposta gi\u00f9 alla fine
@@ -597,9 +597,9 @@ label.vcdcname=Nome DC del vCenter
 label.vcipaddress=Indirizzo IP del vCenter
 label.viewing=Visualizzazione
 label.view=Vista
-label.virtual.machines=Virtual machine
 label.virtual.routers=Router Virtuali
 label.virtual.router=Virtual Router
+label.vlan.only=VLAN
 label.vlan=VLAN
 label.vm.destroy=Destroy
 label.vm.display.name=Nome visualizzato della VM
@@ -625,7 +625,6 @@ label.what.is.cloudstack=Che cosa \u00e8 CloudStack&\#8482?
 label.xenserver.traffic.label=Etichetta del traffico via XenServer
 label.yes=S\u00ec
 label.zone.details=Dettagli della Zona
-label.zone.name=Nome Zona
 label.zones=Zone
 label.zone.type=Tipo di Zona
 label.zoneWizard.trafficType.guest=Guest\: Traffico di rete tra le virtual machine dell\\'utente finale
@@ -801,11 +800,9 @@ state.Completed=Completato
 state.Creating=Creazione in corso
 state.Declined=Declinato
 state.Disabled=Disabilitato
-state.enabled=Abilitato
 state.Enabled=Abilitato
 state.Error=Errore
 state.Migrating=Migrazione in corso
-state.ready=Pronto
 state.Ready=Pronto
 state.Running=In esecuzione
 state.Starting=Avvio in corso

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_ja_JP.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties
index d2d6518..1bbcda0 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -256,7 +256,6 @@ label.add.ACL=ACL \u306e\u8ffd\u52a0
 label.add.acl.list=ACL \u4e00\u89a7\u306e\u8ffd\u52a0
 label.add.affinity.group=\u65b0\u3057\u3044\u30a2\u30d5\u30a3\u30cb\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u306e\u8ffd\u52a0
 label.add.baremetal.dhcp.device=\u30d9\u30a2\u30e1\u30bf\u30eb DHCP \u30c7\u30d0\u30a4\u30b9\u306e\u8ffd\u52a0
-label.add.BigSwitchVns.device=Big Switch VNS \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u8ffd\u52a0
 label.add.BrocadeVcs.device=Brocade VCS \u30b9\u30a4\u30c3\u30c1\u306e\u8ffd\u52a0
 label.add.by.cidr=CIDR \u3067\u8ffd\u52a0
 label.add.by.group=\u30b0\u30eb\u30fc\u30d7\u3067\u8ffd\u52a0
@@ -268,7 +267,6 @@ label.add.direct.iprange=\u76f4\u63a5 IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u5
 label.add.disk.offering=\u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8ffd\u52a0
 label.add.domain=\u30c9\u30e1\u30a4\u30f3\u306e\u8ffd\u52a0
 label.added.brocade.vcs.switch=\u65b0\u3057\u3044 Brocade VCS \u30b9\u30a4\u30c3\u30c1\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f
-label.added.new.bigswitch.vns.controller=\u65b0\u3057\u3044 Big Switch VNS \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f
 label.added.nicira.nvp.controller=\u65b0\u3057\u3044 Nicira NVP Controller \u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f
 label.add.egress.rule=\u9001\u4fe1\u898f\u5247\u306e\u8ffd\u52a0
 label.addes.new.f5=\u65b0\u3057\u3044 F5 \u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f
@@ -316,7 +314,7 @@ label.add.pod=\u30dd\u30c3\u30c9\u306e\u8ffd\u52a0
 label.add.portable.ip.range=\u30dd\u30fc\u30bf\u30d6\u30eb IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u8ffd\u52a0
 label.add.port.forwarding.rule=\u30dd\u30fc\u30c8\u8ee2\u9001\u898f\u5247\u306e\u8ffd\u52a0
 label.add.primary.storage=\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u8ffd\u52a0
-label.add.region=\u9818\u57df\u306e\u8ffd\u52a0
+label.add.region=\u30ea\u30fc\u30b8\u30e7\u30f3\u306e\u8ffd\u52a0
 label.add.resources=\u30ea\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0
 label.add.route=\u30eb\u30fc\u30c8\u306e\u8ffd\u52a0
 label.add.rule=\u898f\u5247\u306e\u8ffd\u52a0
@@ -403,8 +401,6 @@ label.baremetal.pxe.device=\u30d9\u30a2\u30e1\u30bf\u30eb PXE \u30c7\u30d0\u30a4
 label.baremetal.pxe.provider=\u30d9\u30a2\u30e1\u30bf\u30eb PXE \u30d7\u30ed\u30d0\u30a4\u30c0\u30fc
 label.basic.mode=\u57fa\u672c\u30e2\u30fc\u30c9
 label.basic=\u57fa\u672c
-label.bigswitch.controller.address=Big Switch VNS \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc \u30a2\u30c9\u30ec\u30b9
-label.bigswitch.vns.details=Big Switch VNS \u306e\u8a73\u7d30
 label.blade.id=\u30d6\u30ec\u30fc\u30c9 ID
 label.blades=\u30d6\u30ec\u30fc\u30c9
 label.bootable=\u8d77\u52d5\u53ef\u80fd
@@ -527,7 +523,6 @@ label.default.view=\u30c7\u30d5\u30a9\u30eb\u30c8 \u30d3\u30e5\u30fc
 label.delete.acl.list=ACL \u4e00\u89a7\u306e\u524a\u9664
 label.delete.affinity.group=\u30a2\u30d5\u30a3\u30cb\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664
 label.delete.alerts=\u30a2\u30e9\u30fc\u30c8\u306e\u524a\u9664
-label.delete.BigSwitchVns=Big Switch VNS \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u524a\u9664
 label.delete.BrocadeVcs=Brocade VCS \u30b9\u30a4\u30c3\u30c1\u306e\u524a\u9664
 label.delete.ciscoASA1000v=Cisco ASA 1000V \u30ea\u30bd\u30fc\u30b9\u306e\u524a\u9664
 label.delete.ciscovnmc.resource=Cisco VNMC \u30ea\u30bd\u30fc\u30b9\u306e\u524a\u9664
@@ -598,7 +593,6 @@ label.disk.total=\u30c7\u30a3\u30b9\u30af\u5408\u8a08
 label.disk.volume=\u30c7\u30a3\u30b9\u30af \u30dc\u30ea\u30e5\u30fc\u30e0
 label.disk.write.bytes=\u30c7\u30a3\u30b9\u30af\u66f8\u304d\u8fbc\u307f (\u30d0\u30a4\u30c8)
 label.disk.write.io=\u30c7\u30a3\u30b9\u30af\u66f8\u304d\u8fbc\u307f (IO)
-label.display.name=\u8868\u793a\u540d
 label.display.text=\u8868\u793a\u30c6\u30ad\u30b9\u30c8
 label.distributedrouter=\u5206\u6563\u30eb\u30fc\u30bf\u30fc
 label.dns.1=DNS 1
@@ -616,14 +610,13 @@ label.done=\u5b8c\u4e86
 label.double.quotes.are.not.allowed=\u4e8c\u91cd\u5f15\u7528\u7b26\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
 label.download.progress=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306e\u9032\u6357\u72b6\u6cc1
 label.drag.new.position=\u65b0\u3057\u3044\u4f4d\u7f6e\u306b\u30c9\u30e9\u30c3\u30b0
-label.duration.in.sec=\u671f\u9593 (\u79d2)
 label.dynamically.scalable=\u52d5\u7684\u306b\u30b5\u30a4\u30ba\u8a2d\u5b9a\u3059\u308b
 label.edit.acl.rule=ACL \u898f\u5247\u306e\u7de8\u96c6
 label.edit.affinity.group=\u30a2\u30d5\u30a3\u30cb\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u306e\u7de8\u96c6
 label.edit.lb.rule=LB \u898f\u5247\u306e\u7de8\u96c6
 label.edit.network.details=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u8a73\u7d30\u306e\u7de8\u96c6
 label.edit.project.details=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a73\u7d30\u306e\u7de8\u96c6
-label.edit.region=\u9818\u57df\u306e\u7de8\u96c6
+label.edit.region=\u30ea\u30fc\u30b8\u30e7\u30f3\u306e\u7de8\u96c6
 label.edit.tags=\u30bf\u30b0\u306e\u7de8\u96c6
 label.edit.traffic.type=\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u306e\u7a2e\u985e\u306e\u7de8\u96c6
 label.edit=\u7de8\u96c6
@@ -778,7 +771,6 @@ label.installWizard.title=CloudStack&\#8482; \u3078\u3088\u3046\u3053\u305d
 label.instance.limits=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5236\u9650
 label.instance.name=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u540d
 label.instance.port=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9 \u30dd\u30fc\u30c8
-label.instance.scaled.up=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u30b5\u30a4\u30ba\u304c\u62e1\u5927\u3055\u308c\u307e\u3057\u305f
 label.instances=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9
 label.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9
 label.instanciate.template.associate.profile.blade=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u4f5c\u6210\u304a\u3088\u3073\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3068\u30d6\u30ec\u30fc\u30c9\u306e\u95a2\u9023\u4ed8\u3051
@@ -878,7 +870,6 @@ label.local.storage=\u30ed\u30fc\u30ab\u30eb \u30b9\u30c8\u30ec\u30fc\u30b8
 label.local=\u30ed\u30fc\u30ab\u30eb
 label.login=\u30ed\u30b0\u30aa\u30f3
 label.logout=\u30ed\u30b0\u30aa\u30d5
-label.saml.login=SAML \u30ed\u30b0\u30aa\u30f3
 label.lun=LUN
 label.LUN.number=LUN \u756a\u53f7
 label.lxc.traffic.label=LXC \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
@@ -937,7 +928,7 @@ label.menu.my.templates=\u30de\u30a4 \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 label.menu.network.offerings=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
 label.menu.network=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af
 label.menu.physical.resources=\u7269\u7406\u30ea\u30bd\u30fc\u30b9
-label.menu.regions=\u9818\u57df
+label.menu.regions=\u30ea\u30fc\u30b8\u30e7\u30f3
 label.menu.running.instances=\u5b9f\u884c\u4e2d\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9
 label.menu.security.groups=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7
 label.menu.service.offerings=\u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
@@ -960,7 +951,6 @@ label.migrate.router.to=\u30eb\u30fc\u30bf\u30fc\u306e\u79fb\u884c\u5148\:
 label.migrate.systemvm.to=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u79fb\u884c\u5148\:
 label.migrate.to.host=\u30db\u30b9\u30c8\u3078\u79fb\u884c
 label.migrate.to.storage=\u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u79fb\u884c
-label.migrate.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u79fb\u884c
 label.migrate.volume.to.primary.storage=\u5225\u306e\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u306e\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u79fb\u884c
 label.minimum=\u6700\u5c0f
 label.min.instances=\u6700\u5c0f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u6570
@@ -1165,8 +1155,8 @@ label.redundant.router=\u5197\u9577\u30eb\u30fc\u30bf\u30fc
 label.redundant.state=\u5197\u9577\u72b6\u614b
 label.refresh.blades=\u30d6\u30ec\u30fc\u30c9\u306e\u66f4\u65b0
 label.refresh=\u66f4\u65b0
-label.regionlevelvpc=\u9818\u57df\u30ec\u30d9\u30eb\u306e VPC
-label.region=\u9818\u57df
+label.regionlevelvpc=\u30ea\u30fc\u30b8\u30e7\u30f3\u30ec\u30d9\u30eb\u306e VPC
+label.region=\u30ea\u30fc\u30b8\u30e7\u30f3
 label.reinstall.vm=VM \u306e\u518d\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 label.related=\u95a2\u9023
 label.release.account.lowercase=\u30a2\u30ab\u30a6\u30f3\u30c8\u304b\u3089\u89e3\u653e
@@ -1186,7 +1176,7 @@ label.remove.ldap=LDAP \u306e\u524a\u9664
 label.remove.network.offering=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u524a\u9664
 label.remove.pf=\u30dd\u30fc\u30c8\u8ee2\u9001\u898f\u5247\u306e\u524a\u9664
 label.remove.project.account=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304b\u3089\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u524a\u9664
-label.remove.region=\u9818\u57df\u306e\u524a\u9664
+label.remove.region=\u30ea\u30fc\u30b8\u30e7\u30f3\u306e\u524a\u9664
 label.remove.rule=\u898f\u5247\u306e\u524a\u9664
 label.remove.static.nat.rule=\u9759\u7684 NAT \u898f\u5247\u306e\u524a\u9664
 label.remove.static.route=\u9759\u7684\u30eb\u30fc\u30c8\u306e\u524a\u9664
@@ -1275,7 +1265,7 @@ label.select.instance=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u9078\u629e
 label.select.iso.or.template=ISO \u307e\u305f\u306f\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u9078\u629e
 label.select.offering=\u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u9078\u629e
 label.select.project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u9078\u629e
-label.select.region=\u9818\u57df\u306e\u9078\u629e
+label.select.region=\u30ea\u30fc\u30b8\u30e7\u30f3\u306e\u9078\u629e
 label.select.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u9078\u629e
 label.select.tier=\u968e\u5c64\u306e\u9078\u629e
 label.select=\u9078\u629e
@@ -1483,7 +1473,6 @@ label.view=\u8868\u793a -
 label.virtual.appliance.details=\u4eee\u60f3\u30a2\u30d7\u30e9\u30a4\u30a2\u30f3\u30b9\u306e\u8a73\u7d30
 label.virtual.appliances=\u4eee\u60f3\u30a2\u30d7\u30e9\u30a4\u30a2\u30f3\u30b9
 label.virtual.appliance=\u4eee\u60f3\u30a2\u30d7\u30e9\u30a4\u30a2\u30f3\u30b9
-label.virtual.machines=\u4eee\u60f3\u30de\u30b7\u30f3
 label.virtual.networking=\u4eee\u60f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af
 label.virtual.network=\u4eee\u60f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af
 label.virtual.routers.group.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u5225\u306e\u4eee\u60f3\u30eb\u30fc\u30bf\u30fc \u30b0\u30eb\u30fc\u30d7
@@ -1493,6 +1482,7 @@ label.virtual.routers.group.zone=\u30be\u30fc\u30f3\u5225\u306e\u4eee\u60f3\u30e
 label.virtual.routers=\u4eee\u60f3\u30eb\u30fc\u30bf\u30fc
 label.virtual.router=\u4eee\u60f3\u30eb\u30fc\u30bf\u30fc
 label.vlan.id=VLAN/VNI ID
+label.vlan.only=VLAN
 label.vlan.range.details=VLAN \u306e\u7bc4\u56f2\u306e\u8a73\u7d30
 label.vlan.ranges=VLAN \u306e\u7bc4\u56f2
 label.vlan.range=VLAN/VNI \u306e\u7bc4\u56f2
@@ -1541,7 +1531,7 @@ label.VPC.limits=VPC \u5236\u9650
 label.vpc.offering.details=VPC \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8a73\u7d30
 label.vpc.offering=VPC \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
 label.VPC.router.details=VPC \u30eb\u30fc\u30bf\u30fc\u306e\u8a73\u7d30
-label.vpc.supportsregionlevelvpc=\u9818\u57df\u30ec\u30d9\u30eb\u306e VPC \u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308b
+label.vpc.supportsregionlevelvpc=\u30ea\u30fc\u30b8\u30e7\u30f3\u30ec\u30d9\u30eb\u306e VPC \u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308b
 label.vpc.virtual.router=VPC \u4eee\u60f3\u30eb\u30fc\u30bf\u30fc
 label.vpc=VPC
 label.VPN.connection=VPN \u63a5\u7d9a
@@ -1574,7 +1564,6 @@ label.zone.dedicated=\u5c02\u7528\u30be\u30fc\u30f3
 label.zone.details=\u30be\u30fc\u30f3\u306e\u8a73\u7d30
 label.zone.id=\u30be\u30fc\u30f3 ID
 label.zone.lower=\u30be\u30fc\u30f3
-label.zone.name=\u30be\u30fc\u30f3\u540d
 label.zone.step.1.title=\u624b\u9806 1\: <strong>\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u9078\u629e</strong>
 label.zone.step.2.title=\u624b\u9806 2\: <strong>\u30be\u30fc\u30f3\u306e\u8ffd\u52a0</strong>
 label.zone.step.3.title=\u624b\u9806 3\: <strong>\u30dd\u30c3\u30c9\u306e\u8ffd\u52a0</strong>
@@ -1683,7 +1672,7 @@ message.add.new.gateway.to.vpc=\u3053\u306e VPC \u306b\u65b0\u3057\u3044\u30b2\u
 message.add.pod=\u30be\u30fc\u30f3 <b><span id\="add_pod_zone_name"></span></b> \u306b\u65b0\u3057\u3044\u30dd\u30c3\u30c9\u3092\u8ffd\u52a0\u3057\u307e\u3059
 message.add.primary.storage=\u30be\u30fc\u30f3 <b><span id\="zone_name"></span></b> \u306e\u30dd\u30c3\u30c9 <b><span id\="pod_name"></span></b> \u306b\u65b0\u3057\u3044\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3059
 message.add.primary=\u65b0\u3057\u3044\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u3001\u6b21\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-message.add.region=\u65b0\u3057\u3044\u9818\u57df\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+message.add.region=\u65b0\u3057\u3044\u30ea\u30fc\u30b8\u30e7\u30f3\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 message.add.secondary.storage=\u30be\u30fc\u30f3 <b><span id\="zone_name"></span></b> \u306b\u65b0\u3057\u3044\u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3059
 message.add.service.offering=\u65b0\u3057\u3044\u30b3\u30f3\u30d4\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u3001\u6b21\u306e\u30c7\u30fc\u30bf\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 message.add.system.service.offering=\u65b0\u3057\u3044\u30b7\u30b9\u30c6\u30e0 \u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u3001\u6b21\u306e\u30c7\u30fc\u30bf\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -1924,10 +1913,10 @@ message.public.traffic.in.advanced.zone=\u30af\u30e9\u30a6\u30c9\u5185\u306e VM
 message.public.traffic.in.basic.zone=\u30af\u30e9\u30a6\u30c9\u5185\u306e VM \u304c\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u304b\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u7d4c\u7531\u3067\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306b\u30b5\u30fc\u30d3\u30b9\u3092\u63d0\u4f9b\u3059\u308b\u3068\u3001\u30d1\u30d6\u30ea\u30c3\u30af \u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u304c\u751f\u6210\u3055\u308c\u307e\u3059\u3002\u3053\u306e\u305f\u3081\u306b\u3001\u4e00\u822c\u306b\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u306a IP \u30a2\u30c9\u30ec\u30b9\u3092\u5272\u308a\u5f53\u3066\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u4f5c\u6210\u3059\u308b\u3068\u3001\u30b2\u30b9\u30c8 IP \u30a2\u30c9\u30ec\u30b9\u306e\u307b\u304b\u306b\u3053\u306e\u30d1\u30d6\u30ea\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u304b\u3089\u30a2\u30c9\u30ec\u30b9\u304c 1 \u3064\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u52
 72\u308a\u5f53\u3066\u3089\u308c\u307e\u3059\u3002\u30d1\u30d6\u30ea\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9\u3068\u30b2\u30b9\u30c8 IP \u30a2\u30c9\u30ec\u30b9\u306e\u9593\u306b\u3001\u9759\u7684\u306a 1 \u5bfe 1 \u306e NAT \u304c\u81ea\u52d5\u7684\u306b\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3055\u308c\u307e\u3059\u3002\u30a8\u30f3\u30c9 \u30e6\u30fc\u30b6\u30fc\u306f CloudStack \u306e\u30e6\u30fc\u30b6\u30fc \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30a4\u30b9\u3092\u4f7f\u7528\u3057\u3066\u8ffd\u52a0\u306e IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3001\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3068\u30d1\u30d6\u30ea\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9\u306e\u9593\u306b\u9759\u7684 NAT \u3092\u5b9f\u88c5\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002
 message.read.admin.guide.scaling.up=\u30b5\u30a4\u30ba\u3092\u62e1\u5927\u3059\u308b\u524d\u306b\u7ba1\u7406\u8005\u30ac\u30a4\u30c9\u306e\u52d5\u7684\u306a\u30b5\u30a4\u30ba\u5909\u66f4\u306e\u30bb\u30af\u30b7\u30e7\u30f3\u3092\u304a\u8aad\u307f\u304f\u3060\u3055\u3044\u3002
 message.recover.vm=\u3053\u306e VM \u3092\u5fa9\u5143\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-message.redirecting.region=\u9818\u57df\u306b\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u3057\u3066\u3044\u307e\u3059...
+message.redirecting.region=\u30ea\u30fc\u30b8\u30e7\u30f3\u306b\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u3057\u3066\u3044\u307e\u3059...
 message.reinstall.vm=\u6ce8\: \u6ce8\u610f\u3057\u3066\u7d9a\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u308c\u306b\u3088\u308a VM \u304c\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304b\u3089\u518d\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u307e\u3059\u3002\u30eb\u30fc\u30c8 \u30c7\u30a3\u30b9\u30af\u4e0a\u306e\u30c7\u30fc\u30bf\u306f\u5931\u308f\u308c\u307e\u3059\u3002\u8ffd\u52a0\u306e\u30c7\u30fc\u30bf \u30dc\u30ea\u30e5\u30fc\u30e0\u304c\u3042\u308b\u5834\u5408\u306f\u3001\u305d\u306e\u30dc\u30ea\u30e5\u30fc\u30e0\u306b\u5f71\u97ff\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 message.remove.ldap=LDAP \u69cb\u6210\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-message.remove.region=\u3053\u306e\u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u3053\u306e\u9818\u57df\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
+message.remove.region=\u3053\u306e\u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u3053\u306e\u30ea\u30fc\u30b8\u30e7\u30f3\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 message.remove.vpc=VPC \u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 message.remove.vpn.access=\u6b21\u306e\u30e6\u30fc\u30b6\u30fc\u304b\u3089 VPN \u30a2\u30af\u30bb\u30b9\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 message.reset.password.warning.notPasswordEnabled=\u3053\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306f\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u7ba1\u7406\u3092\u6709\u52b9\u306b\u305b\u305a\u306b\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002
@@ -2037,13 +2026,11 @@ state.Declined=\u8f9e\u9000
 state.Destroyed=\u7834\u68c4\u6e08\u307f
 state.detached=\u30c7\u30bf\u30c3\u30c1\u6e08\u307f
 state.Disabled=\u7121\u52b9
-state.enabled=\u6709\u52b9
 state.Enabled=\u6709\u52b9
 state.Error=\u30a8\u30e9\u30fc
 state.Expunging=\u62b9\u6d88\u4e2d
 state.Migrating=\u79fb\u884c\u4e2d
 state.Pending=\u4fdd\u7559
-state.ready=\u6e96\u5099\u5b8c\u4e86
 state.Ready=\u6e96\u5099\u5b8c\u4e86
 state.Running=\u5b9f\u884c\u4e2d
 state.Starting=\u958b\u59cb\u4e2d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_ko_KR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ko_KR.properties b/client/WEB-INF/classes/resources/messages_ko_KR.properties
index badb7f3..a7a1645 100644
--- a/client/WEB-INF/classes/resources/messages_ko_KR.properties
+++ b/client/WEB-INF/classes/resources/messages_ko_KR.properties
@@ -241,7 +241,6 @@ label.add.accounts=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00
 label.add.account.to.project=\uacc4\uc815 \uc815\ubcf4 \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucd94\uac00
 label.add.account=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00
 label.add.ACL=\uad8c\ud55c \uad00\ub9ac(ACL) \ucd94\uac00
-label.add.BigSwitchVns.device=BigSwitch Vns \ucf58\ud2b8\ub864\ub7ec
 label.add.by.cidr=CIDR \ub85c \ucd94\uac00
 label.add.by.group=\uadf8\ub8f9\uc5d0\uc11c \ucd94\uac00
 label.add.by=\ucd94\uac00 \ub2e8\uc704
@@ -461,7 +460,6 @@ label.disk.size.gb=\ub514\uc2a4\ud06c \ud06c\uae30(GB \ub2e8\uc704)
 label.disk.size=\ub514\uc2a4\ud06c \ud06c\uae30
 label.disk.total=\ub514\uc2a4\ud06c \ud569\uacc4
 label.disk.volume=\ub514\uc2a4\ud06c \ubcfc\ub968
-label.display.name=\ud45c\uc2dc\uba85
 label.display.text=\ud45c\uc2dc \ud14d\uc2a4\ud2b8
 label.dns.1=DNS 1
 label.dns.2=DNS 2
@@ -651,7 +649,6 @@ label.local.storage=\ub85c\uceec \uc2a4\ud1a0\ub9ac\uc9c0
 label.local=\ub85c\uceec
 label.login=\ub85c\uadf8\uc778
 label.logout=\ub85c\uadf8\uc544\uc6c3
-label.saml.login=SAML \ub85c\uadf8\uc778
 label.lun=LUN
 label.LUN.number=LUN \ubc88\ud638
 label.make.project.owner=\uacc4\uc815 \uc815\ubcf4 \ud504\ub85c\uc81d\ud2b8 \uc18c\uc720\uc790
@@ -718,6 +715,7 @@ label.migrate.instance.to.ps=\ub2e4\ub978 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\
 label.migrate.instance.to=\uc778\uc2a4\ud134\uc2a4 \uc774\uc804 \uc704\uce58\:
 label.migrate.router.to=\ub77c\uc6b0\ud130 \uc774\uc804 \uc704\uce58\:
 label.migrate.systemvm.to=\uc2dc\uc2a4\ud15c VM \uc774\uc804 \uc704\uce58\:
+label.migrate.volume.to.primary.storage=\ub2e4\ub978 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \ubcfc\ub968 \uc774\uc804
 label.minimum=\ucd5c\uc18c
 label.minute.past.hour=\ubd84(\ub9e4\uc2dc)
 label.mode=\ubaa8\ub4dc
@@ -1085,11 +1083,11 @@ label.view.more=\uc0c1\uc138 \ud45c\uc2dc
 label.view=\ud45c\uc2dc -
 label.virtual.appliances=\uac00\uc0c1 \uc5b4\ud50c\ub77c\uc774\uc5b8\uc2a4
 label.virtual.appliance=\uac00\uc0c1 \uc5b4\ud50c\ub77c\uc774\uc5b8\uc2a4
-label.virtual.machines=\uac00\uc0c1 \uba38\uc2e0
 label.virtual.network=\uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c
 label.virtual.routers=\uac00\uc0c1 \ub77c\uc6b0\ud130
 label.virtual.router=\uac00\uc0c1 \ub77c\uc6b0\ud130
 label.vlan.id=VLAN ID
+label.vlan.only=\uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c(VLAN)
 label.vlan.range=VLAN \ubc94\uc704
 label.vlan=\uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c(VLAN)
 label.vlan.vni.range=VLAN \ubc94\uc704
@@ -1140,7 +1138,6 @@ label.xenserver.traffic.label=XenServer \ud2b8\ub798\ud53d \ub77c\ubca8
 label.yes=\uc608
 label.zone.details=Zone \uc0c1\uc138
 label.zone.id=Zone ID
-label.zone.name=Zone \uc774\ub984
 label.zone.step.1.title=\ub2e8\uacc4 1. <strong>\ub124\ud2b8\uc6cc\ud06c \uc120\ud0dd</strong>
 label.zone.step.2.title=\ub2e8\uacc4 2. <strong>Zone \ucd94\uac00</strong>
 label.zone.step.3.title=\ub2e8\uacc4 3. <strong>Pod \ucd94\uac00</strong>
@@ -1466,12 +1463,10 @@ state.Declined=\uac70\uc808
 state.Destroyed=\ud30c\uae30\ub41c \uc0c1\ud0dc
 state.Disabled=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740
 state.Enabled=\uc0ac\uc6a9\ud568
-state.enabled=\uc720\ud6a8\ud568
 state.Error=\uc624\ub958
 state.Expunging=\uc81c\uac70 \uc911
 state.Migrating=\uc774\uc804 \uc911
 state.Pending=\ubcf4\ub958
-state.ready=\uc900\ube44 \uc644\ub8cc
 state.Ready=\uc900\ube44 \uc644\ub8cc
 state.Running=\uc2e4\ud589 \uc911
 state.Starting=\uc2dc\uc791 \uc911

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/376b27a4/client/WEB-INF/classes/resources/messages_nb_NO.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties b/client/WEB-INF/classes/resources/messages_nb_NO.properties
index bf88907..cdd7d57 100644
--- a/client/WEB-INF/classes/resources/messages_nb_NO.properties
+++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties
@@ -274,6 +274,7 @@ label.alert=Varsel
 label.allocated=Allokert
 label.allocation.state=Allokeringsstatus
 label.api.key=API-n\u00f8kkel
+label.api.version=API Versjon
 label.apply=Bruk
 label.app.name=CloudStack
 label.archive.alerts=Arkiver varsler
@@ -300,6 +301,7 @@ label.by.event.type=Etter hendelsestype
 label.by.pod=Etter Pod
 label.by.role=Etter Rolle
 label.by.start.date=Etter Startdato
+label.bytes.received=Bytes Mottatt
 label.by.traffic.type=Etter Trafikktype
 label.by.type=Etter Type
 label.by.type.id=Etter Type ID
@@ -322,6 +324,7 @@ label.cluster.name=Klyngenavn
 label.clusters=Klynger
 label.cluster.type=Klyngetype
 label.clvm=CLVM
+label.code=Kode
 label.compute.and.storage=Regnekraft og lagring
 label.compute=Beregne
 label.compute.offering=Regnekraftstilbud
@@ -399,7 +402,6 @@ label.disk.total=Disk Totalt
 label.disk.volume=Disk Volum
 label.disk.write.bytes=Disk skrive (Bytes)
 label.disk.write.io=Disk skrive (IO)
-label.display.name=Visningsnavn
 label.display.text=Visningstekst
 label.dns.1=DNS 1
 label.dns.2=DNS 2
@@ -474,6 +476,7 @@ label.host.name=Vertsnavn
 label.hosts=Verter
 label.host=Vert
 label.hourly=Hver time
+label.hvm=HVM
 label.id=ID
 label.info=Info
 label.installWizard.addClusterIntro.subtitle=Hva er en klynge?
@@ -545,6 +548,8 @@ label.lb.algorithm.leastconn=F\u00e6rrest tilkoblinger
 label.lb.algorithm.roundrobin=Ringdistribusjon
 label.lb.algorithm.source=Kilde
 label.LB.isolation=LB-isolering
+label.ldap.configuration=LDAP Konfigurering
+label.ldap.port=LDAP port
 label.load.balancer=Lastbalanserer
 label.load.balancing=Lastbalansering
 label.load.balancing.policies=Regler for lastbalansering
@@ -609,6 +614,7 @@ label.migrate.router.to=Migrer Ruter til
 label.migrate.systemvm.to=Migrer System VM til
 label.migrate.to.host=Migrer til vert
 label.migrate.to.storage=Migrer til lagring
+label.migrate.volume.to.primary.storage=Migrer volumet til en annen prim\u00e6rlagring.
 label.minimum=Minimum
 label.monday=Mandag
 label.monthly=M\u00e5nedlig
@@ -785,6 +791,9 @@ label.shared=Delt
 label.shutdown.provider=Steng tilbyder
 label.size=St\u00f8rrelse
 label.skip.guide=Jeg har brukt CloudStack tidligere. Hopp over denne veiviseren
+label.smb.domain=SMB Domene
+label.smb.password=SMB Passord
+label.smb.username=SMB Brukernavn
 label.source.nat=Kilde NAT
 label.specify.IP.ranges=Spesifiser IP-rekker
 label.specify.vlan=Spesifiser VLAN
@@ -880,11 +889,11 @@ label.viewing=Viser
 label.view.more=Vis mer
 label.view.secondary.ips=Se sekund\u00e6re IPer
 label.view=Vis
-label.virtual.machines=Virtuelle maskiner
 label.virtual.network=Virtuelt-nettverk
 label.virtual.routers=Virtuelle rutere
 label.virtual.router=Virtuell ruter
 label.vlan.id=VLAN/VNI ID
+label.vlan.only=VLAN
 label.vlan=VLAN/VNI
 label.vm.add=Legg til Instans
 label.vm.destroy=Destruer
@@ -925,7 +934,6 @@ label.xenserver.traffic.label=XenServer trafikketikett
 label.yes=Ja
 label.zone.details=Sonedetaljer
 label.zone.id=Sone ID
-label.zone.name=Sonenavn
 label.zone=Sone
 label.zones=Soner
 label.zone.step.1.title=Steg 1\: <strong>Velg et nettverk</strong>
@@ -1092,13 +1100,11 @@ state.Creating=Oppretter
 state.Declined=Avvist
 state.Destroyed=Destruert
 state.Disabled=Inaktiv
-state.enabled=Aktivert
 state.Enabled=Aktivert
 state.Error=Feil
 state.Expunging=Fjerner
 state.Migrating=Migrering
 state.Pending=Venter
-state.ready=Klar
 state.Ready=Klar
 state.Running=Kj\u00f8rer
 state.Starting=Starter