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
This commit is contained in:
callebtc
2026-01-04 02:37:47 +07:00
35 changed files with 36 additions and 3 deletions
+1
View File
@@ -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>