Merge branch 'main' into wifi-aware

# Conflicts: # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-bn/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-fa/strings.xml # app/src/main/res/values-fil/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-he/strings.xml # app/src/main/res/values-hi/strings.xml # app/src/main/res/values-id/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-ka/strings.xml # app/src/main/res/values-ko/strings.xml # app/src/main/res/values-mg/strings.xml # app/src/main/res/values-ms/strings.xml # app/src/main/res/values-ne/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values-pa-rPK/strings.xml # app/src/main/res/values-pl/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-pt/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-sv/strings.xml # app/src/main/res/values-ta/strings.xml # app/src/main/res/values-th/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-uk/strings.xml # app/src/main/res/values-ur/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values-zh/strings.xml
2026-07-25 04:05:21 +00:00 · 2026-01-04 02:37:47 +07:00
parent 35030a05d8 1b9f76be23
commit 23e7e12e9e
35 changed files with 36 additions and 3 deletions
@@ -276,7 +276,7 @@ class MeshForegroundService : Service() {
        } else true
    }

-    private fun buildNotification(activeUsers: Int): Notification {
+    private fun buildNotification(activePeers: Int): Notification {
        val openIntent = Intent(this, MainActivity::class.java)
        val pendingIntent = PendingIntent.getActivity(
            this, 0, openIntent,
@@ -291,7 +291,7 @@ class MeshForegroundService : Service() {
        )

        val title = getString(R.string.app_name)
-        val content = getString(R.string.mesh_service_notification_content, activeUsers)
+        val content = getString(R.string.mesh_service_notification_content, activePeers)

        return NotificationCompat.Builder(this, CHANNEL_ID)
            .setContentTitle(title)
@@ -363,4 +363,5 @@
  <string name="dismiss">إغلاق</string>
  <string name="location_notes_input_placeholder">أضف ملاحظة لهذا المكان</string>
    <string name="bluetooth_recommended">بلوتوث موصى به</string>
+    <string name="mesh_service_notification_content">الشبكة تعمل — %1$d أقران</string>
 </resources>
@@ -350,4 +350,5 @@
    </plurals>

    <string name="bluetooth_recommended">ব্লুটুথ প্রস্তাবিত</string>
+    <string name="mesh_service_notification_content">মেশ চলছে — %1$d পিয়ার</string>
 </resources>
@@ -364,4 +364,5 @@
  <string name="dismiss">schließen</string>
  <string name="location_notes_input_placeholder">füge eine Notiz zu diesem Ort hinzu</string>
    <string name="bluetooth_recommended">Bluetooth empfohlen</string>
+    <string name="mesh_service_notification_content">Mesh läuft — %1$d Peers</string>
 </resources>
@@ -363,4 +363,5 @@
  <string name="dismiss">cerrar</string>
  <string name="location_notes_input_placeholder">agrega una nota para este lugar</string>
    <string name="bluetooth_recommended">Bluetooth recomendado</string>
+    <string name="mesh_service_notification_content">Mesh en ejecución — %1$d pares</string>
 </resources>
@@ -350,4 +350,5 @@
    </plurals>

    <string name="bluetooth_recommended">بلوتوث توصیه می شود</string>
+    <string name="mesh_service_notification_content">مش در حال اجرا — %1$d همتا</string>
 </resources>
@@ -363,4 +363,5 @@
    </plurals>

    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">Tumatakbo ang Mesh — %1$d na peer</string>
 </resources>
@@ -377,4 +377,5 @@
  <string name="dismiss">fermer</string>
  <string name="location_notes_input_placeholder">ajoutez une note pour cet endroit</string>
    <string name="bluetooth_recommended">Bluetooth recommandé</string>
+    <string name="mesh_service_notification_content">Mesh actif — %1$d pairs</string>
 </resources>
@@ -16,5 +16,6 @@
  <string name="location_notes_input_placeholder">הוסף הערה למקום זה</string>
    <string name="skip">Skip</string>
    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">רשת Mesh פועלת — %1$d עמיתים</string>
 </resources>

@@ -363,4 +363,5 @@
  <string name="dismiss">बंद करें</string>
  <string name="location_notes_input_placeholder">इस स्थान के लिए एक नोट जोड़ें</string>
    <string name="bluetooth_recommended">ब्लूटूथ अनुशंसित</string>
+    <string name="mesh_service_notification_content">मेश चल रहा है — %1$d पीयर्स</string>
 </resources>
@@ -363,4 +363,5 @@
  <string name="dismiss">tutup</string>
  <string name="location_notes_input_placeholder">tambahkan catatan untuk tempat ini</string>
    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">Mesh berjalan — %1$d peer</string>
 </resources>
@@ -397,4 +397,5 @@
  <string name="dismiss">chiudi</string>
  <string name="location_notes_input_placeholder">aggiungi una nota per questo luogo</string>
    <string name="bluetooth_recommended">Bluetooth consigliato</string>
+    <string name="mesh_service_notification_content">Mesh in esecuzione — %1$d peer</string>
 </resources>
@@ -363,4 +363,5 @@
  <string name="dismiss">閉じる</string>
  <string name="location_notes_input_placeholder">この場所へのメモを追加</string>
    <string name="bluetooth_recommended">Bluetooth推奨</string>
+    <string name="mesh_service_notification_content">メッシュ実行中 — %1$d ピア</string>
 </resources>
@@ -350,4 +350,5 @@
    </plurals>

    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">Mesh გაშვებულია — %1$d პირები</string>
 </resources>
@@ -363,4 +363,5 @@
  <string name="dismiss">닫기</string>
  <string name="location_notes_input_placeholder">이 장소에 노트 추가</string>
    <string name="bluetooth_recommended">블루투스 권장</string>
+    <string name="mesh_service_notification_content">메시 실행 중 — %1$d 피어</string>
 </resources>
@@ -377,4 +377,5 @@
    </plurals>

    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">Mandeha ny Mesh — %1$d peers</string>
 </resources>
@@ -3,5 +3,6 @@
    <!-- TODO: Malay translations -->
    <string name="skip">Skip</string>
    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">Mesh sedang berjalan — %1$d rakan</string>
 </resources>

@@ -363,4 +363,5 @@
    </plurals>

    <string name="bluetooth_recommended">ब्लुटुथ सिफारिस गरिएको</string>
+    <string name="mesh_service_notification_content">मेश चलिरहेको छ — %1$d पियर्स</string>
 </resources>
@@ -395,4 +395,5 @@
  <string name="dismiss">sluiten</string>
  <string name="location_notes_input_placeholder">voeg een notitie toe voor deze plek</string>
    <string name="bluetooth_recommended">Bluetooth aanbevolen</string>
+    <string name="mesh_service_notification_content">Mesh actief — %1$d peers</string>
 </resources>
@@ -350,4 +350,5 @@
    </plurals>

    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">میش چل رہا ہے — %1$d ساتھی</string>
 </resources>
@@ -16,5 +16,6 @@
  <string name="location_notes_input_placeholder">dodaj notatkę dla tego miejsca</string>
    <string name="skip">Pomiń</string>
    <string name="bluetooth_recommended">Bluetooth zalecany</string>
+    <string name="mesh_service_notification_content">Mesh działa — %1$d peerów</string>
 </resources>

@@ -363,4 +363,5 @@
  <string name="dismiss">fechar</string>
  <string name="location_notes_input_placeholder">adicione uma nota para este local</string>
    <string name="bluetooth_recommended">Bluetooth recomendado</string>
+    <string name="mesh_service_notification_content">Mesh rodando — %1$d pares</string>
 </resources>
@@ -363,4 +363,5 @@
  <string name="dismiss">fechar</string>
  <string name="location_notes_input_placeholder">adicione uma nota para este local</string>
    <string name="bluetooth_recommended">Bluetooth recomendado</string>
+    <string name="mesh_service_notification_content">Mesh em execução — %1$d pares</string>
 </resources>
@@ -353,4 +353,5 @@
  <string name="dismiss">закрыть</string>
  <string name="location_notes_input_placeholder">добавьте заметку для этого места</string>
    <string name="bluetooth_recommended">Рекомендуется Bluetooth</string>
+    <string name="mesh_service_notification_content">Mesh запущен — %1$d пиров</string>
 </resources>
@@ -351,4 +351,5 @@
  <string name="dismiss">stäng</string>
  <string name="location_notes_input_placeholder">lägg till en anteckning för den här platsen</string>
    <string name="bluetooth_recommended">Bluetooth rekommenderas</string>
+    <string name="mesh_service_notification_content">Mesh körs — %1$d peers</string>
 </resources>
@@ -3,5 +3,6 @@
    <!-- TODO: Tamil translations -->
    <string name="skip">Skip</string>
    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">மெஷ் இயங்குகிறது — %1$d பியர்ஸ்</string>
 </resources>

@@ -350,4 +350,5 @@
    </plurals>

    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">Mesh กำลังทำงาน — %1$d เพื่อน</string>
 </resources>
@@ -351,4 +351,5 @@
  <string name="dismiss">kapat</string>
  <string name="location_notes_input_placeholder">bu yer için bir not ekleyin</string>
    <string name="bluetooth_recommended">Bluetooth Önerilir</string>
+    <string name="mesh_service_notification_content">Mesh çalışıyor — %1$d eş</string>
 </resources>
@@ -3,5 +3,6 @@
    <!-- TODO: Ukrainian translations -->
    <string name="skip">Пропустити</string>
    <string name="bluetooth_recommended">Рекомендується Bluetooth</string>
+    <string name="mesh_service_notification_content">Mesh працює — %1$d пірів</string>
 </resources>

@@ -363,4 +363,5 @@
  <string name="dismiss">بند کریں</string>
  <string name="location_notes_input_placeholder">اس جگہ کے لیے ایک نوٹ شامل کریں</string>
    <string name="bluetooth_recommended">Bluetooth Recommended</string>
+    <string name="mesh_service_notification_content">میش چل رہا ہے — %1$d ساتھی</string>
 </resources>
@@ -350,4 +350,5 @@
    </plurals>

    <string name="bluetooth_recommended">Khuyên dùng Bluetooth</string>
+    <string name="mesh_service_notification_content">Mesh đang chạy — %1$d ngang hàng</string>
 </resources>
@@ -16,5 +16,6 @@
  <string name="location_notes_input_placeholder">为此地点添加一条笔记</string>
    <string name="skip">跳过</string>
    <string name="bluetooth_recommended">建议开启蓝牙</string>
+    <string name="mesh_service_notification_content">Mesh 运行中 — %1$d 个节点</string>
 </resources>

@@ -16,5 +16,6 @@
  <string name="location_notes_input_placeholder">為此地點新增一則筆記</string>
    <string name="skip">跳過</string>
    <string name="bluetooth_recommended">建議開啟藍牙</string>
+    <string name="mesh_service_notification_content">Mesh 運行中 — %1$d 個節點</string>
 </resources>

@@ -376,4 +376,5 @@
  <string name="dismiss">关闭</string>
  <string name="location_notes_input_placeholder">为此地点添加一条笔记</string>
    <string name="bluetooth_recommended">建议开启蓝牙</string>
+    <string name="mesh_service_notification_content">Mesh 运行中 — %1$d 个节点</string>
 </resources>
@@ -64,7 +64,7 @@
  <!-- Mesh Service Foreground Notification -->
  <string name="mesh_service_channel_name">Mesh Background Service</string>
  <string name="mesh_service_channel_desc">Keeps the Bluetooth mesh running in the background</string>
-  <string name="mesh_service_notification_content">Mesh running — %1$d users connected</string>
+    <string name="mesh_service_notification_content">Mesh running — %1$d peers</string>

  <!-- Favorites accessibility -->
  <string name="cd_add_favorite">Add to favorites</string>