Added norwegian translation, fixed one english translation
Fixed typos in norwegian translation
Norwegian translation
Added norwegian translation and fix in english
resolve conflict