Merge branch 'master' of github.com:open-keychain/open-keychain

2015-11-02 18:10:05 +01:00
parent ccdfd55f61 c31f760110
commit 59e3122731
5 changed files with 168 additions and 55 deletions
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1679,5 +1679,6 @@
    <string name="share_log_dialog_cancel_button">"Cancel"</string>
    <string name="toast_wrong_mimetype">"Wrong data type, expected text!"</string>
    <string name="toast_no_text">"No text in shared data!"</string>
+    <string name="btn_search_for_query">"Search for\n'%s'"</string>

 </resources>