Author: jsrain Date: Tue Apr 1 09:05:19 2008 New Revision: 45910 URL: http://svn.opensuse.org/viewcvs/yast?rev=45910&view=rev Log: merged texts from proofread Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/general_dialogs.ycp trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=45910&r1=45909&r2=45910&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Apr 1 09:05:19 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 10:05:10 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Thu Mar 27 11:08:56 CET 2008 - ug@suse.de - XML profile on USB devices can make yast to hang when the profile Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/general_dialogs.ycp?rev=45910&r1=45909&r2=45910&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/general_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/general_dialogs.ycp Tue Apr 1 09:05:19 2008 @@ -303,7 +303,7 @@ `TextEntry( `id(`dialogTitle), _("Dialog Title"), title ), `MultiLineEdit( `id( `help ), _("Helptext"), help ), `HBox( - `PushButton( `id( `addDialog ), `opt( `default, `hstretch ), _("Add to Dialoglist") ), + `PushButton( `id( `addDialog ), `opt( `default, `hstretch ), _("Add to Dialog List") ), `PushButton( `id( `applyDialog ), `opt( `default, `hstretch ), _("Apply Changes to Dialog") ) ), `MinSize( 10,5, @@ -313,9 +313,9 @@ dialogs ) ), `HBox( - `PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("delete Dialog") ), - `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog up") ), - `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog down") ) + `PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("Delete Dialog") ), + `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog Up") ), + `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog Down") ) ), `Label( _("Questions in Dialog") ), `MinSize( 10,5, @@ -325,11 +325,11 @@ questions ) ), `HBox( - `PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("add Question") ), - `PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("edit Question") ), - `PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("delete Question") ), - `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question up") ), - `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question down") ) + `PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("Add Question") ), + `PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("Edit Question") ), + `PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("Delete Question") ), + `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question Up") ), + `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question Down") ) ) ) Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstLVM.ycp?rev=45910&r1=45909&r2=45910&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Tue Apr 1 09:05:19 2008 @@ -101,7 +101,7 @@ if( haskey( p, "lvm_group" ) && p["create"]:true == false ) { keepLVM[p["lvm_group"]:"x"] = []; if( !contains( ExistingVGs, p["lvm_group"]:"x" ) ) - Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["lvm_group"]:"x" ) ); + Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["lvm_group"]:"x" ) ); map atm = AutoinstStorage::AutoTargetMap; foreach ( map vg_p, atm["/dev/"+p["lvm_group"]:"x","partitions"]:[], ``{ if( vg_p["create"]:true == false ) @@ -110,7 +110,7 @@ } else if( haskey( p, "evms_group" ) && p["create"]:true == false ) { keepEVMS[p["evms_group"]:"x"] = []; if( !contains( ExistingVGs, p["evms_group"]:"x" ) ) - Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["evms_group"]:"x" ) ); + Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["evms_group"]:"x" ) ); map atm = AutoinstStorage::AutoTargetMap; foreach ( map vg_p, atm["/dev/"+p["evms_group"]:"x","partitions"]:[], ``{ if( vg_p["create"]:true == false ) Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstStorage.ycp?rev=45910&r1=45909&r2=45910&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Tue Apr 1 09:05:19 2008 @@ -411,7 +411,7 @@ y2milestone("shrinking %1",pe); s = s - ((usedSize - sizeByCyl)/cyl_size+1+size(d["partitions"]:[]))*cyl_size; // 1 cyl buffer per partition if( s < 1 ) { - Report::Error( sformat( _("The partition plan configured in your XML profile does not fit on the harddisk. %1MB missing"), (usedSize-sizeByCyl)/(1024*1024) )); + Report::Error( sformat( _("The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"), (usedSize-sizeByCyl)/(1024*1024) )); break; } else { usedSize = usedSize - s; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org