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

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

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
This commit is contained in:
Vincent Breitmoser
2014-10-05 01:22:01 +02:00
parent dff68ac194 d99115c263
commit 60fb3b60a8
6 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@
<string name="section_actions">"Actions"</string>
<string name="section_share_key">"Whole key"</string>
<string name="section_certification_key">"Your Key used for certification"</string>
<string name="section_upload_key">"Upload Key"</string>
<string name="section_upload_key">"Synchronize Key"</string>
<string name="section_key_server">"Keyserver"</string>
<string name="section_fingerprint">"Fingerprint"</string>
<string name="section_key_to_certify">"Key to be certified"</string>