Merge branch 'master' into excluded_modules

meshtastic · Dec 18, 2024 · b22fbdc · b22fbdc
2 parents a132101 + b05768d
commit b22fbdc
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 106 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,8 +32,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdk 34
-        versionCode 30514 // format is Mmmss (where M is 1+the numeric major number
-        versionName "2.5.14"
+        versionCode 30515 // format is Mmmss (where M is 1+the numeric major number
+        versionName "2.5.15"
         testInstrumentationRunner "com.geeksville.mesh.TestRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio

diff --git a/app/src/main/assets/device_hardware.json b/app/src/main/assets/device_hardware.json
@@ -141,7 +141,7 @@
   },
   {
     "hwModel": 12,
-    "hwModelSlug": "TBEAM_S3_CORE",
+    "hwModelSlug": "LILYGO_TBEAM_S3_CORE",
     "platformioTarget": "tbeam-s3-core",
     "architecture": "esp32-s3",
     "activelySupported": true,

diff --git a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
@@ -209,6 +209,9 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
                                 closeGatt() // Close the old non-auto connection
                                 lowLevelConnect(true)
                             }
+                        } else if (status == 147) {
+                            info("got 147, calling lostConnection()")
+                            lostConnection("code 147")
                         }
 
                         if (status == 257) { // mystery error code when phone is hung

diff --git a/app/src/main/proto b/app/src/main/proto
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -256,7 +256,7 @@
     <string name="device_metrics_log">Geräte-Metriken-Protokoll</string>
     <string name="node_map">Nodekarte</string>
     <string name="position_log">Positions-Protokoll</string>
-    <string name="env_metrics_log">Umgebungs-Metriken-Protokoll</string>
+    <string name="env_metrics_log">Sensor-Protokoll</string>
     <string name="sig_metrics_log">Signal-Metriken-Protkoll</string>
     <string name="administration">Administration</string>
     <string name="remote_admin">Fernadministration</string>

diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="node_filter_placeholder">Filter</string>
-    <string name="desc_node_filter_clear">clear node filter</string>
-    <string name="node_filter_include_unknown">Include unknown</string>
-    <string name="node_filter_show_details">Show details</string>
+    <string name="node_filter_placeholder">Filtras</string>
+    <string name="desc_node_filter_clear">išvalyti NODE filtrą</string>
+    <string name="node_filter_include_unknown">Įtraukti nežinomus</string>
+    <string name="node_filter_show_details">Rodyti detales</string>
     <string name="node_sort_alpha">A-Z</string>
-    <string name="node_sort_channel">Channel</string>
-    <string name="node_sort_distance">Distance</string>
+    <string name="node_sort_channel">Kanalas</string>
+    <string name="node_sort_distance">Atstumas</string>
     <string name="node_sort_hops_away">Hops away</string>
-    <string name="node_sort_last_heard">Last heard</string>
-    <string name="node_sort_via_mqtt">via MQTT</string>
-    <string name="unrecognized">Unrecognized</string>
+    <string name="node_sort_last_heard">Seniausiai girdėtas</string>
+    <string name="node_sort_via_mqtt">per MQTT</string>
+    <string name="unrecognized">Be kategorijos</string>
     <string name="message_status_enroute">Waiting to be acknowledged</string>
-    <string name="message_status_queued">Queued for sending</string>
+    <string name="message_status_queued">Eilėje išsiuntimui</string>
     <string name="routing_error_none">Acknowledged</string>
-    <string name="routing_error_no_route">No route</string>
+    <string name="routing_error_no_route">Nėra maršruto</string>
     <string name="routing_error_got_nak">Received a negative acknowledgment</string>
     <string name="routing_error_timeout">Timeout</string>
     <string name="routing_error_no_interface">No Interface</string>
     <string name="routing_error_max_retransmit">Max Retransmission Reached</string>
-    <string name="routing_error_no_channel">No Channel</string>
+    <string name="routing_error_no_channel">Nėra kanalo</string>
     <string name="routing_error_too_large">Packet too large</string>
-    <string name="routing_error_no_response">No response</string>
-    <string name="routing_error_bad_request">Bad Request</string>
+    <string name="routing_error_no_response">Nėra atsakymo</string>
+    <string name="routing_error_bad_request">Bloga užklausa</string>
     <string name="routing_error_duty_cycle_limit">Regional Duty Cycle Limit Reached</string>
-    <string name="routing_error_not_authorized">Not Authorized</string>
+    <string name="routing_error_not_authorized">Neautorizuotas</string>
     <string name="routing_error_pki_failed">Encrypted Send Failed</string>
     <string name="routing_error_pki_unknown_pubkey">Unknown Public Key</string>
-    <string name="routing_error_admin_bad_session_key">Bad session key</string>
+    <string name="routing_error_admin_bad_session_key">Blogas sesijos raktas</string>
     <string name="routing_error_admin_public_key_unauthorized">Public Key unauthorized</string>
     <string name="role_client">App connected or standalone messaging device.</string>
     <string name="role_client_mute">Device that does not forward packets from other devices.</string>
@@ -55,10 +55,10 @@
     <string name="unknown_username">Nežinomas vartotojo vardas</string>
     <string name="send">Siųsti</string>
     <string name="send_text">Siųsti tekstą</string>
-    <string name="warning_not_paired">Šiuo telefonu dar susietas joks Meshtastic suderinamas radijas. Prašome suporuoti įrenginį ir nustatyti savo vartotojo vardą..\n\nŠi atvirojo kodo programa yra kūrimo stadijoje, jei pastebėsite problemas, prašome pranešti mūsų forume: https://github.com/orgs/meshtastic/discussions\n\nDaugiau informacijos rasite mūsų interneto svetainėje - www.meshtastic.org.</string>
+    <string name="warning_not_paired">Su šiuo telefonu dar nėra susietas joks Meshtastic įtaisais. Prašome suporuoti įrenginį ir nustatyti savo vartotojo vardą.\n\nŠi atvirojo kodo programa yra kūrimo stadijoje, jei pastebėsite problemas, prašome pranešti mūsų forume: https://github.com/orgs/meshtastic/discussions\n\nDaugiau informacijos rasite mūsų interneto svetainėje - www.meshtastic.org.</string>
     <string name="you">Tu</string>
     <string name="your_name">Jūsų vardas</string>
-    <string name="analytics_okay">Anoniminė naudojimo statistika ir avarijų ataskaitos.</string>
+    <string name="analytics_okay">Siųsti anoniminę naudojimo statistika ir klaidų ataskaitas.</string>
     <string name="looking_for_meshtastic_devices">Ieškoma Meshtastic įrenginių…</string>
     <string name="starting_pairing">Pradėti susiejimą</string>
     <string name="url_for_join">URL prisijungimui prie Meshtastic tinklo</string>
@@ -91,7 +91,7 @@
     <string name="app_too_old">Reikalingas programos atnaujinimas</string>
     <string name="must_update">Urite atnaujinti šią programą programėlių parduotuvėje (arba Github). Ji per sena, kad galėtų bendrauti su šiuo radijo įrangos programinės įrangos versija. Prašome perskaityti mūsų <a href="https://meshtastic.org/docs/software/android/installation">dokumentaciją</a> šia tema.</string>
     <string name="none">Nėra (išjungti)</string>
-    <string name="modem_config_turbo">Short Range / Turbo</string>
+    <string name="modem_config_turbo">Mažo nuotolio / Turbo</string>
     <string name="modem_config_short">Trumpas nuotolis / Greitas</string>
     <string name="modem_config_medium">Vidutinis nuotolis / Greitas</string>
     <string name="modem_config_long">Ilgas nuotolis / Greitas</string>
@@ -121,13 +121,13 @@
     <string name="region">Regionas</string>
     <string name="cant_change_no_radio">Nepavyko pakeisti kanalo, nes radijas dar nėra prisijungęs. Bandykite dar kartą.</string>
     <string name="save_messages">Eksportuoti rangetest.csv</string>
-    <string name="reset">Atkurti</string>
+    <string name="reset">Nustatyti iš naujo</string>
     <string name="scan">Skenuoti</string>
     <string name="are_you_sure_change_default">Ar tikrai norite pakeisti į numatytąjį kanalą?</string>
     <string name="reset_to_defaults">Atkurti numatytuosius parametrus</string>
     <string name="apply">Taikyti</string>
     <string name="no_app_found">Nerasta jokia programa URL siuntimui</string>
-    <string name="theme">Grafiniai apvalkalai</string>
+    <string name="theme">Išvaizda</string>
     <string name="theme_light">Šviesi</string>
     <string name="theme_dark">Tamsi</string>
     <string name="theme_system">Sistemos numatyta</string>
@@ -167,7 +167,7 @@
     <string name="cant_shutdown">Shutdown not supported on this device</string>
     <string name="reboot">Perkrauti</string>
     <string name="traceroute">Traceroute</string>
-    <string name="intro_show">Rodyti įvada</string>
+    <string name="intro_show">Rodyti įvadą</string>
     <string name="intro_welcome">Sveikiname prisijungus prie Meshtastic</string>
     <string name="intro_welcome_text">Meshtastic yra atvirojo kodo, nepriklausomas nuo tinklo, šifruota komunikacijos platforma. Meshtastic radijo ryšys formuoja tinklą ir komunikuoja, naudodamas LoRa protokolą siųsti bei gauti tekstinius pranešimus.</string>
     <string name="intro_started">... Pradėkime!</string>
@@ -188,8 +188,8 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="direct_message">Tiesioginė žinutė</string>
     <string name="nodedb_reset">NodeDB perkrauti</string>
     <string name="nodedb_reset_description">Tai išvalys visus mazgus iš šio sąrašo.</string>
-    <string name="delivery_confirmed">Delivery confirmed</string>
-    <string name="error">Error</string>
+    <string name="delivery_confirmed">Pristatymas patvirtintas</string>
+    <string name="error">Klaida</string>
     <string name="ignore">Ignoruoti</string>
     <string name="ignore_add">Ar pridėti „%s“ į ignoruojamų sąrašą? Po šio pakeitimo jūsų radijas bus perkrautas.</string>
     <string name="ignore_remove">Ar pašalinti „%s“ iš ignoruojamų sąrašo? Po šio pakeitimo jūsų radijas bus perkrautas.</string>
@@ -201,7 +201,7 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="device_settings">Radijo modulio konfigūracija</string>
     <string name="module_settings">Modulio konfigūracija</string>
     <string name="add">Pridėti</string>
-    <string name="edit">Edit</string>
+    <string name="edit">Redaguoti</string>
     <string name="calculating">Skaičiuojama…</string>
     <string name="map_offline_manager">Neprisijungusio režimo valdymas</string>
     <string name="map_cache_size">Dabartinis talpyklos dydis</string>
@@ -220,25 +220,25 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="waypoint_new">Naujas orientyras</string>
     <string name="waypoint_received">Gautas orientyras: %s</string>
     <string name="error_duty_cycle">Pasiektas veikimo ciklo limitas. Šiuo metu negalima siųsti žinučių, bandykite vėliau.</string>
-    <string name="remove">Remove</string>
+    <string name="remove">Pašalinti</string>
     <string name="remove_node_text">This node will be removed from your list until your node receives data from it again.</string>
-    <string name="mute">Mute</string>
-    <string name="mute_notifications">Mute notifications</string>
-    <string name="mute_8_hours">8 hours</string>
-    <string name="mute_1_week">1 week</string>
-    <string name="mute_always">Always</string>
-    <string name="replace">Replace</string>
-    <string name="wifi_qr_code_scan">Scan WiFi QR code</string>
+    <string name="mute">Nutildyti</string>
+    <string name="mute_notifications">Nutildyti pranešimus</string>
+    <string name="mute_8_hours">8 valandos</string>
+    <string name="mute_1_week">1 savaitė</string>
+    <string name="mute_always">Visada</string>
+    <string name="replace">Pakeisti</string>
+    <string name="wifi_qr_code_scan">Nuskenuoti WiFi QR kodą</string>
     <string name="wifi_qr_code_error">Invalid WiFi Credential QR code format</string>
     <string name="navigate_back">Navigate Back</string>
-    <string name="battery">Battery</string>
+    <string name="battery">Baterija</string>
     <string name="channel_utilization">Channel Utilization</string>
     <string name="air_utilization">Air Utilization</string>
-    <string name="temperature">Temperature</string>
-    <string name="humidity">Humidity</string>
+    <string name="temperature">Temperatūra</string>
+    <string name="humidity">Drėgmė</string>
     <string name="logs">Logs</string>
     <string name="hops_away">Hops Away</string>
-    <string name="info">Information</string>
+    <string name="info">Informacija</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>
     <string name="iaq">IAQ</string>
@@ -261,21 +261,21 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="position_log">Position Log</string>
     <string name="env_metrics_log">Environment Metrics Log</string>
     <string name="sig_metrics_log">Signal Metrics Log</string>
-    <string name="administration">Administration</string>
-    <string name="remote_admin">Remote Administration</string>
-    <string name="bad">Bad</string>
-    <string name="fair">Fair</string>
-    <string name="good">Good</string>
-    <string name="none_quality">None</string>
-    <string name="signal">Signal</string>
-    <string name="signal_quality">Signal Quality</string>
+    <string name="administration">Administravimas</string>
+    <string name="remote_admin">Nuotolinis administravimas</string>
+    <string name="bad">Blogas</string>
+    <string name="fair">Pakankamas</string>
+    <string name="good">Geras</string>
+    <string name="none_quality">Nėra</string>
+    <string name="signal">Signalas</string>
+    <string name="signal_quality">Signalo kokybė</string>
     <string name="traceroute_log">Traceroute Log</string>
-    <string name="traceroute_direct">Direct</string>
+    <string name="traceroute_direct">Tiesiogiai</string>
     <plurals name="traceroute_hops">
-        <item quantity="one">1 hop</item>
-        <item quantity="few">%d hops</item>
-        <item quantity="many">%d hops</item>
-        <item quantity="other">%d hops</item>
+        <item quantity="one">Vienas</item>
+        <item quantity="few">Keli</item>
+        <item quantity="many">Daug</item>
+        <item quantity="other">Kita</item>
     </plurals>
     <string name="traceroute_diff">Hops towards %1$d Hops back %2$d</string>
 </resources>
+22 −1		meshtastic/mesh.proto
+5 −0		meshtastic/portnums.proto
+5 −0		meshtastic/telemetry.proto