Merge "Fix issue with german translation of lock times" into mnc-dev