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

1 files changed, 205 insertions, 151 deletions

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>