diff --git a/client/WEB-INF/classes/resources/messages_ar.properties b/client/WEB-INF/classes/resources/messages_ar.properties
index 4f651188205..01faa4f8862 100644
--- a/client/WEB-INF/classes/resources/messages_ar.properties
+++ b/client/WEB-INF/classes/resources/messages_ar.properties
@@ -86,6 +86,7 @@ label.ESP.policy=\u0633\u064a\u0627\u0633\u0629 ESP
 label.failed=\u062e\u0637\u0623
 label.filterBy=\u062a\u0635\u0641\u064a\u0629 \u062d\u0633\u0628
 label.full.path=\u0645\u0633\u0627\u0631 \u0643\u0627\u0645\u0644
+label.gpu=\u00d9\u0088\u00d8\u00ad\u00d8\u00af\u00d8\u00a9 \u00d8\u00a7\u00d9\u0084\u00d9
 label.guest.type=\u0646\u0648\u0639 \u0627\u0644\u0636\u064a\u0641
 label.IKE.lifetime=\u0639\u0645\u0631 IKE (\u062b\u0627\u0646\u064a\u0629)
 label.IKE.policy=\u0633\u064a\u0627\u0633\u0629 IKE
diff --git a/client/WEB-INF/classes/resources/messages_de_DE.properties b/client/WEB-INF/classes/resources/messages_de_DE.properties
index 4d5852c3c4b..42cbd7df6aa 100644
--- a/client/WEB-INF/classes/resources/messages_de_DE.properties
+++ b/client/WEB-INF/classes/resources/messages_de_DE.properties
@@ -16,8 +16,11 @@
 # under the License.
 
 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.
+error.password.not.match=Die Passwortfelder stimmen nicht \u00fcberein
 error.session.expired=Ihre Sitzung ist abgelaufen.
+extractable=Extrahierbar
 force.delete.domain.warning=Achtung\: Diese Auswahl f\u00fchrt zu einer L\u00f6schung aller untergeordneten Domains und aller angeschlossenen Konten sowie ihrer Quellen.
 force.delete=Erzwinge L\u00f6schung
 force.remove=Erzwinge Entfernung
@@ -26,12 +29,20 @@ force.stop=Erzwinge Abbruch
 ICMP.code=ICMP Code
 ICMP.type=ICMP-Typ
 image.directory=Bildverzeichnis
+instances.actions.reboot.label=Instanz neu starten
+label.about.app=\u00dcber CloudStack
+label.about=\u00dcber
+label.accept.project.invitation=Projekteinladung annehmen
+label.account.and.security.group=Konto, Sicherheitsgruppe
 label.account=Benutzerkonto
 label.account.id=Benutzerkonto-ID
+label.account.lower=Konto
 label.account.name=Benutzerkonto-Name
 label.accounts=Benutzerkonten
 label.account.specific=Besonderheiten des Benutzerkontos
+label.acl=ACL
 label.acquire.new.ip=Neue IP erwerben
+label.action=Aktion
 label.action.attach.disk=Festplatte hinzuf\u00fcgen
 label.action.attach.disk.processing=Hinzuf\u00fcgen einer Festplatte ....
 label.action.attach.iso=ISO hinzuf\u00fcgen
@@ -71,6 +82,7 @@ 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.nic=NIC entfernen
 label.action.delete.pod=Pod l\u00f6schen
 label.action.delete.pod.processing=L\u00f6schen des Pod ....
 label.action.delete.primary.storage=Hauptspeicher l\u00f6schen
@@ -162,6 +174,8 @@ label.action.reboot.router.processing=Neustart vom Router ....
 label.action.reboot.router=Router neu starten
 label.action.reboot.systemvm.processing=Neustart-System VM ....
 label.action.reboot.systemvm=System VM neu starten
+label.action.register.iso=ISO registrieren
+label.action.register.template=Vorlage registrieren
 label.action.release.ip=IP ver\u00f6ffentlichen
 label.action.release.ip.processing=Ver\u00f6ffentlichung der IP....
 label.action.remove.host=Host entfernen
@@ -190,14 +204,18 @@ label.action.unmanage.cluster.processing=Vernachl\u00e4ssigung des Clusters ....
 label.action.unmanage.cluster=Vernachl\u00e4ssige Cluster
 label.action.update.OS.preference=Betriebssystem Pr\u00e4verenz aktualisieren
 label.action.update.OS.preference.processing=Aktualisierung der Betriebssystem Pr\u00e4verenz....
+label.activate.project=Projekt aktivieren
 label.active.sessions=Aktive Sitzungen
 label.add.account=Konto hinzuf\u00fcgen
+label.add.accounts=Konten 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.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.add.guest.network=Gastnetzwerk hinzuf\u00fcgen
 label.add=Hinzuf\u00fcgen
 label.add.host=Host hinzuf\u00fcgen
 label.adding.cluster=Cluster hinzuf\u00fcgen
@@ -213,18 +231,32 @@ label.add.ip.range=IP Bereich hinzuf\u00fcgen
 label.additional.networks=Zus\u00e4tzliche Networks
 label.add.load.balancer=Serverlastverteilung hinzuf\u00fcgen
 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.gateway=Neues Gateway hinzuf\u00fcgen
 label.add.pod=Pod hinzuf\u00fcgen
 label.add.primary.storage=Hauptspeicher hinzuf\u00fcgen
+label.add.region=Region hinzuf\u00fcgen
+label.add.resources=Ressourcen hinzuf\u00fcgen
+label.add.route=Route hinzuf\u00fcgen
+label.add.rule=Regel hinzuf\u00fcgen
 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.system.service.offering=System-Service-Angebot hinzuf\u00fcgen
 label.add.template=Vorlage hinzuf\u00fcgen
+label.add.to.group=Zur Gruppe hinzuf\u00fcgen
 label.add.user=Benutzer hinzuf\u00fcgen
 label.add.vlan=VLAN hinzuf\u00fcgen
+label.add.vms=VMs hinzuf\u00fcgen
+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=VPC hinzuf\u00fcgen
+label.add.vpn.user=VPN-Benutzer hinzuf\u00fcgen
 label.add.vxlan=VXLAN hinzuf\u00fcgen
 label.add.zone=Zone hinzuf\u00fcgen
 label.admin.accounts=Administrator-Konten
@@ -232,27 +264,38 @@ label.admin=Administrator
 label.advanced.mode=Erweiterter Modus
 label.advanced.search=Erweiterte Suche
 label.advanced=Weitergehend
+label.agree=Zustimmen
 label.alert=Warnung
 label.algorithm=Algorithmus
 label.allocated=Zugeteilt
 label.allocation.state=Belegungszustand
+label.allow=Erlauben
 label.api.key=API Schl\u00fcssel
+label.apply=Anwenden
+label.app.name=CloudStack
+label.archive.events=Ereignisse archivieren
 label.assign.to.load.balancer=Instanz zum Lastverteiler hinzuf\u00fcgen
 label.assign=Zuweisen
 label.associated.network.id=Assozierte Netzwerk ID
+label.associated.network=Zugeh\u00f6riges Netzwerk
 label.attached.iso=Angeh\u00e4ngte ISO
+label.author.name=Autorname
 label.availability=Verf\u00fcgbarkeit
 label.availability.zone=Verf\u00fcgbare Zone
 label.available.public.ips=Verf\u00fcgbaren \u00f6ffentlichen IP-Adressen
 label.available=Verf\u00fcgbar
 label.back=Zur\u00fcck
+label.bandwidth=Bandbreite
+label.basic=Basis
 label.basic.mode=Grundmodus
 label.bootable=Bootbar
 label.broadcast.domain.type=Benachrichtigung an alle Nutzer \u00fcber Domain Typ
 label.by.account=Nach Benutzerkonto
+label.by.alert.type=Nach Alarmtyp
 label.by.availability=Nach Verf\u00fcgbarkeit
 label.by.domain=Nach Domain
 label.by.end.date=Nach Endedatum
+label.by.event.type=Nach Ereignistyp
 label.by.level=Nach Level
 label.by.pod=Nach Pod
 label.by.role=Nach Rolle
@@ -265,47 +308,85 @@ label.by.type.id=Nach Typ ID
 label.by.type=Nach Typ
 label.by.zone=Nach Zone
 label.cancel=Abbrechen
+label.capacity=Kapazit\u00e4t
 label.certificate=Zertifikat
+label.change.value=Wert \u00e4ndern
 label.character=Buchstabe
+label.checksum=MD5-Pr\u00fcfsumme
 label.cidr.account=CIDR oder Benutzerkonto/Sicherheitsgruppe
 label.cidr=CIDR
+label.CIDR.list=CIDR-Liste
 label.cidr.list=Quelle CIDR
+label.CIDR.of.destination.network=CIDR des Zielnetzwerks
+label.clear.list=Liste l\u00f6schen
 label.close=Schliessen
 label.cloud.console=Cloud Management Konsole
 label.cloud.managed=Geleitet von cloud.com
 label.cluster=Cluster
+label.cluster.name=Clustername
 label.clusters=Cluster
 label.cluster.type=Cluster-Typ
+label.clvm=CLVM
 label.code=Code
 label.configuration=Konfiguration
+label.configure=Konfigurieren
+label.configure.ldap=LDAP konfigurieren
+label.configure.vpc=VPC konfigurieren
 label.confirmation=Best\u00e4tigung
+label.confirm.password=Passwort best\u00e4tigen
 label.congratulations=Herzlichen Gl\u00fcckwunsch
+label.continue=Fortsetzen
 label.corrections.saved=Korrekturen gespeichert
 label.cpu.allocated=Zugeteilte CPU
 label.CPU.cap=CPU Obergrenze
 label.cpu=CPU
+label.cpu.limits=CPU-Begrenzungen
 label.cpu.mhz=CPU (in MHz)
 label.cpu.utilized=genutzte CPU
+label.created.by.system=Vom System erstellt
 label.created=Erstellt
+label.create.project=Projekt erstellen
+label.create.template=Vorlage erstellen
+label.create.VPN.connection=VPN-Verbindung erstellen
 label.cross.zones=\u00fcberschneidende Zonen
+label.custom=Benutzerdefiniert
 label.custom.disk.size=Benutzerdefinierte Festplattengr\u00f6sse
 label.daily=T\u00e4glich
 label.data.disk.offering=Daten-Speicherplatz-Angebot
 label.date=Datum
 label.day.of.month=Tag des Monats
 label.day.of.week=Tag der Woche
+label.dc.name=DC-Name
+label.default=Standard
 label.default.use=Standardeinstellung nutzen
+label.default.view=Standardansicht
+label.delete.events=Ereignisse l\u00f6schen
+label.delete.F5=F5 l\u00f6schen
+label.delete.gateway=Gateway l\u00f6schen
 label.delete=L\u00f6schen
+label.delete.profile=Profil l\u00f6schen
+label.delete.project=Projekt l\u00f6schen
+label.delete.SRX=SRX l\u00f6schen
+label.delete.vpn.user=VPN-Benutzer l\u00f6schen
 label.deleting.failed=L\u00f6schen fehlgeschlagen
 label.deleting.processing=L\u00f6schen ....
+label.deny=Verweigern
 label.description=Beschreibung
+label.destination.zone=Zielzone
+label.destroy.router=Router zerst\u00f6ren
 label.destroy=Zerst\u00f6ren
 label.detaching.disk=Entfernen der Festplatte
 label.details=Details
 label.device.id=Ger\u00e4te-ID
+label.devices=Ger\u00e4te
+label.dhcp=DHCP
 label.DHCP.server.type=DHCP Server Type
 label.disabled=Deaktiviert
+label.disable.provider=Anbieter deaktivieren
+label.disable.vnmc.provider=VNMC-Anbieter deaktivieren
+label.disable.vpn=VPN deaktivieren
 label.disabling.vpn.access=Deaktivierung des VPN Zugangs
+label.disbale.vnmc.device=VNMC-Ger\u00e4t deaktivieren
 label.disk.allocated=Zugeordnete Festplatte
 label.disk.offering=Festplatten-Angebot
 label.disk.size=Festplattengr\u00f6\u00dfe
@@ -315,29 +396,49 @@ label.disk.volume=Festplatten Volume
 label.display.text=Anzeigetext
 label.dns.1=DNS 1
 label.dns.2=DNS 2
+label.dns=DNS
 label.domain.admin=Domain Administrator
 label.domain=Domain
 label.domain.id=Domain ID
 label.domain.name=Domain Name
 label.domain.suffix=DNS Domainsuffix (z.B. xzy.com)
+label.done=Fertig
 label.double.quotes.are.not.allowed=Anf\u00fchrungszeichen sind nicht erlaubt
 label.download.progress=Download-Fortschritt
 label.edit=Bearbeiten
+label.edit.network.details=Netzwerkdetails bearbeiten
+label.edit.project.details=Projektdetails bearbeiten
+label.edit.region=Region bearbeiten
+label.edit.tags=Schlagw\u00f6rter bearbeiten
+label.edit.vpc=VPC bearbeiten
 label.email=E-Mail
+label.email.lower=E-Mail-Adresse
+label.enable.vnmc.device=VNMC-Ger\u00e4t aktivieren
+label.enable.vnmc.provider=VNMC-Anbieter aktivieren
+label.enable.vpn=VPN aktivieren
 label.enabling.vpn.access=Aktivieren des VPN-Zugriffs
 label.enabling.vpn=VPN aktivieren
+label.endpoint=Endpunkt
 label.endpoint.or.operation=Endpunkt oder Bedienung
 label.end.port=Beende Port
 label.error.code=Fehlercode
 label.error=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.example=Beispiel
+label.f5.details=F5-Details
+label.f5=F5
 label.failed=Fehlgeschlagen
 label.featured=Besonderheiten aufweisen
+label.filterBy=Filtern nach
 label.firewall=Firewall
+label.firstname.lower=Vorname
 label.first.name=Vorname
 label.format=Format
 label.friday=Freitag
+label.full.path=Vollst\u00e4ndiger Pfad
 label.full=Voll
 label.gateway=Schnittstelle
 label.general.alerts=Allgemeine Warnungen
@@ -347,18 +448,29 @@ label.go.step.2=Gehe zu Schritt 2
 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=Gruppe
 label.group.optional=Gruppe (optional)
+label.gslb.delete=GSLB l\u00f6schen
+label.gslb.details=GSLB-Details
+label.gslb.service=GSLB-Dienst
+label.gslb.servicetype=Diensttyp
 label.guest.cidr=Gast CIDR
+label.guest=Gast
 label.guest.gateway=Gast-Schnittstelle
 label.guest.ip=Gast IP-Adresse
 label.guest.ip.range=Gast IP Berecih
 label.guest.netmask=Gast Netzmaske
+label.guest.network.details=Gastnetzwerkdetails
+label.guest.networks=Gastnetzwerke
+label.guest.type=Gasttyp
 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=Host
+label.host.MAC=Host-MAC
 label.host.name=Host Name
 label.hosts=Hosts
 label.host.tags=Markierungen des Hosts
@@ -366,6 +478,9 @@ label.hourly=St\u00fcndlich
 label.hypervisor=Hypervisor
 label.hypervisor.type=Hypervisor Typ
 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.ingress.rule=Zutrittsregel
 label.initiated.by=Initiiert durch
@@ -379,6 +494,7 @@ label.installWizard.addPrimaryStorageIntro.subtitle=Was ist primay storage?
 label.installWizard.addPrimaryStorageIntro.title=primary storage hinzuf\u00fcgen
 label.installWizard.addSecondaryStorageIntro.subtitle=Was ist secondary storage?
 label.installWizard.addSecondaryStorageIntro.title=secondary storage
+label.installWizard.addZoneIntro.subtitle=Was ist eine Zone?
 label.installWizard.addZone.title=zone hinzuf\u00fcgen
 label.installWizard.click.launch=Bitte den Start Button dr\u00fccken
 label.instance=Instanz
@@ -387,40 +503,95 @@ label.instance.name=Name der Instanz
 label.instances=Instanzen
 label.internal.dns.1=Interne DNS 1
 label.internal.dns.2=Interne DNS 2
+label.internal.name=Interner Name
 label.interval.type=Interval Typ
 label.invalid.integer=Ung\u00fcltige Ganzzahl
 label.invalid.number=Ung\u00fcltige Anzahl
+label.invitations=Einladungen
+label.invited.accounts=Eingeladene Konten
+label.invite=Einladen
+label.invite.to=Einladen zu
 label.ip.address=IP-Adresse
 label.ipaddress=IP-Adresse
 label.ip=IP
+label.ip.limits=\u00d6ffentliche IP-Begrenzungen
 label.ip.or.fqdn=IP oder FQDN
 label.ip.range=IP-Bereich
+label.ip.ranges=IP-Bereiche
 label.ips=IPs
+label.ipv4.cidr=IPv4 CIDR
+label.ipv4.end.ip=IPv4 End-IP
+label.ipv4.gateway=IPv4 Gateway
+label.ipv4.netmask=IPv4-Netzmaske
+label.ipv4.start.ip=IPv4 Start-IP
+label.ipv6.address=IPv6 IP-Adresse
+label.ipv6.CIDR=IPv6 CIDR
+label.ipv6.dns1=IPv6 DNS1
+label.ipv6.dns2=IPv6 DNS2
+label.ipv6.end.ip=IPv6 End-IP
+label.ipv6.gateway=IPv6 Gateway
+label.ipv6.start.ip=IPv6 Start-IP
 label.iscsi=iSCSI
 label.is.default=Ist vorgegeben
 label.iso.boot=ISO-Boot
 label.iso=ISO
+label.isolated.networks=Isolierte Netzwerke
+label.isolation.method=Isolationsmethode
+label.isolation.mode=Isolationsmodus
 label.is.redundant.router=Redundant
 label.is.shared=Gemeinsam
+label.is.system=Ist System
 label.keep=Behalten
+label.key=Schl\u00fcssel
+label.label=Bezeichnung
+label.lang.arabic=Arabisch
+label.lang.brportugese=Brasilianisches Portugiesisch
+label.lang.catalan=Katalanisch
 label.lang.chinese=chinesisch (vereinfacht)
+label.lang.dutch=Niederl\u00e4ndisch
 label.lang.english=englisch
+label.lang.french=Franz\u00f6sisch
+label.lang.german=Deutsch
+label.lang.italian=Italienisch
 label.lang.japanese=japanisch
+label.lang.korean=Koreanisch
+label.lang.norwegian=Norwegisch
+label.lang.polish=Polnisch
+label.lang.russian=Russisch
 label.lang.spanish=spanisch
 label.last.disconnected=Zuletzt getrennt
+label.lastname.lower=Nachname
 label.last.name=Nachname
+label.latest.events=Neueste Ereignisse
 label.launch=Start
+label.launch.vm=VM starten
+label.ldap.configuration=LDAP-Konfiguration
+label.ldap.group.name=LDAP-Gruppe
+label.ldap.port=LDAP-Port
 label.level=Ebene
 label.load.balancer=Serverlastverteilung
 label.loading=Laden
 label.local=Lokal
+label.local.storage=Lokaler Speicher
 label.login=Login
 label.logout=Abmelden
 label.lun=LUN
+label.LUN.number=LUN \#
+label.management=Verwaltung
+label.manage.resources=Ressourcen verwalten
 label.manage=Verwalten
+label.max.cpus=Max. CPU-Kerne
 label.maximum=Maximum
+label.max.memory=Max. Speicher (MiB)
+label.max.networks=Max. Netzwerke
+label.max.public.ips=Max. \u00f6ffentliche IPs
+label.max.snapshots=Max. Schnappsch\u00fcsse
+label.max.templates=Max. Vorlagen
+label.max.vms=Max. Benutzer-VMs
+label.max.vpcs=Max. VPCs
 label.may.continue=Sie k\u00f6nnen jetzt fortfahren
 label.memory.allocated=zugeordneter Speicher
+label.memory.limits=Speicherbegrenzungen (MiB)
 label.memory.mb=Speicher (in MB)
 label.memory=Speicher (in MB)
 label.memory.total=Speicher insgesamt
@@ -439,6 +610,7 @@ label.menu.domains=Domains
 label.menu.events=Events
 label.menu.featured.isos=Besondere ISOs
 label.menu.global.settings=Allgemeine Einstellungen
+label.menu.infrastructure=Infrastruktur
 label.menu.instances=Instanzen
 label.menu.ipaddresses=IP-Adressen
 label.menu.isos=ISOs
@@ -449,6 +621,7 @@ label.menu.my.templates=Meine Vorlagen
 label.menu.network=Netzwerk
 label.menu.network.offerings=Netzwerk-Angebote
 label.menu.physical.resources=Technische Ressourcen
+label.menu.regions=Regionen
 label.menu.running.instances=Laufende Instanzen
 label.menu.security.groups=Sicherheitsgruppen
 label.menu.service.offerings=Service-Angebote
@@ -463,24 +636,40 @@ label.menu.volumes=Volumes
 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
+label.mode=Modus
 label.monday=Montag
 label.monthly=Monatlich
 label.more.templates=Mehr Vorlagen
+label.move.to.bottom=Nach unten verschieben
+label.move.to.top=Nach oben verschieben
 label.my.account=Ihr Benutzerkonto
+label.my.network=Mein Netzwerk
+label.my.templates=Meine Vorlagen
+label.name.lower=Name
 label.name=Name
 label.name.optional=Name (Optional)
+label.nat.port.range=NAT-Portbereich
 label.netmask=Netzmaske
+label.network.ACL=Netzwerk-ACL
+label.network.ACLs=Netzwerk-ACLs
+label.network.addVM=Netzwerk zur VM hinzuf\u00fcgen
 label.network.device=Netzwerkger\u00e4t
 label.network.device.type=Netzwerkger\u00e4tetyp
 label.network.domain=Netzwerk-Domain
 label.network.id=Netzwerk-ID
+label.network.limits=Netzwerkbegrenzungen
 label.network.name=Netzwerk Name
 label.network=Netzwerk
 label.network.offering=Netzwerk-Angebot
 label.network.rate=Netzwerk-Rate
+label.networks=Netzwerke
 label.network.type=Netzwerk-Typ
+label.new=Neu
 label.new.password=Neues Passwort
+label.new.project=Neues Projekt
+label.new.vm=Neue VM
 label.next=Weiter
+label.nexusVswitch=Nexus 1000v
 label.nfs=NFS
 label.nfs.server=NFS Server
 label.nfs.storage=NFS-Speicher
@@ -494,14 +683,25 @@ label.no=Nein
 label.none=Kein
 label.no.security.groups=Keine verf\u00fcgbare Sicherheitsgruppe
 label.not.found=Nicht gefunden
+label.no.thanks=Nein, danke
+label.notifications=Benachrichtigungen
+label.number.of.hosts=Anzahl an Hosts
+label.number.of.zones=Anzahl an Zonen
+label.num.cpu.cores=Anzahl an CPU-Kernen
 label.numretries=Anzahl von Wiederholungen
 label.ocfs2=OCFS2
 label.offer.ha=HA anbieten
+label.ok=OK
 label.optional=optional
 label.os.preference=OS Pr\u00e4ferenz
 label.os.type=OS Typ
+label.ovs=OVS
+label.owner.account=Eigent\u00fcmerkonto
 label.password.enabled=Passwort aktiviert
+label.password.lower=Passwort
 label.password=Passwort
+label.path=Pfad
+label.persistent=Persistent
 label.PING.CIFS.password=PING CIFS Passwort
 label.PING.CIFS.username=PING CIFS Benutzername
 label.PING.dir=PING-Verzeichnis
@@ -509,37 +709,84 @@ label.PING.storage.IP=IP des externen Speichers anpingen
 label.please.wait=Bitte warten
 label.pod=Pod
 label.pods=Pod
+label.portable.ip.ranges=Portable IP-Bereiche
+label.portable.ips=Portable IPs
+label.port.forwarding=Portweiterleitung
+label.port=Port
+label.port.range=Portbereich
 label.PreSetup=Voreinstellung
+label.previous=Vorherige
+label.prev=Vor
 label.primary.allocated=Zugewiesener Hauptspeicher
 label.primary.network=Hauptnetzwerk
 label.primary.storage=Hauptspeicher
 label.primary.used=Genutzter Hauptspeicher
+label.private.Gateway=Privater Gateway
 label.private.interface=Privates Interface
 label.private.ip=Private IP-Adresse
+label.private.ip.range=Privater IP-Bereich
 label.private.ips=Private IP-Adressen
+label.privatekey=PKCS\#8 Privater Schl\u00fcssel
+label.private.network=Privates Netzwerk
 label.private.port=Privater Port
 label.private.zone=Private Zone
+label.profile=Profil
+label.project.id=Projektkennung
+label.project.invite=Zum Projekt einladen
+label.project.name=Projektname
+label.project=Projekt
+label.projects=Projekte
+label.project.view=Projektansicht
 label.protocol=Protokoll
+label.provider=Anbieter
+label.providers=Anbieter
 label.public.interface=\u00d6ffentliches Interface
 label.public.ips=\u00d6ffentliche IP-Adressen
 label.public.ip=\u00d6ffentliche IP-Adresse
+label.public.network=\u00d6ffentliches Netzwerk
 label.public.port=\u00d6ffentlicher Port
 label.public=\u00d6ffentlich
 label.public.zone=\u00d6ffentliche Zone
 label.Pxe.server.type=PXE Server Type
+label.quickview=Schnellansicht
+label.rbd=RBD
 label.reboot=Neustart
 label.recent.errors=Aktuelle Fehler
 label.redundant.router=Redundanter Router
 label.refresh=Aktualisieren
+label.region=Region
+label.reinstall.vm=VM neu installieren
 label.related=Verwandt
+label.remove.ACL=ACL entfernen
+label.remove.ip.range=IP-Bereich entfernen
+label.remove.ldap=LDAP entfernen
+label.remove.region=Region entfernen
+label.remove.rule=Regel entfernen
+label.remove.vpc=VPC entfernen
 label.removing.user=Entfernen von Benutzern
+label.reource.id=Ressourcenkennung
 label.required=Erforderlich
+label.resetVM=VM zur\u00fccksetzen
+label.resize.new.size=Neue Gr\u00f6\u00dfe (GB)
+label.resource.name=Ressourcenname
 label.resource=Ressource
 label.resources=Ressourcen
+label.restart.network=Netzwerk neu starten
+label.restart.required=Neustart erforderlich
+label.restart.vpc=VPC neu starten
+label.restore=Wiederherstellen
 label.role=Rolle
+label.rules=Regeln
 label.running.vms=Laufende VMs
+label.s3.access_key=Zugriffsschl\u00fcssel
+label.s3.connection_timeout=Verbindungszeit\u00fcberschreitung
+label.s3.endpoint=Endpunkt
+label.s3.nfs.path=S3 NFS-Pfad
+label.s3.nfs.server=S3 NFS-Server
 label.s3.secret_key=Secret Key
+label.s3.use_https=HTTPS verwenden
 label.saturday=Samstag
+label.save.and.continue=Speichern und fortsetzen
 label.save=Sichern
 label.saving.processing=Sichern ....
 label.search=Suche
@@ -550,20 +797,43 @@ label.security.group.name=Sicherheitsgruppen-Name
 label.security.groups.enabled=Sicherheitsgruppe aktiviert
 label.security.group=Sicherheitsgruppe
 label.security.groups=Sicherheitsgruppen
+label.select.a.template=Vorlage ausw\u00e4hlen
+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.project=Projekt ausw\u00e4hlen
+label.select.template=Vorlage ausw\u00e4hlen
+label.select-view=Ansicht ausw\u00e4hlen
 label.sent=Versendet
 label.server=Server
 label.service.offering=Service-Angebot
+label.services=Dienste
 label.session.expired=Sitzung abgelaufen
+label.settings=Einstellungen
 label.setup=Konfiguration
+label.setup.network=Netzwerk einrichten
+label.set.up.zone.type=Zonentyp einrichten
+label.setup.zone=Zone einrichten
 label.shared=Gemeinsame
 label.SharedMountPoint=Geteilter Einh\u00e4ngepunkt
 label.show.ingress.rule=Zeige Regeln, die den Zutritt steuern
 label.size=Gr\u00f6\u00dfe
+label.smb.domain=SMB-Dom\u00e4ne
+label.smb.password=SMB-Passwort
+label.smb.username=SMB-Benutzername
 label.snapshot.limits=Schnappschuss Grenzen
 label.snapshot.name=Schnappschuss Name
 label.snapshot=Schnappschuss
 label.snapshots=Schnappsch\u00fcsse
 label.snapshot.s=Schnappschuss (Schnappsch\u00fcsse)
+label.SNMP.port=SNMP-Port
+label.source=Quelle
+label.srx.details=SRX-Details
+label.srx=SRX
+label.start.IP=Start-IP
+label.start.port=Startport
+label.state=Status
 label.static.nat=Statische NAT
 label.statistics=Statistiken
 label.status=Status
@@ -573,6 +843,12 @@ label.step.3=Schritt 3
 label.step.4=Schritt 4
 label.step.5=Schritt 5
 label.sticky.domain=Domain
+label.sticky.indirect=Indirekt
+label.sticky.length=L\u00e4nge
+label.sticky.mode=Modus
+label.sticky.nocache=Kein Cache
+label.sticky.prefix=Pr\u00e4fix
+label.sticky.tablesize=Tabellengr\u00f6\u00dfe
 label.stopped.vms=Gestoppte VMs
 label.stop=Stopp
 label.storage=Speicherung
@@ -581,12 +857,15 @@ label.storage.type=Speichertyp
 label.submit=\u00dcberreichen
 label.succeeded=Erfolgreich
 label.sunday=Sonntag
+label.supported.services=Unterst\u00fctzte Dienste
 label.system.service.offering=System-Service-Angebot
 label.system.vms=System VMs
 label.system.vm=System-VM
 label.system.vm.type=System VM Typ
 label.tagged=Markiert
+label.tag.key=Schlagwortschl\u00fcssel
 label.tags=Markierungen
+label.tag.value=Schlagwortwert
 label.target.iqn=Ziel IQN
 label.template.limits=Vorlagen Grenzen
 label.template=Vorlage
@@ -595,24 +874,34 @@ label.theme.default=Motiv-Standardeinstellung
 label.theme.grey=personalisiertes - grau
 label.theme.lightblue=personalisiertes - hellblau
 label.thursday=Donnerstag
+label.timeout.in.second = Zeit\u00fcberschreitung (Sekunden)
+label.timeout=Zeit\u00fcberschreitung
 label.time=Zeit
 label.time.zone=Zeitzone
 label.timezone=Zeitzone
 label.total.cpu=Gesamtanzahl CPU
 label.total.CPU=Gesamtanzahl CPU
+label.total.memory=Gesamter Speicher
 label.total.vms=Insgesamte VMs
 label.traffic.type=Traffic Typ
 label.tuesday=Dienstag
 label.type.id=Typ ID
+label.type.lower=Typ
 label.type=Typ
+label.ucs=UCS
 label.unavailable=nichtverf\u00fcgbar
 label.unlimited=uneingeschr\u00e4nkt
 label.untagged=Unmarkiert
+label.update.ssl.cert= SSL-Zertifikat
+label.update.ssl= SSL-Zertifikat
 label.updating=Aktualisierung
+label.upload=Hochladen
 label.url=URL
 label.used=Gebraucht
 label.user=Benutzer
+label.user.data=Benutzerdaten
 label.username=Benutzername
+label.username.lower=Benutzername
 label.users=Benutzer
 label.value=Wert
 label.vcenter.cluster=vCenter Cluster
@@ -622,26 +911,45 @@ label.vcenter.host=vCenter Host
 label.vcenter.password=vCenter Passwort
 label.vcenter.username=vCenter Benutzername
 label.version=Version
+label.vgpu.max.resolution=Maximale Aufl\u00f6sung
+label.vgpu.video.ram=Video RAM
+label.view=Ansicht
+label.view.more=Ansichtsmodus
 label.virtual.network=Virtuelles Netzwerk
+label.virtual.routers=Virtuelle Router
+label.virtual.router=Virtueller Router
 label.vlan.id=VLAN ID
+label.vlan.range.details=VLAN-Bereichdetails
+label.vlan.ranges=VLAN-Bereich(e)
 label.vlan.range=VLAN Reichweite
 label.vlan=VLAN
+label.vlan.vni.ranges=VLAN/VNI-Bereich(e)
 label.vlan.vni.range=VLAN Reichweite
 label.vm.add=Instanz hinzuf\u00fcgen
 label.vm.destroy=Zerst\u00f6ren
 label.VMFS.datastore=VMFS Datenspeicher
 label.vmfs=VMFS
+label.vm.name=VM-Name
 label.vm.reboot=Neustart
+label.vmsnapshot.memory=Schnappschussspeicher
 label.vmsnapshot.type=Typ
+label.vmsnapshot=VM-Schnappsch\u00fcsse
 label.vm.start=Start
+label.vm.state=VM-Status
 label.vm.stop=Stopp
 label.vms=VMs
 label.vnet.id=VLAN ID
 label.vnet=VLAN
+label.vnmc.devices=VNMC-Ger\u00e4te
 label.volume.limits=Volume Grenzen
 label.volume.name=Volume Name
 label.volumes=Volumes
 label.volume=Volume
+label.vpc.id=VPC-Kennung
+label.VPC.limits=VPC-Begrenzungen
+label.vpc=VPC
+label.VPN.connection=VPN-Verbindung
+label.VPN.gateway=VPN-Gateway
 label.vpn=VPN
 label.vxlan.id=VXLAN ID
 label.vxlan.range=VXLAN Reichweite
@@ -652,8 +960,15 @@ label.wednesday=Mittwoch
 label.weekly=W\u00f6chentlich
 label.welcome=Willkommen
 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>
 label.zones=Zone
+label.zone.type=Zonentyp
 label.zone=Zone
 message.acquire.public.ip=Bitte w\u00e4hlen Sie eine Zone, von der Sie Ihre neue IP erlangen m\u00f6chten.
 message.action.cancel.maintenance=Ihr Host ist erfolgreich f\u00fcr die Wartung abgebrochen. Dieser Prozess kann ein paar Minuten dauern.
@@ -683,6 +998,7 @@ message.action.disable.cluster=Bitte best\u00e4tigen Sie, dass Sie diesen Cluste
 message.action.disable.pod=Bitte best\u00e4tigen Sie, dass Sie diesen Pod deaktivieren m\u00f6chten.
 message.action.disable.static.NAT=Bitte best\u00e4tigen Sie, dass Sie die statische NAT deaktivieren m\u00f6chten.
 message.action.disable.zone=Bitte best\u00e4tigen Sie, dass Sie diese Zone deaktivieren m\u00f6chten.
+message.action.downloading.template=Vorlage wird heruntergeladen.
 message.action.enable.cluster=Bitte best\u00e4tigen Sie, dass Sie diesen Cluster aktivieren m\u00f6chten.
 message.action.enable.pod=Bitte best\u00e4tigen Sie, dass Sie diesen Pod aktivieren m\u00f6chten.
 message.action.enable.zone=Bitte best\u00e4tigen Sie, dass Sie diese Zone aktivieren m\u00f6chten.
@@ -719,6 +1035,8 @@ message.disable.vpn.access=Bitte best\u00e4tigen Sie, dass Sie den VPN Zugriff d
 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.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
 message.installWizard.tooltip.addCluster.name=Der Name des Clusters. Der Name kann frei gew\u00e4hlt werden und wird von Cloudstack nicht genutzt.
 message.installWizard.tooltip.addHost.hostname=Der DNS-Name oder die IP-Adresse des hosts
@@ -737,9 +1055,13 @@ message.installWizard.tooltip.configureGuestTraffic.description=Eine Beschreibun
 message.installWizard.tooltip.configureGuestTraffic.guestGateway=Das gateway, welches der Gast benutzen soll.
 message.installWizard.tooltip.configureGuestTraffic.guestNetmask=Die Subnetzmaske des Gast-Netzwerks
 message.installWizard.tooltip.configureGuestTraffic.name=Der Name f\u00fcr das Netzwerk
+message.listView.subselect.multi=(Strg/Cmd-Klick)
 message.migrate.instance.to.host=Bitte best\u00e4tigen sie, dass die Instanz auf einen anderen Host migriert werden soll
 message.migrate.instance.to.ps=Bitte best\u00e4tigen sie, dass sie die Instanz auf einen anderen prim\u00e4ren Speicher migrieren wollen.
 message.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.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.setup.successful=Cloud setup erfolgreich
 message.step.1.continue=Bitte w\u00e4hlen Sie eine Vorlage oder ISO, um fortzufahren
@@ -749,11 +1071,29 @@ 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.tooltip.zone.name=Einen Namen f\u00fcr die Zone.
+message.validate.fieldrequired=Dieses Feld wird ben\u00f6tigt
 message.vm.create.template.confirm=Das Erstellen einer Vorlage f\u00fchrt automatisch zu einem Neustart der VM.
+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
 message.zone.step.3.desc=Bitte geben Sie die folgende Information ein, um einen neuen pod hinzuzuf\u00fcgen
+mode=Modus
 network.rate=Netzwerk-Rate
+notification.reboot.instance=Instanz neu starten
+state.Active=Aktiv
 state.Allocated=Zugeteilt
+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
+state.Stopped=Gestoppt
+state.Stopping=Stoppt
+ui.listView.filters.all=Alle
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index f2d754ebc0f..d3f371f38e2 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -461,6 +461,7 @@ label.go.step.2=Ir al paso 2
 label.go.step.3=Ir al paso 3
 label.go.step.4=Ir al paso 4
 label.go.step.5=Ir al paso 5
+label.gpu=CPU
 label.group=Grupo
 label.group.optional=Grupo (Opcional)
 label.guest.cidr=Habitaci\u00c3\u00b3n CIDR
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 004187f69b4..bc08e79225b 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -281,6 +281,7 @@ label.add.ingress.rule=Ajouter une r\u00e8gle d\\'entr\u00e9e
 label.adding.succeeded=Ajout r\u00e9ussi
 label.adding.user=Ajout de l\\'utilisateur
 label.adding.zone=Ajout de la zone
+label.add.intermediate.certificate=Ajouter certificat interm\u00e9diaire
 label.add.ip.range=Ajouter une plage IP
 label.add.isolated.network=Ajouter un r\u00e9seau isol\u00e9
 label.additional.networks=R\u00e9seaux additionnels
@@ -416,8 +417,10 @@ label.by.type=Par type
 label.by.zone=Par zone
 label.cache.mode=Type Write-cache
 label.cancel=Annuler
+label.capacity.bytes=Capacit\u00e9 Octets
 label.capacity=Capacit\u00e9
-label.certificate=Certificat
+label.capacity.iops=Capacit\u00e9 IOPS
+label.certificate=Certificat serveur
 label.change.affinity=Changer Affinit\u00e9
 label.change.service.offering=Modifier Offre Service
 label.change.value=Modifier la valeur
@@ -737,6 +740,7 @@ label.instance.name=Nom de l\\'instance
 label.instance.scaled.up=Instance agrandie
 label.instances=Instances
 label.instanciate.template.associate.profile.blade=Instancier Mod\u00e8le et Profil associ\u00e9 \u00e0 la Lame
+label.intermediate.certificate=Certificat interm\u00e9diaire {0}
 label.internal.dns.1=DNS interne 1
 label.internal.dns.2=DNS interne 2
 label.internal.name=Nom interne
@@ -1157,6 +1161,7 @@ label.restore=Restaurer
 label.review=Revoir
 label.revoke.project.invite=R\u00e9voquer l\\'invitation
 label.role=R\u00f4le
+label.root.certificate=Certificat racine
 label.root.disk.controller=Contr\u00f4leur de disque principal
 label.root.disk.offering=Offre de disque racine
 label.root.disk.size=Taille disque principal
diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties
index e2f3f0b5aa7..0e97f57829a 100644
--- a/client/WEB-INF/classes/resources/messages_it_IT.properties
+++ b/client/WEB-INF/classes/resources/messages_it_IT.properties
@@ -356,6 +356,7 @@ label.ESP.policy=Policy di ESP
 label.f5=F5
 label.failed=Errore
 label.full.path=Path completo
+label.gpu=CPU
 label.guest.end.ip=Indirizzo IP guest finale
 label.guest=Guest
 label.guest.networks=Reti guest
diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties
index 2fa3cb641a3..a032d4570bd 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -263,6 +263,7 @@ 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.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 \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002
 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
 label.add.F5.device=F5 \u30c7\u30d0\u30a4\u30b9\u306e\u8ffd\u52a0
@@ -279,6 +280,7 @@ label.adding.succeeded=\u8ffd\u52a0\u3057\u307e\u3057\u305f
 label.adding=\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
 label.adding.user=\u30e6\u30fc\u30b6\u30fc\u3092\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
 label.adding.zone=\u30be\u30fc\u30f3\u3092\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059
+label.add.intermediate.certificate=\u4e2d\u9593\u8a3c\u660e\u66f8\u306e\u8ffd\u52a0
 label.add.ip.range=IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u8ffd\u52a0
 label.add.isolated.network=\u5206\u96e2\u3055\u308c\u305f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u8ffd\u52a0
 label.additional.networks=\u8ffd\u52a0\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af
@@ -415,8 +417,10 @@ label.by.type=\u7a2e\u985e
 label.by.zone=\u30be\u30fc\u30f3
 label.cache.mode=\u66f8\u304d\u8fbc\u307f\u30ad\u30e3\u30c3\u30b7\u30e5\u306e\u7a2e\u985e
 label.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+label.capacity.bytes=\u51e6\u7406\u80fd\u529b (\u30d0\u30a4\u30c8)
+label.capacity.iops=\u51e6\u7406\u80fd\u529b (IOPS)
 label.capacity=\u51e6\u7406\u80fd\u529b
-label.certificate=\u8a3c\u660e\u66f8
+label.certificate=\u30b5\u30fc\u30d0\u30fc\u8a3c\u660e\u66f8
 label.change.affinity=\u30a2\u30d5\u30a3\u30cb\u30c6\u30a3\u306e\u5909\u66f4
 label.change.service.offering=\u30b5\u30fc\u30d3\u30b9 \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u5909\u66f4
 label.change.value=\u5024\u306e\u5909\u66f4
@@ -736,6 +740,7 @@ label.instance.scaled.up=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u30b5\u30a4\
 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
+label.intermediate.certificate=\u4e2d\u9593\u8a3c\u660e\u66f8 {0}
 label.internal.dns.1=\u5185\u90e8 DNS 1
 label.internal.dns.2=\u5185\u90e8 DNS 2
 label.internal.name=\u5185\u90e8\u540d
@@ -963,6 +968,7 @@ label.nfs.storage=NFS \u30b9\u30c8\u30ec\u30fc\u30b8
 label.nic.adapter.type=NIC \u30a2\u30c0\u30d7\u30bf\u30fc\u306e\u7a2e\u985e
 label.nicira.controller.address=\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc \u30a2\u30c9\u30ec\u30b9
 label.nicira.l3gatewayserviceuuid=L3 \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4 \u30b5\u30fc\u30d3\u30b9\u306e UUID
+label.nicira.nvp.details=Nicira NVP \u306e\u8a73\u7d30
 label.nicira.transportzoneuuid=\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8 \u30be\u30fc\u30f3\u306e UUID
 label.nics=NIC
 label.no.actions=\u5b9f\u884c\u3067\u304d\u308b\u64cd\u4f5c\u306f\u3042\u308a\u307e\u305b\u3093
@@ -1155,6 +1161,7 @@ label.restore=\u5fa9\u5143
 label.review=\u78ba\u8a8d
 label.revoke.project.invite=\u62db\u5f85\u306e\u53d6\u308a\u6d88\u3057
 label.role=\u5f79\u5272
+label.root.certificate=\u30eb\u30fc\u30c8\u8a3c\u660e\u66f8
 label.root.disk.controller=\u30eb\u30fc\u30c8 \u30c7\u30a3\u30b9\u30af \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc
 label.root.disk.offering=\u30eb\u30fc\u30c8 \u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0
 label.root.disk.size=\u30eb\u30fc\u30c8 \u30c7\u30a3\u30b9\u30af \u30b5\u30a4\u30ba
@@ -1866,7 +1873,7 @@ message.tooltip.reserved.system.netmask=\u30dd\u30c3\u30c9\u306e\u30b5\u30d6\u30
 message.tooltip.zone.name=\u30be\u30fc\u30f3\u306e\u540d\u524d\u3067\u3059\u3002
 message.update.os.preference=\u3053\u306e\u30db\u30b9\u30c8\u306e OS \u57fa\u672c\u8a2d\u5b9a\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u540c\u69d8\u306e\u57fa\u672c\u8a2d\u5b9a\u3092\u6301\u3064\u3059\u3079\u3066\u306e\u4eee\u60f3\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306f\u3001\u5225\u306e\u30db\u30b9\u30c8\u3092\u9078\u629e\u3059\u308b\u524d\u306b\u307e\u305a\u3053\u306e\u30db\u30b9\u30c8\u306b\u5272\u308a\u5f53\u3066\u3089\u308c\u307e\u3059\u3002
 message.update.resource.count=\u3053\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30ea\u30bd\u30fc\u30b9\u6570\u3092\u66f4\u65b0\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-message.update.ssl=\u5404\u30b3\u30f3\u30bd\u30fc\u30eb \u30d7\u30ed\u30ad\u30b7\u306e\u4eee\u60f3\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3067\u66f4\u65b0\u3059\u308b\u3001X.509 \u6e96\u62e0\u306e\u65b0\u3057\u3044 SSL \u8a3c\u660e\u66f8\u3092\u9001\u4fe1\u3057\u3066\u304f\u3060\u3055\u3044\:
+message.update.ssl=\u5404\u30b3\u30f3\u30bd\u30fc\u30eb \u30d7\u30ed\u30ad\u30b7\u304a\u3088\u3073\u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u4eee\u60f3\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3067\u66f4\u65b0\u3059\u308b\u3001X.509 \u6e96\u62e0\u306e\u65b0\u3057\u3044 SSL \u8a3c\u660e\u66f8\u3092\u9001\u4fe1\u3057\u3066\u304f\u3060\u3055\u3044\:
 message.validate.accept=\u6709\u52b9\u306a\u62e1\u5f35\u5b50\u3092\u6301\u3064\u5024\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 message.validate.creditcard=\u30af\u30ec\u30b8\u30c3\u30c8 \u30ab\u30fc\u30c9\u756a\u53f7\u3092\u6b63\u3057\u304f\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 message.validate.date.ISO=\u65e5\u4ed8\u3092\u6b63\u3057\u304f\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 (ISO)\u3002
diff --git a/client/WEB-INF/classes/resources/messages_ko_KR.properties b/client/WEB-INF/classes/resources/messages_ko_KR.properties
index ce79d2e5b27..891546d590a 100644
--- a/client/WEB-INF/classes/resources/messages_ko_KR.properties
+++ b/client/WEB-INF/classes/resources/messages_ko_KR.properties
@@ -52,6 +52,7 @@ label.account.specific=\uacc4\uc815 \uc815\ubcf4 \uace0\uc720
 label.accounts=\uacc4\uc815 \uc815\ubcf4
 label.account=\uacc4\uc815 \uc815\ubcf4
 label.acquire.new.ip=\uc0c8\ub85c\uc6b4 IP \uc8fc\uc18c \ucde8\ub4dd
+label.acquire.new.secondary.ip=\uc0c8\ub85c\uc6b4 \ub450\ubc88\uc9f8 IP \uc8fc\uc18c \ucde8\ub4dd
 label.action.attach.disk.processing=\ub514\uc2a4\ud06c\ub97c \uc5f0\uacb0\ud558\ub294 \uc911...
 label.action.attach.disk=\ub514\uc2a4\ud06c \uc5f0\uacb0
 label.action.attach.iso=ISO \uc5f0\uacb0
@@ -530,6 +531,7 @@ label.go.step.2=\ub2e8\uacc4 2\uc73c\ub85c
 label.go.step.3=\ub2e8\uacc4 3\uc73c\ub85c
 label.go.step.4=\ub2e8\uacc4 4\uc73c\ub85c
 label.go.step.5=\ub2e8\uacc4 5\uc73c\ub85c
+label.gpu=CPU
 label.group.optional=\uadf8\ub8f9(\uc635\uc158)
 label.group=\uadf8\ub8f9
 label.guest.cidr=\uac8c\uc2a4\ud2b8 CIDR
diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties b/client/WEB-INF/classes/resources/messages_nb_NO.properties
index c169112222d..b16c826a582 100644
--- a/client/WEB-INF/classes/resources/messages_nb_NO.properties
+++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties
@@ -452,6 +452,7 @@ label.go.step.2=G\u00e5 til steg 2
 label.go.step.3=G\u00e5 til steg 3
 label.go.step.4=G\u00e5 til steg 4
 label.go.step.5=G\u00e5 til steg 5
+label.gpu=CPU
 label.group=Gruppe
 label.group.optional=Gruppe (Valgfritt)
 label.guest.cidr=Gjest CIDR
diff --git a/client/WEB-INF/classes/resources/messages_nl_NL.properties b/client/WEB-INF/classes/resources/messages_nl_NL.properties
index 54c78e30e53..89ef828a3c1 100644
--- a/client/WEB-INF/classes/resources/messages_nl_NL.properties
+++ b/client/WEB-INF/classes/resources/messages_nl_NL.properties
@@ -263,6 +263,7 @@ 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
 label.add.F5.device=Voeg F5 apparaat toe
@@ -963,6 +964,7 @@ label.nfs.storage=NFS Opslag
 label.nic.adapter.type=NIC adapter type
 label.nicira.controller.address=Controller Adres
 label.nicira.l3gatewayserviceuuid=L3 Gateway Service Uuid
+label.nicira.nvp.details=Nicira NVP details
 label.nicira.transportzoneuuid=Transport Zone Uuid
 label.nics=NICs
 label.no.actions=Geen Beschikbare Acties
diff --git a/client/WEB-INF/classes/resources/messages_pl.properties b/client/WEB-INF/classes/resources/messages_pl.properties
index 06d5ec2dbde..b28a00c1355 100644
--- a/client/WEB-INF/classes/resources/messages_pl.properties
+++ b/client/WEB-INF/classes/resources/messages_pl.properties
@@ -257,6 +257,7 @@ label.go.step.2=Id\u017a do punktu 2
 label.go.step.3=Id\u017a do punktu 3
 label.go.step.4=Id\u017a do punktu 4
 label.go.step.5=Id\u017a do punktu 5
+label.gpu=CPU
 label.group=Grupa
 label.group.optional=Grupa (opcjonalnie)
 label.guest=Go\u015b\u0107
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index 8ee08ba3cbb..bdfa46c01b0 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -262,6 +262,7 @@ label.add.domain=Adicionar Dom\u00ednio
 label.add.egress.rule=Adicionar regra egress
 label.add.F5.device=Adicionar dispositivo F5
 label.add.firewall=Adicionar regra de Firewall
+label.add.gslb=Adicionar GSLB
 label.add.guest.network=Adicionar rede guest
 label.add.host=Adicionar Host
 label.adding=Adicionando
@@ -292,6 +293,7 @@ label.add.NiciraNvp.device=Adicionar Controlador Nvp
 label.add.PA.device=Adicionar dispositivo Palo Alto
 label.add.physical.network=Adicionar rede f\u00edsica
 label.add.pod=Adicionar POD
+label.add.portable.ip.range=Adicionar Faixa de Endere\u00e7os IPs Port\u00e1veis 
 label.add.port.forwarding.rule=Adicionar regra de encaminhamento de porta
 label.add.primary.storage=Adicionar Storage Prim\u00e1rio
 label.add.region=Adicionar Regi\u00e3o
@@ -344,6 +346,7 @@ label.app.name=CloudStack
 label.archive.alerts=Guardar alertas
 label.archive.events=Guardar eventos
 label.assign=Atribuir
+label.assign.instance.another=Atribuir Inst\u00e2ncia para outra Conta
 label.assign.to.load.balancer=Atribuindo Inst\u00e2ncia ao balanceador de carga
 label.associated.network.id=ID de Rede Associado
 label.associated.network=Rede associada
@@ -382,6 +385,7 @@ label.by.traffic.type=por Tipo de Tr\u00e1fego
 label.by.type.id=por Tipo de ID
 label.by.type=Por Tipo
 label.by.zone=por Zona
+label.cache.mode=Tipo do cache de escrita
 label.cancel=Cancelar
 label.capacity=Capacidade
 label.certificate=Certificado
@@ -459,6 +463,7 @@ label.delete.gateway=delete gateway
 label.delete.NetScaler=Remover NetScaler
 label.delete.NiciraNvp=Remover Controlador Nvp
 label.delete.PA=Remover Palo Alto
+label.delete.portable.ip.range=Deletar Endere\u00e7os IPs Port\u00e1teis
 label.delete.project=Deletar projeto
 label.delete=Remover
 label.delete.SRX=Remover SRX
@@ -518,11 +523,13 @@ label.done=Pronto
 label.double.quotes.are.not.allowed=Aspas duplas n\u00e3o s\u00e3o permitidas
 label.download.progress=Status do Download
 label.drag.new.position=Arrastar para uma nova posi\u00e7\u00e3o
+label.dynamically.scalable=Dinamicamente Escal\u00e1vel
 label.edit.affinity.group=Editar Grupo de Afinidade
 label.edit=Editar
 label.edit.lb.rule=Editar regra de LB
 label.edit.network.details=Editar detalhes de rede
 label.edit.project.details=Editar detalhes do projeto
+label.edit.region=Editar Regi\u00e3o
 label.edit.tags=Edite etiquetas
 label.edit.traffic.type=Editar tipo de tr\u00e1fego
 label.edit.vpc=Editar VPC
@@ -576,8 +583,13 @@ label.go.step.2=V\u00e1 para passo 2
 label.go.step.3=V\u00e1 para passo 3
 label.go.step.4=V\u00e1 para passo 4
 label.go.step.5=V\u00e1 para passo 5
+label.gpu=CPU
 label.group=Grupo
 label.group.optional=Grupo (Opcional)
+label.gslb.delete=Deletar GSLB
+label.gslb.details=Detalhes do GSLB
+label.gslb.domain.name=Nome do Dom\u00ednio GSLB
+label.gslb.servicetype=Tipo do Servi\u00e7o
 label.guest.cidr=CIDR de rede Convidado
 label.guest.end.ip=IP do fim do guest
 label.guest.gateway=Gateway de rede Convidado
@@ -635,6 +647,7 @@ 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
@@ -657,6 +670,9 @@ label.ip.range=Range de IP
 label.ip.ranges=Ranges de IP
 label.IPsec.preshared.key=Chave IPSec pr\u00e9 compartilhada
 label.ips=IPs
+label.ipv6.address=Endere\u00e7o IPv6
+label.ipv6.CIDR=CIDR IPv6
+label.ipv6.gateway=Gateway IPv6
 label.iscsi=iSCSI
 label.is.default=\u00c9\u0089 Padr\u00e3o
 label.iso.boot=ISO de Boot
@@ -807,6 +823,7 @@ label.netScaler=NetScaler
 label.network.ACL=ACL de rede
 label.network.ACLs=Network ACLs
 label.network.ACL.total=Total de rede ACL
+label.network.addVM=Adicionar rede para VM
 label.network.desc=Descri\u00e7\u00e3o de Rede
 label.network.device=Dispositivo de Rede
 label.network.device.type=Tipo de Dispositivo de Rede
@@ -866,6 +883,10 @@ label.numretries=N\u00famero de Tentativas
 label.ocfs2=OCFS2
 label.offer.ha=Offer HA
 label.ok=OK
+label.opendaylight.controller=Controlador OpenDaylight
+label.opendaylight.controllerdetail=Detalhes do Controlador OpenDaylight
+label.opendaylight.controllers=Controladores OpenDaylight
+label.openDaylight=OpenDaylight
 label.optional=Opcional
 label.order=Ordenar
 label.os.preference=Prefer\u00eancia de SO
@@ -877,6 +898,7 @@ label.PA.log.profile=Palo Alto Log Profile
 label.PA=Palo Alto
 label.parent.domain=Dom\u00ednio Principal
 label.password.enabled=Senha Ativada
+label.password.reset.confirm=A senha foi recuperada para
 label.password=Senha
 label.path=Caminho (Path)
 label.PA.threat.profile=Palo Alto Threat Profile
@@ -895,6 +917,7 @@ label.plugins=Plugins
 label.pod.name=Nome do Pod
 label.pod=POD
 label.pods=Pods
+label.portable.ip.ranges=Faixa de endere\u00e7os IPs Port\u00e1vel
 label.port.forwarding=Encaminhamento de Porta
 label.port.forwarding.policies=Pol\u00edticas de redirecionamento de portas
 label.port=Porta
@@ -925,6 +948,7 @@ label.project=Projeto
 label.projects=Projetos
 label.project.view=Vis\u00e3o de Projeto
 label.protocol=Protocolo
+label.provider=Provedor
 label.providers=Providers
 label.public.interface=Interface P\u00fablica
 label.public.ip=Endere\u00e7o IP P\u00fablico
@@ -946,11 +970,13 @@ label.rbd=RDB
 label.rbd.secret=Cephx secret
 label.reboot=Reiniciar
 label.recent.errors=Erros Recentes
+label.recover.vm=Recuperar VM
 label.redundant.router.capability=Recurso de roteador redundante
 label.redundant.router=Roteador Redundantee
 label.redundant.state=Estado redundante
 label.refresh=Atualizar
 label.region=Regi\u00e3o
+label.reinstall.vm=Reinstalar VM
 label.related=Relacionado
 label.remind.later=Me lembre depois
 label.remove.ACL=Remove ACL
@@ -974,6 +1000,7 @@ label.required=Obrigat\u00f3rio
 label.reserved.system.gateway=Gateway de sistema reservado
 label.reserved.system.ip=IP de Sistema Reservado
 label.reserved.system.netmask=M\u00e1scara de rede reservada do sistema
+label.resetVM=Restabelecer VM
 label.reset.VPN.connection=Resetar a conex\u00e3o VPN
 label.resize.new.offering.id=New Offering
 label.resize.new.size=New Size(GB)
@@ -1039,6 +1066,7 @@ label.service.capabilities=Recursos de servi\u00e7os
 label.service.offering=Plano
 label.service.state=Estado do Servi\u00e7o
 label.session.expired=Sess\u00e3o Expirada
+label.set.default.NIC=Configurar para NIC padr\u00e3o
 label.setup=Configura\u00e7\u00e3o
 label.setup.network=Configurar Rede
 label.setup.zone=Configurar Zona
@@ -1126,7 +1154,9 @@ label.system.vm.type=Tipo de VM de Sistema
 label.system.vm=VM de Sistema
 label.system.wide.capacity=Capacidade Total do Sistema
 label.tagged=Tagged
+label.tag.key=Chave
 label.tags=Tags
+label.tag.value=Valor
 label.target.iqn=Target IQN
 label.task.completed=Tarefa completa
 label.template.limits=Limites do Template
@@ -1227,6 +1257,7 @@ label.volume.limits=Limites de Disco
 label.volume.name=Nome do Disco
 label.volumes=Discos
 label.vpc.id=VPC ID
+label.VPC.limits=Limites VPC
 label.VPC.router.details=Detalhes de roteador de VPC
 label.vpc=VPC
 label.VPN.connection=Conex\u00e3o VPN
@@ -1248,6 +1279,8 @@ label.weekly=Semanal
 label.welcome=Bem-Vindo
 label.welcome.cloud.console=Painel de Controle
 label.what.is.cloudstack=O que \u00e9 o CloudStack&\#8482?
+label.xenserver.tools.version.61.plus=XenServer Tools Vers\u00e3o 6.1\\+
+label.Xenserver.Tools.Version61plus=XenServer Tools Vers\u00e3o 6.1\\+
 label.xen.traffic.label=Etiqueta de tr\u00e1fego XenServer
 label.yes=Sim
 label.zone.details=Detalhes de zona
@@ -1523,7 +1556,9 @@ message.please.wait.while.zone.is.being.created=Por favor, espere enquanto sua z
 message.project.invite.sent=Convite enviado para o usu\u00e1rio; Eles ser\u00e3o adicionados ao projeto ap\u00f3s aceitarem o convite
 message.public.traffic.in.advanced.zone=O tr\u00e1fego p\u00fablico \u00e9 gerado quando as VMs na nuvem acessam a internet. Os IPs acess\u00edveis ao p\u00fablico devem ser alocados para essa finalidade. Os usu\u00e1rios finais podem usar a interface do usu\u00e1rio CloudStack para adquirir esses IPs afim de implementar NAT entre a sua rede de guests e sua rede p\u00fablica. <br/><br/> Forne\u00e7a pelo menos um intervalo de endere\u00e7os IP para o tr\u00e1fego de internet.
 message.public.traffic.in.basic.zone=O tr\u00e1fego p\u00fablico \u00e9 gerado quando as VMs na nuvem acessam a Internet ou prestam servi\u00e7os aos clientes atrav\u00e9s da Internet. Os IPs acess\u00edveis ao p\u00fablico devem ser alocados para essa finalidade. Quando uma inst\u00e2ncia \u00e9 criada, um IP a partir deste conjunto de IPs p\u00fablicos ser\u00e3o destinados \u00e0 inst\u00e2ncia, al\u00e9m do endere\u00e7o IP guest. Um NAT est\u00e1tico 1-1  ser\u00e1 criada automaticamente entre o IP p\u00fablico e IP guest. Os usu\u00e1rios finais tamb\u00e9m podem usar a interface de usu\u00e1rio CloudStack para adquirir IPs adicionais afim de se implementar NAT est\u00e1tico entre suas inst\u00e2ncias e o IP p\u00fablico.
+message.recover.vm=Por favor, confirme a recupera\u00e7\u00e3o desta VM.
 message.redirecting.region=Redirecionando para regi\u00e3o...
+message.reinstall.vm=NOTA\: Proceda com cuidado. Isso far\u00e1 com que a m\u00e1quina virtual seja re-instalada a partir  do Template. Todos os datos do disco ROOT ser\u00e3o perdidos. Volumes de Dados adicionais, se houver, n\u00e3o ser\u00e3o alterados.
 message.remove.ldap=Voc\u00ea tem certeza que deseja deletar a configura\u00e7\u00e3o LDAP?
 message.remove.region=Voc\u00ea tem certeza que deseja remover esta regi\u00e3o deste servidor de gerenciamento?
 message.remove.vpc=Favor confirmar que voc\u00ea deseja remover a VPC
diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties
index ff68668e6ff..5fb571c4a7e 100644
--- a/client/WEB-INF/classes/resources/messages_ru_RU.properties
+++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties
@@ -564,6 +564,7 @@ label.go.step.2=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u
 label.go.step.3=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u0433\u0443 3
 label.go.step.4=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u0433\u0443 4
 label.go.step.5=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u0433\u0443 5
+label.gpu=CPU
 label.group.optional=\u0413\u0440\u0443\u043f\u043f\u0430 (\u043e\u043f\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e)
 label.group=\u0413\u0440\u0443\u043f\u043f\u0430
 label.guest.cidr=\u0413\u043e\u0441\u0442\u0435\u0432\u043e\u0439 CIDR
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 1ec4e9537a6..fa4b04fcb6b 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -263,6 +263,7 @@ 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.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
 label.add.F5.device=\u6dfb\u52a0 F5 \u8bbe\u5907
@@ -279,6 +280,7 @@ label.adding.succeeded=\u5df2\u6210\u529f\u6dfb\u52a0
 label.adding=\u6b63\u5728\u6dfb\u52a0
 label.adding.user=\u6b63\u5728\u6dfb\u52a0\u7528\u6237
 label.adding.zone=\u6b63\u5728\u6dfb\u52a0\u533a\u57df
+label.add.intermediate.certificate=\u6dfb\u52a0\u4e2d\u95f4\u8bc1\u4e66
 label.add.ip.range=\u6dfb\u52a0 IP \u8303\u56f4
 label.add.isolated.network=\u6dfb\u52a0\u9694\u79bb\u7f51\u7edc
 label.additional.networks=\u5176\u4ed6\u7f51\u7edc
@@ -329,6 +331,7 @@ label.add.vmware.datacenter=\u6dfb\u52a0 VMware \u6570\u636e\u4e2d\u5fc3
 label.add.vnmc.device=\u6dfb\u52a0 VNMC \u8bbe\u5907
 label.add.vnmc.provider=\u6dfb\u52a0 VNMC \u63d0\u4f9b\u7a0b\u5e8f
 label.add.volume=\u6dfb\u52a0\u5377
+label.add.vpc.offering=\u6dfb\u52a0 VPC \u65b9\u6848
 label.add.vpc=\u6dfb\u52a0 VPC
 label.add.vpn.customer.gateway=\u6dfb\u52a0 VPN \u5ba2\u6237\u7f51\u5173
 label.add.VPN.gateway=\u6dfb\u52a0 VPN \u7f51\u5173
@@ -414,8 +417,10 @@ label.by.type=\u6309\u7c7b\u578b
 label.by.zone=\u6309\u533a\u57df
 label.cache.mode=\u5199\u5165\u7f13\u5b58\u7c7b\u578b
 label.cancel=\u53d6\u6d88
+label.capacity.bytes=\u5bb9\u91cf(\u5b57\u8282)
+label.capacity.iops=\u5bb9\u91cf IOPS
 label.capacity=\u5bb9\u91cf
-label.certificate=\u8bc1\u4e66
+label.certificate=\u670d\u52a1\u5668\u8bc1\u4e66
 label.change.affinity=\u66f4\u6539\u5173\u8054\u6027
 label.change.service.offering=\u66f4\u6539\u670d\u52a1\u65b9\u6848
 label.change.value=\u66f4\u6539\u503c
@@ -543,6 +548,7 @@ label.disabled=\u5df2\u7981\u7528
 label.disable.network.offering=\u7981\u7528\u7f51\u7edc\u65b9\u6848
 label.disable.provider=\u7981\u7528\u63d0\u4f9b\u7a0b\u5e8f
 label.disable.vnmc.provider=\u7981\u7528 VNMC \u63d0\u4f9b\u7a0b\u5e8f
+label.disable.vpc.offering=\u7981\u7528 VPC \u65b9\u6848
 label.disable.vpn=\u7981\u7528 VPN
 label.disabling.vpn.access=\u6b63\u5728\u7981\u7528 VPN \u8bbf\u95ee
 label.disassociate.profile.blade=\u53d6\u6d88\u5c06\u914d\u7f6e\u6587\u4ef6\u4e0e\u5200\u7247\u5f0f\u670d\u52a1\u5668\u5173\u8054
@@ -566,6 +572,7 @@ 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
 label.dns.2=DNS 2
 label.dns=DNS
@@ -606,6 +613,7 @@ label.enable.s3=\u542f\u7528 S3 \u652f\u6301\u7684\u8f85\u52a9\u5b58\u50a8
 label.enable.swift=\u542f\u7528 SWIFT
 label.enable.vnmc.device=\u542f\u7528 VNMC \u8bbe\u5907
 label.enable.vnmc.provider=\u542f\u7528 VNMC \u63d0\u4f9b\u7a0b\u5e8f
+label.enable.vpc.offering=\u542f\u7528 VPC \u65b9\u6848
 label.enable.vpn=\u542f\u7528 VPN
 label.enabling.vpn.access=\u6b63\u5728\u542f\u7528 VPN \u8bbf\u95ee
 label.enabling.vpn=\u6b63\u5728\u542f\u7528 VPN
@@ -648,6 +656,7 @@ label.go.step.2=\u8f6c\u81f3\u6b65\u9aa4 2
 label.go.step.3=\u8f6c\u81f3\u6b65\u9aa4 3
 label.go.step.4=\u8f6c\u81f3\u6b65\u9aa4 4
 label.go.step.5=\u8f6c\u81f3\u6b65\u9aa4 5
+label.gpu=GPU
 label.group.by.account=\u6309\u5e10\u6237\u5206\u7ec4
 label.group.by.cluster=\u6309\u7fa4\u96c6\u5206\u7ec4
 label.group.by.pod=\u6309\u63d0\u4f9b\u70b9\u5206\u7ec4
@@ -731,6 +740,7 @@ 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
+label.intermediate.certificate=\u4e2d\u95f4\u8bc1\u4e66 {0}
 label.internal.dns.1=\u5185\u90e8 DNS 1
 label.internal.dns.2=\u5185\u90e8 DNS 2
 label.internal.name=\u5185\u90e8\u540d\u79f0
@@ -888,6 +898,7 @@ label.menu.templates=\u6a21\u677f
 label.menu.virtual.appliances=\u865a\u62df\u8bbe\u5907
 label.menu.virtual.resources=\u865a\u62df\u8d44\u6e90
 label.menu.volumes=\u5377
+label.menu.vpc.offerings=VPC \u65b9\u6848
 label.migrate.instance.to.host=\u5c06\u5b9e\u4f8b\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u673a
 label.migrate.instance.to.ps=\u5c06\u5b9e\u4f8b\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8
 label.migrate.instance.to=\u8fc1\u79fb\u5b9e\u4f8b\u81f3
@@ -957,6 +968,7 @@ label.nfs.storage=NFS \u5b58\u50a8
 label.nic.adapter.type=NIC \u9002\u914d\u5668\u7c7b\u578b
 label.nicira.controller.address=\u63a7\u5236\u5668\u5730\u5740
 label.nicira.l3gatewayserviceuuid=L3 Gateway Service UUID
+label.nicira.nvp.details=Nicira NVP \u8be6\u7ec6\u4fe1\u606f
 label.nicira.transportzoneuuid=\u4f20\u8f93\u533a\u57df UUID
 label.nics=NIC
 label.no.actions=\u65e0\u53ef\u7528\u64cd\u4f5c
@@ -1087,12 +1099,15 @@ label.rbd=RBD
 label.rbd.secret=Cephx \u5bc6\u94a5
 label.reboot=\u91cd\u65b0\u542f\u52a8
 label.recent.errors=\u6700\u8fd1\u51fa\u73b0\u7684\u9519\u8bef
+label.recover.vm=\u6062\u590d VM
 label.redundant.router.capability=\u5197\u4f59\u8def\u7531\u5668\u529f\u80fd
 label.redundant.router=\u5197\u4f59\u8def\u7531\u5668
 label.redundant.state=\u5197\u4f59\u72b6\u6001
 label.refresh.blades=\u5237\u65b0\u5200\u7247\u5f0f\u670d\u52a1\u5668
 label.refresh=\u5237\u65b0
+label.regionlevelvpc=\u5730\u7406\u533a\u57df\u7ea7 VPC
 label.region=\u533a\u57df
+label.reinstall.vm=\u91cd\u65b0\u5b89\u88c5 VM
 label.related=\u76f8\u5173\u8054
 label.release.account.lowercase=\u4ece\u5e10\u6237\u4e2d\u91ca\u653e
 label.release.account=\u4ece\u5e10\u6237\u4e2d\u91ca\u653e
@@ -1118,6 +1133,7 @@ label.remove.static.route=\u5220\u9664\u9759\u6001\u8def\u7531
 label.remove.tier=\u5220\u9664\u5c42
 label.remove.vm.from.lb=\u4ece\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219\u4e2d\u5220\u9664 VM
 label.remove.vmware.datacenter=\u5220\u9664 VMware \u6570\u636e\u4e2d\u5fc3
+label.remove.vpc.offering=\u5220\u9664 VPC \u65b9\u6848
 label.remove.vpc=\u5220\u9664 VPC
 label.removing=\u6b63\u5728\u5220\u9664
 label.removing.user=\u6b63\u5728\u5220\u9664\u7528\u6237
@@ -1145,6 +1161,7 @@ label.restore=\u8fd8\u539f
 label.review=\u6838\u5bf9
 label.revoke.project.invite=\u64a4\u9500\u9080\u8bf7
 label.role=\u89d2\u8272
+label.root.certificate=\u6839\u8bc1\u4e66
 label.root.disk.controller=\u6839\u78c1\u76d8\u63a7\u5236\u5668
 label.root.disk.offering=\u6839\u78c1\u76d8\u65b9\u6848
 label.root.disk.size=\u6839\u78c1\u76d8\u5927\u5c0f
@@ -1288,6 +1305,7 @@ label.sunday=\u661f\u671f\u65e5
 label.super.cidr.for.guest.networks=\u6765\u5bbe\u7f51\u7edc\u7684\u8d85\u7ea7 CIDR
 label.supported.services=\u652f\u6301\u7684\u670d\u52a1
 label.supported.source.NAT.type=\u652f\u6301\u7684\u6e90 NAT \u7c7b\u578b
+label.supportsstrechedl2subnet=\u652f\u6301\u6269\u5c55\u4e8c\u7ea7\u5b50\u7f51
 label.suspend.project=\u6682\u505c\u9879\u76ee
 label.switch.type=\u4ea4\u6362\u673a\u7c7b\u578b
 label.system.capacity=\u7cfb\u7edf\u5bb9\u91cf
@@ -1359,6 +1377,7 @@ label.username.lower=\u7528\u6237\u540d
 label.username=\u7528\u6237\u540d
 label.users=\u7528\u6237
 label.user=\u7528\u6237
+label.use.vm.ips=\u4f7f\u7528 VM IP
 label.use.vm.ip=\u4f7f\u7528 VM IP\:
 label.value=\u503c
 label.vcdcname=vCenter DC \u540d\u79f0
@@ -1371,6 +1390,11 @@ label.vcenter.username=vCenter \u7528\u6237\u540d
 label.vcenter=vCenter
 label.vcipaddress=vCenter IP \u5730\u5740
 label.version=\u7248\u672c
+label.vgpu.max.resolution=\u6700\u5927\u5206\u8fa8\u7387
+label.vgpu.max.vgpu.per.gpu=\u6bcf\u4e2a GPU \u7684 vGPU \u6570
+label.vgpu.remaining.capacity=\u5269\u4f59\u5bb9\u91cf
+label.vgpu.type=vGPU \u7c7b\u578b
+label.vgpu.video.ram=\u89c6\u9891 RAM
 label.view.all=\u67e5\u770b\u5168\u90e8
 label.view.console=\u67e5\u770b\u63a7\u5236\u53f0
 label.viewing=\u67e5\u770b
@@ -1427,9 +1451,13 @@ label.volume.limits=\u5377\u9650\u5236
 label.volume.name=\u5377\u540d\u79f0
 label.volumes=\u5377
 label.volume=\u5377
+label.vpc.distributedvpcrouter=\u5206\u5e03\u5f0f VPC \u8def\u7531\u5668
 label.vpc.id=VPC ID
 label.VPC.limits=VPC \u9650\u5236
+label.vpc.offering.details=VPC \u65b9\u6848\u8be6\u7ec6\u4fe1\u606f
+label.vpc.offering=VPC \u65b9\u6848
 label.VPC.router.details=VPC \u8def\u7531\u5668\u8be6\u7ec6\u4fe1\u606f
+label.vpc.supportsregionlevelvpc=\u652f\u6301\u5730\u7406\u533a\u57df\u7ea7 VPC
 label.vpc.virtual.router=VPC \u865a\u62df\u8def\u7531\u5668
 label.vpc=VPC
 label.VPN.connection=VPN \u8fde\u63a5
@@ -1615,9 +1643,11 @@ message.confirm.destroy.router=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u9500\
 message.confirm.disable.network.offering=\u662f\u5426\u786e\u5b9e\u8981\u7981\u7528\u6b64\u7f51\u7edc\u65b9\u6848?
 message.confirm.disable.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64\u63d0\u4f9b\u7a0b\u5e8f
 message.confirm.disable.vnmc.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528 VNMC \u63d0\u4f9b\u7a0b\u5e8f\u3002
+message.confirm.disable.vpc.offering=\u662f\u5426\u786e\u5b9e\u8981\u7981\u7528\u6b64 VPC \u65b9\u6848?
 message.confirm.enable.network.offering=\u662f\u5426\u786e\u5b9e\u8981\u542f\u7528\u6b64\u7f51\u7edc\u65b9\u6848?
 message.confirm.enable.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64\u63d0\u4f9b\u7a0b\u5e8f
 message.confirm.enable.vnmc.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528 VNMC \u63d0\u4f9b\u7a0b\u5e8f\u3002
+message.confirm.enable.vpc.offering=\u662f\u5426\u786e\u5b9e\u8981\u542f\u7528\u6b64 VPC \u65b9\u6848?
 message.confirm.join.project=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u52a0\u5165\u6b64\u9879\u76ee\u3002
 message.confirm.refresh.blades=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5237\u65b0\u5200\u7247\u5f0f\u670d\u52a1\u5668\u3002
 message.confirm.release.dedicated.cluster=\u662f\u5426\u8981\u91ca\u653e\u6b64\u4e13\u7528\u7fa4\u96c6?
@@ -1628,6 +1658,7 @@ message.confirm.release.dedicate.vlan.range=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e
 message.confirm.remove.IP.range=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64 IP \u8303\u56f4\u3002
 message.confirm.remove.network.offering=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664\u6b64\u7f51\u7edc\u65b9\u6848?
 message.confirm.remove.vmware.datacenter=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 VMware \u6570\u636e\u4e2d\u5fc3
+message.confirm.remove.vpc.offering=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664\u6b64 VPC \u65b9\u6848?
 message.confirm.scale.up.router.vm=\u662f\u5426\u786e\u5b9e\u8981\u6269\u5c55\u8def\u7531\u5668 VM?
 message.confirm.scale.up.system.vm=\u662f\u5426\u786e\u5b9e\u8981\u6269\u5c55\u7cfb\u7edf VM?
 message.confirm.shutdown.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5173\u95ed\u6b64\u63d0\u4f9b\u7a0b\u5e8f
@@ -1678,6 +1709,7 @@ message.disable.user=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b6
 message.disable.vpn.access=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528 VPN \u8bbf\u95ee\u3002
 message.disable.vpn=\u662f\u5426\u786e\u5b9e\u8981\u7981\u7528 VPN?
 message.disabling.network.offering=\u6b63\u5728\u7981\u7528\u7f51\u7edc\u65b9\u6848
+message.disabling.vpc.offering=\u6b63\u5728\u7981\u7528 VPC \u65b9\u6848
 message.disallowed.characters=\u7981\u7528\u5b57\u7b26\: \\<\\,\\>
 message.download.ISO=\u8bf7\u5355\u51fb <a href\="\#">00000</a> \u4e0b\u8f7d ISO
 message.download.template=\u8bf7\u5355\u51fb <a href\="\#">00000</a> \u4e0b\u8f7d\u6a21\u677f
@@ -1695,6 +1727,7 @@ message.enable.vpn.access=\u5f53\u524d\u5df2\u5bf9\u6b64 IP \u5730\u5740\u7981\u
 message.enable.vpn=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5bf9\u6b64 IP \u5730\u5740\u542f\u7528 VPN \u8bbf\u95ee\u3002
 message.enabling.network.offering=\u6b63\u5728\u542f\u7528\u7f51\u7edc\u65b9\u6848
 message.enabling.security.group.provider=\u6b63\u5728\u542f\u7528\u5b89\u5168\u7ec4\u63d0\u4f9b\u7a0b\u5e8f
+message.enabling.vpc.offering=\u6b63\u5728\u542f\u7528 VPC \u65b9\u6848
 message.enabling.zone.dots=\u6b63\u5728\u542f\u7528\u8d44\u6e90\u57df...
 message.enabling.zone=\u6b63\u5728\u542f\u7528\u533a\u57df
 message.enter.seperated.list.multiple.cidrs=\u5982\u679c\u5b58\u5728\u591a\u4e2a CIDR\uff0c\u8bf7\u8f93\u5165\u7528\u9017\u53f7\u5206\u9694\u7684 CIDR \u5217\u8868
@@ -1747,6 +1780,7 @@ message.iso.desc=\u78c1\u76d8\u6620\u50cf\uff0c\u5176\u4e2d\u5305\u542b\u64cd\u4
 message.join.project=\u60a8\u73b0\u5728\u5df2\u52a0\u5165\u4e86\u4e00\u4e2a\u9879\u76ee\u3002\u8bf7\u5207\u6362\u5230\u201c\u9879\u76ee\u89c6\u56fe\u201d\u4ee5\u67e5\u770b\u9879\u76ee\u3002
 message.launch.vm.on.private.network=\u662f\u5426\u8981\u5728\u60a8\u7684\u79c1\u4eba\u4e13\u7528\u7f51\u7edc\u4e2d\u542f\u52a8\u5b9e\u4f8b?
 message.launch.zone=\u533a\u57df\u5df2\u51c6\u5907\u5c31\u7eea\uff0c\u53ef\u968f\u65f6\u542f\u52a8\uff1b\u8bf7\u7ee7\u7eed\u6267\u884c\u4e0b\u4e00\u6b65\u9aa4\u3002
+message.listView.subselect.multi=(\u6309\u4f4f Ctrl/Cmd \u5e76\u5355\u51fb)
 message.lock.account=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u9501\u5b9a\u6b64\u5e10\u6237\u3002\u901a\u8fc7\u9501\u5b9a\u6b64\u5e10\u6237\uff0c\u6b64\u5e10\u6237\u7684\u6240\u6709\u7528\u6237\u5c06\u4e0d\u518d\u80fd\u591f\u7ba1\u7406\u5404\u81ea\u7684\u4e91\u8d44\u6e90\uff0c\u4f46\u4ecd\u7136\u53ef\u4ee5\u8bbf\u95ee\u73b0\u6709\u8d44\u6e90\u3002
 message.migrate.instance.confirm=\u8bf7\u786e\u8ba4\u8981\u5c06\u865a\u62df\u5b9e\u4f8b\u8fc1\u79fb\u5230\u7684\u4e3b\u673a\u3002
 message.migrate.instance.to.host=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u5b9e\u4f8b\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u673a\u3002
@@ -1782,7 +1816,9 @@ message.project.invite.sent=\u53d1\u9001\u7ed9\u7528\u6237\u7684\u9080\u8bf7\uff
 message.public.traffic.in.advanced.zone=\u4e91\u4e2d\u7684 VM \u8bbf\u95ee Internet \u65f6\u5c06\u751f\u6210\u516c\u5171\u901a\u4fe1\uff0c\u4f46\u5fc5\u987b\u5206\u914d\u53ef\u516c\u5f00\u8bbf\u95ee\u7684 IP \u624d\u80fd\u5b9e\u73b0\u3002\u6700\u7ec8\u7528\u6237\u53ef\u4ee5\u4f7f\u7528 CloudStack UI \u83b7\u53d6\u8fd9\u4e9b IP\uff0c\u4ee5\u5728\u5176\u6765\u5bbe\u7f51\u7edc\u4e0e\u516c\u7528\u7f51\u7edc\u4e4b\u95f4\u6267\u884c NAT\u3002<br/><br/>\u8bf7\u81f3\u5c11\u4e3a Internet \u901a\u4fe1\u63d0\u4f9b\u4e00\u4e2a IP \u5730\u5740\u8303\u56f4\u3002
 message.public.traffic.in.basic.zone=\u4e91\u4e2d\u7684 VM \u8bbf\u95ee Internet \u6216\u901a\u8fc7 Internet \u5411\u5ba2\u6237\u7aef\u63d0\u4f9b\u670d\u52a1\u65f6\u5c06\u751f\u6210\u516c\u5171\u901a\u4fe1\uff0c\u4f46\u5fc5\u987b\u5206\u914d\u53ef\u516c\u5f00\u8bbf\u95ee\u7684 IP \u624d\u80fd\u5b9e\u73b0\u3002\u521b\u5efa\u5b9e\u4f8b\u65f6\uff0c\u5c06\u628a\u8fd9\u4e00\u7ec4\u516c\u7528 IP \u4e2d\u7684 IP (\u6765\u5bbe IP \u5730\u5740\u9664\u5916)\u5206\u914d\u7ed9\u6b64\u5b9e\u4f8b\u3002\u9759\u6001 1-1 NAT \u5c06\u5728\u516c\u7528 IP \u4e0e\u6765\u5bbe IP \u4e4b\u95f4\u81ea\u52a8\u8bbe\u7f6e\u3002\u6700\u7ec8\u7528\u6237\u8fd8\u53ef\u4ee5\u4f7f\u7528 CloudStack UI \u83b7\u53d6\u5176\u4ed6 IP\uff0c\u4ee5\u5728\u5176\u5b9e\u4f8b\u4e0e\u516c\u7528 IP \u4e4b\u95f4\u6267\u884c\u9759\u6001 NAT\u3002
 message.read.admin.guide.scaling.up=\u5f00\u59cb\u6269\u5c55\u4e4b\u524d\uff0c\u8bf7\u9605\u8bfb\u7ba1\u7406\u6307\u5357\u4e2d\u7684\u52a8\u6001\u6269\u5c55\u90e8\u5206\u3002
+message.recover.vm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u6062\u590d\u6b64 VM\u3002
 message.redirecting.region=\u6b63\u5728\u91cd\u5b9a\u5411\u5230\u533a\u57df...
+message.reinstall.vm=\u6ce8\u610f\: \u8bf7\u8c28\u614e\u64cd\u4f5c\u3002\u8fd9\u5c06\u5bfc\u81f4\u4ece\u6a21\u677f\u91cd\u65b0\u5b89\u88c5 VM\uff0c\u5e76\u4e14\u5f15\u5bfc\u78c1\u76d8\u4e0a\u5b58\u50a8\u7684\u6570\u636e\u5c06\u4e22\u5931\u3002\u989d\u5916\u7684\u6570\u636e\u5377(\u5982\u679c\u5b58\u5728)\u5c06\u65e0\u6cd5\u8bbf\u95ee\u3002
 message.remove.ldap=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664 LDAP \u914d\u7f6e?
 message.remove.region=\u662f\u5426\u786e\u5b9e\u8981\u4ece\u6b64\u7ba1\u7406\u670d\u52a1\u5668\u4e2d\u5220\u9664\u6b64\u533a\u57df?
 message.remove.vpc=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 VPC
@@ -1837,7 +1873,7 @@ message.tooltip.reserved.system.netmask=\u7528\u4e8e\u5b9a\u4e49\u63d0\u4f9b\u70
 message.tooltip.zone.name=\u533a\u57df\u540d\u79f0\u3002
 message.update.os.preference=\u8bf7\u4e3a\u6b64\u4e3b\u673a\u9009\u62e9\u4e00\u4e2a\u64cd\u4f5c\u7cfb\u7edf\u9996\u9009\u9879\u3002\u9996\u5148\u5c06\u5177\u6709\u76f8\u4f3c\u9996\u9009\u9879\u7684\u6240\u6709\u865a\u62df\u5b9e\u4f8b\u5206\u914d\u81f3\u6b64\u4e3b\u673a\uff0c\u7136\u540e\u518d\u9009\u62e9\u5176\u4ed6\u5b9e\u4f8b\u3002
 message.update.resource.count=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u66f4\u65b0\u6b64\u5e10\u6237\u7684\u8d44\u6e90\u6570\u3002
-message.update.ssl=\u8bf7\u63d0\u4ea4\u4e00\u4e2a\u65b0\u7684 X.509 \u517c\u5bb9\u7684 SSL \u8bc1\u4e66\uff0c\u4ee5\u4fbf\u5c06\u5176\u66f4\u65b0\u5230\u6bcf\u4e2a\u63a7\u5236\u53f0\u4ee3\u7406\u865a\u62df\u5b9e\u4f8b\:
+message.update.ssl=\u8bf7\u63d0\u4ea4\u4e00\u4e2a X.509 \u517c\u5bb9\u7684\u65b0 SSL \u8bc1\u4e66\uff0c\u4ee5\u4fbf\u5c06\u5176\u66f4\u65b0\u5230\u6bcf\u4e2a\u63a7\u5236\u53f0\u4ee3\u7406\u548c\u4e8c\u7ea7\u5b58\u50a8\u865a\u62df\u5b9e\u4f8b\:
 message.validate.accept=\u8bf7\u8f93\u5165\u4e00\u4e2a\u5e26\u6709\u6709\u6548\u6269\u5c55\u540d\u7684\u503c\u3002
 message.validate.creditcard=\u8bf7\u8f93\u5165\u4e00\u4e2a\u6709\u6548\u7684\u4fe1\u7528\u5361\u5361\u53f7\u3002
 message.validate.date.ISO=\u8bf7\u8f93\u5165\u6709\u6548\u7684\u65e5\u671f(ISO)\u3002
@@ -1872,6 +1908,7 @@ message.zone.no.network.selection=\u6240\u9009\u533a\u57df\u65e0\u4efb\u4f55\u7f
 message.zone.step.1.desc=\u8bf7\u4e3a\u60a8\u7684\u533a\u57df\u9009\u62e9\u4e00\u79cd\u7f51\u7edc\u6a21\u5f0f\u3002
 message.zone.step.2.desc=\u8bf7\u8f93\u5165\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u533a\u57df
 message.zone.step.3.desc=\u8bf7\u8f93\u5165\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u63d0\u4f9b\u70b9
+message.zoneWizard.enable.local.storage=\u8b66\u544a\: \u5982\u679c\u4e3a\u6b64\u8d44\u6e90\u57df\u542f\u7528\u4e86\u672c\u5730\u5b58\u50a8\uff0c\u5219\u5fc5\u987b\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e\u60a8\u5e0c\u671b\u542f\u52a8\u7cfb\u7edf VM \u7684\u4f4d\u7f6e\:<br/><br/>1. \u5982\u679c\u9700\u8981\u5728\u5171\u4eab\u4e3b\u5b58\u50a8\u4e2d\u542f\u52a8\u7cfb\u7edf VM\uff0c\u5219\u5fc5\u987b\u5728\u5b8c\u6210\u521b\u5efa\u540e\u5c06\u5171\u4eab\u4e3b\u5b58\u50a8\u6dfb\u52a0\u5230\u6b64\u8d44\u6e90\u57df\u3002<br/><br/>2. \u5982\u679c\u9700\u8981\u5728\u672c\u5730\u4e3b\u5b58\u50a8\u4e2d\u542f\u52a8\u7cfb\u7edf VM\uff0c\u5219\u5fc5\u987b\u5728\u542f\u7528\u6b64\u8d44\u6e90\u57df\u4e4b\u524d\u5c06 system.vm.use.local.storage \u8bbe\u7f6e\u4e3a true\u3002<br/><br/><br/>\u662f\u5426\u8981\u7ee7\u7eed?
 messgae.validate.min=\u8bf7\u8f93\u5165\u4e00\u4e2a\u5927\u4e8e\u6216\u7b49\u4e8e {0} \u7684\u503c\u3002
 mode=\u6a21\u5f0f
 network.rate=\u7f51\u7edc\u901f\u7387