TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thoughtbox-patch-1'

Browse Source 
Conflicts:
	res/values/strings.xml
This commit is contained in:
Moxie Marlinspike 2013-10-15 06:28:18 -07:00
commit f27c7c4178
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -437,7 +437,7 @@
<string name="preferences__pref_led_blink_dialogtitle">Select LED Blink Pattern</string>
<string name="preferences__select_led_color">Select LED Color</string>
<string name="preferences__sound">Sound</string>
<string name="preferences__inthread_notifications">In thread notifications</string>
<string name="preferences__inthread_notifications">In-thread notifications</string>
<string name="preferences__play_inthread_notifications">Play notification sound when viewing an active conversation.</string>
<string name="preferences__vibrate">Vibrate</string>
<string name="preferences__also_vibrate_when_notified">Also vibrate when notified</string>