- Merge devel-framework branch, resolved conflicts

alecpl

2012-04-13 0c259682f65eaaf23ea4ccb56a706d6baf3007e4

1
tinyMCE.addI18n('sl.paste_dlg',{"word_title":"Uporabite kombinacijo tipk CTRL+V, da prilepite vsebino v okno.","text_linebreaks":"Obdr\u017ei prelome vrstic","text_title":"Uporabite kombinacijo tipk CTRL+V, da prilepite vsebino v okno."});