am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."

* commit '9fa542a5032d8adc3f502cef0c5c98d8f10abbc2':
  Manual fix for some Norwegian format strings.