[yast-commit] r67750 - in /trunk/autoinstallation: package/ src/clients/ src/dialogs/ src/modules/

Author: jsuchome Date: Thu Mar 29 13:56:40 2012 New Revision: 67750 URL: http://svn.opensuse.org/viewcvs/yast?rev=67750&view=rev Log: - merged proofread texts Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/autoyast.ycp trunk/autoinstallation/src/clients/ayast_setup.ycp trunk/autoinstallation/src/clients/inst_autoconfigure.ycp trunk/autoinstallation/src/dialogs/PartitionDialog.ycp trunk/autoinstallation/src/dialogs/general_dialogs.ycp trunk/autoinstallation/src/dialogs/helps.ycp trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp trunk/autoinstallation/src/modules/Profile.ycp trunk/autoinstallation/src/modules/ProfileLocation.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Mar 29 13:56:40 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 13:56:04 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Wed Feb 1 16:28:04 CET 2012 - ug@suse.de - 2.22.0 Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/autoyast.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Thu Mar 29 13:56:40 2012 @@ -79,7 +79,7 @@ map cmdline = $[ "id" : "autoyast2", - "help" : _("autoyast"), + "help" : _("AutoYaST"), "guihandler" : AutoSequence, "actions" : $[ "file" : $[ "handler":openFile, "help":"file operations" ], Modified: trunk/autoinstallation/src/clients/ayast_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ayast_setup.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/ayast_setup.ycp (original) +++ trunk/autoinstallation/src/clients/ayast_setup.ycp Thu Mar 29 13:56:40 2012 @@ -78,7 +78,7 @@ boolean openFile( map options ) { if ( options["filename"]:nil == nil ) { - CommandLine::Error(_("Path to autoyast profile must be set")); + CommandLine::Error(_("Path to AutoYaST profile must be set.")); return false; } if( options["dopackages"]:"yes" == "no" ) @@ -99,18 +99,18 @@ map cmdline = $[ "id" : "ayast_setup", - "help" : _("Client for autoyast configuration on the running system"), + "help" : _("Client for AutoYaST configuration on the running system"), "guihandler": GUI, "actions" : $[ "setup" : $[ "handler" : openFile, - "help" : _("Configure the system using given autoyast profile"), + "help" : _("Configure the system using given AutoYaST profile"), "example" : "setup filename=/path/to/profile dopackages=no" ] ], "options" : $[ "filename": $[ "type" : "string", - "help" : _("Path to autoyast profile") + "help" : _("Path to AutoYaST profile") ], "dopackages": $[ "type" : "enum", Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/inst_autoconfigure.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Thu Mar 29 13:56:40 2012 @@ -59,7 +59,7 @@ if( process["name"]:"" == resource ) { if( haskey( process, "sleep" ) ) { if( process["sleep","feedback"]:false == true ) - Popup::ShowFeedback( "", sformat( _("processing resource %1"), resource)); + Popup::ShowFeedback( "", sformat( _("Processing resource %1"), resource)); sleep( 1000*process["sleep","time"]:0 ); if( process["sleep","feedback"]:false == true ) Popup::ClearFeedback(); Modified: trunk/autoinstallation/src/dialogs/PartitionDialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/PartitionDialog.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/PartitionDialog.ycp (original) +++ trunk/autoinstallation/src/dialogs/PartitionDialog.ycp Thu Mar 29 13:56:40 2012 @@ -126,7 +126,7 @@ stripes = (integer) UI::QueryWidget( `id(`numberStripes), `Value ); stripesize = (integer) UI::QueryWidget( `id(`stripesize), `Value ); if( "" == lvName ) { - Popup::Warning( _("Please provide a logical volume name.") ); + Popup::Warning( _("Provide a logical volume name.") ); } } else { UI::ChangeWidget( `id(`striping), `Enabled, false ); @@ -180,7 +180,9 @@ (boolean) UI::QueryWidget(`id(`resizePartition),`Value)); if( `keep == (symbol) UI::QueryWidget(`id(`cbFileSystem), `Value ) ){ if( ! reUse && lvmGroup == "" ){ /* for PV's its ok to have no fs */ - Popup::Warning( _("You selected to create the partition but you did not select a valid file system.\nPlease select a valid filesystem to continue.") ); + Popup::Warning( _("You selected to create the partition, but you did not select a valid file +system. Select a valid filesystem to continue. +") ); } part = AutoinstPartition::set( part, "format", false); part = AutoinstPartition::set( part, "filesystem",`Empty); @@ -460,7 +462,7 @@ UI::ChangeWidget(`id(`size), `Enabled, false); } else{ - Popup::Error(_("Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected")); + Popup::Error(_("Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected.")); UI::ChangeWidget(`id(`size), `Enabled, true); UI::ChangeWidget(`id(`unit), `Value, `GB ); } Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/general_dialogs.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/general_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/general_dialogs.ycp Thu Mar 29 13:56:40 2012 @@ -53,7 +53,7 @@ `Left(`CheckBox(`id(`confirm), _("Con&firm installation?"), confirm)), `Left(`CheckBox(`id(`second_stage), _("AutoYaST Second Stage"), second_stage)), `Left(`CheckBox(`id(`halt), _("Turn Off the Machine after the First Stage"), halt)), - `Left(`CheckBox(`id(`halt_second), _("Turn Off the Machine after the Second Stage"), halt_second)), + `Left(`CheckBox(`id(`halt_second), _("Turn off the Machine after the Second Stage"), halt_second)), `Left(`CheckBox(`id(`reboot_second), _("Reboot the Machine after the Second Stage"), reboot_second)), `Left(`Label( _("Signature Handling") )), `Left(`CheckBox(`id(`accept_unsigned_file), _("Accept &Unsigned Files"), accept_unsigned_file)), @@ -342,8 +342,8 @@ `MinSize( 10, 5, `SelectionBox( `id(`dialogs), `opt(`notify,`immediate), _("Title"), 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( `dialogUp ), `opt( `default, `hstretch ), _("Dialog up") ), + `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog down") ) ), `Label( _("Questions in dialog") ), `MinSize( 10,5, @@ -356,8 +356,8 @@ `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( `questionUp ), `opt( `default, `hstretch ), _("Question up") ), + `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question down") ) ) ) Modified: trunk/autoinstallation/src/dialogs/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/helps.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/helps.ycp (original) +++ trunk/autoinstallation/src/dialogs/helps.ycp Thu Mar 29 13:56:40 2012 @@ -63,7 +63,7 @@ + _("<p><b>Advanced Options</b></p>") - + _("By default, AutoYaST2 will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST2 to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes.") + + _("By default, AutoYaST will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes.") + _("These options and other advanced options cannot be configured using this interface. Instead, add them manually to the control file. Modified: trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Thu Mar 29 13:56:40 2012 @@ -292,7 +292,7 @@ * the next instructions taints result */ if( ! found ){ - Popup::Error(sformat( _("Volume group '%1' must have at least one physical volume. Please provide one."), volGroupName) ); + Popup::Error(sformat( _("Volume group '%1' must have at least one physical volume. Provide one."), volGroupName) ); } sane = found; }); Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Profile.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Thu Mar 29 13:56:40 2012 @@ -345,7 +345,7 @@ do { UI::OpenDialog( `VBox( - `Label(_("Encrypted AutoYaST profile. Please enter the password twice")), + `Label(_("Encrypted AutoYaST profile. Enter the password twice.")), `Password(`id(`password), ""), `Password(`id(`password2), ""), `PushButton(`id(`ok), Label::OKButton()) @@ -395,7 +395,7 @@ sectionFiles = add(sectionFiles, sectionName, sectionFileName); } else{ - y2error(sformat(_("Couldn't write section %1 to file %2"), sectionName, sectionFileName)); + y2error(sformat(_("Could not write section %1 to file %2."), sectionName, sectionFileName)); } }); return sectionFiles; @@ -552,7 +552,7 @@ while( out["stdout"]:"" == "" ) { UI::OpenDialog( `VBox( - `Label(_("Encrypted AutoYaST profile. Please enter the correct password.")), + `Label(_("Encrypted AutoYaST profile. Enter the correct password.")), `Password(`id(`password), ""), `PushButton(`id(`ok), Label::OKButton()) ) Modified: trunk/autoinstallation/src/modules/ProfileLocation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/ProfileLocation.ycp?rev=67750&r1=67749&r2=67750&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/ProfileLocation.ycp (original) +++ trunk/autoinstallation/src/modules/ProfileLocation.ycp Thu Mar 29 13:56:40 2012 @@ -126,7 +126,7 @@ y2milestone("encrypted profile found"); UI::OpenDialog( `VBox( - `Label( _("Encrypted AutoYaST profile. Please enter the correct password.") ), + `Label( _("Encrypted AutoYaST profile. Enter the correct password.") ), `Password(`id(`password), ""), `PushButton(`id(`ok), _("&OK") ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org