Author: jsuchome Date: Thu Mar 29 15:23:51 2012 New Revision: 67784 URL: http://svn.opensuse.org/viewcvs/yast?rev=67784&view=rev Log: - merged proofread texts Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/inst_live_simple_proposal.ycp trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-live-installer.changes?rev=67784&r1=67783&r2=67784&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Mar 29 15:23:51 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:23:27 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Tue Aug 30 14:43:52 CEST 2011 - jsrain@suse.cz - do not set the root device for mkinitrd explicitly (bnc#714650) Modified: trunk/live-installer/src/inst_live_simple_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_simple_proposal.ycp?rev=67784&r1=67783&r2=67784&view=diff ============================================================================== --- trunk/live-installer/src/inst_live_simple_proposal.ycp (original) +++ trunk/live-installer/src/inst_live_simple_proposal.ycp Thu Mar 29 15:23:51 2012 @@ -19,7 +19,7 @@ Wizard::SetContents ( // dialog caption - _("Installation settings"), + _("Installation Settings"), // label `Label (_("Analyzing the system...")), "", @@ -142,8 +142,9 @@ Use <b>Accept</b> to perform a new installation with the values displayed.</p>") // help text 2/3 + _("<p> -To change the values click the respective headline -or select <b>Change Installation Settings</b></p>") +To change the values, click the respective headline +or select <b>Change Installation Settings</b>.</p> +") // help text 3/3 + _("<p> Your hard disk has not been modified, you can still safely abort. @@ -152,7 +153,7 @@ Wizard::SetContents ( - _("Installation settings"), + _("Installation Settings"), contents, help, GetInstArgs::enable_back(), Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installer.ycp?rev=67784&r1=67783&r2=67784&view=diff ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Thu Mar 29 15:23:51 2012 @@ -44,7 +44,8 @@ if (! Popup::ContinueCancel (sformat (_("Your computer has less than %1 of memory. This may not be sufficient for the live installation, especially when installing while running other applications. -Before continuing, finish all running applications."), "1 GB"))) +Before continuing, close all running applications. +"), "1 GB"))) { UI::CloseDialog(); return nil; @@ -81,8 +82,9 @@ { // continue/cancel pop-up if (! Popup::ContinueCancel (_("YaST detected a mounted removable media. YaST cannot install -the system on media which is mounted. -To install the system on these media, unmount them first."))) +the system on mounted media. +Unmount the media to install the system on it. +"))) { Storage::SwitchUiAutomounter(true); UI::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org