Author: fehr Date: Tue Dec 11 12:52:35 2007 New Revision: 42953 URL: http://svn.opensuse.org/viewcvs/yast?rev=42953&view=rev Log: fix a bunch of problems with translatable texts (#325687) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/custom_part_helptexts.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/include/raid_lib.ycp trunk/storage/storage/src/inst_custom_part.ycp trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Dec 11 12:52:35 2007 @@ -3,6 +3,7 @@ - require pam_mount to be installed when encryption is used (#345177) - change LILO to GRUB in helptext (#309129) +- fix a bunch of problems with translatable texts (#325687) ------------------------------------------------------------------- Wed Nov 28 17:44:06 CET 2007 - aschnell@suse.de Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_check_generated.ycp?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Tue Dec 11 12:52:35 2007 @@ -419,7 +419,7 @@ // popup text Popup::Error(_("You tried to mount a fat partition to one of the following mount points: / /usr /home /opt /var. -Use a Linux file system, such as ext2 or reiserfs, for these mount points. +Use a Linux file system, such as ext3 or reiserfs, for these mount points. ")); retval = `again; @@ -429,7 +429,7 @@ { // popup text Popup::Error(_("You tried to mount a fat partition to the mount point /boot. -Use a Linux file system, such as ext2 or reiserfs, for this mount point. +Use a Linux file system, such as ext2, ext3 or reiserfs, for this mount point. ")); retval = `again; Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Tue Dec 11 12:52:35 2007 @@ -1264,27 +1264,29 @@ }; -define string AddLvm( boolean lvm, string txt ) - ``{ - txt = sformat( txt, lvm ? _("logical volume") : _("partition") ); - return( txt ); - } - define boolean FsysCannotShrinkPopup( boolean ask, boolean lvm ) ``{ boolean ret = true; - // Popup text - // %1 is either replaced by "logical volume" or by "partition" - string txt = AddLvm( lvm, _(" -The file system on the %1 cannot be shrunk by YaST2. -Only fat, ext2, ext3, and reiser allow shrinking of a file system.")); + string txt = ""; + 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."); + 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."); if( ask ) { txt = txt + "\n"; - txt = txt + AddLvm( lvm, - // Popup text - // %1 is either replaced by "logical volume" or by "partition" - _("You risk losing data if you shrink this %1.")); + if( !lvm ) + // Popup text + txt = txt + _("You risk losing data if you shrink this partition."); + else + // Popup text + txt = txt + _("You risk losing data if you shrink this logical volume."); txt = txt + "\n\n"; txt = txt + _("Continue?"); } @@ -1303,17 +1305,21 @@ define boolean FsysCannotGrowPopup( boolean ask, boolean lvm ) ``{ boolean ret = true; - // Popup text - // %1 is either replaced by "logical volume" or by "partition" - string txt = AddLvm( lvm, _(" -The file system on the selected %1 cannot be extended by YaST2. -Only fat, ext2, ext3, xfs, and reiser allow extending a file system.")); + string txt = ""; + 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."); + 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."); if( ask ) { txt = txt + "\n\n"; - // Popup text - // %1 is either replaced by "logical volume" or by "partition" - txt = txt + AddLvm( lvm, _("Continue resizing the %1?")); + txt = txt + _("Continue resizing?"); } if( ask ) { @@ -1331,26 +1337,31 @@ ``{ // %1 is either replaced by "logical volume" or by "partition" string txt = sformat( _(" -The %1 is currently mounted on %2. +The file system is currently mounted on %1. It is not possible to resize the file system while it is mounted. Unmount the file system and retry resizing. "), - AddLvm( lvm, "%1"), mount ); + mount ); Popup::Error( txt ); } define boolean FsysShrinkReiserWarning( boolean lvm ) ``{ boolean ret = true; - // Popup text - // %1 is either replaced by "logical volume" or by "partition" - ret = Popup::YesNo( AddLvm( lvm, _(" -You decreased a %1 with a reiser file system on it. + string txt = ""; + if( !lvm ) + // Popup text + txt = _("You decreased a partition with a reiser file system on it."); + else + txt = _("You decreased a logical volume with a reiser file system on it."); + txt = txt + "\n"; + txt = txt + _(" It is possible to shrink a reiser file system, but this feature is not very thoroughly tested. A backup of your data is recommended. -Shrink the file system now?"))); +Shrink the file system now?"); + ret = Popup::YesNo( txt ); return( ret ); } Modified: trunk/storage/storage/src/include/custom_part_helptexts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_helptexts.ycp?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_helptexts.ycp (original) +++ trunk/storage/storage/src/include/custom_part_helptexts.ycp Tue Dec 11 12:52:35 2007 @@ -211,8 +211,8 @@ // helptext expert partitioning help_text = help_text + _("<p> -For LVM setup, using a non-LVM root device and a non-LVM swap -device is recommended. Other than the root and swap devices, you should have partitions +For LVM setup, using a non-LVM boot partition is necessary. +Other than the boot partition, you should have partitions managed by LVM.</p> "); @@ -268,7 +268,7 @@ If you have an older PC and want to boot from a partition, make sure it ends below this 1024 cylinder boundary. Create a separate partition and mount it as <b>/boot</b>, if necessary. A partition consisting of one single cylinder -(at least 12 MB) is usually sufficient for that. +(at least 64 MB) is usually sufficient for that. </p> "); // helptext expert partitioning. 13 Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_pv_lib.ycp?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Tue Dec 11 12:52:35 2007 @@ -326,7 +326,7 @@ Popup::Message(_("To use LVM, at least one partition of type 0x8e (or 0x83) is required. Change your partition table accordingly. In most cases, this can be done in the following way: -click 'Create', select 'Do not format', and set the partition ID to 0x8e. +click 'Create', select 'Do not format', and set the File System ID to 0x8e. ")); } else if( Mode::normal() ) Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid_lib.ycp?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Tue Dec 11 12:52:35 2007 @@ -363,7 +363,7 @@ Popup::Message(_("To use RAID, at least two partitions of type 0xFD (or 0x83) are required. Change your partition table accordingly. In most cases, this can be done in the following way: -click 'Create', select 'Do not format', and set the partition ID to 0xFD. +click 'Create', select 'Do not format', and set the File System ID to 0xFD. ")); return false; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_part.ycp?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Tue Dec 11 12:52:35 2007 @@ -1250,7 +1250,7 @@ Popup::Error(_("The value for the partition end is invalid. Enter the end cylinder number (such as 77), an offset (like +122), -or the size of the partition (for example, +100M or 1.8GB).")); +or the size of the partition (for example, +100M or +1.8GB).")); } else { Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=42953&r1=42952&r2=42953&view=diff ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Tue Dec 11 12:52:35 2007 @@ -233,7 +233,7 @@ `query_key : "opt_readonly", // help text, richtext format `help_text : _("<p><b>Mount Read-Only:</b> -No writable access to the file system is possible. Default is false.</p> +No writing to the file system is possible. Default is false.</p> "), `type : `boolean, `str_opt : $[ 1 : "ro", "default" : "" ], @@ -267,7 +267,7 @@ `widget : `Left(`CheckBox(`id("opt_noauto"), `opt(`notify), _("Do Not Mount at System &Start-up"), false)), `query_key : "opt_noauto", // help text, richtext format - `help_text : _("<p><b>Not Mounted at System Start-up:</b> + `help_text : _("<p><b>Do Not Mount at System Start-up:</b> 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> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org