Merge "Replace deprecated language codes in user options"