allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix some gettext plural forms. Should fix #3604.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8268 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2010-12-14 13:05:35 +00:00
parent bb92cf3b24
commit a571b28dd4
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/processor_box.cc
View File

@@ -767,18 +767,22 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
text += _("\nThis plugin has:\n");
if (has_midi) {
text += string_compose("\t%1 ", p.get_info()->n_inputs.n_midi()) + _("MIDI input(s)\n");
uint32_t const n = p.get_info()->n_inputs.n_midi ();
text += string_compose (ngettext ("\t%1 MIDI input", "\t%1 MIDI inputs", n), n);
}
if (has_audio) {
text += string_compose("\t%1 ", p.get_info()->n_inputs.n_audio()) + _("audio input(s)\n");
uint32_t const n = p.get_info()->n_inputs.n_audio ();
text += string_compose (ngettext ("\t%1 audio input", "\t%1 audio inputs", n), n);
}
text += _("\nBut at the insertion point, there are:\n");
if (has_midi) {
text += string_compose("\t%1 ", streams.count.n_midi()) + _("MIDI channel(s)\n");
uint32_t const n = streams.count.n_midi ();
text += string_compose (ngettext ("\t%1 MIDI channel\n", "\t%1 MIDI channels\n", n), n);
}
if (has_audio) {
text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n");
uint32_t const n = streams.count.n_audio ();
text += string_compose (ngettext ("\t%1 audio channel\n", "\t%1 audio channels\n", n), n);
}
text += string_compose (_("\n%1 is unable to insert this plugin here.\n"), PROGRAM_NAME);

33
gtk2_ardour/region_view.cc
View File

@@ -305,19 +305,11 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
_silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0;
_silence_text->property_y() = 20.0;
double ms;
char const * sunits;
char const * noun;
if (silences.size() > 1) {
noun = _("silent segments");
} else {
noun = _("silent segment");
}
ms = (float) shortest/_region->session().frame_rate();
double ms = (float) shortest/_region->session().frame_rate();
/* ms are now in seconds */
char const * sunits;
if (ms >= 60.0) {
sunits = _("minutes");
@@ -328,7 +320,11 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
} else {
sunits = _("secs");
}
string text = string_compose (ngettext ("%1 silent segment", "%1 silent segments", silences.size()), silences.size())
+ ", "
+ string_compose (_("shortest = %1 %2"), ms, sunits);
if (seen_audible) {
/* ms are now in seconds */
double ma = shortest_audible / _region->session().frame_rate();
@@ -343,14 +339,11 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
} else {
aunits = _("secs");
}
_silence_text->property_text() = string_compose (_("%1 %2, shortest = %3 %4\n (shortest audible segment = %5 %6)"),
silences.size(), noun,
ms, sunits, ma, aunits).c_str();
} else {
_silence_text->property_text() = string_compose (_("%1 %2, shortest = %3 %4"),
silences.size(), noun, ms, sunits).c_str();
}
text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits);
}
_silence_text->property_text() = text.c_str ();
}
void