diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-22 11:30:14 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-22 11:30:14 +0200 |
| commit | 30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5 (patch) | |
| tree | c112ebc3bfdde008a1d276972e22498bc43ea17d /OpenKeychain/src/main/res | |
| parent | adea9df71411f7ea0ab08066c92048b0c2dad1ce (diff) | |
| parent | 0b7fb707810f5a46a4906d5e4b82f50dcff91bcd (diff) | |
| download | open-keychain-30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5.tar.gz open-keychain-30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5.tar.bz2 open-keychain-30207ee11ffb05fdc1fcbcb02f5fe438be0d59d5.zip | |
Merge commit '0b7fb70'
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res')
| -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 71342eaec..330bc349d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -499,5 +499,6 @@ <string name="secret_cannot_multiple">Secret keys can only be deleted individually!</string> <string name="title_view_cert">View Certificate Details</string> <string name="unknown_algorithm">unknown</string> + <string name="can_sign_not">cannot sign</string> </resources> |