Merge branch 'development' of github.com:open-keychain/open-keychain into development

2015-05-05 09:27:07 +02:00
parent e3f5c6d01e 9bf01bad14
commit f87d21a661
3 changed files with 54 additions and 9 deletions
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1289,5 +1289,6 @@
    <string name="snack_yubi_other">Different key stored on YubiKey!</string>
    <string name="error_nfc">"NFC Error: %s"</string>
    <string name="error_pin_nodefault">Default PIN was rejected!</string>
+    <string name="error_bluetooth_file">Error creating temporary file. Bluetooth sharing will fail.</string>

 </resources>