diff --git a/XenAdmin/Controls/HaNtolIndicator.ja.resx b/XenAdmin/Controls/HaNtolIndicator.ja.resx index e8e67babc..7223c38f6 100644 --- a/XenAdmin/Controls/HaNtolIndicator.ja.resx +++ b/XenAdmin/Controls/HaNtolIndicator.ja.resx @@ -121,10 +121,7 @@ GrowAndShrink - - Top, Bottom, Left, Right - - + True @@ -143,9 +140,6 @@ 2 - - Left - NoControl @@ -177,12 +171,12 @@ 0 + + Top, Left, Right + True - - Fill - NoControl @@ -193,7 +187,7 @@ 330, 16 - 4 + 0 プールの最大許容障害数を超える数を指定することはできません。 @@ -223,7 +217,7 @@ 352, 16 - 13 + 4 False @@ -241,7 +235,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> True @@ -258,14 +252,11 @@ 0, 0, 0, 0 - - 0, 4, 0, 6 - 358, 36 - 14 + 0 プールで許容するサーバー障害の数を指定できます。 @@ -298,7 +289,7 @@ 1, 30 - 2 + 3 MiddleLeft @@ -355,7 +346,7 @@ 35, 20 - 1 + 2 Right @@ -388,7 +379,7 @@ 85, 23 - 0 + 1 許容するサーバー障害数(&F): @@ -405,6 +396,9 @@ 5 + + Fill + 3, 16 @@ -433,10 +427,10 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableStatus" Row="2" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="labelMax" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="spinner" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="numericUpDownCapacity" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelNumberOfServers" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableStatus" Row="2" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="labelMax" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="spinner" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="numericUpDownCapacity" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelNumberOfServers" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - Top + Fill 0, 0 diff --git a/XenAdmin/Controls/HaNtolIndicator.zh-CN.resx b/XenAdmin/Controls/HaNtolIndicator.zh-CN.resx index bc350b9a3..64e4075b9 100644 --- a/XenAdmin/Controls/HaNtolIndicator.zh-CN.resx +++ b/XenAdmin/Controls/HaNtolIndicator.zh-CN.resx @@ -121,10 +121,7 @@ GrowAndShrink - - Top, Bottom, Left, Right - - + True @@ -143,18 +140,15 @@ 2 - - Left - NoControl - 0, 0 + 3, 0 - 0, 0, 0, 0 + 3, 0, 0, 0 16, 16 @@ -177,23 +171,23 @@ 0 + + Top, Left, Right + True - - Fill - NoControl - 19, 3 + 22, 0 - 330, 15 + 327, 13 - 4 + 0 此数字不能超过池的最大故障容量。 @@ -214,16 +208,16 @@ Fill - 3, 52 + 3, 61 1 - 352, 20 + 352, 35 - 13 + 4 False @@ -241,7 +235,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> True @@ -258,14 +252,11 @@ 0, 0, 0, 0 - - 0, 4, 0, 6 - 358, 27 - 14 + 0 可以指定池中能够允许出现的服务器故障数。 @@ -292,13 +283,13 @@ NoControl - 143, 30 + 160, 32 1, 22 - 2 + 3 MiddleLeft @@ -322,7 +313,7 @@ NoControl - 148, 30 + 166, 37 16, 16 @@ -349,13 +340,13 @@ Left - 94, 30 + 99, 35 45, 19 - 1 + 2 Right @@ -382,13 +373,13 @@ NoControl - 0, 27 + 3, 38 81, 22 - 0 + 1 允许出现的故障数(&F): @@ -405,8 +396,11 @@ 5 + + Fill + - 3, 16 + 3, 17 0, 0, 0, 0 @@ -433,10 +427,10 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableStatus" Row="2" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="labelMax" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="spinner" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="numericUpDownCapacity" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelNumberOfServers" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableStatus" Row="2" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="labelMax" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="spinner" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="numericUpDownCapacity" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelNumberOfServers" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> - Top + Fill 0, 0 @@ -445,13 +439,13 @@ 0, 0, 0, 0 - 3, 3, 6, 0 + 3, 4, 3, 6 368, 125 - 13 + 0 服务器故障限制 diff --git a/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.ja.resx b/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.ja.resx index c6351c77e..f22670304 100644 --- a/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.ja.resx +++ b/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.ja.resx @@ -172,7 +172,7 @@ 2, 2, 0, 0 - 448, 15 + 2, 15 0 @@ -201,14 +201,11 @@ 3, 235 - - 3, 3, 3, 3 - 90, 13 - 1 + 2 高可用性再起動優先度(&H): @@ -256,7 +253,7 @@ 144, 22 - 2 + 3 MiddleLeft @@ -285,14 +282,11 @@ 3, 262 - - 3, 3, 3, 3 - 59, 13 - 3 + 4 起動順序(&S): @@ -319,7 +313,7 @@ 80, 20 - 4 + 5 Right @@ -348,9 +342,6 @@ 3, 288 - - 3, 3, 3, 3 - 147, 13 @@ -382,7 +373,7 @@ 80, 20 - 6 + 7 Right @@ -411,14 +402,11 @@ 275, 265 - - 3, 3, 3, 3 - 8, 20 - 7 + 8 秒 @@ -445,13 +433,13 @@ 3, 310 - 3, 22, 3, 4 + 3, 20, 3, 0 160, 17 - 9 + 10 最大許容障害数を増やすには? @@ -475,7 +463,7 @@ GrowAndShrink - Top + Fill 270, 228 @@ -487,7 +475,7 @@ 319, 79 - 8 + 9 haNtolIndicator @@ -504,21 +492,57 @@ True + + + + + 5 + True + + Virtual machine + + + 50 + True + + Restart priority + + + 50 + True + + Start order + + + 50 + True + + Delay interval + + + 50 + True + + Agile + + + 50 + Fill @@ -532,7 +556,7 @@ 640, 194 - 13 + 1 dataGridViewVms @@ -577,61 +601,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelHaStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="5" /><Control Name="labelProtectionLevel" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="m_dropDownButtonRestartPriority" Row="2" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelStartOrder" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudOrder" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelay" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudStartDelay" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelayUnits" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="linkLabelTellMeMore" Row="5" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="haNtolIndicator" Row="2" RowSpan="4" Column="5" ColumnSpan="1" /><Control Name="dataGridViewVms" Row="1" RowSpan="1" Column="0" ColumnSpan="6" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> - - - True - - - - - - 5 - - - True - - - 仮想マシン - - - 50 - - - True - - - 再起動優先度 - - - 50 - - - True - - - 起動順序 - - - 50 - - - True - - - 遅延間隔 - - - 50 - - - True - - - アジャイル - - - 50 + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelHaStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="5" /><Control Name="labelProtectionLevel" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="m_dropDownButtonRestartPriority" Row="2" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelStartOrder" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudOrder" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelay" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudStartDelay" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelayUnits" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="linkLabelTellMeMore" Row="5" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="haNtolIndicator" Row="2" RowSpan="4" Column="5" ColumnSpan="1" /><Control Name="dataGridViewVms" Row="1" RowSpan="1" Column="0" ColumnSpan="6" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> NoControl @@ -666,9 +636,6 @@ 96, 96 - - 8, 3, 3, 3 - 661, 347 diff --git a/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.zh-CN.resx b/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.zh-CN.resx index b22e6debd..9dd22f0fd 100644 --- a/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.zh-CN.resx +++ b/XenAdmin/Wizards/HAWizard_Pages/AssignPriorities.zh-CN.resx @@ -172,7 +172,7 @@ 2, 2, 0, 0 - 448, 15 + 2, 15 0 @@ -199,16 +199,13 @@ NoControl - 3, 235 - - - 3, 3, 3, 3 + 3, 225 90, 13 - 1 + 2 高可用性重启优先级(&H): @@ -247,7 +244,7 @@ NoControl - 99, 231 + 99, 221 0, 0, 3, 0 @@ -256,7 +253,7 @@ 144, 22 - 2 + 3 MiddleLeft @@ -283,16 +280,13 @@ NoControl - 3, 262 - - - 3, 3, 3, 3 + 3, 252 59, 13 - 3 + 4 启动顺序(&S): @@ -313,13 +307,13 @@ Top, Right - 163, 259 + 163, 249 80, 20 - 4 + 5 Right @@ -346,16 +340,13 @@ NoControl - 3, 288 - - - 3, 3, 3, 3 + 3, 278 147, 13 - 5 + 6 尝试在此时间后启动下一个 VM(&A): @@ -376,13 +367,13 @@ Top, Right - 163, 285 + 163, 275 80, 20 - 6 + 7 Right @@ -411,14 +402,11 @@ 249, 288 - - 3, 3, 3, 3 - 47, 13 - 7 + 8 秒 @@ -442,16 +430,16 @@ NoControl - 3, 328 + 3, 318 - 3, 20, 3, 6 + 3, 20, 3, 0 249, 13 - 9 + 10 如何增加最大故障转移容量? @@ -475,19 +463,19 @@ GrowAndShrink - Top + Fill - 309, 228 + 304, 218 - 10, 0, 3, 3 + 5, 0, 3, 3 319, 79 - 8 + 9 haNtolIndicator @@ -504,21 +492,57 @@ True + + + + + 5 + True + + Virtual machine + + + 50 + True + + Restart priority + + + 50 + True + + Start order + + + 50 + True + + Delay interval + + + 50 + True + + Agile + + + 50 + Fill @@ -532,7 +556,7 @@ 625, 194 - 13 + 1 dataGridViewVms @@ -577,61 +601,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelHaStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="5" /><Control Name="labelProtectionLevel" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="m_dropDownButtonRestartPriority" Row="2" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelStartOrder" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudOrder" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelay" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudStartDelay" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelayUnits" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="linkLabelTellMeMore" Row="5" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="haNtolIndicator" Row="2" RowSpan="4" Column="5" ColumnSpan="1" /><Control Name="dataGridViewVms" Row="1" RowSpan="1" Column="0" ColumnSpan="6" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> - - - True - - - - - - 5 - - - True - - - 虚拟机 - - - 50 - - - True - - - 重启优先级 - - - 50 - - - True - - - 启动顺序 - - - 50 - - - True - - - 延迟间隔 - - - 50 - - - True - - - 灵活 - - - 50 + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelHaStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="5" /><Control Name="labelProtectionLevel" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="m_dropDownButtonRestartPriority" Row="2" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelStartOrder" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudOrder" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelay" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="nudStartDelay" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStartDelayUnits" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="linkLabelTellMeMore" Row="5" RowSpan="1" Column="0" ColumnSpan="5" /><Control Name="haNtolIndicator" Row="2" RowSpan="4" Column="5" ColumnSpan="1" /><Control Name="dataGridViewVms" Row="1" RowSpan="1" Column="0" ColumnSpan="6" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> NoControl @@ -666,9 +636,6 @@ 96, 96 - - 8, 3, 3, 3 - 631, 347