Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 19:59:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1232-polling-events' into 'master'

Browse Source 
Show "connecting" state for pending contacts

See merge request briar/briar!1129
This commit is contained in:
Torsten Grote
2019-06-10 13:11:06 +00:00
parent f31b85acdb a4a45efd43
commit 4a4abd7efa
18 changed files with 401 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/values/strings.xml
View File

@@ -193,7 +193,7 @@
<string name="pending_contact_requests">Pending Contact Requests</string>
<string name="no_pending_contacts">No pending contacts</string>
<string name="add_contact_remote_connecting">Connecting…</string>
<string name="waiting_for_contact_to_come_online">Waiting for contact to come online…\n\nDid they enter your link already?</string>
<string name="waiting_for_contact_to_come_online">Waiting for contact to come online…</string>
<string name="connecting">Connecting…</string>
<string name="adding_contact">Adding contact…</string>
<string name="adding_contact_failed">Adding contact has failed</string>