Author: aschnell Date: Mon Sep 1 17:09:58 2008 New Revision: 50533 URL: http://svn.opensuse.org/viewcvs/yast?rev=50533&view=rev Log: - work on messages Modified: trunk/storage/disk/src/disk.ycp trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Dmmultipath.cc trunk/storage/libstorage/src/Dmraid.cc trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/Partition.cc trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk.ycp?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/disk/src/disk.ycp (original) +++ trunk/storage/disk/src/disk.ycp Mon Sep 1 17:09:58 2008 @@ -22,8 +22,10 @@ import "Popup"; import "Wizard"; import "Misc"; + import "Label"; + // popup text string msg = _("Only use this program if you are familiar with partitioning hard disks. Never partition disks that may, in any way, be in use @@ -39,9 +41,12 @@ if (size (WFM::Args()) == 0) { Wizard::CreateDialog(); - Wizard::SetContents ( + Wizard::SetContents( + // dialog heading _("Expert Partitioner"), - `Label (_("Initializing...")), + // text show during initialization + `Label(_("Initializing...")), + // helptext _("<p>Please wait, while volumes are being detected.</p>"), false, false @@ -53,7 +58,7 @@ y2milestone( "warn:%1", warn ); if( warn==nil ) warn = 1; - if (warn==0||Popup::YesNoHeadline(_("Warning"),msg)==true) { + if (warn==0||Popup::YesNoHeadline(Label::WarningMsg(),msg)==true) { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Mon Sep 1 17:09:58 2008 @@ -205,8 +205,8 @@ unsigned long dummy = 0; if( !checkPartedValid( ppart, nm, pl, dummy ) ) { - // popup text %1$s is replaced by disk name e.g. /dev/hda string txt = sformat( + // popup text %1$s is replaced by disk name e.g. /dev/hda _("The partitioning on disk %1$s is not readable by\n" "the partitioning tool fdasd, which is used to change the\n" "partition table.\n" Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Mon Sep 1 17:09:58 2008 @@ -436,8 +436,8 @@ if (label == "unsupported") { - // popup text %1$s is replaced by disk name e.g. /dev/hda string txt = sformat( + // popup text %1$s is replaced by disk name e.g. /dev/hda _("The partition table type on disk %1$s cannot be handled by\n" "this tool.\n" "\n" @@ -831,8 +831,8 @@ y2mil( "nm:" << nm ); if( !dmp_slave && !checkPartedValid( ppart, nm, pl, range_exceed ) ) { - // popup text %1$s is replaced by disk name e.g. /dev/hda string txt = sformat( + // popup text %1$s is replaced by disk name e.g. /dev/hda _("The partitioning on disk %1$s is not readable by\n" "the partitioning tool parted, which is used to change the\n" "partition table.\n" @@ -847,9 +847,9 @@ } if( range_exceed>0 ) { + string txt = sformat( // popup text %1$s is replaced by disk name e.g. /dev/hda // %2$lu and %3$lu are replaced by numbers. - string txt = sformat( _("Your disk %1$s contains %2$lu partitions. The maximum number\n" "of partitions that the kernel driver of the disk can handle is %3$lu.\n" "Partitions numbered above %3$lu cannot be accessed."), @@ -858,6 +858,7 @@ { txt += "\n"; txt += + // popup text _("openSUSE is switching to the new IDE drivers using the libata\n" "modules. These do only support partitions with up to 15\n" "partitions. You have the following options with openSUSE 10.3:\n" Modified: trunk/storage/libstorage/src/Dmmultipath.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipath.cc?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dmmultipath.cc (original) +++ trunk/storage/libstorage/src/Dmmultipath.cc Mon Sep 1 17:09:58 2008 @@ -176,7 +176,8 @@ // displayed text during action, %1$s is replaced by multipath partition e.g. pdc_dabaheedj1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending multipath partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/Dmraid.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmraid.cc?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dmraid.cc (original) +++ trunk/storage/libstorage/src/Dmraid.cc Mon Sep 1 17:09:58 2008 @@ -176,7 +176,8 @@ // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.cc?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmLv.cc (original) +++ trunk/storage/libstorage/src/LvmLv.cc Mon Sep 1 17:09:58 2008 @@ -267,7 +267,8 @@ // displayed text during action, %1$s is replaced by device name e.g. /dev/system/var // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending logical volume %1$s to %2$s"), dev.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/Partition.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.cc?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/libstorage/src/Partition.cc (original) +++ trunk/storage/libstorage/src/Partition.cc Mon Sep 1 17:09:58 2008 @@ -509,7 +509,8 @@ // displayed text during action, %1$s is replaced by device name e.g. /dev/hda1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=50533&r1=50532&r2=50533&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon Sep 1 17:09:58 2008 @@ -2641,7 +2641,8 @@ // displayed text during action, %1$s is replaced by device name e.g. /dev/hda1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org