Merged r7468 from trunk.
Norwegian translation of trunk r5957 and 1.2-stable r7455 updated.
Contributed by Lars Erik Gullerud.
Authored by: tmaruyama 2011-09-23
Parent: [r7470]
Child: [r7472]
