diff -urN kdenetwork-3.5.6/kopete/plugins/translator/translatorlanguages.cpp kopete/kdenetwork-3.5.6/kopete/plugins/translator/translatorlanguages.cpp --- kdenetwork-3.5.6/kopete/plugins/translator/translatorlanguages.cpp 2005-09-10 10:20:15.000000000 +0200 +++ kopete/kdenetwork-3.5.6/kopete/plugins/translator/translatorlanguages.cpp 2007-09-13 16:15:33.000000000 +0200 @@ -29,7 +29,7 @@ { m_lc = 0; m_sc = 0; - m_services.insert("babelfish", "BabelFish"); +// m_services.insert("babelfish", "BabelFish"); m_services.insert("google", "Google"); m_langs.insert("null", i18n("Unknown")); @@ -45,29 +45,29 @@ m_langs.insert("es", i18n("Spanish")); /* English to .. */ - m_supported["babelfish"].append("en_zh"); - m_supported["babelfish"].append("en_fr"); - m_supported["babelfish"].append("en_de"); - m_supported["babelfish"].append("en_it"); - m_supported["babelfish"].append("en_ja"); - m_supported["babelfish"].append("en_ko"); - m_supported["babelfish"].append("en_pt"); - m_supported["babelfish"].append("en_es"); +// m_supported["babelfish"].append("en_zh"); +// m_supported["babelfish"].append("en_fr"); +// m_supported["babelfish"].append("en_de"); +// m_supported["babelfish"].append("en_it"); +// m_supported["babelfish"].append("en_ja"); +// m_supported["babelfish"].append("en_ko"); +// m_supported["babelfish"].append("en_pt"); +// m_supported["babelfish"].append("en_es"); /* Chinese to .. */ - m_supported["babelfish"].append("zh_en"); +// m_supported["babelfish"].append("zh_en"); /* French to ... */ - m_supported["babelfish"].append("fr_en"); - m_supported["babelfish"].append("fr_de"); +// m_supported["babelfish"].append("fr_en"); +// m_supported["babelfish"].append("fr_de"); /* German to ... */ - m_supported["babelfish"].append("de_en"); - m_supported["babelfish"].append("de_fr"); +// m_supported["babelfish"].append("de_en"); +// m_supported["babelfish"].append("de_fr"); - m_supported["babelfish"].append("it_en"); - m_supported["babelfish"].append("ja_en"); - m_supported["babelfish"].append("ko_en"); - m_supported["babelfish"].append("pt_en"); - m_supported["babelfish"].append("ru_en"); - m_supported["babelfish"].append("es_en"); +// m_supported["babelfish"].append("it_en"); +// m_supported["babelfish"].append("ja_en"); +// m_supported["babelfish"].append("ko_en"); +// m_supported["babelfish"].append("pt_en"); +// m_supported["babelfish"].append("ru_en"); +// m_supported["babelfish"].append("es_en"); /* Google Service */ m_supported["google"].append("en_de"); diff -urN kdenetwork-3.5.6/kopete/plugins/translator/translatorplugin.cpp kopete/kdenetwork-3.5.6/kopete/plugins/translator/translatorplugin.cpp --- kdenetwork-3.5.6/kopete/plugins/translator/translatorplugin.cpp 2005-09-10 10:20:15.000000000 +0200 +++ kopete/kdenetwork-3.5.6/kopete/plugins/translator/translatorplugin.cpp 2007-09-13 16:15:01.000000000 +0200 @@ -16,6 +16,8 @@ * (at your option) any later version. * * * ************************************************************************* + Patched by Francesco Rossi in order to support new + google translation page layout (13-sept-2007) */ #include @@ -290,7 +292,8 @@ // kdDebug( 14308 ) << k_funcinfo << "Google response:"<< endl << data << endl; - QRegExp re( "" ); +// QRegExp re( "" ); + QRegExp re( ""); re.setMinimal( true ); re.search( data ); @@ -325,7 +328,8 @@ //kdDebug( 14308 ) << k_funcinfo << "Babelfish response: " << endl << data << endl; - QRegExp re( "
(.*)(.*)(.*)
" ); re.setMinimal( true ); re.search( data ); @@ -360,7 +364,7 @@ msg.setBody( translated, msg.format() ); break; case ShowOriginal: - msg.setBody( i18n( "%2\nAuto Translated: %1" ).arg( translated, msg.plainBody() ), msg.format() ); + msg.setBody( i18n( "%2 \nAuto Translated: \n%1" ).arg( translated, msg.plainBody() ), msg.format() ); break; case ShowDialog: {