sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:siacs/Conversations

This commit is contained in:
Daniel Gultsch 2019-01-02 10:03:48 +01:00
parent cfab0dbe1b 331ca7cb73
commit 71a32f0ecc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/res/values/strings.xml
View File

@ -715,7 +715,7 @@
<string name="gif">GIF</string> <string name="gif">GIF</string>
<string name="view_conversation">View conversation</string> <string name="view_conversation">View conversation</string>
<string name="pref_use_share_location_plugin">Share Location Plugin</string> <string name="pref_use_share_location_plugin">Share Location Plugin</string>
<string name="pref_use_share_location_plugin_summary">Use the Share Location Plugin instead of the build in map</string> <string name="pref_use_share_location_plugin_summary">Use the Share Location Plugin instead of the built-in map</string>
<string name="copy_link">Copy web address</string> <string name="copy_link">Copy web address</string>
<string name="copy_jabber_id">Copy Jabber ID</string> <string name="copy_jabber_id">Copy Jabber ID</string>
<string name="p1_s3_filetransfer">HTTP File Sharing for S3</string> <string name="p1_s3_filetransfer">HTTP File Sharing for S3</string>