Merge branch 'main' into message-ui-tweaks

app/src/main/res/values/strings.xml

@@ -299,7 +299,7 @@
     <string name="humidity">Humidity</string>
     <string name="logs">Logs</string>
     <string name="hops_away">Hops Away</string>
-    <string name="hops_away_template">Hops Away: %$1d</string>
+    <string name="hops_away_template">Hops Away: %1$d</string>
     <string name="info">Information</string>
     <string name="ch_util_definition">Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).</string>
     <string name="air_util_definition">Percent of airtime for transmission used within the last hour.</string>