matrix/element-android
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2025-07-31 07:04:23 +03:00
Code Activity

Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2022-10-14 17:12:08 +01:00
parent 6426ff40d3 6c10a9bf2d
commit dc9b41d19a
11 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/ui-strings/src/main/res/values/strings.xml
View File

@ -3331,7 +3331,7 @@
<string name="device_manager_session_rename_edit_hint">Session name</string>
<string name="device_manager_session_rename_description">Custom session names can help you recognize your devices more easily.</string>
<string name="device_manager_session_rename_warning">Please be aware that session names are also visible to people you communicate with.</string>
<string name="device_manager_sessions_sign_in_with_qr_code_title">SIGN IN WITH QR CODE</string>
<string name="device_manager_sessions_sign_in_with_qr_code_title">Sign in with QR Code</string>
<string name="device_manager_sessions_sign_in_with_qr_code_description">You can use this device to sign in a mobile or web device with a QR code. There are two ways to do this:</string>
<string name="device_manager_learn_more_sessions_inactive_title">Inactive sessions</string>