DBus: track, heading, transponder. Added I18N for track/heading, added further I18N keys. Of course not all I18N strings are translated yet.

samples/blackmiscquantities_dbus/BlackMiscTest.Testservice.xml

@@ -34,5 +34,13 @@
       <arg name="geo" type="((didb(s)(s))(didb(s)(s))(didb(s)(s)))" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Geo::CCoordinateGeodetic"/>
     </method>
+    <method name="receiveTransponder">
+      <arg name="transponder" type="(sii)" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CTransponder"/>
+    </method>
+    <method name="receiveTrack">
+      <arg name="track" type="(didb(s)(s)b)" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CTrack"/>
+    </method>
   </interface>
 </node>

samples/blackmiscquantities_dbus/main.cpp

@@ -75,7 +75,10 @@ int main(int argc, char *argv[])
     } else {
         qDebug() << "Already registered, assuming 2nd pid: " << TestserviceTool::getPid();
         BlackmisctestTestserviceInterface testserviceInterface(Testservice::ServiceName, Testservice::ServicePath, connection, &a);
-        double speedValue = 200.0;
+
+        CSpeed speed(200, BlackMisc::PhysicalQuantities::CSpeedUnit::km_h());
+        CAltitude al(1000, true, CLengthUnit::ft());
+
         while (true) {
             QDBusMessage m = QDBusMessage::createSignal(
                         Testservice::ServicePath, Testservice::ServiceName,
@@ -103,7 +106,6 @@ int main(int argc, char *argv[])
             qDebug() << "Send list via interface" << list;
 
             // PQs
-            CSpeed speed(speedValue++, BlackMisc::PhysicalQuantities::CSpeedUnit::km_h());
             testserviceInterface.receiveSpeed(speed);
             qDebug() << "Send speed via interface" << speed;
 
@@ -111,17 +113,28 @@ int main(int argc, char *argv[])
             testserviceInterface.receiveSpeed(speed);
             qDebug() << "Send speed via interface" << speed;
             TestserviceTool::sleep(2500);
+            speed.switchUnit(CSpeedUnit::km_h());
+            speed.addUnitValue(1.0);
 
             // Aviation
             CComSystem comSystem = CComSystem("DBUS COM1", CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress(), CPhysicalQuantitiesConstants::FrequencyUnicom());
             testserviceInterface.receiveComUnit(comSystem);
             qDebug() << "Send COM via interface" << comSystem;
 
-            CAltitude al(1000, true, CLengthUnit::ft());
             QDBusVariant qv(QVariant::fromValue(al));
             testserviceInterface.receiveVariant(qv);
             testserviceInterface.receiveAltitude(al);
             qDebug() << "Send altitude via interface" << al;
+            al.addUnitValue(1);
+
+            CTransponder transponder("transponder", 7000, CTransponder::ModeC);
+            testserviceInterface.receiveTransponder(transponder);
+            qDebug() << "Send transponder via interface" << transponder;
+
+            CTrack track(123.45, true, CAngleUnit::deg());
+            testserviceInterface.receiveTrack(track);
+            qDebug() << "Send track via interface" << track;
+
             TestserviceTool::sleep(2500);
 
             // Math

samples/blackmiscquantities_dbus/testservice.cpp

@@ -85,4 +85,20 @@ void Testservice::receiveGeoPosition(const BlackMisc::Geo::CCoordinateGeodetic &
     qDebug() << "Pid:" << TestserviceTool::getPid() << "Received geo data:" << geo;
 }
 
+/*
+ * Receive transponder
+ */
+void Testservice::receiveTransponder(const BlackMisc::Aviation::CTransponder &transponder)
+{
+    qDebug() << "Pid:" << TestserviceTool::getPid() << "Received transponder:" << transponder;
+}
+
+/*
+ * Receive track
+ */
+void Testservice::receiveTrack(const BlackMisc::Aviation::CTrack &track)
+{
+    qDebug() << "Pid:" << TestserviceTool::getPid() << "Received track:" << track;
+}
+
 } // namespace

samples/blackmiscquantities_dbus/testservice.h

@@ -94,6 +94,18 @@ public slots:
      */
     void receiveGeoPosition(const BlackMisc::Geo::CCoordinateGeodetic &geo);
 
+    /*!
+     * \brief Receive transponder
+     * \param transponder
+     */
+    void receiveTransponder(const BlackMisc::Aviation::CTransponder &transponder);
+
+    /*!
+     * \brief Receive track
+     * \param track
+     */
+    void receiveTrack(const BlackMisc::Aviation::CTrack &track);
+
 public:
     static const QString ServiceName;
     static const QString ServicePath;

src/blackmisc/avaltitude.cpp

@@ -16,7 +16,7 @@ namespace Aviation
 /*
  * Own implementation for streaming
  */
-QString CAltitude::stringForConverter() const
+QString CAltitude::stringForConverter(bool /** i18n **/) const
 {
     QString s = CLength::stringForConverter();
     return s.append(this->m_msl ? " MSL" : " AGL");

src/blackmisc/avaltitude.h

@@ -24,9 +24,10 @@ private:
 protected:
     /*!
      * \brief Specific stream operation for Altitude
+     * \param i18n
      * \return
      */
-    virtual QString stringForConverter() const;
+    virtual QString stringForConverter(bool i18n) const;
 
     /*!
      * \brief Stream to DBus <<

src/blackmisc/avheading.cpp

@@ -16,9 +16,9 @@ namespace Aviation
 /*
  * Own implementation for streaming
  */
-QString CHeading::stringForConverter() const
+QString CHeading::stringForConverter(bool i18n) const
 {
-    QString s = CAngle::stringForConverter();
+    QString s = CAngle::stringForConverter(i18n);
     return s.append(this->m_magnetic ? " magnetic" : " true");
 }
 
@@ -50,5 +50,14 @@ bool CHeading::operator !=(const CHeading &otherHeading)
     return !((*this) == otherHeading);
 }
 
+/*!
+ * \brief Register metadata of unit and quantity
+ */
+void CHeading::registerMetadata()
+{
+    qRegisterMetaType<CHeading>(typeid(CHeading).name());
+    qDBusRegisterMetaType<CHeading>();
+}
+
 } // namespace
 } // namespace

src/blackmisc/avheading.h

@@ -23,9 +23,28 @@ private:
 protected:
     /*!
      * \brief Specific stream operation for heading
+     * \param i18n
      * \return
      */
-    virtual QString stringForConverter() const;
+    virtual QString stringForConverter(bool i18n = false) const;
+
+    /*!
+     * \brief Stream to DBus <<
+     * \param argument
+     */
+    virtual void marshallToDbus(QDBusArgument &argument) const {
+        CAngle::marshallToDbus(argument);
+        argument << this->m_magnetic;
+    }
+
+    /*!
+     * \brief Stream from DBus >>
+     * \param argument
+     */
+    virtual void unmarshallFromDbus(const QDBusArgument &argument) {
+        CAngle::unmarshallFromDbus(argument);
+        argument >> this->m_magnetic;
+    }
 
 public:
     /*!
@@ -108,8 +127,16 @@ public:
         CAngle::switchUnit(newUnit);
         return (*this);
     }
+
+    /*!
+     * \brief Register metadata
+     */
+    static void registerMetadata();
 };
 
 } // namespace
 } // namespace
+
+Q_DECLARE_METATYPE(BlackMisc::Aviation::CHeading)
+
 #endif // guard

src/blackmisc/aviocomsystem.h

@@ -199,6 +199,7 @@ public:
         if (!(s = comSystem.validate(false))) comSystem = CComSystem(); // reset to default
         return s;
     }
+
     /*!
      * \brief COM1 unit
      * \param activeFrequencyMHz
@@ -208,6 +209,7 @@ public:
     static CComSystem getCom1System(double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
         return CComSystem(CModulator::NameCom1(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
     }
+
     /*!
      * \brief COM1 unit
      * \param activeFrequency
@@ -237,6 +239,7 @@ public:
     static bool tryGetCom1Unit(CComSystem &comSystem, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
         return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom1(), activeFrequency, standbyFrequency);
     }
+
     /*!
      * \brief COM2 unit
      * \param activeFrequencyMHz
@@ -246,6 +249,7 @@ public:
     static CComSystem getCom2System(double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
         return CComSystem(CModulator::NameCom2(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
     }
+
     /*!
      * \brief COM2 unit
      * \param activeFrequency
@@ -255,6 +259,7 @@ public:
     static CComSystem getCom2System(BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
         return CComSystem(CModulator::NameCom2(), activeFrequency, standbyFrequency ==  CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency);
     }
+
     /*!
      * \brief Try to get COM unit
      * \param comSystem
@@ -265,6 +270,7 @@ public:
     static bool tryGetCom2System(CComSystem &comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
         return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom2(), activeFrequencyMHz, standbyFrequencyMHz);
     }
+
     /*!
      * \brief Try to get COM unit
      * \param comSystem
@@ -285,6 +291,7 @@ public:
     static CComSystem getCom3System(double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
         return CComSystem(CModulator::NameCom3(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
     }
+
     /*!
      * \brief COM3 unit
      * \param activeFrequency
@@ -305,6 +312,7 @@ public:
     static bool tryGetCom3System(CComSystem &comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
         return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom3(), activeFrequencyMHz, standbyFrequencyMHz);
     }
+
     /*!
      * \brief Try to get COM unit
      * \param comSystem

src/blackmisc/aviomodulator.h

@@ -272,6 +272,7 @@ public:
     {
         return this->m_frequencyActive == CModulator::FrequencyNotSet();
     }
+
     /*!
      * \brief Toggle active and standby frequencies
      */

src/blackmisc/aviotransponder.cpp

@@ -99,5 +99,36 @@ QString CTransponder::getTransponderCodeFormatted() const
     return f.right(4);
 }
 
+/*!
+ * \brief Stream to DBus <<
+ * \param argument
+ */
+void CTransponder::marshallToDbus(QDBusArgument &argument) const {
+    CAvionicsBase::marshallToDbus(argument);
+    argument << this->m_transponderCode;
+    argument << static_cast<qint32>(this->m_transponderMode);
+}
+
+/*!
+ * \brief Stream from DBus >>
+ * \param argument
+ */
+void CTransponder::unmarshallFromDbus(const QDBusArgument &argument) {
+    CAvionicsBase::unmarshallFromDbus(argument);
+    qint32 tm;
+    argument >> this->m_transponderCode;
+    argument >> tm;
+    this->m_transponderMode = static_cast<TransponderMode>(tm);
+}
+
+/*!
+ * \brief Register metadata of unit and quantity
+ */
+void CTransponder::registerMetadata()
+{
+    qRegisterMetaType<CTransponder>(typeid(CTransponder).name());
+    qDBusRegisterMetaType<CTransponder>();
+}
+
 } // namespace
 } // namespace

src/blackmisc/aviotransponder.h

@@ -31,6 +31,7 @@ public:
         ModeC = 12,
         ModeS = 20
     };
+
 private:
     qint32 m_transponderCode; //<! Transponder code
     TransponderMode m_transponderMode; //<! Transponder mode
@@ -63,6 +64,7 @@ private:
         if (!ok)this->m_transponderCode = -1; // will cause assert / exception
         this->validate(validate);
     }
+
 protected:
     /*!
      * \brief Are the set values valid / in range?
@@ -95,6 +97,18 @@ protected:
      */
     virtual QString stringForConverter(bool i18n = false) const;
 
+    /*!
+     * \brief Stream to DBus <<
+     * \param argument
+     */
+    virtual void marshallToDbus(QDBusArgument &argument) const;
+
+    /*!
+     * \brief Stream from DBus >>
+     * \param argument
+     */
+    virtual void unmarshallFromDbus(const QDBusArgument &argument);
+
 public:
     /*!
      * Default constructor
@@ -262,6 +276,7 @@ public:
         if (!(s = transponder.validate(false))) transponder = CTransponder(); // reset to default
         return s;
     }
+
     /*!
      * Try to get a Transponder unit with given name and code. Returns true in case an object
      * has been sucessfully created, otherwise returns a default object.
@@ -278,6 +293,7 @@ public:
         if (!(s = transponder.validate(false))) transponder = CTransponder(); // reset to default
         return s;
     }
+
     /*!
      * \brief Transponder unit
      * \param transponderCode
@@ -288,6 +304,7 @@ public:
     {
         return CTransponder("Transponder", transponderCode, mode);
     }
+
     /*!
      * \brief Try to get Transponder unit
      * \param transponder
@@ -312,6 +329,11 @@ public:
         return CTransponder::tryGetTransponder(transponder, "Transponder", transponderCode, mode);
     }
 
+    /*!
+     * \brief Register metadata of unit and quantity
+     */
+    static void registerMetadata();
+
 };
 
 } // namespace

src/blackmisc/avtrack.cpp

@@ -16,9 +16,9 @@ namespace Aviation
 /*
  * Own implementation for streaming
  */
-QString CTrack::stringForConverter() const
+QString CTrack::stringForConverter(bool i18n) const
 {
-    QString s = CAngle::stringForConverter();
+    QString s = CAngle::stringForConverter(i18n);
     return s.append(this->m_magnetic ? " magnetic" : " true");
 }
 
@@ -50,5 +50,14 @@ bool CTrack::operator !=(const CTrack &otherTrack)
     return !((*this) == otherTrack);
 }
 
+/*!
+ * \brief Register metadata of unit and quantity
+ */
+void CTrack::registerMetadata()
+{
+    qRegisterMetaType<CTrack>(typeid(CTrack).name());
+    qDBusRegisterMetaType<CTrack>();
+}
+
 } // namespace
 } // namespace

src/blackmisc/avtrack.h

@@ -27,7 +27,25 @@ protected:
      * \brief Specific stream operation for Track
      * \return
      */
-    virtual QString stringForConverter() const;
+    virtual QString stringForConverter(bool i18n = false) const;
+
+    /*!
+     * \brief Stream to DBus <<
+     * \param argument
+     */
+    virtual void marshallToDbus(QDBusArgument &argument) const {
+        CAngle::marshallToDbus(argument);
+        argument << this->m_magnetic;
+    }
+
+    /*!
+     * \brief Stream from DBus >>
+     * \param argument
+     */
+    virtual void unmarshallFromDbus(const QDBusArgument &argument) {
+        CAngle::unmarshallFromDbus(argument);
+        argument >> this->m_magnetic;
+    }
 
 public:
     /*!
@@ -85,7 +103,10 @@ public:
      */
     bool isMagneticTrack() const {
         return this->m_magnetic;
+        QT_TRANSLATE_NOOP("Aviation", "magnetic");
+        QT_TRANSLATE_NOOP("Aviation", "true");
     }
+
     /*!
      * \brief True Track?
      * \return
@@ -93,10 +114,17 @@ public:
     bool isTrueTrack() const {
         return !this->m_magnetic;
     }
+
+    /*!
+     * \brief Register metadata
+     */
+    static void registerMetadata();
 };
 
 } // namespace
 
 } // namespace
 
+Q_DECLARE_METATYPE(BlackMisc::Aviation::CTrack)
+
 #endif // BLACKMISC_AVTRACK_H

src/blackmisc/basestreamstringifier.h

@@ -153,7 +153,7 @@ protected:
     }
 
     /*!
-     * \brief String for converter
+     * \brief String for QString conversion
      * \param i18n
      * \return
      */

src/blackmisc/blackmisc.pro

@@ -23,4 +23,5 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
 HEADERS += *.h
 SOURCES += *.cpp
 DESTDIR = ../../lib
-OTHER_FILES += $$TRANSLATIONS
+OTHER_FILES += $$TRANSLATIONS \
+    readme.txt

src/blackmisc/blackmiscfreefunctions.cpp

@@ -33,6 +33,9 @@ void BlackMisc::Aviation::registerMetadata()
     CAdfSystem::registerMetadata();
     CAltitude::registerMetadata();
     CAviationVerticalPositions::registerMetadata();
+    CTransponder::registerMetadata();
+    CHeading::registerMetadata();
+    CTrack::registerMetadata();
 }
 
 /*

src/blackmisc/blackmiscfreefunctions.h

@@ -13,6 +13,7 @@
 /*!
  * \brief Workaround, to call initResource from namespace
  */
+// cannot be declare within namespace, see docu
 inline void initBlackMiscResources() { Q_INIT_RESOURCE(blackmisc); }
 
 /*!

src/blackmisc/com_handler.cpp

@@ -100,8 +100,8 @@ namespace BlackMisc
         /////////////////////////////////////////////////
 
         data.resize(message_length);
+        // creates warning when compiled as RELEASE
         qint32 bytes = stream.readRawData(data.data(), message_length);
-
         Q_ASSERT (bytes == message_length);
         Q_ASSERT (data.size() == message_length);
 

src/blackmisc/pqbase.cpp

@@ -179,7 +179,7 @@ double CMeasurementUnit::valueRounded(double value, int digits) const
 /*
  * Rounded to QString
  */
-QString CMeasurementUnit::toQStringRounded(double value, int digits) const
+QString CMeasurementUnit::toQStringRounded(double value, int digits, bool /** i18n **/) const
 {
     if (digits < 0) digits = this->m_displayDigits;
     double v = CMath::round(value, digits);

src/blackmisc/pqbase.h

@@ -507,9 +507,10 @@ public:
      * specialized formatting
      * \param value
      * \param digits
+     * \param i18n
      * \return
      */
-    virtual QString toQStringRounded(double value, int digits = -1) const;
+    virtual QString toQStringRounded(double value, int digits = -1, bool i18n = false) const;
 
     /*!
      * \brief Rounded value

src/blackmisc/pqphysicalquantity.h

@@ -77,7 +77,7 @@ protected:
      */
     virtual QString stringForConverter(bool i18n = false) const
     {
-        return this->unitValueRoundedWithUnit(i18n);
+        return this->unitValueRoundedWithUnit(-1, i18n);
     }
 
     /*!

src/blackmisc/pqunits.cpp

@@ -66,7 +66,7 @@ double CAngleUnit::conversionSexagesimalToSi(const CMeasurementUnit &, double va
 /*
  * Rounded to QString
  */
-QString CAngleUnit::toQStringRounded(double value, int digits) const
+QString CAngleUnit::toQStringRounded(double value, int digits, bool i18n) const
 {
     QString s;
     if ((*this) == CAngleUnit::sexagesimalDeg())
@@ -76,8 +76,9 @@ QString CAngleUnit::toQStringRounded(double value, int digits) const
         double mi = floor((value - de) * 100.0);
         double se = floor((value - de - mi / 100.0) * 1000000) / 100.0;
         QString ses = QLocale::system().toString(se, 'f', 2);
-        s = QString::number(de).append(" ").append(QString::number(mi))
+        s = QString::number(de);
-            .append("'").append(ses).append("\"");
+        s = s.append(i18n ? CAngleUnit::deg().getUnitName(true) : " ");
+        s = s.append(QString::number(mi)).append("'").append(ses).append("\"");
     }
     else
     {

src/blackmisc/pqunits.h

@@ -240,9 +240,10 @@ public:
      * \brief Special conversion to QString for sexagesimal degrees.
      * \param value
      * \param digits
+     * \param i18n
      * \return
      */
-    virtual QString toQStringRounded(double value, int digits) const;
+    virtual QString toQStringRounded(double value, int digits = -1, bool i18n = false) const;
 
     /*!
      * \brief Radians
@@ -477,6 +478,7 @@ public:
     {
         static CMassUnit kg("kilogram", "kg", true, true, 1.0, CMeasurementPrefix::k(), 1);
         return kg;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "kilogram");
     }
 
     /*!
@@ -487,6 +489,7 @@ public:
     {
         static CMassUnit g("gram", "g", true, false, 1.0 / 1000.0, CMeasurementPrefix::One(), 0);
         return g;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "gram");
     }
 
     /*!
@@ -497,6 +500,7 @@ public:
     {
         static CMassUnit t("tonne", "t", false, false, 1000.0, CMeasurementPrefix::One(), 3);
         return t;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "tonne");
     }
 
     /*!
@@ -507,6 +511,7 @@ public:
     {
         static CMassUnit lbs("pound", "lb", false, false, 0.45359237, CMeasurementPrefix::One(), 1);
         return lbs;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "pound");
     }
 
     /*!
@@ -594,6 +599,7 @@ public:
     {
         static CPressureUnit Pa("pascal", "Pa", true);
         return Pa;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "pascal");
     }
 
     /*!
@@ -604,6 +610,7 @@ public:
     {
         static CPressureUnit hPa("hectopascal", "hPa", true, CMeasurementPrefix::h().getFactor(), CMeasurementPrefix::h());
         return hPa;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "hectopascal");
     }
 
     /*!
@@ -614,6 +621,7 @@ public:
     {
         static CPressureUnit psi("pounds per square inch", "psi", false, 6894.8, CMeasurementPrefix::One(), 2);
         return psi;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "pounds per square inch");
     }
 
     /*!
@@ -624,6 +632,7 @@ public:
     {
         static CPressureUnit bar("bar", "bar", false, 1E5);
         return bar;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "bar");
     }
 
     /*!
@@ -879,6 +888,7 @@ public:
     {
         static CSpeedUnit ms("meters/second", "m/s", true, false);
         return ms;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "meters/second");
     }
 
     /*!
@@ -889,6 +899,7 @@ public:
     {
         static CSpeedUnit kts("knot", "kts", false, false, 1852.0 / 3600.0, CMeasurementPrefix::One(), 1);
         return kts;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "knot");
     }
 
     /*!
@@ -899,6 +910,7 @@ public:
     {
         static CSpeedUnit NMh("nautical miles/hour", "NM/h", false, false, 1852.0 / 3600.0, CMeasurementPrefix::One(), 1);
         return NMh;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "nautical miles/hour");
     }
 
     /*!
@@ -907,8 +919,9 @@ public:
      */
     static const CSpeedUnit &ft_s()
     {
-        static CSpeedUnit fts("feet/seconds", "ft/s", false, false, 0.3048, CMeasurementPrefix::One(), 0);
+        static CSpeedUnit fts("feet/second", "ft/s", false, false, 0.3048, CMeasurementPrefix::One(), 0);
         return fts;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "feet/second");
     }
 
     /*!
@@ -919,6 +932,7 @@ public:
     {
         static CSpeedUnit ftmin("feet/minute", "ft/min", false, false, 0.3048 / 60.0, CMeasurementPrefix::One(), 0);
         return ftmin;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "feet/minute");
     }
 
     /*!
@@ -929,6 +943,7 @@ public:
     {
         static CSpeedUnit kmh("kilometers/hour", "km/h", false, false, 1.0 / 3.6, CMeasurementPrefix::One(), 1);
         return kmh;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "kilometers/hour");
     }
 
     /*!
@@ -1015,6 +1030,7 @@ public:
     {
         static CTimeUnit s("second", "s", true, true, 1, CMeasurementPrefix::None(), 1);
         return s;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "second");
     }
 
     /*!
@@ -1025,6 +1041,7 @@ public:
     {
         static CTimeUnit ms("millisecond", "ms", true, false, 1E-03, CMeasurementPrefix::m(), 0);
         return ms;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "millisecond");
     }
 
     /*!
@@ -1035,6 +1052,7 @@ public:
     {
         static CTimeUnit h("hour", "h", false, false, 3600, CMeasurementPrefix::None(), 1);
         return h;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "hour");
     }
 
     /*!
@@ -1045,6 +1063,7 @@ public:
     {
         static CTimeUnit min("minute", "min", false, false, 60, CMeasurementPrefix::None(), 2);
         return min;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "minute");
     }
 
     /*!
@@ -1055,6 +1074,7 @@ public:
     {
         static CTimeUnit day("day", "d", false, false, 3600 * 24, CMeasurementPrefix::None(), 1);
         return day;
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "day");
     }
 
     /*!
@@ -1138,9 +1158,9 @@ public:
      */
     static const CAccelerationUnit &m_s2()
     {
-        static CAccelerationUnit ms2("meter/second^2", "m/s^2", true, false, 1, CMeasurementPrefix::None(), 1);
+        static CAccelerationUnit ms2("meters/second^2", "m/s^2", true, false, 1, CMeasurementPrefix::None(), 1);
         return ms2;
-        QT_TRANSLATE_NOOP("CMeasurementUnit", "meter/second^2");
+        QT_TRANSLATE_NOOP("CMeasurementUnit", "meters/second^2");
         QT_TRANSLATE_NOOP("CMeasurementUnit", "m/s^2");
     }
 

src/blackmisc/readme.txt

@@ -0,0 +1 @@
+I18N: lupdate -noobsolete blackmisc.pro

src/blackmisc/translations/blackmisc_i18n_de.ts

@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="de_DE">
+<context>
+    <name>Aviation</name>
+    <message>
+        <location filename="../avtrack.h" line="106"/>
+        <source>magnetic</source>
+        <translatorcomment>Magnetischer Kurs</translatorcomment>
+        <translation type="unfinished">missweisend</translation>
+    </message>
+    <message>
+        <location filename="../avtrack.h" line="107"/>
+        <source>true</source>
+        <translatorcomment>Rechtweisend Kurs (TH)</translatorcomment>
+        <translation type="unfinished">rechtweisend</translation>
+    </message>
+</context>
 <context>
     <name>CMeasurementUnit</name>
     <message>
@@ -39,80 +54,175 @@
         <translation>Statute Meile</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="255"/>
+        <location filename="../pqunits.h" line="256"/>
         <source>radian</source>
         <translation type="unfinished">Bogenmaß</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="266"/>
+        <location filename="../pqunits.h" line="267"/>
         <source>degree</source>
         <translation>Grad</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="267"/>
+        <location filename="../pqunits.h" line="268"/>
         <source>deg</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="278"/>
+        <location filename="../pqunits.h" line="279"/>
         <source>segadecimal degree</source>
         <translation>Segadezimal</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="637"/>
+        <location filename="../pqunits.h" line="481"/>
+        <source>kilogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="492"/>
+        <source>gram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="503"/>
+        <source>tonne</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="514"/>
+        <source>pound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="602"/>
+        <source>pascal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="613"/>
+        <source>hectopascal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="624"/>
+        <source>pounds per square inch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="635"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="646"/>
         <source>millibar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="648"/>
+        <location filename="../pqunits.h" line="657"/>
-        <location filename="../pqunits.h" line="659"/>
+        <location filename="../pqunits.h" line="668"/>
         <source>inch of mercury 0C</source>
         <translation type="unfinished">Inch Hg bei 0°C</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="774"/>
+        <location filename="../pqunits.h" line="783"/>
         <source>Kelvin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="785"/>
+        <location filename="../pqunits.h" line="794"/>
         <source>centigrade</source>
         <translation type="unfinished">Grad Celcsius</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="786"/>
+        <location filename="../pqunits.h" line="795"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="797"/>
+        <location filename="../pqunits.h" line="806"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="798"/>
+        <location filename="../pqunits.h" line="807"/>
         <source>F</source>
         <translation>°F</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1143"/>
+        <location filename="../pqunits.h" line="891"/>
-        <source>meter/second^2</source>
+        <source>meters/second</source>
+        <translation type="unfinished">Meter/Sekunde</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="902"/>
+        <source>knot</source>
+        <translation type="unfinished">Knoten</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="913"/>
+        <source>nautical miles/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="924"/>
+        <source>feet/second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="935"/>
+        <source>feet/minute</source>
+        <translation type="unfinished">Fuß/Minute</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="946"/>
+        <source>kilometers/hour</source>
+        <translation type="unfinished">Kilometer/Stunde</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1033"/>
+        <source>second</source>
+        <translation type="unfinished">Sekunde</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1044"/>
+        <source>millisecond</source>
+        <translation type="unfinished">Millisekunde</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1055"/>
+        <source>hour</source>
+        <translation type="unfinished">Stunde</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1066"/>
+        <source>minute</source>
+        <translation type="unfinished">Minute</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1077"/>
+        <source>day</source>
+        <translation type="unfinished">Tag</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1163"/>
+        <source>meters/second^2</source>
         <translation type="unfinished">Meter/Sekunde²</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1144"/>
+        <location filename="../pqunits.h" line="1164"/>
         <source>m/s^2</source>
-        <translation type="unfinished">m/s²</translation>
+        <translation>m/s²</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1156"/>
+        <location filename="../pqunits.h" line="1176"/>
         <source>ft/s^2</source>
         <translation>ft/s²</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1155"/>
+        <location filename="../pqunits.h" line="1175"/>
         <source>feet/second^2</source>
-        <translation>Fuß/Sekunde^2</translation>
+        <translation type="unfinished">Fuß/Sekunde²</translation>
     </message>
 </context>
 </TS>

src/blackmisc/translations/blackmisc_i18n_en.ts

@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="en_US">
+<context>
+    <name>Aviation</name>
+    <message>
+        <location filename="../avtrack.h" line="106"/>
+        <source>magnetic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../avtrack.h" line="107"/>
+        <source>true</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CMeasurementUnit</name>
     <message>
@@ -39,78 +52,173 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="255"/>
+        <location filename="../pqunits.h" line="256"/>
         <source>radian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="266"/>
+        <location filename="../pqunits.h" line="267"/>
         <source>degree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="267"/>
+        <location filename="../pqunits.h" line="268"/>
         <source>deg</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="278"/>
+        <location filename="../pqunits.h" line="279"/>
         <source>segadecimal degree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="637"/>
+        <location filename="../pqunits.h" line="481"/>
+        <source>kilogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="492"/>
+        <source>gram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="503"/>
+        <source>tonne</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="514"/>
+        <source>pound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="602"/>
+        <source>pascal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="613"/>
+        <source>hectopascal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="624"/>
+        <source>pounds per square inch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="635"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="646"/>
         <source>millibar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="648"/>
+        <location filename="../pqunits.h" line="657"/>
-        <location filename="../pqunits.h" line="659"/>
+        <location filename="../pqunits.h" line="668"/>
         <source>inch of mercury 0C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="774"/>
+        <location filename="../pqunits.h" line="783"/>
         <source>Kelvin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="785"/>
+        <location filename="../pqunits.h" line="794"/>
         <source>centigrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="786"/>
+        <location filename="../pqunits.h" line="795"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="797"/>
+        <location filename="../pqunits.h" line="806"/>
         <source>Fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="798"/>
+        <location filename="../pqunits.h" line="807"/>
         <source>F</source>
         <translation>°F</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1143"/>
+        <location filename="../pqunits.h" line="891"/>
-        <source>meter/second^2</source>
+        <source>meters/second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1144"/>
+        <location filename="../pqunits.h" line="902"/>
-        <source>m/s^2</source>
+        <source>knot</source>
-        <translation type="unfinished">m/s²</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1156"/>
+        <location filename="../pqunits.h" line="913"/>
+        <source>nautical miles/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="924"/>
+        <source>feet/second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="935"/>
+        <source>feet/minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="946"/>
+        <source>kilometers/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1033"/>
+        <source>second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1044"/>
+        <source>millisecond</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1055"/>
+        <source>hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1066"/>
+        <source>minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1077"/>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1163"/>
+        <source>meters/second^2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1164"/>
+        <source>m/s^2</source>
+        <translation>m/s²</translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1176"/>
         <source>ft/s^2</source>
         <translation>ft/s²</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1155"/>
+        <location filename="../pqunits.h" line="1175"/>
         <source>feet/second^2</source>
         <translation type="unfinished"></translation>
     </message>

src/blackmisc/translations/blackmisc_i18n_fr.ts

@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="fr_FR">
+<context>
+    <name>Aviation</name>
+    <message>
+        <location filename="../avtrack.h" line="106"/>
+        <source>magnetic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../avtrack.h" line="107"/>
+        <source>true</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CMeasurementUnit</name>
     <message>
         <location filename="../pqunits.h" line="74"/>
         <source>meter</source>
-        <translation>mètre</translation>
+        <translation type="unfinished">mètre</translation>
     </message>
     <message>
         <location filename="../pqunits.h" line="86"/>
@@ -31,7 +44,7 @@
     <message>
         <location filename="../pqunits.h" line="131"/>
         <source>mile</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../pqunits.h" line="142"/>
@@ -39,78 +52,173 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="255"/>
+        <location filename="../pqunits.h" line="256"/>
         <source>radian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="266"/>
+        <location filename="../pqunits.h" line="267"/>
         <source>degree</source>
         <translation>degré</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="267"/>
+        <location filename="../pqunits.h" line="268"/>
         <source>deg</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="278"/>
+        <location filename="../pqunits.h" line="279"/>
         <source>segadecimal degree</source>
         <translation>segadecimal</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="637"/>
+        <location filename="../pqunits.h" line="481"/>
+        <source>kilogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="492"/>
+        <source>gram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="503"/>
+        <source>tonne</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="514"/>
+        <source>pound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="602"/>
+        <source>pascal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="613"/>
+        <source>hectopascal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="624"/>
+        <source>pounds per square inch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="635"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="646"/>
         <source>millibar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="648"/>
+        <location filename="../pqunits.h" line="657"/>
-        <location filename="../pqunits.h" line="659"/>
+        <location filename="../pqunits.h" line="668"/>
         <source>inch of mercury 0C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="774"/>
+        <location filename="../pqunits.h" line="783"/>
         <source>Kelvin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="785"/>
+        <location filename="../pqunits.h" line="794"/>
         <source>centigrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="786"/>
+        <location filename="../pqunits.h" line="795"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="797"/>
+        <location filename="../pqunits.h" line="806"/>
         <source>Fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="798"/>
+        <location filename="../pqunits.h" line="807"/>
         <source>F</source>
         <translation>°F</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1143"/>
+        <location filename="../pqunits.h" line="891"/>
-        <source>meter/second^2</source>
+        <source>meters/second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1144"/>
+        <location filename="../pqunits.h" line="902"/>
+        <source>knot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="913"/>
+        <source>nautical miles/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="924"/>
+        <source>feet/second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="935"/>
+        <source>feet/minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="946"/>
+        <source>kilometers/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1033"/>
+        <source>second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1044"/>
+        <source>millisecond</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1055"/>
+        <source>hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1066"/>
+        <source>minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1077"/>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1163"/>
+        <source>meters/second^2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../pqunits.h" line="1164"/>
         <source>m/s^2</source>
         <translation>m/s²</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1156"/>
+        <location filename="../pqunits.h" line="1176"/>
         <source>ft/s^2</source>
         <translation>ft/s²</translation>
     </message>
     <message>
-        <location filename="../pqunits.h" line="1155"/>
+        <location filename="../pqunits.h" line="1175"/>
         <source>feet/second^2</source>
         <translation type="unfinished"></translation>
     </message>