From e203619326e7eec12d28d9b7f8ac0809bc8e8dd5 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 23 Aug 2012 14:16:55 -0700 Subject: [PATCH] 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. (Reviewed-by: Brian) --- client/WEB-INF/classes/resources/messages.properties | 7 ++++--- client/WEB-INF/classes/resources/messages_ja.properties | 7 +++---- client/WEB-INF/classes/resources/messages_zh_CN.properties | 7 +++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index ce82c4aa97b..a293fbd65f0 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -54,6 +54,10 @@ 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) ******************************************************************************************* @@ -344,7 +348,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 @@ -1352,7 +1355,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.restore.instance=Please confirm that you want to restore this instance. @@ -1360,7 +1362,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 diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index ea9c1d16fd9..66e4e4d7140 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -6,7 +6,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) ******************************************************************************************* @@ -297,7 +299,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=ゲスト ネットワークの追加 @@ -1306,7 +1307,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 ゲストが使用できなくなります。 @@ -1315,7 +1315,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=ゾーン にハイパーバイザーで管理されるクラスターを追加します diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 4640f669555..2a8da6be65f 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -6,7 +6,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) ******************************************************************************************* @@ -297,7 +299,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=添加来宾网络 @@ -1306,7 +1307,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 来宾。 @@ -1315,7 +1315,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=向区域 中添加一个虚拟机管理程序托管的群集