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

Resolve merge conflicts.

Browse Source 
# Conflicts:
#   briar-android/src/main/res/values/strings.xml
This commit is contained in:
akwizgran
2019-06-17 12:13:19 +00:00
parent aab46040a5 18fd238aa1
commit 22f5c42fc1
26 changed files with 431 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,6 +213,10 @@
<item quantity="one">New contact added.</item>
<item quantity="other">%d new contacts added.</item>
</plurals>
<string name="adding_contact_slow_warning">Adding this contact is taking longer than usual</string>
<string name="adding_contact_slow_title">Cannot Connect to Contact</string>
<string name="adding_contact_slow_text">Adding this contact is taking longer than usual.\n\nPlease check that your contact has received your link and added you:</string>
<string name="offline_state">No Internet connection</string>
<string name="duplicate_link_dialog_title">Duplicate Link</string>
<string name="duplicate_link_dialog_text_1">You already have a pending contact with this link: %s</string>
<!-- This is a question asking whether two nicknames refer to the same person -->