diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index e04cc934a..adba65474 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1225,8 +1225,10 @@ class MeshService : Service(), Logging { when (intent.action) { RadioInterfaceService.RADIO_CONNECTED_ACTION -> { try { + // sleep now disabled by default on ESP32, permanent is true unless isPowerSaving enabled + val lsEnabled = radioConfig?.preferences?.isPowerSaving ?: false val connected = intent.getBooleanExtra(EXTRA_CONNECTED, false) - val permanent = intent.getBooleanExtra(EXTRA_PERMANENT, false) + val permanent = intent.getBooleanExtra(EXTRA_PERMANENT, false) || !lsEnabled onConnectionChanged( when { connected -> ConnectionState.CONNECTED diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 566608553..d5e126be7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -52,7 +52,7 @@ Seznam vysílačů v síti Aktualizace softwaru Připojeno k vysílači (%s) - Nepřipojeno, zvolte si vysílač + Nepřipojeno Připojené k uspanému vysílači. Aktualizovat na %s Aplikace je příliš stará diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 06655d6ec..a29066008 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -53,7 +53,7 @@ Αναβάθμιση Firmware Συνδεδεμένο στο radio Συνδεδεμένο στο radio (%s) - Αποσυνδεδεμένο, επιλέξτε radio + Αποσυνδεδεμένο Συνδεδεμένο στο radio, αλλά βρίσκεται σε ύπνωση Αναβάθμιση σε %s Εφαρμογή πολύ παλαιά diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4832d241b..0fccde7d4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -50,7 +50,7 @@ Actualizar el firmware Conectado a la radio Conectado a la radio (%s) - No está conectado seleccione la radio de abajo + No está conectado Conectado a la radio pero está en reposo Actualizar a %s Es necesario actualizar la aplicación diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 491b00e6f..82595b286 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -54,7 +54,7 @@ Mise à jour du Firmware Connecté à une radio Connecté à la radio (%s) - Non connecté, veuillez sélectionner une radio ci-dessous + Non connecté Connecté à la radio, mais en mode veille Aucun (désactivé) Vous devez mettre à jour l\'application sur le Google Play Store (ou Github). Cette version n\'est plus compatible avec la radio. diff --git a/app/src/main/res/values-ht/strings.xml b/app/src/main/res/values-ht/strings.xml index 02236b315..5fb52deec 100644 --- a/app/src/main/res/values-ht/strings.xml +++ b/app/src/main/res/values-ht/strings.xml @@ -51,7 +51,7 @@ Mete ajou mikrolojisyèl Konekte ak radyo Konekte ak radyo (%s) - Pa konekte, chwazi radyo anba a + Pa konekte Konekte ak radyo, men li ap dòmi Mizajou %s Aplikasyon twò ansyen diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 654d74ab0..3cc95f3e1 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -52,7 +52,7 @@ Firmware frissítés Kapcsolódva a rádióhoz Kapcsolódva a(z) %s rádióhoz - Nincs kapcsolat, válasszon egy rádiót alább + Nincs kapcsolat Kapcsolódva a rádióhoz, de az alvó üzemmódban van Frissítés %s verzióra Az alkalmazás frissítése szükséges diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a2fb2d994..786052953 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -52,7 +52,7 @@ mapboxの有償プラン(または代替地図プロバイダ)を検討さ ネットワーク内のノードリスト ファームウェアアップデート Meshtasticデバイスに接続しました。(%s) - 接続されていません。下記のMeshtasticデバイスを選択してください。 + 接続されていません 接続しましたが、Meshtasticデバイスはスリープ状態です。 %s更新 言語 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index a6b747228..a0d095559 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -51,7 +51,7 @@ 펌웨어 업데이트 라디오로 연결됨 라디오로 연결됨 (%s) - 연결되지 않음, 아래에서 라이오를 선택하세요. + 연결되지 않음 라디오에 연결됨, 해당 라이도는 잠자기중. %s로 업데이트 너무 오래된 앱 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1bd37b686..b8f70c89e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -53,7 +53,7 @@ Programma Updaten Verbonden met een radio Verbonden met radio (%s) - Niet verbonden, selecteer radio hieronder + Niet verbonden Verbonden met radio in slaapstand Updaten naar %s Applicatie te oud diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index f675496a4..ab30033c3 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -53,7 +53,7 @@ Oppdater Firmware Tilkoblet radio Tilkoblet til radio (%s) - Ikke tilkoblet. velg radio nedenfor + Ikke tilkoblet Tilkoblet radio, men den sover Oppdater til %s Applikasjon for gammel diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 02e373bae..1f842c165 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -53,7 +53,7 @@ Atualizar Firmware Conectado ao rádio Conectado ao rádio (%s) - Não conectado, selecione um rádio abaixo + Não conectado Conectado ao rádio, mas ele está em suspensão (sleep) Atualização para %s Atualização do aplicativo necessária diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3e3019895..d36dc9580 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -52,7 +52,7 @@ Atualizar Firmware Conectado ao rádio Conectado ao rádio (%s) - Não conectado, escolha um rádio em baixo + Não conectado Conectado ao rádio, mas está a dormir Atualização para %s A aplicação é muito antiga diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f0dc195c5..9906c35bd 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -53,7 +53,7 @@ Updateaza firmware-ul Connectat la dispozitiv Conectat la dispozitivul (%s) - Neconectat, selectează dispozitivul din lista de jos + Neconectat Connectat la dispozitivi, dar e în modul de sleep Updateaza către %s Aplicație prea veche diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index c28077f89..bc9aa1573 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -53,7 +53,7 @@ Aktualizácia firmvéru Pripojené k vysielaču Pripojené k vysielaču (%s) - Nepripojené, zvoľte si vysielač. + Nepripojené Pripojené k uspatému vysielaču. Aktualizovať na %s Aplikácia je príliš stará diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 6faa2fe3d..96340e38d 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -51,7 +51,7 @@ Posodobite vdelano programsko opremo Povezana z radiem Povezana z radiem (%s) - Ni povezano. Izberite radio spodaj + Ni povezano Povezan z radiem, vendar radio "spi" Posodobi v %s Aplikacija je prestara diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3739a19b2..33d304a9f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -53,7 +53,7 @@ Yazılım güncelle Radyoya bağlandı (%s) telsizine bağlandı - Bağlı değil, aşağıdan bir radyo seçiniz + Bağlı değil Telsize bağlandı, ancak uyku durumunda %s\'e güncelle Uygulama çok eski diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 6e27c241b..e64b5d4c6 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -53,7 +53,7 @@ 更新固件 连接设备 连接到设备(%s) - 未连接,请选择下方的设备 + 未连接 已连接到设备,正在休眠中 更新到%s 需要应用程序更新 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 404935fe9..8fe586770 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,7 +57,7 @@ Update Firmware Connected to radio Connected to radio (%s) - Not connected, select radio below + Not connected Connected to radio, but it is sleeping Update to %s Application update required