1 files changed, 64 insertions, 36 deletions
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
index 6986e6b..f2fb55c 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
@@ -184,19 +184,19 @@ It has been added and marked unverified; use Test Selected to try again.</source
 <context>
     <name>ModuleKeyServerSync</name>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="420"/>
+        <location filename="../KeyServerSyncModule.cpp" line="443"/>
         <source>The following email addresses have status:
 </source>
         <translation>以下電子郵件地址的狀態為：</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="429"/>
+        <location filename="../KeyServerSyncModule.cpp" line="452"/>
         <source>Could not parse status information.</source>
         <translation>無法解析狀態資訊。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="400"/>
-        <location filename="../KeyServerSyncModule.cpp" line="437"/>
+        <location filename="../KeyServerSyncModule.cpp" line="423"/>
+        <location filename="../KeyServerSyncModule.cpp" line="460"/>
         <source>Public Key Upload Successful</source>
         <translation>公鑰上傳成功</translation>
     </message>
@@ -217,21 +217,21 @@ Note: For verification, you can find more information here: https://keys.openpgp
 注意：如需驗證相關資訊，請參閱此處：https://keys.openpgp.org/about</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="369"/>
-        <location filename="../KeyServerSyncModule.cpp" line="391"/>
-        <location filename="../KeyServerSyncModule.cpp" line="450"/>
+        <location filename="../KeyServerSyncModule.cpp" line="392"/>
+        <location filename="../KeyServerSyncModule.cpp" line="414"/>
+        <location filename="../KeyServerSyncModule.cpp" line="473"/>
         <source>Key Upload Failed</source>
         <translation>金鑰上傳失敗</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="370"/>
+        <location filename="../KeyServerSyncModule.cpp" line="393"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>上傳前匯出公鑰失敗。
 金鑰：%1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="438"/>
+        <location filename="../KeyServerSyncModule.cpp" line="461"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -244,8 +244,8 @@ Please check your email (%3) for further verification from %4.</source>
 請檢查您的電子郵件（%3）以接收 %4 的進一步驗證通知。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="392"/>
-        <location filename="../KeyServerSyncModule.cpp" line="451"/>
+        <location filename="../KeyServerSyncModule.cpp" line="415"/>
+        <location filename="../KeyServerSyncModule.cpp" line="474"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -276,49 +276,72 @@ Publish to %1 anyway?</source>
 仍要發布至 %1 嗎？</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="234"/>
+        <location filename="../KeyServerSyncModule.cpp" line="241"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1：無法匯出公鑰</translation>
     </message>
     <message>
         <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <source>Key Refresh Stopped</source>
+        <translation>金鑰重新整理已停止</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="283"/>
+        <source>Key Publishing Stopped</source>
+        <translation>金鑰發布已停止</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="297"/>
+        <source>the fetched keys could not be imported: the key database is no longer available</source>
+        <translation>無法匯入擷取到的金鑰：金鑰資料庫已無法使用</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>Key Refresh Finished</source>
         <translation>金鑰重新整理完成</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="286"/>
+        <location filename="../KeyServerSyncModule.cpp" line="308"/>
         <source>Key Publishing Finished</source>
         <translation>金鑰發布完成</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="331"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>已有金鑰伺服器操作正在執行。請等它完成後再試一次。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="353"/>
+        <location filename="../KeyServerSyncModule.cpp" line="376"/>
         <source>Key Servers</source>
         <translation>金鑰伺服器</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="354"/>
+        <location filename="../KeyServerSyncModule.cpp" line="377"/>
         <source>keyserver,key server,hkp,vks,publish,search</source>
         <translation>keyserver,key server,hkp,vks,publish,search,金鑰伺服器,發布,搜尋</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="401"/>
+        <location filename="../KeyServerSyncModule.cpp" line="424"/>
         <source>The public key was uploaded to the key server %2 over HKP.
 Fingerprint: %1</source>
         <translation>公鑰已透過 HKP 上傳至金鑰伺服器 %2。
 指紋：%1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="480"/>
+        <location filename="../KeyServerSyncModule.cpp" line="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="512"/>
         <source>Key Update Failed</source>
         <translation>金鑰更新失敗</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="481"/>
+        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+        <translation>已擷取公鑰，但無法匯入，因為其金鑰資料庫已無法使用。
+金鑰 ID：%1</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="513"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -327,42 +350,42 @@ Error: %2</source>
 錯誤：%2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="524"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Upload the public key to the key server used for syncing</source>
         <translation>將公鑰上傳到用於同步的金鑰伺服器</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="536"/>
+        <location filename="../KeyServerSyncModule.cpp" line="568"/>
         <source>Import the latest copy of the public key from the key server</source>
         <translation>從金鑰伺服器匯入該公鑰的最新副本</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="548"/>
+        <location filename="../KeyServerSyncModule.cpp" line="580"/>
         <source>Check Publication Status</source>
         <translation>檢查發布狀態</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="549"/>
+        <location filename="../KeyServerSyncModule.cpp" line="581"/>
         <source>Ask the key server whether it has this public key</source>
         <translation>詢問金鑰伺服器是否存有此公鑰</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="618"/>
+        <location filename="../KeyServerSyncModule.cpp" line="650"/>
         <source>Publication Status</source>
         <translation>發布狀態</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="623"/>
+        <location filename="../KeyServerSyncModule.cpp" line="655"/>
         <source>The public key has been published on %1.</source>
         <translation>公鑰已發布於 %1。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="628"/>
+        <location filename="../KeyServerSyncModule.cpp" line="660"/>
         <source>The public key is not published on %1.</source>
         <translation>公鑰未發布於 %1。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="632"/>
+        <location filename="../KeyServerSyncModule.cpp" line="664"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -379,31 +402,31 @@ Error: %2</source>
 錯誤：%2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="307"/>
-        <location filename="../KeyServerSyncModule.cpp" line="338"/>
-        <location filename="../KeyServerSyncModule.cpp" line="560"/>
+        <location filename="../KeyServerSyncModule.cpp" line="330"/>
+        <location filename="../KeyServerSyncModule.cpp" line="361"/>
+        <location filename="../KeyServerSyncModule.cpp" line="592"/>
         <source>Key Server</source>
         <translation>金鑰伺服器</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="561"/>
+        <location filename="../KeyServerSyncModule.cpp" line="593"/>
         <source>Import public keys from a trusted key server.</source>
         <translation>從受信任的金鑰伺服器匯入公鑰。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="525"/>
-        <location filename="../KeyServerSyncModule.cpp" line="538"/>
-        <location filename="../KeyServerSyncModule.cpp" line="550"/>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
+        <location filename="../KeyServerSyncModule.cpp" line="570"/>
+        <location filename="../KeyServerSyncModule.cpp" line="582"/>
         <source>Key Server Operations</source>
         <translation>金鑰伺服器操作</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="523"/>
+        <location filename="../KeyServerSyncModule.cpp" line="555"/>
         <source>Publish Public Key to Key Server</source>
         <translation>將公鑰發佈至金鑰伺服器</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="535"/>
+        <location filename="../KeyServerSyncModule.cpp" line="567"/>
         <source>Refresh Public Key From Key Server</source>
         <translation>從金鑰伺服器更新公鑰</translation>
     </message>
@@ -437,6 +460,11 @@ Error: %2</source>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>已將 %2 個金鑰中的 %1 個發布至金鑰伺服器 %3。</translation>
     </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+        <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+        <translation>執行期間金鑰資料庫已變更，因此在處理 %2 把金鑰中的 %1 把後停止。未匯入任何擷取到的金鑰。請重新開始。</translation>
+    </message>
 </context>
 <context>
     <name>SearchKeyDialog</name>