TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 23:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/loki-project/session-android into attachment-in-conversation-preview

Browse Source
This commit is contained in:
Ryan ZHAO
2020-09-03 13:17:03 +10:00
parent c0d5c22a21 0da8613075
commit 4a740780ca
308 changed files with 2481 additions and 2436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -1854,6 +1854,13 @@
<string name="dialog_seed_disclaimer">*Please note that it is not possible to use the same Session ID on multiple devices simultaneously</string>
<string name="view_reset_secure_session_done_message">Secure session reset done</string>
<string name="dialog_ui_mode_title">Theme</string>
<string name="dialog_ui_mode_option_day">Day</string>
<string name="dialog_ui_mode_option_night">Night</string>
<string name="dialog_ui_mode_option_system_default">System default</string>
<string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
<!-- Attachment message -->
<string name="attachment">Attachment</string>