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 '2403-show-progress-while-connecting-to-mailbox' into 'master'

Browse Source 
Show progress while connecting to mailbox

Closes #2403

See merge request briar/briar!1747
This commit is contained in:
akwizgran
2022-12-14 12:20:43 +00:00
parent 47971517cd ba2db48d8e
commit ec84ddb38b
7 changed files with 128 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -633,7 +633,9 @@
<string name="mailbox_setup_download_link">Share Download Link</string>
<string name="mailbox_setup_button_scan">Scan Mailbox QR code</string>
<string name="permission_camera_qr_denied_body">You have denied access to the camera, but scanning a QR code requires using the camera.\n\nPlease consider granting access.</string>
<string name="mailbox_setup_connecting">Connecting…</string>
<string name="mailbox_setup_connecting">Connecting to Mailbox…</string>
<!-- This string is shown when connecting to a Mailbox for the first time. The placeholder will be replaced with a duration, e.g. "2 minutes". -->
<string name="mailbox_setup_connecting_info">This may take up to %1s</string>
<string name="mailbox_setup_qr_code_wrong_title">Wrong QR code</string>
<string name="mailbox_setup_qr_code_wrong_description">The scanned code is invalid. Please open the Briar Mailbox app on your Mailbox device and scan the QR code it presents.</string>
<string name="mailbox_setup_already_paired_title">Mailbox already linked</string>