- Merge devel-framework branch, resolved conflicts

alecpl

2012-04-13 0c259682f65eaaf23ea4ccb56a706d6baf3007e4

1
tinyMCE.addI18n('eu.paste_dlg',{"word_title":"Erabili CTRL+V testua lehioan itsasteko.","text_linebreaks":"Mantendu lerro-jauziak","text_title":"Erabili CTRL+V testua lehioan itsasteko."});