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

Merge branch '472-forum-no-message-for-the-inviter-if-an-invitee-accepts-or-declines' into 'master'

Browse Source 
Show Responses to Forum Invitations in Private Conversation

Closes #472

See merge request !257
This commit is contained in:
akwizgran
2016-08-01 13:46:30 +00:00
parent 36dd9c30f8 64b596d0f9
commit d096c1fead
23 changed files with 318 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,6 +227,10 @@
<string name="forum_new_message_hint">New Entry</string>
<string name="forum_message_reply_hint">New Reply</string>
<string name="forum_invitation_already_sharing">Already sharing</string>
<string name="forum_invitation_response_accepted_sent">You accepted the forum invitation from %s.</string>
<string name="forum_invitation_response_declined_sent">You declined the forum invitation from %s.</string>
<string name="forum_invitation_response_accepted_received">%s accepted the forum invitation.</string>
<string name="forum_invitation_response_declined_received">%s declined the forum invitation.</string>
<!-- Dialogs -->
<string name="dialog_title_lost_password">Lost Password</string>