Author: aschnell Date: Fri Apr 25 13:58:45 2008 New Revision: 47070 URL: http://svn.opensuse.org/viewcvs/yast?rev=47070&view=rev Log: - fixed action description (bnc #382495) Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=47070&r1=47069&r2=47070&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Apr 25 13:58:45 2008 @@ -1 +1 @@ -2.16.18 +2.16.19 Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=47070&r1=47069&r2=47070&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Fri Apr 25 13:58:45 2008 @@ -1955,17 +1955,33 @@ string txt; string d = dev; if( doing ) - { - // displayed text during action, %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by a name e.g. ROOT - txt = sformat( _("Setting label on %1$s to %2$s"), d.c_str(), label.c_str() ); - } + { + if( label.empty() ) + { + // displayed text during action, %1$s is replaced by device name e.g. /dev/hda1 + txt = sformat( _("Clearing label on %1$s"), d.c_str() ); + } + else + { + // displayed text during action, %1$s is replaced by device name e.g. /dev/hda1 + // %2$s is replaced by a name e.g. ROOT + txt = sformat( _("Setting label on %1$s to %2$s"), d.c_str(), label.c_str() ); + } + } else - { - // displayed text before action, %1$s is replaced by device name e.g. /dev/hda1 - // %2$s is replaced by a name e.g. ROOT - txt = sformat( _("Set label on %1$s to %2$s"), d.c_str(), label.c_str() ); - } + { + if( label.empty() ) + { + // displayed text before action, %1$s is replaced by device name e.g. /dev/hda1 + txt = sformat( _("Clear label on %1$s"), d.c_str() ); + } + else + { + // displayed text before action, %1$s is replaced by device name e.g. /dev/hda1 + // %2$s is replaced by a name e.g. ROOT + txt = sformat( _("Set label on %1$s to %2$s"), d.c_str(), label.c_str() ); + } + } return( txt ); } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=47070&r1=47069&r2=47070&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Apr 25 13:58:45 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 25 13:57:38 CEST 2008 - aschnell@suse.de + +- fixed action description (bnc #382495) +- version 2.16.19 + +------------------------------------------------------------------- Wed Apr 16 10:58:44 CEST 2008 - aschnell@suse.de - check return value of SCR::Read(.proc.swaps) before processing it -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org