Merged r11015 from trunk to 2.2-stable (#12605, #12608)
Norwegian translation changed by Ketil Mehl.
Authored by: tmaruyama 2012-12-16
Parent: [r11017]
Child: [r11019]