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

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

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
This commit is contained in:
Daniel Ramos
2015-04-24 03:44:57 +01:00
parent 702c28854b 76841ca873
commit 40122d61cc
5 changed files with 92 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,6 +639,7 @@
<string name="create_key_add_email">"Add email address"</string>
<string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string>
<string name="create_key_email_already_exists_text">"Email address has already been added"</string>
<string name="create_key_email_invalid_email">"Email address format is invalid"</string>
<!-- View key -->
<string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>