aboutsummaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-12 14:59:46 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-12 14:59:46 +0200
commit3455d10a4a87916bfe5da52ca9c401dafa8d5155 (patch)
treee7b6cc4520ad0dd64e348d2e9a27ffe7a81db696 /res/values/strings.xml
parent4d0bf7971ec321a55f180b833b033ceaa6635fdf (diff)
Better error handling if attach file doesnt work (on permission denied)0.2-beta
and unified encrypted and unencrypted file attachment
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index abae1053..8020a01e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -115,4 +115,9 @@
<string name="pref_advanced_options">Advanced Options</string>
<string name="pref_never_send_crash">Never send crash reports</string>
<string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
+ <string name="openpgp_error">OpenKeychain reporeted an error</string>
+ <string name="error_decrypting_file">I/O Error decrypting file</string>
+ <string name="error_copying_image_file">Error copying image file.</string>
+ <string name="accept">Accept</string>
+ <string name="error">An error has occurred</string>
</resources>