Author: ug Date: Tue Feb 23 13:23:17 2010 New Revision: 60979 URL: http://svn.opensuse.org/viewcvs/yast?rev=60979&view=rev Log: translation fixes (bnc#448238). 2.17.36 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstClone.ycp Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION?rev=60979&r1=60978&r2=60979&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION Tue Feb 23 13:23:17 2010 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes?rev=60979&r1=60978&r2=60979&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Tue Feb 23 13:23:17 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 23 13:21:49 CET 2010 - ug@suse.de + +- translation fixes (bnc#448238) +- 2.17.36 + +------------------------------------------------------------------- Tue Feb 23 09:08:00 CET 2010 - ug@suse.de - fix for resizing partitions (bnc#580842) Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstClone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstClone.ycp?rev=60979&r1=60978&r2=60979&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstClone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstClone.ycp Tue Feb 23 13:23:17 2010 @@ -220,11 +220,14 @@ "software" == def_resource || /* has no desktop file */ "bootloader" == def_resource ) { + string desktop_file = substring( resourceMap["X-SuSE-DocTeamID"]:"", 4 ); + string name = dpgettext("desktop_translations", "/usr/share/locale/", "Name("+desktop_file+".desktop): "+resourceMap["Name"]:"" ); + if( name == "Name("+desktop_file+".desktop): "+resourceMap["Name"]:"" ) + name = resourceMap["Name"]:""; // Set resource name, if not using default value string resource = resourceMap["X-SuSE-YaST-AutoInstResource"]:""; if (resource == "") resource = def_resource; - string name = resourceMap["Name"]:""; if (resource != "") { items = add(items, `item(`id(resource), name ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org