Merge proposals

ki18n in Ubuntu has no merge proposals.