summaryrefslogtreecommitdiff
path: root/gtk2_ardour/region_view.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-12-14 13:05:35 +0000
committerCarl Hetherington <carl@carlh.net>2010-12-14 13:05:35 +0000
commita571b28dd4507aea892c04c9675ebe67359c8b39 (patch)
tree427c7e5e58e8b88caa5a9c221bbe17270b7e5cfc /gtk2_ardour/region_view.cc
parentbb92cf3b2434fbeb547fb8df88ade0d1688ff823 (diff)
Fix some gettext plural forms. Should fix #3604.
git-svn-id: svn://localhost/ardour2/branches/3.0@8268 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_view.cc')
-rw-r--r--gtk2_ardour/region_view.cc33
1 files changed, 13 insertions, 20 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index e84d25c9f3..5163b65287 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -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