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 2014/11/15 09:59:16 UTC
git commit: updated refs/heads/4.3 to e615f21
Repository: cloudstack
Updated Branches:
refs/heads/4.3 e2fd4ef42 -> e615f218a
Update L10N strings from Transifex to repo (4.3 branch)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e615f218
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e615f218
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e615f218
Branch: refs/heads/4.3
Commit: e615f218a98a499a63c86aedf4cfb55dd3776473
Parents: e2fd4ef
Author: Milamber <mi...@apache.org>
Authored: Sat Nov 15 08:58:51 2014 +0000
Committer: Milamber <mi...@apache.org>
Committed: Sat Nov 15 08:59:10 2014 +0000
----------------------------------------------------------------------
.../classes/resources/messages_de_DE.properties | 266 +++++++++++++++++++
.../classes/resources/messages_es.properties | 1 +
.../classes/resources/messages_fr_FR.properties | 4 +
.../classes/resources/messages_ja_JP.properties | 15 +-
.../classes/resources/messages_ko_KR.properties | 8 +-
.../classes/resources/messages_nl_NL.properties | 1 +
.../classes/resources/messages_pt_BR.properties | 1 +
.../classes/resources/messages_ru_RU.properties | 3 +-
.../classes/resources/messages_zh_CN.properties | 39 +--
9 files changed, 309 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 2a5685c..6b0b099 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,6 +29,11 @@ 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.name=Benutzerkonto-Name
@@ -71,6 +79,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 +171,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 +201,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 +228,30 @@ 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.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 +259,37 @@ 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.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,28 +302,46 @@ 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.disk.size=Benutzerdefinierte Festplattengr\u00f6sse
label.daily=T\u00e4glich
@@ -294,17 +349,31 @@ 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.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.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.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.vpn=VPN deaktivieren
label.disabling.vpn.access=Deaktivierung des VPN Zugangs
label.disk.allocated=Zugeordnete Festplatte
label.disk.offering=Festplatten-Angebot
@@ -315,29 +384,43 @@ 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.tags=Schlagw\u00f6rter bearbeiten
+label.edit.vpc=VPC bearbeiten
label.email=E-Mail
+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=F5
label.failed=Fehlgeschlagen
label.featured=Besonderheiten aufweisen
+label.filterBy=Filtern nach
label.firewall=Firewall
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
@@ -349,15 +432,20 @@ label.go.step.5=Weiter mit Schritt 5
label.group=Gruppe
label.group.optional=Gruppe (optional)
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.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
@@ -365,6 +453,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
@@ -378,6 +469,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
@@ -386,40 +478,82 @@ 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.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.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
@@ -438,6 +572,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
@@ -448,6 +583,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
@@ -465,21 +601,34 @@ label.minimum=Minimum
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=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.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
@@ -493,14 +642,22 @@ 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.owner.account=Eigent\u00fcmerkonto
label.password.enabled=Passwort aktiviert
label.password=Passwort
+label.path=Pfad
label.PING.CIFS.password=PING CIFS Passwort
label.PING.CIFS.username=PING CIFS Benutzername
label.PING.dir=PING-Verzeichnis
@@ -508,37 +665,76 @@ label.PING.storage.IP=IP des externen Speichers anpingen
label.please.wait=Bitte warten
label.pod=Pod
label.pods=Pod
+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.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.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.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.required=Erforderlich
+label.resize.new.size=Neue Gr\u00f6\u00dfe (GB)
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
@@ -549,20 +745,38 @@ 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-view=Ansicht ausw\u00e4hlen
label.sent=Versendet
label.server=Server
label.service.offering=Service-Angebot
label.session.expired=Sitzung abgelaufen
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.source=Quelle
+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
@@ -572,6 +786,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
@@ -580,6 +800,7 @@ 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
@@ -594,11 +815,14 @@ 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
@@ -607,7 +831,10 @@ label.type=Typ
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
@@ -621,7 +848,11 @@ label.vcenter.host=vCenter Host
label.vcenter.password=vCenter Passwort
label.vcenter.username=vCenter Benutzername
label.version=Version
+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=VLAN Reichweite
label.vlan=VLAN
@@ -629,9 +860,13 @@ 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
@@ -640,6 +875,10 @@ label.volume.limits=Volume Grenzen
label.volume.name=Volume Name
label.volumes=Volumes
label.volume=Volume
+label.vpc.id=VPC-Kennung
+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
@@ -650,8 +889,14 @@ label.wednesday=Mittwoch
label.weekly=W\u00f6chentlich
label.welcome=Willkommen
label.yes=Ja
+label.zone.details=Zonendetails
label.zone.id=Zone ID
+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.
@@ -717,6 +962,7 @@ 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=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
@@ -738,6 +984,9 @@ message.installWizard.tooltip.configureGuestTraffic.name=Der Name f\u00fcr das N
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
@@ -747,11 +996,28 @@ 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.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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 50b4271..adedbb6 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -1141,6 +1141,7 @@ message.step.4.continue=Por favor seleccione al menos una red social para contin
message.step.4.desc=Por favor, seleccione la red primaria que la instancia virtual estar\u00c3\u00a1 conectado.
message.update.os.preference=Por favor seleccione un sistema operativo de preferencia para este equipo. Todas las instancias virtuales con preferencias similares ser\u00c3\u00a1n los primeros asignados a este equipo antes de elegir otro.
message.update.resource.count=Por favor confirme que usted quiere actualizar los conteos para esta cuenta
+message.update.ssl=Por favor, env\u00c3\u00ade una nueva X.509 compatible con certificado SSL que se actualizar\u00c3\u00a1 a cada instancia virtual de la consola del servidor proxy\:
message.validate.invalid.characters=Se han hallado caracteres no v\u00e1lidos. Por favor, corr\u00edjalos.
message.virtual.network.desc=Una red dedicada virtualizados para su cuenta. El dominio de difusi\u00c3\u00b3n est\u00c3\u00a1 contenida dentro de una VLAN y todos los acceso a la red p\u00c3\u00bablica se encamina a cabo por un router virtual.
message.vm.create.template.confirm=Crear plantilla de la m\u00c3\u00a1quina virtual se reiniciar\u00c3\u00a1 autom\u00c3\u00a1ticamente.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 65bbab4..47f05ed 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -944,11 +944,13 @@ label.rbd=RBD
label.rbd.secret=Secret Cephx
label.reboot=Red\u00e9marrer
label.recent.errors=Erreurs r\u00e9centes
+label.recover.vm=Restaurer VM
label.redundant.router.capability=Router redondant
label.redundant.router=Routeur redondant
label.redundant.state=\u00c9tat de la redondance
label.refresh=Actualiser
label.region=R\u00e9gion
+label.reinstall.vm=R\u00e9-installer VM
label.related=Connexes
label.remind.later=Rappeler moi plus tard
label.remove.ACL=Supprimer une r\u00e8gle ACL
@@ -1520,7 +1522,9 @@ message.please.wait.while.zone.is.being.created=Patienter pendant la cr\u00e9ati
message.project.invite.sent=Invitation envoy\u00e9e ; les utilisateurs seront ajout\u00e9s apr\u00e8s acceptation de l\\'invitation
message.public.traffic.in.advanced.zone=Le trafic public est g\u00e9n\u00e9r\u00e9 lorsque les machines virtuelles dans le nuage acc\u00e8dent \u00e0 Internet. Des adresses IP publiquement accessibles doivent \u00eatre pr\u00e9vues \u00e0 cet effet. Les utilisateurs peuvent utiliser l\\'interface d\\'administration de CloudStack pour acqu\u00e9rir ces adresses IP qui impl\u00e9menteront une translation d\\'adresse NAT entre le r\u00e9seau d\\'invit\u00e9 et le r\u00e9seau public.<br/><br/>Fournir au moins une plage d\\'adresses IP pour le trafic Internet.
message.public.traffic.in.basic.zone=Le trafic public est g\u00e9n\u00e9r\u00e9 lorsque les machines virtuelles dans le nuage acc\u00e8dent \u00e0 Internet ou fournissent des services \u00e0 des utilisateurs sur Internet. Des adresses IP publiquement accessibles doivent \u00eatre pr\u00e9vus \u00e0 cet effet. Quand une instance est cr\u00e9\u00e9e, une adresse IP publique depuis un ensemble d\\'adresses IP publiques sera allou\u00e9e \u00e0 l\\'instance, en plus de l\\'adresse IP de l\\'invit\u00e9. La translation d\\'adresses statique NAT 1-1 sera mises en place automatiquement entre l\\'adresse IP publique et l\\'adresse IP de l\\'invit\u00e9. Les utilisateurs peuvent \u00e9galement utiliser l\\'interface d\\'administration CloudStack pour acqu\u00e9rir des adresses IP suppl\u00e9mentaires pour ajouter une translation d\\'adresse statique NAT entre leurs instances et le r\u00e9seau d\\'adresses IP publiques.
+message.recover.vm=Confirmer la restauration de cette VM.
message.redirecting.region=Redirection vers r\u00e9gion...
+message.reinstall.vm=NOTE\: Proc\u00e9dez avec prudence. Cela entra\u00eenera la r\u00e9-installation de la VM \u00e0 partir du mod\u00e8le; les donn\u00e9es sur le disque ROOT seront perdues. Les volumes de donn\u00e9es suppl\u00e9mentaires, le cas \u00e9ch\u00e9ant, ne seront pas touch\u00e9s.
message.remove.ldap=Supprimer la configuration LDAP ?
message.remove.region=Confirmer que vous souhaitez supprimer cette r\u00e9gion depuis ce serveur d\\'administration ?
message.remove.vpc=Confirmer la suppression du VPC
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 a71052c..d3de778 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -293,7 +293,7 @@ label.add.physical.network=\u7269\u7406\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306
label.add.pod=\u30dd\u30c3\u30c9\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
@@ -763,7 +763,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
@@ -948,7 +948,7 @@ label.redundant.router.capability=\u5197\u9577\u30eb\u30fc\u30bf\u30fc\u6a5f\u80
label.redundant.router=\u5197\u9577\u30eb\u30fc\u30bf\u30fc
label.redundant.state=\u5197\u9577\u72b6\u614b
label.refresh=\u66f4\u65b0
-label.region=\u9818\u57df
+label.region=\u30ea\u30fc\u30b8\u30e7\u30f3
label.related=\u95a2\u9023
label.remind.later=\u30a2\u30e9\u30fc\u30e0\u3092\u8868\u793a\u3059\u308b
label.remove.ACL=ACL \u306e\u524a\u9664
@@ -959,7 +959,7 @@ label.remove.ip.range=IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u524a\
label.remove.ldap=LDAP \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
@@ -1358,7 +1358,7 @@ message.add.pod.during.zone.creation=\u5404\u30be\u30fc\u30f3\u306b\u306f 1 \u30
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
@@ -1520,9 +1520,9 @@ message.please.wait.while.zone.is.being.created=\u30be\u30fc\u30f3\u304c\u4f5c\u
message.project.invite.sent=\u30e6\u30fc\u30b6\u30fc\u306b\u62db\u5f85\u72b6\u304c\u9001\u4fe1\u3055\u308c\u307e\u3057\u305f\u3002\u30e6\u30fc\u30b6\u30fc\u304c\u62db\u5f85\u3092\u627f\u8afe\u3059\u308b\u3068\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002
message.public.traffic.in.advanced.zone=\u30af\u30e9\u30a6\u30c9\u5185\u306e VM \u304c\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u306b\u30a2\u30af\u30bb\u30b9\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\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\u3053\u308c\u3089\u306e IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3001\u30b2\u30b9\u30c8 \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3068\u30d1\u30d6\u30ea\u30c3\u30af \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u9593\u306b NAT \u3092\u5b9f\u88c5\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<br/><br/>\
u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8 \u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u306e\u305f\u3081\u306b\u3001\u5c11\u306a\u304f\u3068\u3082 1 \u3064 IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
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.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.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=\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
@@ -1567,6 +1567,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.validate.instance.name=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u540d\u306f 63 \u6587\u5b57\u4ee5\u5185\u3067\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002ASCII \u6587\u5b57\u306e a\uff5ez\u3001A\uff5eZ\u3001\u6570\u5b57\u306e 0\uff5e9\u3001\u304a\u3088\u3073\u30cf\u30a4\u30d5\u30f3\u306e\u307f\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002\u6587\u5b57\u3067\u59cb\u307e\u308a\u3001\u6587\u5b57\u307e\u305f\u306f\u6570\u5b57\u3067\u7d42\u308f\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
message.validate.invalid.characters=\u7121\u52b9\u306a\u6587\u5b57\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u4fee\u6574\u3057\u3066\u304f\u3060\u3055\u3044\u3002
message.virtual.network.desc=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u5c02\u7528\u4eee\u60f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3067\u3059\u3002\u30d6\u30ed\u30fc\u30c9\u30ad\u30e3\u30b9\u30c8 \u30c9\u30e1\u30a4\u30f3\u306f VLAN \u5185\u306b\u914d\u7f6e\u3055\u308c\u3001\u30d1\u30d6\u30ea\u30c3\u30af \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306f\u3059\u3079\u3066\u4eee\u60f3\u30eb\u30fc\u30bf\u30fc\u306b\u3088\u3063\u3066\u30eb\u30fc\u30c6\u30a3\u30f3\u30b0\u3055\u308c\u307e\u3059\u3002
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 e198307..612aecc 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
@@ -231,9 +232,9 @@ label.action.update.OS.preference=OS \uae30\ubcf8 \uc124\uc815 \uc5c5\ub370\uc77
label.action.update.OS.preference.processing=OS \uae30\ubcf8 \uc124\uc815\uc744 \uc5c5\ub370\uc774\ud2b8\ud558\ub294 \uc911...
label.action.update.resource.count.processing=\uc790\uc6d0 \uc218\ub97c \uc5c5\ub370\uc774\ud2b8\ud558\ub294 \uc911...
label.action.update.resource.count=\uc790\uc6d0 \uc218 \uc5c5\ub370\uc774\ud2b8
-label.action.vmsnapshot.create=VM \uc2a4
-label.action.vmsnapshot.delete=VM
-label.action.vmsnapshot.revert=VM \uc2a4\ub0c5\uc0f7
+label.action.vmsnapshot.create=\uc2a4\ub0c5\uc0f7 \ub9cc\ub4e4\uae30
+label.action.vmsnapshot.delete=VM \uc2a4\ub0c5\uc0f7 \uc0ad\uc81c
+label.action.vmsnapshot.revert=VM \uc2a4\ub0c5\uc0f7 \uc73c\ub85c \ubcf5\uadc0
label.activate.project=\ud504\ub85c\uc81d\ud2b8 \ud65c\uc131\ud654
label.active.sessions=\ud65c\uc131 \uc138\uc158
label.add.accounts.to=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00\:
@@ -1430,6 +1431,7 @@ message.tooltip.reserved.system.netmask=Pod \uc11c\ube0c\ub124\ud2b8\uc6cc\ud06c
message.tooltip.zone.name=Zone \uc774\ub984\uc785\ub2c8\ub2e4.
message.update.os.preference=\ud604\uc7ac \ud638\uc2a4\ud2b8 OS \uae30\ubcf8 \uc124\uc815\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624.\uac19\uc740 \uae30\ubcf8 \uc124\uc815\uc744 \uac00\uc9c0\ub294 \ubaa8\ub4e0 \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\ub294 \ub2e4\ub978 \ud638\uc2a4\ud2b8\ub97c \uc120\ud0dd\ud558\uae30 \uc804\uc5d0 \uc6b0\uc120\uc774 \ud638\uc2a4\ud2b8\uac00 \ud560\ub2f9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
message.update.resource.count=\ud604\uc7ac \uacc4\uc815 \uc815\ubcf4 \uc790\uc6d0\uc218\ub97c \uc5c5\ub370\uc774\ud2b8\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
+message.update.ssl=\uac01 \ucf58\uc194 \ud504\ub85d\uc2dc \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\ub85c \uc5c5\ub370\uc774\ud2b8\ud558\ub294 X.509 \uae30\ubc18 \uc0c8 SSL \uc778\uc99d\uc11c\ub97c \uc804\uc1a1\ud574 \uc8fc\uc2ed\uc2dc\uc624\:
message.validate.instance.name=\uc778\uc2a4\ud134\uc2a4\uba85\uc740 63 \ubb38\uc790 \uc774\ub0b4\uc5d0\uc11c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. ASCII \ubb38\uc790\uc758 a-z, A-Z, \uc22b\uc790\uc758 0-9 \ubc0f \ud558\uc774\ud508\ub9cc\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ubb38\uc790\ub85c \uc2dc\uc791\ud558\uc5ec \ubb38\uc790 \ub610\ub294 \uc22b\uc790\ub85c \ub05d\ub0b4\uc57c \ud569\ub2c8\ub2e4.
message.virtual.network.desc=\uacc4\uc815 \uc815\ubcf4 \uc804\uc6a9 \uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c\uc785\ub2c8\ub2e4. \ube0c\ub85c\ub4dc\uce90\uc2a4\ud2b8 \ub3c4\uba54\uc778\uc740 VLAN \ub0b4\uc5d0 \ubc30\uce58\ub418\uc5b4 \uacf5\uac1c \ub124\ud2b8\uc6cc\ud06c\uc5d0 \uc811\uadfc\ub294 \ubaa8\ub450 \uac00\uc0c1 \ub77c\uc6b0\ud130\uc5d0 \ud574\uc11c \ub8e8\ud305 \ub429\ub2c8\ub2e4.
message.vm.create.template.confirm=\ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30\ud558\uba74 VM\uc774 \uc790\ub3d9\uc73c\ub85c \uc7ac\uc2dc\uc791\ub429\ub2c8\ub2e4.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 4d0c328..2a74419 100644
--- a/client/WEB-INF/classes/resources/messages_nl_NL.properties
+++ b/client/WEB-INF/classes/resources/messages_nl_NL.properties
@@ -1567,6 +1567,7 @@ message.tooltip.reserved.system.netmask=De netwerk prefix dat het pod subnet def
message.tooltip.zone.name=Een naam voor de zone.
message.update.os.preference=Selecteer een OS voorkeur voor deze host. Alle virtueel instanties van gelijke voorkeur zullen eerst op deze machine gealloceerd worden voordat er gekeken wordt naar andere hosts.
message.update.resource.count=Bevestig dat u de verbruiksstatistieken voor deze account wilt bijwerken.
+message.update.ssl=Geef een nieuw X.509 compliant SSL certificaat in waarmee elke console proxy en secundaire opslag instantie mee geupdate kunnen worden\:
message.validate.instance.name=Namen van instantie kunnen niet langer zijn dan 63 karakters. Alleen ASCII letters a~z, A~Z, cijfers 0~9 zijn toegestaan. Moet beginnen met een letter en mag eindigen met een letter of cijfer.
message.validate.invalid.characters=Niet toegestane karakters gevonden, corrigeer deze.
message.virtual.network.desc=Een dedicated gevirtualiseerd netwerk voor uw account. Het broadcast domein is ingesloten binnen een VLAN en toegang naar het publieke netwerk wordt gerouteerd door een virtueele router.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 5d8205a..3dec451 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -1567,6 +1567,7 @@ message.tooltip.reserved.system.netmask=O prefixo de rede que define a subrede d
message.tooltip.zone.name=Um nome para a zona.
message.update.os.preference=Escolha o SO de preferencia para este host. Todas Inst\u00e2ncias com preferencias similares ser\u00e3o alocadas neste host antes de tentar em outro.
message.update.resource.count=Por favor confirme que voc\u00ea quer atualizar a contagem de recursos para esta conta.
+message.update.ssl=Envie o novo certificado SSL X.509 para ser atualizado em cada console proxy\:
message.validate.instance.name=Nomes de inst\u00e2ncias n\u00e3o podem ter mais de 63 caracteres. Somente letras ASCII a~z, A~Z, d\u00edgitos 0~9 e h\u00edfen s\u00e3o permitidos. Deve come\u00e7ar com uma letra e terminar com uma letra ou d\u00edgito.
message.validate.invalid.characters=Caracteres inv\u00e1lidos encontrados, por favor corrija.
message.virtual.network.desc=Rede virtual dedicado para sua conta. O Dom\u00ednio de broadcast Est\u00e1 na VLAN e todo acesso a internet \u00e9 roteado atrav\u00e9s do virtual router.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 8732a6a..1dc4029 100644
--- a/client/WEB-INF/classes/resources/messages_ru_RU.properties
+++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties
@@ -21,7 +21,7 @@ confirm.enable.swift=\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u04
error.could.not.enable.zone=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u043e\u043d\u0443
error.installWizard.message=\u0427\u0442\u043e-\u0442\u043e \u043d\u0435 \u0442\u0430\u043a. \u0412\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c \u043d\u0430\u0437\u0430\u0434 \u0438 \u0438\u0441\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043e\u0448\u0438\u0431\u043a\u0438.
error.invalid.username.password=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0456\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c
-error.login=\u0412\u0430\u0448\u0435 \u0438\u043c\u044f/\u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0435\u0442 \u0441 \u0432\u0430\u0448\u0438\u043c\u0438 \u0437\u0430\u043f\u0438\u0441\u044f\u043c\u0438.
+error.login=\u0412\u0430\u0448\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0442 \u043d\u0430\u0448\u0438\u043c \u0437\u0430\u043f\u0438\u0441\u044f\u043c.
error.menu.select=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0438\u0437-\u0437\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u044f \u0432\u044b\u0431\u0440\u0430\u043d\u044b\u0445 \u043f\u0443\u043d\u043a\u0442\u043e\u0432.
error.mgmt.server.inaccessible=\u0421\u0435\u0440\u0432\u0435\u0440 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043e\u0431\u0440\u0430\u0442\u0438\u0442\u044c\u0441\u044f \u043a \u043d\u0435\u043c\u0443 \u043f\u043e\u0437\u0436\u0435.
error.password.not.match=\u041f\u0430\u0440\u043e\u043b\u0438 \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442
@@ -1519,6 +1519,7 @@ message.tooltip.reserved.system.netmask=\u041f\u0440\u0435\u0444\u0438\u043a\u04
message.tooltip.zone.name=\u0418\u043c\u044f \u0434\u043b\u044f \u0437\u043e\u043d\u044b
message.update.os.preference=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u041e\u0421 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u0445\u043e\u0441\u0442\u0430. \u0412\u0441\u0435 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u044b \u0441 \u0430\u043d\u0430\u043b\u043e\u0433\u0438\u0447\u043d\u044b\u043c\u0438 \u043f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0435\u043d\u0438\u044f\u043c\u0438 \u0432\u043f\u0435\u0440\u0432\u044b\u0435 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043e \u043d\u0430 \u044d\u0442\u043e\u0442 \u0443\u0437\u0435\u043b, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u0432\u044b\u0431\u0440\u0430\u0442\u044c \u0434\u0440\u0443\u0433\u0443\u044e.
message.update.resource.count=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0447\u0435\u0442\u0447\u0438\u043a \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u0430.
+message.update.ssl=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0442\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u044b\u0439 X.509 SSL \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 \u0434\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0439 \u043a\u043e\u043d\u0441\u043e\u043b\u0438 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043f\u0440\u043e\u043a\u0441\u0438, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440\:
message.validate.instance.name=\u0418\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0434\u043b\u0438\u043d\u0435\u0435 63 \u0441\u0438\u043c\u0432\u043e\u043b\u0430. \u0422\u043e\u043b\u044c\u043a\u043e ASCII, \u0431\u0443\u043a\u0432\u044b a~z, A~Z, \u0446\u044b\u0444\u0440\u044b 0~9, \u0434\u0435\u0444\u0438\u0441 \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f. \u0414\u043e\u043b\u0436\u043d\u0430 \u043d\u0430\u0447\u0438\u043d\u0430\u0442\u044c\u0441\u044f \u0441 \u0431\u0443\u043a\u0432\u044b \u0438 \u0437\u0430\u043a\u0430\u043d\u0447\u0438\u0432\u0430\u0442\u044c\u0441\u044f \u0431\u0443\u043a\u0432\u043e\u0439 \u0438\u043b\u0438 \u0446\u0438\u0444\u0440\u043e\u0439.
message.validate.invalid.characters=\u041d\u0430\u0439\u0434\u0435\u043d\u044b \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b; \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u043f\u0440\u0430\u0432\u044c\u0442\u0435.
message.virtual.network.desc=\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u0439 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0439 \u0441\u0435\u0442\u0438 \u0434\u043b\u044f \u0432\u0430\u0448\u0435\u0439 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438. \u0428\u0438\u0440\u043e\u043a\u043e\u0432\u0435\u0449\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u043c\u0435\u043d \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432\u043d\u0443\u0442\u0440\u0438 VLAN \u0438 \u0432\u0435\u0441\u044c \u0432\u043d\u0435\u0448\u043d\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0441\u0435\u0442\u0438 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043f\u0443\u0442\u0435\u043c \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0433\u043e \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440\u0430.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e615f218/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 300efff..74384f2 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -16,13 +16,14 @@
# under the License.
changed.item.properties=\u66f4\u6539\u9879\u76ee\u5c5e\u6027
-confirm.enable.s3=\u8bf7\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u542f\u7528\u5bf9 S3 \u652f\u6301\u7684\u8f85\u52a9\u5b58\u50a8\u7684\u652f\u6301
+confirm.enable.s3=\u8bf7\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u542f\u7528\u652f\u6301 S3\u7684\u8f85\u52a9\u5b58\u50a8
confirm.enable.swift=\u8bf7\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u542f\u7528\u5bf9 SWIFT \u7684\u652f\u6301
+error.could.not.change.your.password.because.ldap.is.enabled=\u9519\u8bef\uff0c\u7531\u4e8e\u5f00\u542fLDAP\uff0c\u4e0d\u80fd\u66f4\u6539\u4f60\u7684\u5bc6\u7801\u3002
error.could.not.enable.zone=\u65e0\u6cd5\u542f\u7528\u533a\u57df
error.installWizard.message=\u51fa\u73b0\u95ee\u9898\uff1b\u8bf7\u8fd4\u56de\u5e76\u66f4\u6b63\u4efb\u4f55\u9519\u8bef
error.invalid.username.password=\u7528\u6237\u540d\u6216\u5bc6\u7801\u65e0\u6548
error.login=\u60a8\u7684\u7528\u6237\u540d/\u5bc6\u7801\u4e0e\u6211\u4eec\u7684\u8bb0\u5f55\u4e0d\u4e00\u81f4\u3002
-error.menu.select=\u6b63\u5728\u9009\u62e9\u9879\u76ee\uff0c\u65e0\u6cd5\u6267\u884c\u64cd\u4f5c\u3002
+error.menu.select=\u8bf7\u9009\u62e9\u9879\u76ee\uff0c\u5426\u5219\u65e0\u6cd5\u6267\u884c\u64cd\u4f5c\u3002
error.mgmt.server.inaccessible=\u65e0\u6cd5\u8bbf\u95ee\u7ba1\u7406\u670d\u52a1\u5668\u3002\u8bf7\u7a0d\u540e\u518d\u8bd5\u3002
error.password.not.match=\u5bc6\u7801\u5b57\u6bb5\u4e0d\u4e00\u81f4
error.please.specify.physical.network.tags=\u7f51\u7edc\u65b9\u6848\u5728\u60a8\u4e3a\u6b64\u7269\u7406\u7f51\u7edc\u6307\u5b9a\u6807\u7b7e\u4e4b\u540e\u624d\u53ef\u7528\u3002
@@ -31,11 +32,11 @@ error.something.went.wrong.please.correct.the.following=\u51fa\u73b0\u95ee\u9898
error.unable.to.reach.management.server=\u65e0\u6cd5\u8bbf\u95ee\u7ba1\u7406\u670d\u52a1\u5668
error.unresolved.internet.name=\u65e0\u6cd5\u89e3\u6790\u60a8\u7684 Internet \u540d\u79f0\u3002
extractable=\u53ef\u63d0\u53d6
-force.delete.domain.warning=\u8b66\u544a\: \u9009\u62e9\u6b64\u9009\u9879\u5c06\u5bfc\u81f4\u5220\u9664\u6240\u6709\u5b50\u57df\u4ee5\u53ca\u6240\u6709\u76f8\u5173\u8054\u7684\u5e10\u6237\u53ca\u5176\u8d44\u6e90\u3002
+force.delete.domain.warning=\u8b66\u544a\: \u9009\u62e9\u6b64\u9009\u9879\u5c06\u5220\u9664\u6240\u6709\u5b50\u57df\u4ee5\u53ca\u6240\u6709\u76f8\u5173\u8054\u7684\u5e10\u6237\u53ca\u5176\u8d44\u6e90\u3002
force.delete=\u5f3a\u5236\u5220\u9664
-force.remove.host.warning=\u8b66\u544a\: \u9009\u62e9\u6b64\u9009\u9879\u5c06\u5bfc\u81f4 CloudStack \u5728\u4ece\u7fa4\u96c6\u4e2d\u79fb\u9664\u6b64\u4e3b\u673a\u4e4b\u524d\uff0c\u5f3a\u5236\u505c\u6b62\u6240\u6709\u6b63\u5728\u8fd0\u884c\u7684\u865a\u62df\u673a\u3002
+force.remove.host.warning=\u8b66\u544a\: \u5982\u679c\u9009\u62e9\u6b64\u9009\u9879\uff0c\u5728\u4ece\u7fa4\u96c6\u4e2d\u79fb\u9664\u6b64\u4e3b\u673a\u4e4b\u524d\uff0cCloudStack \u5c06\u5f3a\u5236\u505c\u6b62\u6240\u6709\u6b63\u5728\u8fd0\u884c\u5728\u6b64\u4e3b\u673a\u4e0a\u7684\u865a\u62df\u673a\u3002
force.remove=\u5f3a\u5236\u79fb\u9664
-force.stop.instance.warning=\u8b66\u544a\: \u9664\u975e\u4e07\u4e0d\u5f97\u5df2\uff0c\u5426\u5219\u4e0d\u5e94\u5f3a\u5236\u505c\u6b62\u6b64\u5b9e\u4f8b\u3002\u505c\u6b62\u6b64\u5b9e\u4f8b\u53ef\u80fd\u4f1a\u5bfc\u81f4\u6570\u636e\u4e22\u5931\u4ee5\u53ca\u81f4\u4f7f\u865a\u62df\u673a\u72b6\u6001\u4e0d\u4e00\u81f4\u3002
+force.stop.instance.warning=\u8b66\u544a\: \u9664\u975e\u4e07\u4e0d\u5f97\u5df2\uff0c\u4e0d\u8981\u4f7f\u7528\u5f3a\u5236\u505c\u6b62\u5b9e\u4f8b\u7684\u529f\u80fd\u3002\u505c\u6b62\u5b9e\u4f8b\u53ef\u80fd\u4f1a\u5bfc\u81f4\u6570\u636e\u4e22\u5931\u4ee5\u53ca\u81f4\u4f7f\u865a\u62df\u673a\u72b6\u6001\u4e0d\u4e00\u81f4\u3002
force.stop=\u5f3a\u5236\u505c\u6b62
ICMP.code=ICMP \u4ee3\u7801
ICMP.type=ICMP \u7c7b\u578b
@@ -292,7 +293,7 @@ label.add.physical.network=\u6dfb\u52a0\u7269\u7406\u7f51\u7edc
label.add.pod=\u6dfb\u52a0\u63d0\u4f9b\u70b9
label.add.port.forwarding.rule=\u6dfb\u52a0\u7aef\u53e3\u8f6c\u53d1\u89c4\u5219
label.add.primary.storage=\u6dfb\u52a0\u4e3b\u5b58\u50a8
-label.add.region=\u6dfb\u52a0\u533a\u57df
+label.add.region=\u6dfb\u52a0\u5730\u57df
label.add.resources=\u6dfb\u52a0\u8d44\u6e90
label.add.route=\u6dfb\u52a0\u8def\u7531
label.add.rule=\u6dfb\u52a0\u89c4\u5219
@@ -308,7 +309,7 @@ label.add.to.group=\u6dfb\u52a0\u5230\u7ec4
label.add=\u6dfb\u52a0
label.add.user=\u6dfb\u52a0\u7528\u6237
label.add.vlan=\u6dfb\u52a0 VLAN
-label.add.vms.to.lb=\u5411\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219\u4e2d\u6dfb\u52a0 VM
+label.add.vms.to.lb=\u5411\u8d1f\u8f7d\u5747\u8861\u671f\u89c4\u5219\u4e2d\u6dfb\u52a0 VM(s)
label.add.vms=\u6dfb\u52a0 VM
label.add.VM.to.tier=\u5411\u5c42\u4e2d\u6dfb\u52a0 VM
label.add.vm=\u6dfb\u52a0 VM
@@ -558,7 +559,7 @@ label.expunge=\u5220\u9664
label.external.link=\u5916\u90e8\u94fe\u63a5
label.f5=F5
label.failed=\u5931\u8d25
-label.featured=\u7cbe\u9009
+label.featured=\u7279\u8272\u7684
label.fetch.latest=\u63d0\u53d6\u6700\u65b0\u5185\u5bb9
label.filterBy=\u8fc7\u6ee4\u4f9d\u636e
label.firewall=\u9632\u706b\u5899
@@ -600,7 +601,7 @@ label.host.tags=\u4e3b\u673a\u6807\u7b7e
label.host=\u4e3b\u673a
label.hourly=\u6bcf\u5c0f\u65f6
label.hypervisor.capabilities=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u529f\u80fd
-label.hypervisor.snapshot.reserve=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u5feb\u7167\u9884\u7559
+label.hypervisor.snapshot.reserve=\u9884\u7559\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u5feb\u7167
label.hypervisors=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f
label.hypervisor.type=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u7c7b\u578b
label.hypervisor=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f
@@ -711,7 +712,7 @@ label.login=\u767b\u5f55
label.logout=\u6ce8\u9500
label.lun=LUN
label.LUN.number=LUN \u53f7
-label.make.project.owner=\u8bbe\u4e3a\u5e10\u6237\u9879\u76ee\u6240\u6709\u8005
+label.make.project.owner=\u8bbe\u5e10\u6237\u4e3a\u9879\u76ee\u6240\u6709\u8005
label.management.ips=\u7ba1\u7406\u7c7b IP \u5730\u5740
label.management=\u7ba1\u7406
label.manage.resources=\u7ba1\u7406\u8d44\u6e90
@@ -748,8 +749,8 @@ label.menu.destroyed.instances=\u5df2\u9500\u6bc1\u7684\u5b9e\u4f8b
label.menu.disk.offerings=\u78c1\u76d8\u65b9\u6848
label.menu.domains=\u57df
label.menu.events=\u4e8b\u4ef6
-label.menu.featured.isos=\u7cbe\u9009 ISO
-label.menu.featured.templates=\u7cbe\u9009\u6a21\u677f
+label.menu.featured.isos=\u7279\u8272 ISO
+label.menu.featured.templates=\u7279\u8272\u6a21\u677f
label.menu.global.settings=\u5168\u5c40\u8bbe\u7f6e
label.menu.infrastructure=\u57fa\u7840\u67b6\u6784
label.menu.instances=\u5b9e\u4f8b
@@ -762,7 +763,7 @@ label.menu.my.templates=\u6211\u7684\u6a21\u677f
label.menu.network.offerings=\u7f51\u7edc\u65b9\u6848
label.menu.network=\u7f51\u7edc
label.menu.physical.resources=\u7269\u7406\u8d44\u6e90
-label.menu.regions=\u533a\u57df
+label.menu.regions=\u5730\u57df
label.menu.running.instances=\u6b63\u5728\u8fd0\u884c\u7684\u5b9e\u4f8b
label.menu.security.groups=\u5b89\u5168\u7ec4
label.menu.service.offerings=\u670d\u52a1\u65b9\u6848
@@ -947,7 +948,7 @@ 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=\u5237\u65b0
-label.region=\u533a\u57df
+label.region=\u5730\u57df
label.related=\u76f8\u5173\u8054
label.remind.later=\u4ee5\u540e\u63d0\u9192\u6211
label.remove.ACL=\u5220\u9664 ACL
@@ -958,7 +959,7 @@ label.remove.ip.range=\u5220\u9664 IP \u8303\u56f4
label.remove.ldap=\u5220\u9664 LDAP
label.remove.pf=\u5220\u9664\u7aef\u53e3\u8f6c\u53d1\u89c4\u5219
label.remove.project.account=\u4ece\u9879\u76ee\u4e2d\u5220\u9664\u5e10\u6237
-label.remove.region=\u79fb\u9664\u533a\u57df
+label.remove.region=\u79fb\u9664\u5730\u57df
label.remove.rule=\u5220\u9664\u89c4\u5219
label.remove.static.nat.rule=\u5220\u9664\u9759\u6001 NAT \u89c4\u5219
label.remove.static.route=\u5220\u9664\u9759\u6001\u8def\u7531
@@ -1056,6 +1057,7 @@ label.snapshot.schedule=\u8bbe\u7f6e\u91cd\u73b0\u5feb\u7167
label.snapshot.s=\u5feb\u7167
label.snapshots=\u5feb\u7167
label.snapshot=\u5feb\u7167
+label.sockets=CPU \u63d2\u69fd\u6570\u91cf
label.source.nat=\u6e90 NAT
label.source=\u6e90\u7b97\u6cd5
label.specify.IP.ranges=\u6307\u5b9a IP \u8303\u56f4
@@ -1356,7 +1358,7 @@ message.add.pod.during.zone.creation=\u6bcf\u4e2a\u533a\u57df\u4e2d\u5fc5\u987b\
message.add.pod=\u4e3a\u533a\u57df <b><span id\="add_pod_zone_name"></span></b> \u6dfb\u52a0\u4e00\u4e2a\u65b0\u63d0\u4f9b\u70b9
message.add.primary.storage=\u4e3a\u533a\u57df <b><span id\="add_pod_zone_name"></span></b>\u3001\u63d0\u4f9b\u70b9 <b><span id\="pod_name"></span></b> \u6dfb\u52a0\u4e00\u4e2a\u65b0\u4e3b\u5b58\u50a8
message.add.primary=\u8bf7\u6307\u5b9a\u4ee5\u4e0b\u53c2\u6570\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u4e3b\u5b58\u50a8
-message.add.region=\u8bf7\u6307\u5b9a\u6dfb\u52a0\u65b0\u533a\u57df\u6240\u9700\u7684\u4fe1\u606f\u3002
+message.add.region=\u8bf7\u6307\u5b9a\u6dfb\u52a0\u65b0\u5730\u57df\u6240\u9700\u7684\u4fe1\u606f\u3002
message.add.secondary.storage=\u4e3a\u533a\u57df <b><span id\="zone_name"></span></b> \u6dfb\u52a0\u4e00\u4e2a\u65b0\u5b58\u50a8
message.add.service.offering=\u8bf7\u586b\u5199\u4ee5\u4e0b\u6570\u636e\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u8ba1\u7b97\u65b9\u6848\u3002
message.add.system.service.offering=\u8bf7\u586b\u5199\u4ee5\u4e0b\u6570\u636e\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u7cfb\u7edf\u670d\u52a1\u65b9\u6848\u3002
@@ -1518,9 +1520,9 @@ message.please.wait.while.zone.is.being.created=\u6b63\u5728\u521b\u5efa\u533a\u
message.project.invite.sent=\u53d1\u9001\u7ed9\u7528\u6237\u7684\u9080\u8bf7\uff1b\u7528\u6237\u63a5\u53d7\u9080\u8bf7\u540e\uff0c\u5c06\u52a0\u5165\u5230\u9879\u76ee\u4e2d
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.redirecting.region=\u6b63\u5728\u91cd\u5b9a\u5411\u5230\u533a\u57df...
+message.redirecting.region=\u6b63\u5728\u91cd\u5b9a\u5411\u5230\u5730\u57df...
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.region=\u662f\u5426\u786e\u5b9e\u8981\u4ece\u6b64\u7ba1\u7406\u670d\u52a1\u5668\u4e2d\u5220\u9664\u6b64\u5730\u57df?
message.remove.vpc=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 VPC
message.remove.vpn.access=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u4ee5\u4e0b\u7528\u6237\u7684 VPN \u8bbf\u95ee\u3002
message.reset.password.warning.notPasswordEnabled=\u521b\u5efa\u6b64\u5b9e\u4f8b\u7684\u6a21\u677f\u65f6\u672a\u542f\u7528\u5bc6\u7801
@@ -1565,6 +1567,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.validate.instance.name=\u5b9e\u4f8b\u540d\u79f0\u4e0d\u5f97\u8d85\u8fc7 63 \u4e2a\u5b57\u7b26\u3002\u4ec5\u5141\u8bb8\u4f7f\u7528 ASCII \u5b57\u6bcd a - z \u6216 A - Z\u3001\u6570\u5b57 0 - 9 \u4ee5\u53ca\u8fde\u5b57\u7b26\u3002\u5b9e\u4f8b\u540d\u79f0\u5fc5\u987b\u4ee5\u5b57\u6bcd\u5f00\u5934\u5e76\u4ee5\u5b57\u6bcd\u6216\u6570\u5b57\u7ed3\u675f\u3002
message.validate.invalid.characters=\u67e5\u627e\u5230\u65e0\u6548\u5b57\u7b26\uff0c\u8bf7\u66f4\u6b63\u3002
message.virtual.network.desc=\u60a8\u7684\u5e10\u6237\u7684\u4e13\u7528\u865a\u62df\u7f51\u7edc\u3002\u5e7f\u64ad\u57df\u5305\u542b\u5728 VLAN \u4e2d\uff0c\u5e76\u4e14\u6240\u6709\u516c\u7528\u7f51\u7edc\u8bbf\u95ee\u90fd\u7531\u865a\u62df\u8def\u7531\u5668\u8def\u7531\u51fa\u53bb\u3002