Merge pull request #329 from diegotheblind/master

Translated new strings (Terminal link & others) [ITA]
remove conflict markers