Author: jsuchome Date: Thu Mar 29 16:27:41 2012 New Revision: 67825 URL: http://svn.opensuse.org/viewcvs/yast?rev=67825&view=rev Log: - merged proofread texts Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=67825&r1=67824&r2=67825&view=diff ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Mar 29 16:27:41 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:27:31 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Wed Mar 7 08:14:29 UTC 2012 - lslezak@suse.cz - ensure that the migration products are removed (bnc#750746) Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=67825&r1=67824&r2=67825&view=diff ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Thu Mar 29 16:27:41 2012 @@ -668,8 +668,8 @@ // Product is going to be upgraded (removed + installed new version) if (contains (products_to_be_upgraded, name) || sles_for_vmware_upgrade) { map <string,any> old_product = find(map<string,any> p, products, {return p["name"]:"" == (sles_for_vmware_upgrade ? "SUSE_SLES" : name) && p["status"]:`unknown == `removed;}); - string old_product_name = old_product["name"]:_("No name defined"); - string old_display_name = old_product["display_name"]:old_product["short_name"]:old_product["name"]:_("No name defined"); + string old_product_name = old_product["name"]:_("No name defined."); + string old_display_name = old_product["display_name"]:old_product["short_name"]:old_product["name"]:_("No name defined."); y2milestone ("Detected product upgrade from: '%1' to: '%2'", old_display_name, display_name); y2milestone ("Product will be upgraded to: %1 (this is the new one)", product); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org