aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-26 22:38:35 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-26 22:38:35 +0100
commitbe31815ee80dd6770bc09804216f732ef58d055b (patch)
tree424904029620191ab39c7518f584c5b601571d76 /OpenKeychain/src/main/res
parentfa73362a9faed746a272bfe9e4329b1ee606e09e (diff)
parent84b234af3720368fcf6c61dcd61b8a7d8986a1b4 (diff)
downloadopen-keychain-be31815ee80dd6770bc09804216f732ef58d055b.tar.gz
open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.tar.bz2
open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml1
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 b0d5fbc64..e2b92d875 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -928,6 +928,7 @@
<string name="msg_crt_error_master_not_found">"Master key not found!"</string>
<string name="msg_crt_error_nothing">"No keys certified!"</string>
<string name="msg_crt_error_unlock">"Error unlocking master key!"</string>
+ <string name="msg_crt_error_divert">"Certification with NFC is not (yet) supported!"</string>
<string name="msg_crt">"Certifying keyrings"</string>
<string name="msg_crt_master_fetch">"Fetching certifying master key"</string>
<string name="msg_crt_save">"Saving certified key %s"</string>