Added new diff and merge for po files
Removed fron newline from bash prompt