Translations of time span collides with other translations

The translation of some time spans collide with translations using format_plural:

'#options' => array(
      0 => t('Immediate'),
      1 => t('1 day'),
      7 => t('1 week'),
      14 => t('2 weeks'),
)

Due to the format_plural of both '1 day' and '1 week' the translations already exist. I suggest changing the code to:

'#options' => array(
      0 => t('Immediate'),
      1 => format_plural(1, '1 day', '@count days'),
      7 => format_plural(1, '1 week', '@count weeks'),
      14 => format_plural(2, '1 week', '@count weeks'),
)

I'll try to submit a patch in the comments...