Code

conf: merge two translatable strings