Tanu Kaskinen pushed to branch master at PulseAudio / pulseaudio
Commits:
65c9195e by Marek Cernocky at 2018-10-09T08:56:31Z
i18n: Fixed plural forms handling
- - - - -
2 changed files:
- src/modules/alsa/alsa-util.c
- src/utils/pactl.c
Changes:
=====================================
src/modules/alsa/alsa-util.c
=====================================
@@ -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 {
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"
- "Most likely this is a bug in the ALSA driver '%s'.
Please report this issue to the ALSA developers."),
+ 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.",
+ "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) (pa_bytes_to_usec(k, ss) /
PA_USEC_PER_MSEC),
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 {
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"
- "Most likely this is a bug in the ALSA driver '%s'.
Please report this issue to the ALSA developers."),
+ 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.",
+ "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,
k < 0 ? "-" : "",
(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 {
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"
- "Most likely this is a bug in the ALSA driver '%s'.
Please report this issue to the ALSA developers."),
+ 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.",
+ "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) (pa_bytes_to_usec(k, ss) /
PA_USEC_PER_MSEC),
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))
PA_ONCE_BEGIN {
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"
- "Most likely this is a bug in the ALSA driver '%s'.
Please report this issue to the ALSA developers."),
+ 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.",
+ "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) (pa_bytes_to_usec(k, ss) /
PA_USEC_PER_MSEC),
pa_strnull(dn));
=====================================
src/utils/pactl.c
=====================================
@@ -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);
- 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);
- 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);
printf(_("Sample cache size: %s\n"), s);
@@ -881,8 +887,10 @@ static void fill_volume(pa_cvolume *cv, unsigned
supported) {
if (volume.channels == 1) {
pa_cvolume_set(&volume, supported, volume.values[0]);
} 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"),
- volume.channels, supported);
+ 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);
quit(1);
return;
}
View it on GitLab:
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/65c9195e8f81d6e8c847e6cb91df1513acb24aec
--
View it on GitLab:
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/65c9195e8f81d6e8c847e6cb91df1513acb24aec
You're receiving this email because of your account on gitlab.freedesktop.org.
_______________________________________________
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
