Romanian translation can now be considered complete.
Tested locally - looks nice.
Fixed romanian translation typo.
fix merge conflicts in ro.po
Merged further fixes for romanian translation; fixed merge conflicts