aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-10-29 14:50:29 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-10-29 14:50:29 +0100
commita1330f78e499840b386ea92e4280e9cdff9407f6 (patch)
tree16fe0e991164575d088a47e95e4df8885ae99d63 /OpenKeychain/src/main/res/values
parente89dba8f245f59afd9e4e3da9c62f98befcb4d47 (diff)
downloadopen-keychain-a1330f78e499840b386ea92e4280e9cdff9407f6.tar.gz
open-keychain-a1330f78e499840b386ea92e4280e9cdff9407f6.tar.bz2
open-keychain-a1330f78e499840b386ea92e4280e9cdff9407f6.zip
uploadop: clean up, add logging
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml15
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index fa745cb5b..bc22237d7 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1299,15 +1299,22 @@
</plurals>
<string name="msg_backup_all">"Backup with all keys"</string>
<string name="msg_backup_public">"Creating backup of public key %s"</string>
- <string name="msg_backup_upload_public">"Uploading public key %s"</string>
<string name="msg_backup_secret">"Creating backup of secret key %s"</string>
<string name="msg_backup_error_uri_open">"Error opening URI stream!"</string>
<string name="msg_backup_error_db">"Database error!"</string>
<string name="msg_backup_error_io">"Input/output error!"</string>
- <string name="msg_backup_error_key">"Error preprocessing key data!"</string>
- <string name="msg_backup_error_upload">"Error uploading key to server! Please check your Internet connection"</string>
<string name="msg_backup_success">"Backup operation successful"</string>
- <string name="msg_backup_upload_success">"Upload to keyserver successful"</string>
+
+ <string name="msg_upload">"Uploading public key"</string>
+ <string name="msg_upload_proxy_direct">"Using proxy: none"</string>
+ <string name="msg_upload_proxy_tor">"Using proxy: TOR"</string>
+ <string name="msg_upload_proxy">"Using proxy: %s"</string>
+ <string name="msg_upload_server">"Server: %s"</string>
+ <string name="msg_upload_key">"Key id: %s"</string>
+ <string name="msg_upload_error_key">"Error preprocessing key data!"</string>
+ <string name="msg_upload_error_not_found">"Key not found!"</string>
+ <string name="msg_upload_error_upload">"Error uploading key to server! Please check your Internet connection"</string>
+ <string name="msg_upload_success">"Upload to keyserver successful"</string>
<string name="msg_del_error_empty">"Nothing to delete!"</string>
<string name="msg_del_error_multi_secret">"Secret keys can only be deleted individually!"</string>