[Harmattan] rearranged main menu entries
[General] translation update