Merge branch 'develop' into feature/cleanup

buildscript-translations.sh

@@ -10,7 +10,7 @@ cd ../..
 # way, source files that are not compiled (such as iOS files on a linux build
 # host) will still be considered.
 
-lupdate-qt6 src -ts 3rdParty/enrouteText/assets/enroute_cz.ts
+lupdate-qt6 src -ts 3rdParty/enrouteText/assets/enroute_cs.ts
 lupdate-qt6 src -ts 3rdParty/enrouteText/assets/enroute_de.ts
 lupdate-qt6 src -ts 3rdParty/enrouteText/assets/enroute_es.ts
 lupdate-qt6 src -ts 3rdParty/enrouteText/assets/enroute_fr.ts

generatedSources/manual/08-appendix/04-authors.html

@@ -106,12 +106,22 @@ <h1>Authors<a class="headerlink" href="#authors" title="Link to this heading">
 · <a class="reference external" href="mailto:stefan&#46;kebekus&#37;&#52;&#48;gmail&#46;com">stefan<span>&#46;</span>kebekus<span>&#64;</span>gmail<span>&#46;</span>com</a></p>
 <section id="contributions">
 <h2>Contributions<a class="headerlink" href="#contributions" title="Link to this heading"></a></h2>
-<p><strong>iOS Version</strong> The app has been ported to iOS by Simon Schneider. Simon
-is currently student pilot (PPL) and member of the Akaflieg Freiburg
-flight club, just like Stefan.</p>
-<p><strong>Programming</strong> Heinz Blöchinger has helped us with file import
-functionality. After 15 years of alpine gliding, Heinz has fulfilled a
-big dream and now flies helicopters.</p>
+<ul class="simple">
+<li><p><strong>iOS Version:</strong> The app has been ported to iOS by Simon Schneider,
+who also maintains the iOS port. Simon received his PPL license in
+2024. Like Stefan, he is a member of the Akaflieg Freiburg flight
+club.</p></li>
+<li><p><strong>Programming:</strong> Heinz Blöchinger has helped us with file import
+functionality. After 15 years of alpine gliding, Heinz has fulfilled
+a big dream and now flies helicopters.</p></li>
+<li><p><strong>Programming:</strong> Christian Engelhardt started the implementation of
+height density calculation. Christian is a PPL pilot in southern
+Germany, studied electrical engineering and working as an Embedded SW
+Engineer.</p></li>
+<li><p><strong>Programming:</strong> Tom Linz completed height density calculation. He
+received his PPL license in late 2024. Tom works as a development
+engineer for safety systems.</p></li>
+</ul>
 </section>
 <section id="translations">
 <h2>Translations<a class="headerlink" href="#translations" title="Link to this heading"></a></h2>
@@ -120,8 +130,8 @@ <h2>Translations<a class="headerlink" href="#translations" title="Link to this h
 aerospace engineers. Luca is also doing aerobatics.</p></li>
 <li><p><strong>German:</strong> Markus Sachs. Markus flies trikes and is an enthusiastic
 ‘Co’ on everyting else that flies.</p></li>
-<li><p><strong>Italian:</strong> Ivan Battistella and Antonio Fardella. Antonio is a
-naval aviator with a passion for everything challenging.</p></li>
+<li><p><strong>Italian:</strong> Ivan Battistella and Antonio Fardella. Antonio is an
+ultralight pilot with a passion for everything challenging.</p></li>
 <li><p><strong>Polish:</strong> Sławek Mikuła.</p></li>
 <li><p><strong>Spanish:</strong> Luca Riva.</p></li>
 </ul>

generatedSources/manual/_sources/08-appendix/04-authors.rst.txt

@@ -10,13 +10,20 @@ club. Stefan flies gliders and motor planes.
 Contributions
 ~~~~~~~~~~~~~
 
-**iOS Version** The app has been ported to iOS by Simon Schneider. Simon
-is currently student pilot (PPL) and member of the Akaflieg Freiburg
-flight club, just like Stefan.
-
-**Programming** Heinz Blöchinger has helped us with file import
-functionality. After 15 years of alpine gliding, Heinz has fulfilled a
-big dream and now flies helicopters.
+-  **iOS Version:** The app has been ported to iOS by Simon Schneider,
+   who also maintains the iOS port. Simon received his PPL license in
+   2024. Like Stefan, he is a member of the Akaflieg Freiburg flight
+   club.
+-  **Programming:** Heinz Blöchinger has helped us with file import
+   functionality. After 15 years of alpine gliding, Heinz has fulfilled
+   a big dream and now flies helicopters.
+-  **Programming:** Christian Engelhardt started the implementation of
+   height density calculation. Christian is a PPL pilot in southern
+   Germany, studied electrical engineering and working as an Embedded SW
+   Engineer.
+-  **Programming:** Tom Linz completed height density calculation. He
+   received his PPL license in late 2024. Tom works as a development
+   engineer for safety systems.
 
 Translations
 ~~~~~~~~~~~~
@@ -25,8 +32,8 @@ Translations
    aerospace engineers. Luca is also doing aerobatics.
 -  **German:** Markus Sachs. Markus flies trikes and is an enthusiastic
    'Co' on everyting else that flies.
--  **Italian:** Ivan Battistella and Antonio Fardella. Antonio is a
-   naval aviator with a passion for everything challenging.
+-  **Italian:** Ivan Battistella and Antonio Fardella. Antonio is an
+   ultralight pilot with a passion for everything challenging.
 -  **Polish:** Sławek Mikuła.
 -  **Spanish:** Luca Riva.
 

src/Librarian.cpp

@@ -68,7 +68,7 @@ auto Librarian::getStringFromRessource(const QString &name) -> QString
                + "<strong>" + tr("Programming") + ":</strong> " + tr("Heinz Blöchinger has helped us with file import functionality. After 15 years of alpine gliding, Heinz has fulfilled a big dream and now flies helicopters.")
                + "</li>"
                + "<li>"
-               + "<strong>" + tr("Programming") + ":</strong> " + tr("Christian Engelhardt started the implementation of height density calculation. Christian is a PPL pilot in southern germany, studied electrical engineering and working as an Embedded SW Engineer.")
+               + "<strong>" + tr("Programming") + ":</strong> " + tr("Christian Engelhardt started the implementation of height density calculation. Christian is a PPL pilot in southern Germany, studied electrical engineering and working as an Embedded SW Engineer.")
                + "</li>"
                + "<li>"
                + "<strong>" + tr("Programming") + ":</strong> " + tr("Tom Linz completed height density calculation. He received his PPL license in late 2024. Tom works as a development engineer for safety systems.")
@@ -83,7 +83,7 @@ auto Librarian::getStringFromRessource(const QString &name) -> QString
 )html") + tr(R"html(
 <li><strong>German:</strong> Markus Sachs. Markus flies trikes and is an enthusiastic 'Co' on everyting else that flies.</li>
 )html") + tr(R"html(
-<li><strong>Italian:</strong> Ivan Battistella and Antonio Fardella.  Antonio is a naval aviator with a passion for everything challenging.</li>
+<li><strong>Italian:</strong> Ivan Battistella and Antonio Fardella.  Antonio is an ultralight pilot with a passion for everything challenging.</li>
 )html") + tr(R"html(
 <li><strong>Polish:</strong> Sławek Mikuła.</li>
 )html") + (R"html(
@@ -303,7 +303,7 @@ auto Librarian::getStringFromRessource(const QString &name) -> QString
     if (name == u":text/whatsnew.html"_qs)
     {
         QString result;
-        result += "<p>" + tr("<strong>Enroute Flight Navigation</strong> now computes the density height from METAR data.") + " "
+        result += "<p>" + tr("<strong>Enroute Flight Navigation</strong> now computes the density altitude from METAR data.") + " "
                   + tr("We thank Christian Engelhardt and Tom Linz for the implementation!") + "</p>";
 
         result += "<p>" + tr("As requested by our users, <strong>Enroute Flight Navigation</strong> is now able to import flight routes in FPL and PLN formats.") + " "

src/fileFormats/FPL.cpp

@@ -44,7 +44,7 @@ FileFormats::FPL::FPL(const QString& fileName)
     }
     if (xmlReader.name().compare("flight-plan") != 0)
     {
-        setError(QObject::tr("File %1 does not contain a flight plan.", "FileFormats::FPL").arg(fileName));
+        setError(QObject::tr("File %1 does not contain a route.", "FileFormats::FPL").arg(fileName));
         return;
     }
 
@@ -144,7 +144,7 @@ FileFormats::FPL::FPL(const QString& fileName)
             }
             if (count3 == 0)
             {
-                setError(QObject::tr("File %1 does not contain a waypoint.", "FileFormats::FPL").arg(fileName));
+                setError(QObject::tr("File %1 does not contain waypoints.", "FileFormats::FPL").arg(fileName));
                 return;
             }
         }
@@ -177,7 +177,7 @@ FileFormats::FPL::FPL(const QString& fileName)
                     }
                     if (count4 != 1)
                     {
-                        setError(QObject::tr("Route point %1 does not have a unique waypoint identifier.", "FileFormats::FPL").arg(count3));
+                        setError(QObject::tr("Waypoint %1 does not have a unique waypoint identifier.", "FileFormats::FPL").arg(count3));
                         return;
                     }
 
@@ -195,7 +195,7 @@ FileFormats::FPL::FPL(const QString& fileName)
             }
             if (count3 == 0)
             {
-                setError(QObject::tr("File %1 does not contain a waypoint.", "FileFormats::FPL").arg(fileName));
+                setError(QObject::tr("File %1 does not contain waypoints.", "FileFormats::FPL").arg(fileName));
                 return;
             }
         }
@@ -206,7 +206,7 @@ FileFormats::FPL::FPL(const QString& fileName)
     }
     if (waypointTableCounter != 1)
     {
-        setError(QObject::tr("File %1 does not contain a waypoint.", "FileFormats::FPL").arg(fileName));
+        setError(QObject::tr("File %1 does not contain waypoints.", "FileFormats::FPL").arg(fileName));
         return;
     }
     if (routeCounter != 1)

src/fileFormats/PLN.cpp

@@ -83,7 +83,7 @@ FileFormats::PLN::PLN(const QString& fileName)
     }
     if (xmlReader.name().compare("SimBase.Document", Qt::CaseInsensitive) != 0)
     {
-        setError(QObject::tr("File %1 does not contain a flight plan.", "FileFormats::PLN").arg(fileName));
+        setError(QObject::tr("File %1 does not contain a route.", "FileFormats::PLN").arg(fileName));
         return;
     }
 

src/qml/dialogs/WaypointDescription.qml

@@ -82,7 +82,7 @@ CenteringDialog {
                 if (weatherStation === null)
                     return ""
                 if (weatherStation.hasMETAR)
-                    return weatherStation.metar.summary + " • <a href='xx'>" + qsTr("full report") + "</a>"
+                    return weatherStation.metar.summary(Navigator.aircraft, Clock.time) + " • <a href='xx'>" + qsTr("full report") + "</a>"
                 return "<a href='xx'>" + qsTr("read TAF") + "</a>"
             }
             Layout.fillWidth: true

src/weather/METAR.cpp

@@ -314,7 +314,11 @@ QString Weather::METAR::derivedData(const Navigation::Aircraft& aircraft) const
     QStringList items;
     if (m_densityAltitude.isFinite())
     {
-        items += tr("Density Altitude: %1").arg(aircraft.verticalDistanceToString(m_densityAltitude));
+        Units::Distance const altitude = Units::Distance::fromM(m_location.altitude());
+        items += tr("Density Altitude: %1 (Δ %2)").arg(
+            aircraft.verticalDistanceToString(m_densityAltitude), 
+            aircraft.verticalDistanceToString(m_densityAltitude - altitude, /*forceSign=*/ true)
+            );
     }
     auto relativeHumidity = Navigation::Atmosphere::relativeHumidity(m_temperature, m_dewpoint);
     if (!std::isnan(relativeHumidity))