Author: jsuchome Date: Thu Mar 29 16:11:12 2012 New Revision: 67820 URL: http://svn.opensuse.org/viewcvs/yast?rev=67820&view=rev Log: - merge proofread texts Modified: trunk/system-profile/package/yast2-system-profile.changes trunk/system-profile/src/dialogs.ycp trunk/system-profile/src/texts.ycp Modified: trunk/system-profile/package/yast2-system-profile.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/package/yast2-system-profile.changes?rev=67820&r1=67819&r2=67820&view=diff ============================================================================== --- trunk/system-profile/package/yast2-system-profile.changes (original) +++ trunk/system-profile/package/yast2-system-profile.changes Thu Mar 29 16:11:12 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:11:02 CEST 2012 - jsuchome@suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Wed Sep 28 22:55:04 CEST 2011 - visnov@suse.cz - set dialog title Modified: trunk/system-profile/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/src/dialogs.ycp?rev=67820&r1=67819&r2=67820&view=diff ============================================================================== --- trunk/system-profile/src/dialogs.ycp (original) +++ trunk/system-profile/src/dialogs.ycp Thu Mar 29 16:11:12 2012 @@ -92,7 +92,7 @@ y2milestone("executeSmoltCmd returned emtpy or nil data, thus an error occurred."); // (bnc#441221) fix typo string errMsg1 = _("An error occurred while gathering system information."); - string errMsg2 = _("Please make sure that the smolt package is installed."); + string errMsg2 = _("Make sure that the smolt package is installed."); Popup::Message(sformat("%1\n%2", errMsg1, errMsg2)); } } @@ -102,8 +102,10 @@ UI::ReplaceWidget(`id(`smoltDataReplace), `RichText(`id(`smoltData), `opt(`plainText), "")); UI::ChangeWidget(`id(`smoltData), `Value, sysData); UI::RecalcLayout(); - string notifyHeading = _("System profile was sent successfully."); - string notifyBody = _("Find a URL an your password to edit and comment your\nprofile online at the end of the system profile details."); + string notifyHeading = _("System profile has been successfully sent."); + string notifyBody = _("At the end of the system profile details, find a URL and your password to edit +and comment your profile online. +"); Popup::Notify(sformat("%1\n\n%2", notifyHeading, notifyBody)); } Modified: trunk/system-profile/src/texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/src/texts.ycp?rev=67820&r1=67819&r2=67820&view=diff ============================================================================== --- trunk/system-profile/src/texts.ycp (original) +++ trunk/system-profile/src/texts.ycp Thu Mar 29 16:11:12 2012 @@ -38,9 +38,17 @@ * All descriptions are here */ map DESC = $[ - "short" : _("Driver development is prioritized based on hardware popularity.\nPlease send your system profile to influence this work."), - "long" : _("Driver development is prioritized based on hardware popularity.\nPlease send your system profile to a community database to help\ncreating current statistics."), - "smolt" : _("Driver development is prioritized based on hardware popularity.\nThe community project smolt creates statistics from contributed\nsystem profiles. Please send your system profile to support smolt.") + "short" : _("Driver development is prioritized according to hardware popularity. +Please send your system profile to influence this work. +"), + "long" : _("Driver development is prioritized according to hardware popularity. +Please send your system profile to a community database to help +creating current statistics. +"), + "smolt" : _("Driver development is prioritized according to hardware popularity. +The community project Smolt creates statistics from contributed +system profiles. Please send your system profile to support Smolt. +") ]; @@ -58,8 +66,8 @@ * All helps are here */ map HELPS = $[ - "c1" : _("<p>Linux driver development is prioritized based on hardware popularity. You can submit your system profile to a community database to influence this work.</p>"), - "c2" : _("<p>To keep your system profile updated in this database please activate to send the data monthly.</p>"), + "c1" : _("<p>Linux driver development is prioritized according to hardware popularity. You can submit your system profile to a community database to influence this work.</p>"), + "c2" : _("<p>To keep your system profile updated in this database, activate sending the data monthly.</p>"), "c3" : _("<p>Your system profile will be transmitted to the smolt project. Visit <b>http://smolts.org</b> for details.</p>"), "c4" : _("<p>Once you sent your profile manually, you will receive a URL and a password to edit and comment your profile online. Press <b>Send Profile</b> to send the profile manually.</p>") ]; @@ -71,7 +79,7 @@ "sendOnce" : _("Send Profile Once"), "sendProfileMonthly" : _("Send profile monthly."), "disbleSendingProfile" : _("Do not send profile monthly."), - "errorWhileSending" : _("An error occurred and the system profile was not sent."), + "errorWhileSending" : _("An error occurred and the system profile has not been sent."), "serverOrNetworkDown" : _("Maybe your network is disconnected or the target server is down.") ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org