Author: aschnell Date: Fri Aug 29 15:02:17 2008 New Revision: 50483 URL: http://svn.opensuse.org/viewcvs/yast?rev=50483&view=rev Log: - removed "EVMS" from text messages Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/custom_part_helptexts.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_check_generated.ycp?rev=50483&r1=50482&r2=50483&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Fri Aug 29 15:02:17 2008 @@ -341,8 +341,7 @@ }); - whole_disk = whole_disk || diskinfo["type"]:`CT_UNKNOWN==`CT_LVM || - diskinfo["type"]:`CT_UNKNOWN==`CT_EVMS; + whole_disk = whole_disk || diskinfo["type"]:`CT_UNKNOWN==`CT_LVM; diskinfo = add( diskinfo, "whole_disk", whole_disk ); all_whole_disk = all_whole_disk && whole_disk; targetMap = add( targetMap, disk, diskinfo ); @@ -742,11 +741,6 @@ if( !tg["/dev/"+p["used_by"]:"","create"]:false ) ppl = add( ppl, p ); } - else if( p["used_by_type"]:`UB_NONE==`UB_EVMS ) - { - if( !tg["/dev/evms/"+p["used_by"]:"","create"]:false ) - ppl = add( ppl, p ); - } }); pl = ppl; } @@ -788,13 +782,6 @@ Remove it from the volume group before editing it. "),curr_part["used_by"]:"" )); } - else if( used == `UB_EVMS ) - { - // popup text %1 is replaced by a name e.g. system - Popup::Message(sformat(_("The selected device is used by EVMS volume (%1). -Remove the EVMS volume before editing it. -"), curr_part["used_by"]:"" )); - } else if( used != `UB_NONE ) { // popup text %1 is replaced by a name e.g. system @@ -847,17 +834,9 @@ Remove it from the RAID before deleting it. "), curr_part["used_by"]:"", part_name )); } - - else if( used == `UB_EVMS) - { - // popup text %2 is a device name, %1 is the EVMS name - Popup::Message(sformat(_("The device (%2) is used by EVMS object (%1). -Remove the EVMS object before deleting it. -"), curr_part["used_by"]:"", part_name )); - } else { - // popup text %2 is a device name, %1 is the EVMS name + // popup text, %1 and %2 are device names Popup::Message(sformat(_("The device (%2) is used by %1. Remove %1 before deleting it. "), curr_part["used_by"]:"", part_name )); @@ -929,7 +908,7 @@ } if( !ok ) { - // popup text %2 is a device name, %1 is the EVMS name + // popup text, %1 is a device name Popup::Message(sformat(_("The device (%1) cannot be removed Since it is a logical partition and another logical partition with higher number is in use. @@ -1023,15 +1002,6 @@ deleting the extended partition. ")); } - else if( used == `UB_EVMS ) - { - // popup text, Do not translate EVMS. - Popup::Message(_(" -The selected extended partition contains at least one partition -that is used by an EVMS volume. Remove the EVMS volume -before deleting the extended partition. -")); - } else if( used != `UB_NONE ) { // popup text, Do not translate RAID. Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=50483&r1=50482&r2=50483&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 29 15:02:17 2008 @@ -1610,15 +1610,6 @@ deleting the device. ")); } - else if( used == `UB_EVMS ) - { - // popup text, Do not translate EVMS. - Popup::Message(_(" -The selected device contains at least one partition -that is used by an EVMS device. Delete the EVMS device -before deleting the device. -")); - } else if( used != `UB_NONE ) { // popup text Modified: trunk/storage/storage/src/include/custom_part_helptexts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_helptexts.ycp?rev=50483&r1=50482&r2=50483&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_helptexts.ycp (original) +++ trunk/storage/storage/src/include/custom_part_helptexts.ycp Fri Aug 29 15:02:17 2008 @@ -311,7 +311,7 @@ "); // helptext expert partitioning. 19 help_text = help_text + _("<p> -<b>Used By</b> tells if a device is used by LVM, RAID or EVMS. If you do not use such +<b>Used By</b> tells if a device is used by LVM or RAID. If you do not use such things, it is perfectly normal for this column to be empty. </p> "); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org