Merge "PIP: Prepare PIP strings for translations" into nyc-dev