Author: fehr Date: Thu Mar 29 17:52:34 2012 New Revision: 67828 URL: http://svn.opensuse.org/viewcvs/yast?rev=67828&view=rev Log: patched proofread texts back into source code Modified: branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp Modified: branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp Thu Mar 29 17:52:34 2012 @@ -31,7 +31,7 @@ Never partition disks that may, in any way, be in use (mounted, swap, etc.) unless you know exactly what you are doing. Otherwise, the partitioning table will not be forwarded to the -kernel, which would most likely lead to data loss. +kernel, which will most likely lead to data loss. To continue despite this warning, click Yes. "); @@ -47,7 +47,7 @@ // text show during initialization `Label(_("Initializing...")), // helptext - _("<p>Please wait, while volumes are being detected.</p>"), + _("<p>Volumes are being detected.</p>"), false, false ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp Thu Mar 29 17:52:34 2012 @@ -45,7 +45,7 @@ // translators: command line help text for disk module "help" : _("Disk partitioner"), // custum help text (should replace default one) - "customhelp" : _("Command line interface for the partitioner module is not available"), + "customhelp" : _("Command line interface for the partitioner module is not available."), "guihandler" : DiskSequence, ]; Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc Thu Mar 29 17:52:34 2012 @@ -720,14 +720,14 @@ { // displayed text during action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Extending BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Extending Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } else { // displayed text before action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Extend BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Extend Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } return( txt ); @@ -741,14 +741,14 @@ { // displayed text during action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Reducing BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Reducing Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } else { // displayed text before action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Reduce BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Reduce Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } return( txt ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc Thu Mar 29 17:52:34 2012 @@ -67,13 +67,13 @@ if( doing ) { // displayed text during action, %1$s is replaced by raid partition name e.g. pdc_dabaheedj_part1 - txt = sformat( _("Deleting raid partition %1$s"), d.c_str() ); + txt = sformat( _("Deleting RAID partition %1$s"), d.c_str() ); } else { // displayed text before action, %1$s is replaced by raid partition name e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Delete raid partition %1$s (%2$s)"), d.c_str(), + txt = sformat( _("Delete RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } return( txt ); @@ -86,7 +86,7 @@ if( doing ) { // displayed text during action, %1$s is replaced by raid partition name e.g. pdc_dabaheedj_part1 - txt = sformat( _("Creating raid partition %1$s"), d.c_str() ); + txt = sformat( _("Creating RAID partition %1$s"), d.c_str() ); } else { @@ -94,7 +94,7 @@ { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Create swap raid partition %1$s (%2$s)"), + txt = sformat( _("Create swap RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } else if( !mp.empty() ) @@ -105,7 +105,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Create raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Create RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -115,7 +115,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Create encrypted raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Create encrypted RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -124,14 +124,14 @@ { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Create extended raid partition %1$s (%2$s)"), + txt = sformat( _("Create extended RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } else { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Create raid partition %1$s (%2$s)"), + txt = sformat( _("Create RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } } @@ -147,7 +147,7 @@ // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) - txt = sformat( _("Formatting raid partition %1$s (%2$s) with %3$s"), + txt = sformat( _("Formatting RAID partition %1$s (%2$s) with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } else @@ -158,7 +158,7 @@ { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Format raid partition %1$s (%2$s) for swap"), + txt = sformat( _("Format RAID partition %1$s (%2$s) for swap"), d.c_str(), sizeString().c_str() ); } else if( encryption==ENC_NONE ) @@ -167,7 +167,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Format raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Format RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -177,7 +177,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Format encrypted raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Format encrypted RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -187,7 +187,7 @@ // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) - txt = sformat( _("Format raid partition %1$s (%2$s) with %3$s"), + txt = sformat( _("Format RAID partition %1$s (%2$s) with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } @@ -204,11 +204,11 @@ if( needShrink() ) // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Shrinking raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); + txt = sformat( _("Shrinking RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); else // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %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 = sformat( _("Extending RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); txt += Text(" ", " "); // text displayed during action txt += _("(progress bar might not move)"); @@ -218,11 +218,11 @@ if( needShrink() ) // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Shrink raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); + txt = sformat( _("Shrink RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); else // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Extend raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); + txt = sformat( _("Extend RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); } return( txt ); @@ -236,14 +236,14 @@ { // displayed text during action, %1$s is replaced by partition name (e.g. pdc_dabaheedj_part1), // %2$s is replaced by hexadecimal number (e.g. 8E) - txt = sformat( _("Setting type of raid partition %1$s to %2$X"), + txt = sformat( _("Setting type of RAID partition %1$s to %2$X"), d.c_str(), id() ); } else { // displayed text before action, %1$s is replaced by partition name (e.g. pdc_dabaheedj_part1), // %2$s is replaced by hexadecimal number (e.g. 8E) - txt = sformat( _("Set type of raid partition %1$s to %2$X"), + txt = sformat( _("Set type of RAID partition %1$s to %2$X"), d.c_str(), id() ); } return( txt ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc Thu Mar 29 17:52:34 2012 @@ -240,12 +240,12 @@ if( doing ) { // displayed text during action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Removing raid %1$s"), name().c_str() ); + txt = sformat( _("Removing RAID %1$s"), name().c_str() ); } else { // displayed text before action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Remove raid %1$s"), name().c_str() ); + txt = sformat( _("Remove RAID %1$s"), name().c_str() ); } return( txt ); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc Thu Mar 29 17:52:34 2012 @@ -70,12 +70,12 @@ if( doing ) { // displayed text during action, %1$s is replaced by volume name e.g. hilbert:/work - txt = sformat( _("Removing nfs volume %1$s"), dev.c_str() ); + txt = sformat( _("Removing NFS volume %1$s"), dev.c_str() ); } else { // displayed text before action, %1$s is replaced by volume name e.g. hilbert:/work - txt = sformat( _("Remove nfs volume %1$s"), dev.c_str() ); + txt = sformat( _("Remove NFS volume %1$s"), dev.c_str() ); } return( txt ); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc Thu Mar 29 17:52:34 2012 @@ -374,8 +374,7 @@ "If they are clean devices or contain partitions then you can choose to use\n" "MD Partitionable RAID sysbsystem to handle them. In case of clean device you\n" "will be able to install system on it and boot from such RAID.\n" - "Do you want MD Partitionable RAID subsystem to manage those partitions?" - ), boost::join(l, " ").c_str() ); + "Do you want MD Partitionable RAID subsystem to manage those partitions?"), boost::join(l, " ").c_str() ); if( yesnoPopupCb(txt) ) { Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc Thu Mar 29 17:52:34 2012 @@ -72,12 +72,12 @@ if( doing ) { // displayed text during action, %1$s is replaced by path name e.g /var/run - txt = sformat( _("Removing Tmpfs volume from mount point %1$s"), orig_mp.c_str() ); + txt = sformat( _("Removing tmpfs volume from mount point %1$s"), orig_mp.c_str() ); } else { // displayed text before action, %1$s is replaced by path name e.g /var/run - txt = sformat( _("Remove Tmpfs volume from mount point %1$s"), orig_mp.c_str() ); + txt = sformat( _("Remove tmpfs volume from mount point %1$s"), orig_mp.c_str() ); } return( txt ); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Thu Mar 29 17:52:34 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr@suse.de +- patched proofread texts back into source code - prevent invalid size values in tmpfs size (bnc#754326) ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp Thu Mar 29 17:52:34 2012 @@ -80,7 +80,7 @@ // pushbutton to choose the entire disk, erasing all data on // the disk this is an easy way to select all partitions on // the target disk - `Left(`PushButton (`id (`full), _("Use &entire hard disk")))); + `Left(`PushButton (`id (`full), _("Use &Entire Hard Disk")))); vbox_contents = add (vbox_contents, `VSpacing(0.5) ); @@ -131,11 +131,11 @@ `VSpacing(0.5), `Left (`RadioButton (`id (`part_id), // Radio button for using an entire (Windows) partition for Linux - _("&Delete Windows completely") ) ), + _("&Delete Windows Completely") ) ), `VSpacing(0.5), `Left (`RadioButton (`id (`resize), // Radio button for resizing a (Windows) partition - _("&Shrink Windows partition"), true ) ) + _("&Shrink Windows Partition"), true ) ) ) ) ) @@ -158,9 +158,10 @@ "); // helptext, part 2 of 4 helptext = helptext + _("<p> -You can either use the <b>entire hard disk</b> or one or more of the +Use either the <b>entire hard disk</b> or one or more of the partitions or free regions shown. -</p>"); +</p> +"); // helptext, part 3 of 4 helptext = helptext + _("<p> Notice: If you select a region that is not shown as <i>free</i>, you Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp Thu Mar 29 17:52:34 2012 @@ -216,8 +216,8 @@ if( fat_system_mount || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to one of -the following mount points: / /usr /home /opt /var. This will very likely + string message = _("You tried to mount a FAT partition to one of the following mount +points: /, /usr, /home, /opt or /var. This will very likely cause problems. Use a Linux file system, such as ext3, for these mount points. @@ -231,7 +231,7 @@ if( fat_system_boot || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to the + string message = _("You tried to mount a FAT partition to the mount point /boot. This will very likely cause problems. Use a Linux file system, such as ext3, for this mount point. @@ -294,7 +294,7 @@ // popup text, %1 is a size string message = sformat(_("Warning: Your boot partition is smaller than %1. -It is recommended to increase the size of /boot. +We recommend to increase the size of /boot. Really keep this size of boot partition? "), Storage::KByteToHumanStringOmitZeroes(12*1024)); @@ -318,8 +318,8 @@ string message = sformat(_("Warning: There is no partition mounted as /boot. To boot from your hard disk, a small /boot partition (approx. %1) is required. Consider creating one. -(Partitions assigned to /boot will automatically be changed to -type 0x41 PReP/CHRP). +Partitions assigned to /boot will automatically be changed to +type 0x41 PReP/CHRP. Really use the setup without /boot partition? "), Storage::KByteToHumanStringOmitZeroes(4*1024)); @@ -393,9 +393,9 @@ // popup text string message = sformat(_("Warning: With your current setup, your %2 installation will encounter problems when booting, because you have no -FAT partition mounted onto %1. +FAT partition mounted on %1. -This will give severe problems with the normal boot setup. +This will cause severe problems with the normal boot setup. If you do not know exactly what you are doing, use a normal FAT partition for your files below %1. @@ -414,7 +414,7 @@ encounter problems when booting, because you have no separate %1 partition on your RAID disk. -This will give severe problems with the normal boot setup. +This will cause severe problems with the normal boot setup. If you do not know exactly what you are doing, use a normal partition for your files below %1. @@ -440,8 +440,8 @@ { // popup text string message = _(" -You have not assigned a swap partition. There is nothing wrong with that, but -in most cases it is highly recommended to create and assign a swap partition. +You have not assigned a swap partition. In most cases, we highly recommend +to create and assign a swap partition. Swap partitions on your system are listed in the main window with the type \"Linux Swap\". An assigned swap partition has the mount point \"swap\". You can assign more than one swap partition, if desired. @@ -458,7 +458,7 @@ // popup text string message = _(" You chose to install onto an existing partition that will not be -formatted. YaST2 cannot guarantee your installation will succeed, +formatted. YaST cannot guarantee your installation will succeed, particularly in any of the following cases: ") + // continued popup text @@ -468,9 +468,9 @@ - if this partition does not yet contain a file system ") + // continued popup text -_("If in doubt, you might want to go back and mark this partition for +_("If in doubt, better go back and mark this partition for formatting, especially if it is assigned to one of the standard mount points -like /, /boot, /usr, /opt, or /var. +like /, /boot, /usr, /opt or /var. ") + // continued popup text _("If you decide to format the partition, all data on it will be lost. @@ -591,12 +591,12 @@ { // popup text %1 is directory name string message = sformat(_("The selected device is currently mounted on %1. -It is *strongly* recommended to unmount it manually +We *strongly* recommend to unmount it manually before deleting it. Click Cancel unless you know exactly what you are doing. -If you proceed, YaST2 will try unmounting before deleting it. +If you proceed, YaST will try unmounting before deleting it. "), mounts ); @@ -649,9 +649,8 @@ if( !ok ) { // 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. + Popup::Message(sformat(_("The device (%1) cannot be removed since it is a logical partition and +another logical partition with a higher number is in use. "), part_name )); return( false ); } @@ -709,8 +708,8 @@ // popup text string message = sformat(_("The selected extended partition contains partitions which are currently mounted: %1 -It is *strongly* recommended to unmount these partitions before you delete the extended partition. -Please choose Cancel unless you know exactly what you are doing. +We *strongly* recommend to unmount these partitions before you delete the extended partition. +Choose Cancel unless you know exactly what you are doing. "), mounted_parts ); if( ! Popup::ContinueCancel(message)) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -53,7 +53,7 @@ string label = ""; if( format ) // label text - label = _("Don't forget what you enter here!"); + label = _("Do not forget what you enter here!"); if( tmpcrypt ) { if( size(label)>0 ) @@ -81,7 +81,7 @@ // translator comment: %1 is the device name, %2 is a directory // example: "...password for device /dev/hda6 mounted on /var" - string enter = sformat(_("Enter your crypt password for + string enter = sformat(_("Enter your encryption password for device %1 mounted on %2. "),device,mount); @@ -94,7 +94,7 @@ `HBox( `HSpacing(1), // heading text - `Heading(_("Enter your password for the encrypted file system")), + `Heading(_("Enter your Password for the Encrypted File System")), `HSpacing(1) ), `VSpacing(2), @@ -109,7 +109,7 @@ `Password(`id("pw1"), // Label: get password for user root // Please use newline if label is longer than 40 characters - _("&Enter a password for your file system:"), ""), + _("&Enter a Password for your File System:"), ""), `HSpacing(15)), `VSpacing(0.5), @@ -117,7 +117,7 @@ `Password(`id("pw2"), // Label: get same password again for verification // Please use newline if label is longer than 40 characters - _("Reenter the password for &verification:"), ""), + _("Reenter the Password for &Verification:"), ""), `HSpacing(15)) ), `HSpacing(4) @@ -157,7 +157,10 @@ if ( pw1 != pw2 ) { // popup text - Popup::Message(_("The first and the second version\nof the password do not match!\nPlease try again.")); + Popup::Message(_("The first and the second version +of the password do not match! +Try again. +")); } else if (pw1 == "") { @@ -211,7 +214,7 @@ posdot = search( query, "," ); if( posdot!=nil ) { - Popup::Error(_("No floating point number!")); + Popup::Error(_("No floating point number.")); ret = `error; } else @@ -409,11 +412,12 @@ if( new["enc_type"]:`none==`none && new["type"]:`unknown!=`tmpfs ) { // help text, richtext format - helptext = helptext + _("<p><b>Mount in /etc/fstab By:</b> + helptext = helptext + _("<p><b>Mount in /etc/fstab by:</b> Normally, a file system to mount is identified in /etc/fstab -by the device name. This identification can be changed so the file system to mount -is found by searching for a UUID or a volume label. Not all file systems can be -mounted by UUID or a volume label. If an option is disabled, it is not possible. +by the device name. This identification can be changed so the file system +to mount is found by searching for a UUID or a volume label. Not all file +systems can be mounted by UUID or a volume label. If an option is disabled, +this is not possible. "); // help text, richtext format @@ -434,10 +438,10 @@ `VBox( `Left( `RadioButton( `id(`device), // label text - _("&Device name") )), + _("&Device Name") )), `Left( `RadioButton( `id(`label), // label text - _("Volume &label") )), + _("Volume &Label") )), `Left( `RadioButton( `id(`uuid), // label text "U&UID" )) @@ -556,7 +560,7 @@ `VBox( `HSpacing(50), // heading text - `Left(`Heading(_("Fstab options:"))), + `Left(`Heading(_("Fstab Options:"))), `VStretch(), `VSpacing(1), `HBox(`HStretch(), @@ -665,7 +669,7 @@ // popup text %1 is a number Popup::Error( sformat(_(" Maximum volume label length for the selected file system -is %1. Your volume label was truncated to this size. +is %1. Your volume label has been truncated to this size. "), max_len )); } if( search(new["label"]:"","/")!=nil ) @@ -837,7 +841,7 @@ return `VBox( `ComboBox(`id(`fs), `opt(`hstretch, `notify), // label text - _("File &system"), filesystems), + _("File &System"), filesystems), `PushButton(`id(`fs_options), `opt(`hstretch), // button text _("O&ptions...")) @@ -855,7 +859,7 @@ return `VBox( `Left(`CheckBox(`id(`crypt_fs), `opt(`notify), // button text - _("&Encrypt device"), cr))); + _("&Encrypt Device"), cr))); } @@ -1020,7 +1024,7 @@ your Linux installation might be damaged. Unmount the partition if possible. If you are unsure, -it is recommended to abort. Do not proceed unless you know +we recommend to abort. Do not proceed unless you know exactly what you are doing. Continue? @@ -1041,13 +1045,15 @@ if( !lvm ) // Popup text txt = _(" -The file system on the partition cannot be shrunk by YaST2. -Only fat, ext2, ext3 and reiser allow shrinking of a file system."); +YaST cannot shrink the file system on the partition. +Only FAT, ext2, ext3 and reiser allow shrinking of a file system. +"); else // Popup text txt = _(" -The file system on the logical volume cannot be shrunk by YaST2. -Only fat, ext2, ext3 and reiser allow shrinking of a file system."); +YaST cannot shrink the file system on the logical volume. +Only FAT, ext2, ext3 and reiser allow shrinking of a file system. +"); if( ask ) { txt = txt + "\n"; @@ -1079,13 +1085,15 @@ if( !lvm ) // Popup text txt = _(" -The file system on the selected partition cannot be extended by YaST2. -Only fat, ext2, ext3, xfs, and reiser allow extending a file system."); +YaST cannot extend the file system on the selected partition. +Only FAT, ext2, ext3, XFS and reiser allow extending a file system. +"); else // Popup text txt = _(" -The file system on the selected logical volume cannot be extended by YaST2. -Only fat, ext2, ext3, xfs, and reiser allow extending a file system."); +YaST cannot extend the file system on the selected logical volume. +Only FAT, ext2, ext3, XFS and reiser allow extending a file system. +"); if( ask ) { txt = txt + "\n\n"; @@ -1227,7 +1235,7 @@ // popup text, %1 is replaced by device name string message = sformat(_("The selected device contains partitions that are currently mounted: %1 -It is *strongly* recommended to unmount these partitions before deleting the partition table. +We *strongly* recommended to unmount these partitions before deleting the partition table. Choose Cancel unless you know exactly what you are doing. "), mounted_parts ); @@ -1320,8 +1328,9 @@ ``{ // help text, richtext format string helptext = _("<p> -Here it is possible to create and remove subvolumes -from an BTRFS filesystem.</p>"); +Create and remove subvolumes +from a Btrfs filesystem.</p> +"); list<map> old_subvol = new["subvol"]:[]; @@ -1422,7 +1431,7 @@ { if( changed ) { - if( Popup::YesNo( _("Modifications done so far in Dialog get lost!")) ) + if( Popup::YesNo( _("Modifications done so far in this dialog will be lost.")) ) new["subvol"] = old_subvol; else ret = `again; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp Thu Mar 29 17:52:34 2012 @@ -64,8 +64,8 @@ { helptext = helptext + _("<p> This mount point corresponds to a temporary filesystem like /tmp or /var/tmp. -You may leave the crypt password empty. If you do this, the system will create -a random password at system startup for you. This means, you will lose all +If you leave the encryption password empty, the system will create +a random password at system startup for you. This means, you will lose all data on these filesystems at system shutdown. </p> "); @@ -109,8 +109,9 @@ // help text for cryptofs string helptext = _("<p> -You will need to enter your crypt fs password. -</p>"); +You will need to enter your encryption password. +</p> +"); // help text, continued helptext = helptext + _("<p> @@ -127,21 +128,23 @@ define string ia64_gpt_text() { return( _("Warning: With your current setup, your installation -will encounter problems when booting, because the disk you -have your /boot partition on does not contain a GPT disk label. +will encounter problems when booting, because the disk on which +your /boot partition is located does not contain a GPT disk label. It will probably not be possible to boot such a setup. If you need to use this disk for installation, you should destroy -the disk label in the expert partitioner.") ); +the disk label in the expert partitioner. +") ); } define string ia64_gpt_fix_text() { - return( _("Warning: Your system states that is reqires an EFI + return( _("Warning: Your system states that it reqires an EFI boot setup. Since the selected disk does not contain a -GPT disk label we create a GPT label on this disk. +GPT disk label YaST will create a GPT label on this disk. -You need to mark all partitions on this disk for removal.") ); +You need to mark all partitions on this disk for removal. +") ); } } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp Thu Mar 29 17:52:34 2012 @@ -83,10 +83,10 @@ { // error popup text ret = Popup::YesNo( -_("You have selected not to mount automatically at start-up a file system +_("You have selected to not automatically mount at start-up a file system that may contain files that the system needs to work properly. -This might lead to trouble. +This may cause problems. Really do this? ")); @@ -149,8 +149,8 @@ { // error popup text ret = Popup::YesNo( -_("You have set the option to be mountable by users for a file system -that may contain files that need to be executable. +_("You have set a file system as mountable by users. The file system +may contain files that need to be executable. This usually causes problems. @@ -447,8 +447,8 @@ This file system is not supported in %1;. It is completely untested and might not be well-integrated -in the system. Do not file bugs against the file system -itself if it does not work properly or at all. +in the system. Do not report bugs against this file system +if it does not work properly or at all. Really use this file system? "), Product::name ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp Thu Mar 29 17:52:34 2012 @@ -99,9 +99,10 @@ if (!display_info["TextMode"]:false) { // helptext - helptext = helptext + _("<p>By double clicking on a table entry -you can navigate to the view with detailed information about the -device.</p>"); + helptext = helptext + _("<p>By double clicking a table entry, +you navigate to the view with detailed information about the +device.</p> +"); } else { @@ -186,12 +187,14 @@ if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || (Mode::normal() && WFM::ClientExists("multipath"))) // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); + CallConfig(_("Calling multipath configuration cancels all current changes. +Really call multipath configuration? +"), ["yast2-multipath"], "multipath"); else // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), nil, "multipath-simple"); + CallConfig(_("Calling multipath configuration cancels all current changes. +Really call multipath configuration? +"), nil, "multipath-simple"); break; case `cryptpwd: Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -121,7 +121,7 @@ string MiniWorkflowStepResizeVolumeHelptext() { // helptext - string helptext = _("<p>Change the devices that are used by the BTRFS volume.</p>"); + string helptext = _("<p>Change the devices that are used by the Btrfs volume.</p>"); return helptext; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp Thu Mar 29 17:52:34 2012 @@ -15,7 +15,7 @@ if (device == nil) { // error popup - Popup::Error(_("No BTRFS device selected.")); + Popup::Error(_("No Btrfs device selected.")); return; } @@ -47,7 +47,7 @@ if (device == nil) { // error popup - Popup::Error(_("No BTRFS device selected.")); + Popup::Error(_("No Btrfs device selected.")); return; } @@ -100,7 +100,7 @@ if (device == nil) { // error popup - Popup::Error(_("No BTRFS device selected.")); + Popup::Error(_("No Btrfs device selected.")); return; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp Thu Mar 29 17:52:34 2012 @@ -78,7 +78,7 @@ `VBox( `HStretch(), // heading - `IconAndHeading(_("Btrfs Volumes (BTRFS)"), StorageIcons::dm_icon ), + `IconAndHeading(_("Btrfs Volumes"), StorageIcons::dm_icon ), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), ArrangeButtons([ // push button text @@ -90,7 +90,7 @@ )); // helptext - string helptext = _("<p>This view shows all BTRFS volumes.</p>"); + string helptext = _("<p>This view shows all Btrfs volumes.</p>"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -135,7 +135,8 @@ // helptext string helptext = _("<p>This view shows detailed information about the -selected BTRFS volume.</p>"); +selected Btrfs volume.</p> +"); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -191,7 +192,8 @@ // helptext string helptext = _("<p>This view shows all devices used by the -selected BTRFS volume.</p>"); +selected Btrfs volume.</p> +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -21,8 +21,9 @@ // helptext helptext = helptext + _("<p>If you want to encrypt all data on the -volume select <b>Encrypt device</b>. Changing the encryption on an existing -volume will delete all data on it.</p>"); +volume, select <b>Encrypt Device</b>. Changing the encryption on an existing +volume will delete all data on it.</p> +"); // helptext helptext = helptext + _("<p>Then, choose whether the partition should @@ -482,16 +483,16 @@ if (data["used_fs"]:`unknown == `swap) // helptext helptext = helptext + _("<p> -The file system used for this volume is swap. You may leave the crypt password -empty but then the swap device cannot be used for hibernating (suspend to -disk). +The file system used for this volume is swap. You can leave the encryption +password empty, but then the swap device cannot be used for hibernating +(suspend to disk). </p> "); else // helptext helptext = helptext + _("<p> This mount point corresponds to a temporary filesystem like /tmp or /var/tmp. -You may leave the crypt password empty. If you do this, the system will create +If you leave the encryption password empty, the system will create a random password at system startup for you. This means, you will lose all data on these filesystems at system shutdown. </p> @@ -536,9 +537,9 @@ if( two_pw ) { - label = _("All data previously present on the volume will be lost!"); + label = _("All data stored on the volume will be lost!"); label = label + "\n"; - label = label + _("Don't forget what you enter here!"); + label = label + _("Do not forget what you enter here!"); label = label + "\n"; } if (empty_pw_allowed) @@ -549,7 +550,7 @@ ad = `Password( `id(`pw2), `opt(`hstretch), // Label: get same password again for verification // Please use newline if label is longer than 40 characters - _("Reenter the password for &verification:"), ""); + _("Reenter the Password for &Verification:"), ""); term contents = `HVSquash(`FrameWithMarginBox(_("Password"), @@ -557,7 +558,7 @@ `Password(`id(`pw1), `opt(`hstretch), // Label: get password for user root // Please use newline if label is longer than 40 characters - _("&Enter a password for your file system:"), ""), + _("&Enter a Password for your File System:"), ""), ad, `VSpacing(0.5), `Left(`Label(label)) @@ -665,7 +666,9 @@ { y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); //FIXME: Really? - Popup::Error(sformat(_("Partition %1 cannot be resized\nbecause the filesystem seems to be inconsistent"), device)); + Popup::Error(sformat(_("Partition %1 cannot be resized +because the filesystem seems to be inconsistent. +"), device)); return false; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp Thu Mar 29 17:52:34 2012 @@ -55,9 +55,10 @@ ); // helptext - string helptext = _("<p>This view shows all Device Mapper devices -except for those already included in some other view. Thus Multipath Disks, -BIOS RAIDs and LVM logical volumes are not shown here.</p>"); + string helptext = _("<p>This view shows all Device Mapper devices except for those already +included in some other view. Therefore multipath disks, +BIOS RAIDs and LVM logical volumes are not shown here.</p> +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp Thu Mar 29 17:52:34 2012 @@ -434,9 +434,10 @@ string helptext = _("<p>Select one or more (if available) hard disks that will have the same partition layout as this disk.</p> -<p>Disks marked with '*' sign contain one or +<p>Disks marked with the sign '*' contain one or more partitions. After cloning, these -partitions will be deleted.</p>"); +partitions will be deleted.</p> +"); list <string> AvailableTargetDisks() { @@ -483,9 +484,10 @@ } if (isempty(myparts)) { - Popup::Error(_("There are no partitions on this disk (a clonable -disk must have at least one partition). -Create some partitions before cloning the disk.")); + Popup::Error(_("There are no partitions on this disk, but a clonable +disk must have at least one partition. +Create partitions before cloning the disk. +")); return; } @@ -530,7 +532,7 @@ list <string> selected_disks = (list <string>) UI::QueryWidget(`id(`tdisk), `SelectedItems); if (isempty(selected_disks)) { - Popup::Error(_("Select some target disk for creating a clone")); + Popup::Error(_("Select a target disk for creating a clone")); UI::SetFocus(`id(`tdisk)); ret = nil; continue; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp Thu Mar 29 17:52:34 2012 @@ -171,7 +171,8 @@ // helptext string helptext = _("<p>This view shows all hard disks including -iSCSI disks, BIOS RAIDs and Multipath disks and their partitions.</p>"); +iSCSI disks, BIOS RAIDs and multipath disks and their partitions.</p> +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -307,7 +308,7 @@ expert_cmds = add(expert_cmds, `item(`id(`clone_disk), // menu entry text - _("Clone This Disk"))); + _("Clone this Disk"))); if (String::StartsWith(device, "/dev/dasd")) { @@ -336,8 +337,9 @@ // helptext string helptext = _("<p>This view shows all partitions of the selected -hard disk. If the hard disk is used by e.g. BIOS RAID or multipath no -partitions are shown here.</p>"); +hard disk. If the hard disk is used by e.g. BIOS RAID or multipath, no +partitions are shown here.</p> +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -403,7 +405,8 @@ // helptext string helptext = _("<p>This view shows all devices used by the selected hard disk. The view is only available for BIOS RAIDs, partitioned -software RAIDs and Multipath Disks.</p>"); +software RAIDs and multipath disks.</p> +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp Thu Mar 29 17:52:34 2012 @@ -219,9 +219,10 @@ string FstabAddDialogHelptext() { // help text, richtext format - string helptext = _("<p>YaST2 has scanned your hard disks and found -one or several existing Linux systems with mount points. The old mount points -are shown in the table.</p>"); + string helptext = _("<p>YaST has scanned your hard disks and found one or several existing +Linux systems with mount points. The old mount points are shown in +the table.</p> +"); // help text, richtext format helptext = helptext + _("<p>You can choose whether the existing system @@ -270,7 +271,7 @@ `opt(`decorated), `VBox( `VSpacing(0.45), // dialog heading - `Left(`Heading(_("Import Mount Points from existing System:"))), + `Left(`Heading(_("Import Mount Points from Existing System:"))), `MarginBox(1, 0.5, `VBox( `Left(`ReplacePoint(`id(`device), `Empty())), @@ -279,7 +280,7 @@ navigate_buttons, `VSpacing(0.45), // checkbox label - `Left(`CheckBox(`id(`format_sys), _("Format system volumes"), true)) + `Left(`CheckBox(`id(`format_sys), _("Format System Volumes"), true)) ) ), `ButtonBox( @@ -390,7 +391,7 @@ } else { - Popup::Error(_("Wrong Password provided.")); + Popup::Error(_("Wrong Password Provided.")); } } else if( size(pwd)==0 ) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp Thu Mar 29 17:52:34 2012 @@ -85,9 +85,10 @@ list<string> volumes = Storage::GetAffectedDevices( device ); return ( ConfirmRecursiveDelete( device, volumes, _("Confirm Deleting Partition Used by LVM"), - sformat(_("The selected partition is used by volume group \"%1\" -To keep system in consistent state, the following volume group -and its logical volumes will be deleted:"), used_by_device), + sformat(_("The selected partition is used by volume group \"%1\". +To keep the system in a consistent state, the following volume group +and its logical volumes will be deleted: +"), used_by_device), sformat( _("Delete partition \"%1\" and volume group \"%2\" now?"), device, used_by_device) )); break; @@ -97,9 +98,10 @@ list<string> volumes = Storage::GetAffectedDevices( device ); return ( ConfirmRecursiveDelete( device, volumes, _("Confirm Deleting Partition Used by RAID"), - sformat(_("The selected partition belongs to RAID \"%1\" -To keep system in consistent state, the following -RAID device will be deleted:"), used_by_device), + sformat(_("The selected partition belongs to RAID \"%1\". +To keep the system in a consistent state, the following +RAID device will be deleted: +"), used_by_device), sformat( _("Delete partition \"%1\" and RAID \"%2\" now?"), device, used_by_device) )); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -29,16 +29,16 @@ // helptext helptext = helptext + _(" -<p><b>Size:</b><br>This is the size of the loop file. The file system to -create in the encrypted loop device will have this size.</p> +<p><b>Size:</b><br>This is the size of the loop file. The file system +created in the encrypted loop device will have this size.</p> "); // helptext helptext = helptext + _(" -<p><b>NOTE:</b> During installation, there cannot be any consistency -checks about file size and path names because the file system is not -accessible. It will be created at the end of installation. Be -careful about the size and path name you provide.</p> +<p><b>NOTE:</b> During installation, YaST cannot carry out consistency +checks of file size and path names because the file system is not +accessible. It will be created at the end of the installation. Be +careful when providing the size and path name.</p> "); return helptext; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp Thu Mar 29 17:52:34 2012 @@ -213,9 +213,9 @@ // tree node label `item(`id(`nfs), `icon(StorageIcons::nfs_icon), _("NFS"), open(`nfs)), // tree node label - `item(`id(`btrfs), `icon(StorageIcons::nfs_icon), _("BTRFS"), open(`btrfs)), + `item(`id(`btrfs), `icon(StorageIcons::nfs_icon), _("Btrfs"), open(`btrfs)), // tree node label - `item(`id(`tmpfs), `icon(StorageIcons::nfs_icon), _("TMPFS"), open(`tmpfs)), + `item(`id(`tmpfs), `icon(StorageIcons::nfs_icon), _("tmpfs"), open(`tmpfs)), // tree node label `item(`id(`unused), `icon(StorageIcons::unused_icon), _("Unused Devices"), open(`unused)) ]) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp Thu Mar 29 17:52:34 2012 @@ -105,7 +105,7 @@ ); // helptext - string helptext = _("<p>This view shows all RAIDs except of BIOS RAIDs.</p>"); + string helptext = _("<p>This view shows all RAIDs except BIOS RAIDs.</p>"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp Thu Mar 29 17:52:34 2012 @@ -115,7 +115,7 @@ `Left(`HBox( `MultiSelectionBox(`id(`visible_fields), `opt(`shrinkable, `notify), // multi selection box label - _("Visible Information On Storage Devices"), + _("Visible Information on Storage Devices"), PreselectVisibleFields()), `HStretch() )) @@ -131,20 +131,23 @@ // helptext helptext = helptext + _("<p><b>Default Mount by</b> gives the mount by method for newly created file systems. <i>Device Name</i> uses the kernel -device name which is not persistent. <i>Device ID</i> and <i>Device Path</i> +device name, which is not persistent. <i>Device ID</i> and <i>Device Path</i> use names generated by udev from hardware information. These should be persistent but unfortunately this is not always true. Finally <i>UUID</i> and -<i>Volume Label</i> use the file systems UUID and label.</p>"); +<i>Volume Label</i> use the file systems UUID and label.</p> +"); // helptext helptext = helptext + _("<p><b>Default File System</b> gives the file -system type for newly created file file systems.</p>"); +system type for newly created file systems.</p> +"); // helptext helptext = helptext + _("<p><b>Alignment of Newly Created Partitions</b> determines how created partitions are aligned. <b>cylinder</b> is the traditional alignment at cylinder boundaries of the disk. <b>optimal</b> aligns the -partitions for best performance according to hints provided by linux kernel -or tries to be compatible with Windows Vista and Win 7.</p>"); +partitions for best performance according to hints provided by the Linux +kernel or tries to be compatible with Windows Vista and Win 7.</p> +"); // helptext helptext = helptext + _("<p><b>Show Storage Devices by</b> controls Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp Thu Mar 29 17:52:34 2012 @@ -22,7 +22,7 @@ ); // helptext - string helptext = _("<p>This view show the installation summary.</p>"); + string helptext = _("<p>This view shows the installation summary.</p>"); Wizard::RestoreHelp(helptext); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -21,7 +21,7 @@ ]; // dialog title - string title = _("Add Tmpfs Mount"); + string title = _("Add tmpfs Mount"); symbol widget = MiniWorkflow::Run(title, StorageIcons::dm_icon, aliases, sequence, "FormatMount"); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp Thu Mar 29 17:52:34 2012 @@ -15,7 +15,7 @@ if (device == nil) { // error popup - Popup::Error(_("No TMPFS device selected.")); + Popup::Error(_("No tmpfs device selected.")); return; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp Thu Mar 29 17:52:34 2012 @@ -70,7 +70,7 @@ `VBox( `HStretch(), // heading - `IconAndHeading(_("Tmpfs Volumes (TMPFS)"), StorageIcons::dm_icon ), + `IconAndHeading(_("tmpfs Volumes"), StorageIcons::dm_icon ), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), ArrangeButtons([ // push button text @@ -82,7 +82,7 @@ )); // helptext - string helptext = _("<p>This view shows all TMPFS volumes.</p>"); + string helptext = _("<p>This view shows all tmpfs volumes.</p>"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -127,7 +127,8 @@ // helptext string helptext = _("<p>This view shows detailed information about the -selected TMPFS volume.</p>"); +selected tmpfs volume.</p> +"); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -162,7 +163,7 @@ Greasemonkey::Transform( `VBox( // heading - `IconAndHeading(sformat(_("Tmpfs mounted at %1"), device), StorageIcons::lvm_lv_icon), + `IconAndHeading(sformat(_("tmpfs mounted at %1"), device), StorageIcons::lvm_lv_icon), `DumbTab(`id(`tab), [ // push button text `item(`id(`overview), _("&Overview")) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp Thu Mar 29 17:52:34 2012 @@ -37,16 +37,13 @@ string help_text = ""; // helptext LVM partitioning. - help_text = _("<p>Here, create the logical -volumes used to store your data.</p> + help_text = _("Create the logical volumes used to store your data.</p> "); // helptext LVM partitioning. - help_text = help_text + _("<p> -Logical volumes are -usable almost everywhere normal <b>disk partitions</b> can be used. -You can create file systems on logical volumes and use them, for example, as swap -or as raw partitions for databases.</p> + help_text = help_text + _("<p> Logical volumes can be used almost everywhere where normal <b>disk +partitions</b> can be used. Create file systems on logical volumes and use +them, for example, as swap or as raw partitions for databases.</p> "); // helptext LVM partitioning. @@ -60,7 +57,7 @@ // helptext LVM partitioning. help_text = help_text + _("<p> The logical volumes need to be large enough -to hold all the files to install now, but you do not necessarily need to +to hold all the files to install, but you do not necessarily need to allocate all your physical storage now. The file systems can be increased later while your system is in use. </p> @@ -89,11 +86,9 @@ "); // helptext LVM partitioning. - help_text = help_text + _("<p> -Under normal circumstances, there is no need to have more than one volume -group. If you need more than one volume group for special reasons, -create them here. Each volume group must have at least one partition -that belongs to that volume group.</p> + help_text = help_text + _("<p> Under normal circumstances, there is no need to have more than one +volume group. If you need more anyway, create them here. Each volume +group must have at least one partition.</p> "); // helptext LVM partitioning. @@ -228,7 +223,7 @@ define term get_pv_content( list table_list, list vg_list, string vg_size_str ) ``{ // button text - string lvm_mp_button = _("LVM Multipath detection"); + string lvm_mp_button = _("LVM Multipath Detection"); return( `HBox(`HSpacing(2.5), `VBox( `VSpacing(0.1), @@ -248,11 +243,11 @@ `Top(`PushButton( `id(`vg_remove_vg), `opt(`hstretch), // button text - _("Remove &group"))), + _("Remove &Group"))), `Bottom(`PushButton( `id(`vg_add_vg), `opt(`hstretch), // button text - _("A&dd group")))))) + _("A&dd Group")))))) )), `VSpacing(0.2), `VWeight(50, get_pv_table_content( table_list )) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp Thu Mar 29 17:52:34 2012 @@ -38,7 +38,7 @@ // help text richtext format // %1 is replaced by description text for server name string helptext = sformat( _(" -<p><b>%1:</b><br>This must be the name of a nfs server. +<p><b>%1:</b><br>This must be the name of a NFS server. The server needs to be accessible.</p> "), sv ); @@ -46,7 +46,7 @@ // %1 is replaced by description text for nfs path helptext = helptext + sformat( _(" <p><b>%1:</b><br>This is the absolute path exported on the -nfs server. +NFS server. "), sp ); return helptext; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp Thu Mar 29 17:52:34 2012 @@ -216,8 +216,8 @@ // %1 is replaced by button text help_text = help_text + sformat(_("<p> To make only small adjustments to the proposed -setup (like e.g. changing filesystem types), choose -<b>%1</b> and do these modification in the expert +setup (like changing filesystem types), choose +<b>%1</b> and modify the settings in the expert partitioner dialog.</p> "), deletechars(modify_str,"&")); @@ -232,17 +232,17 @@ // help text continued help_text = help_text + sformat(_("<p> If the suggestion does not fit your needs, create -your own partition setup starting with the partitions as -currently present on the disks. For this, select +your own partition setup starting with the partitions +currently present on the disks. Select <b>%1</b>. This is also the option to choose for -advanced options like RAID and encryption.</p> +advanced configurations like RAID and encryption.</p> "), deletechars(detailed_str,"&")); // help text continued // %1 is replaced by button text help_text = help_text + _("<p> -To create an LVM based proposal, choose the corresponding button.</p> +To create an LVM-based proposal, choose the corresponding button.</p> "); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp Thu Mar 29 17:52:34 2012 @@ -203,10 +203,11 @@ // help text (common to both modes), continued helptext = helptext + _(" <p> -The actual resizing will be performed only after you confirm all your -settings in the last installation dialog. Until then, your Windows +The actual resizing will not be performed until after you confirm all your +settings in the last installation dialog. Until then your Windows partition will remain untouched. -</p>"); +</p> +"); // help text (common to both modes), continued helptext = helptext + _(" @@ -263,8 +264,9 @@ helptext = helptext + _(" <p> Drag the slider or enter a numeric value in either -input field to adjust the suggested value. -</p>"); +input field to adjust the suggested values. +</p> +"); // help text (graphical mode), continued helptext = helptext + _(" @@ -318,8 +320,9 @@ // help text (non-graphical mode), continued helptext = helptext + _(" <p> -<b>Windows Used</b> is the size of the used part of your Windows partition. -</p>"); +<b>Windows Used</b> is the size of the space your Windows partition uses. +</p> +"); // help text (non-graphical mode), continued helptext = helptext + _(" Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp Thu Mar 29 17:52:34 2012 @@ -475,11 +475,11 @@ // of free space and that he should terminate the installation now. string explanation = sformat( _("An error has occurred. -Insufficient space is available on the Windows partition to allow for +The space available on the Windows partition is not sufficient for the minimum Linux installation. -To install Linux, first boot Windows and uninstall some -applications or delete some data. +To install Linux, boot Windows first and uninstall some +applications or delete data to free space. You need at least %1 MB of free space on the Windows device, including Windows workspace and @@ -583,10 +583,11 @@ // help text (common to both modes), continued helptext = helptext + _(" <p> -The actual resizing will be performed only after you confirm all your -settings in the last installation dialog. Until then, your Windows +The actual resizing will not be performed until after you confirm all your +settings in the last installation dialog. Until then your Windows partition will remain untouched. -</p>"); +</p> +"); // help text (common to both modes), continued helptext = helptext + _(" @@ -643,8 +644,9 @@ helptext = helptext + _(" <p> Drag the slider or enter a numeric value in either -input field to adjust the suggested value. -</p>"); +input field to adjust the suggested values. +</p> +"); // help text (graphical mode), continued helptext = helptext + _(" @@ -698,8 +700,9 @@ // help text (non-graphical mode), continued helptext = helptext + _(" <p> -<b>Windows Used</b> is the size of the used part of your Windows partition. -</p>"); +<b>Windows Used</b> is the size of the space your Windows partition uses. +</p> +"); // help text (non-graphical mode), continued helptext = helptext + _(" Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp Thu Mar 29 17:52:34 2012 @@ -191,11 +191,11 @@ list<map<symbol, any> > options = [ $[ // button text - `widget : `Left(`CheckBox(`id("opt_readonly"), _("Mount &read-only"), false)), + `widget : `Left(`CheckBox(`id("opt_readonly"), _("Mount &Read-Only"), false)), `query_key : "opt_readonly", // help text, richtext format `help_text : _("<p><b>Mount Read-Only:</b> -No writing to the file system is possible. Default is false.</p> +Writing to the file system is not possible. Default is false.</p> "), `type : `boolean, `str_opt : $[ 1 : "ro", "default" : "" ], @@ -203,18 +203,19 @@ ], $[ // button text - `widget : `Left(`CheckBox(`id("opt_noatime"), _("No &access time"), false)), + `widget : `Left(`CheckBox(`id("opt_noatime"), _("No &Access Time"), false)), `query_key : "opt_noatime", // help text, richtext format - `help_text : _("<p><b>No access time:</b> -Access times are not updated when a file is read. Default is false.</p>"), + `help_text : _("<p><b>No Access Time:</b> +Access times are not updated when a file is read. Default is false.</p> +"), `type : `boolean, `str_opt : $[ 1 : "noatime", "default" : "" ], `str_scan : [[ "noatime", 1 ], ["atime", 0 ]], ], $[ // button text - `widget : `Left(`CheckBox(`id("opt_user"), _("Mountable by &user"), false)), + `widget : `Left(`CheckBox(`id("opt_user"), _("Mountable by &User"), false)), `query_key : "opt_user", // help text, richtext format `help_text : _("<p><b>Mountable by User:</b> @@ -233,8 +234,7 @@ The file system is not automatically mounted when the system starts. An entry in /etc/fstab is created and the file system is mounted with the appropriate options when the command <tt>mount <mount point></tt> -(<mount point> is the directory to which the file system is mounted) -is given. Default is false.</p> +is entered (<mount point> is the directory to which the file system is mounted). Default is false.</p> "), `type : `boolean, `str_opt : $[ 1 : "noauto", "default" : "" ], @@ -270,7 +270,7 @@ // help text, richtext format `help_text : _("<p><b>Data Journaling Mode:</b> Specifies the journaling mode for file data. -<tt>journal</tt> -- All data is committed into the journal prior to being +<tt>journal</tt> -- All data is committed to the journal prior to being written into the main file system. Highest performance impact.<br> <tt>ordered</tt> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. Medium performance impact.<br> @@ -319,7 +319,7 @@ ``{ map<symbol,any> opt = $[ // label text - `widget : `TextEntry(`id("opt_arbitrary"), _("Arbitrary option &value"), ""), + `widget : `TextEntry(`id("opt_arbitrary"), _("Arbitrary Option &Value"), ""), `query_key : "opt_arbitrary", // help text, richtext format `help_text : _("<p><b>Arbitrary Option Value:</b> @@ -399,29 +399,30 @@ ], $[ // label text - `widget : `ComboBox(`id("opt_fat_size"), `opt(`hstretch), _("FAT &size"), ["auto", + `widget : `ComboBox(`id("opt_fat_size"), `opt(`hstretch), _("FAT &Size"), ["auto", `item(`id("12"), "12 bit"), `item(`id("16"), "16 bit"), `item(`id("32"), "32 bit") ]), `query_key : "opt_fat_size", `option_str : "-F", // help text, richtext format - `help_text : _("<p><b>FAT size:</b> -Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST2 will automatically select the value most suitable for the file system size.</p> + `help_text : _("<p><b>FAT Size:</b> +Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p> ") ], $[ // label text - `widget : `TextEntry(`id("opt_root_dir_entries"), `opt(`hstretch), _("Root &dir entries"), "auto"), + `widget : `TextEntry(`id("opt_root_dir_entries"), `opt(`hstretch), _("Root &Dir Entries"), "auto"), `query_key : "opt_root_dir_entries", `option_str : "-r", `between : [ 112, -1], `valid_chars : "0123456789", // popup text - `error_text : _("The minimum size for \"Root dir entries\" is 112. Please try again."), + `error_text : _("The minimum size for \"Root Dir Entries\" is 112. Try again."), // help text, richtext format - `help_text : _("<p><b>Root dir entries:</b> -Select the number of entries available in the root directory.</p>") + `help_text : _("<p><b>Root Dir Entries:</b> +Select the number of entries available in the root directory.</p> +") ] ]; @@ -429,22 +430,23 @@ list< map<symbol, any> > reiserfs_options = [ $[ // label text - `widget : `ComboBox(`id("opt_hash"), `opt(`hstretch), _("Hash &function"), ["auto", "r5", "tea" ,"rupasov" ]), + `widget : `ComboBox(`id("opt_hash"), `opt(`hstretch), _("Hash &Function"), ["auto", "r5", "tea" ,"rupasov" ]), `query_key : "opt_hash", `option_str : "--hash", `option_blank : true, // help text, richtext format - `help_text : _("<p><b>Hash function:</b> -This specifies the name of the hash function to use to sort the file names in directories.</p>") + `help_text : _("<p><b>Hash Function:</b> +This specifies the name of the hash function to use to sort the file names in directories.</p> +") ], $[ // label text - `widget : `ComboBox(`id("opt_format"), `opt(`hstretch), _("FS &revision"), ["auto", "3.5", "3.6" ]), + `widget : `ComboBox(`id("opt_format"), `opt(`hstretch), _("FS &Revision"), ["auto", "3.5", "3.6" ]), `query_key : "opt_format", `option_str : "--format", `option_blank : true, // help text, richtext format - `help_text : _("<p><b>FS revision:</b> + `help_text : _("<p><b>FS Revision:</b> This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p> ") ] @@ -454,12 +456,12 @@ list< map<symbol, any> > xfs_options = [ $[ // label text - `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &size in bytes"), ["auto","512","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), + `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &Size in Bytes"), ["auto","512","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), `query_key : "opt_blocksize", `option_str : "-bsize=", // help text, richtext format - `help_text : _("<p><b>Block size:</b> -Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048, and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p> + `help_text : _("<p><b>Block Size:</b> +Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p> ") ], $[ @@ -473,28 +475,28 @@ ], $[ // label text - `widget : `ComboBox(`id("opt_max_inode_space"), `opt(`hstretch), _("&Percentage of inode space"),["auto", "5", "10", "15", "20","25","30", + `widget : `ComboBox(`id("opt_max_inode_space"), `opt(`hstretch), _("&Percentage of Inode Space"),["auto", "5", "10", "15", "20","25","30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", `item(`id("0"), "100") ]), `query_key : "opt_max_inode_space", `option_str : "-imaxpct=", // help text, richtext format - `help_text : _("<p><b>Percentage of inode space:</b> -The option \"Percentage of inode space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p> + `help_text : _("<p><b>Percentage of Inode Space:</b> +The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p> ") ], $[ // label text - `widget : `ComboBox(`id("opt_inode_align"), `opt(`hstretch), _("Inode &aligned"),[ "auto", `item(`id("1"), "true"), + `widget : `ComboBox(`id("opt_inode_align"), `opt(`hstretch), _("Inode &Aligned"),[ "auto", `item(`id("1"), "true"), `item( `id("0"), "false") ]), `query_key : "opt_inode_align", `option_str : "-ialign=", // help text, richtext format `help_text : _("<p><b>Inode Aligned:</b> The option \"Inode Aligned\" is used to specify whether inode allocation is or -is not aligned. The default is that inodes are aligned. Aligned inode access -is normally more efficient than unaligned access.</p> +is not aligned. By default inodes are aligned, which +is usually more efficient than unaligned access.</p> ") ] ]; @@ -519,18 +521,21 @@ */ $[ // label text - `widget : `TextEntry(`id("opt_log_size"), `opt(`hstretch),_("&Log size in megabytes"), "auto"), + `widget : `TextEntry(`id("opt_log_size"), `opt(`hstretch),_("&Log Size in Megabytes"), "auto"), `query_key : "opt_log_size", `option_str : "-s", // no way to find out the max log size ???? `between : [ 0 , -1 ], // -> -1 = infinite `valid_chars : "0123456789", // popup text - `error_text : _("The \"Log size\" value is incorrect.\nPlease enter a value greater than zero."), + `error_text : _("The \"Log Size\" value is incorrect. +Enter a value greater than zero. +"), // xgettext: no-c-format // help text, richtext format - `help_text : _("<p><b>Log size</b> -Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>") + `help_text : _("<p><b>Log Size</b> +Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p> +") ], $[ // label text @@ -543,13 +548,15 @@ list< map<symbol, any> > ext2_options = [ $[ // label text - `widget : `TextEntry(`id("opt_raid"), `opt(`hstretch), _("Stride &length in blocks"), "none" ), + `widget : `TextEntry(`id("opt_raid"), `opt(`hstretch), _("Stride &Length in Blocks"), "none" ), `query_key : "opt_raid", `option_str : "-Rstride=", `valid_chars : "0123456789", `between : [ 1, -1], // popup text - `error_text : _("The \"Stride length in blocks\" value is not possible.\nPlease select a value greater than 1."), + `error_text : _("The \"Stride Length in Blocks\" value is invalid. +Select a value greater than 1. +"), // help text, richtext format `help_text : _("<p><b>Stride Length in Blocks:</b> Set RAID-related options for the file system. Currently, the only supported @@ -559,28 +566,33 @@ ], $[ // label text - `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &size in bytes"), ["auto","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), + `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &Size in Bytes"), ["auto","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), `query_key : "opt_blocksize", `option_str : "-b", // help text, richtext format - `help_text : _("<p><b>Block size:</b> -Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n") + `help_text : _("<p><b>Block Size:</b> +Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p> +") ], $[ // label text - `widget : `ComboBox(`id("opt_inode_density"), `opt(`hstretch), _("Bytes per &inode"),["auto","1024", "2048","4096","8192", "16384","32768" ]), + `widget : `ComboBox(`id("opt_inode_density"), `opt(`hstretch), _("Bytes per &Inode"),["auto","1024", "2048","4096","8192", "16384","32768" ]), `query_key : "opt_inode_density", `option_str : "-i", // help text, richtext format - `help_text : _("<p><b>Bytes per inode:</b> -Specify the bytes to inode ratio. YaST2 creates an inode for every <bytes-per-inode> bytes of space on the disk. The larger the bytes-per-inode ratio, the fewer inodes will be created. -Generally, this value should not be smaller than the block size of the file system, since too many inodes will be created in this case. It is not possible to expand the -number of inodes on a file system after its creation, so be sure to enter a reasonable value for this parameter.</p> + `help_text : _("<p><b>Bytes per Inode:</b> +Specify the bytes to inode ratio. YaST creates an inode for every +<bytes-per-inode> bytes of space on the disk. The larger the +bytes-per-inode ratio, the fewer inodes will be created. Generally, this +value should not be smaller than the block size of the file system, or else +too many inodes will be created. It is not possible to expand the number of +inodes on a file system after its creation. So be sure to enter a reasonable +value for this parameter.</p> ") ], $[ // label text - `widget : `TextEntry(`id("opt_reserved_blocks"), `opt(`hstretch), _("Percentage of blocks &reserved for root"), "auto" ), + `widget : `TextEntry(`id("opt_reserved_blocks"), `opt(`hstretch), _("Percentage of Blocks &Reserved for root"), "auto" ), `query_key : "opt_reserved_blocks", `option_str : "-m", //`default : 5, @@ -588,22 +600,25 @@ `str_length : 6, `valid_chars : "0123456789.", // popup text - `error_text : _("The \"Percentage of blocks reserved for root\" value is incorrect.\nAllowed are float numbers not larger than 99. (e.g. 0.5)"), + `error_text : _("The \"Percentage of Blocks Reserved for root\" value is incorrect. +Allowed are float numbers no larger than 99 (e.g. 0.5). +"), // xgettext: no-c-format // help text, richtext format - `help_text : _("<p><b>Percentage of blocks reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>") + `help_text : _("<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>") ], $[ // checkbox text - `widget : `CheckBox(`id("opt_reg_checks"), `opt(`hstretch), _("Disable regular checks")), + `widget : `CheckBox(`id("opt_reg_checks"), `opt(`hstretch), _("Disable Regular Checks")), `query_key : "opt_reg_checks", `option_str : "-c 0 -i 0", `option_cmd : `tunefs, `type : `boolean, `default : false, // help text, richtext format - `help_text : _("<p><b>Disable regular checks:</b> -Disable regular file system check at booting.</p>\n") + `help_text : _("<p><b>Disable Regular Checks:</b> +Disable regular file system check at booting.</p> +") ] ]; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp Thu Mar 29 17:52:34 2012 @@ -756,20 +756,20 @@ } // popup text %1 is replaced by disk name e.g. /dev/hda text = text + sformat( _(" -The partitioning on your disk %1 is either not readable by -the partitioning tool parted used to change the -partition table or is not supported by this tool. +The partitioning on your disk %1 is either not readable or not +supported by the partitioning tool parted used to change the +partition table. -You may use the partitions on disk %1 as they are or -format them and assign mount points to them, but you -cannot add, edit, resize, or remove partitions from that -disk here.\n"), disk ); +You can use the partitions on disk %1 as they are or +format them and assign mount points, but you cannot add, edit, +resize, or remove partitions from that disk here. +"), disk ); if( expert_partitioner ) { // popup text text = text + _(" -You may initialize the disk partition table to a sane state in the Expert +You can initialize the disk partition table to a sane state in the Expert Partitioner by selecting \"Expert\"->\"Create New Partition Table\", but this will destroy all data on all partitions of this disk. "); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp Thu Mar 29 17:52:34 2012 @@ -2547,7 +2547,7 @@ Popup::Error( sformat(_("Could not set encryption. System error code is %1. -The crypt password provided could be incorrect. +The encryption password provided could be incorrect. "), ret )); LibStorage::StorageInterface::forgetCryptPassword( sint, device ); } @@ -3544,7 +3544,7 @@ Popup::Error( sformat(_("Could not set encryption. System error code is %1. -The crypt password provided could be incorrect. +The encryption password provided could be incorrect. "), i )); y2milestone( "CheckCryptOk dev:%1 pwlen:%2 ret:%3", dev, size(fs_passwd), i==0 ); @@ -3618,7 +3618,7 @@ `Password(`id(`pw2), `opt(`hstretch), // Label: get same password again for verification // Please use newline if label is longer than 40 characters - _("Reenter the password for &verification:"), ""), + _("Reenter the Password for &Verification:"), ""), `HSpacing(13)) ); UI::OpenDialog( @@ -3643,7 +3643,7 @@ `Password(`id(`pw1), `opt(`hstretch), // Label: get password for encrypted volume // Please use newline if label is longer than 40 characters - _("&Enter encryption password:"), ""), + _("&Enter Encryption Password:"), ""), `HSpacing(13)), ad), `HSpacing(4) @@ -3710,8 +3710,7 @@ term ad = `Empty(); if( size(dev2)>0 ) ad = `VBox( - `Left( `Label( _( -"The following encrypted volumes are already available."))), + `Left( `Label( _("The following encrypted volumes are already available."))), `Left(`RichText(HTML::List(sort(dev2)))), `VSpacing(0.2) ); @@ -3728,8 +3727,7 @@ `VBox ( `Left (`Heading (_("Encrypted Volume Activation"))), `VSpacing(0.2), - `Left( `Label( _( -"The following volumes contain an encryption signature but the + `Left( `Label( _("The following volumes contain an encryption signature but the passwords are not yet known. The passwords need to be known if the volumes are needed either during an update or if they contain an encrypted LVM physical volume."))), @@ -3737,7 +3735,7 @@ `Left(`RichText(HTML::List(sort(dev1)))), `VSpacing(0.2), ad, - `Left(`Label( _("Do you want to provide crypt passwords?"))), + `Left(`Label( _("Do you want to provide encryption passwords?"))), button_box ) ) @@ -3780,8 +3778,7 @@ boolean ret = true; boolean rescan_done = false; // text in help field - string helptext = _( -"Enter encryption password for any of the + string helptext = _("Enter encryption password for any of the devices in the locked devices list. Password will be tried for all devices."); // header text @@ -3796,10 +3793,10 @@ if( ret ) { // label text, multiple device names follow - string label = _("Please provide password for any of the following devices:"); + string label = _("Provide password for any of the following devices:"); if( size(crvol["inactive"]:[])==1 ) // label text, one device name follows - label = _("Please provide password for the following device:"); + label = _("Provide password for the following device:"); foreach( string s, crvol["inactive"]:[], ``{ label = label + sformat("\n%1", s ); @@ -4553,7 +4550,7 @@ { txt = sformat( _(" Device %1 cannot be removed because this would indirectly change -device %2 which contains activated swap that is needed to run +device %2, which contains activated swap that is needed to run the installation. "), p["device"]:"", pl[pos,"device"]:"" ); } @@ -4561,7 +4558,7 @@ { txt = sformat( _(" Device %1 cannot be removed because this would indirectly change -device %2 which contains data needed to perform the installation. +device %2, which contains data needed to perform the installation. "), p["device"]:"", pl[pos,"device"]:"" ); } Popup::Message( txt ); @@ -4576,7 +4573,8 @@ { txt = sformat(_(" Partition %1 cannot be removed since other partitions on the -disk %2 are in used."), p["device"]:"", disk["device"]:""); +disk %2 are used. +"), p["device"]:"", disk["device"]:""); Popup::Message(txt); ret = false; }; @@ -5189,7 +5187,7 @@ if (!PackagesProposal::SetResolvables(proposal_ID, `package, pkgs)) { y2error("PackagesProposal::SetResolvables() for %1 failed", pkgs); - Report::Error(sformat(_("Add the following resolvables failed: %1"), pkgs)); + Report::Error(sformat(_("Adding the following resolvables failed: %1"), pkgs)); } if( Stage::initial() ) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp Thu Mar 29 17:52:34 2012 @@ -89,7 +89,7 @@ y2milestone("CommitErrorPopup error%1 last_action%2 extended_message:%3", error, last_action, extended_message); - string text = _("Failure occurred during following action:") + "\n" + last_action + "\n\n"; + string text = _("Failure occurred during the following action:") + "\n" + last_action + "\n\n"; string tmp = LibStorage::StorageInterface::getErrorString(sint, error); if (!isempty(tmp)) @@ -123,7 +123,7 @@ `Password(`id(`password), // Label: get password for device // Please use newline if label is longer than 40 characters - sformat(_("&Enter password for device %1:"), device), password), + sformat(_("&Enter Password for Device %1:"), device), password), `ButtonBox( `PushButton(`id(`ok), `opt(`default), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp Thu Mar 29 17:52:34 2012 @@ -128,12 +128,12 @@ case `mount_by: // Column header - header = add(header, _("Mount By")); + header = add(header, _("Mount by")); break; case `used_by: // Column header - header = add(header, _("Used By")); + header = add(header, _("Used by")); break; case `start_cyl: @@ -148,7 +148,7 @@ case `fs_id: // Column header - header = add(header, `Right(_("FS Id"))); + header = add(header, `Right(_("FS ID"))); break; case `uuid: @@ -320,7 +320,7 @@ case `fs_id: // helptext for table column and overview entry - ret = ret + _("<b>FS Id</b> shows the file system id."); + ret = ret + _("<b>FS ID</b> shows the file system id."); break; case `fs_type: @@ -347,15 +347,17 @@ case `mount_by: // helptext for table column and overview entry - ret = ret + _("<b>Mount By</b> indicates how the file system -is mounted: (Kernel) by Kernel Name, (Label) by File System Label, (UUID) by -File System UUID, (ID) by Device ID, and (Path) by Device Path."); + ret = ret + _("<b>Mount by</b> indicates how the file system +is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) by +file system UUID, (ID) by device ID, and (Path) by device path. +"); if (Mode::normal()) // helptext for table column and overview entry ret = ret + " " + _("A question mark (?) indicates that the file system is not listed in <tt>/etc/fstab</tt>. It is either mounted -manually or by some automount system. When changing setting of this volume -YaST will not update <tt>/etc/fstab</tt>."); +manually or by some automount system. When changing settings for this volume +YaST will not update <tt>/etc/fstab</tt>. +"); break; case `mount_point: @@ -412,7 +414,8 @@ case `stripes: // helptext for table column and overview entry ret = ret + _("<b>Stripes</b> shows the stripe number for LVM -logical volumes and, if greater than one, in parenthesise the stripe size."); +logical volumes and, if greater than one, the stripe size in parenthesis. +"); break; case `type: @@ -423,8 +426,9 @@ case `udev_id: // helptext for table column and overview entry - ret = ret + _("<b>Device Id</b> shows the persistent device -ids. This field can be empty."); + ret = ret + _("<b>Device ID</b> shows the persistent device +IDs. This field can be empty. +"); break; case `udev_path: @@ -436,8 +440,8 @@ case `used_by: // helptext for table column and overview entry ret = ret + _("<b>Used By</b> shows if a device is used by -e.g. RAID or LVM. If you do not use such things, it is perfectly normal for -this column to be empty."); +e.g. RAID or LVM. If not, this column is empty. +"); break; case `uuid: @@ -634,7 +638,7 @@ return value; else // row label, %1 is replace by mount by method - return sformat(_("Mount By: %1"), value); + return sformat(_("Mount by: %1"), value); } case `used_by: @@ -646,7 +650,7 @@ integer n = size(data["used_by"]:[]); return mergestring(maplist(integer i, Integer::Range(n == 0 ? 1 : n), { // row label, %1 is replaced by number, %2 is replace by device name e.g. /dev/system - return sformat(_("Used By %1: %2"), i+1, String::EscapeTags(UsedByString(data["used_by", i]:$[]))); + return sformat(_("Used by %1: %2"), i+1, String::EscapeTags(UsedByString(data["used_by", i]:$[]))); }), HTML::Newline()); } } @@ -916,7 +920,7 @@ return value; else // row label, %1 is replace by file system id - return sformat(_("FS Id: %1"), value); + return sformat(_("FS ID: %1"), value); } case `file_path: Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp Thu Mar 29 17:52:34 2012 @@ -3059,7 +3059,7 @@ Storage::CanDelete( p, target[s]:$[], false)) { if( usable_for_win_resize(p,false) ) - p["dtxt"] = _("Resize impossible due to inconsistent fs. Try checking fs under Windows."); + p["dtxt"] = _("Resize impossible due to inconsistent file system. Try checking file system under Windows."); p["delete"] = true; } return( p ); @@ -3824,7 +3824,7 @@ Storage::CanDelete( p, target[s]:$[], false)) { if( usable_for_win_resize(p,false) ) - p["dtxt"] = _("Resize impossible due to inconsistent fs. Try checking fs under Windows."); + p["dtxt"] = _("Resize impossible due to inconsistent file system. Try checking file system under Windows."); p["delete"] = true; } return( p ); @@ -4140,7 +4140,7 @@ vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox(`id(`btrfs), `opt(`notify), // Label text - _("Use &Btrfs as default Filesystem"), + _("Use &Btrfs as Default File System"), GetProposalBtrfs() )))); term frame = `VBox( `VSpacing(3*space), `HVCenter( `VBox( `Left(`Label( `opt(`boldFont), _("Proposal settings"))), `VSpacing(0.3), `HVCenter(vb)) )); @@ -4177,7 +4177,7 @@ // Label: get same password again for verification // Please use newline if label is longer than 40 characters _("Reenter the password for verification:"), "")), - `Label(_("Don't forget what you enter here!")), + `Label(_("Do not forget what you enter here!")), `ButtonBox( `PushButton(`id(`ok), `opt(`default), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp?rev=67828&r1=67827&r2=67828&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp Thu Mar 29 17:52:34 2012 @@ -148,7 +148,7 @@ { list<string> tmp = [ _("Default Mount-by:") + " " + substring(tostring(Storage::GetDefaultMountBy()), 1), - _("Default Filesystem:") + " " + substring(tostring(Partitions::DefaultFs()), 1), + _("Default File System:") + " " + substring(tostring(Partitions::DefaultFs()), 1), _("Show Storage Devices by:") + " " + substring(tostring(display_name), 1), _("Partition Alignment:") + " " + substring(tostring(Storage::GetPartitionAlignment()), 7), _("Visible Information on Storage Devices:") + " " + HTML::List(visible_fields) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org