aboutsummaryrefslogtreecommitdiffstats
path: root/src/m_key_server_sync/ts
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2026-10-23 13:00:19 +0200
committersaturneric <[email protected]>2026-10-23 13:00:19 +0200
commit6a0f7a39db504eb96eca3ee27db47f65f097204c (patch)
tree94f6d330ed8ebea2161b10546df99b32b75e2c58 /src/m_key_server_sync/ts
parentfix(key_server_sync): stop batches when key databases are reloaded (diff)
downloadmodules-6a0f7a39db504eb96eca3ee27db47f65f097204c.tar.gz
modules-6a0f7a39db504eb96eca3ee27db47f65f097204c.zip
i18n(key-server-sync): update synchronization translations
- add messages for stopped publishing and refresh operations - add errors for unavailable key databases during imports - add batch-operation interruption feedback across locales - update source locations after key server code changes
Diffstat (limited to 'src/m_key_server_sync/ts')
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts99
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.tr_TR.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts100
-rw-r--r--src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts100
10 files changed, 639 insertions, 360 deletions
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 285c050..8127473 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.de_DE.ts
@@ -184,19 +184,19 @@ Es wurde hinzugefügt und als unverifiziert markiert; verwenden Sie &quot;Ausgew
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>Die folgenden E-Mail-Adressen haben folgenden Status:</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>Statusinformationen konnten nicht analysiert werden.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>Öffentlicher Schlüssel erfolgreich hochgeladen</translation>
</message>
@@ -217,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="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>Hochladen des Schlüssels fehlgeschlagen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>Der öffentliche Schlüssel konnte vor dem Hochladen nicht exportiert werden.
Schlüssel: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -244,8 +244,8 @@ Fingerabdruck: %1
Bitte prüfen Sie Ihre E-Mail (%3) auf weitere Bestätigungen von %4.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -276,49 +276,72 @@ 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="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<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"/>
+ <source>Key Refresh Stopped</source>
+ <translation>Schlüsselaktualisierung gestoppt</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>Schlüsselveröffentlichung gestoppt</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>die abgerufenen Schlüssel konnten nicht importiert werden: die Schlüsseldatenbank ist nicht mehr verfügbar</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>Schlüsselaktualisierung abgeschlossen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>Schlüsselveröffentlichung abgeschlossen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>Es läuft bereits ein Schlüsselserver-Vorgang. Versuchen Sie es erneut, wenn er abgeschlossen ist.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>Schlüsselserver</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,Schlüsselserver,veröffentlichen,suchen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>Der öffentliche Schlüssel wurde über HKP auf den Schlüsselserver %2 hochgeladen.
Fingerabdruck: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>Schlüsselaktualisierung fehlgeschlagen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>Der öffentliche Schlüssel wurde abgerufen, konnte aber nicht importiert werden, da seine Schlüsseldatenbank nicht mehr verfügbar ist.
+Schlüssel-ID: %1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -327,42 +350,42 @@ Schlüssel-ID: %1
Fehler: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>Den öffentlichen Schlüssel auf den für die Synchronisierung verwendeten Schlüsselserver hochladen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>Die neueste Kopie des öffentlichen Schlüssels vom Schlüsselserver importieren</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>Veröffentlichungsstatus prüfen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>Den Schlüsselserver fragen, ob er diesen öffentlichen Schlüssel hat</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>Veröffentlichungsstatus</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>Der öffentliche Schlüssel wurde auf %1 veröffentlicht.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>Der öffentliche Schlüssel ist nicht auf %1 veröffentlicht.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -379,31 +402,31 @@ Schlüssel-ID: %1
Fehler: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>Schlüsselserver</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>Öffentliche Schlüssel von einem vertrauenswürdigen Schlüsselserver importieren.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>Schlüsselserver-Vorgänge</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>Öffentlichen Schlüssel auf Schlüsselserver veröffentlichen</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>Öffentlichen Schlüssel vom Schlüsselserver aktualisieren</translation>
</message>
@@ -437,6 +460,11 @@ Fehler: %2</translation>
<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>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>Die Schlüsseldatenbanken wurden während dieses Vorgangs geändert, daher wurde er nach %1 von %2 Schlüsseln gestoppt. Es wurde nichts Abgerufenes importiert. Bitte starten Sie ihn erneut.</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
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 de2dfb5..3c256d9 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.en_US.ts
@@ -172,19 +172,19 @@ It has been added and marked unverified; use Test Selected to try again.</source
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation type="unfinished"></translation>
</message>
@@ -203,56 +203,71 @@ Publish to %1 anyway?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<source>%1: the public key could not be exported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../KeyServerSyncModule.cpp" line="282"/>
+ <source>Key Refresh Stopped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -261,93 +276,100 @@ Please check your email (%3) for further verification from %4.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation type="unfinished"></translation>
</message>
@@ -381,6 +403,11 @@ Error: %2</source>
<source>%1 of %2 keys were published to the key server %3.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
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 8d8b05d..11b7856 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.es_ES.ts
@@ -184,19 +184,19 @@ Se ha agregado y se ha marcado como no verificado; use Probar seleccionado para
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>Las siguientes direcciones de correo electrónico tienen el estado:</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<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="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>Carga de clave pública exitosa</translation>
</message>
@@ -217,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="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>Carga de clave fallida</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>No se pudo exportar la clave pública antes de cargarla.
Clave: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -244,8 +244,8 @@ 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="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -276,49 +276,72 @@ 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="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<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"/>
+ <source>Key Refresh Stopped</source>
+ <translation>Actualización de claves detenida</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>Publicación de claves detenida</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>no se pudieron importar las claves obtenidas: la base de datos de claves ya no está disponible</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>Actualización de claves completada</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>Publicación de claves completada</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>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="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>Servidores de claves</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,servidor de claves,publicar,buscar</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>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="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>Actualización de clave fallida</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>La clave pública se obtuvo, pero no se pudo importar porque su base de datos de claves ya no está disponible.
+ID de clave: %1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -327,42 +350,42 @@ ID de clave: %1
Error: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>Subir la clave pública al servidor de claves usado para la sincronización</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>Importar la copia más reciente de la clave pública desde el servidor de claves</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>Comprobar estado de publicación</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>Preguntar al servidor de claves si tiene esta clave pública</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>Estado de publicación</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>La clave pública se ha publicado en %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>La clave pública no está publicada en %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -379,31 +402,31 @@ ID de clave: %1
Error: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>Servidor de claves</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>Importar claves públicas desde un servidor de claves de confianza.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>Operaciones del servidor de claves</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>Publicar clave pública en el servidor de claves</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>Actualizar clave pública desde el servidor de claves</translation>
</message>
@@ -437,6 +460,11 @@ Error: %2</translation>
<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>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>Las bases de datos de claves cambiaron mientras se ejecutaba, por lo que se detuvo tras %1 de %2 claves. No se importó nada de lo obtenido. Inícielo de nuevo.</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
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 0b82ef1..cef863d 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.fr_FR.ts
@@ -184,19 +184,19 @@ Il a été ajouté et marqué comme non vérifié ; utilisez Test sélectionné
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>Les adresses e-mail suivantes ont le statut suivant :</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>Impossible d&apos;analyser les informations de statut.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>Téléversement de la clé publique réussi</translation>
</message>
@@ -217,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="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>Échec du téléversement de la clé</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>Échec de l&apos;exportation de la clé publique avant le téléversement.
Clé : %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -244,8 +244,8 @@ 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="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -276,49 +276,72 @@ 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="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<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"/>
+ <source>Key Refresh Stopped</source>
+ <translation>Actualisation des clés arrêtée</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>Publication des clés arrêtée</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>les clés récupérées n&apos;ont pas pu être importées : la base de données de clés n&apos;est plus disponible</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>Actualisation des clés terminée.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>Publication des clés terminée.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>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="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>Serveurs de clés</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,serveur de clés,publier,rechercher</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>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="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>Échec de la mise à jour de la clé</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>La clé publique a été récupérée mais n&apos;a pas pu être importée, car sa base de données de clés n&apos;est plus disponible.
+Identifiant de clé : %1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -327,42 +350,42 @@ Identifiant de clé : %1
Erreur : %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>Téléverser la clé publique vers le serveur de clés utilisé pour la synchronisation</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>Importer la copie la plus récente de la clé publique depuis le serveur de clés</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>Vérifier l’état de publication</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>Demander au serveur de clés s’il possède cette clé publique</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>Statut de publication</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>La clé publique a été publiée sur %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>La clé publique n&apos;est pas publiée sur %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -379,31 +402,31 @@ Identifiant de clé : %1
Erreur : %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>Serveur de clés</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>Importer des clés publiques depuis un serveur de clés de confiance.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>Opérations du serveur de clés</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>Publier la clé publique sur le serveur de clés</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>Actualiser la clé publique depuis le serveur de clés</translation>
</message>
@@ -437,6 +460,11 @@ Erreur : %2</translation>
<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>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>Les bases de données de clés ont été modifiées pendant l&apos;exécution ; l&apos;opération a donc été arrêtée après %1 clés sur %2. Aucune clé récupérée n&apos;a été importée. Veuillez la relancer.</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
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 6aafacd..2b77228 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.it_IT.ts
@@ -184,19 +184,19 @@ It has been added and marked unverified; use Test Selected to try again.</source
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>I seguenti indirizzi email hanno lo stato:</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>Impossibile analizzare le informazioni sullo stato.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>Caricamento della chiave pubblica riuscito</translation>
</message>
@@ -217,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="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>Caricamento della chiave pubblica fallito</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>Impossibile esportare la chiave pubblica prima del caricamento.
Chiave: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -244,8 +244,8 @@ Impronta digitale: %1
Controlla la tua email (%3) per ulteriori verifiche da %4.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -276,49 +276,72 @@ 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="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<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"/>
+ <source>Key Refresh Stopped</source>
+ <translation>Aggiornamento delle chiavi interrotto</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>Pubblicazione delle chiavi interrotta</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>impossibile importare le chiavi recuperate: il database delle chiavi non è più disponibile</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>Aggiornamento delle chiavi completato</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>Pubblicazione delle chiavi completata</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>Un&apos;operazione sul server delle chiavi è già in esecuzione. Riprova quando è terminata.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>Server delle chiavi</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,server delle chiavi,pubblica,cerca</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>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="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>Aggiornamento della chiave fallito</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>La chiave pubblica è stata recuperata ma non è stato possibile importarla, perché il suo database delle chiavi non è più disponibile.
+ID chiave: %1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -327,42 +350,42 @@ ID chiave: %1
Errore: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>Carica la chiave pubblica sul server delle chiavi usato per la sincronizzazione</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>Importa la copia più recente della chiave pubblica dal server delle chiavi</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>Verifica stato di pubblicazione</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>Chiedi al server delle chiavi se ha questa chiave pubblica</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>Stato della pubblicazione</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>La chiave pubblica è stata pubblicata su %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>La chiave pubblica non è pubblicata su %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -379,31 +402,31 @@ ID chiave: %1
Errore: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>Server delle chiavi</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>Importa chiavi pubbliche da un server delle chiavi attendibile.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>Operazioni del server delle chiavi</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>Pubblica chiave pubblica sul server delle chiavi</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>Aggiorna chiave pubblica dal server delle chiavi</translation>
</message>
@@ -437,6 +460,11 @@ Errore: %2</translation>
<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>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>I database delle chiavi sono stati modificati durante l&apos;esecuzione, quindi l&apos;operazione è stata interrotta dopo %1 chiavi su %2. Nessuna chiave recuperata è stata importata. Avviala di nuovo.</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
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 4269d2d..c70f782 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.pl_PL.ts
@@ -212,52 +212,67 @@ Serwer nie potwierdzi twojego adresu e-mail, a wysyłania nie będzie można cof
Opublikować na %1 mimo to?</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<source>%1: the public key could not be exported</source>
<translation>%1: nie udało się wyeksportować klucza publicznego</translation>
</message>
<message>
<location filename="../KeyServerSyncModule.cpp" line="282"/>
+ <source>Key Refresh Stopped</source>
+ <translation>Odświeżanie kluczy zatrzymane</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>Publikowanie kluczy zatrzymane</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>nie udało się zaimportować pobranych kluczy: baza kluczy nie jest już dostępna</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>Odświeżanie kluczy zakończone</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>Publikowanie kluczy zakończone</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>Operacja serwera kluczy już trwa. Spróbuj ponownie po jej zakończeniu.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>Serwery kluczy</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,serwer kluczy,publikuj,szukaj</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>Nie udało się wysłać klucza</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>Nie udało się wyeksportować klucza publicznego przed wysłaniem.
Klucz: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -266,32 +281,32 @@ Odcisk klucza: %1
Błąd: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>Wysłano klucz publiczny</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>Klucz publiczny został wysłany na serwer kluczy %2 przez HKP.
Odcisk klucza: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<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="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>Nie udało się przetworzyć informacji o statusie.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -304,12 +319,20 @@ Odcisk klucza: %1
Sprawdź swoją pocztę e-mail (%3), aby kontynuować weryfikację od %4.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>Nie udało się zaktualizować klucza</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>Klucz publiczny został pobrany, ale nie można go zaimportować, ponieważ jego baza kluczy nie jest już dostępna.
+Identyfikator klucza: %1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -318,42 +341,42 @@ Identyfikator klucza: %1
Błąd: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>Wyślij klucz publiczny na serwer kluczy używany do synchronizacji</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>Zaimportuj najnowszą kopię klucza publicznego z serwera kluczy</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>Sprawdź stan publikacji</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>Zapytaj serwer kluczy, czy ma ten klucz publiczny</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>Status publikacji</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>Klucz publiczny został opublikowany na %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>Klucz publiczny nie jest opublikowany na %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -362,31 +385,31 @@ Błąd: %2</translation>
%2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>Serwer kluczy</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>Importuj klucze publiczne z zaufanego serwera kluczy.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>Operacje na serwerze kluczy</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>Opublikuj klucz publiczny na serwerze kluczy</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>Odśwież klucz publiczny z serwera kluczy</translation>
</message>
@@ -410,6 +433,11 @@ Błąd: %2</translation>
<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>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>Bazy kluczy zostały zmienione w trakcie działania, więc operacja została zatrzymana po %1 z %2 kluczy. Nic z pobranych danych nie zostało zaimportowane. Uruchom ją ponownie.</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
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 696225e..61191e8 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.ru_RU.ts
@@ -180,19 +180,19 @@ It has been added and marked unverified; use Test Selected to try again.</source
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>Статус следующих адресов электронной почты:</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>Не удалось обработать информацию о статусе.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>Открытый ключ успешно загружен</translation>
</message>
@@ -213,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="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>Ошибка загрузки ключа</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -230,7 +230,8 @@ Error: %2</source>
Ошибка: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>Ошибка обновления ключа</translation>
</message>
@@ -265,51 +266,66 @@ Publish to %1 anyway?</source>
Опубликовать на %1 всё равно?</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<source>%1: the public key could not be exported</source>
<translation>%1: не удалось экспортировать открытый ключ</translation>
</message>
<message>
<location filename="../KeyServerSyncModule.cpp" line="282"/>
+ <source>Key Refresh Stopped</source>
+ <translation>Обновление ключей остановлено</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>Публикация ключей остановлена</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>не удалось импортировать полученные ключи: база данных ключей больше недоступна</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>Обновление ключей завершено</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>Публикация ключей завершена</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>Операция с сервером ключей уже выполняется. Повторите попытку после её завершения.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>Серверы ключей</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,сервер ключей,опубликовать,поиск</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>Не удалось экспортировать открытый ключ перед загрузкой.
Ключ: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<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="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -322,7 +338,14 @@ Please check your email (%3) for further verification from %4.</source>
Пожалуйста, проверьте вашу электронную почту (%3) на наличие дальнейшего подтверждения от %4.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>Открытый ключ был получен, но его не удалось импортировать, так как его база данных ключей больше недоступна.
+Идентификатор ключа: %1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -331,42 +354,42 @@ Error: %2</source>
Ошибка: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>Загрузить открытый ключ на сервер ключей, используемый для синхронизации</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>Импортировать последнюю копию открытого ключа с сервера ключей</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>Проверить статус публикации</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>Спросить сервер ключей, есть ли на нём этот открытый ключ</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>Статус публикации</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>Открытый ключ опубликован на %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>Открытый ключ не опубликован на %1.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -375,31 +398,31 @@ Error: %2</source>
%2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>Сервер ключей</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>Импортировать открытые ключи с доверенного сервера ключей.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>Операции с сервером ключей</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>Опубликовать открытый ключ на сервере ключей</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>Обновить открытый ключ с сервера ключей</translation>
</message>
@@ -433,6 +456,11 @@ Error: %2</source>
<source>%1 of %2 keys were published to the key server %3.</source>
<translation>На сервер ключей %3 опубликовано %1 из %2 ключей.</translation>
</message>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>Базы данных ключей были изменены во время выполнения, поэтому операция была остановлена после %1 из %2 ключей. Ничего из полученного не импортировано. Запустите её снова.</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.tr_TR.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.tr_TR.ts
index 19d8edd..ba35fb8 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.tr_TR.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.tr_TR.ts
@@ -200,6 +200,11 @@ Eklenip doğrulanmamış olarak işaretlendi. Yeniden denemek için Seçileni S�
<translation>%2 anahtardan %1 tanesi %3 anahtar sunucusuna yayımlandı.</translation>
</message>
<message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>Bu işlem çalışırken anahtar veritabanları değiştirildi; bu nedenle %2 anahtardan %1 tanesinden sonra durduruldu. Alınan hiçbir anahtar içe aktarılmadı. Lütfen yeniden başlatın.</translation>
+ </message>
+ <message>
<location filename="../KeyServerProbe.cpp" line="246"/>
<source>The server could not be reached.</source>
<translation>Sunucuya ulaşılamadı.</translation>
@@ -228,59 +233,74 @@ Sunucu e-posta adresinizi doğrulamayacak ve yükleme geri alınamayacak: HKP an
%1 sunucusuna yine de yayımlansın mı?</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<source>%1: the public key could not be exported</source>
<translation>%1: açık anahtar dışa aktarılamadı</translation>
</message>
<message>
<location filename="../KeyServerSyncModule.cpp" line="282"/>
+ <source>Key Refresh Stopped</source>
+ <translation>Anahtar Yenileme Durduruldu</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>Anahtar Yayımlama Durduruldu</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>alınan anahtarlar içe aktarılamadı: anahtar veritabanı artık kullanılamıyor</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>Anahtar Yenileme Tamamlandı</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>Anahtar Yayımlama Tamamlandı</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>Anahtar Sunucusu</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>Bir anahtar sunucusu işlemi zaten çalışıyor. Bittiğinde yeniden deneyin.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>Anahtar Sunucuları</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>anahtar sunucusu,anahtar sunucuları,hkp,vks,yayımlama,arama,keyserver,key server,hkp,vks,publish,search</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>Anahtar Yükleme Başarısız</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>Yüklemeden önce açık anahtar dışa aktarılamadı.
Anahtar: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -289,32 +309,32 @@ Parmak izi: %1
Hata: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>Açık Anahtar Yüklendi</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>Açık anahtar, HKP üzerinden %2 anahtar sunucusuna yüklendi.
Parmak izi: %1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>Şu e-posta adreslerinin durumu:
</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>Durum bilgisi ayrıştırılamadı.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -327,12 +347,20 @@ Parmak izi: %1
Ek doğrulama için %4 tarafından gönderilen iletiyi e-postanızda (%3) kontrol edin.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>Anahtar Güncelleme Başarısız</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>Ortak anahtar alındı ancak anahtar veritabanı artık kullanılamadığı için içe aktarılamadı.
+Anahtar Kimliği: %1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -341,64 +369,64 @@ Anahtar kimliği: %1
Hata: %2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>Açık Anahtarı Anahtar Sunucusuna Yayımla</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>Açık anahtarı eşitleme için kullanılan anahtar sunucusuna yükleyin</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>Anahtar Sunucusu İşlemleri</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>Açık Anahtarı Anahtar Sunucusundan Yenile</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>Açık anahtarın en son kopyasını anahtar sunucusundan içe aktarın</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>Yayımlama Durumunu Kontrol Et</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>Anahtar sunucusuna bu açık anahtarın onda olup olmadığını sorun</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>Güvenilir bir anahtar sunucusundan açık anahtarları içe aktarın.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>Yayımlama Durumu</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>Açık anahtar %1 üzerinde yayımlandı.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>Açık anahtar %1 üzerinde yayımlanmamış.</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
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 bd6a50c..f20128e 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_CN.ts
@@ -184,19 +184,19 @@ It has been added and marked unverified; use Test Selected to try again.</source
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>以下电子邮件地址的状态为：</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>无法解析状态信息。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>公钥上传成功</translation>
</message>
@@ -217,21 +217,21 @@ Note: For verification, you can find more information here: https://keys.openpgp
注意：如需了解验证详情，请访问：https://keys.openpgp.org/about</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>密钥上传失败</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>上传前导出公钥失败。
密钥：%1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -244,8 +244,8 @@ Please check your email (%3) for further verification from %4.</source>
请检查您的电子邮件（%3）以获取 %4 的进一步验证信息。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -276,49 +276,72 @@ Publish to %1 anyway?</source>
仍然发布到 %1？</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<source>%1: the public key could not be exported</source>
<translation>%1：无法导出公钥</translation>
</message>
<message>
<location filename="../KeyServerSyncModule.cpp" line="282"/>
+ <source>Key Refresh Stopped</source>
+ <translation>密钥刷新已停止</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>密钥发布已停止</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>无法导入已获取的密钥：密钥数据库已不可用</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>密钥刷新完成</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>密钥发布完成</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>已有密钥服务器操作正在运行，请待其完成后重试。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>密钥服务器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,密钥服务器,发布,搜索</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>公钥已通过 HKP 上传至密钥服务器 %2。
指纹：%1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>密钥更新失败</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>已获取公钥，但无法导入，因为其密钥数据库已不可用。
+密钥 ID：%1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -327,42 +350,42 @@ Error: %2</source>
错误：%2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>将公钥上传到用于同步的密钥服务器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>从密钥服务器导入该公钥的最新副本</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>检查发布状态</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>询问密钥服务器是否存有此公钥</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>发布状态</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>公钥已在 %1 上发布。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>公钥未在 %1 上发布。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -379,31 +402,31 @@ Error: %2</source>
错误：%2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>密钥服务器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>从受信任的密钥服务器导入公钥。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>密钥服务器操作</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>将公钥发布到密钥服务器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>从密钥服务器更新公钥</translation>
</message>
@@ -437,6 +460,11 @@ Error: %2</source>
<source>%1 of %2 keys were published to the key server %3.</source>
<translation>已将 %2 个密钥中的 %1 个发布到密钥服务器 %3。</translation>
</message>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>运行期间密钥数据库发生了更改，因此在处理 %2 个密钥中的 %1 个后停止。已获取的内容均未导入。请重新启动。</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
diff --git a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
index 6986e6b..f2fb55c 100644
--- a/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
+++ b/src/m_key_server_sync/ts/ModuleKeyServerSync.zh_TW.ts
@@ -184,19 +184,19 @@ It has been added and marked unverified; use Test Selected to try again.</source
<context>
<name>ModuleKeyServerSync</name>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="420"/>
+ <location filename="../KeyServerSyncModule.cpp" line="443"/>
<source>The following email addresses have status:
</source>
<translation>以下電子郵件地址的狀態為：</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="429"/>
+ <location filename="../KeyServerSyncModule.cpp" line="452"/>
<source>Could not parse status information.</source>
<translation>無法解析狀態資訊。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="400"/>
- <location filename="../KeyServerSyncModule.cpp" line="437"/>
+ <location filename="../KeyServerSyncModule.cpp" line="423"/>
+ <location filename="../KeyServerSyncModule.cpp" line="460"/>
<source>Public Key Upload Successful</source>
<translation>公鑰上傳成功</translation>
</message>
@@ -217,21 +217,21 @@ Note: For verification, you can find more information here: https://keys.openpgp
注意：如需驗證相關資訊，請參閱此處：https://keys.openpgp.org/about</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="369"/>
- <location filename="../KeyServerSyncModule.cpp" line="391"/>
- <location filename="../KeyServerSyncModule.cpp" line="450"/>
+ <location filename="../KeyServerSyncModule.cpp" line="392"/>
+ <location filename="../KeyServerSyncModule.cpp" line="414"/>
+ <location filename="../KeyServerSyncModule.cpp" line="473"/>
<source>Key Upload Failed</source>
<translation>金鑰上傳失敗</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="370"/>
+ <location filename="../KeyServerSyncModule.cpp" line="393"/>
<source>Failed to export the public key before uploading.
Key: %1</source>
<translation>上傳前匯出公鑰失敗。
金鑰：%1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="438"/>
+ <location filename="../KeyServerSyncModule.cpp" line="461"/>
<source>The public key was successfully uploaded to the key server %4.
Fingerprint: %1
@@ -244,8 +244,8 @@ Please check your email (%3) for further verification from %4.</source>
請檢查您的電子郵件（%3）以接收 %4 的進一步驗證通知。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="392"/>
- <location filename="../KeyServerSyncModule.cpp" line="451"/>
+ <location filename="../KeyServerSyncModule.cpp" line="415"/>
+ <location filename="../KeyServerSyncModule.cpp" line="474"/>
<source>Failed to upload public key to the server.
Fingerprint: %1
Error: %2</source>
@@ -276,49 +276,72 @@ Publish to %1 anyway?</source>
仍要發布至 %1 嗎？</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="234"/>
+ <location filename="../KeyServerSyncModule.cpp" line="241"/>
<source>%1: the public key could not be exported</source>
<translation>%1：無法匯出公鑰</translation>
</message>
<message>
<location filename="../KeyServerSyncModule.cpp" line="282"/>
+ <source>Key Refresh Stopped</source>
+ <translation>金鑰重新整理已停止</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="283"/>
+ <source>Key Publishing Stopped</source>
+ <translation>金鑰發布已停止</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="297"/>
+ <source>the fetched keys could not be imported: the key database is no longer available</source>
+ <translation>無法匯入擷取到的金鑰：金鑰資料庫已無法使用</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="304"/>
<source>Key Refresh Finished</source>
<translation>金鑰重新整理完成</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="286"/>
+ <location filename="../KeyServerSyncModule.cpp" line="308"/>
<source>Key Publishing Finished</source>
<translation>金鑰發布完成</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="308"/>
+ <location filename="../KeyServerSyncModule.cpp" line="331"/>
<source>A key server operation is already running. Try again when it has finished.</source>
<translation>已有金鑰伺服器操作正在執行。請等它完成後再試一次。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="353"/>
+ <location filename="../KeyServerSyncModule.cpp" line="376"/>
<source>Key Servers</source>
<translation>金鑰伺服器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="354"/>
+ <location filename="../KeyServerSyncModule.cpp" line="377"/>
<source>keyserver,key server,hkp,vks,publish,search</source>
<translation>keyserver,key server,hkp,vks,publish,search,金鑰伺服器,發布,搜尋</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="401"/>
+ <location filename="../KeyServerSyncModule.cpp" line="424"/>
<source>The public key was uploaded to the key server %2 over HKP.
Fingerprint: %1</source>
<translation>公鑰已透過 HKP 上傳至金鑰伺服器 %2。
指紋：%1</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="480"/>
+ <location filename="../KeyServerSyncModule.cpp" line="501"/>
+ <location filename="../KeyServerSyncModule.cpp" line="512"/>
<source>Key Update Failed</source>
<translation>金鑰更新失敗</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="481"/>
+ <location filename="../KeyServerSyncModule.cpp" line="502"/>
+ <source>The public key was fetched but could not be imported, because its key database is no longer available.
+Key ID: %1</source>
+ <translation>已擷取公鑰，但無法匯入，因為其金鑰資料庫已無法使用。
+金鑰 ID：%1</translation>
+ </message>
+ <message>
+ <location filename="../KeyServerSyncModule.cpp" line="513"/>
<source>Failed to retrieve public key from %3.
Key ID: %1
Error: %2</source>
@@ -327,42 +350,42 @@ Error: %2</source>
錯誤：%2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="524"/>
+ <location filename="../KeyServerSyncModule.cpp" line="556"/>
<source>Upload the public key to the key server used for syncing</source>
<translation>將公鑰上傳到用於同步的金鑰伺服器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="536"/>
+ <location filename="../KeyServerSyncModule.cpp" line="568"/>
<source>Import the latest copy of the public key from the key server</source>
<translation>從金鑰伺服器匯入該公鑰的最新副本</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="548"/>
+ <location filename="../KeyServerSyncModule.cpp" line="580"/>
<source>Check Publication Status</source>
<translation>檢查發布狀態</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="549"/>
+ <location filename="../KeyServerSyncModule.cpp" line="581"/>
<source>Ask the key server whether it has this public key</source>
<translation>詢問金鑰伺服器是否存有此公鑰</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="618"/>
+ <location filename="../KeyServerSyncModule.cpp" line="650"/>
<source>Publication Status</source>
<translation>發布狀態</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="623"/>
+ <location filename="../KeyServerSyncModule.cpp" line="655"/>
<source>The public key has been published on %1.</source>
<translation>公鑰已發布於 %1。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="628"/>
+ <location filename="../KeyServerSyncModule.cpp" line="660"/>
<source>The public key is not published on %1.</source>
<translation>公鑰未發布於 %1。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="632"/>
+ <location filename="../KeyServerSyncModule.cpp" line="664"/>
<source>Could not ask %1 about this key.
%2</source>
@@ -379,31 +402,31 @@ Error: %2</source>
錯誤：%2</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="307"/>
- <location filename="../KeyServerSyncModule.cpp" line="338"/>
- <location filename="../KeyServerSyncModule.cpp" line="560"/>
+ <location filename="../KeyServerSyncModule.cpp" line="330"/>
+ <location filename="../KeyServerSyncModule.cpp" line="361"/>
+ <location filename="../KeyServerSyncModule.cpp" line="592"/>
<source>Key Server</source>
<translation>金鑰伺服器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="561"/>
+ <location filename="../KeyServerSyncModule.cpp" line="593"/>
<source>Import public keys from a trusted key server.</source>
<translation>從受信任的金鑰伺服器匯入公鑰。</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="525"/>
- <location filename="../KeyServerSyncModule.cpp" line="538"/>
- <location filename="../KeyServerSyncModule.cpp" line="550"/>
+ <location filename="../KeyServerSyncModule.cpp" line="557"/>
+ <location filename="../KeyServerSyncModule.cpp" line="570"/>
+ <location filename="../KeyServerSyncModule.cpp" line="582"/>
<source>Key Server Operations</source>
<translation>金鑰伺服器操作</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="523"/>
+ <location filename="../KeyServerSyncModule.cpp" line="555"/>
<source>Publish Public Key to Key Server</source>
<translation>將公鑰發佈至金鑰伺服器</translation>
</message>
<message>
- <location filename="../KeyServerSyncModule.cpp" line="535"/>
+ <location filename="../KeyServerSyncModule.cpp" line="567"/>
<source>Refresh Public Key From Key Server</source>
<translation>從金鑰伺服器更新公鑰</translation>
</message>
@@ -437,6 +460,11 @@ Error: %2</source>
<source>%1 of %2 keys were published to the key server %3.</source>
<translation>已將 %2 個金鑰中的 %1 個發布至金鑰伺服器 %3。</translation>
</message>
+ <message>
+ <location filename="../KeyServerBatchLogic.cpp" line="106"/>
+ <source>The key databases were changed while this was running, so it was stopped after %1 of %2 keys. Nothing fetched was imported. Please start it again.</source>
+ <translation>執行期間金鑰資料庫已變更，因此在處理 %2 把金鑰中的 %1 把後停止。未匯入任何擷取到的金鑰。請重新開始。</translation>
+ </message>
</context>
<context>
<name>SearchKeyDialog</name>
generated by cgit (git 2.51.2) at 2026-10-25 12:25:29 +0100