Author: lslezak Date: Thu Jun 30 16:22:45 2011 New Revision: 64676 URL: http://svn.opensuse.org/viewcvs/yast?rev=64676&view=rev Log: - fixed typos (bnc#702648), fixed help text for migration repo selection dialog Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/clients/wagon_dup_repositories.ycp trunk/wagon/src/clients/wagon_point_of_no_return.ycp trunk/wagon/src/clients/wagon_registration_check.ycp trunk/wagon/src/include/common_func.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=64676&r1=64675&r2=64676&view=diff ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Jun 30 16:22:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 30 14:13:52 UTC 2011 - lslezak@suse.cz + +- fixed typos (bnc#702648), fixed help text for migration repo + selection dialog + +------------------------------------------------------------------- Wed Jun 22 14:40:00 UTC 2011 - lslezak@suse.cz - added a new client for selecting DUP repositories (fate#311994) Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=64676&r1=64675&r2=64676&view=diff ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Thu Jun 30 16:22:45 2011 @@ -278,7 +278,7 @@ }); if (size (removed_packages) > 0) { - y2milestone ("%1 products were removed, reseting packager", size (removed_packages)); + y2milestone ("%1 products were removed, resetting packager", size (removed_packages)); ResetPackager(); foreach (string one_package, removed_packages, { Modified: trunk/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_dup_repositories.ycp?rev=64676&r1=64675&r2=64676&view=diff ============================================================================== --- trunk/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ trunk/wagon/src/clients/wagon_dup_repositories.ycp Thu Jun 30 16:22:45 2011 @@ -63,8 +63,8 @@ ); // help text - string help_text = "<p>" + _("YaST checks whether the installed products are the installed products are registered.") - + "</p><p>" + _("Migrating unregistered or partly registered system might result in broken system.") + "</p>"; + string help_text = "<p>" + _("Here select the repositories which will be used for migration.") + + "</p><p>" + _("The installed packages will be switched to the versions available in the selected migration repositories.") + "</p>"; Wizard::SetContents (heading_text, contents, help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next()); Modified: trunk/wagon/src/clients/wagon_point_of_no_return.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_point_of_no_return.ycp?rev=64676&r1=64675&r2=64676&view=diff ============================================================================== --- trunk/wagon/src/clients/wagon_point_of_no_return.ycp (original) +++ trunk/wagon/src/clients/wagon_point_of_no_return.ycp Thu Jun 30 16:22:45 2011 @@ -36,7 +36,7 @@ Wagon::abort_can_revert_products = false; // @see BNC 575102 - y2milestone ("Reseting repos_already_registered flag"); + y2milestone ("Resetting repos_already_registered flag"); Wagon::repos_already_registered = false; return `auto; Modified: trunk/wagon/src/clients/wagon_registration_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registration_check.ycp?rev=64676&r1=64675&r2=64676&view=diff ============================================================================== --- trunk/wagon/src/clients/wagon_registration_check.ycp (original) +++ trunk/wagon/src/clients/wagon_registration_check.ycp Thu Jun 30 16:22:45 2011 @@ -186,7 +186,7 @@ ); // help text - string help_text = "<p>" + _("YaST checks whether the installed products are the installed products are registered.") + string help_text = "<p>" + _("YaST checks whether the installed products are registered.") + "</p><p>" + _("Migrating unregistered or partly registered system might result in broken system.") + "</p>"; Wizard::SetContents (heading_text, contents, help_text, Modified: trunk/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/include/common_func.ycp?rev=64676&r1=64675&r2=64676&view=diff ============================================================================== --- trunk/wagon/src/include/common_func.ycp (original) +++ trunk/wagon/src/include/common_func.ycp Thu Jun 30 16:22:45 2011 @@ -119,13 +119,13 @@ void ResetPackager () { Wizard::SetContents ( - _("Reseting Package Manager"), - `Label(_("Reseting package manager...")), + _("Resetting Package Manager"), + `Label(_("Resetting package manager...")), "", false, true ); - y2milestone ("Reseting Pkg"); + y2milestone ("Resetting Pkg"); Pkg::PkgApplReset(); Pkg::PkgReset(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org