diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-05 09:27:07 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-05 09:27:07 +0200 |
commit | f87d21a66121b785196d30faff8308f9e128fb10 (patch) | |
tree | 23b282560e32840de0057e30843172d7f91dee98 /OpenKeychain/src/main/res/values/strings.xml | |
parent | e3f5c6d01e160dc638f15e912f4499065d17206f (diff) | |
parent | 9bf01bad143204daf25c1a81d02c2aa269ebf710 (diff) | |
download | open-keychain-f87d21a66121b785196d30faff8308f9e128fb10.tar.gz open-keychain-f87d21a66121b785196d30faff8308f9e128fb10.tar.bz2 open-keychain-f87d21a66121b785196d30faff8308f9e128fb10.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 72ba46702..45b1dc26b 100644 --- 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> |