mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

i18n: Fixed plural forms handling

Browse source
This commit is contained in:
Marek Cernocky 2018-10-02 11:20:10 +02:00 • committed by Tanu Kaskinen
parent 7f05b835df
commit 65c9195e8f
2 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/modules/alsa/alsa-util.c
View file

@ -1165,8 +1165,11 @@ snd_pcm_sframes_t pa_alsa_safe_avail(snd_pcm_t *pcm, size_t hwbuf_size, const pa
PA_ONCE_BEGIN { PA_ONCE_BEGIN {
char *dn = pa_alsa_get_driver_name_by_pcm(pcm); char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
pa_log(_("snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n" pa_log(ngettext("snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."), "Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
(unsigned long) k),
(unsigned long) k, (unsigned long) k,
(unsigned long) (pa_bytes_to_usec(k, ss) / PA_USEC_PER_MSEC), (unsigned long) (pa_bytes_to_usec(k, ss) / PA_USEC_PER_MSEC),
pa_strnull(dn)); pa_strnull(dn));
@ -1228,8 +1231,11 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_status_t *status, snd_pcm_sframes
PA_ONCE_BEGIN { PA_ONCE_BEGIN {
char *dn = pa_alsa_get_driver_name_by_pcm(pcm); char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
pa_log(_("snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%lu ms).\n" pa_log(ngettext("snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."), "Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
(signed long) k),
(signed long) k, (signed long) k,
k < 0 ? "-" : "", k < 0 ? "-" : "",
(unsigned long) (pa_bytes_to_usec(abs_k, ss) / PA_USEC_PER_MSEC), (unsigned long) (pa_bytes_to_usec(abs_k, ss) / PA_USEC_PER_MSEC),
@ -1253,8 +1259,11 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_status_t *status, snd_pcm_sframes
PA_ONCE_BEGIN { PA_ONCE_BEGIN {
char *dn = pa_alsa_get_driver_name_by_pcm(pcm); char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
pa_log(_("snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n" pa_log(ngettext("snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."), "Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
(unsigned long) k),
(unsigned long) k, (unsigned long) k,
(unsigned long) (pa_bytes_to_usec(k, ss) / PA_USEC_PER_MSEC), (unsigned long) (pa_bytes_to_usec(k, ss) / PA_USEC_PER_MSEC),
pa_strnull(dn)); pa_strnull(dn));
@ -1312,8 +1321,11 @@ int pa_alsa_safe_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas
k >= pa_bytes_per_second(ss)*10)) k >= pa_bytes_per_second(ss)*10))
PA_ONCE_BEGIN { PA_ONCE_BEGIN {
char *dn = pa_alsa_get_driver_name_by_pcm(pcm); char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
pa_log(_("snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes (%lu ms).\n" pa_log(ngettext("snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte (%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."), "Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.",
(unsigned long) k),
(unsigned long) k, (unsigned long) k,
(unsigned long) (pa_bytes_to_usec(k, ss) / PA_USEC_PER_MSEC), (unsigned long) (pa_bytes_to_usec(k, ss) / PA_USEC_PER_MSEC),
pa_strnull(dn)); pa_strnull(dn));

14
src/utils/pactl.c
View file

@ -167,10 +167,16 @@ static void stat_callback(pa_context *c, const pa_stat_info *i, void *userdata)
} }
pa_bytes_snprint(s, sizeof(s), i->memblock_total_size); pa_bytes_snprint(s, sizeof(s), i->memblock_total_size);
printf(_("Currently in use: %u blocks containing %s bytes total.\n"), i->memblock_total, s); printf(ngettext("Currently in use: %u block containing %s bytes total.\n",
"Currently in use: %u blocks containing %s bytes total.\n",
i->memblock_total),
i->memblock_total, s);
pa_bytes_snprint(s, sizeof(s), i->memblock_allocated_size); pa_bytes_snprint(s, sizeof(s), i->memblock_allocated_size);
printf(_("Allocated during whole lifetime: %u blocks containing %s bytes total.\n"), i->memblock_allocated, s); printf(ngettext("Allocated during whole lifetime: %u block containing %s bytes total.\n",
"Allocated during whole lifetime: %u blocks containing %s bytes total.\n",
i->memblock_allocated),
i->memblock_allocated, s);
pa_bytes_snprint(s, sizeof(s), i->scache_size); pa_bytes_snprint(s, sizeof(s), i->scache_size);
printf(_("Sample cache size: %s\n"), s); printf(_("Sample cache size: %s\n"), s);
@ -881,7 +887,9 @@ static void fill_volume(pa_cvolume *cv, unsigned supported) {
if (volume.channels == 1) { if (volume.channels == 1) {
pa_cvolume_set(&volume, supported, volume.values[0]); pa_cvolume_set(&volume, supported, volume.values[0]);
} else if (volume.channels != supported) { } else if (volume.channels != supported) {
pa_log(_("Failed to set volume: You tried to set volumes for %d channels, whereas channel/s supported = %d\n"), pa_log(ngettext("Failed to set volume: You tried to set volumes for %d channel, whereas channel/s supported = %d\n",
"Failed to set volume: You tried to set volumes for %d channels, whereas channel/s supported = %d\n",
volume.channels),
volume.channels, supported); volume.channels, supported);
quit(1); quit(1);
return; return;