Author: locilka Date: Mon Sep 8 17:49:53 2008 New Revision: 50824 URL: http://svn.opensuse.org/viewcvs/yast?rev=50824&view=rev Log: - merged texts from proofread Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/deploying_proposal.ycp trunk/installation/src/clients/inst_automatic_configuration.ycp trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/clients/inst_mode.ycp trunk/installation/src/clients/inst_proposal.ycp trunk/installation/src/clients/inst_upgrade_urls.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Sep 8 17:49:53 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 8 17:49:11 CEST 2008 - locilka@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Sep 8 15:57:09 CEST 2008 - locilka@suse.cz - Added new AutoYaST client deploy_images_auto to support Modified: trunk/installation/src/clients/deploying_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/deploying_proposal.ycp?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/src/clients/deploying_proposal.ycp (original) +++ trunk/installation/src/clients/deploying_proposal.ycp Mon Sep 8 17:49:53 2008 @@ -77,9 +77,10 @@ "links" : [ im_do_enable, im_do_disable ], // TRANSLATORS: help text "help" : _("<p><b>Installation from Images</b> is used to speed the installation up. -Images contain compressed snapshots of installed system matching your selection +Images contain compressed snapshots of an installed system matching your selection of patterns. The rest of packages which are not in images will be installed from -packages the standard way.</p>") + +packages the standard way.</p> +") + // TRANSLATORS: help text _("<p>Installation from images is disabled by default if the current pattern selection does not fit any set of images.</p>"), @@ -115,7 +116,8 @@ Report::Message (_("Unable to enable installation from images. Currently selected patterns do not fit the images -stored on installation media.")); +stored on the installation media. +")); } ImageInstallation::changed_by_user = true; Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_automatic_configuration.ycp?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Mon Sep 8 17:49:53 2008 @@ -147,7 +147,7 @@ Do not panic! X11 Configuration must switch to console for a while - to do detect your videocard properly... + to detect your videocard properly... ****************************************************** ") Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_complex_welcome.ycp?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Mon Sep 8 17:49:53 2008 @@ -169,7 +169,7 @@ // help text, continued _("<p> Select <b>Abort</b> to abort the -installation process any time. +installation process at any time. </p> "); Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_deploy_image.ycp?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Mon Sep 8 17:49:53 2008 @@ -218,19 +218,21 @@ ) ), // TRANSLATORS: help idi#1 - _("<p>Please wait, while system images are just being deployed...</p>") + + _("<p>System images are being deployed. Please wait...</p>") + // TRANSLATORS: help idi#2 _("<p>Installation images are part of the installation media.</p>") + // TRANSLATORS: help idi#3 _("<p>Installation from images is faster than installation from RPM packages -because it does not need to handle with RPM database, locks etc. -One of the images also contains the joint RPM database and other metadata.</p>") + +because it does not need to interact with a RPM database, locks etc. +One of the images also contains the joint RPM database and other metadata.</p> +") + // TRANSLATORS: help idi#4 _("<p>If there is no direct access to installation images, -installation program has to download them first before they are deployed.</p>"), +the installation program has to download them first before they are deployed.</p> +"), false, false ); */ Modified: trunk/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mode.ycp?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/src/clients/inst_mode.ycp (original) +++ trunk/installation/src/clients/inst_mode.ycp Mon Sep 8 17:49:53 2008 @@ -220,9 +220,10 @@ _("<p> Select <b>Use Automatic Configuration</b> to let the installation program configure your network and hardware automatically. Otherwise you will -be offered a configuration proposal with possibility to tune all the -settings manually. Unexperienced users had better use automatic -configuration.</p>") + +be offered a configuration proposal with the possibility to tune all the +settings manually. Inexperienced users are advised to use automatic +configuration.</p> +") + // help text for installation method _("<p>Update mode does not support automatic configuration.</p>") + @@ -234,8 +235,9 @@ // help text for installation method _("<p>The features <b>Update</b> and <b>Repair Installed System</b> are only -available if some Linux system has been detected. -</p>"); +available if an existing Linux system has been detected. +</p> +"); } Wizard::SetContents ( Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_proposal.ycp?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Mon Sep 8 17:49:53 2008 @@ -958,7 +958,7 @@ // Help text for installation proposal // General part ("You can change values...") is added as the next paragraph. help_text_string = _("<p> -Use <b>Install</b> to perform a new installation with the values displayed. +Select <b>Install</b> to perform a new installation with the values displayed. </p> ") + how_to_change; @@ -989,7 +989,7 @@ // Help text for update proposal // General part ("You can change values...") is added as the next paragraph. help_text_string = _("<p> -Use <b>Update</b> to perform an update with the values displayed. +Select <b>Update</b> to perform an update with the values displayed. </p> ") + how_to_change; Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_upgrade_urls.ycp?rev=50824&r1=50823&r2=50824&view=diff ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Mon Sep 8 17:49:53 2008 @@ -836,7 +836,7 @@ _("Initializing package manager..."), ], // TRANSLATORS: dialog help - _("<p>Please wait while repositories are being read...</p>") + _("<p>Reading repositories. Please wait..</p>") ); Wizard::SetTitleIcon ("yast-sw_source"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org