diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-21 20:09:52 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-21 20:09:52 +0200 |
| commit | 7d273ecfa661400aa56f6d2dd1acbae5198912ef (patch) | |
| tree | 5a761a87c10995361b22a61eda474822a29958c3 /OpenKeychain/src/main/res/values/strings.xml | |
| parent | 7a097dd5df441b5ad2a79a8444ff973bcdc1822a (diff) | |
| parent | b0efee2526e5bb60abf459607e7ab80e4ef28420 (diff) | |
| download | open-keychain-7d273ecfa661400aa56f6d2dd1acbae5198912ef.tar.gz open-keychain-7d273ecfa661400aa56f6d2dd1acbae5198912ef.tar.bz2 open-keychain-7d273ecfa661400aa56f6d2dd1acbae5198912ef.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c1e3b51f9..d4c67aa23 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -404,6 +404,9 @@ <string name="import_qr_code_button">"Scan QR Code"</string> <string name="import_qr_code_text">"Place your camera over the QR Code!"</string> + <!-- Import from URL --> + <string name="import_url_warn_no_search_parameter">"No search parameter found. You may still attempt manually searching the keyserver."</string> + <!-- Generic result toast --> <string name="view_log">"Details"</string> <string name="with_warnings">", with warnings"</string> |