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

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