switching to RSyntaxArea instead of JSyntaxPane
remove some fuzzy markers with lokalize, which loves reindenting everything :(
Merge pull request #192 from jcb/master

CRLF? Windows guys, seriously?! You probably want this tip: dos2unix your_file. Happy trollday, guys :)
[Fix] Checkout and pull to retrieve progression. In theory, merge conflict should never happened -> Closes #194
Merge pull request #195 from Cedric-Huguenin/master

[Fix] Checkout and pull to retrieve progression. In theory, merge conflict should never happened
Merge branch 'master' of github.com:oster/PLM
merge changes of Gerald to use Rsyntaxtextarea instead of jsyntaxpane
start the changelog of the next release
Proper end of line management, depending on the system [jcb]
manually merge some review of french translation by JCB
more translation work from JCB
one day, I'll be able to use git properly
* fetch upstream+merge