Plural form of frequency units is hard coded

At several places frequency localized frequency unit names are read but are then simply extended to indicate possible plural forms by just adding a hard coded "(s)". This works for English where Day, Month and Year so become "Day(s)", "Month(s)" and "Year(s)", but already looks funny in German where it should be "Tag(e)", "Monat(e)" and "Jahr(e)" instead of "Tag(s)", "Monat(s)" and "Jahr(s)", and i'd bet that it becomes totally confusing in non-latin languages ...

Places where "(s)" is used that i have identified so far are:

./CRM/Pledge/BAO/Query.php:583: $freqUnitsDisplay["'{$val}'"] = ts('%1(s)', array(1 => $label));
./CRM/Pledge/Form/Pledge.php:378: $freqUnitsDisplay[$val] = ts('%1(s)', array(1 => $label));
./CRM/Pledge/Form/PledgeView.php:61: $values['frequencyUnit'] = ts( '%1(s)', array( 1 => $values['frequency_unit'] ) );

For my German-only project i simply replaced the "s" with an "e", but for a clean i18n/l10n solution there should be extra entries for the optional plural form of frequency units in the translation files ...