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

Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripping-master-key

Browse Source
This commit is contained in:
Victor Hazali
2016-03-30 05:33:11 +08:00
parent 0ce989ef18 05accb4906
commit 8ac7115f22
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@
<string name="title_advanced_key_info">"Advanced"</string>
<string name="title_delete_secret_key">"Delete YOUR key '%s'?"</string>
<string name="title_manage_my_keys">"Manage my keys"</string>
<string name="title_alert_strip">"Strip this Subkey"</string>
<!-- section -->
<string name="section_user_ids">"Identities"</string>
@@ -292,6 +293,7 @@
<string name="error_message">"Error: %s"</string>
<string name="theme_dark">"Dark"</string>
<string name="theme_light">"Light"</string>
<string name="strip">"Strip it"</string>
<!-- key flags -->
<string name="flag_certify">"Certify"</string>
@@ -332,6 +334,7 @@
<string name="public_key_deletetion_confirmation">"Delete key '%s'?"</string>
<string name="also_export_secret_keys">"Also export secret keys"</string>
<string name="reinstall_openkeychain">"You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys."</string>
<string name="alert_strip">"Stripping this Subkey will render it useless."</string>
<string name="key_exported">"Successfully exported 1 key."</string>
<string name="keys_exported">"Successfully exported %d keys."</string>