Merge commit '0b7fb70'

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
This commit is contained in:
Vincent Breitmoser
2014-04-22 11:30:14 +02:00
5 changed files with 32 additions and 15 deletions

View File

@@ -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>