Author: aschnell Date: Fri Apr 17 17:11:14 2009 New Revision: 56835 URL: http://svn.opensuse.org/viewcvs/yast?rev=56835&view=rev Log: - prefer used_by_device over used_by Modified: trunk/storage/storage/src/include/custom_part_check_generated.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=56835&r1=56834&r2=56835&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Fri Apr 17 17:11:14 2009 @@ -507,7 +507,7 @@ // popup text %1 is replaced by a raid name e.g. md0 Popup::Message(sformat(_("The selected device belongs to the RAID (%1). Remove it from the RAID before editing it. -"),curr_part["used_by"]:"")); +"),curr_part["used_by_device"]:"")); return false; } else if( used == `UB_LVM ) @@ -515,14 +515,14 @@ // popup text %1 is replaced by a name e.g. system Popup::Message(sformat(_("The selected device belongs to a volume group (%1). Remove it from the volume group before editing it. -"),curr_part["used_by"]:"" )); +"),curr_part["used_by_device"]:"" )); } else if( used != `UB_NONE ) { // popup text %1 is replaced by a name e.g. system Popup::Message(sformat(_("The selected device is used by volume (%1). Remove the volume before editing it. -"), curr_part["used_by"]:"" )); +"), curr_part["used_by_device"]:"" )); } boolean ret = used==`UB_NONE; if( ret ) @@ -559,7 +559,7 @@ // popup text %2 is a device name, %1 is the volume group name Popup::Error(sformat(_("The device (%2) belongs to a volume group (%1). Remove it from the volume group before deleting it. -"),curr_part["used_by"]:"" , part_name) ); +"),curr_part["used_by_device"]:"" , part_name) ); }*/ if( used == `UB_MD) @@ -567,14 +567,14 @@ // popup text %2 is a device name, %1 is the raid name Popup::Message(sformat(_("The device (%2) belongs to the RAID (%1). Remove it from the RAID before deleting it. -"), curr_part["used_by"]:"", part_name )); +"), curr_part["used_by_device"]:"", part_name )); } else { // 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 )); +"), curr_part["used_by_device"]:"", part_name )); } return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org