aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-06 11:55:37 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-07 13:24:41 +0100
commit739a2d609d15be7472575adb937e9a0b164dd4a9 (patch)
treee46352028b6573b04022c565ceb9baaca047a86f /src/main/res
parent164d341915137ec35f5d1eb681ee50d0b83c58bc (diff)
implement direct sharing in android 6.0. fixes #1321
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 584b419f..ffbb69ce 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -91,6 +91,7 @@
<string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
<string name="restart">Restart</string>
<string name="install">Install</string>
+ <string name="openkeychain_not_installed">Please install OpenKeychain</string>
<string name="offering">offering…</string>
<string name="waiting">waiting…</string>
<string name="no_pgp_key">No OpenPGP Key found</string>
@@ -554,4 +555,6 @@
<item quantity="one">%d message</item>
<item quantity="other">%d messages</item>
</plurals>
+ <string name="shared_file_with_x">Shared file with %s</string>
+ <string name="shared_image_with_x">Shared image with %s</string>
</resources>