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

Merge branch 'fix-string-substitutions' into 'master'

Browse Source 
Fix multiple substitutions specified in non-positional format

See merge request briar/briar!1568
This commit is contained in:
akwizgran
2021-12-17 11:23:03 +00:00
parent 20b52804bf 3a22388495
commit d13e4c976e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,7 +297,7 @@
<string name="duplicate_link_dialog_text_1">You already have a pending contact with this link: %s</string>
<string name="duplicate_link_dialog_text_1_contact">You already have a contact with this link: %s</string>
<!-- This is a question asking whether two nicknames refer to the same person -->
<string name="duplicate_link_dialog_text_2">Are %s and %s the same person?</string>
<string name="duplicate_link_dialog_text_2">Are %1$s and %2$s the same person?</string>
<!-- This is a button for answering that two nicknames do indeed refer to the same person. This
string will be used in a dialog button, so if the translation of this string is longer than 20
characters, please use "Yes" instead, and use "No" for the "Different Person" button -->
@@ -306,7 +306,7 @@
will be used in a dialog button, so if the translation of this string longer than 20 characters,
please use "No" instead, and use "Yes" for the "Same Person" button -->
<string name="different_person_button">Different Person</string>
<string name="duplicate_link_dialog_text_3">%s and %s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
<string name="pending_contact_updated_toast">Pending contact updated</string>
<!-- Introductions -->