Merge "Increase string lengths for localization." into klp-dev