Author: fehr Date: Tue Jan 15 18:23:58 2008 New Revision: 43635 URL: http://svn.opensuse.org/viewcvs/yast?rev=43635&view=rev Log: merge proofread texts back into ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/auto_part_ui.ycp branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/custom_part_dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_custom_part.ycp branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_part_proposal.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes?rev=43635&r1=43634&r2=43635&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Tue Jan 15 18:23:58 2008 @@ -3,6 +3,7 @@ - adapt size restrictions of disk label to parted (#352484) - use gpt as default disk label for disks larger 2TB +- merge proofread texts back into ycp - version 2.13.96 ------------------------------------------------------------------- Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/auto_part_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/auto_part_ui.ycp?rev=43635&r1=43634&r2=43635&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/auto_part_ui.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/auto_part_ui.ycp Tue Jan 15 18:23:58 2008 @@ -271,7 +271,7 @@ vb = add (vb, `Left(`HBox(`HSpacing(3), `CheckBox( `id(`home), // Label text - _("Propose Separate &Home Partition" ), + _("Propose Separate &Home Partition"), cfg["home"]:false )))); vb = add (vb, `VSpacing(1) ); vb = add( vb, @@ -285,7 +285,7 @@ _("Create &EVMS Based Proposal"), cfg["prop_evms"]:false )))); vbox = add (vbox, `VSpacing(1.5) ); - term frame = `HVCenter(`Frame( _( "Proposal type" ), `HVCenter(vb) )); + term frame = `HVCenter(`Frame( _("Proposal type"), `HVCenter(vb) )); vbox = add (vbox, frame ); return( vbox ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/custom_part_dialogs.ycp?rev=43635&r1=43634&r2=43635&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/include/custom_part_dialogs.ycp Tue Jan 15 18:23:58 2008 @@ -483,8 +483,8 @@ // help text, richtext format helptext = helptext + _("<p><b>Volume Label:</b> -The name entered in this field is used as the volume label. This normally only -makes sense when you activate the option for mounting by volume label. +The name entered in this field is used as the volume label. This usually makes sense only +when you activate the option for mounting by volume label. A volume label cannot contain the / character or spaces. "); Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_custom_part.ycp?rev=43635&r1=43634&r2=43635&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_custom_part.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_custom_part.ycp Tue Jan 15 18:23:58 2008 @@ -1292,10 +1292,10 @@ The value of the end cylinder %1 was not valid. The used disk label %2 does not support partitions above the size of %3. -Therefore the cylinder value must be below %4. +Therefore, the cylinder value must be below %4. Use the maximum allowed value -or select No and enter a correct value yourself. +or select <b>No</b> and enter a correct value yourself. Use the maximum allowed value? "), @@ -2267,7 +2267,7 @@ } else if( size(disks) == 0 ) { - string txt = _("There are no partitionable Disks available."); + string txt = _("There are no partitionable disks available."); if( Arch::s390() ) { txt = txt + "\n" + _("You may use dasdfmt in Expert-Button to low level format disks."); Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_part_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_part_proposal.ycp?rev=43635&r1=43634&r2=43635&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_part_proposal.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/inst_part_proposal.ycp Tue Jan 15 18:23:58 2008 @@ -163,9 +163,9 @@ // help text continued // %1 is replaced by button text help_text = help_text + sformat(_("<p> -If you want to do only small adjustments to the proposed -setup (like e.g. changing filesystem types) choose -<b>%1</b> and do these modification in expert +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 partioner dialog.</p> "), deletechars(modify_str,"&")); @@ -183,12 +183,14 @@ // help text continued // %1 is replaced by button text help_text = help_text + _("<p> -To create a LVM or EVMS based proposal choose the corresponding button.</p>"); +To create an LVM or EVMS based proposal, choose the corresponding button.</p> +"); else // help text continued // %1 is replaced by button text help_text = help_text + _("<p> -To create a LVM based proposal choose the corresponding button.</p>"); +To create an LVM based proposal, choose the corresponding button.</p> +"); if( proposal_firsttime ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org