am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev

* commit '4b60af78fa8b0c474c9aee0f03171867843d2838':
  Fix issue with german translation of lock times