Merge branch 'main' into wifi-aware

mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 19:25:20 +00:00

# 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

parent 35030a05d8 1b9f76be23

commit 23e7e12e9e

35 changed files with 36 additions and 3 deletions

									
										app/src/main/res/values-fil/strings.xml
									
		+1
		
												View File
												
				@@ -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>