From a1330f78e499840b386ea92e4280e9cdff9407f6 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 29 Oct 2015 14:50:29 +0100
Subject: uploadop: clean up, add logging

---
 OpenKeychain/src/main/res/values-ja/strings.xml |  8 ++++----
 OpenKeychain/src/main/res/values/strings.xml    | 15 +++++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index db7f8ee98..a2e68ac66 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -1179,15 +1179,15 @@
   </plurals>
   <string name="msg_backup_all">すべての鍵とバックアップ</string>
   <string name="msg_backup_public">公開鍵 %s のバックアップを作成中</string>
-  <string name="msg_backup_upload_public">公開鍵 %s をアップロード中</string>
+  <string name="msg_upload">公開鍵 %s をアップロード中</string>
   <string name="msg_backup_secret">秘密鍵 %s のバックアップを作成中</string>
   <string name="msg_backup_error_uri_open">URIオープン時にエラー!</string>
   <string name="msg_backup_error_db">データベースエラー!</string>
   <string name="msg_backup_error_io">入出力エラー!</string>
-  <string name="msg_backup_error_key">鍵データの事前処理のエラー!</string>
-  <string name="msg_backup_error_upload">サーバに鍵をアップロード中にエラー! インターネット接続を確認してください</string>
+  <string name="msg_upload_error_key">鍵データの事前処理のエラー!</string>
+  <string name="msg_upload_error_upload">サーバに鍵をアップロード中にエラー! インターネット接続を確認してください</string>
   <string name="msg_backup_success">バックアップ操作に成功</string>
-  <string name="msg_backup_upload_success">鍵サーバへアップロードに成功</string>
+  <string name="msg_upload_success">鍵サーバへアップロードに成功</string>
   <string name="msg_del_error_empty">削除するものがありません!</string>
   <string name="msg_del_error_multi_secret">秘密鍵は個別にしか削除できません!</string>
   <plurals name="msg_del">
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>
-- 
cgit v1.2.3