TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-11-08 10:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into custom-server

Browse Source 
# Conflicts:
#	src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
This commit is contained in:
Mikunj
2019-10-11 15:40:09 +11:00
parent 4657b79179 ca9032e109
commit 2f18c5bad2
25 changed files with 469 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1552,7 +1552,7 @@
<!-- Display name activity -->
<string name="activity_display_name_title">Create Your Loki Messenger Account</string>
<string name="activity_display_name_subtitle">Enter a name to be shown to your contacts</string>
<string name="activity_display_name_name_edit_text_label">Display Name (Optional)</string>
<string name="activity_display_name_name_edit_text_label">Display Name</string>
<string name="activity_display_name_button_title">Next</string>
<!-- Key pair activity -->
<string name="activity_key_pair_title">Create Your Loki Messenger Account</string>