fix(i18n): update key server translation contexts

- regenerate locale contexts for the renamed module class
- add key server settings strings across supported locales
- include the generated module header in sync tests

10 files changed, 2195 insertions, 1835 deletions

diff --git a/src/m_key_server_sync/test/CMakeLists.txt b/src/m_key_server_sync/test/CMakeLists.txt
index d602b88..2bf824a 100644
--- a/src/m_key_server_sync/test/CMakeLists.txt
+++ b/src/m_key_server_sync/test/CMakeLists.txt
@@ -43,7 +43,9 @@ add_executable(gf_mod_key_server_sync_test
   ${CMAKE_CURRENT_SOURCE_DIR}/../KeyServerBatchLogic.cpp)
 
 target_include_directories(gf_mod_key_server_sync_test PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/..")
+  "${CMAKE_CURRENT_SOURCE_DIR}/.."
+  # GFModuleTr.h, generated by gf_add_module() beside the module.
+  "${CMAKE_CURRENT_BINARY_DIR}/..")
 
 target_link_libraries(gf_mod_key_server_sync_test PRIVATE
   GTest::gtest GTest::gtest_main Qt::Core)
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
index ac5e143..d31e2f0 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
@@ -2,21 +2,201 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
+        <translation>Schlüsselserver-Liste</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
+        <translation>Schlüsselserver hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
+        <translation>Vorgänge</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
+        <translation>Hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
+        <translation>Als Standard festlegen</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
+        <translation>Ausgewählten testen</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
+        <translation>Ausgewählte löschen</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
+        <translation>https://keys.example.org</translation>
+    </message>
+    <message>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
+        <translation type="vanished">Ein neuer Schlüsselserver wird vor dem Hinzufügen gegen die HKP- und VKS-Schnittstellen getestet. Die Suche verwendet HKP; Veröffentlichung und Aktualisierung verwenden VKS.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <translation>Ein neuer Schlüsselserver wird vor dem Hinzufügen gegen die HKP- und VKS-Schnittstellen getestet. Die Suche verwendet HKP. Veröffentlichung und Aktualisierung verwenden immer den Standardserver: über VKS, sofern der Server dies unterstützt, andernfalls über HKP.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
+        <translation>HKP</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
+        <translation>VKS</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
+        <translation>Zuletzt getestet</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
+        <translation>Nein</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
+        <translation>Verifiziert</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
+        <translation>Nicht verifiziert</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
+        <translation>Ungültige Adresse</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <translation>&quot;%1&quot; ist keine gültige Schlüsselserver-Adresse.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
+        <translation>Bereits aufgelistet</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
+        <translation>%1 ist bereits in der Schlüsselserver-Liste.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
+        <translation>Unsicherer Schlüsselserver-Adresse</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <translation>%1 verwendet unverschlüsseltes HTTP, sodass jeder im Netzwerk sehen und ändern kann, was Sie nachschlagen oder veröffentlichen. Trotzdem hinzufügen?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation>Keine verifizierte Veröffentlichung</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation>%1 unterstützt die VKS-Schnittstelle nicht, daher verwenden Veröffentlichung und Aktualisierung stattdessen HKP.
+
+Über HKP bestätigt der Server Ihre E-Mail-Adresse nicht, und ein hochgeladener Schlüssel kann nicht wieder entfernt werden.
+
+%1 trotzdem als Standard verwenden?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation>Schlüsselserver nicht verifiziert</translation>
+    </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
+        <translation>%1 hat nicht als Schlüsselserver geantwortet.
+
+%2
+
+Es wurde hinzugefügt und als unverifiziert markiert; verwenden Sie &quot;Ausgewählten testen&quot;, um es erneut zu versuchen.</translation>
+    </message>
+</context>
+<context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
         <source>The following email addresses have status:
 </source>
         <translation>Die folgenden E-Mail-Adressen haben folgenden Status:</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
         <source>Could not parse status information.</source>
         <translation>Statusinformationen konnten nicht analysiert werden.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
         <source>Public Key Upload Successful</source>
         <translation>Öffentlicher Schlüssel erfolgreich hochgeladen</translation>
     </message>
@@ -37,21 +217,21 @@ Bitte prüfen Sie Ihre E-Mail (%3) auf weitere Bestätigungen von keys.openpgp.o
 Hinweis: Weitere Informationen zur Verifizierung finden Sie hier: https://keys.openpgp.org/about</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
         <source>Key Upload Failed</source>
         <translation>Hochladen des Schlüssels fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>Der öffentliche Schlüssel konnte vor dem Hochladen nicht exportiert werden.
 Schlüssel: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -64,8 +244,8 @@ Fingerabdruck: %1
 Bitte prüfen Sie Ihre E-Mail (%3) auf weitere Bestätigungen von %4.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -83,7 +263,7 @@ Fehler: %2</translation>
         <translation>Ohne Verifizierung veröffentlichen?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
         <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
 
 The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
@@ -96,39 +276,49 @@ Der Server wird Ihre E-Mail-Adresse nicht bestätigen, und der Upload kann nicht
 Trotzdem auf %1 veröffentlichen?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1: Der öffentliche Schlüssel konnte nicht exportiert werden.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
         <source>Key Refresh Finished</source>
         <translation>Schlüsselaktualisierung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
         <source>Key Publishing Finished</source>
         <translation>Schlüsselveröffentlichung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>Es läuft bereits ein Schlüsselserver-Vorgang. Versuchen Sie es erneut, wenn er abgeschlossen ist.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
         <source>The public key was uploaded to the key server %2 over HKP.
 Fingerprint: %1</source>
         <translation>Der öffentliche Schlüssel wurde über HKP auf den Schlüsselserver %2 hochgeladen.
 Fingerabdruck: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
         <source>Key Update Failed</source>
         <translation>Schlüsselaktualisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -137,22 +327,42 @@ Schlüssel-ID: %1
 Fehler: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
         <source>Publication Status</source>
         <translation>Veröffentlichungsstatus</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
         <source>The public key has been published on %1.</source>
         <translation>Der öffentliche Schlüssel wurde auf %1 veröffentlicht.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
         <source>The public key is not published on %1.</source>
         <translation>Der öffentliche Schlüssel ist nicht auf %1 veröffentlicht.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -169,28 +379,36 @@ Schlüssel-ID: %1
 Fehler: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Key Server</source>
         <translation>Schlüsselserver</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
         <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">Öffentliche Schlüssel von einem vertrauenswürdigen Schlüsselserver importieren.</translation>
+        <translation>Öffentliche Schlüssel von einem vertrauenswürdigen Schlüsselserver importieren.</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
         <source>Key Server Operations</source>
-        <translation type="vanished">Schlüsselserver-Vorgänge</translation>
+        <translation>Schlüsselserver-Vorgänge</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
         <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">Öffentlichen Schlüssel auf Schlüsselserver veröffentlichen</translation>
+        <translation>Öffentlichen Schlüssel auf Schlüsselserver veröffentlichen</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
         <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">Öffentlichen Schlüssel vom Schlüsselserver aktualisieren</translation>
+        <translation>Öffentlichen Schlüssel vom Schlüsselserver aktualisieren</translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
         <source>The server could not be reached.</source>
         <translation>Der Server konnte nicht erreicht werden.</translation>
     </message>
@@ -200,12 +418,12 @@ Fehler: %2</translation>
         <translation>Der Server hat geantwortet, aber nicht als Schlüsselserver: Er unterstützt weder das HKP- noch das VKS-Interface.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
         <source>Failed:</source>
         <translation>Fehlgeschlagen:</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
         <source>The key server does not have this key.</source>
         <translation>Der Schlüsselserver hat diesen Schlüssel nicht.</translation>
     </message>
@@ -215,192 +433,12 @@ Fehler: %2</translation>
         <translation>%1 von %2 Schlüsseln wurden vom Schlüsselserver abgerufen.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>%1 von %2 Schlüsseln wurden auf den Schlüsselserver %3 veröffentlicht.</translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
-        <translation>Schlüsselserver-Liste</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
-        <translation>Schlüsselserver hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
-        <translation>Vorgänge</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
-        <translation>Hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
-        <translation>Als Standard festlegen</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
-        <translation>Ausgewählten testen</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
-        <translation>Ausgewählte löschen</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
-        <translation>https://keys.example.org</translation>
-    </message>
-    <message>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
-        <translation type="vanished">Ein neuer Schlüsselserver wird vor dem Hinzufügen gegen die HKP- und VKS-Schnittstellen getestet. Die Suche verwendet HKP; Veröffentlichung und Aktualisierung verwenden VKS.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
-        <translation>Ein neuer Schlüsselserver wird vor dem Hinzufügen gegen die HKP- und VKS-Schnittstellen getestet. Die Suche verwendet HKP. Veröffentlichung und Aktualisierung verwenden immer den Standardserver: über VKS, sofern der Server dies unterstützt, andernfalls über HKP.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
-        <translation>Standard</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
-        <translation>HKP</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
-        <translation>VKS</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
-        <translation>Zuletzt getestet</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
-        <translation>Nein</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
-        <translation>Verifiziert</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
-        <translation>Nicht verifiziert</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
-        <translation>Nie</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
-        <translation>Ungültige Adresse</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
-        <translation>&quot;%1&quot; ist keine gültige Schlüsselserver-Adresse.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
-        <translation>Bereits aufgelistet</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
-        <translation>%1 ist bereits in der Schlüsselserver-Liste.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
-        <translation>Unsicherer Schlüsselserver-Adresse</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
-        <translation>%1 verwendet unverschlüsseltes HTTP, sodass jeder im Netzwerk sehen und ändern kann, was Sie nachschlagen oder veröffentlichen. Trotzdem hinzufügen?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
-        <translation>Keine verifizierte Veröffentlichung</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
-
-Use %1 as the default anyway?</source>
-        <translation>%1 unterstützt die VKS-Schnittstelle nicht, daher verwenden Veröffentlichung und Aktualisierung stattdessen HKP.
-
-Über HKP bestätigt der Server Ihre E-Mail-Adresse nicht, und ein hochgeladener Schlüssel kann nicht wieder entfernt werden.
-
-%1 trotzdem als Standard verwenden?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
-        <translation>Schlüsselserver nicht verifiziert</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
-        <translation>%1 hat nicht als Schlüsselserver geantwortet.
-
-%2
-
-Es wurde hinzugefügt und als unverifiziert markiert; verwenden Sie &quot;Ausgewählten testen&quot;, um es erneut zu versuchen.</translation>
-    </message>
-</context>
-<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.cpp" line="110"/>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
index 2a79e10..809c931 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
@@ -2,329 +2,383 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
-        <source>The following email addresses have status:
-</source>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
-        <source>Could not parse status information.</source>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
-        <source>Public Key Upload Successful</source>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="155"/>
-        <source>Publish Without Verification?</source>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
-        <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-
-The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
-
-Publish to %1 anyway?</source>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
-        <source>%1: the public key could not be exported</source>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
-        <source>Key Refresh Finished</source>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
-        <source>Key Publishing Finished</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
-        <source>A key server operation is already running. Try again when it has finished.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
-        <source>Key Upload Failed</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
-        <source>Failed to export the public key before uploading.
-Key: %1</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
-        <source>The public key was uploaded to the key server %2 over HKP.
-Fingerprint: %1</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
-        <source>The public key was successfully uploaded to the key server %4.
-Fingerprint: %1
-
-%2
-Please check your email (%3) for further verification from %4.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
-        <source>Failed to retrieve public key from %3.
-Key ID: %1
-Error: %2</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
-        <source>Publication Status</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
-        <source>The public key has been published on %1.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
-        <source>The public key is not published on %1.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
-        <source>Could not ask %1 about this key.
-
-%2</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
-        <source>Failed to upload public key to the server.
-Fingerprint: %1
-Error: %2</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="501"/>
-        <source>Key Update Failed</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
-        <source>Key Server</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
-        <source>The server could not be reached.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="247"/>
-        <source>The server responded, but not as a key server: it supports neither the HKP nor the VKS interface.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
-        <source>Failed:</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
-        <source>The key server does not have this key.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="88"/>
-        <source>%1 of %2 keys were fetched from the key server.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
-        <source>%1 of %2 keys were published to the key server %3.</source>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
+    <name>ModuleKeyServerSync</name>
     <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
+        <source>The following email addresses have status:
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
+        <source>Could not parse status information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
+        <source>Public Key Upload Successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
+        <location filename="../KeyServerSyncModule.cpp" line="155"/>
+        <source>Publish Without Verification?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
+        <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
+
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
+
+Publish to %1 anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
+        <source>%1: the public key could not be exported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
+        <source>Key Refresh Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <source>Key Publishing Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
+        <source>A key server operation is already running. Try again when it has finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
+        <source>Key Upload Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
+        <source>Failed to export the public key before uploading.
+Key: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
+        <source>The public key was uploaded to the key server %2 over HKP.
+Fingerprint: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
+        <source>The public key was successfully uploaded to the key server %4.
+Fingerprint: %1
+
+%2
+Please check your email (%3) for further verification from %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
+        <source>Failed to retrieve public key from %3.
+Key ID: %1
+Error: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
+        <source>Publish Public Key to Key Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
+        <source>Key Server Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
+        <source>Refresh Public Key From Key Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
+        <source>Import public keys from a trusted key server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
+        <source>Publication Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
+        <source>The public key has been published on %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
+        <source>The public key is not published on %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
+        <source>Could not ask %1 about this key.
 
-Use %1 as the default anyway?</source>
+%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
+        <source>Failed to upload public key to the server.
+Fingerprint: %1
+Error: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
+        <source>Key Update Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
+        <source>Key Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
+        <source>The server could not be reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerProbe.cpp" line="247"/>
+        <source>The server responded, but not as a key server: it supports neither the HKP nor the VKS interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
+        <source>Failed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
+        <source>The key server does not have this key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="88"/>
+        <source>%1 of %2 keys were fetched from the key server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
+        <source>%1 of %2 keys were published to the key server %3.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
index 0126eec..e065172 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
@@ -2,21 +2,201 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="es_ES">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
+        <translation>Lista de servidores de claves</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
+        <translation>Añadir un servidor de claves</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
+        <translation>Operaciones</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
+        <translation>Añadir</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
+        <translation>Establecer como predeterminado</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
+        <translation>Probar seleccionado</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
+        <translation>Eliminar seleccionado</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
+        <translation>https://keys.example.org</translation>
+    </message>
+    <message>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
+        <translation type="vanished">Un nuevo servidor de claves se prueba contra las interfaces HKP y VKS antes de añadirse. La búsqueda utiliza HKP; la publicación y la actualización utilizan VKS.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <translation>Un nuevo servidor de claves se prueba contra las interfaces HKP y VKS antes de añadirse. La búsqueda utiliza HKP. La publicación y la actualización siempre utilizan el servidor predeterminado: mediante VKS si lo ofrece, mediante HKP en caso contrario.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
+        <translation>Predeterminado</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
+        <translation>HKP</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
+        <translation>VKS</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
+        <translation>Estado</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
+        <translation>Última prueba</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
+        <translation>Sí</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
+        <translation>Verificado</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
+        <translation>No verificado</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
+        <translation>Dirección no válida</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <translation>&quot;%1&quot; no es una dirección de servidor de claves válida.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
+        <translation>Ya incluido</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
+        <translation>%1 ya está en la lista de servidores de claves.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
+        <translation>Dirección de servidor de claves insegura</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <translation>%1 usa HTTP sin cifrar, por lo que cualquiera en la red puede ver y modificar lo que busque o publique. ¿Agregarlo de todas formas?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation>Sin publicación verificada</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation>%1 no admite la interfaz VKS, por lo que la publicación y la actualización utilizarán HKP en su lugar.
+
+Con HKP, el servidor no confirma su dirección de correo electrónico y una clave subida no se puede eliminar nuevamente.
+
+¿Usar %1 como predeterminado de todos modos?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation>Servidor de claves no verificado</translation>
+    </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
+        <translation>%1 no respondió como servidor de claves.
+
+%2
+
+Se ha agregado y se ha marcado como no verificado; use Probar seleccionado para intentarlo de nuevo.</translation>
+    </message>
+</context>
+<context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
         <source>The following email addresses have status:
 </source>
         <translation>Las siguientes direcciones de correo electrónico tienen el estado:</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
         <source>Could not parse status information.</source>
         <translation>No se pudo analizar la información de estado.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
         <source>Public Key Upload Successful</source>
         <translation>Carga de clave pública exitosa</translation>
     </message>
@@ -37,21 +217,21 @@ Por favor, revise su correo electrónico (%3) para obtener la verificación adic
 Nota: Para la verificación, puede encontrar más información aquí: https://keys.openpgp.org/about</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
         <source>Key Upload Failed</source>
         <translation>Carga de clave fallida</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>No se pudo exportar la clave pública antes de cargarla.
 Clave: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -64,8 +244,8 @@ Huella: %1
 Por favor, revise su correo electrónico (%3) para obtener la verificación adicional de %4.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -83,7 +263,7 @@ Error: %2</translation>
         <translation>¿Publicar sin verificación?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
         <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
 
 The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
@@ -96,39 +276,49 @@ El servidor no confirmará su dirección de correo electrónico y la carga no se
 ¿Publicar en %1 de todos modos?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1: no se pudo exportar la clave pública</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
         <source>Key Refresh Finished</source>
         <translation>Actualización de claves completada</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
         <source>Key Publishing Finished</source>
         <translation>Publicación de claves completada</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>Ya se está ejecutando una operación con el servidor de claves. Inténtelo de nuevo cuando haya terminado.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
         <source>The public key was uploaded to the key server %2 over HKP.
 Fingerprint: %1</source>
         <translation>La clave pública se cargó en el servidor de claves %2 a través de HKP.
 Huella: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
         <source>Key Update Failed</source>
         <translation>Actualización de clave fallida</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -137,22 +327,42 @@ ID de clave: %1
 Error: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
         <source>Publication Status</source>
         <translation>Estado de publicación</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
         <source>The public key has been published on %1.</source>
         <translation>La clave pública se ha publicado en %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
         <source>The public key is not published on %1.</source>
         <translation>La clave pública no está publicada en %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -169,28 +379,36 @@ ID de clave: %1
 Error: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Key Server</source>
         <translation>Servidor de claves</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
         <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">Importar claves públicas desde un servidor de claves de confianza.</translation>
+        <translation>Importar claves públicas desde un servidor de claves de confianza.</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
         <source>Key Server Operations</source>
-        <translation type="vanished">Operaciones del servidor de claves</translation>
+        <translation>Operaciones del servidor de claves</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
         <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">Publicar clave pública en el servidor de claves</translation>
+        <translation>Publicar clave pública en el servidor de claves</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
         <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">Actualizar clave pública desde el servidor de claves</translation>
+        <translation>Actualizar clave pública desde el servidor de claves</translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
         <source>The server could not be reached.</source>
         <translation>No se pudo contactar con el servidor.</translation>
     </message>
@@ -200,12 +418,12 @@ Error: %2</translation>
         <translation>El servidor respondió, pero no como un servidor de claves: no admite ni la interfaz HKP ni la VKS.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
         <source>Failed:</source>
         <translation>Error:</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
         <source>The key server does not have this key.</source>
         <translation>El servidor de claves no tiene esta clave.</translation>
     </message>
@@ -215,192 +433,12 @@ Error: %2</translation>
         <translation>Se recuperaron %1 de %2 claves del servidor de claves.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>Se publicaron %1 de %2 claves en el servidor de claves %3.</translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
-        <translation>Lista de servidores de claves</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
-        <translation>Añadir un servidor de claves</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
-        <translation>Operaciones</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
-        <translation>Añadir</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
-        <translation>Establecer como predeterminado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
-        <translation>Probar seleccionado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
-        <translation>Eliminar seleccionado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
-        <translation>https://keys.example.org</translation>
-    </message>
-    <message>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
-        <translation type="vanished">Un nuevo servidor de claves se prueba contra las interfaces HKP y VKS antes de añadirse. La búsqueda utiliza HKP; la publicación y la actualización utilizan VKS.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
-        <translation>Un nuevo servidor de claves se prueba contra las interfaces HKP y VKS antes de añadirse. La búsqueda utiliza HKP. La publicación y la actualización siempre utilizan el servidor predeterminado: mediante VKS si lo ofrece, mediante HKP en caso contrario.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
-        <translation>Predeterminado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
-        <translation>HKP</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
-        <translation>VKS</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
-        <translation>Última prueba</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
-        <translation>Sí</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
-        <translation>Verificado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
-        <translation>No verificado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
-        <translation>Nunca</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
-        <translation>Dirección no válida</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
-        <translation>&quot;%1&quot; no es una dirección de servidor de claves válida.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
-        <translation>Ya incluido</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
-        <translation>%1 ya está en la lista de servidores de claves.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
-        <translation>Dirección de servidor de claves insegura</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
-        <translation>%1 usa HTTP sin cifrar, por lo que cualquiera en la red puede ver y modificar lo que busque o publique. ¿Agregarlo de todas formas?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
-        <translation>Sin publicación verificada</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
-
-Use %1 as the default anyway?</source>
-        <translation>%1 no admite la interfaz VKS, por lo que la publicación y la actualización utilizarán HKP en su lugar.
-
-Con HKP, el servidor no confirma su dirección de correo electrónico y una clave subida no se puede eliminar nuevamente.
-
-¿Usar %1 como predeterminado de todos modos?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
-        <translation>Servidor de claves no verificado</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
-        <translation>%1 no respondió como servidor de claves.
-
-%2
-
-Se ha agregado y se ha marcado como no verificado; use Probar seleccionado para intentarlo de nuevo.</translation>
-    </message>
-</context>
-<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.ui" line="14"/>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
index 1cde93a..b1fe077 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
@@ -2,21 +2,201 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="fr_FR">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
+        <translation>Liste des serveurs de clés</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
+        <translation>Ajouter un serveur de clés</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
+        <translation>Opérations</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
+        <translation>Définir par défaut</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
+        <translation>Tester la sélection</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
+        <translation>Supprimer la sélection</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
+        <translation>https://keys.example.org</translation>
+    </message>
+    <message>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
+        <translation type="vanished">Un nouveau serveur de clés est testé sur les interfaces HKP et VKS avant d&apos;être ajouté. La recherche utilise HKP ; la publication et l&apos;actualisation utilisent VKS.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <translation>Un nouveau serveur de clés est testé sur les interfaces HKP et VKS avant d&apos;être ajouté. La recherche utilise HKP. La publication et l&apos;actualisation utilisent toujours le serveur par défaut : sur VKS quand celui-ci le propose, sinon sur HKP.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
+        <translation>Par défaut</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
+        <translation>HKP</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
+        <translation>VKS</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
+        <translation>Statut</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
+        <translation>Dernier test</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
+        <translation>oui</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
+        <translation>non</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
+        <translation>Vérifié</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
+        <translation>Non vérifié</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
+        <translation>jamais</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
+        <translation>Adresse invalide</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <translation>«%1» n&apos;est pas une adresse de serveur de clés valide.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
+        <translation>Déjà listé</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
+        <translation>%1 est déjà dans la liste des serveurs de clés.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
+        <translation>Adresse de serveur de clés non sécurisée</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <translation>%1 utilise HTTP en clair, donc n&apos;importe qui sur le réseau peut voir et modifier ce que vous consultez ou publiez. L&apos;ajouter quand même ?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation>Aucune publication vérifiée</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation>%1 ne prend pas en charge l&apos;interface VKS, donc la publication et l&apos;actualisation utiliseront HKP à la place.
+
+Sur HKP, le serveur ne confirme pas votre adresse e-mail et une clé téléversée ne peut pas être supprimée ultérieurement.
+
+Utiliser %1 comme serveur par défaut malgré tout&#xa0;?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation>Serveur de clés non vérifié</translation>
+    </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
+        <translation>%1 n&apos;a pas répondu en tant que serveur de clés.
+
+%2
+
+Il a été ajouté et marqué comme non vérifié ; utilisez Test sélectionné pour réessayer.</translation>
+    </message>
+</context>
+<context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
         <source>The following email addresses have status:
 </source>
         <translation>Les adresses e-mail suivantes ont le statut suivant :</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
         <source>Could not parse status information.</source>
         <translation>Impossible d&apos;analyser les informations de statut.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
         <source>Public Key Upload Successful</source>
         <translation>Téléversement de la clé publique réussi</translation>
     </message>
@@ -37,21 +217,21 @@ Veuillez vérifier votre e-mail (%3) pour la vérification supplémentaire de ke
 Remarque : Pour la vérification, vous pouvez trouver plus d&apos;informations ici : https://keys.openpgp.org/about</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
         <source>Key Upload Failed</source>
         <translation>Échec du téléversement de la clé</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>Échec de l&apos;exportation de la clé publique avant le téléversement.
 Clé : %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -64,8 +244,8 @@ Empreinte : %1
 Veuillez vérifier votre e-mail (%3) pour la vérification supplémentaire de %4.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -83,7 +263,7 @@ Erreur : %2</translation>
         <translation>Publier sans vérification ?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
         <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
 
 The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
@@ -96,39 +276,49 @@ Le serveur ne confirmera pas votre adresse e-mail, et le téléversement ne peut
 Publier sur %1 quand même ?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1 : la clé publique n&apos;a pas pu être exportée.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
         <source>Key Refresh Finished</source>
         <translation>Actualisation des clés terminée.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
         <source>Key Publishing Finished</source>
         <translation>Publication des clés terminée.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>Une opération de serveur de clés est déjà en cours. Réessayez lorsqu&apos;elle sera terminée.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
         <source>The public key was uploaded to the key server %2 over HKP.
 Fingerprint: %1</source>
         <translation>La clé publique a été téléversée sur le serveur de clés %2 via HKP.
 Empreinte : %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
         <source>Key Update Failed</source>
         <translation>Échec de la mise à jour de la clé</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -137,22 +327,42 @@ Identifiant de clé : %1
 Erreur : %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
         <source>Publication Status</source>
         <translation>Statut de publication</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
         <source>The public key has been published on %1.</source>
         <translation>La clé publique a été publiée sur %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
         <source>The public key is not published on %1.</source>
         <translation>La clé publique n&apos;est pas publiée sur %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -169,28 +379,36 @@ Identifiant de clé : %1
 Erreur : %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Key Server</source>
         <translation>Serveur de clés</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
         <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">Importer des clés publiques depuis un serveur de clés de confiance.</translation>
+        <translation>Importer des clés publiques depuis un serveur de clés de confiance.</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
         <source>Key Server Operations</source>
-        <translation type="vanished">Opérations du serveur de clés</translation>
+        <translation>Opérations du serveur de clés</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
         <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">Publier la clé publique sur le serveur de clés</translation>
+        <translation>Publier la clé publique sur le serveur de clés</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
         <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">Actualiser la clé publique depuis le serveur de clés</translation>
+        <translation>Actualiser la clé publique depuis le serveur de clés</translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
         <source>The server could not be reached.</source>
         <translation>Le serveur est inaccessible.</translation>
     </message>
@@ -200,12 +418,12 @@ Erreur : %2</translation>
         <translation>Le serveur a répondu, mais pas en tant que serveur de clés : il ne prend en charge ni l&apos;interface HKP ni l&apos;interface VKS.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
         <source>Failed:</source>
         <translation>Échec :</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
         <source>The key server does not have this key.</source>
         <translation>Le serveur de clés ne possède pas cette clé.</translation>
     </message>
@@ -215,192 +433,12 @@ Erreur : %2</translation>
         <translation>%1 clé(s) sur %2 ont été récupérées depuis le serveur de clés.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>%1 clé(s) sur %2 ont été publiées sur le serveur de clés %3.</translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
-        <translation>Liste des serveurs de clés</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
-        <translation>Ajouter un serveur de clés</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
-        <translation>Opérations</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
-        <translation>Ajouter</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
-        <translation>Définir par défaut</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
-        <translation>Tester la sélection</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
-        <translation>Supprimer la sélection</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
-        <translation>https://keys.example.org</translation>
-    </message>
-    <message>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
-        <translation type="vanished">Un nouveau serveur de clés est testé sur les interfaces HKP et VKS avant d&apos;être ajouté. La recherche utilise HKP ; la publication et l&apos;actualisation utilisent VKS.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
-        <translation>Un nouveau serveur de clés est testé sur les interfaces HKP et VKS avant d&apos;être ajouté. La recherche utilise HKP. La publication et l&apos;actualisation utilisent toujours le serveur par défaut : sur VKS quand celui-ci le propose, sinon sur HKP.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
-        <translation>Par défaut</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
-        <translation>HKP</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
-        <translation>VKS</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
-        <translation>Statut</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
-        <translation>Dernier test</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
-        <translation>oui</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
-        <translation>non</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
-        <translation>Vérifié</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
-        <translation>Non vérifié</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
-        <translation>jamais</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
-        <translation>Adresse invalide</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
-        <translation>«%1» n&apos;est pas une adresse de serveur de clés valide.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
-        <translation>Déjà listé</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
-        <translation>%1 est déjà dans la liste des serveurs de clés.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
-        <translation>Adresse de serveur de clés non sécurisée</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
-        <translation>%1 utilise HTTP en clair, donc n&apos;importe qui sur le réseau peut voir et modifier ce que vous consultez ou publiez. L&apos;ajouter quand même ?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
-        <translation>Aucune publication vérifiée</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
-
-Use %1 as the default anyway?</source>
-        <translation>%1 ne prend pas en charge l&apos;interface VKS, donc la publication et l&apos;actualisation utiliseront HKP à la place.
-
-Sur HKP, le serveur ne confirme pas votre adresse e-mail et une clé téléversée ne peut pas être supprimée ultérieurement.
-
-Utiliser %1 comme serveur par défaut malgré tout&#xa0;?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
-        <translation>Serveur de clés non vérifié</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
-        <translation>%1 n&apos;a pas répondu en tant que serveur de clés.
-
-%2
-
-Il a été ajouté et marqué comme non vérifié ; utilisez Test sélectionné pour réessayer.</translation>
-    </message>
-</context>
-<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.cpp" line="110"/>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
index e86e9b0..36c23a6 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
@@ -2,21 +2,201 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="it_IT">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
+        <translation>Elenco dei server di chiavi</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
+        <translation>Aggiungi un server di chiavi</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
+        <translation>Operazioni</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
+        <translation>Imposta come predefinito</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
+        <translation>Testa selezionato</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
+        <translation>Elimina selezionato</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
+        <translation>https://keys.example.org</translation>
+    </message>
+    <message>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
+        <translation type="vanished">Un nuovo server di chiavi viene testato rispetto alle interfacce HKP e VKS prima di essere aggiunto. La ricerca utilizza HKP; la pubblicazione e l&apos;aggiornamento utilizzano VKS.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <translation>Un nuovo server di chiavi viene testato rispetto alle interfacce HKP e VKS prima di essere aggiunto. La ricerca utilizza HKP. La pubblicazione e l&apos;aggiornamento utilizzano sempre il server predefinito: su VKS dove lo offre, altrimenti su HKP.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
+        <translation>Predefinito</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
+        <translation>HKP</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
+        <translation>VKS</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
+        <translation>Stato</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
+        <translation>Ultimo test</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
+        <translation>Verificato</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
+        <translation>Non verificato</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
+        <translation>mai</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
+        <translation>Indirizzo non valido</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <translation>&quot;%1&quot; non è un indirizzo del server di chiavi valido.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
+        <translation>Già elencato</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
+        <translation>%1 è già presente nella lista dei server di chiavi.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
+        <translation>Indirizzo del Server di Chiavi Non Sicuro</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <translation>%1 utilizza HTTP semplice, quindi chiunque sulla rete può vedere e modificare ciò che cerchi o pubblichi. Aggiungerlo comunque?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation>Nessuna pubblicazione verificata</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation>%1 non supporta l&apos;interfaccia VKS, quindi la pubblicazione e l&apos;aggiornamento utilizzeranno HKP.
+
+Su HKP il server non conferma il tuo indirizzo email e una chiave caricata non può essere rimossa.
+
+Usare %1 come predefinito comunque?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation>Server di Chiavi Non Verificato</translation>
+    </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
+        <translation>%1 non ha risposto come server di chiavi.
+
+%2
+
+È stato aggiunto e contrassegnato come non verificato; usa &quot;Test Selezionato&quot; per riprovare.</translation>
+    </message>
+</context>
+<context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
         <source>The following email addresses have status:
 </source>
         <translation>I seguenti indirizzi email hanno lo stato:</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
         <source>Could not parse status information.</source>
         <translation>Impossibile analizzare le informazioni sullo stato.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
         <source>Public Key Upload Successful</source>
         <translation>Caricamento della chiave pubblica riuscito</translation>
     </message>
@@ -37,21 +217,21 @@ Controlla la tua email (%3) per ulteriori verifiche da keys.openpgp.org.
 Nota: Per la verifica, puoi trovare maggiori informazioni qui: https://keys.openpgp.org/about</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
         <source>Key Upload Failed</source>
         <translation>Caricamento della chiave pubblica fallito</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>Impossibile esportare la chiave pubblica prima del caricamento.
 Chiave: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -64,8 +244,8 @@ Impronta digitale: %1
 Controlla la tua email (%3) per ulteriori verifiche da %4.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -83,7 +263,7 @@ Errore: %2</translation>
         <translation>Pubblicare senza verifica?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
         <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
 
 The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
@@ -96,39 +276,49 @@ Il server non confermerà il tuo indirizzo email e il caricamento non può esser
 Pubblicare su %1 comunque?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1: impossibile esportare la chiave pubblica</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
         <source>Key Refresh Finished</source>
         <translation>Aggiornamento delle chiavi completato</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
         <source>Key Publishing Finished</source>
         <translation>Pubblicazione delle chiavi completata</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>Un&apos;operazione sul server delle chiavi è già in esecuzione. Riprova quando è terminata.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
         <source>The public key was uploaded to the key server %2 over HKP.
 Fingerprint: %1</source>
         <translation>La chiave pubblica è stata caricata con successo sul server delle chiavi %2 tramite HKP.
 Impronta digitale: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
         <source>Key Update Failed</source>
         <translation>Aggiornamento della chiave fallito</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -137,22 +327,42 @@ ID chiave: %1
 Errore: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
         <source>Publication Status</source>
         <translation>Stato della pubblicazione</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
         <source>The public key has been published on %1.</source>
         <translation>La chiave pubblica è stata pubblicata su %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
         <source>The public key is not published on %1.</source>
         <translation>La chiave pubblica non è pubblicata su %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -169,28 +379,36 @@ ID chiave: %1
 Errore: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Key Server</source>
         <translation>Server delle chiavi</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
         <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">Importa chiavi pubbliche da un server delle chiavi attendibile.</translation>
+        <translation>Importa chiavi pubbliche da un server delle chiavi attendibile.</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
         <source>Key Server Operations</source>
-        <translation type="vanished">Operazioni del server delle chiavi</translation>
+        <translation>Operazioni del server delle chiavi</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
         <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">Pubblica chiave pubblica sul server delle chiavi</translation>
+        <translation>Pubblica chiave pubblica sul server delle chiavi</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
         <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">Aggiorna chiave pubblica dal server delle chiavi</translation>
+        <translation>Aggiorna chiave pubblica dal server delle chiavi</translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
         <source>The server could not be reached.</source>
         <translation>Impossibile raggiungere il server.</translation>
     </message>
@@ -200,12 +418,12 @@ Errore: %2</translation>
         <translation>Il server ha risposto, ma non come server delle chiavi: non supporta né l&apos;interfaccia HKP né VKS.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
         <source>Failed:</source>
         <translation>Errore:</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
         <source>The key server does not have this key.</source>
         <translation>Il server delle chiavi non dispone di questa chiave.</translation>
     </message>
@@ -215,192 +433,12 @@ Errore: %2</translation>
         <translation>%1 di %2 chiavi sono state recuperate dal server delle chiavi.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>%1 di %2 chiavi sono state pubblicate sul server delle chiavi %3.</translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
-        <translation>Elenco dei server di chiavi</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
-        <translation>Aggiungi un server di chiavi</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
-        <translation>Operazioni</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
-        <translation>Aggiungi</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
-        <translation>Imposta come predefinito</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
-        <translation>Testa selezionato</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
-        <translation>Elimina selezionato</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
-        <translation>https://keys.example.org</translation>
-    </message>
-    <message>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
-        <translation type="vanished">Un nuovo server di chiavi viene testato rispetto alle interfacce HKP e VKS prima di essere aggiunto. La ricerca utilizza HKP; la pubblicazione e l&apos;aggiornamento utilizzano VKS.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
-        <translation>Un nuovo server di chiavi viene testato rispetto alle interfacce HKP e VKS prima di essere aggiunto. La ricerca utilizza HKP. La pubblicazione e l&apos;aggiornamento utilizzano sempre il server predefinito: su VKS dove lo offre, altrimenti su HKP.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
-        <translation>Predefinito</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
-        <translation>HKP</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
-        <translation>VKS</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
-        <translation>Stato</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
-        <translation>Ultimo test</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
-        <translation>Sì</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
-        <translation>Verificato</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
-        <translation>Non verificato</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
-        <translation>mai</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
-        <translation>Indirizzo non valido</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
-        <translation>&quot;%1&quot; non è un indirizzo del server di chiavi valido.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
-        <translation>Già elencato</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
-        <translation>%1 è già presente nella lista dei server di chiavi.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
-        <translation>Indirizzo del Server di Chiavi Non Sicuro</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
-        <translation>%1 utilizza HTTP semplice, quindi chiunque sulla rete può vedere e modificare ciò che cerchi o pubblichi. Aggiungerlo comunque?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
-        <translation>Nessuna pubblicazione verificata</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
-
-Use %1 as the default anyway?</source>
-        <translation>%1 non supporta l&apos;interfaccia VKS, quindi la pubblicazione e l&apos;aggiornamento utilizzeranno HKP.
-
-Su HKP il server non conferma il tuo indirizzo email e una chiave caricata non può essere rimossa.
-
-Usare %1 come predefinito comunque?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
-        <translation>Server di Chiavi Non Verificato</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
-        <translation>%1 non ha risposto come server di chiavi.
-
-%2
-
-È stato aggiunto e contrassegnato come non verificato; usa &quot;Test Selezionato&quot; per riprovare.</translation>
-    </message>
-</context>
-<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.cpp" line="110"/>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
index eb81610..b871027 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
@@ -2,202 +2,6 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="pl_PL">
 <context>
-    <name>GTrC</name>
-    <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
-        <source>The server could not be reached.</source>
-        <translation>Nie udało się połączyć z serwerem.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerProbe.cpp" line="247"/>
-        <source>The server responded, but not as a key server: it supports neither the HKP nor the VKS interface.</source>
-        <translation>Serwer odpowiedział, ale nie jako serwer kluczy: nie obsługuje ani interfejsu HKP, ani VKS.</translation>
-    </message>
-    <message>
-        <source>The key server did not return a key.</source>
-        <translation type="vanished">Serwer kluczy nie zwrócił klucza.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="155"/>
-        <source>Publish Without Verification?</source>
-        <translation>Opublikować bez weryfikacji?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
-        <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
-
-The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
-
-Publish to %1 anyway?</source>
-        <translation>%1 nie obsługuje weryfikowanego publikowania (VKS), więc klucz zostanie wysłany przez HKP.
-
-Serwer nie potwierdzi twojego adresu e-mail, a wysyłania nie będzie można cofnąć — serwery kluczy HKP nie pozwalają usuwać kluczy.
-
-Opublikować na %1 mimo to?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
-        <source>%1: the public key could not be exported</source>
-        <translation>%1: nie udało się wyeksportować klucza publicznego</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
-        <source>Key Refresh Finished</source>
-        <translation>Odświeżanie kluczy zakończone</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
-        <source>Key Publishing Finished</source>
-        <translation>Publikowanie kluczy zakończone</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
-        <source>A key server operation is already running. Try again when it has finished.</source>
-        <translation>Operacja serwera kluczy już trwa. Spróbuj ponownie po jej zakończeniu.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
-        <source>Key Upload Failed</source>
-        <translation>Nie udało się wysłać klucza</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
-        <source>Failed to export the public key before uploading.
-Key: %1</source>
-        <translation>Nie udało się wyeksportować klucza publicznego przed wysłaniem.
-Klucz: %1</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
-        <source>Failed to upload public key to the server.
-Fingerprint: %1
-Error: %2</source>
-        <translation>Nie udało się wysłać klucza publicznego na serwer.
-Odcisk klucza: %1
-Błąd: %2</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
-        <source>Public Key Upload Successful</source>
-        <translation>Wysłano klucz publiczny</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
-        <source>The public key was uploaded to the key server %2 over HKP.
-Fingerprint: %1</source>
-        <translation>Klucz publiczny został wysłany na serwer kluczy %2 przez HKP.
-Odcisk klucza: %1</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
-        <source>The following email addresses have status:
-</source>
-        <translation>Następujące adresy e-mail mają status:
-</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
-        <source>Could not parse status information.</source>
-        <translation>Nie udało się przetworzyć informacji o statusie.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
-        <source>The public key was successfully uploaded to the key server %4.
-Fingerprint: %1
-
-%2
-Please check your email (%3) for further verification from %4.</source>
-        <translation>Klucz publiczny został pomyślnie wysłany na serwer kluczy %4.
-Odcisk klucza: %1
-
-%2
-Sprawdź swoją pocztę e-mail (%3), aby kontynuować weryfikację od %4.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="501"/>
-        <source>Key Update Failed</source>
-        <translation>Nie udało się zaktualizować klucza</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
-        <source>Failed to retrieve public key from %3.
-Key ID: %1
-Error: %2</source>
-        <translation>Nie udało się pobrać klucza publicznego z %3.
-Identyfikator klucza: %1
-Błąd: %2</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
-        <source>Publication Status</source>
-        <translation>Status publikacji</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
-        <source>The public key has been published on %1.</source>
-        <translation>Klucz publiczny został opublikowany na %1.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
-        <source>The public key is not published on %1.</source>
-        <translation>Klucz publiczny nie jest opublikowany na %1.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
-        <source>Could not ask %1 about this key.
-
-%2</source>
-        <translation>Nie udało się zapytać %1 o ten klucz.
-
-%2</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
-        <source>Key Server</source>
-        <translation>Serwer kluczy</translation>
-    </message>
-    <message>
-        <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">Importuj klucze publiczne z zaufanego serwera kluczy.</translation>
-    </message>
-    <message>
-        <source>Key Server Operations</source>
-        <translation type="vanished">Operacje na serwerze kluczy</translation>
-    </message>
-    <message>
-        <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">Opublikuj klucz publiczny na serwerze kluczy</translation>
-    </message>
-    <message>
-        <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">Odśwież klucz publiczny z serwera kluczy</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
-        <source>Failed:</source>
-        <translation>Nie udało się:</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
-        <source>The key server does not have this key.</source>
-        <translation>Serwer kluczy nie ma tego klucza.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="88"/>
-        <source>%1 of %2 keys were fetched from the key server.</source>
-        <translation>%1 z %2 kluczy pobrano z serwera kluczy.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
-        <source>%1 of %2 keys were published to the key server %3.</source>
-        <translation>Opublikowano %1 z %2 kluczy na serwerze kluczy %3.</translation>
-    </message>
-</context>
-<context>
     <name>KeyServerSettingsPage</name>
     <message>
         <location filename="../KeyServerSettingsPage.ui" line="17"/>
@@ -374,6 +178,240 @@ Został dodany i oznaczony jako niezweryfikowany; użyj „Testuj zaznaczone”,
     </message>
 </context>
 <context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
+        <source>The server could not be reached.</source>
+        <translation>Nie udało się połączyć z serwerem.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerProbe.cpp" line="247"/>
+        <source>The server responded, but not as a key server: it supports neither the HKP nor the VKS interface.</source>
+        <translation>Serwer odpowiedział, ale nie jako serwer kluczy: nie obsługuje ani interfejsu HKP, ani VKS.</translation>
+    </message>
+    <message>
+        <source>The key server did not return a key.</source>
+        <translation type="vanished">Serwer kluczy nie zwrócił klucza.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="155"/>
+        <source>Publish Without Verification?</source>
+        <translation>Opublikować bez weryfikacji?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
+        <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
+
+The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
+
+Publish to %1 anyway?</source>
+        <translation>%1 nie obsługuje weryfikowanego publikowania (VKS), więc klucz zostanie wysłany przez HKP.
+
+Serwer nie potwierdzi twojego adresu e-mail, a wysyłania nie będzie można cofnąć — serwery kluczy HKP nie pozwalają usuwać kluczy.
+
+Opublikować na %1 mimo to?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
+        <source>%1: the public key could not be exported</source>
+        <translation>%1: nie udało się wyeksportować klucza publicznego</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
+        <source>Key Refresh Finished</source>
+        <translation>Odświeżanie kluczy zakończone</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <source>Key Publishing Finished</source>
+        <translation>Publikowanie kluczy zakończone</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
+        <source>A key server operation is already running. Try again when it has finished.</source>
+        <translation>Operacja serwera kluczy już trwa. Spróbuj ponownie po jej zakończeniu.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
+        <source>Key Upload Failed</source>
+        <translation>Nie udało się wysłać klucza</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
+        <source>Failed to export the public key before uploading.
+Key: %1</source>
+        <translation>Nie udało się wyeksportować klucza publicznego przed wysłaniem.
+Klucz: %1</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
+        <source>Failed to upload public key to the server.
+Fingerprint: %1
+Error: %2</source>
+        <translation>Nie udało się wysłać klucza publicznego na serwer.
+Odcisk klucza: %1
+Błąd: %2</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
+        <source>Public Key Upload Successful</source>
+        <translation>Wysłano klucz publiczny</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
+        <source>The public key was uploaded to the key server %2 over HKP.
+Fingerprint: %1</source>
+        <translation>Klucz publiczny został wysłany na serwer kluczy %2 przez HKP.
+Odcisk klucza: %1</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
+        <source>The following email addresses have status:
+</source>
+        <translation>Następujące adresy e-mail mają status:
+</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
+        <source>Could not parse status information.</source>
+        <translation>Nie udało się przetworzyć informacji o statusie.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
+        <source>The public key was successfully uploaded to the key server %4.
+Fingerprint: %1
+
+%2
+Please check your email (%3) for further verification from %4.</source>
+        <translation>Klucz publiczny został pomyślnie wysłany na serwer kluczy %4.
+Odcisk klucza: %1
+
+%2
+Sprawdź swoją pocztę e-mail (%3), aby kontynuować weryfikację od %4.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
+        <source>Key Update Failed</source>
+        <translation>Nie udało się zaktualizować klucza</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
+        <source>Failed to retrieve public key from %3.
+Key ID: %1
+Error: %2</source>
+        <translation>Nie udało się pobrać klucza publicznego z %3.
+Identyfikator klucza: %1
+Błąd: %2</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
+        <source>Publication Status</source>
+        <translation>Status publikacji</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
+        <source>The public key has been published on %1.</source>
+        <translation>Klucz publiczny został opublikowany na %1.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
+        <source>The public key is not published on %1.</source>
+        <translation>Klucz publiczny nie jest opublikowany na %1.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
+        <source>Could not ask %1 about this key.
+
+%2</source>
+        <translation>Nie udało się zapytać %1 o ten klucz.
+
+%2</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
+        <source>Key Server</source>
+        <translation>Serwer kluczy</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
+        <source>Import public keys from a trusted key server.</source>
+        <translation>Importuj klucze publiczne z zaufanego serwera kluczy.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
+        <source>Key Server Operations</source>
+        <translation>Operacje na serwerze kluczy</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
+        <source>Publish Public Key to Key Server</source>
+        <translation>Opublikuj klucz publiczny na serwerze kluczy</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
+        <source>Refresh Public Key From Key Server</source>
+        <translation>Odśwież klucz publiczny z serwera kluczy</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
+        <source>Failed:</source>
+        <translation>Nie udało się:</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
+        <source>The key server does not have this key.</source>
+        <translation>Serwer kluczy nie ma tego klucza.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="88"/>
+        <source>%1 of %2 keys were fetched from the key server.</source>
+        <translation>%1 z %2 kluczy pobrano z serwera kluczy.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
+        <source>%1 of %2 keys were published to the key server %3.</source>
+        <translation>Opublikowano %1 z %2 kluczy na serwerze kluczy %3.</translation>
+    </message>
+</context>
+<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.ui" line="14"/>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
index 7fc94bb..05db296 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
@@ -2,21 +2,197 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
+        <translation>Список серверов ключей</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
+        <translation>Добавить сервер ключей</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
+        <translation>Добавить</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
+        <translation>Операции</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
+        <translation>Установить по умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
+        <translation>Проверить выбранные</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
+        <translation>Удалить выбранные</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
+        <translation>https://keys.example.org</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <translation>Новый сервер ключей проверяется через интерфейсы HKP и VKS перед добавлением. Поиск использует HKP. Публикация и обновление всегда используют сервер по умолчанию: через VKS, если он его поддерживает, иначе через HKP.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
+        <translation>По умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
+        <translation>Адрес</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
+        <translation>HKP</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
+        <translation>VKS</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
+        <translation>Последняя проверка</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
+        <translation>да</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
+        <translation>нет</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
+        <translation>Проверено</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
+        <translation>Не проверено</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
+        <translation>никогда</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
+        <translation>Недопустимый адрес</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <translation>&quot;%1&quot; не является допустимым адресом сервера ключей.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
+        <translation>Уже в списке</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
+        <translation>%1 уже есть в списке серверов ключей.</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
+        <translation>Небезопасный адрес сервера ключей</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <translation>%1 использует обычный HTTP, поэтому любой в сети может видеть и изменять то, что вы ищете или публикуете. Всё равно добавить?</translation>
+    </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation>Нет подтверждённой публикации</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation>%1 не поддерживает интерфейс VKS, поэтому публикация и обновление будут использовать HKP.
+
+Через HKP сервер не подтверждает ваш адрес электронной почты, и загруженный ключ нельзя будет удалить.
+
+Всё равно использовать %1 по умолчанию?</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation>Сервер ключей не проверен</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
+        <translation>%1 не ответил как сервер ключей.
+
+%2
+
+Он был добавлен и помечен как непроверенный; используйте «Проверить выбранное», чтобы попробовать снова.</translation>
+    </message>
+</context>
+<context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
         <source>The following email addresses have status:
 </source>
         <translation>Статус следующих адресов электронной почты:</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
         <source>Could not parse status information.</source>
         <translation>Не удалось обработать информацию о статусе.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
         <source>Public Key Upload Successful</source>
         <translation>Открытый ключ успешно загружен</translation>
     </message>
@@ -37,15 +213,15 @@ 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="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
         <source>Key Upload Failed</source>
         <translation>Ошибка загрузки ключа</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -54,7 +230,7 @@ Error: %2</source>
 Ошибка: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
         <source>Key Update Failed</source>
         <translation>Ошибка обновления ключа</translation>
     </message>
@@ -76,7 +252,7 @@ Error: %2</source>
         <translation>Опубликовать без проверки?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
         <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
 
 The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
@@ -89,41 +265,51 @@ Publish to %1 anyway?</source>
 Опубликовать на %1 всё равно?</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1: не удалось экспортировать открытый ключ</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
         <source>Key Refresh Finished</source>
         <translation>Обновление ключей завершено</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
         <source>Key Publishing Finished</source>
         <translation>Публикация ключей завершена</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>Операция с сервером ключей уже выполняется. Повторите попытку после её завершения.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>Не удалось экспортировать открытый ключ перед загрузкой.
 Ключ: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
         <source>The public key was uploaded to the key server %2 over HKP.
 Fingerprint: %1</source>
         <translation>Открытый ключ загружен на сервер ключей %2 через HKP.
 Отпечаток: %1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -136,7 +322,7 @@ Please check your email (%3) for further verification from %4.</source>
 Пожалуйста, проверьте вашу электронную почту (%3) на наличие дальнейшего подтверждения от %4.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -145,22 +331,42 @@ Error: %2</source>
 Ошибка: %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
         <source>Publication Status</source>
         <translation>Статус публикации</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
         <source>The public key has been published on %1.</source>
         <translation>Открытый ключ опубликован на %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
         <source>The public key is not published on %1.</source>
         <translation>Открытый ключ не опубликован на %1.</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -169,28 +375,36 @@ Error: %2</source>
 %2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Key Server</source>
         <translation>Сервер ключей</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
         <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">Импортировать открытые ключи с доверенного сервера ключей.</translation>
+        <translation>Импортировать открытые ключи с доверенного сервера ключей.</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
         <source>Key Server Operations</source>
-        <translation type="vanished">Операции с сервером ключей</translation>
+        <translation>Операции с сервером ключей</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
         <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">Опубликовать открытый ключ на сервере ключей</translation>
+        <translation>Опубликовать открытый ключ на сервере ключей</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
         <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">Обновить открытый ключ с сервера ключей</translation>
+        <translation>Обновить открытый ключ с сервера ключей</translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
         <source>The server could not be reached.</source>
         <translation>Не удалось связаться с сервером.</translation>
     </message>
@@ -200,12 +414,12 @@ Error: %2</source>
         <translation>Сервер ответил, но не как сервер ключей: он не поддерживает ни интерфейс HKP, ни интерфейс VKS.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
         <source>Failed:</source>
         <translation>Ошибка:</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
         <source>The key server does not have this key.</source>
         <translation>На сервере ключей нет этого ключа.</translation>
     </message>
@@ -215,188 +429,12 @@ Error: %2</source>
         <translation>С сервера ключей получено %1 из %2 ключей.</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>На сервер ключей %3 опубликовано %1 из %2 ключей.</translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
-        <translation>Список серверов ключей</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
-        <translation>Добавить сервер ключей</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
-        <translation>Добавить</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
-        <translation>Операции</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
-        <translation>Установить по умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
-        <translation>Проверить выбранные</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
-        <translation>Удалить выбранные</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
-        <translation>https://keys.example.org</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
-        <translation>Новый сервер ключей проверяется через интерфейсы HKP и VKS перед добавлением. Поиск использует HKP. Публикация и обновление всегда используют сервер по умолчанию: через VKS, если он его поддерживает, иначе через HKP.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
-        <translation>По умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
-        <translation>HKP</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
-        <translation>VKS</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
-        <translation>Статус</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
-        <translation>Последняя проверка</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
-        <translation>да</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
-        <translation>нет</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
-        <translation>Проверено</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
-        <translation>Не проверено</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
-        <translation>никогда</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
-        <translation>Недопустимый адрес</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
-        <translation>&quot;%1&quot; не является допустимым адресом сервера ключей.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
-        <translation>Уже в списке</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
-        <translation>%1 уже есть в списке серверов ключей.</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
-        <translation>Небезопасный адрес сервера ключей</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
-        <translation>%1 использует обычный HTTP, поэтому любой в сети может видеть и изменять то, что вы ищете или публикуете. Всё равно добавить?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
-        <translation>Нет подтверждённой публикации</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
-
-Use %1 as the default anyway?</source>
-        <translation>%1 не поддерживает интерфейс VKS, поэтому публикация и обновление будут использовать HKP.
-
-Через HKP сервер не подтверждает ваш адрес электронной почты, и загруженный ключ нельзя будет удалить.
-
-Всё равно использовать %1 по умолчанию?</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
-        <translation>Сервер ключей не проверен</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
-        <translation>%1 не ответил как сервер ключей.
-
-%2
-
-Он был добавлен и помечен как непроверенный; используйте «Проверить выбранное», чтобы попробовать снова.</translation>
-    </message>
-</context>
-<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.ui" line="14"/>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
index e58f2a8..3426d32 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
@@ -2,21 +2,201 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="zh_CN">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
+        <translation>密钥服务器列表</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
+        <translation>添加密钥服务器</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
+        <translation>操作</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
+        <translation>添加</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
+        <translation>设为默认</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
+        <translation>测试所选</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
+        <translation>删除所选</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
+        <translation>https://keys.example.org</translation>
+    </message>
+    <message>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
+        <translation type="vanished">新密钥服务器在添加前会通过 HKP 和 VKS 接口进行测试。搜索使用 HKP；发布和刷新使用 VKS。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <translation>新密钥服务器在添加前会通过 HKP 和 VKS 接口进行测试。搜索使用 HKP。发布和刷新始终使用默认服务器：如果默认服务器支持 VKS 则通过 VKS，否则通过 HKP。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
+        <translation>默认</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
+        <translation>地址</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
+        <translation>HKP</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
+        <translation>VKS</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
+        <translation>状态</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
+        <translation>上次测试</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
+        <translation>否</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
+        <translation>已验证</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
+        <translation>未验证</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
+        <translation>从未</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
+        <translation>无效地址</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <translation>&quot;%1&quot; 不是有效的密钥服务器地址。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
+        <translation>已列出</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
+        <translation>%1 已在密钥服务器列表中。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
+        <translation>不安全的密钥服务器地址</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <translation>%1 使用明文 HTTP，网络上的任何人都可以查看或篡改您查询或发布的内容。仍然添加吗？</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation>无验证发布</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation>%1 不支持 VKS 接口，因此发布和刷新将改用 HKP。
+
+通过 HKP，服务器不会确认您的电子邮件地址，且上传的密钥无法再次删除。
+
+仍然将 %1 设为默认服务器吗？</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation>密钥服务器未验证</translation>
+    </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
+        <translation>%1 未以密钥服务器身份响应。
+
+%2
+
+该服务器已添加并标记为未验证；请使用“测试所选”重试。</translation>
+    </message>
+</context>
+<context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
         <source>The following email addresses have status:
 </source>
         <translation>以下电子邮件地址的状态为：</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
         <source>Could not parse status information.</source>
         <translation>无法解析状态信息。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
         <source>Public Key Upload Successful</source>
         <translation>公钥上传成功</translation>
     </message>
@@ -37,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="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
         <source>Key Upload Failed</source>
         <translation>密钥上传失败</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>上传前导出公钥失败。
 密钥：%1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -64,8 +244,8 @@ Please check your email (%3) for further verification from %4.</source>
 请检查您的电子邮件（%3）以获取 %4 的进一步验证信息。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -83,7 +263,7 @@ Error: %2</source>
         <translation>无验证发布？</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
         <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
 
 The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
@@ -96,39 +276,49 @@ Publish to %1 anyway?</source>
 仍然发布到 %1？</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1：无法导出公钥</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
         <source>Key Refresh Finished</source>
         <translation>密钥刷新完成</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
         <source>Key Publishing Finished</source>
         <translation>密钥发布完成</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>已有密钥服务器操作正在运行，请待其完成后重试。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
         <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="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
         <source>Key Update Failed</source>
         <translation>密钥更新失败</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -137,22 +327,42 @@ Error: %2</source>
 错误：%2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
         <source>Publication Status</source>
         <translation>发布状态</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
         <source>The public key has been published on %1.</source>
         <translation>公钥已在 %1 上发布。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
         <source>The public key is not published on %1.</source>
         <translation>公钥未在 %1 上发布。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -169,28 +379,36 @@ Error: %2</source>
 错误：%2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Key Server</source>
         <translation>密钥服务器</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
         <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">从受信任的密钥服务器导入公钥。</translation>
+        <translation>从受信任的密钥服务器导入公钥。</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
         <source>Key Server Operations</source>
-        <translation type="vanished">密钥服务器操作</translation>
+        <translation>密钥服务器操作</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
         <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">将公钥发布到密钥服务器</translation>
+        <translation>将公钥发布到密钥服务器</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
         <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">从密钥服务器更新公钥</translation>
+        <translation>从密钥服务器更新公钥</translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
         <source>The server could not be reached.</source>
         <translation>无法连接到服务器。</translation>
     </message>
@@ -200,12 +418,12 @@ Error: %2</source>
         <translation>服务器已响应，但并非密钥服务器：它既不支持 HKP 协议，也不支持 VKS 接口。</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
         <source>Failed:</source>
         <translation>失败：</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
         <source>The key server does not have this key.</source>
         <translation>密钥服务器没有此密钥。</translation>
     </message>
@@ -215,192 +433,12 @@ Error: %2</source>
         <translation>已从密钥服务器获取 %2 个密钥中的 %1 个。</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>已将 %2 个密钥中的 %1 个发布到密钥服务器 %3。</translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
-        <translation>密钥服务器列表</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
-        <translation>添加密钥服务器</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
-        <translation>操作</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
-        <translation>添加</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
-        <translation>设为默认</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
-        <translation>测试所选</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
-        <translation>删除所选</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
-        <translation>https://keys.example.org</translation>
-    </message>
-    <message>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
-        <translation type="vanished">新密钥服务器在添加前会通过 HKP 和 VKS 接口进行测试。搜索使用 HKP；发布和刷新使用 VKS。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
-        <translation>新密钥服务器在添加前会通过 HKP 和 VKS 接口进行测试。搜索使用 HKP。发布和刷新始终使用默认服务器：如果默认服务器支持 VKS 则通过 VKS，否则通过 HKP。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
-        <translation>默认</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
-        <translation>地址</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
-        <translation>HKP</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
-        <translation>VKS</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
-        <translation>状态</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
-        <translation>上次测试</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
-        <translation>已验证</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
-        <translation>未验证</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
-        <translation>从未</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
-        <translation>无效地址</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
-        <translation>&quot;%1&quot; 不是有效的密钥服务器地址。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
-        <translation>已列出</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
-        <translation>%1 已在密钥服务器列表中。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
-        <translation>不安全的密钥服务器地址</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
-        <translation>%1 使用明文 HTTP，网络上的任何人都可以查看或篡改您查询或发布的内容。仍然添加吗？</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
-        <translation>无验证发布</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
-
-Use %1 as the default anyway?</source>
-        <translation>%1 不支持 VKS 接口，因此发布和刷新将改用 HKP。
-
-通过 HKP，服务器不会确认您的电子邮件地址，且上传的密钥无法再次删除。
-
-仍然将 %1 设为默认服务器吗？</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
-        <translation>密钥服务器未验证</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
-        <translation>%1 未以密钥服务器身份响应。
-
-%2
-
-该服务器已添加并标记为未验证；请使用“测试所选”重试。</translation>
-    </message>
-</context>
-<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.cpp" line="110"/>
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 f003548..aa43696 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
@@ -2,21 +2,201 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="zh_TW">
 <context>
-    <name>GTrC</name>
+    <name>KeyServerSettingsPage</name>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="17"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
+        <source>Key Server List</source>
+        <translation>金鑰伺服器清單</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="49"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
+        <source>Add a Key Server</source>
+        <translation>新增金鑰伺服器</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="82"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
+        <source>Operations</source>
+        <translation>操作</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="60"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
+        <source>Add</source>
+        <translation>新增</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="88"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
+        <source>Set As Default</source>
+        <translation>設為預設</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="95"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
+        <source>Test Selected</source>
+        <translation>測試選取項目</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.ui" line="102"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
+        <source>Delete Selected</source>
+        <translation>刪除選取項目</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
+        <source>https://keys.example.org</source>
+        <translation>https://keys.example.org</translation>
+    </message>
+    <message>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
+        <translation type="vanished">新增金鑰伺服器前，會先測試其 HKP 與 VKS 介面。搜尋使用 HKP；發布與重新整理使用 VKS。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
+        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
+        <translation>新增金鑰伺服器前，會先測試其 HKP 與 VKS 介面。搜尋使用 HKP。發布與重新整理一律使用預設伺服器：若支援 VKS 則使用 VKS，否則使用 HKP。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Default</source>
+        <translation>預設</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Address</source>
+        <translation>位址</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>HKP</source>
+        <translation>HKP</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>VKS</source>
+        <translation>VKS</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
+        <source>Status</source>
+        <translation>狀態</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
+        <source>Last Tested</source>
+        <translation>上次測試</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
+        <source>yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
+        <source>no</source>
+        <translation>否</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Verified</source>
+        <translation>已驗證</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
+        <source>Unverified</source>
+        <translation>未驗證</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
+        <source>never</source>
+        <translation>從未</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
+        <source>Invalid Address</source>
+        <translation>無效位址</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
+        <source>&quot;%1&quot; is not a valid key server address.</source>
+        <translation>「%1」不是有效的金鑰伺服器位址。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
+        <source>Already Listed</source>
+        <translation>已列出</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
+        <source>%1 is already in the key server list.</source>
+        <translation>%1 已存在於金鑰伺服器列表中。</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
+        <source>Insecure Key Server Address</source>
+        <translation>不安全的金鑰伺服器位址</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
+        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
+        <translation>%1 使用純 HTTP，因此網路上的任何人都可以查看或變更您查詢或發布的內容。仍要新增嗎？</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
+        <source>No Verified Publishing</source>
+        <translation>無驗證發布</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
+        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
+
+Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
+
+Use %1 as the default anyway?</source>
+        <translation>%1 不支援 VKS 介面，因此發布與重新整理將改用 HKP。
+
+透過 HKP，伺服器不會確認您的電子郵件地址，且上傳的金鑰無法再次移除。
+
+是否仍要將 %1 設為預設？</translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
+        <source>Key Server Not Verified</source>
+        <translation>金鑰伺服器未驗證</translation>
+    </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="431"/>
+        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
+        <source>%1 did not answer as a key server.
+
+%2
+
+It has been added and marked unverified; use Test Selected to try again.</source>
+        <translation>%1 未以金鑰伺服器身分回應。
+
+%2
+
+它已新增並標記為未驗證；請使用「測試選取項目」再試一次。</translation>
+    </message>
+</context>
+<context>
+    <name>ModuleKeyServerSync</name>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="416"/>
         <source>The following email addresses have status:
 </source>
         <translation>以下電子郵件地址的狀態為：</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="441"/>
+        <location filename="../KeyServerSyncModule.cpp" line="425"/>
         <source>Could not parse status information.</source>
         <translation>無法解析狀態資訊。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="409"/>
-        <location filename="../KeyServerSyncModule.cpp" line="452"/>
+        <location filename="../KeyServerSyncModule.cpp" line="396"/>
+        <location filename="../KeyServerSyncModule.cpp" line="433"/>
         <source>Public Key Upload Successful</source>
         <translation>公鑰上傳成功</translation>
     </message>
@@ -37,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="372"/>
-        <location filename="../KeyServerSyncModule.cpp" line="397"/>
-        <location filename="../KeyServerSyncModule.cpp" line="468"/>
+        <location filename="../KeyServerSyncModule.cpp" line="365"/>
+        <location filename="../KeyServerSyncModule.cpp" line="387"/>
+        <location filename="../KeyServerSyncModule.cpp" line="446"/>
         <source>Key Upload Failed</source>
         <translation>金鑰上傳失敗</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="373"/>
+        <location filename="../KeyServerSyncModule.cpp" line="366"/>
         <source>Failed to export the public key before uploading.
 Key: %1</source>
         <translation>上傳前匯出公鑰失敗。
 金鑰：%1</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="453"/>
+        <location filename="../KeyServerSyncModule.cpp" line="434"/>
         <source>The public key was successfully uploaded to the key server %4.
 Fingerprint: %1
 
@@ -64,8 +244,8 @@ Please check your email (%3) for further verification from %4.</source>
 請檢查您的電子郵件（%3）以接收 %4 的進一步驗證通知。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="398"/>
-        <location filename="../KeyServerSyncModule.cpp" line="469"/>
+        <location filename="../KeyServerSyncModule.cpp" line="388"/>
+        <location filename="../KeyServerSyncModule.cpp" line="447"/>
         <source>Failed to upload public key to the server.
 Fingerprint: %1
 Error: %2</source>
@@ -83,7 +263,7 @@ Error: %2</source>
         <translation>不經驗證即發布？</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="157"/>
+        <location filename="../KeyServerSyncModule.cpp" line="156"/>
         <source>%1 does not support verified publishing (VKS), so the key would be uploaded over HKP instead.
 
 The server will not confirm your email address, and the upload cannot be undone: HKP key servers do not allow keys to be removed.
@@ -96,39 +276,49 @@ Publish to %1 anyway?</source>
 仍要發布至 %1 嗎？</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="232"/>
+        <location filename="../KeyServerSyncModule.cpp" line="230"/>
         <source>%1: the public key could not be exported</source>
         <translation>%1：無法匯出公鑰</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="282"/>
+        <location filename="../KeyServerSyncModule.cpp" line="278"/>
         <source>Key Refresh Finished</source>
         <translation>金鑰重新整理完成</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="287"/>
+        <location filename="../KeyServerSyncModule.cpp" line="282"/>
         <source>Key Publishing Finished</source>
         <translation>金鑰發布完成</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="309"/>
+        <location filename="../KeyServerSyncModule.cpp" line="304"/>
         <source>A key server operation is already running. Try again when it has finished.</source>
         <translation>已有金鑰伺服器操作正在執行。請等它完成後再試一次。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="411"/>
+        <location filename="../KeyServerSyncModule.cpp" line="349"/>
+        <source>Key Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="350"/>
+        <source>keyserver,key server,hkp,vks,publish,search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="397"/>
         <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="501"/>
+        <location filename="../KeyServerSyncModule.cpp" line="476"/>
         <source>Key Update Failed</source>
         <translation>金鑰更新失敗</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="502"/>
+        <location filename="../KeyServerSyncModule.cpp" line="477"/>
         <source>Failed to retrieve public key from %3.
 Key ID: %1
 Error: %2</source>
@@ -137,22 +327,42 @@ Error: %2</source>
 錯誤：%2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="640"/>
+        <location filename="../KeyServerSyncModule.cpp" line="520"/>
+        <source>Upload the public key to the key server used for syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="532"/>
+        <source>Import the latest copy of the public key from the key server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="544"/>
+        <source>Check Publication Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="545"/>
+        <source>Ask the key server whether it has this public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../KeyServerSyncModule.cpp" line="614"/>
         <source>Publication Status</source>
         <translation>發布狀態</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="645"/>
+        <location filename="../KeyServerSyncModule.cpp" line="619"/>
         <source>The public key has been published on %1.</source>
         <translation>公鑰已發布於 %1。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="652"/>
+        <location filename="../KeyServerSyncModule.cpp" line="624"/>
         <source>The public key is not published on %1.</source>
         <translation>公鑰未發布於 %1。</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="658"/>
+        <location filename="../KeyServerSyncModule.cpp" line="628"/>
         <source>Could not ask %1 about this key.
 
 %2</source>
@@ -169,28 +379,36 @@ Error: %2</source>
 錯誤：%2</translation>
     </message>
     <message>
-        <location filename="../KeyServerSyncModule.cpp" line="308"/>
+        <location filename="../KeyServerSyncModule.cpp" line="303"/>
+        <location filename="../KeyServerSyncModule.cpp" line="334"/>
+        <location filename="../KeyServerSyncModule.cpp" line="556"/>
         <source>Key Server</source>
         <translation>金鑰伺服器</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="557"/>
         <source>Import public keys from a trusted key server.</source>
-        <translation type="vanished">從受信任的金鑰伺服器匯入公鑰。</translation>
+        <translation>從受信任的金鑰伺服器匯入公鑰。</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="521"/>
+        <location filename="../KeyServerSyncModule.cpp" line="534"/>
+        <location filename="../KeyServerSyncModule.cpp" line="546"/>
         <source>Key Server Operations</source>
-        <translation type="vanished">金鑰伺服器操作</translation>
+        <translation>金鑰伺服器操作</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="519"/>
         <source>Publish Public Key to Key Server</source>
-        <translation type="vanished">將公鑰發佈至金鑰伺服器</translation>
+        <translation>將公鑰發佈至金鑰伺服器</translation>
     </message>
     <message>
+        <location filename="../KeyServerSyncModule.cpp" line="531"/>
         <source>Refresh Public Key From Key Server</source>
-        <translation type="vanished">從金鑰伺服器更新公鑰</translation>
+        <translation>從金鑰伺服器更新公鑰</translation>
     </message>
     <message>
-        <location filename="../KeyServerProbe.cpp" line="245"/>
+        <location filename="../KeyServerProbe.cpp" line="246"/>
         <source>The server could not be reached.</source>
         <translation>無法連線至伺服器。</translation>
     </message>
@@ -200,12 +418,12 @@ Error: %2</source>
         <translation>伺服器已回應，但並非金鑰伺服器：既不支援 HKP 也不支援 VKS 介面。</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="42"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="44"/>
         <source>Failed:</source>
         <translation>失敗：</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="77"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="79"/>
         <source>The key server does not have this key.</source>
         <translation>金鑰伺服器沒有此金鑰。</translation>
     </message>
@@ -215,192 +433,12 @@ Error: %2</source>
         <translation>已從金鑰伺服器取得 %2 個金鑰中的 %1 個。</translation>
     </message>
     <message>
-        <location filename="../KeyServerBatchLogic.cpp" line="99"/>
+        <location filename="../KeyServerBatchLogic.cpp" line="97"/>
         <source>%1 of %2 keys were published to the key server %3.</source>
         <translation>已將 %2 個金鑰中的 %1 個發布至金鑰伺服器 %3。</translation>
     </message>
 </context>
 <context>
-    <name>KeyServerSettingsPage</name>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="17"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="57"/>
-        <source>Key Server List</source>
-        <translation>金鑰伺服器清單</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="49"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="58"/>
-        <source>Add a Key Server</source>
-        <translation>新增金鑰伺服器</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="82"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="59"/>
-        <source>Operations</source>
-        <translation>操作</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="60"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="61"/>
-        <source>Add</source>
-        <translation>新增</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="88"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="62"/>
-        <source>Set As Default</source>
-        <translation>設為預設</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="95"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="63"/>
-        <source>Test Selected</source>
-        <translation>測試選取項目</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.ui" line="102"/>
-        <location filename="../KeyServerSettingsPage.cpp" line="64"/>
-        <source>Delete Selected</source>
-        <translation>刪除選取項目</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="66"/>
-        <source>https://keys.example.org</source>
-        <translation>https://keys.example.org</translation>
-    </message>
-    <message>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP; publishing and refreshing use VKS.</source>
-        <translation type="vanished">新增金鑰伺服器前，會先測試其 HKP 與 VKS 介面。搜尋使用 HKP；發布與重新整理使用 VKS。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="67"/>
-        <source>A new key server is tested against the HKP and VKS interfaces before it is added. Searching uses HKP. Publishing and refreshing always use the default server: over VKS where it offers it, over HKP otherwise.</source>
-        <translation>新增金鑰伺服器前，會先測試其 HKP 與 VKS 介面。搜尋使用 HKP。發布與重新整理一律使用預設伺服器：若支援 VKS 則使用 VKS，否則使用 HKP。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Default</source>
-        <translation>預設</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Address</source>
-        <translation>位址</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>HKP</source>
-        <translation>HKP</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>VKS</source>
-        <translation>VKS</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="74"/>
-        <source>Status</source>
-        <translation>狀態</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="75"/>
-        <source>Last Tested</source>
-        <translation>上次測試</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="108"/>
-        <source>yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="109"/>
-        <source>no</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Verified</source>
-        <translation>已驗證</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="127"/>
-        <source>Unverified</source>
-        <translation>未驗證</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="136"/>
-        <source>never</source>
-        <translation>從未</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="162"/>
-        <source>Invalid Address</source>
-        <translation>無效位址</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="163"/>
-        <source>&quot;%1&quot; is not a valid key server address.</source>
-        <translation>「%1」不是有效的金鑰伺服器位址。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="173"/>
-        <source>Already Listed</source>
-        <translation>已列出</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="174"/>
-        <source>%1 is already in the key server list.</source>
-        <translation>%1 已存在於金鑰伺服器列表中。</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="180"/>
-        <source>Insecure Key Server Address</source>
-        <translation>不安全的金鑰伺服器位址</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="181"/>
-        <source>%1 uses plain HTTP, so anyone on the network can see and change what you look up or publish. Add it anyway?</source>
-        <translation>%1 使用純 HTTP，因此網路上的任何人都可以查看或變更您查詢或發布的內容。仍要新增嗎？</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="229"/>
-        <source>No Verified Publishing</source>
-        <translation>無驗證發布</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="230"/>
-        <source>%1 does not support the VKS interface, so publishing and refreshing will use HKP instead.
-
-Over HKP the server does not confirm your email address, and an uploaded key cannot be removed again.
-
-Use %1 as the default anyway?</source>
-        <translation>%1 不支援 VKS 介面，因此發布與重新整理將改用 HKP。
-
-透過 HKP，伺服器不會確認您的電子郵件地址，且上傳的金鑰無法再次移除。
-
-是否仍要將 %1 設為預設？</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="291"/>
-        <source>Key Server Not Verified</source>
-        <translation>金鑰伺服器未驗證</translation>
-    </message>
-    <message>
-        <location filename="../KeyServerSettingsPage.cpp" line="292"/>
-        <source>%1 did not answer as a key server.
-
-%2
-
-It has been added and marked unverified; use Test Selected to try again.</source>
-        <translation>%1 未以金鑰伺服器身分回應。
-
-%2
-
-它已新增並標記為未驗證；請使用「測試選取項目」再試一次。</translation>
-    </message>
-</context>
-<context>
     <name>SearchKeyDialog</name>
     <message>
         <location filename="../SearchKeyDialog.cpp" line="110"/>