Update translations and improve 2 parameter strings

Change-Id: Ieb481fa0642083edac4968bff00c18ec67a679ea