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

This commit is contained in:
Adithya Abraham Philip
2015-03-02 22:31:13 +05:30
17 changed files with 109 additions and 49 deletions

View File

@@ -363,8 +363,7 @@
<string name="progress_con_reimport">"consolidate: reimporting…"</string>
<!-- action strings -->
<string name="hint_keyserver_search_hint">"Name/Email/Key ID…"</string>
<string name="hint_cloud_search_hint">"Name/Email/Proof/Key…"</string>
<string name="hint_cloud_search_hint">"Search via Name, Email…"</string>
<!-- key bit length selections -->
<string name="key_size_512">"512"</string>