Pulsar.cpp   Pulsar.cpp 
skipping to change at line 159 skipping to change at line 159
if (flags&Name) if (flags&Name)
{ {
oss << "<h2>" << designation << "</h2>"; oss << "<h2>" << designation << "</h2>";
} }
if (flags&ObjectType) if (flags&ObjectType)
{ {
if (glitch==0) if (glitch==0)
oss << q_("Type: <b>%1</b>").arg(q_("pulsar")) << "< br />"; oss << QString("%1: <b>%2</b>").arg(q_("Type"), q_(" pulsar")) << "<br />";
else else
{ {
QString sglitch; QString sglitch;
if (glitch==1) if (glitch==1)
sglitch = q_("has one registered glitch"); sglitch = q_("has one registered glitch");
else else
{ {
// TRANSLATORS: Full phrase is "Has X regist ered glitches", where X is number // TRANSLATORS: Full phrase is "Has X regist ered glitches", where X is number
sglitch = q_("has %1 registered glitches").a rg(glitch); sglitch = q_("has %1 registered glitches").a rg(glitch);
} }
oss << q_("Type: <b>%1</b> (%2)").arg(q_("pulsar wit h glitches")).arg(sglitch) << "<br />"; oss << QString("%1: <b>%2</b> (%3)").arg(q_("Type"), q_("pulsar with glitches")).arg(sglitch) << "<br />";
} }
} }
// Ra/Dec etc. // Ra/Dec etc.
oss << getPositionInfoString(core, flags); oss << getCommonInfoString(core, flags);
if (flags&Extra) if (flags&Extra)
{ {
if (period>0) if (period>0)
{ {
//TRANSLATORS: Unit of measure for period - seconds oss << QString("%1: %2 %3")
oss << q_("Barycentric period: %1 s").arg(QString::n .arg(q_("Barycentric period"))
umber(period, 'f', 16)) << "<br>"; .arg(QString::number(period, 'f', 16))
//TRANSLATORS: Unit of measure for period - s
econds
.arg(qc_("s", "period"));
oss << "<br />";
} }
if (pderivative>0) if (pderivative>0)
{ oss << QString("%1: %2").arg(q_("Time derivative of
oss << q_("Time derivative of barycentric period: %1 barycentric period")).arg(QString::number(pderivative, 'e', 5)) << "<br />"
").arg(QString::number(pderivative, 'e', 5)) << "<br>"; ;
}
if (dmeasure>0) if (dmeasure>0)
{ {
oss << QString("%1 %2 %3<sup>-3</sup> %4 %5") oss << QString("%1: %2 %3/%4<sup>3</sup>")
.arg(q_("Dispersion measure:")) .arg(q_("Dispersion measure"))
.arg(QString::number(dmeasure, 'f', 3)) .arg(QString::number(dmeasure, 'f', 3))
//TRANSLATORS: Unit of measure for distance -
centimeters
.arg(q_("cm"))
.arg(QChar(0x00B7))
//TRANSLATORS: Unit of measure for distance - parsecs //TRANSLATORS: Unit of measure for distance - parsecs
.arg(q_("pc")); .arg(qc_("pc", "distance"))
oss << "<br>"; //TRANSLATORS: Unit of measure for distance -
centimeters
.arg(qc_("cm", "distance"));
oss << "<br />";
} }
double edot = getEdot(period, pderivative); double edot = getEdot(period, pderivative);
if (edot>0) if (edot>0)
{ {
oss << q_("Spin down energy loss rate: %1 ergs/s").a oss << QString("%1: %2 %3")
rg(QString::number(edot, 'e', 2)) << "<br>"; .arg(q_("Spin down energy loss rate"))
.arg(QString::number(edot, 'e', 2))
//TRANSLATORS: Unit of measure for power - er
g per second
.arg(qc_("ergs/s", "power"));
oss << "<br>";
} }
if (bperiod>0) if (bperiod>0)
{ {
oss << q_("Binary period of pulsar: %1 days").arg(QS oss << QString("%1: %2 %3")
tring::number(bperiod, 'f', 12)) << "<br>"; .arg(q_("Binary period of pulsar"))
.arg(QString::number(bperiod, 'f', 12))
//TRANSLATORS: Unit of measure for period - d
ays
.arg(qc_("days", "period"));
oss << "<br>";
} }
if (eccentricity>0) if (eccentricity>0)
{ oss << QString("%1: %2").arg(q_("Eccentricity")).arg
oss << q_("Eccentricity: %1").arg(QString::number(ec (QString::number(eccentricity, 'f', 10)) << "<br />";
centricity, 'f', 10)) << "<br>";
}
if (parallax>0) if (parallax>0)
{ {
//TRANSLATORS: Unit of measure for annual parallax - oss << QString("%1: %2 %3")
milliarcseconds .arg(q_("Annual parallax"))
oss << q_("Annual parallax: %1 mas").arg(parallax) < .arg(parallax)
< "<br>"; //TRANSLATORS: Unit of measure for annual par
allax - milliarcseconds
.arg(qc_("mas", "parallax"));
oss << "<br />";
} }
if (distance>0) if (distance>0)
{ {
oss << q_("Distance based on electron density model: oss << QString("%1: %2 %3 (%4 %5)")
%1 kpc (%2 ly)").arg(distance).arg(distance*3261.563777) << "<br>"; .arg(q_("Distance based on electron density m
odel"))
.arg(distance)
//TRANSLATORS: Unit of measure for distance -
kiloparsecs
.arg(qc_("kpc", "distance"))
.arg(distance*3261.563777)
//TRANSLATORS: Unit of measure for distance -
light years
.arg(qc_("ly", "distance"));
oss << "<br />";
} }
if (w50>0) if (w50>0)
{ {
oss << q_("Profile width at 50% of peak: %1 ms").arg oss << QString("%1: %2 %3")
(QString::number(w50, 'f', 2)) << "<br>"; // xgettext:no-c-format
.arg(q_("Profile width at 50% of peak"))
.arg(QString::number(w50, 'f', 2))
//TRANSLATORS: Unit of measure for time - mil
liseconds
.arg(qc_("ms", "time"));
oss << "<br />";
} }
// TRANSLATORS: Full phrase is "Time averaged flux density a
t XXXMHz"
QString flux = q_("Time averaged flux density at");
// TRANSLATORS: Unit of measurement of frequency
QString freq = qc_("MHz", "frequency");
// TRANSLATORS: mJy is milliJansky(10-26W/m2/Hz)
QString sfd = qc_("mJy", "spectral flux density");
if (s400>0) if (s400>0)
{ oss << QString("%1 %2%3: %4 %5").arg(flux).arg(400).
oss << QString("%1 %2%3: %4 %5") arg(freq).arg(QString::number(s400, 'f', 2)).arg(sfd) << "<br />";
// TRANSLATORS: Full phrase is "Time averaged
flux density at XXXMHz"
.arg(q_("Time averaged flux density at"))
.arg(400)
// TRANSLATORS: Unit of measurement of freque
ncy
.arg(q_("MHz"))
.arg(QString::number(s400, 'f', 2))
// TRANSLATORS: mJy is milliJansky(10-26W/m2/
Hz)
.arg(q_("mJy")) << "<br>";
}
if (s600>0) if (s600>0)
{ oss << QString("%1 %2%3: %4 %5").arg(flux).arg(600).
oss << QString("%1 %2%3: %4 %5") arg(freq).arg(QString::number(s600, 'f', 2)).arg(sfd) << "<br />";
// TRANSLATORS: Full phrase is "Time averaged
flux density at XXXMHz"
.arg(q_("Time averaged flux density at"))
.arg(600)
// TRANSLATORS: Unit of measurement of freque
ncy
.arg(q_("MHz"))
.arg(QString::number(s600, 'f', 2))
// TRANSLATORS: mJy is milliJansky(10-26W/m2/
Hz)
.arg(q_("mJy")) << "<br>";
}
if (s1400>0) if (s1400>0)
{ oss << QString("%1 %2%3: %4 %5").arg(flux).arg(1400)
oss << QString("%1 %2%3: %4 %5") .arg(freq).arg(QString::number(s1400, 'f', 2)).arg(sfd) << "<br />";
// TRANSLATORS: Full phrase is "Time averaged
flux density at XXXMHz"
.arg(q_("Time averaged flux density at"))
.arg(1400)
// TRANSLATORS: Unit of measurement of freque
ncy
.arg(q_("MHz"))
.arg(QString::number(s1400, 'f', 2))
// TRANSLATORS: mJy is milliJansky(10-26W/m2/
Hz)
.arg(q_("mJy")) << "<br>";
}
if (notes.length()>0) if (notes.length()>0)
{ oss << "<br />" << QString("%1: %2").arg(q_("Notes")
oss << "<br>" << q_("Notes: %1").arg(getPulsarTypeIn ).arg(getPulsarTypeInfoString(notes)) << "<br />";
foString(notes)) << "<br>";
}
} }
postProcessInfoString(str, flags); postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap Pulsar::getInfoMap(const StelCore *core) const QVariantMap Pulsar::getInfoMap(const StelCore *core) const
{ {
QVariantMap map = StelObject::getInfoMap(core); QVariantMap map = StelObject::getInfoMap(core);
 End of changes. 19 change blocks. 
80 lines changed or deleted 86 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/