cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dominik Schürmann
2014-10-26 00:38:31 +02:00
parent 8257e450f9 fb7264d7fd
commit 825baeee1b
6 changed files with 123 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -688,6 +688,7 @@
<string name="msg_is_error_io_exc">"Error encoding keyring"</string>
<string name="msg_is_merge_public">"Merging imported data into existing public keyring"</string>
<string name="msg_is_merge_secret">"Merging imported data into existing public keyring"</string>
<string name="msg_is_merge_special">"Merging in self-certificates data from public keyring"</string>
<string name="msg_is_pubring_generate">"Generating public keyring from secret keyring"</string>
<string name="msg_is_subkey_nonexistent">"Subkey %s unavailable in secret key"</string>
<string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string>