diff --git a/XenAdmin/Help/HelpManager.ja.resx b/XenAdmin/Help/HelpManager.ja.resx index d6af30f730..a5a9eeaa7c 100644 --- a/XenAdmin/Help/HelpManager.ja.resx +++ b/XenAdmin/Help/HelpManager.ja.resx @@ -117,1042 +117,1003 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7018 - - 6000 - - - 4022 + hosts-add - 1311 + rbac-join-domain - 1310 + rbac-join-domain - 6830 + systemalerts - 6410 + updates-autoconfig - 7019 + licensing-manage - 3000 + vms-storage-attach - 4210 + dmc-about - 4211 + dmc-about - 4202 + dmc-about - 4201 + dmc-about - 6610 + hosts-nics - 6600 + hosts-nics - 4103 + troubleshooting-bugtool - 4104 + troubleshooting-bugtool - 4102 + troubleshooting-bugtool - 4101 + troubleshooting-bugtool - 4105 + troubleshooting-bugtool - 6220 + hosts-reconnect - 6150 + vms-properties - 6120 + hosts-connect-save - 6900 + pools-rootpassword - 1600 + intro-start - 1303 + users-overview - 9600 + templates-new - 6400 + vms-uninstall - 9000 + vms-copy - 7001 + systemalerts - 9000 + vms-copy - 9845 + vms-relocate - 9000 + vms-copy - 9852 + vms-relocate - 9847 + vms-relocate - 9853 + rbac-roles - 9846 + vms-relocate - 9848 + vms-relocate - 7400 + resources-customfields - 1001 + intro-welcome - 8620 + wlb-disable - 9850 + hosts-disconnect - 7002 + systemalerts - 9840 + dr-config - 9832 + dr-testfailover - 9835 + dr-testfailover 9830 - 9836 + dr-testfailover - 9837 + dr-testfailover - 9833 + dr-testfailover - 9834 + dr-testfailover - 9831 + dr-testfailover - 9822 + dr-failback - 9825 + dr-failback - 9820 + dr-failback - 9826 + dr-failback - 9827 + dr-failback - 9823 + dr-failback - 9824 + dr-failback - 9821 + dr-failback - 9812 + dr-failover - 9815 + dr-failover - 9810 + dr-failover - 9816 + dr-failover - 9817 + dr-failover - 9813 + dr-failover - 9814 + dr-failover - 9811 + dr-failover - 9808 + dr-about - 9809 + dr-failover - 7003 + systemalerts - 7004 + systemalerts - 6390 + templates-new - 6240 + hosts-properties - 6252 + hosts-network-properties - 5002 + vms-storage-addnewdisk - 6242 + pools-properties - 6243 + storage-pools - 6260 + storage-pools - 6262 + vms-storage-properties - 6241 + vms-properties - 7017 + pools-ha-config - 6270 + vms-network-properties 6536 - 6261 + vms-storage-properties - 9805 + vapps-properties - 6130 + hosts-connect-save - 6280 + hosts-maintenancemode - 9856 + troubleshooting-eventlog - 9501 + vms-export-ovf - 9502 + vms-export-ovf - 9503 + vms-export-ovf - 9504 + vms-export - 9505 + vms-exportimport-about - 9506 + vms-export-ovf - 9507 + vms-export - 9508 + vms-export-ovf - 9509 + vms-export - 9510 + vms-export-ovf - 6510 + vms-export - 6516 + vms-export - 6515 + vms-export - 9857 + systemalerts - 7200 + resources-folders - 9900 + vms-vgpu-configure - 6820 + performance-config - 7005 + systemalerts - 7006 + updates-xencenter - 4501 + pools-ha-disable - 7007 + pools-ha-about - 3500 + pools-ha-config - 3500 + pools-ha-config - 7008 + pools-ha-about - 4500 + pools-ha-enable - 9904 + health-check - 9905 + health-check - 9511 + vms-import - 9512 + vms-import-ovf - 9513 + vms-importdiskimage - 9514 + vms-import-ovf - 9515 + vms-import - 9516 + vms-importdiskimage - 9517 + vms-import-ovf - 9528 + vms-import - 9519 + vms-importdiskimage - 9520 + rbac-overview - 9521 + rbac-overview - 9522 + vms-import-ovf - 9523 + vms-importdiskimage - 9524 + vms-import-ovf - 9525 + vms-importdiskimage - 9526 + vms-import-ovf - 9527 + vms-importdiskimage - 9534 + vms-import-ovf - 9529 + vms-exportimport-about - 9530 + vms-import - 9531 + vms-importdiskimage - 9532 + vms-import-ovf - 9533 + vms-importdiskimage - 6700 - - - 6320 + vms-installtools - 9591 + storage-pools - 9841 + dr-testfailover - 6800 + licensing-about - 7015 + licensing-about - 6200 + hosts-reconnect - 7000 + troubleshooting-eventlog - 9854 + storage-pools-add-hba - 9851 + updates-applying - 7016 + systemalerts - 1300 + users-overview - 1302 + users-overview - 7007 + pools-ha-about - 7008 + pools-ha-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7010 + systemalerts - 5001 + vms-storage-move - 9010 + vms-relocate - 7300 + resources-searching-saved - 7011 + systemalerts - 8310 + hosts-nics - 8300 + hosts-management-ip - 8301 + hosts-management-ip - 7410 + resources-customfields - 5000 + vms-storage-addnewdisk - 7210 + resources-folders - 8000 - - - 6535 - - - 6535 - - - 6535 - - - 6535 - - - 9843 - - - 6535 - - - 6535 - - - 6535 + hosts-network-add - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 5100 + pools-createnew - 4000 + storage-pools-add - 4030 - - - 4025 + storage-pools-add - 4024 + storage-pools-add-iso - 4016 + storage-pools-add-smb - 4015 + storage-pools-add-software-fcoe - 4013 + storage-pools-add-hba - 4012 + storage-pools-add-iscsi - 4021 + storage-pools-add-iso - 4011 + storage-pools-add-nfsvhd - 4023 + storage-pools-add - 4026 + rbac-overview - 4015 + storage-pools-add-software-fcoe - 4016 + storage-pools-add-smb - 4017 + storage-pools-add - 4018 + storage-pools-add - 4020 + storage-pools-add - 4019 + storage-pools-add - 4023 + storage-pools-add - 4014 + storage-pools-add - 4023 + storage-pools-add - 4029 + storage-pools-add - 9855 + storage-pools-add-hba - 4010 + storage-pools-add - 7220 + resources-tagging - 9804 + vapps-create - 9842 + vapps-create - 9801 + vapps-create - 9803 + vapps-create - 9802 + vapps-create - 8500 + vms-network - 2000 + vms-new - 2015 + vms-new-template - 2030 + vms-new-media - 2055 + vms-new-cloudconfig - 2040 + vms-new-cpu-memory - 2070 + vms-new-finish - 2000 + vms-new - 2080 + vms-new-vgpu - 2035 + vms-new-homeserver - 2030 + vms-new-media - 2020 + vms-new-media - 2060 + vms-new-networking - 2030 + vms-new-media - 9730 + vms-new - 9844 + vms-new - 2020 + vms-new-media - 2050 + vms-new-storage - 2010 + vms-new-template - 6170 + intro-options - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 - - - 1200 + updates-applying - 5192 + pools-add-host - 5191 + pools-requirements - 5190 + pools-add-host - 5193 + pools-requirements - 1002 + intro-start - 6005 + hosts-reconnect - 6300 + vms-relocate - 1500 + troubleshooting-bugtool - 6160 + storage-repair - 9749 + rbac-join-domain - 6280 + hosts-maintenancemode - 6525 + vms-snapshots-revert - 9700 + rbac-overview - 9710 + rbac-assigning-roles - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 6100 + hosts-connect-save - 7300 + resources-searching-saved - 6810 + hosts-backup - 6801 + licensing-about - 6281 + vms-suspend - 6110 + hosts-connect-save - 7009 + systemalerts - 1301 + users-overview - 1033 + tabs - 1020 + tabs - 1040 + tabs - 9903 + tabs - 9902 + tabs - 9901 + tabs - 1095 + tabs - 1096 + pools-ha-about - 1100 + tabs - 1000 + intro-welcome - 1070 + tabs - 1071 + hosts-network - 1072 + vms-network - 1080 + tabs - 1085 + hosts-nics - 1090 + パフォーマンス - 1010 + tabs - 1030 + tabs - 1031 + tabs - 1032 + tabs - 1060 + tabs - 1050 + tabs - 1051 + tabs - 1052 + tabs - 1054 + tabs - 1053 + tabs - 1400 + resources-tagging - 1110 + intro-xencenterwindow - 8610 + wlb-get-started-help - 8611 + wlb-overview - 6210 + hosts-reconnect - 6310 + updates-applying - 6290 + vms-properties - 9849 + vms-storage-move - 6251 + vms-network-add - 9800 + vapps-manage - 6550 + vms-snapshotschedule-about - 6520 + vms-snapshots-take - 6530 + vms-snapshots-newtemplate - 8106 + cbt-overview - 8101 + vms-reboot - 8102 + vms-power-off - 8103 + vms-reboot - 8104 + vms-power-off - 8105 + vms-suspend - 8600 + wlb-configure - 8640 + wlb-initialize - 8605 + wlb-placement-strategy-change - 8630 + wlb-reports-creating - 8632 + wlb-reports-creating - 7012 + updates-xencenter - 7013 + updates-applying - 7014 + updates-applying - 9000 + vms-copy - 9000 + vms-copy - 9000 + vms-copy - 9000 + vms-copy - 9000 + vms-copy - 1301 + users-overview - 7016 + systemalerts - 9909 + hosts-control-domain-memory - 9908 + pvs-read-cache - 9907 + pvs-read-cache - 9906 + pvs-read-cache - 9910 + pvs-read-cache - 1020 + tabs - 6553 + vms-snapshotschedule-manage-policy - 4029 + storage-pools-add - 1020 + tabs diff --git a/XenAdmin/Help/HelpManager.zh-CN.resx b/XenAdmin/Help/HelpManager.zh-CN.resx index d6af30f730..a8e9bd815c 100644 --- a/XenAdmin/Help/HelpManager.zh-CN.resx +++ b/XenAdmin/Help/HelpManager.zh-CN.resx @@ -117,1042 +117,1003 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7018 - - 6000 - - - 4022 + hosts-add - 1311 + rbac-join-domain - 1310 + rbac-join-domain - 6830 + systemalerts - 6410 + updates-autoconfig - 7019 + licensing-manage - 3000 + vms-storage-attach - 4210 + dmc-about - 4211 + dmc-about - 4202 + dmc-about - 4201 + dmc-about - 6610 + hosts-nics - 6600 + hosts-nics - 4103 + troubleshooting-bugtool - 4104 + troubleshooting-bugtool - 4102 + troubleshooting-bugtool - 4101 + troubleshooting-bugtool - 4105 + troubleshooting-bugtool - 6220 + hosts-reconnect - 6150 + vms-properties - 6120 + hosts-connect-save - 6900 + pools-rootpassword - 1600 + intro-start - 1303 + users-overview - 9600 + templates-new - 6400 + vms-uninstall - 9000 + vms-copy - 7001 + systemalerts - 9000 + vms-copy - 9845 + vms-relocate - 9000 + vms-copy - 9852 + vms-relocate - 9847 + vms-relocate - 9853 + rbac-roles - 9846 + vms-relocate - 9848 + vms-relocate - 7400 + resources-customfields - 1001 + intro-welcome - 8620 + wlb-disable - 9850 + hosts-disconnect - 7002 + systemalerts - 9840 + dr-config - 9832 + dr-testfailover - 9835 + dr-testfailover 9830 - 9836 + dr-testfailover - 9837 + dr-testfailover - 9833 + dr-testfailover - 9834 + dr-testfailover - 9831 + dr-testfailover - 9822 + dr-failback - 9825 + dr-failback - 9820 + dr-failback - 9826 + dr-failback - 9827 + dr-failback - 9823 + dr-failback - 9824 + dr-failback - 9821 + dr-failback - 9812 + dr-failover - 9815 + dr-failover - 9810 + dr-failover - 9816 + dr-failover - 9817 + dr-failover - 9813 + dr-failover - 9814 + dr-failover - 9811 + dr-failover - 9808 + dr-about - 9809 + dr-failover - 7003 + systemalerts - 7004 + systemalerts - 6390 + templates-new - 6240 + hosts-properties - 6252 + hosts-network-properties - 5002 + vms-storage-addnewdisk - 6242 + pools-properties - 6243 + storage-pools - 6260 + storage-pools - 6262 + vms-storage-properties - 6241 + vms-properties - 7017 + pools-ha-config - 6270 + vms-network-properties 6536 - 6261 + vms-storage-properties - 9805 + vapps-properties - 6130 + hosts-connect-save - 6280 + hosts-maintenancemode - 9856 + troubleshooting-eventlog - 9501 + vms-export-ovf - 9502 + vms-export-ovf - 9503 + vms-export-ovf - 9504 + vms-export - 9505 + vms-exportimport-about - 9506 + vms-export-ovf - 9507 + vms-export - 9508 + vms-export-ovf - 9509 + vms-export - 9510 + vms-export-ovf - 6510 + vms-export - 6516 + vms-export - 6515 + vms-export - 9857 + systemalerts - 7200 + resources-folders - 9900 + vms-vgpu-configure - 6820 + performance-config - 7005 + systemalerts - 7006 + updates-xencenter - 4501 + pools-ha-disable - 7007 + pools-ha-about - 3500 + pools-ha-config - 3500 + pools-ha-config - 7008 + pools-ha-about - 4500 + pools-ha-enable - 9904 + health-check - 9905 + health-check - 9511 + vms-import - 9512 + vms-import-ovf - 9513 + vms-importdiskimage - 9514 + vms-import-ovf - 9515 + vms-import - 9516 + vms-importdiskimage - 9517 + vms-import-ovf - 9528 + vms-import - 9519 + vms-importdiskimage - 9520 + rbac-overview - 9521 + rbac-overview - 9522 + vms-import-ovf - 9523 + vms-importdiskimage - 9524 + vms-import-ovf - 9525 + vms-importdiskimage - 9526 + vms-import-ovf - 9527 + vms-importdiskimage - 9534 + vms-import-ovf - 9529 + vms-exportimport-about - 9530 + vms-import - 9531 + vms-importdiskimage - 9532 + vms-import-ovf - 9533 + vms-importdiskimage - 6700 - - - 6320 + vms-installtools - 9591 + storage-pools - 9841 + dr-testfailover - 6800 + licensing-about - 7015 + licensing-about - 6200 + hosts-reconnect - 7000 + troubleshooting-eventlog - 9854 + storage-pools-add-hba - 9851 + updates-applying - 7016 + systemalerts - 1300 + users-overview - 1302 + users-overview - 7007 + pools-ha-about - 7008 + pools-ha-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7015 + licensing-about - 7010 + systemalerts - 5001 + vms-storage-move - 9010 + vms-relocate - 7300 + resources-searching-saved - 7011 + systemalerts - 8310 + hosts-nics - 8300 + hosts-management-ip - 8301 + hosts-management-ip - 7410 + resources-customfields - 5000 + vms-storage-addnewdisk - 7210 + resources-folders - 8000 - - - 6535 - - - 6535 - - - 6535 - - - 6535 - - - 9843 - - - 6535 - - - 6535 - - - 6535 + hosts-network-add - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 6551 + vms-snapshotschedule-create-policy - 5100 + pools-createnew - 4000 + storage-pools-add - 4030 - - - 4025 + storage-pools-add - 4024 + storage-pools-add-iso - 4016 + storage-pools-add-smb - 4015 + storage-pools-add-software-fcoe - 4013 + storage-pools-add-hba - 4012 + storage-pools-add-iscsi - 4021 + storage-pools-add-iso - 4011 + storage-pools-add-nfsvhd - 4023 + storage-pools-add - 4026 + rbac-overview - 4015 + storage-pools-add-software-fcoe - 4016 + storage-pools-add-smb - 4017 + storage-pools-add - 4018 + storage-pools-add - 4020 + storage-pools-add - 4019 + storage-pools-add - 4023 + storage-pools-add - 4014 + storage-pools-add - 4023 + storage-pools-add - 4029 + storage-pools-add - 9855 + storage-pools-add-hba - 4010 + storage-pools-add - 7220 + resources-tagging - 9804 + vapps-create - 9842 + vapps-create - 9801 + vapps-create - 9803 + vapps-create - 9802 + vapps-create - 8500 + vms-network - 2000 + vms-new - 2015 + vms-new-template - 2030 + vms-new-media - 2055 + vms-new-cloudconfig - 2040 + vms-new-cpu-memory - 2070 + vms-new-finish - 2000 + vms-new - 2080 + vms-new-vgpu - 2035 + vms-new-homeserver - 2030 + vms-new-media - 2020 + vms-new-media - 2060 + vms-new-networking - 2030 + vms-new-media - 9730 + vms-new - 9844 + vms-new - 2020 + vms-new-media - 2050 + vms-new-storage - 2010 + vms-new-template - 6170 + intro-options - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 + updates-applying - 6315 - - - 1200 + updates-applying - 5192 + pools-add-host - 5191 + pools-requirements - 5190 + pools-add-host - 5193 + pools-requirements - 1002 + intro-start - 6005 + hosts-reconnect - 6300 + vms-relocate - 1500 + troubleshooting-bugtool - 6160 + storage-repair - 9749 + rbac-join-domain - 6280 + hosts-maintenancemode - 6525 + vms-snapshots-revert - 9700 + rbac-overview - 9710 + rbac-assigning-roles - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 7500 + upgrade - 6100 + hosts-connect-save - 7300 + resources-searching-saved - 6810 + hosts-backup - 6801 + licensing-about - 6281 + vms-suspend - 6110 + hosts-connect-save - 7009 + systemalerts - 1301 + users-overview - 1033 + tabs - 1020 + tabs - 1040 + tabs - 9903 + tabs - 9902 + tabs - 9901 + tabs - 1095 + tabs - 1096 + pools-ha-about - 1100 + tabs - 1000 + intro-welcome - 1070 + tabs - 1071 + hosts-network - 1072 + vms-network - 1080 + tabs - 1085 + hosts-nics - 1090 + performance - 1010 + tabs - 1030 + tabs - 1031 + tabs - 1032 + tabs - 1060 + tabs - 1050 + tabs - 1051 + tabs - 1052 + tabs - 1054 + tabs - 1053 + tabs - 1400 + resources-tagging - 1110 + intro-xencenterwindow - 8610 + wlb-get-started-help - 8611 + wlb-overview - 6210 + hosts-reconnect - 6310 + updates-applying - 6290 + vms-properties - 9849 + vms-storage-move - 6251 + vms-network-add - 9800 + vapps-manage - 6550 + vms-snapshotschedule-about - 6520 + vms-snapshots-take - 6530 + vms-snapshots-newtemplate - 8106 + cbt-overview - 8101 + vms-reboot - 8102 + vms-power-off - 8103 + vms-reboot - 8104 + vms-power-off - 8105 + vms-suspend - 8600 + wlb-configure - 8640 + wlb-initialize - 8605 + wlb-placement-strategy-change - 8630 + wlb-reports-creating - 8632 + wlb-reports-creating - 7012 + updates-xencenter - 7013 + updates-applying - 7014 + updates-applying - 9000 + vms-copy - 9000 + vms-copy - 9000 + vms-copy - 9000 + vms-copy - 9000 + vms-copy - 1301 + users-overview - 7016 + systemalerts - 9909 + hosts-control-domain-memory - 9908 + pvs-read-cache - 9907 + pvs-read-cache - 9906 + pvs-read-cache - 9910 + pvs-read-cache - 1020 + tabs - 6553 + vms-snapshotschedule-manage-policy - 4029 + storage-pools-add - 1020 + tabs diff --git a/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx b/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx index f971a9f89c..fe06ba25f0 100644 --- a/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx +++ b/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx @@ -226,13 +226,46 @@ True - 3 + 4 - - 126, 143 + + True + + + Fill + + + NoControl + + + 185, 133 + + + 312, 27 + + + 19 + + + MiddleLeft + + + False + + + initialVCPUWarningLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 3, 0, 13 + + tableLayoutPanel1 + + + 0 + + + 129, 136 50, 21 @@ -250,7 +283,7 @@ tableLayoutPanel1 - 0 + 1 True @@ -289,7 +322,7 @@ tableLayoutPanel1 - 1 + 2 True @@ -322,7 +355,7 @@ tableLayoutPanel1 - 2 + 3 Tahoma, 8pt @@ -330,9 +363,6 @@ 104, 104 - - 0, 6, 0, 6 - 250, 21 @@ -349,7 +379,7 @@ tableLayoutPanel1 - 3 + 4 True @@ -363,6 +393,9 @@ 3, 98 + + 3, 3, 3, 3 + 98, 33 @@ -385,7 +418,7 @@ tableLayoutPanel1 - 4 + 5 True @@ -408,6 +441,9 @@ この VM には、ホーム サーバーの合計メモリ サイズを超える物理メモリが割り当てられています。 + + MiddleLeft + False @@ -421,7 +457,7 @@ tableLayoutPanel1 - 5 + 6 True @@ -429,6 +465,30 @@ GrowAndShrink + + True + + + NoControl + + + 72, 3 + + + 3, 3, 3, 3 + + + 23, 13 + + + 1 + + + MB + + + MiddleLeft + lblMB @@ -441,6 +501,18 @@ 0 + + 1, 0 + + + 0, 0, 0, 0 + + + 71, 20 + + + 0 + nudMemory @@ -478,11 +550,23 @@ tableLayoutPanel1 - 6 + 7 Top, Left, Right + + Top, Bottom, Left, Right + + + 3, -6 + + + 425, 36 + + + 0 + transparentTrackBar1 @@ -520,7 +604,7 @@ tableLayoutPanel1 - 7 + 8 True @@ -534,6 +618,9 @@ 3, 60 + + 3, 3, 3, 3 + 120, 27 @@ -556,7 +643,7 @@ tableLayoutPanel1 - 9 + 10 True @@ -592,7 +679,7 @@ tableLayoutPanel1 - 10 + 11 True @@ -618,6 +705,9 @@ VM メモリ(&V): + + MiddleLeft + lblMemory @@ -628,7 +718,7 @@ tableLayoutPanel1 - 11 + 12 True @@ -667,7 +757,7 @@ tableLayoutPanel1 - 12 + 13 True @@ -703,14 +793,11 @@ tableLayoutPanel1 - 13 + 14 126, 63 - - 0, 3, 0, 3 - 50, 21 @@ -727,10 +814,10 @@ tableLayoutPanel1 - 14 + 15 - Top + Fill 0, 0 @@ -739,10 +826,10 @@ 0, 0, 0, 0 - 11 + 13 - 500, 329 + 500, 500 0 @@ -760,7 +847,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="comboBoxInitialVCPUs" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="5" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="comboBoxTopology" Row="4" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelTopology" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="MemWarningLabel" Row="9" RowSpan="2" Column="2" ColumnSpan="1" /><Control Name="panel2" Row="9" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="panel1" Row="8" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="lblPriority" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="lblVCPUs" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblVcpuWarning" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="lblMemory" Row="9" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="VCPUWarningLabel" Row="2" RowSpan="2" Column="2" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="comboBoxVCPUs" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,20,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="initialVCPUWarningLabel" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="comboBoxInitialVCPUs" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="5" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="comboBoxTopology" Row="4" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="labelTopology" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="MemWarningLabel" Row="10" RowSpan="2" Column="3" ColumnSpan="1" /><Control Name="panel2" Row="10" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="panel1" Row="9" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="lblPriority" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="lblVCPUs" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblVcpuWarning" Row="1" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="lblMemory" Row="10" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="VCPUWarningLabel" Row="2" RowSpan="2" Column="2" ColumnSpan="2" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="comboBoxVCPUs" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Absolute,45,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,20,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,100,Percent,50,Absolute,20" /></TableLayoutSettings> NoControl @@ -793,91 +880,7 @@ tableLayoutPanel1 - 8 - - - True - - - NoControl - - - 72, 2 - - - 0, 0, 0, 0 - - - 22, 17 - - - 1 - - - MB - - - MiddleLeft - - - lblMB - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - 1, 0 - - - 0, 0, 0, 0 - - - 71, 19 - - - 0 - - - nudMemory - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 1 - - - Top, Bottom, Left, Right - - - 3, -6 - - - 425, 36 - - - 0 - - - transparentTrackBar1 - - - XenAdmin.Controls.TransparentTrackBar, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 3 + 9 True diff --git a/XenAdmin/SettingsPanels/CPUMemoryEditPage.zh-CN.resx b/XenAdmin/SettingsPanels/CPUMemoryEditPage.zh-CN.resx index af739ab9e5..7733afb833 100644 --- a/XenAdmin/SettingsPanels/CPUMemoryEditPage.zh-CN.resx +++ b/XenAdmin/SettingsPanels/CPUMemoryEditPage.zh-CN.resx @@ -226,13 +226,46 @@ True - 3 + 4 - - 126, 143 + + True - - 0, 3, 0, 13 + + Fill + + + NoControl + + + 185, 133 + + + 312, 27 + + + 19 + + + MiddleLeft + + + False + + + initialVCPUWarningLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + 129, 136 50, 21 @@ -250,7 +283,7 @@ tableLayoutPanel1 - 0 + 1 True @@ -289,7 +322,7 @@ tableLayoutPanel1 - 1 + 2 True @@ -322,7 +355,7 @@ tableLayoutPanel1 - 2 + 3 Tahoma, 8pt @@ -330,9 +363,6 @@ 126, 93 - - 0, 6, 0, 6 - 250, 21 @@ -349,7 +379,7 @@ tableLayoutPanel1 - 3 + 4 True @@ -363,6 +393,9 @@ 3, 87 + + 3, 3, 3, 3 + 120, 33 @@ -385,7 +418,7 @@ tableLayoutPanel1 - 4 + 5 True @@ -408,6 +441,9 @@ 分配给此 VM 的物理内存量大于其主服务器的总内存 + + MiddleLeft + False @@ -421,7 +457,7 @@ tableLayoutPanel1 - 5 + 6 True @@ -429,6 +465,30 @@ GrowAndShrink + + True + + + NoControl + + + 72, 3 + + + 3, 3, 3, 3 + + + 23, 13 + + + 1 + + + MB + + + MiddleLeft + lblMB @@ -441,6 +501,18 @@ 0 + + 1, 0 + + + 0, 0, 0, 0 + + + 71, 20 + + + 0 + nudMemory @@ -478,11 +550,23 @@ tableLayoutPanel1 - 6 + 7 Top, Left, Right + + Top, Bottom, Left, Right + + + 3, -6 + + + 425, 36 + + + 0 + transparentTrackBar1 @@ -520,7 +604,7 @@ tableLayoutPanel1 - 7 + 8 True @@ -534,6 +618,9 @@ 3, 60 + + 3, 3, 3, 3 + 120, 27 @@ -556,7 +643,7 @@ tableLayoutPanel1 - 9 + 10 True @@ -592,7 +679,7 @@ tableLayoutPanel1 - 10 + 11 True @@ -618,6 +705,9 @@ VM 内存(&V): + + MiddleLeft + lblMemory @@ -628,7 +718,7 @@ tableLayoutPanel1 - 11 + 12 True @@ -667,7 +757,7 @@ tableLayoutPanel1 - 12 + 13 True @@ -703,14 +793,11 @@ tableLayoutPanel1 - 13 + 14 126, 63 - - 0, 3, 0, 3 - 50, 21 @@ -727,10 +814,10 @@ tableLayoutPanel1 - 14 + 15 - Top + Fill 0, 0 @@ -739,10 +826,10 @@ 0, 0, 0, 0 - 11 + 13 - 500, 329 + 500, 500 0 @@ -760,7 +847,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="comboBoxInitialVCPUs" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="5" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="comboBoxTopology" Row="4" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelTopology" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="MemWarningLabel" Row="9" RowSpan="2" Column="2" ColumnSpan="1" /><Control Name="panel2" Row="9" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="panel1" Row="8" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="lblPriority" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="lblVCPUs" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblVcpuWarning" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="lblMemory" Row="9" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="VCPUWarningLabel" Row="2" RowSpan="2" Column="2" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="comboBoxVCPUs" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,20,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="initialVCPUWarningLabel" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="comboBoxInitialVCPUs" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="5" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="comboBoxTopology" Row="4" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="labelTopology" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="MemWarningLabel" Row="10" RowSpan="2" Column="3" ColumnSpan="1" /><Control Name="panel2" Row="10" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="panel1" Row="9" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="lblPriority" Row="8" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="lblVCPUs" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblVcpuWarning" Row="1" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="lblMemory" Row="10" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="VCPUWarningLabel" Row="2" RowSpan="2" Column="2" ColumnSpan="2" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="comboBoxVCPUs" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Absolute,45,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,20,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,100,Percent,50,Absolute,20" /></TableLayoutSettings> NoControl @@ -793,91 +880,7 @@ tableLayoutPanel1 - 8 - - - True - - - NoControl - - - 72, 2 - - - 0, 0, 0, 0 - - - 23, 13 - - - 1 - - - MB - - - MiddleLeft - - - lblMB - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - 1, 0 - - - 0, 0, 0, 0 - - - 71, 20 - - - 0 - - - nudMemory - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 1 - - - Top, Bottom, Left, Right - - - 3, -6 - - - 425, 36 - - - 0 - - - transparentTrackBar1 - - - XenAdmin.Controls.TransparentTrackBar, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 3 + 9 True diff --git a/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.ja.resx b/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.ja.resx index 23318a5eb8..592bde4e87 100644 --- a/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.ja.resx +++ b/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.ja.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 4 True - + Fill - + 3, 3 @@ -139,7 +139,7 @@ 0 - この新規仮想マシンを識別するための名前を入力して、割り当てる仮想 CPU の数とメモリの量を指定します、新しい仮想マシンに適用されるブートモードを選択します。 + この新規仮想マシンを識別するための名前を入力して、割り当てる仮想 CPU の数とメモリの量を指定し、適用される起動モードを選択します。 lblIntro @@ -175,7 +175,7 @@ label3 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -199,7 +199,7 @@ m_textBoxVMName - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -229,7 +229,7 @@ lblCPUs - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -253,7 +253,7 @@ m_upDownCpuCount - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -267,6 +267,9 @@ True + + NoControl + 3, 80 @@ -286,7 +289,7 @@ lblMemory - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -310,7 +313,7 @@ m_upDownMemory - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -324,6 +327,9 @@ True + + NoControl + 144, 80 @@ -340,7 +346,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -385,7 +391,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -409,7 +415,7 @@ m_upDownAddSpace - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -439,7 +445,7 @@ label5 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -466,7 +472,7 @@ tableLayoutPanel2 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_groupBoxAddSpace @@ -496,7 +502,7 @@ m_groupBoxAddSpace - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -540,39 +546,6 @@ 9 - - Fill - - - 0, 129 - - - 0, 5, 0, 0 - - - 150, 105 - - - 3, 3, 3, 3 - - - 578, 105 - - - 8 - - - bootModesControl1 - - - XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - tableLayoutPanel1 - - - 10 - Fill @@ -580,7 +553,7 @@ 0, 0 - 10 + 9 578, 337 @@ -592,7 +565,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -622,9 +595,9 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True diff --git a/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.zh-CN.resx b/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.zh-CN.resx index c84e883a51..1adb54f5cf 100644 --- a/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.zh-CN.resx +++ b/XenAdmin/Wizards/ImportWizard/ImageVMConfigPage.zh-CN.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 4 True - + Fill - + 3, 0 @@ -139,7 +139,7 @@ 0 - 输入有助于以后识别虚拟机的名称，指定最初分配给新虚拟机的虚拟 CPU 数和内存量，并选择将应用于新虚拟机的引导模式。 + 输入有助于以后识别虚拟机的名称，指定最初分配给新 VM 的虚拟 CPU 数和内存量，并选择将应用于新 VM 的引导模式。 lblIntro @@ -175,7 +175,7 @@ label3 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -199,7 +199,7 @@ m_textBoxVMName - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -229,7 +229,7 @@ lblCPUs - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -253,7 +253,7 @@ m_upDownCpuCount - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -267,6 +267,9 @@ True + + NoControl + 3, 104 @@ -286,7 +289,7 @@ lblMemory - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -310,7 +313,7 @@ m_upDownMemory - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -324,6 +327,9 @@ True + + NoControl + 160, 104 @@ -340,7 +346,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -385,7 +391,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -409,7 +415,7 @@ m_upDownAddSpace - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -439,7 +445,7 @@ label5 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -466,7 +472,7 @@ tableLayoutPanel2 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_groupBoxAddSpace @@ -496,7 +502,7 @@ m_groupBoxAddSpace - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -540,39 +546,6 @@ 9 - - Fill - - - 0, 129 - - - 0, 5, 0, 0 - - - 150, 105 - - - 3, 3, 3, 3 - - - 578, 105 - - - 8 - - - bootModesControl1 - - - XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - tableLayoutPanel1 - - - 10 - Fill @@ -580,7 +553,7 @@ 0, 0 - 10 + 9 578, 337 @@ -592,7 +565,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -622,9 +595,9 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True diff --git a/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.ja.resx b/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.ja.resx index 1aca4b1b8c..3fe0f718ed 100644 --- a/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.ja.resx +++ b/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.ja.resx @@ -154,13 +154,85 @@ tableLayoutPanel1 - 6 + 8 True - 3 + 4 + + + True + + + Fill + + + NoControl + + + 185, 40 + + + 327, 27 + + + 21 + + + MiddleLeft + + + False + + + vCPUWarningLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + True + + + Fill + + + NoControl + + + 185, 113 + + + 327, 27 + + + 20 + + + MiddleLeft + + + False + + + initialVCPUWarningLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 190, 122 @@ -181,7 +253,7 @@ tableLayoutPanel1 - 0 + 2 Left @@ -217,7 +289,7 @@ tableLayoutPanel1 - 1 + 3 True @@ -250,7 +322,7 @@ tableLayoutPanel1 - 2 + 4 Tahoma, 8pt @@ -274,7 +346,7 @@ tableLayoutPanel1 - 3 + 5 True @@ -304,7 +376,7 @@ tableLayoutPanel1 - 5 + 7 True @@ -334,7 +406,7 @@ tableLayoutPanel1 - 7 + 9 Left @@ -370,7 +442,7 @@ tableLayoutPanel1 - 8 + 10 190, 43 @@ -391,7 +463,7 @@ tableLayoutPanel1 - 9 + 11 True @@ -421,7 +493,7 @@ tableLayoutPanel1 - 10 + 12 Left @@ -451,7 +523,7 @@ tableLayoutPanel1 - 11 + 13 Left @@ -481,7 +553,7 @@ tableLayoutPanel1 - 12 + 14 Left @@ -511,7 +583,7 @@ tableLayoutPanel1 - 13 + 15 Left @@ -541,7 +613,7 @@ tableLayoutPanel1 - 14 + 16 Left @@ -571,7 +643,7 @@ tableLayoutPanel1 - 15 + 17 Left @@ -601,7 +673,7 @@ tableLayoutPanel1 - 16 + 18 Fill @@ -631,7 +703,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="comboBoxInitialVCPUs" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comboBoxTopology" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="spinnerStatMax" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelVCPUs" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="spinnerDynMax" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelTopology" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboBoxVCPUs" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="spinnerDynMin" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelDynMin" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMax" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatMax" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMinInfo" Row="6" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelDynMaxInfo" Row="7" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelStatMaxInfo" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="vCPUWarningLabel" Row="1" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="initialVCPUWarningLabel" Row="4" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="comboBoxInitialVCPUs" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="3" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="comboBoxTopology" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="spinnerStatMax" Row="8" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelVCPUs" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="spinnerDynMax" Row="7" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelTopology" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboBoxVCPUs" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="spinnerDynMin" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelDynMin" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMax" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatMax" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMinInfo" Row="6" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelDynMaxInfo" Row="7" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStatMaxInfo" Row="8" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Absolute,41,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> Top @@ -661,7 +733,7 @@ tableLayoutPanel1 - 4 + 6 NoControl diff --git a/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.zh-CN.resx b/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.zh-CN.resx index 7250208cc6..91c8179ac0 100644 --- a/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.zh-CN.resx +++ b/XenAdmin/Wizards/NewVMWizard/Page_CpuMem.zh-CN.resx @@ -139,7 +139,7 @@ 1 - vCPU 数量(&C): + vCPU 数量(&N): MiddleLeft @@ -154,13 +154,85 @@ tableLayoutPanel1 - 6 + 8 True - 3 + 4 + + + True + + + Fill + + + NoControl + + + 185, 40 + + + 327, 27 + + + 21 + + + MiddleLeft + + + False + + + vCPUWarningLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + True + + + Fill + + + NoControl + + + 185, 113 + + + 327, 27 + + + 20 + + + MiddleLeft + + + False + + + initialVCPUWarningLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 204, 109 @@ -181,7 +253,7 @@ tableLayoutPanel1 - 0 + 2 Left @@ -217,7 +289,7 @@ tableLayoutPanel1 - 1 + 3 True @@ -250,7 +322,7 @@ tableLayoutPanel1 - 2 + 4 Tahoma, 8pt @@ -274,7 +346,7 @@ tableLayoutPanel1 - 3 + 5 True @@ -304,7 +376,7 @@ tableLayoutPanel1 - 5 + 7 True @@ -334,7 +406,7 @@ tableLayoutPanel1 - 7 + 9 Left @@ -370,7 +442,7 @@ tableLayoutPanel1 - 8 + 10 204, 30 @@ -391,7 +463,7 @@ tableLayoutPanel1 - 9 + 11 True @@ -421,7 +493,7 @@ tableLayoutPanel1 - 10 + 12 Left @@ -451,7 +523,7 @@ tableLayoutPanel1 - 11 + 13 Left @@ -481,7 +553,7 @@ tableLayoutPanel1 - 12 + 14 Left @@ -511,7 +583,7 @@ tableLayoutPanel1 - 13 + 15 Left @@ -541,7 +613,7 @@ tableLayoutPanel1 - 14 + 16 Left @@ -571,7 +643,7 @@ tableLayoutPanel1 - 15 + 17 Left @@ -601,7 +673,7 @@ tableLayoutPanel1 - 16 + 18 Fill @@ -610,7 +682,7 @@ 0, 0 - 9 + 10 515, 255 @@ -631,7 +703,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="comboBoxInitialVCPUs" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comboBoxTopology" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="spinnerStatMax" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelVCPUs" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="spinnerDynMax" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelTopology" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboBoxVCPUs" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="spinnerDynMin" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelDynMin" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMax" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatMax" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMinInfo" Row="6" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelDynMaxInfo" Row="7" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelStatMaxInfo" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="vCPUWarningLabel" Row="1" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="initialVCPUWarningLabel" Row="4" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="comboBoxInitialVCPUs" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelInitialVCPUs" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelInvalidVCPUWarning" Row="3" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="comboBoxTopology" Row="2" RowSpan="1" Column="1" ColumnSpan="3" /><Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="4" /><Control Name="spinnerStatMax" Row="8" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelVCPUs" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="spinnerDynMax" Row="7" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelTopology" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboBoxVCPUs" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="spinnerDynMin" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelDynMin" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMax" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelStatMax" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelDynMinInfo" Row="6" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelDynMaxInfo" Row="7" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="labelStatMaxInfo" Row="8" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Absolute,41,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> Top @@ -661,7 +733,7 @@ tableLayoutPanel1 - 4 + 6 NoControl diff --git a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx index 78462186e3..f2efb87f6e 100644 --- a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx +++ b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.ja.resx @@ -125,190 +125,43 @@ 2 - - CdRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 0 - - - UrlRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 1 - - - CdDropDownBox - - - XenAdmin.Controls.ISODropDownBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panelInstallationMethod - - - 3 - - - UrlTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 4 - - - linkLabelAttachNewIsoStore - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 5 - - - Top + + Top, Bottom, Left, Right - - 0, 0 - - - 3, 3, 3, 3 - - - 5 - - - 548, 176 - - - 1 - - - panelInstallationMethod - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CdRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlRadioButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdDropDownBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlTextBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkLabelAttachNewIsoStore" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,120,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings> + + 3, 269 - - 0, 4 - - + 0, 0, 0, 0 - - 544, 40 - - - 0 - - - オペレーティング システムの新規 VM へのインストール方法を選択します。 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod + + 200, 104 - - 2 - - - True - - - NoControl + + 3, 3, 3, 3 - - 6, 6 + + 542, 149 - - 177, 18 + + 7 - - 0 + + False - - インストール元 DVD ドライブ(&D): + + bootModesControl1 - - CdRadioButton + + XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + panelInstallationMethod - + 0 - - True - - - NoControl - - - 6, 66 - - - 3, 12, 3, 3 - - - 135, 18 - - - 2 - - - インストール元 URL(&U): - - - UrlRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 1 - Top, Left, Right @@ -324,6 +177,18 @@ 1 + + Top + + + 3, 19 + + + 518, 20 + + + 1 + PvBootTextBox @@ -336,6 +201,30 @@ 0 + + True + + + Fill + + + 0, 0 + + + 0, 0, 0, 0 + + + 0, 0, 0, 3 + + + 524, 16 + + + 0 + + + 高度な起動パラメーターを追加する場合はここで指定します。起動パラメーターが不要な場合は空白のままにしておきます。 + label2 @@ -400,70 +289,73 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + panelInstallationMethod 1 - - Top + + True - - 3, 35 + + NoControl - - 526, 19 + + 6, 46 - - 1 + + 149, 17 - - PvBootTextBox + + 0 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + インストール元 DVD ドライブ(&D): - - tableLayoutPanel2 + + CdRadioButton - - 0 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + panelInstallationMethod - - Fill + + 2 - - 0, 0 + + True - - 0, 0, 0, 0 + + NoControl - - 0, 0, 0, 3 + + 6, 105 - - 532, 32 + + 3, 12, 3, 3 - - 0 + + 122, 17 - - 高度な起動パラメーターを追加する場合はここで指定します。起動パラメーターが不要な場合は空白のままにしておきます。 + + 3 - - label2 + + インストール元 URL(&U): - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + UrlRadioButton - - tableLayoutPanel2 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + panelInstallationMethod + + + 3 Top, Left, Right @@ -490,7 +382,7 @@ panelInstallationMethod - 3 + 5 Top, Left, Right @@ -517,7 +409,7 @@ panelInstallationMethod - 4 + 6 True @@ -556,7 +448,67 @@ panelInstallationMethod - 5 + 7 + + + Fill + + + 0, 0 + + + 3, 3, 3, 3 + + + 8 + + + 548, 418 + + + 1 + + + panelInstallationMethod + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bootModesControl1" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="PvBootBox" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlRadioButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdDropDownBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlTextBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkLabelAttachNewIsoStore" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + + + 3, 3 + + + 0, 0, 0, 0 + + + 542, 40 + + + 0 + + + オペレーティング システムの新規 VM へのインストール方法を選択します。 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelInstallationMethod + + + 4 17, 17 diff --git a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx index 749ef6346c..afe31acc5c 100644 --- a/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx +++ b/XenAdmin/Wizards/NewVMWizard/Page_InstallationMedia.zh-CN.resx @@ -125,190 +125,43 @@ 2 - - CdRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 0 - - - UrlRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 1 - - - CdDropDownBox - - - XenAdmin.Controls.ISODropDownBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - panelInstallationMethod - - - 3 - - - UrlTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 4 - - - linkLabelAttachNewIsoStore - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 5 - - - Top + + Top, Bottom, Left, Right - - 0, 0 - - - 3, 3, 3, 3 - - - 5 - - - 548, 176 - - - 1 - - - panelInstallationMethod - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this + + 3, 269 - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CdRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlRadioButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdDropDownBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlTextBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkLabelAttachNewIsoStore" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,120,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings> - - - 0, 4 - - + 0, 0, 0, 0 - - 544, 40 - - - 0 - - - 请为要在新 VM 上安装的操作系统软件选择安装方法。 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 2 + + 200, 104 - - True - - - NoControl - - - 6, 6 + + 3, 3, 3, 3 - - 149, 17 + + 542, 149 - - 0 + + 7 - - 从此 DVD 驱动器安装(&D): + + False - - CdRadioButton + + bootModesControl1 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + XenAdmin.Wizards.BootModesControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - + panelInstallationMethod - + 0 - - True - - - NoControl - - - 6, 65 - - - 3, 12, 3, 3 - - - 122, 17 - - - 2 - - - 从此 URL 安装(&U): - - - UrlRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panelInstallationMethod - - - 1 - Top, Left, Right @@ -324,6 +177,18 @@ 1 + + Top + + + 3, 19 + + + 518, 20 + + + 1 + PvBootTextBox @@ -336,6 +201,30 @@ 0 + + True + + + Fill + + + 0, 0 + + + 0, 0, 0, 0 + + + 0, 0, 0, 3 + + + 524, 16 + + + 0 + + + 请在此处输入任何高级启动参数。如果不想提供任何参数，请将此框留空。 + label2 @@ -400,70 +289,73 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + panelInstallationMethod 1 - - Top + + True - - 3, 36 + + NoControl - - 526, 20 + + 6, 46 - - 1 + + 149, 17 - - PvBootTextBox + + 0 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 从此 DVD 驱动器安装(&D): - - tableLayoutPanel2 + + CdRadioButton - - 0 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + panelInstallationMethod - - Fill + + 2 - - 0, 0 + + True - - 0, 0, 0, 0 + + NoControl - - 0, 0, 0, 3 + + 6, 105 - - 532, 33 + + 3, 12, 3, 3 - - 0 + + 122, 17 - - 请在此处输入任何高级启动参数。如果不想提供任何参数，请将此框留空。 + + 3 - - label2 + + 从此 URL 安装(&U): - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + UrlRadioButton - - tableLayoutPanel2 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + panelInstallationMethod + + + 3 Top, Left, Right @@ -490,7 +382,7 @@ panelInstallationMethod - 3 + 5 Top, Left, Right @@ -517,7 +409,7 @@ panelInstallationMethod - 4 + 6 True @@ -556,7 +448,67 @@ panelInstallationMethod - 5 + 7 + + + Fill + + + 0, 0 + + + 3, 3, 3, 3 + + + 8 + + + 548, 418 + + + 1 + + + panelInstallationMethod + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bootModesControl1" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="PvBootBox" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlRadioButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CdDropDownBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="UrlTextBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="linkLabelAttachNewIsoStore" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + + + 3, 3 + + + 0, 0, 0, 0 + + + 542, 40 + + + 0 + + + 请为要在新 VM 上安装的操作系统软件选择安装方法。 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelInstallationMethod + + + 4 17, 17 diff --git a/XenModel/FriendlyNames.ja.resx b/XenModel/FriendlyNames.ja.resx index fe79547fae..70d73f50e0 100644 --- a/XenModel/FriendlyNames.ja.resx +++ b/XenModel/FriendlyNames.ja.resx @@ -1919,4 +1919,10 @@ [XenServer] クラスター管理デーモン + + 仮想マシン '{0}' はセキュア ブートの検証をパスしませんでした。 + + + 仮想マシンのセキュア ブート検証が失敗しました + \ No newline at end of file diff --git a/XenModel/FriendlyNames.zh-CN.resx b/XenModel/FriendlyNames.zh-CN.resx index c1ab64786c..926e984b58 100644 --- a/XenModel/FriendlyNames.zh-CN.resx +++ b/XenModel/FriendlyNames.zh-CN.resx @@ -1919,4 +1919,10 @@ [XenServer] 群集管理守护程序 + + 虚拟机“{0}”无法通过安全启动验证。 + + + VM 安全启动验证失败 + \ No newline at end of file diff --git a/XenModel/InvisibleMessages.ja.resx b/XenModel/InvisibleMessages.ja.resx index 2f20c2a0e1..a503764ede 100644 --- a/XenModel/InvisibleMessages.ja.resx +++ b/XenModel/InvisibleMessages.ja.resx @@ -156,12 +156,6 @@ [XenCenter].log - - -mapid {0} {1} - - - Help\XenCenter.ja.chm - Home.htm @@ -201,4 +195,7 @@ https://www.citrix.com/products/citrix-hypervisor/get-started.html + + http://docs.citrix.com/{0}/xencenter/current-release/{1}.html?utm_campaign={2}&utm_medium={3}&utm_source={4} + \ No newline at end of file diff --git a/XenModel/InvisibleMessages.zh-CN.resx b/XenModel/InvisibleMessages.zh-CN.resx index 0b645526d7..8b0c8d191d 100644 --- a/XenModel/InvisibleMessages.zh-CN.resx +++ b/XenModel/InvisibleMessages.zh-CN.resx @@ -156,12 +156,6 @@ [XenCenter].log - - -mapid {0} {1} - - - Help\XenCenter.zh-CN.chm - Home.htm @@ -201,4 +195,7 @@ https://www.citrix.com/products/citrix-hypervisor/get-started.html + + http://docs.citrix.com/{0}/xencenter/current-release/{1}.html?utm_campaign={2}&utm_medium={3}&utm_source={4} + \ No newline at end of file diff --git a/XenModel/Messages.ja.resx b/XenModel/Messages.ja.resx index 85893c7c76..68d7c19aed 100755 --- a/XenModel/Messages.ja.resx +++ b/XenModel/Messages.ja.resx @@ -2226,9 +2226,6 @@ SR の物理使用量が {2} を超えるとアラートが送信されます。 [XenCenter] のキャッシュにボンド マスターが見つかりません。 - - 起動モード - 起動順序: {0} @@ -2241,6 +2238,9 @@ SR の物理使用量が {2} を超えるとアラートが送信されます。 ハード ディスク + + 起動モード + アップグレード後に接続に問題が生じた SR があります。この問題を解決するには、SR を再接続してください。 @@ -5843,6 +5843,24 @@ CD をイジェクトしてから再試行してください。 グループの役割 + + UEFI ブート モードおよび UEFI セキュア ブート モードは試験段階の機能であり、現時点では実稼働での使用には適していません。 + + + UEFI ブート モードおよび UEFI セキュア ブート モードは現在選択したテンプレートでサポートされていません。 + + + UEFI ブート モードは試験段階の機能であり、現時点では実稼働での使用には適していません。 + + + UEFI ブート モードは現在選択したテンプレートでサポートされていません。 + + + UEFI セキュア ブート モードは試験段階の機能であり、現時点では実稼働での使用には適していません。 + + + UEFI セキュア ブート モードは現在選択したテンプレートでサポートされていません。 + [XenCenter] のバージョンが古いため、{0} に接続できません。 @@ -6581,6 +6599,12 @@ VM の再起動優先度をクリアしてもよろしいですか? 指定した場所に対する書き込み許可がありません。この種類のファイルをインポートするには、読み取り/書き込みアクセスが必要です。 + + 起動オプション + + + 新規仮想マシンの起動モードを選択する + インポートする VM の配置先の選択 @@ -12883,7 +12907,7 @@ SR-IOV ネットワークを有効にするには、サーバーの再起動が vCPU の初期の数(&C): - vCPU の最大数(&X): + vCPU の最大数(&V): vCPU の最大数、トポロジー、vCPU 優先度を変更するには、VM がシャットダウン状態である必要があります。 @@ -12897,6 +12921,12 @@ SR-IOV ネットワークを有効にするには、サーバーの再起動が vCPU の数(&C): + + この仮想マシンに {0} 個以上の vCPU を割り当てることをお勧めします + + + 物理 CPU よりも多い vCPU を設定すると、VM のパフォーマンスが低下します + コンテナ管理 diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index 1dc8599668..5549348218 100755 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -2222,9 +2222,6 @@ 在 [XenCenter] 的缓存中找不到绑定主对象。 - - 启动模式 - 启动顺序: {0} @@ -2237,6 +2234,9 @@ 硬盘 + + 引导模式 + 升级后存在损坏的 SR。要解决该问题，应重新连接 SR。 @@ -5837,6 +5837,24 @@ 组角色 + + UEFI 和 UEFI 安全启动模式是实验性功能，当前不适合于供生产使用。 + + + 选定模板不支持 UEFI 和 UEFI 安全启动模式。 + + + UEFI 启动模式是实验性功能，当前不适合于供生产使用。 + + + 选定模板不支持 UEFI 启动模式。 + + + UEFI 安全启动模式是实验性功能，当前不适合于供生产使用。 + + + 选定模板不支持 UEFI 安全启动模式。 + 此版本的 [XenCenter] 已过时，无法连接到 {0}。 @@ -6575,6 +6593,12 @@ 您在所提供的位置没有写入权限。需要具有读写权限才能导入此类型的文件。 + + 引导选项 + + + 为新虚拟机选择引导模式 + 选择用来放置导入 VM 的位置 @@ -12879,7 +12903,7 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并 初始 vCPU 数量(&C): - 最大 vCPU 数量(&X): + 最大 vCPU 数量(&V): 仅当 VM 关闭时才能更改最大 vCPU 数量、拓扑以及 vCPU 优先级。 @@ -12891,7 +12915,13 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并 如果初始 vCPU 数量设置为小于最大数量，则可以在运行过程中向虚拟机中添加更多 vCPU。 - vCPU 数量(&C): + vCPU 数量(&N): + + + 建议为此 VM 至少分配 {0} 个 vCPU + + + vCPU 数超过物理 CPU 数可能会导致 VM 性能下降 容器管理 diff --git a/XenOvfApi/Content.ja.resx b/XenOvfApi/Content.ja.resx index 0e69b0d39e..f3defcf710 100644 --- a/XenOvfApi/Content.ja.resx +++ b/XenOvfApi/Content.ja.resx @@ -154,10 +154,10 @@ PVS アクセラレータ情報 - HVM起動パラメータ + HVM 起動パラメーター - 非揮発性ランダムアクセスメモリ + 不揮発性 RAM [XenServer] インストール後処理のみ (Linux ディストリビューションの修復を試行) diff --git a/XenOvfApi/Content.zh-CN.resx b/XenOvfApi/Content.zh-CN.resx index 46722d14c7..13904b9786 100644 --- a/XenOvfApi/Content.zh-CN.resx +++ b/XenOvfApi/Content.zh-CN.resx @@ -154,10 +154,10 @@ PVS 加速器信息 - HVM启动参数 + HVM 启动参数 - 非易失性随机存取存储器 + 非易失性随机存取内存 仅限 [XenServer] 安装后操作(尝试修复 Linux 发行版。)