You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/08/23 23:10:37 UTC
git commit: CS-15802: cloudstack 3.0 UI - stop/reboot
virtualRouter/network - add text "All services provided by this
virtualRouter/network will be interrupted" in confirm dialog.
Updated Branches:
refs/heads/master 00323f0e5 -> 7f8734f12
CS-15802: cloudstack 3.0 UI - stop/reboot virtualRouter/network - add text "All services provided by this virtualRouter/network will be interrupted" in confirm dialog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7f8734f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7f8734f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7f8734f1
Branch: refs/heads/master
Commit: 7f8734f124cb3b1fcde8b68244c7de783ca36d24
Parents: 00323f0
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Aug 23 14:02:45 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Aug 23 14:08:20 2012 -0700
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 9 ++++++---
.../classes/resources/messages_ja.properties | 7 +++----
.../classes/resources/messages_zh_CN.properties | 7 +++----
3 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f8734f1/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index f96a7c4..899e3c0 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -70,6 +70,12 @@ label.remove.tier=Remove tier
label.network.domain.text=Network domain
label.memory.mb=Memory (in MB)
label.cpu.mhz=CPU (in MHz)
+
+message.action.remove.host=Please confirm that you want to remove this host.
+
+message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
+message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
+message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network.
#modified labels (end) *******************************************************************************************
@@ -361,7 +367,6 @@ label.least.connections=Least connections
label.round.robin=Round-robin
label.restart.required=Restart required
label.clean.up=Clean up
-message.restart.network=Please confirm that you want to restart network
label.restart.network=Restart network
label.edit.network.details=Edit network details
label.add.guest.network=Add guest network
@@ -1368,7 +1373,6 @@ message.action.host.enable.maintenance.mode=Enabling maintenance mode will cause
message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine.
message.action.primarystorage.enable.maintenance.mode=Warning: placing the primary storage into maintenance mode will cause all VMs using volumes from it to be stopped. Do you want to continue?
message.action.reboot.instance=Please confirm that you want to reboot this instance.
-message.action.reboot.router=Please confirm that you want to reboot this router.
message.action.reboot.systemvm=Please confirm that you want to reboot this system VM.
message.action.release.ip=Please confirm that you want to release this IP.
message.action.remove.host=Removing last/only host in cluster and reinstalling the host will destroy working environment/database on the host and render the VM Guests unuseable.
@@ -1377,7 +1381,6 @@ message.action.start.instance=Please confirm that you want to start this instanc
message.action.start.router=Please confirm that you want to start this router.
message.action.start.systemvm=Please confirm that you want to start this system VM.
message.action.stop.instance=Please confirm that you want to stop this instance.
-message.action.stop.router=Please confirm that you want to stop this router.
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.add.cluster.zone=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f8734f1/client/WEB-INF/classes/resources/messages_ja.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 20cb7e9..c7de4ec 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -23,7 +23,9 @@
#modified labels (begin) *****************************************************************************************
-
+message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
+message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
+message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network.
#modified labels (end) *******************************************************************************************
@@ -314,7 +316,6 @@ label.round.robin=ラウンドロビン
label.network.domain.text=ネットワーク ドメイン テキスト
label.restart.required=再起動が必要
label.clean.up=クリーン アップ
-message.restart.network=ネットワークを再起動してもよろしいですか?
label.restart.network=ネットワークの再起動
label.edit.network.details=ネットワークの詳細の編集
label.add.guest.network=ゲスト ネットワークの追加
@@ -1323,7 +1324,6 @@ message.action.host.enable.maintenance.mode=保守モードを有効にすると
message.action.instance.reset.password=この仮想マシンのルート パスワードを変更してもよろしいですか?
message.action.primarystorage.enable.maintenance.mode=警告: プライマリ ストレージを保守モードにすると、そのストレージ上のボリュームを使用するすべての VM が停止します。続行してもよろしいですか?
message.action.reboot.instance=このインスタンスを再起動してもよろしいですか?
-message.action.reboot.router=このルーターを再起動してもよろしいですか?
message.action.reboot.systemvm=このシステム VM を再起動してもよろしいですか?
message.action.release.ip=この IP アドレスを解放してもよろしいですか?
message.action.remove.host=クラスター内に最後まで残った唯一のホストを削除して再インストールすると、ホスト上の作業環境およびデータベースが破棄され、VM ゲストが使用できなくなります。
@@ -1332,7 +1332,6 @@ message.action.start.instance=このインスタンスを起動してもよろ
message.action.start.router=このルーターを起動してもよろしいですか?
message.action.start.systemvm=このシステム VM を起動してもよろしいですか?
message.action.stop.instance=このインスタンスを停止してもよろしいですか?
-message.action.stop.router=このルーターを停止してもよろしいですか?
message.action.stop.systemvm=このシステム VM を停止してもよろしいですか?
message.action.take.snapshot=このボリュームのスナップショットを作成してもよろしいですか?
message.add.cluster.zone=ゾーン <b><span id="zone_name"></span></b> にハイパーバイザーで管理されるクラスターを追加します
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f8734f1/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 17ae13d..54f079c 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -23,7 +23,9 @@
#modified labels (begin) *****************************************************************************************
-
+message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
+message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
+message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network.
#modified labels (end) *******************************************************************************************
@@ -314,7 +316,6 @@ label.round.robin=轮询算法
label.network.domain.text=网络域文本
label.restart.required=需要重新启动
label.clean.up=清除
-message.restart.network=请确认您确实要重新启动网络
label.restart.network=重新启动网络
label.edit.network.details=编辑网络详情
label.add.guest.network=添加来宾网络
@@ -1323,7 +1324,6 @@ message.action.host.enable.maintenance.mode=启用维护模式将导致将此主
message.action.instance.reset.password=请确认您确实要更改此虚拟机的 ROOT 用户密码。
message.action.primarystorage.enable.maintenance.mode=警告: 将主存储置于维护模式将导致使用主存储中的卷的所有 VM 停止运行。是否要继续?
message.action.reboot.instance=请确认您确实要重新启动此实例。
-message.action.reboot.router=请确认您确实要重新启动此路由器。
message.action.reboot.systemvm=请确认您确实要重新启动此系统 VM。
message.action.release.ip=请确认您确实要释放此 IP。
message.action.remove.host=删除群集中的最后一个/仅有的主机并重新安装此主机将销毁主机上的工作环境/数据库，并呈现无法使用的 VM 来宾。
@@ -1332,7 +1332,6 @@ message.action.start.instance=请确认您确实要启动此实例。
message.action.start.router=请确认您确实要启动此路由器。
message.action.start.systemvm=请确认您确实要启动此系统 VM。
message.action.stop.instance=请确认您确实要停止此实例。
-message.action.stop.router=请确认您确实要停止此路由器。
message.action.stop.systemvm=请确认您确实要停止此系统 VM。
message.action.take.snapshot=请确认您确实要创建此卷的快照。
message.add.cluster.zone=向区域 <b><span id="zone_name"></span></b> 中添加一个虚拟机管理程序托管的群集