cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/4] git commit: updated refs/heads/master to 559fc61
Date Tue, 28 Feb 2017 11:58:56 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master e3c25b6f4 -> 559fc612d


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/fr_FR.js
----------------------------------------------------------------------
diff --git a/ui/l10n/fr_FR.js b/ui/l10n/fr_FR.js
index 57b2cb6..18b5b43 100644
--- a/ui/l10n/fr_FR.js
+++ b/ui/l10n/fr_FR.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Accueil",
     "label.host": "Hôte",
     "label.host.MAC": "Adresse MAC hôte",
-    "label.host.alerts": "Alertes des hôtes",
+    "label.host.alerts": "Hôtes en état d'Alerte",
     "label.host.name": "Nom d'hôte",
     "label.host.tag": "Etiquette hôte",
     "label.host.tags": "Étiquettes d'hôte",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Services supportés",
     "label.supported.source.NAT.type": "Type de NAT supporté",
     "label.supportsstrechedl2subnet": "Sous-réseau Streched L2 supporté",
+    "label.supportspublicaccess": "Accès publiques activés",
     "label.suspend.project": "Suspendre projet",
     "label.switch.type": "Type commutateur",
     "label.system.capacity": "Capacité système",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Arrêter cette VM ?",
     "message.action.take.snapshot": "Confirmer la prise d'un instantané pour ce volume.",
     "message.action.unmanage.cluster": "Confirmez que vous ne voulez plus gérer le cluster",
+    "message.action.vmsnapshot.create": "Veuillez confirmer que vous souhaitez prendre un
instantané de cette instance. <br>Notez que l'instance sera mise en pause durant la
prise de l'instantané puis remise en route une fois terminée, si elle fonctionne sur KVM.",
     "message.action.vmsnapshot.delete": "Confirmez que vous souhaitez supprimer cet instantané
VM.",
     "message.action.vmsnapshot.revert": "Rétablir l'instantané VM",
     "message.activate.project": "Voulez-vous activer ce projet ?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "État d'alerte détecté",
     "message.allow.vpn.access": "Entrez un identifiant et un mot de passe pour l'utilisateur
que vous souhaitez autoriser à utiliser l'accès VPN.",
     "message.apply.snapshot.policy": "Vous avez mis à jour votre politique d'instantanés
avec succès.",
+    "message.assign.instance.another": "Veuillez spécifier le type de compte, domaine, nom
de compte et réseau (optionnel) pour le nouveau compte. <br> Si l'interface par défaut
de la machine virtuelle est sur un réseau partagé, CloudStack va vérifier si le réseau
peut être utilisé par le nouveau compte si vous n'avez pas spécifier de réseau. <br>
Si l'interface par défaut de la machine virtuelle est sur un réseau isolé, et que le nouveau
compte a plus d'un réseau isolé, vous devez en spécifier un.",
     "message.attach.iso.confirm": "Attacher l'image ISO à cette instance ?",
     "message.attach.volume": "Renseignez les données suivantes pour attacher un nouveau
volume. Si vous attachez un volume disque à une machine virtuelle sous Windows, vous aurez
besoin de redémarrer l'instance pour voir le nouveau disque.",
     "message.basic.mode.desc": "Choisissez ce modèle de réseau si vous  <b>*<u>ne
voulez pas</u>*</b> activer le support des VLANs. Toutes les instances créées
avec ce modèle de réseau se verront assigner une adresse IP et les groupes de sécurité
seront utilisés pour fournir l'isolation entre les VMs.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Confirmer l'activation de ce fournisseur",
     "message.confirm.enable.vnmc.provider": "Confirmer l'activation du fournisseur VNMC.",
     "message.confirm.enable.vpc.offering": "Voulez-vous activer cette offre VPC ?",
+    "message.confirm.force.update": "Voulez-vous forcer la mise à jour ?",
     "message.confirm.join.project": "Rejoindre ce projet ?",
     "message.confirm.migrate.volume": "Confirmer la migration de ce volume ?",
     "message.confirm.refresh.blades": "Confirmer que vous voulez rafraîchr les lames.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/hu.js
----------------------------------------------------------------------
diff --git a/ui/l10n/hu.js b/ui/l10n/hu.js
index c24d024..4583d40 100644
--- a/ui/l10n/hu.js
+++ b/ui/l10n/hu.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Kezdőlap",
     "label.host": "Kiszolgáló",
     "label.host.MAC": "Kiszolgáló MAC",
-    "label.host.alerts": "Kiszolgáló riasztások",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "Kiszolgáló név",
     "label.host.tag": "Kiszolgáló címke",
     "label.host.tags": "Kiszolgáló címkék",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Támogatott szolgáltatások",
     "label.supported.source.NAT.type": "Támogatott forrás NAT típus",
     "label.supportsstrechedl2subnet": "Supports Streched L2 Subnet",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "Projekt felfüggesztése",
     "label.switch.type": "Switch típus",
     "label.system.capacity": "Rendszer kapacítás",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Erősítsd meg, hogy le akarod állítani ezt a rendszer
VM-et!",
     "message.action.take.snapshot": "Erősítsd meg, hogy pillanatfelvételt kérsz erről
a kötetről!",
     "message.action.unmanage.cluster": "Erősítsd meg, hogy megszakítod a fürt vezérlését!",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Erősítsd meg, hogy törölni akarod ezt a VM pillanatfelvételt!",
     "message.action.vmsnapshot.revert": "Revert VM snapshot",
     "message.activate.project": "Biztosan aktiválni szeretnéd ezt a projektet?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "Alert state detected",
     "message.allow.vpn.access": "Add meg a VPN felhasználó nevét és jelszavát",
     "message.apply.snapshot.policy": "Sikeresen módosítottad a jelenlegi pillanatfelvétel
szabályzatodat!",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "Erősítsd meg, hogy az ISO-t ehhez a virtuális géphez
akarod csatolni!",
     "message.attach.volume": "Töltsd ki a következő adatokat a kötet csatlakoztatásához!
Ha Windows-alapú virtuális géphez csatlakoztatsz merevlemezt, akkor újra kell indítanod
a példányt ahhoz, hogy lásd a merevlemezt.",
     "message.basic.mode.desc": "Akkor válaszd ezt a hálózati modellt, ha <b>*<u>nem</u>*</b>
akarsz VLAN támogatást bekapcsolni.  Ezen a hálózaton minden példány közvetlenül a
hálózattól kap IP címet és a biztonsági csoportok szolgáltatnak biztonságot és szegregációt.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Erősítsd meg, hogy be szeretnéd kapcsolni ezt
a szolgáltatót",
     "message.confirm.enable.vnmc.provider": "Erősítsd meg, hogy be szeretnéd kapcsolni
a VNMC szolgáltatót!",
     "message.confirm.enable.vpc.offering": "Biztos vagy abban, hogy be akarod kapcsolni ezt
a VPC ajánlatot?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "Erősítsd meg, hogy csatlakozni szeretnél a projekthez",
     "message.confirm.migrate.volume": "El akarod költöztetni ezt a kötetet?",
     "message.confirm.refresh.blades": "Please confirm that you want to refresh blades.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/it_IT.js
----------------------------------------------------------------------
diff --git a/ui/l10n/it_IT.js b/ui/l10n/it_IT.js
index c8341e1..7b0c7f5 100644
--- a/ui/l10n/it_IT.js
+++ b/ui/l10n/it_IT.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Home",
     "label.host": "Host",
     "label.host.MAC": "MAC del sistema host",
-    "label.host.alerts": "Host Alerts",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "Host Name",
     "label.host.tag": "Host Tag",
     "label.host.tags": "Host Tags",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Servizi Supportati",
     "label.supported.source.NAT.type": "Tipo di Source NAT supportato",
     "label.supportsstrechedl2subnet": "Supports Streched L2 Subnet",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "Sospendere il Progett",
     "label.switch.type": "Switch Type",
     "label.system.capacity": "System Capacity",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Please confirm that you want to stop this system VM.",
     "message.action.take.snapshot": "Please confirm that you want to take a snapshot of this
volume.",
     "message.action.unmanage.cluster": "Please confirm that you want to unmanage the cluster.",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Please confirm that you want to delete this VM snapshot.",
     "message.action.vmsnapshot.revert": "Revert VM snapshot",
     "message.activate.project": "Si è sicuri di voler attivare questo progetto?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "Rilevato uno stato di Alert",
     "message.allow.vpn.access": "Please enter a username and password of the user that you
want to allow VPN access.",
     "message.apply.snapshot.policy": "You have successfully updated your current snapshot
policy.",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "Please confirm that you want to attach the ISO to this
virtual instance.",
     "message.attach.volume": "Please fill in the following data to attach a new volume. If
you are attaching a disk volume to a Windows based virtual machine, you will need to reboot
the instance to see the attached disk.",
     "message.basic.mode.desc": "Choose this network model if you do <b>*<u>not</u>*</b>
want to enable any VLAN support.  All virtual instances created under this network model will
be assigned an IP directly from the network and security groups are used to provide security
and segregation.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Si prega di confermare di voler abilitare questo
provider",
     "message.confirm.enable.vnmc.provider": "Please confirm you would like to enable the
VNMC provider.",
     "message.confirm.enable.vpc.offering": "Are you sure you want to enable this VPC offering?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "Si prega di confermare di volersi unire a questo progetto.",
     "message.confirm.migrate.volume": "Do you want to migrate this volume?",
     "message.confirm.refresh.blades": "Please confirm that you want to refresh blades.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/ja_JP.js
----------------------------------------------------------------------
diff --git a/ui/l10n/ja_JP.js b/ui/l10n/ja_JP.js
index dbab6c3..9dec16f 100644
--- a/ui/l10n/ja_JP.js
+++ b/ui/l10n/ja_JP.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "ホーム",
     "label.host": "ホスト",
     "label.host.MAC": "ホストの MAC",
-    "label.host.alerts": "ホスト アラート",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "ホスト名",
     "label.host.tag": "ホストタグ",
     "label.host.tags": "ホスト タグ",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "サポートされるサービス",
     "label.supported.source.NAT.type": "サポートされる送信元 NAT の種類",
     "label.supportsstrechedl2subnet": "ストレッチ L2 サブネットをサポートする",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "プロジェクトの一時停止",
     "label.switch.type": "スイッチの種類",
     "label.system.capacity": "システムの処理能力",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "このシステム VM を停止してもよろしいですか?",
     "message.action.take.snapshot": "このボリュームのスナップショットを作成してもよろしいですか?",
     "message.action.unmanage.cluster": "クラスターを非管理対象にしてもよろしいですか?",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "この VM スナップショットを削除してもよろしいですか?",
     "message.action.vmsnapshot.revert": "VM スナップショットを元に戻す",
     "message.activate.project": "このプロジェクトをアクティブにしてもよろしいですか?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "アラート状態が検出されました",
     "message.allow.vpn.access": "VPN アクセスを許可するユーザーのユーザー名とパスワードを入力してください。",
     "message.apply.snapshot.policy": "現在のスナップショット ポリシーを更新しました。",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "この仮想インスタンスに ISO ファイルをアタッチしてもよろしいですか?",
     "message.attach.volume": "新しいボリュームをアタッチするために、次のデータを入力してください。Windows
ベースの仮想マシンにディスク ボリュームをアタッチする場合は、アタッチしたディスクを認識するためにインスタンスを再起動する必要があります。",
     "message.basic.mode.desc": "VLAN サポートが<b><u>不要である</u></b>場合は、このネットワーク
モデルを選択してください。このネットワーク モデルで作成されるすべての仮想インスタンスにネットワークから直接
IP アドレスが割り当てられ、セキュリティ グループを使用してセキュリティと分離が提供されます。",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "このプロバイダーを有効にしてもよろしいですか?",
     "message.confirm.enable.vnmc.provider": "VNMC プロバイダーを有効にしてもよろしいですか?",
     "message.confirm.enable.vpc.offering": "この VPC オファリングを有効にしてもよろしいですか?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "このプロジェクトに参加してもよろしいですか?",
     "message.confirm.migrate.volume": "このボリュームを移行してもよろしいですか?",
     "message.confirm.refresh.blades": "ブレードを更新してもよろしいですか?",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/ko_KR.js
----------------------------------------------------------------------
diff --git a/ui/l10n/ko_KR.js b/ui/l10n/ko_KR.js
index ef34bd1..54bad50 100644
--- a/ui/l10n/ko_KR.js
+++ b/ui/l10n/ko_KR.js
@@ -20,7 +20,7 @@ var dictionary = {
     "changed.item.properties": "항목 속성 변경",
     "confirm.enable.s3": "S3 기반 2차 저장소 지원을 하려면 아래 정보를 입력해
주십시오.",
     "confirm.enable.swift": "Swift 기술 지원를 사용 하려면 다음 정보를 입력해
주십시오.",
-    "error.could.not.change.your.password.because.ldap.is.enabled": "Error could not change
your password because LDAP is enabled.",
+    "error.could.not.change.your.password.because.ldap.is.enabled": "LDAP 기능이 활성화
되어 있기 때문에 패스워드 변경을 실패하였습니다.",
     "error.could.not.enable.zone": "Zone을 사용 할 수 없습니다.",
     "error.installWizard.message": "문제가 발생했습니다. 다시 오류를 수정할
수 있습니다.",
     "error.invalid.username.password": "유효하지 않은 사용자명 또는 암호",
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Home",
     "label.host": "호스트",
     "label.host.MAC": "호스트 MAC",
-    "label.host.alerts": "호스트 알림 체계",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "호스트명",
     "label.host.tag": "Host Tag",
     "label.host.tags": "호스트 태그",
@@ -1338,7 +1338,7 @@ var dictionary = {
     "label.rbd.secret": "Cephx secret",
     "label.reboot": "재시작",
     "label.recent.errors": "최근 오류",
-    "label.recover.vm": "Recover VM",
+    "label.recover.vm": "VM 복구",
     "label.redundant.router": "중복 라우터",
     "label.redundant.router.capability": "중복 라우터 기능",
     "label.redundant.state": "중복 상태",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "기술 지원되는 서비스",
     "label.supported.source.NAT.type": "기술 지원되는 전송 NAT 종류",
     "label.supportsstrechedl2subnet": "Supports Streched L2 Subnet",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "프로젝트 일시정지",
     "label.switch.type": "형식",
     "label.system.capacity": "시스템 처리 능력",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "현재 시스템 VM을 정지하시겠습니까?",
     "message.action.take.snapshot": "현재 볼륨 스냅샷을 만드시겠습니까?",
     "message.action.unmanage.cluster": "클러스터를 비관리 대상으로 하시겠습니까?",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Please confirm that you want to delete this VM snapshot.",
     "message.action.vmsnapshot.revert": "Revert VM snapshot",
     "message.activate.project": "현재 프로젝트를 활성화 하시겠습니까?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "경계체제 상태가 감지되었습니다",
     "message.allow.vpn.access": "VPN 접근를 허가하는 사용자 사용자명과 암호를
입력해 주십시오.",
     "message.apply.snapshot.policy": "현재 스냅샷 정책를 업데이트했습니다.",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "현재 가상 인스턴스에 ISO 파일을 연결 하시겠습니까?",
     "message.attach.volume": "새로운 볼륨을 연결 하기 위해 아래 데이터를
입력해 주십시오.Windows 베이스 가상 머신에 디스크 볼륨을 연결 하는
경우는 연결 한 디스크를 인식하기 위해서 인스턴스를 재시작할 필요가
있습니다.",
     "message.basic.mode.desc": "VLAN 기술 지원가<b><u>불필요한</u></b>경우는
이 네트워크 모델을 선택해 주십시오.이 네트워크 모델로 만들기되는
모든 가상 인스턴스에 네트워크에서 직접 IP 주소를 할당할 수 있어
보안 그룹을 사용해 보안와 분리가 제공됩니다.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "현재 제공자를 사용하시겠습니까?",
     "message.confirm.enable.vnmc.provider": "Please confirm you would like to enable the
VNMC provider.",
     "message.confirm.enable.vpc.offering": "Are you sure you want to enable this VPC offering?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "현재 프로젝트에 참여하시겠습니까?",
     "message.confirm.migrate.volume": "Do you want to migrate this volume?",
     "message.confirm.refresh.blades": "Please confirm that you want to refresh blades.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/nb_NO.js
----------------------------------------------------------------------
diff --git a/ui/l10n/nb_NO.js b/ui/l10n/nb_NO.js
index 7e6af1c..eb68c83 100644
--- a/ui/l10n/nb_NO.js
+++ b/ui/l10n/nb_NO.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Hjem",
     "label.host": "Vert",
     "label.host.MAC": "Verts MAC",
-    "label.host.alerts": "Vertsvarsler",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "Vertsnavn",
     "label.host.tag": "Merkelapper for vert",
     "label.host.tags": "Vertsknagger",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Støttede Tjenester",
     "label.supported.source.NAT.type": "Supporterte kilde-NAT typer",
     "label.supportsstrechedl2subnet": "Støtter strekket L2 subnett",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "Suspender prosjekt",
     "label.switch.type": "Svitsjtype",
     "label.system.capacity": "Systemkapasistet",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Vennligst bekreft at du vil stoppe denne system VM.",
     "message.action.take.snapshot": "Vennligst bekreft at du vil ta et øyeblikksbilde av
dette volumet.",
     "message.action.unmanage.cluster": "Vennligst bekreft at du ikke ønsker å administere
klyngen.",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Vennligst bekreft at du ønsker å slette dette
VM øyeblikksbildet.",
     "message.action.vmsnapshot.revert": "Tilbakestill VM øyeblikksbilde",
     "message.activate.project": "Er du sikker på du ønsker å aktivere dette prosjektet?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "Alarm oppdaget",
     "message.allow.vpn.access": "Vennligst skriv inn et brukernavn og passord for brukeren
du til gi VPN-tilgang.",
     "message.apply.snapshot.policy": "Du har oppdatert den nåværende øyeblikksbilde policyen.",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "Vennligst bekreft at du vil tildele ISOen til denne virtuelle
instans.",
     "message.attach.volume": "Vennligst fyll inn følgende data for å tilknytte et nytt
volum. Hvis du tilknytter et diskvolum til en Windows-basert virtuell maskin så er du nødt
til å restarte instansen for å se den tilknyttede disken.",
     "message.basic.mode.desc": "Velg denne nettverksmodellen hvis du <b>*<u>ikke</u>*</b>
vil aktivere VLAN støtte. Alle virtuelle instnanser opprettet under denne nettverksmodellen
vil bli tildelt en IP direkte fra nettverket og sikkerhetsgrupper blir benyttet for å tilby
sikkerhet og segregering.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Vennligst bekreft at du ønsker å aktivere denne
tilbyderen",
     "message.confirm.enable.vnmc.provider": "Vennligst bekreft at du ønsker å aktivere
denne VNMC tilbyderen.",
     "message.confirm.enable.vpc.offering": "Er du sikker på at du vil aktivere dette VPC
nettverkstilbudet?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "Vennligst bekreft at du ønsker å delta i dette prosjektet.",
     "message.confirm.migrate.volume": "Ønsker du å migrere dette volumet?",
     "message.confirm.refresh.blades": "Vennligst bekreft at du vil oppdatere blade status.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/nl_NL.js
----------------------------------------------------------------------
diff --git a/ui/l10n/nl_NL.js b/ui/l10n/nl_NL.js
index 7f91b9b..2191740 100644
--- a/ui/l10n/nl_NL.js
+++ b/ui/l10n/nl_NL.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Home",
     "label.host": "Host",
     "label.host.MAC": "Host MAC",
-    "label.host.alerts": "Host Waarschuwingen",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "Hostnaam",
     "label.host.tag": "machine kenteken",
     "label.host.tags": "Host Tags",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Geondersteunde Diensten",
     "label.supported.source.NAT.type": "Ondersteunde Source NAT type",
     "label.supportsstrechedl2subnet": "Ondersteund Streched L2 Subnet",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "Pauzeer Project",
     "label.switch.type": "Switch Type",
     "label.system.capacity": "Systeem Capaciteit",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Bevestig dat u deze systeem VM wilt stoppen.",
     "message.action.take.snapshot": "Bevestig dat u een snapshot wilt maken van dit volume.",
     "message.action.unmanage.cluster": "Bevestig dat u dit cluster niet langer wilt laten
beheren door CloudStack.",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Bevestig dat u deze VM snapshot wilt verwijderen.",
     "message.action.vmsnapshot.revert": "Draai VM snapshot terug",
     "message.activate.project": "Weet u zeker dat u dit project wilt activeren?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "Probleem status gedetecteerd",
     "message.allow.vpn.access": "Specificeer een gebruikersnaam en wachtwoord voor de gebruiker
die u toegang wilt geven tot de VPN.",
     "message.apply.snapshot.policy": "De huidige snapshot policy is succesvol gewijzigd.",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "Bevestig dat u deze ISO wilt koppelen aan de virtuele
machine.",
     "message.attach.volume": "Specificeer de volgende gegevens om een nieuw volume te koppelen.
Als u een schijf volume wilt toevoegen aan een Windows gebaseerde machine, dan dient u deze
te rebooten om de schijf zichtbaar te maken.",
     "message.basic.mode.desc": "Kies dit netwerk model als u <b>*<u>geen</u>*</b>
VLAN ondersteuning wilt inschakelen. Alle virtuele machines onder dit netwerk model zullen
direct een IP gealloceerd krijgen vanuit het netwerk en security groups kunnen gebruikt worden
om beveiliging en segmentering te realiseren.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Bevestig dat u deze provider wilt inschakelen",
     "message.confirm.enable.vnmc.provider": "Bevestig dat u de VNMC provider wilt inschakelen.",
     "message.confirm.enable.vpc.offering": "Weet u zeker dat u deze VPC aanbieding wilt inschakelen?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "Bevestig dat u aan dit project wilt bijdragen",
     "message.confirm.migrate.volume": "Wilt U dit volume migreren?",
     "message.confirm.refresh.blades": "Bevestig dat u de blades wilt verversen.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/pl.js
----------------------------------------------------------------------
diff --git a/ui/l10n/pl.js b/ui/l10n/pl.js
index a941a03..34819b3 100644
--- a/ui/l10n/pl.js
+++ b/ui/l10n/pl.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Home",
     "label.host": "Host",
     "label.host.MAC": "Host MAC",
-    "label.host.alerts": "Host Alerts",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "Host Name",
     "label.host.tag": "Host Tag",
     "label.host.tags": "Host Tags",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Supported Services",
     "label.supported.source.NAT.type": "Supported Source NAT type",
     "label.supportsstrechedl2subnet": "Supports Streched L2 Subnet",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "Zawieś projekt",
     "label.switch.type": "Switch Type",
     "label.system.capacity": "System Capacity",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Please confirm that you want to stop this system VM.",
     "message.action.take.snapshot": "Please confirm that you want to take a snapshot of this
volume.",
     "message.action.unmanage.cluster": "Please confirm that you want to unmanage the cluster.",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Please confirm that you want to delete this VM snapshot.",
     "message.action.vmsnapshot.revert": "Revert VM snapshot",
     "message.activate.project": "Czy na pewno chcesz aktywować ten projekt?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "Alert state detected",
     "message.allow.vpn.access": "Please enter a username and password of the user that you
want to allow VPN access.",
     "message.apply.snapshot.policy": "You have successfully updated your current snapshot
policy.",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "Please confirm that you want to attach the ISO to this
virtual instance.",
     "message.attach.volume": "Please fill in the following data to attach a new volume. If
you are attaching a disk volume to a Windows based virtual machine, you will need to reboot
the instance to see the attached disk.",
     "message.basic.mode.desc": "Choose this network model if you do <b>*<u>not</u>*</b>
want to enable any VLAN support.  All virtual instances created under this network model will
be assigned an IP directly from the network and security groups are used to provide security
and segregation.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Please confirm that you would like to enable this
provider",
     "message.confirm.enable.vnmc.provider": "Please confirm you would like to enable the
VNMC provider.",
     "message.confirm.enable.vpc.offering": "Are you sure you want to enable this VPC offering?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "Please confirm you wish to join this project.",
     "message.confirm.migrate.volume": "Do you want to migrate this volume?",
     "message.confirm.refresh.blades": "Please confirm that you want to refresh blades.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/pt_BR.js
----------------------------------------------------------------------
diff --git a/ui/l10n/pt_BR.js b/ui/l10n/pt_BR.js
index fa6936a..224f191 100644
--- a/ui/l10n/pt_BR.js
+++ b/ui/l10n/pt_BR.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Home",
     "label.host": "Host",
     "label.host.MAC": "Host MAC",
-    "label.host.alerts": "Alertas de Host",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "Host Name",
     "label.host.tag": "Tag de host",
     "label.host.tags": "Tags de Host",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Serviços Suportados",
     "label.supported.source.NAT.type": "Tipo de Source NAT Suportado",
     "label.supportsstrechedl2subnet": "Suporte à Streched L2 Subnet",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "Suspender Projeto",
     "label.switch.type": "Tipo de Switch",
     "label.system.capacity": "Capacidade do Sistema",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Confirme que você deseja parar esta VM de Sistema.",
     "message.action.take.snapshot": "Por favor confirme que você deseja criar um snapshot
deste volume.",
     "message.action.unmanage.cluster": "Confirma a desvinculação do cluster.",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Por favor, confirme que você deseja excluir este
snapshot da VM.",
     "message.action.vmsnapshot.revert": "Reverter snapshot da VM",
     "message.activate.project": "Você tem certeza que deseja ativar este projeto ?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "Alerta de estado detectado",
     "message.allow.vpn.access": "Entre com nome de Usuário e senha do Usuário que terá
acesso VPN.",
     "message.apply.snapshot.policy": "Você atualizou com sucesso sua política de Snapshot.",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "Por favor, confirme que você deseja conectar o ISO à
esta instância virtual.",
     "message.attach.volume": "Preencha os seguintes dados para conectar o novo disco. Se
você Está conectando um disco a uma maquina virtual Windows, será necessário reiniciar
a Instância para visualizar o novo disco.",
     "message.basic.mode.desc": "Escolha este modelo de rede se você <b>*<u>não</u>*</b>
quer suporte a VLAN. Toda Instância criada neste modelo de rede estará ligado diretamente
a um IP da rede e será usado Security Groups para prover segurança e segregação.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Por favor confirme que você gostaria de habilitar
este provider",
     "message.confirm.enable.vnmc.provider": "Por favor confirme que você gostaria de habilitar
este provedor VNMC.",
     "message.confirm.enable.vpc.offering": "Você tem certeza que deseja habilitar esta oferta
de VPC?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "Por favor confirme que você deseja entrar neste projeto",
     "message.confirm.migrate.volume": "Você quer migrar este volume?",
     "message.confirm.refresh.blades": "Por favor confirme que você deseja renovar as lâminas.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/ru_RU.js
----------------------------------------------------------------------
diff --git a/ui/l10n/ru_RU.js b/ui/l10n/ru_RU.js
index 64cbb30..2c5b1a6 100644
--- a/ui/l10n/ru_RU.js
+++ b/ui/l10n/ru_RU.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "Главная",
     "label.host": "Узел",
     "label.host.MAC": "MAC узла",
-    "label.host.alerts": "Оповещения узла",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "Имя узла",
     "label.host.tag": "Host Tag",
     "label.host.tags": "Метки узла",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "Поддерживаемые службы",
     "label.supported.source.NAT.type": "Поддерживаемые типы NAT-источника",
     "label.supportsstrechedl2subnet": "Supports Streched L2 Subnet",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "Приостановить проект",
     "label.switch.type": "Тип свича",
     "label.system.capacity": "Мощность системы",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "Пожалуйста подтвердите желание
остановить эту служебную машину.",
     "message.action.take.snapshot": "Подтвердите, что вы действительно
хотите получить снимок этого диска.",
     "message.action.unmanage.cluster": "Подтвердите, что вы действительно
хотите перевести кластер в обычный режим.",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "Пожалуйста подтвердите, что
Вы хотите удалить этот снимок ВМ.",
     "message.action.vmsnapshot.revert": "Восстановить снимок ВМ",
     "message.activate.project": "Вы действительно хотите запустить
этот проект?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "Обнаружен сигнал тревоги",
     "message.allow.vpn.access": "Пожалуйста введите имя и пароль
пользователя, которому Вы хотите предоставить VPN
доступ.",
     "message.apply.snapshot.policy": "Вы успешно обновили политику
создания резервных копий.",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "Пожалуйста подтвердите желание
подключить ISO к этой виртуальной машине.",
     "message.attach.volume": "Пожалуйста заполните следующие
данные для подключеиня нового диска. Если Вы подключаете
диск к виртуальной машине Windows, потребуется перезагрузка
для того, что бы диск был окончательно подключен.",
     "message.basic.mode.desc": "Выберите эту сетевую модель, если
Вы <b>*<u>не</u>*</b> хотите активировать поддержку
VLAN.  Всем созданным в рамках данной сетевой модели
виртуальным машинам будет напрямую присвоен маршрутизируемый
IP адрес. Для обеспечения безопасности используется
функционал Security groups.",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "Подтвердите, что вы действительно
хотите включить поставщика",
     "message.confirm.enable.vnmc.provider": "Please confirm you would like to enable the
VNMC provider.",
     "message.confirm.enable.vpc.offering": "Are you sure you want to enable this VPC offering?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "Подтвердите присоединение к
проекту.",
     "message.confirm.migrate.volume": "Do you want to migrate this volume?",
     "message.confirm.refresh.blades": "Please confirm that you want to refresh blades.",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98eb5d76/ui/l10n/zh_CN.js
----------------------------------------------------------------------
diff --git a/ui/l10n/zh_CN.js b/ui/l10n/zh_CN.js
index d0a9647..accfc5b 100644
--- a/ui/l10n/zh_CN.js
+++ b/ui/l10n/zh_CN.js
@@ -814,7 +814,7 @@ var dictionary = {
     "label.home": "首页",
     "label.host": "主机",
     "label.host.MAC": "主机 MAC",
-    "label.host.alerts": "主机警报",
+    "label.host.alerts": "Hosts in Alert State",
     "label.host.name": "主机名称",
     "label.host.tag": "宿主机标签",
     "label.host.tags": "主机标签",
@@ -1576,6 +1576,7 @@ var dictionary = {
     "label.supported.services": "支持的服务",
     "label.supported.source.NAT.type": "支持的源 NAT 类型",
     "label.supportsstrechedl2subnet": "支持扩展二级子网",
+    "label.supportspublicaccess": "Supports Public Access",
     "label.suspend.project": "暂停项目",
     "label.switch.type": "交换机类型",
     "label.system.capacity": "系统容量",
@@ -1865,6 +1866,7 @@ var dictionary = {
     "message.action.stop.systemvm": "请确认您确实要停止此系统 VM。",
     "message.action.take.snapshot": "请确认您确实要创建此卷的快照。",
     "message.action.unmanage.cluster": "请确认您确实要取消托管此群集。",
+    "message.action.vmsnapshot.create": "Please confirm that you want to take a snapshot
of this instance. <br>Please notice that the instance will be paused during the snapshoting,
and resumed after snapshotting, if it runs on KVM.",
     "message.action.vmsnapshot.delete": "请确认您确实要删除此 VM 快照。",
     "message.action.vmsnapshot.revert": "还原 VM 快照",
     "message.activate.project": "是否确实要激活此项目?",
@@ -1908,6 +1910,7 @@ var dictionary = {
     "message.alert.state.detected": "检测到警报状态",
     "message.allow.vpn.access": "请输入要允许进行 VPN 访问的用户的用户名和密码。",
     "message.apply.snapshot.policy": "您已成功更新当前的快照策略。",
+    "message.assign.instance.another": "Please specify the account type, domain, account
name and network (optional) of the new account. <br> If the default nic of the vm is
on a shared network, CloudStack will check if the network can be used by the new account if
you do not specify one network. <br> If the default nic of the vm is on a isolated network,
and the new account has more one isolated networks, you should specify one.",
     "message.attach.iso.confirm": "请确认您确实要将此 ISO 附加到此虚拟实例。",
     "message.attach.volume": "请填写以下数据以附加一个新卷。如果要将磁盘卷附加到基于
Windows 的虚拟机,需要重新启动此实例才能显示已连接的磁盘。",
     "message.basic.mode.desc": "如果您<b>*<u>不</u>*</b>希望启用任何
VLAN 支持,请选择此网络模式。将直接从此网络中为在此网络模式下创建的所有虚拟机实例分配一个
IP,并使用安全组提供安全性和隔离。",
@@ -1963,6 +1966,7 @@ var dictionary = {
     "message.confirm.enable.provider": "请确认您确实要启用此提供程序",
     "message.confirm.enable.vnmc.provider": "请确认您确实要启用 VNMC 提供程序。",
     "message.confirm.enable.vpc.offering": "是否确实要启用此 VPC 方案?",
+    "message.confirm.force.update": "Do you want to make a force update?",
     "message.confirm.join.project": "请确认您确实要加入此项目。",
     "message.confirm.migrate.volume": "是否要迁移此卷?",
     "message.confirm.refresh.blades": "请确认您确实要刷新刀片式服务器。",


Mime
View raw message