MeteorShower.cpp   MeteorShower.cpp 
skipping to change at line 552 skipping to change at line 552
oss << " (" << m_showerID <<")</h2>"; oss << " (" << m_showerID <<")</h2>";
} }
else else
{ {
oss << "</h2>"; oss << "</h2>";
} }
} }
if (flags&Extra) if (flags&Extra)
{ {
oss << q_("Type: <b>%1</b> (%2)").arg(q_("meteor shower"), m stdata) << "<br />"; oss << QString("%1: <b>%2</b> (%3)").arg(q_("Type"), q_("met eor shower"), mstdata) << "<br />";
} }
// Ra/Dec etc. // Ra/Dec etc.
oss << getPositionInfoString(core, flags); oss << getCommonInfoString(core, flags);
if (flags&Extra) if (flags&Extra)
{ {
QString sDriftRA = StelUtils::radToHmsStr(m_driftAlpha); QString sDriftRA = StelUtils::radToHmsStr(m_driftAlpha);
QString sDriftDE = StelUtils::radToDmsStr(m_driftDelta); QString sDriftDE = StelUtils::radToDmsStr(m_driftDelta);
if (withDecimalDegree) if (withDecimalDegree)
{ {
sDriftRA = StelUtils::radToDecDegStr(m_driftAlpha,4, false,true); sDriftRA = StelUtils::radToDecDegStr(m_driftAlpha,4, false,true);
sDriftDE = StelUtils::radToDecDegStr(m_driftDelta,4, false,true); sDriftDE = StelUtils::radToDecDegStr(m_driftDelta,4, false,true);
} }
oss << QString("%1: %2/%3") oss << QString("%1: %2/%3")
.arg(q_("Radiant drift (per day)")) .arg(q_("Radiant drift (per day)"))
.arg(sDriftRA) .arg(sDriftRA)
.arg(sDriftDE); .arg(sDriftDE);
oss << "<br />"; oss << "<br />";
if (m_speed > 0) if (m_speed > 0)
{ {
oss << q_("Geocentric meteoric velocity: %1 km/s").a oss << QString("%1: %2 %3")
rg(m_speed) << "<br />"; .arg(q_("Geocentric meteoric velocity"))
.arg(m_speed)
// TRANSLATORS: Unit of measure for speed - k
ilometers per second
.arg(qc_("km/s", "speed"));
oss << "<br />";
} }
if (m_pidx > 0) if (m_pidx > 0)
{ oss << QString("%1: %2").arg(q_("The population inde
oss << q_("The population index: %1").arg(m_pidx) << x")).arg(m_pidx) << "<br />";
"<br />";
}
if (!m_parentObj.isEmpty()) if (!m_parentObj.isEmpty())
{ oss << QString("%1: %2").arg(q_("Parent body")).arg(
oss << q_("Parent body: %1").arg(q_(m_parentObj)) << q_(m_parentObj)) << "<br />";
"<br />";
}
// activity info // activity info
if (m_status != INACTIVE) if (m_status != INACTIVE)
{ {
QString actStr = q_("Activity");
if(m_activity.start.month() == m_activity.finish.mon th()) if(m_activity.start.month() == m_activity.finish.mon th())
{ {
oss << QString("%1: %2 - %3 %4") oss << QString("%1: %2 - %3 %4")
.arg(q_("Activity")) .arg(actStr)
.arg(m_activity.start.day()) .arg(m_activity.start.day())
.arg(m_activity.finish.day()) .arg(m_activity.finish.day())
.arg(m_activity.start.toString("MMMM" )); .arg(m_activity.start.toString("MMMM" ));
} }
else else
{ {
oss << QString("%1: %2 - %3") oss << QString("%1: %2 - %3")
.arg(q_("Activity")) .arg(actStr)
.arg(m_activity.start.toString("d MMM M")) .arg(m_activity.start.toString("d MMM M"))
.arg(m_activity.finish.toString("d MM MM")); .arg(m_activity.finish.toString("d MM MM"));
} }
oss << "<br />"; oss << "<br />";
oss << q_("Maximum: %1").arg(m_activity.peak.toStrin g("d MMMM")); oss << q_("Maximum: %1").arg(m_activity.peak.toStrin g("d MMMM"));
oss << QString(" (%1 %2&deg;)") oss << QString(" (%1 %2&deg;)")
.arg(q_("Solar longitude")) .arg(q_("Solar longitude"))
.arg(getSolarLongitude(m_activity.peak)); .arg(getSolarLongitude(m_activity.peak));
oss << "<br />"; oss << "<br />";
 End of changes. 8 change blocks. 
14 lines changed or deleted 16 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/