diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-29 15:08:30 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-29 15:08:30 +0200 |
commit | cf59a8fc308a8988c949c1175c963977f84ee653 (patch) | |
tree | 0f667e68fdf8b269e2f43f38bfe23bacb229dd8b /OpenKeychain/src/main/res/values/strings.xml | |
parent | 7d05905a7caccba2474cd996779ca31497330a10 (diff) | |
parent | 853964670b5b52a8b26864dff9c19f2f8c3fc8c9 (diff) | |
download | open-keychain-cf59a8fc308a8988c949c1175c963977f84ee653.tar.gz open-keychain-cf59a8fc308a8988c949c1175c963977f84ee653.tar.bz2 open-keychain-cf59a8fc308a8988c949c1175c963977f84ee653.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index bbea9f6ad..6b6e3f5bf 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1327,7 +1327,7 @@ <string name="error_nfc_chaining_error">"NFC: Card expected last command in a chain"</string> <string name="error_nfc_header">"NFC: Card reported invalid %s byte"</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> + <string name="error_temp_file">Error creating temporary file.</string> <string name="btn_delete_original">Delete original file</string> <string name="snack_encrypt_filenames_on">"Filenames <b>are</b> encrypted."</string> |