aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2025-02-03 17:04:49 +0000
committersaturneric <[email protected]>2025-02-03 17:04:49 +0000
commit4606bb8aff6971e65c16a7b328a03ec80d4fb2d6 (patch)
tree8632d47db4ec84f15e720d35a021ce50717cca29
parentchore: remove setting 'basic/longer_expiration_date' (diff)
downloadGpgFrontend-4606bb8aff6971e65c16a7b328a03ec80d4fb2d6.tar.gz
GpgFrontend-4606bb8aff6971e65c16a7b328a03ec80d4fb2d6.zip
fix: solve discovered issues
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.de_DE.ts189
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.en_US.ts189
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.fr_FR.ts189
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.it_IT.ts189
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.zh_CN.ts189
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.zh_TW.ts189
-rw-r--r--src/core/model/GpgKeyGenerateInfo.cpp4
-rw-r--r--src/core/model/GpgKeyGenerateInfo.h3
-rw-r--r--src/ui/UserInterfaceUtils.cpp40
-rw-r--r--src/ui/dialog/key_generate/KeyGenerateDialog.cpp13
-rw-r--r--src/ui/function/GpgOperaHelper.cpp3
11 files changed, 558 insertions, 639 deletions
diff --git a/resource/lfs/locale/ts/GpgFrontend.de_DE.ts b/resource/lfs/locale/ts/GpgFrontend.de_DE.ts
index f4163959..708228d0 100644
--- a/resource/lfs/locale/ts/GpgFrontend.de_DE.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.de_DE.ts
@@ -538,6 +538,14 @@
</message>
</context>
<context>
+ <name>GpgFrontend::KeyGenerateInfo</name>
+ <message>
+ <location filename="../../../../src/core/model/GpgKeyGenerateInfo.cpp" line="39"/>
+ <source>None</source>
+ <translation type="unfinished">Kein</translation>
+ </message>
+</context>
+<context>
<name>GpgFrontend::Module::GlobalRegisterTable</name>
<message>
<location filename="../../../../src/core/module/GlobalRegisterTable.cpp" line="47"/>
@@ -746,39 +754,39 @@
<context>
<name>GpgFrontend::UI::CommonUtils</name>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="459"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="419"/>
<source>Timeout</source>
<translation type="unfinished">Zeitablauf</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="334"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="162"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="294"/>
<source>Success</source>
<translation type="unfinished">Erfolg</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="159"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="119"/>
<source>Failed to Load GnuPG Context</source>
<translation type="unfinished">Fehler beim Laden des GnuPG-Kontextes</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="161"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="121"/>
<source>It seems that GnuPG (gpg) is not properly installed. Please refer to the &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; for instructions on fixing the installation. After resolving the issue, relaunch GpgFrontend.&lt;br /&gt;&lt;br /&gt;Alternatively, you can open the GnuPG Controller to configure a custom GnuPG installation for GpgFrontend to use. Once set, GpgFrontend will restart automatically.&lt;br /&gt;&lt;br /&gt;Details: %1</source>
<translation type="unfinished">Es scheint, dass GnuPG (gpg) nicht richtig installiert ist. Bitte lesen Sie die &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; für Anweisungen zur Behebung der Installation. Nachdem Sie das Problem behoben haben, starten Sie GpgFrontend erneut. Alternativ können Sie den GnuPG-Controller öffnen, um eine benutzerdefinierte GnuPG-Installation zu konfigurieren, die GpgFrontend verwenden soll. Einmal eingestellt, wird GpgFrontend automatisch neu gestartet.&lt;br /&gt;&lt;br /&gt;Details: %1</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="203"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="163"/>
<source>Gpg Operation succeed.</source>
<translation>Gpg-Verarbeitung erfolgreich.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="213"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="326"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="173"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="286"/>
<source>Failure</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="214"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="174"/>
<source>Gpg Operation failed.
Error code: %1
@@ -791,101 +799,101 @@ Quelle: %2
Beschrei: %3</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="241"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="248"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="516"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="201"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="208"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="233"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="193"/>
<source>Open Key</source>
<translation type="unfinished">Schlüssel öffnen</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="234"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="194"/>
<source>Keyring files</source>
<translation type="unfinished">Schlüsselbunddateien</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="242"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
<source>Cannot open this file. Please make sure that this is a regular file and it&apos;s readable.</source>
<translation type="unfinished">Kann diese Datei nicht öffnen. Bitte stellen Sie sicher, dass es sich um eine reguläre, lesbare Datei handelt.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="249"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="209"/>
<source>The target file is too large for a keyring.</source>
<translation>Die Zieldatei ist zu groß für einen Schlüsselring.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="255"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="215"/>
<source>File Open Failed</source>
<translation type="unfinished">Datei konnte nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="256"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="216"/>
<source>Failed to open file: </source>
<translation type="unfinished">Datei konnte nicht geöffnet werden: </translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="307"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="267"/>
<source>Processing</source>
<translation type="unfinished">In Bearbeitung</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="327"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="287"/>
<source>Failed to execute command.</source>
<translation type="unfinished">Fehler beim Ausführen des Befehls.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="335"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="295"/>
<source>Succeed in executing command.</source>
<translation type="unfinished">Befehl erfolgreich ausgeführt.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="337"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="297"/>
<source>Warning</source>
<translation type="unfinished">Warnung</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="338"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="298"/>
<source>Finished executing command.</source>
<translation type="unfinished">Ausführung des Befehls abgeschlossen.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="359"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="319"/>
<source>Default Keyserver Not Found</source>
<translation type="unfinished">Standard-Keyserver nicht gefunden</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="360"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="320"/>
<source>Cannot read default keyserver from your settings, please set a default keyserver first</source>
<translation type="unfinished">Der Standard-Keyserver kann nicht aus Ihren Einstellungen gelesen werden, bitte legen Sie zuerst einen Standard-Keyserver fest</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="456"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="416"/>
<source>Key Not Found</source>
<translation type="unfinished">Schlüssel nicht gefunden</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="462"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="422"/>
<source>Key Server Not Found</source>
<translation type="unfinished">Schlüsselserver nicht gefunden</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="465"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="425"/>
<source>Connection Error</source>
<translation type="unfinished">Verbindungsfehler</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="404"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="364"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="436"/>
<source>The key has been updated</source>
<translation type="unfinished">Der Schlüssel wurde aktualisiert</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="406"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="478"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="366"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="438"/>
<source>No need to update the key</source>
<translation type="unfinished">Keine Notwendigkeit, den Schlüssel zu aktualisieren</translation>
</message>
@@ -1243,68 +1251,63 @@ Beschrei: %3</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="52"/>
- <source>Enable to use longer key expiration date.</source>
- <translation type="unfinished">Aktivieren, um ein längeres Schlüsselablaufdatum zu verwenden.</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Import files dropped on the Key List without confirmation.</source>
<translation type="unfinished">Dateien ohne Nachfrage importieren, die auf der Schlüsselliste abgelegt wurden.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Disable loading of all modules (including integrated modules)</source>
<translation type="unfinished">Deaktivieren des Ladens aller Module (einschließlich integrierter Module)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
<source>Language</source>
<translation type="unfinished">Sprache</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>NOTE</source>
<translation type="unfinished">HINWEIS</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>: </source>
<translation type="unfinished">: </translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="59"/>
<source>GpgFrontend will restart automatically if you change the language!</source>
<translation type="unfinished">GpgFrontend wird automatisch neu gestartet, wenn die Sprache geändert wird!</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
<source>Data</source>
<translation type="unfinished">Daten</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="65"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="83"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="81"/>
<source>Clear All Log (Total Size: %1)</source>
<translation type="unfinished">Gesamtes Protokoll löschen (Gesamtgröße: %1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="68"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="97"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="66"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="95"/>
<source>Clear All Data Objects (Total Size: %1)</source>
<translation type="unfinished">Alle Datenobjekte löschen (Gesamtgröße: %1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="71"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="69"/>
<source>Reveal in File Explorer</source>
<translation>Im Datei-Explorer öffnen</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="90"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="88"/>
<source>Confirm</source>
<translation type="unfinished">Bestätigen</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="91"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="89"/>
<source>Are you sure you want to clear all data objects?
This will result in loss of all cached form positions, statuses, key servers, etc.</source>
<translation type="unfinished">Sind Sie sicher, dass Sie alle Datenobjekte löschen möchten? Dies führt zum Verlust aller zwischengespeicherten Formularpositionen, Status, Schlüsselserver usw.</translation>
@@ -1770,46 +1773,46 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="63"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="70"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="575"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="581"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="578"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="584"/>
<source>Custom</source>
<translation type="unfinished">Benutzerdefiniert</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="71"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="524"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="527"/>
<source>3 Months</source>
<translation type="unfinished">3 Monate</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="72"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="529"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="532"/>
<source>6 Months</source>
<translation type="unfinished">6 Monate</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="73"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="537"/>
<source>1 Year</source>
<translation type="unfinished">1 Jahr</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="74"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="135"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="140"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="539"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="144"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="542"/>
<source>2 Years</source>
<translation type="unfinished">2 Jahre</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="75"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="544"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="547"/>
<source>5 Years</source>
<translation type="unfinished">5 Jahre</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="76"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="549"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="552"/>
<source>10 Years</source>
<translation type="unfinished">10 Jahre</translation>
</message>
@@ -1817,20 +1820,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="77"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="100"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="109"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="555"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="558"/>
<source>Non Expired</source>
<translation type="unfinished">Nicht abgelaufen</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="81"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="284"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="586"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="290"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="589"/>
<source>Primary Key Only</source>
<translation type="unfinished">Nur Primärschlüssel</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="82"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="332"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="338"/>
<source>Primary Key With Subkey</source>
<translation type="unfinished">Primärschlüssel mit Unterschlüssel</translation>
</message>
@@ -1928,58 +1931,58 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation type="unfinished">Erstellen</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="130"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="255"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="261"/>
<source>None</source>
<translation type="unfinished">Kein</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="142"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="146"/>
<source>Generate Key</source>
<translation type="unfinished">Schlüssel erstellen</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="152"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="156"/>
<source>Name must contain at least five characters.</source>
<translation type="unfinished">Der Name muss mindestens fünf Zeichen enthalten.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="157"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="161"/>
<source>Please give a valid email address.</source>
<translation type="unfinished">Bitte geben Sie eine gültige E-Mail Adresse an.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="162"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="166"/>
<source>Please give a valid primary key algorithm.</source>
<translation type="unfinished">Bitte geben Sie einen gültigen Primärschlüssel-Algorithmus an.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="171"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="175"/>
<source>Time to primary key expiration must not be less than 120 seconds.</source>
<translation type="unfinished">Die Zeit bis zum Ablauf des Primärschlüssels darf nicht weniger als 120 Sekunden betragen.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="178"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="182"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished">Bitte geben Sie einen gültigen Unterschlüssel-Algorithmus an.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="186"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="190"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished">Die Zeit bis zum Ablauf des Unterschlüssels darf nicht weniger als 120 Sekunden betragen.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="614"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="617"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="615"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="618"/>
<source>Unknown error occurred</source>
<translation type="unfinished">Unbekannter Fehler ist aufgetreten</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="627"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="630"/>
<source>Generating</source>
<translation type="unfinished">Erstellen</translation>
</message>
@@ -3921,22 +3924,17 @@ Hinweis: Weitere Informationen zur Verifizierung finden Sie hier: https://keys.o
<translation type="unfinished">Das Ablaufdatum des Schlüsselpaars konnte nicht aktualisiert werden.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="124"/>
<source>Modified Expiration Date (Local Time)</source>
<translation type="unfinished">Geändertes Ablaufdatum (Ortszeit)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="135"/>
- <source>Tips: For the sake of security, the key is valid for up to two years. If you are an expert user, please unlock it for a longer time in the settings.</source>
- <translation type="unfinished">Tipps: Aus Sicherheitsgründen ist der Schlüssel bis zu zwei Jahre gültig. Wenn Sie ein erfahrener Benutzer sind, entsperren Sie es bitte für längere Zeit in den Einstellungen.</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="125"/>
<source>No Expiration</source>
<translation type="unfinished">Nicht ablaufend</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="140"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="126"/>
<source>Modified Expiration Date</source>
<translation type="unfinished">Geändertes Ablaufdatum</translation>
</message>
@@ -5802,12 +5800,12 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
<context>
<name>GpgFrontend::UI::SubkeyGenerateDialog</name>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="79"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
<source>Tipps: if the key pair has a passphrase, the subkey&apos;s passphrase must be equal to it.</source>
<translation type="unfinished">Tipps: Wenn das Schlüsselpaar eine Passphrase hat, muss die Passphrase des Unterschlüssels die gleiche sein.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="85"/>
<source>Generate New Subkey</source>
<translation type="unfinished">Neuen Unterschlüssel erstellen</translation>
</message>
@@ -5857,27 +5855,27 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
<translation type="unfinished">Keine Passphrase</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="180"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="183"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished">Bitte geben Sie einen gültigen Unterschlüssel-Algorithmus an.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="189"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="192"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished">Die Zeit bis zum Ablauf des Unterschlüssels darf nicht weniger als 120 Sekunden betragen.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="201"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="204"/>
<source>Generating</source>
<translation type="unfinished">Erstellen</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="212"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="215"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="213"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="216"/>
<source>Unknown error occurred</source>
<translation>Unbekannter Fehler ist aufgetreten</translation>
</message>
@@ -6390,17 +6388,12 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
<translation type="unfinished">Sollte dieser Vorgang zu langsam sein, stellen Sie bitte die Keyserver-Adresse entsprechend in der gnupg-Konfigurationsdatei ein (abhängig von der Netzwerksituation in Ihrem Land oder Ihrer Region).</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="67"/>
- <source>Show Verify Details</source>
- <translation type="unfinished">Verifizierungsdetails anzeigen</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="75"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="64"/>
<source>Public key not found locally</source>
<translation type="unfinished">Öffentlicher Schlüssel lokal nicht gefunden</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="76"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="65"/>
<source>There is no target public key content in local for GpgFrontend to gather enough information about this Signature. Do you want to import the public key from Keyserver now?</source>
<translation type="unfinished">Es gibt lokal keinen öffentlichen Zielschlüsselinhalt für GpgFrontend, um genügend Informationen über diese Signatur zu sammeln. Möchten Sie jetzt den öffentlichen Schlüssel vom Keyserver importieren?</translation>
</message>
diff --git a/resource/lfs/locale/ts/GpgFrontend.en_US.ts b/resource/lfs/locale/ts/GpgFrontend.en_US.ts
index 47335d24..e738217e 100644
--- a/resource/lfs/locale/ts/GpgFrontend.en_US.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.en_US.ts
@@ -538,6 +538,14 @@
</message>
</context>
<context>
+ <name>GpgFrontend::KeyGenerateInfo</name>
+ <message>
+ <location filename="../../../../src/core/model/GpgKeyGenerateInfo.cpp" line="39"/>
+ <source>None</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>GpgFrontend::Module::GlobalRegisterTable</name>
<message>
<location filename="../../../../src/core/module/GlobalRegisterTable.cpp" line="47"/>
@@ -746,24 +754,24 @@
<context>
<name>GpgFrontend::UI::CommonUtils</name>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="334"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="162"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="294"/>
<source>Success</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="203"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="163"/>
<source>Gpg Operation succeed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="213"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="326"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="173"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="286"/>
<source>Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="214"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="174"/>
<source>Gpg Operation failed.
Error code: %1
@@ -772,116 +780,116 @@ Description: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="233"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="193"/>
<source>Open Key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="234"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="194"/>
<source>Keyring files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="241"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="248"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="516"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="201"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="208"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="242"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
<source>Cannot open this file. Please make sure that this is a regular file and it&apos;s readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="249"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="209"/>
<source>The target file is too large for a keyring.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="255"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="215"/>
<source>File Open Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="256"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="216"/>
<source>Failed to open file: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="307"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="267"/>
<source>Processing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="327"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="287"/>
<source>Failed to execute command.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="335"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="295"/>
<source>Succeed in executing command.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="337"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="297"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="338"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="298"/>
<source>Finished executing command.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="359"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="319"/>
<source>Default Keyserver Not Found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="360"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="320"/>
<source>Cannot read default keyserver from your settings, please set a default keyserver first</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="456"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="416"/>
<source>Key Not Found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="459"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="419"/>
<source>Timeout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="462"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="422"/>
<source>Key Server Not Found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="465"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="425"/>
<source>Connection Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="404"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="364"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="436"/>
<source>The key has been updated</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="159"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="119"/>
<source>Failed to Load GnuPG Context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="161"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="121"/>
<source>It seems that GnuPG (gpg) is not properly installed. Please refer to the &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; for instructions on fixing the installation. After resolving the issue, relaunch GpgFrontend.&lt;br /&gt;&lt;br /&gt;Alternatively, you can open the GnuPG Controller to configure a custom GnuPG installation for GpgFrontend to use. Once set, GpgFrontend will restart automatically.&lt;br /&gt;&lt;br /&gt;Details: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="406"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="478"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="366"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="438"/>
<source>No need to update the key</source>
<translation type="unfinished"></translation>
</message>
@@ -1239,68 +1247,63 @@ Description: %3</source>
</message>
<message>
<location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="52"/>
- <source>Enable to use longer key expiration date.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Import files dropped on the Key List without confirmation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Disable loading of all modules (including integrated modules)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
<source>Language</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>NOTE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="59"/>
<source>GpgFrontend will restart automatically if you change the language!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
<source>Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="65"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="83"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="81"/>
<source>Clear All Log (Total Size: %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="68"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="97"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="66"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="95"/>
<source>Clear All Data Objects (Total Size: %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="71"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="69"/>
<source>Reveal in File Explorer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="90"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="88"/>
<source>Confirm</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="91"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="89"/>
<source>Are you sure you want to clear all data objects?
This will result in loss of all cached form positions, statuses, key servers, etc.</source>
<translation type="unfinished"></translation>
@@ -1766,46 +1769,46 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="63"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="70"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="575"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="581"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="578"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="584"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="71"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="524"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="527"/>
<source>3 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="72"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="529"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="532"/>
<source>6 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="73"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="537"/>
<source>1 Year</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="74"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="135"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="140"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="539"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="144"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="542"/>
<source>2 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="75"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="544"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="547"/>
<source>5 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="76"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="549"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="552"/>
<source>10 Years</source>
<translation type="unfinished"></translation>
</message>
@@ -1813,20 +1816,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="77"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="100"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="109"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="555"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="558"/>
<source>Non Expired</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="81"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="284"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="586"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="290"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="589"/>
<source>Primary Key Only</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="82"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="332"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="338"/>
<source>Primary Key With Subkey</source>
<translation type="unfinished"></translation>
</message>
@@ -1924,58 +1927,58 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="130"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="255"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="261"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="142"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="146"/>
<source>Generate Key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="152"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="156"/>
<source>Name must contain at least five characters.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="157"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="161"/>
<source>Please give a valid email address.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="162"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="166"/>
<source>Please give a valid primary key algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="171"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="175"/>
<source>Time to primary key expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="178"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="182"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="186"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="190"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="614"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="617"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="615"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="618"/>
<source>Unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="627"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="630"/>
<source>Generating</source>
<translation type="unfinished"></translation>
</message>
@@ -3909,22 +3912,17 @@ Note: For verification, you can find more information here: https://keys.openpgp
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="124"/>
<source>Modified Expiration Date (Local Time)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="135"/>
- <source>Tips: For the sake of security, the key is valid for up to two years. If you are an expert user, please unlock it for a longer time in the settings.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="125"/>
<source>No Expiration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="140"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="126"/>
<source>Modified Expiration Date</source>
<translation type="unfinished"></translation>
</message>
@@ -5742,12 +5740,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<context>
<name>GpgFrontend::UI::SubkeyGenerateDialog</name>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="79"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
<source>Tipps: if the key pair has a passphrase, the subkey&apos;s passphrase must be equal to it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="85"/>
<source>Generate New Subkey</source>
<translation type="unfinished"></translation>
</message>
@@ -5797,27 +5795,27 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="180"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="183"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="189"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="192"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="201"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="204"/>
<source>Generating</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="212"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="215"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="213"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="216"/>
<source>Unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
@@ -6328,17 +6326,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="67"/>
- <source>Show Verify Details</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="75"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="64"/>
<source>Public key not found locally</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="76"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="65"/>
<source>There is no target public key content in local for GpgFrontend to gather enough information about this Signature. Do you want to import the public key from Keyserver now?</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts b/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts
index 54af4c6c..9824085e 100644
--- a/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts
@@ -538,6 +538,14 @@
</message>
</context>
<context>
+ <name>GpgFrontend::KeyGenerateInfo</name>
+ <message>
+ <location filename="../../../../src/core/model/GpgKeyGenerateInfo.cpp" line="39"/>
+ <source>None</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>GpgFrontend::Module::GlobalRegisterTable</name>
<message>
<location filename="../../../../src/core/module/GlobalRegisterTable.cpp" line="47"/>
@@ -746,39 +754,39 @@
<context>
<name>GpgFrontend::UI::CommonUtils</name>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="459"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="419"/>
<source>Timeout</source>
<translation type="unfinished">Temps libre</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="334"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="162"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="294"/>
<source>Success</source>
<translation type="unfinished">Succès</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="159"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="119"/>
<source>Failed to Load GnuPG Context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="161"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="121"/>
<source>It seems that GnuPG (gpg) is not properly installed. Please refer to the &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; for instructions on fixing the installation. After resolving the issue, relaunch GpgFrontend.&lt;br /&gt;&lt;br /&gt;Alternatively, you can open the GnuPG Controller to configure a custom GnuPG installation for GpgFrontend to use. Once set, GpgFrontend will restart automatically.&lt;br /&gt;&lt;br /&gt;Details: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="203"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="163"/>
<source>Gpg Operation succeed.</source>
<translation type="unfinished">Opération Gpg réussie.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="213"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="326"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="173"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="286"/>
<source>Failure</source>
<translation type="unfinished">Échec</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="214"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="174"/>
<source>Gpg Operation failed.
Error code: %1
@@ -791,101 +799,101 @@ Source : %2
Description : %3</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="241"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="248"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="516"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="201"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="208"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
<source>Error</source>
<translation type="unfinished">Erreur</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="233"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="193"/>
<source>Open Key</source>
<translation type="unfinished">Ouvrir la clé</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="234"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="194"/>
<source>Keyring files</source>
<translation type="unfinished">Fichiers de porte-clés</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="242"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
<source>Cannot open this file. Please make sure that this is a regular file and it&apos;s readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="249"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="209"/>
<source>The target file is too large for a keyring.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="255"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="215"/>
<source>File Open Failed</source>
<translation type="unfinished">L&apos;ouverture du fichier a échoué</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="256"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="216"/>
<source>Failed to open file: </source>
<translation type="unfinished">Échec de l&apos;ouverture du fichier:</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="307"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="267"/>
<source>Processing</source>
<translation type="unfinished">Traitement</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="327"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="287"/>
<source>Failed to execute command.</source>
<translation type="unfinished">Échec de l&apos;exécution de la commande.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="335"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="295"/>
<source>Succeed in executing command.</source>
<translation type="unfinished">Réussir l&apos;exécution de la commande.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="337"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="297"/>
<source>Warning</source>
<translation type="unfinished">Avertissement</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="338"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="298"/>
<source>Finished executing command.</source>
<translation type="unfinished">Exécution de la commande terminée.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="359"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="319"/>
<source>Default Keyserver Not Found</source>
<translation type="unfinished">Serveur de clés par défaut introuvable</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="360"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="320"/>
<source>Cannot read default keyserver from your settings, please set a default keyserver first</source>
<translation type="unfinished">Impossible de lire le serveur de clés par défaut à partir de vos paramètres, veuillez d&apos;abord définir un serveur de clés par défaut</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="456"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="416"/>
<source>Key Not Found</source>
<translation type="unfinished">Clé introuvable</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="462"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="422"/>
<source>Key Server Not Found</source>
<translation type="unfinished">Serveur de clé introuvable</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="465"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="425"/>
<source>Connection Error</source>
<translation type="unfinished">Erreur de connexion</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="404"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="364"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="436"/>
<source>The key has been updated</source>
<translation type="unfinished">La clé a été mise à jour</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="406"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="478"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="366"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="438"/>
<source>No need to update the key</source>
<translation type="unfinished">Pas besoin de mettre à jour la clé</translation>
</message>
@@ -1243,68 +1251,63 @@ Description : %3</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="52"/>
- <source>Enable to use longer key expiration date.</source>
- <translation type="unfinished">Activer pour utiliser une date d&apos;expiration de clé plus longue.</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Import files dropped on the Key List without confirmation.</source>
<translation type="unfinished">Importez des fichiers déposés sur la liste des clés sans confirmation.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Disable loading of all modules (including integrated modules)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
<source>Language</source>
<translation type="unfinished">Langue</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>NOTE</source>
<translation type="unfinished">REMARQUE</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>: </source>
<translation type="unfinished">:</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="59"/>
<source>GpgFrontend will restart automatically if you change the language!</source>
<translation type="unfinished">GpgFrontend redémarrera automatiquement si vous changez de langue&#xa0;!</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
<source>Data</source>
<translation type="unfinished">Données</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="65"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="83"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="81"/>
<source>Clear All Log (Total Size: %1)</source>
<translation type="unfinished">Effacer tout le journal (taille totale&#xa0;:&#xa0;%1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="68"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="97"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="66"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="95"/>
<source>Clear All Data Objects (Total Size: %1)</source>
<translation type="unfinished">Effacer tous les objets de données (taille totale&#xa0;: %1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="71"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="69"/>
<source>Reveal in File Explorer</source>
<translation type="unfinished">Révéler dans l&apos;explorateur de fichiers</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="90"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="88"/>
<source>Confirm</source>
<translation type="unfinished">Confirmer</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="91"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="89"/>
<source>Are you sure you want to clear all data objects?
This will result in loss of all cached form positions, statuses, key servers, etc.</source>
<translation type="unfinished">Voulez-vous vraiment effacer tous les objets de données&#xa0;? Cela entraînera la perte de toutes les positions de formulaire mises en cache, des statuts, des serveurs de clés, etc.</translation>
@@ -1770,46 +1773,46 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="63"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="70"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="575"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="581"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="578"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="584"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="71"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="524"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="527"/>
<source>3 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="72"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="529"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="532"/>
<source>6 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="73"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="537"/>
<source>1 Year</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="74"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="135"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="140"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="539"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="144"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="542"/>
<source>2 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="75"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="544"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="547"/>
<source>5 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="76"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="549"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="552"/>
<source>10 Years</source>
<translation type="unfinished"></translation>
</message>
@@ -1817,20 +1820,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="77"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="100"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="109"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="555"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="558"/>
<source>Non Expired</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="81"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="284"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="586"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="290"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="589"/>
<source>Primary Key Only</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="82"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="332"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="338"/>
<source>Primary Key With Subkey</source>
<translation type="unfinished"></translation>
</message>
@@ -1928,58 +1931,58 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="130"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="255"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="261"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="142"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="146"/>
<source>Generate Key</source>
<translation type="unfinished">Générer la clé</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="152"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="156"/>
<source>Name must contain at least five characters.</source>
<translation type="unfinished">Le nom doit contenir au moins cinq caractères.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="157"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="161"/>
<source>Please give a valid email address.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="162"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="166"/>
<source>Please give a valid primary key algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="171"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="175"/>
<source>Time to primary key expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="178"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="182"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="186"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="190"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="614"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="617"/>
<source>Error</source>
<translation type="unfinished">Erreur</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="615"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="618"/>
<source>Unknown error occurred</source>
<translation type="unfinished">Une erreur inconnue s&apos;est produite</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="627"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="630"/>
<source>Generating</source>
<translation type="unfinished">Générateur</translation>
</message>
@@ -3913,22 +3916,17 @@ Note: For verification, you can find more information here: https://keys.openpgp
<translation type="unfinished">Échec de la mise à jour de la date d&apos;expiration de la paire de clés.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="124"/>
<source>Modified Expiration Date (Local Time)</source>
<translation type="unfinished">Date d&apos;expiration modifiée (heure locale)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="135"/>
- <source>Tips: For the sake of security, the key is valid for up to two years. If you are an expert user, please unlock it for a longer time in the settings.</source>
- <translation type="unfinished">Conseils&#xa0;: Pour des raisons de sécurité, la clé est valable jusqu&apos;à deux ans. Si vous êtes un utilisateur expert, veuillez le déverrouiller plus longtemps dans les paramètres.</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="125"/>
<source>No Expiration</source>
<translation type="unfinished">Pas d&apos;expiration</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="140"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="126"/>
<source>Modified Expiration Date</source>
<translation type="unfinished">Date d&apos;expiration modifiée</translation>
</message>
@@ -5746,12 +5744,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<context>
<name>GpgFrontend::UI::SubkeyGenerateDialog</name>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="79"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
<source>Tipps: if the key pair has a passphrase, the subkey&apos;s passphrase must be equal to it.</source>
<translation type="unfinished">Conseil&#xa0;: si la paire de clés a une phrase secrète, la phrase secrète de la sous-clé doit lui être égale.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="85"/>
<source>Generate New Subkey</source>
<translation type="unfinished">Générer une nouvelle sous-clé</translation>
</message>
@@ -5801,27 +5799,27 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="180"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="183"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="189"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="192"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="201"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="204"/>
<source>Generating</source>
<translation type="unfinished">Générateur</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="212"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="215"/>
<source>Error</source>
<translation type="unfinished">Erreur</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="213"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="216"/>
<source>Unknown error occurred</source>
<translation type="unfinished">Une erreur inconnue s&apos;est produite</translation>
</message>
@@ -6281,17 +6279,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation type="unfinished">Si ce processus est trop lent, veuillez définir l&apos;adresse du serveur de clés de manière appropriée dans le fichier de configuration gnupg (en fonction de la situation du réseau dans votre pays ou région).</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="67"/>
- <source>Show Verify Details</source>
- <translation type="unfinished">Afficher les détails de vérification</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="75"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="64"/>
<source>Public key not found locally</source>
<translation type="unfinished">Clé publique introuvable localement</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="76"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="65"/>
<source>There is no target public key content in local for GpgFrontend to gather enough information about this Signature. Do you want to import the public key from Keyserver now?</source>
<translation type="unfinished">Il n&apos;y a pas de contenu de clé publique cible en local pour que GpgFrontend recueille suffisamment d&apos;informations sur cette signature. Voulez-vous importer la clé publique depuis Keyserver maintenant&#xa0;?</translation>
</message>
diff --git a/resource/lfs/locale/ts/GpgFrontend.it_IT.ts b/resource/lfs/locale/ts/GpgFrontend.it_IT.ts
index ff1b60d3..4ad679d1 100644
--- a/resource/lfs/locale/ts/GpgFrontend.it_IT.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.it_IT.ts
@@ -538,6 +538,14 @@
</message>
</context>
<context>
+ <name>GpgFrontend::KeyGenerateInfo</name>
+ <message>
+ <location filename="../../../../src/core/model/GpgKeyGenerateInfo.cpp" line="39"/>
+ <source>None</source>
+ <translation type="unfinished">Nessuno</translation>
+ </message>
+</context>
+<context>
<name>GpgFrontend::Module::GlobalRegisterTable</name>
<message>
<location filename="../../../../src/core/module/GlobalRegisterTable.cpp" line="47"/>
@@ -746,39 +754,39 @@
<context>
<name>GpgFrontend::UI::CommonUtils</name>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="459"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="419"/>
<source>Timeout</source>
<translation>Tempo scaduto</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="334"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="162"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="294"/>
<source>Success</source>
<translation>Successo</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="159"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="119"/>
<source>Failed to Load GnuPG Context</source>
<translation>Caricamento nuPG Context fallito</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="161"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="121"/>
<source>It seems that GnuPG (gpg) is not properly installed. Please refer to the &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; for instructions on fixing the installation. After resolving the issue, relaunch GpgFrontend.&lt;br /&gt;&lt;br /&gt;Alternatively, you can open the GnuPG Controller to configure a custom GnuPG installation for GpgFrontend to use. Once set, GpgFrontend will restart automatically.&lt;br /&gt;&lt;br /&gt;Details: %1</source>
<translation>Sembra che GnuPG (gpg) non sia installato correttamente. Consulta la pagina &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; per istruzioni su come risolvere l&apos;installazione. Dopo aver risolto il problema, riavvia GpgFrontend.&lt;br /&gt;&lt;br /&gt;In alternativa, puoi aprire GnuPG Controller per configurare un&apos;installazione GnuPG personalizzata da utilizzare per GpgFrontend. Una volta impostata, GpgFrontend si riavvierà automaticamente.&lt;br /&gt;&lt;br /&gt;Dettagli: %1</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="203"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="163"/>
<source>Gpg Operation succeed.</source>
<translation>Operazione Gpg riuscita.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="213"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="326"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="173"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="286"/>
<source>Failure</source>
<translation>Fallimento</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="214"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="174"/>
<source>Gpg Operation failed.
Error code: %1
@@ -791,101 +799,101 @@ Origine: %2
Descrizione: %3</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="241"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="248"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="516"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="201"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="208"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="233"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="193"/>
<source>Open Key</source>
<translation>Chiave aperta</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="234"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="194"/>
<source>Keyring files</source>
<translation>File portachiavi</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="242"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
<source>Cannot open this file. Please make sure that this is a regular file and it&apos;s readable.</source>
<translation>Impossibile aprire questo file. Assicurati che questo sia un file regolare e che sia leggibile.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="249"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="209"/>
<source>The target file is too large for a keyring.</source>
<translation>Il file di destinazione è troppo grande per un portachiavi.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="255"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="215"/>
<source>File Open Failed</source>
<translation>Apertura file non riuscita</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="256"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="216"/>
<source>Failed to open file: </source>
<translation>Impossibile aprire il file: </translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="307"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="267"/>
<source>Processing</source>
<translation>In lavorazione</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="327"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="287"/>
<source>Failed to execute command.</source>
<translation>Impossibile eseguire il comando.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="335"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="295"/>
<source>Succeed in executing command.</source>
<translation>Riuscire a eseguire il comando.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="337"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="297"/>
<source>Warning</source>
<translation>Avvertimento</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="338"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="298"/>
<source>Finished executing command.</source>
<translation>Terminata l&apos;esecuzione del comando.</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="359"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="319"/>
<source>Default Keyserver Not Found</source>
<translation>Keyserver predefinito non trovato</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="360"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="320"/>
<source>Cannot read default keyserver from your settings, please set a default keyserver first</source>
<translation>Impossibile leggere il server delle chiavi predefinito dalle impostazioni, impostare prima un server delle chiavi predefinito</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="456"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="416"/>
<source>Key Not Found</source>
<translation>Chiave non trovata</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="462"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="422"/>
<source>Key Server Not Found</source>
<translation>Server chiave non trovato</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="465"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="425"/>
<source>Connection Error</source>
<translation>Errore di connessione</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="404"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="364"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="436"/>
<source>The key has been updated</source>
<translation>La chiave è stata aggiornata</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="406"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="478"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="366"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="438"/>
<source>No need to update the key</source>
<translation>Non è necessario aggiornare la chiave</translation>
</message>
@@ -1243,68 +1251,63 @@ Descrizione: %3</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="52"/>
- <source>Enable to use longer key expiration date.</source>
- <translation>Abilita per utilizzare una data di scadenza della chiave più lunga.</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Import files dropped on the Key List without confirmation.</source>
<translation>Importa i file rilasciati nell&apos;elenco delle chiavi senza conferma.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Disable loading of all modules (including integrated modules)</source>
<translation>Disabilita il caricamento di tutti i moduli (inclusi i moduli integrati)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
<source>Language</source>
<translation>Lingua</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>NOTE</source>
<translation>NOTA</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>: </source>
<translation>: </translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="59"/>
<source>GpgFrontend will restart automatically if you change the language!</source>
<translation>GpgFrontend si riavvierà automaticamente se cambi la lingua!</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
<source>Data</source>
<translation>Dati</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="65"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="83"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="81"/>
<source>Clear All Log (Total Size: %1)</source>
<translation>Cancella tutto il registro (dimensione totale: %1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="68"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="97"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="66"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="95"/>
<source>Clear All Data Objects (Total Size: %1)</source>
<translation>Cancella tutti gli oggetti dati (dimensione totale: %1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="71"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="69"/>
<source>Reveal in File Explorer</source>
<translation>Mostra in Esplora File</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="90"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="88"/>
<source>Confirm</source>
<translation>Conferma</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="91"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="89"/>
<source>Are you sure you want to clear all data objects?
This will result in loss of all cached form positions, statuses, key servers, etc.</source>
<translation>Sei sicuro di voler cancellare tutti gli oggetti dati? Ciò comporterà la perdita di tutte le posizioni dei moduli memorizzati nella cache, gli stati, i server delle chiavi, ecc.</translation>
@@ -1770,46 +1773,46 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="63"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="70"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="575"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="581"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="578"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="584"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="71"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="524"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="527"/>
<source>3 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="72"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="529"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="532"/>
<source>6 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="73"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="537"/>
<source>1 Year</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="74"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="135"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="140"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="539"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="144"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="542"/>
<source>2 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="75"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="544"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="547"/>
<source>5 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="76"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="549"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="552"/>
<source>10 Years</source>
<translation type="unfinished"></translation>
</message>
@@ -1817,20 +1820,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="77"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="100"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="109"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="555"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="558"/>
<source>Non Expired</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="81"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="284"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="586"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="290"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="589"/>
<source>Primary Key Only</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="82"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="332"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="338"/>
<source>Primary Key With Subkey</source>
<translation type="unfinished"></translation>
</message>
@@ -1928,58 +1931,58 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="130"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="255"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="261"/>
<source>None</source>
<translation type="unfinished">Nessuno</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="142"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="146"/>
<source>Generate Key</source>
<translation type="unfinished">Genera chiave</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="152"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="156"/>
<source>Name must contain at least five characters.</source>
<translation type="unfinished">Il nome deve contenere almeno cinque caratteri.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="157"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="161"/>
<source>Please give a valid email address.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="162"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="166"/>
<source>Please give a valid primary key algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="171"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="175"/>
<source>Time to primary key expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="178"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="182"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="186"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="190"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="614"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="617"/>
<source>Error</source>
<translation type="unfinished">Errore</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="615"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="618"/>
<source>Unknown error occurred</source>
<translation type="unfinished">Si è verificato un errore sconosciuto</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="627"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="630"/>
<source>Generating</source>
<translation type="unfinished">Generazione</translation>
</message>
@@ -3922,22 +3925,17 @@ Nota: per la verifica, puoi trovare maggiori informazioni qui: https://keys.open
<translation>Impossibile aggiornare la data di scadenza della coppia di chiavi.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="124"/>
<source>Modified Expiration Date (Local Time)</source>
<translation>Data di scadenza modificata (ora locale)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="135"/>
- <source>Tips: For the sake of security, the key is valid for up to two years. If you are an expert user, please unlock it for a longer time in the settings.</source>
- <translation>Suggerimenti: per motivi di sicurezza, la chiave è valida fino a due anni. Se sei un utente esperto, sbloccalo più a lungo nelle impostazioni.</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="125"/>
<source>No Expiration</source>
<translation>Senza scadenza</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="140"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="126"/>
<source>Modified Expiration Date</source>
<translation>Data di scadenza modificata</translation>
</message>
@@ -5793,12 +5791,12 @@ Se il problema persiste, prendere in considerazione la possibilità di richieder
<context>
<name>GpgFrontend::UI::SubkeyGenerateDialog</name>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="79"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
<source>Tipps: if the key pair has a passphrase, the subkey&apos;s passphrase must be equal to it.</source>
<translation>Suggerimenti: se la coppia di chiavi ha una passphrase, la passphrase della sottochiave deve essere uguale ad essa.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="85"/>
<source>Generate New Subkey</source>
<translation>Genera nuova sottochiave</translation>
</message>
@@ -5848,27 +5846,27 @@ Se il problema persiste, prendere in considerazione la possibilità di richieder
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="180"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="183"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="189"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="192"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="201"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="204"/>
<source>Generating</source>
<translation>Generazione</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="212"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="215"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="213"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="216"/>
<source>Unknown error occurred</source>
<translation>Si è verificato un errore sconosciuto</translation>
</message>
@@ -6328,17 +6326,12 @@ Se il problema persiste, prendere in considerazione la possibilità di richieder
<translation>Se questo processo è troppo lento, impostare l&apos;indirizzo del server delle chiavi in modo appropriato nel file di configurazione di gnupg (a seconda della situazione della rete nel proprio paese o regione).</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="67"/>
- <source>Show Verify Details</source>
- <translation>Mostra dettagli di verifica</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="75"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="64"/>
<source>Public key not found locally</source>
<translation>Chiave pubblica non trovata localmente</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="76"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="65"/>
<source>There is no target public key content in local for GpgFrontend to gather enough information about this Signature. Do you want to import the public key from Keyserver now?</source>
<translation>Non c&apos;è contenuto di chiave pubblica di destinazione in locale per GpgFrontend per raccogliere informazioni sufficienti su questa firma. Vuoi importare la chiave pubblica da Keyserver adesso?</translation>
</message>
diff --git a/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts b/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts
index 1efda678..26162ff8 100644
--- a/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts
@@ -538,6 +538,14 @@
</message>
</context>
<context>
+ <name>GpgFrontend::KeyGenerateInfo</name>
+ <message>
+ <location filename="../../../../src/core/model/GpgKeyGenerateInfo.cpp" line="39"/>
+ <source>None</source>
+ <translation type="unfinished">无</translation>
+ </message>
+</context>
+<context>
<name>GpgFrontend::Module::GlobalRegisterTable</name>
<message>
<location filename="../../../../src/core/module/GlobalRegisterTable.cpp" line="47"/>
@@ -746,39 +754,39 @@
<context>
<name>GpgFrontend::UI::CommonUtils</name>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="459"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="419"/>
<source>Timeout</source>
<translation>超时</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="334"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="162"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="294"/>
<source>Success</source>
<translation>成功</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="159"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="119"/>
<source>Failed to Load GnuPG Context</source>
<translation>加载 GnuPG 上下文失败</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="161"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="121"/>
<source>It seems that GnuPG (gpg) is not properly installed. Please refer to the &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; for instructions on fixing the installation. After resolving the issue, relaunch GpgFrontend.&lt;br /&gt;&lt;br /&gt;Alternatively, you can open the GnuPG Controller to configure a custom GnuPG installation for GpgFrontend to use. Once set, GpgFrontend will restart automatically.&lt;br /&gt;&lt;br /&gt;Details: %1</source>
<translation>GnuPG (gpg) 似乎未正确安装。请参阅 &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; 获取修复安装的说明。解决该问题后,重新启动 GpgFrontend。&lt;br /&gt;&lt;br /&gt;或者,你可以打开 GnuPG 控制器,配置供 GpgFrontend 使用的自定义 GnuPG 安装。设置完成后,GpgFrontend 将自动重启。&lt;br /&gt;&lt;br /&gt;详情: %1</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="203"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="163"/>
<source>Gpg Operation succeed.</source>
<translation>Gpg 操作成功。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="213"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="326"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="173"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="286"/>
<source>Failure</source>
<translation>失败</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="214"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="174"/>
<source>Gpg Operation failed.
Error code: %1
@@ -791,101 +799,101 @@ Description: %3</source>
说明: %3</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="241"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="248"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="516"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="201"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="208"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="233"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="193"/>
<source>Open Key</source>
<translation>打开密钥</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="234"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="194"/>
<source>Keyring files</source>
<translation>密钥圈文件</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="242"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
<source>Cannot open this file. Please make sure that this is a regular file and it&apos;s readable.</source>
<translation>无法打开此文件。请确保这是一个普通文件,并且有读取权限。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="249"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="209"/>
<source>The target file is too large for a keyring.</source>
<translation>目标文件对于一个密钥来说太大。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="255"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="215"/>
<source>File Open Failed</source>
<translation>文件打开失败</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="256"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="216"/>
<source>Failed to open file: </source>
<translation>打开文件失败: </translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="307"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="267"/>
<source>Processing</source>
<translation>处理中</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="327"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="287"/>
<source>Failed to execute command.</source>
<translation>执行命令失败。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="335"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="295"/>
<source>Succeed in executing command.</source>
<translation>成功执行命令。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="337"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="297"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="338"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="298"/>
<source>Finished executing command.</source>
<translation>命令执行完毕。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="359"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="319"/>
<source>Default Keyserver Not Found</source>
<translation>未找到默认密钥服务器</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="360"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="320"/>
<source>Cannot read default keyserver from your settings, please set a default keyserver first</source>
<translation>无法从您的设置中读取默认密钥服务器,请先设置默认密钥服务器</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="456"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="416"/>
<source>Key Not Found</source>
<translation>未找到密钥</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="462"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="422"/>
<source>Key Server Not Found</source>
<translation>未找到密钥服务器</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="465"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="425"/>
<source>Connection Error</source>
<translation>连接错误</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="404"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="364"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="436"/>
<source>The key has been updated</source>
<translation>密钥已更新</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="406"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="478"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="366"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="438"/>
<source>No need to update the key</source>
<translation>无需更新密钥</translation>
</message>
@@ -1243,68 +1251,63 @@ Description: %3</source>
</message>
<message>
<location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="52"/>
- <source>Enable to use longer key expiration date.</source>
- <translation>启用以使用更长的密钥到期日期。</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Import files dropped on the Key List without confirmation.</source>
<translation>未经确认,导入放在密钥列表中的文件。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Disable loading of all modules (including integrated modules)</source>
<translation>禁止加载所有的模组(包括被集成模组)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
<source>Language</source>
<translation>语言</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>NOTE</source>
<translation>提示</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>: </source>
<translation>: </translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="59"/>
<source>GpgFrontend will restart automatically if you change the language!</source>
<translation>如果您更改语言,GpgFrontend 将自动重启!</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
<source>Data</source>
<translation>数据</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="65"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="83"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="81"/>
<source>Clear All Log (Total Size: %1)</source>
<translation>清除所有日志(总大小:%1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="68"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="97"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="66"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="95"/>
<source>Clear All Data Objects (Total Size: %1)</source>
<translation>清除所有数据对象(总大小:%1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="71"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="69"/>
<source>Reveal in File Explorer</source>
<translation>在文件资源管理器中显示</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="90"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="88"/>
<source>Confirm</source>
<translation>确认</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="91"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="89"/>
<source>Are you sure you want to clear all data objects?
This will result in loss of all cached form positions, statuses, key servers, etc.</source>
<translation>您确定要清除所有数据对象吗?这将导致所有缓存的页面位置、状态、密钥服务器等丢失。</translation>
@@ -1770,46 +1773,46 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="63"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="70"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="575"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="581"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="578"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="584"/>
<source>Custom</source>
<translation type="unfinished">自定义</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="71"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="524"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="527"/>
<source>3 Months</source>
<translation type="unfinished">3个月</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="72"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="529"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="532"/>
<source>6 Months</source>
<translation type="unfinished">6个月</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="73"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="537"/>
<source>1 Year</source>
<translation type="unfinished">1年</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="74"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="135"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="140"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="539"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="144"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="542"/>
<source>2 Years</source>
<translation type="unfinished">2年</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="75"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="544"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="547"/>
<source>5 Years</source>
<translation type="unfinished">5年</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="76"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="549"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="552"/>
<source>10 Years</source>
<translation type="unfinished">10年</translation>
</message>
@@ -1817,20 +1820,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="77"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="100"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="109"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="555"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="558"/>
<source>Non Expired</source>
<translation type="unfinished">不过期</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="81"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="284"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="586"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="290"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="589"/>
<source>Primary Key Only</source>
<translation type="unfinished">仅主密钥</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="82"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="332"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="338"/>
<source>Primary Key With Subkey</source>
<translation type="unfinished">主密钥附带子密钥</translation>
</message>
@@ -1928,58 +1931,58 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation type="unfinished">生成</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="130"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="255"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="261"/>
<source>None</source>
<translation type="unfinished">无</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="142"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="146"/>
<source>Generate Key</source>
<translation type="unfinished">生成密钥</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="152"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="156"/>
<source>Name must contain at least five characters.</source>
<translation type="unfinished">名称必须至少包含五个字符。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="157"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="161"/>
<source>Please give a valid email address.</source>
<translation type="unfinished">请使用一个有效的电子邮件地址。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="162"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="166"/>
<source>Please give a valid primary key algorithm.</source>
<translation type="unfinished">请选择一个有效的主密钥算法。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="171"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="175"/>
<source>Time to primary key expiration must not be less than 120 seconds.</source>
<translation type="unfinished">距离主密钥过期时间不得少于 120 秒。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="178"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="182"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished">请选择一个有效的子密钥算法。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="186"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="190"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished">距离子密钥过期时间不得少于 120 秒。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="614"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="617"/>
<source>Error</source>
<translation type="unfinished">错误</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="615"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="618"/>
<source>Unknown error occurred</source>
<translation type="unfinished">发生未知错误</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="627"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="630"/>
<source>Generating</source>
<translation type="unfinished">生成</translation>
</message>
@@ -3921,22 +3924,17 @@ Note: For verification, you can find more information here: https://keys.openpgp
<translation>无法更新密钥对的过期日期。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="124"/>
<source>Modified Expiration Date (Local Time)</source>
<translation>修改到期日期(本地时间)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="135"/>
- <source>Tips: For the sake of security, the key is valid for up to two years. If you are an expert user, please unlock it for a longer time in the settings.</source>
- <translation>温馨提示:为安全起见,密钥有效期最长为两年。如果您是专家用户,请在设置中解锁更长的时间。</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="125"/>
<source>No Expiration</source>
<translation>无有效期</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="140"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="126"/>
<source>Modified Expiration Date</source>
<translation>修改到期日</translation>
</message>
@@ -5802,12 +5800,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<context>
<name>GpgFrontend::UI::SubkeyGenerateDialog</name>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="79"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
<source>Tipps: if the key pair has a passphrase, the subkey&apos;s passphrase must be equal to it.</source>
<translation>提示:如果主密钥和子密钥都有密码,则子密钥的密码必须与主密钥相同。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="85"/>
<source>Generate New Subkey</source>
<translation>生成新子密钥</translation>
</message>
@@ -5857,27 +5855,27 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation type="unfinished">无密码</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="180"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="183"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished">请选择一个有效的子密钥算法。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="189"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="192"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished">距离主密钥过期时间不得少于120秒。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="201"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="204"/>
<source>Generating</source>
<translation>生成</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="212"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="215"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="213"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="216"/>
<source>Unknown error occurred</source>
<translation>发生未知错误</translation>
</message>
@@ -6337,17 +6335,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation>如果此过程太慢,请在 gnupg 配置文件中适当设置密钥服务器地址(取决于您所在国家或地区的网络情况)。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="67"/>
- <source>Show Verify Details</source>
- <translation>显示验证详细信息</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="75"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="64"/>
<source>Public key not found locally</source>
<translation>本地未找到公钥</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="76"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="65"/>
<source>There is no target public key content in local for GpgFrontend to gather enough information about this Signature. Do you want to import the public key from Keyserver now?</source>
<translation>本地没有目标公钥内容供 GpgFrontend 收集有关此签名的足够信息。现在要从密钥服务器导入公钥吗?</translation>
</message>
diff --git a/resource/lfs/locale/ts/GpgFrontend.zh_TW.ts b/resource/lfs/locale/ts/GpgFrontend.zh_TW.ts
index 5b36cecb..af5a87eb 100644
--- a/resource/lfs/locale/ts/GpgFrontend.zh_TW.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.zh_TW.ts
@@ -538,6 +538,14 @@
</message>
</context>
<context>
+ <name>GpgFrontend::KeyGenerateInfo</name>
+ <message>
+ <location filename="../../../../src/core/model/GpgKeyGenerateInfo.cpp" line="39"/>
+ <source>None</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>GpgFrontend::Module::GlobalRegisterTable</name>
<message>
<location filename="../../../../src/core/module/GlobalRegisterTable.cpp" line="47"/>
@@ -746,39 +754,39 @@
<context>
<name>GpgFrontend::UI::CommonUtils</name>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="459"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="419"/>
<source>Timeout</source>
<translation type="unfinished">暫停</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="334"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="162"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="294"/>
<source>Success</source>
<translation type="unfinished">成功</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="159"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="119"/>
<source>Failed to Load GnuPG Context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="161"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="121"/>
<source>It seems that GnuPG (gpg) is not properly installed. Please refer to the &lt;a href=&apos;https://www.gpgfrontend.bktus.com/overview/faq/#troubleshooting-gnupg-installation-issues&apos;&gt;FAQ&lt;/a&gt; for instructions on fixing the installation. After resolving the issue, relaunch GpgFrontend.&lt;br /&gt;&lt;br /&gt;Alternatively, you can open the GnuPG Controller to configure a custom GnuPG installation for GpgFrontend to use. Once set, GpgFrontend will restart automatically.&lt;br /&gt;&lt;br /&gt;Details: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="203"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="163"/>
<source>Gpg Operation succeed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="213"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="326"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="173"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="286"/>
<source>Failure</source>
<translation type="unfinished">失敗</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="214"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="174"/>
<source>Gpg Operation failed.
Error code: %1
@@ -787,101 +795,101 @@ Description: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="241"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="248"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="516"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="201"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="208"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="233"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="193"/>
<source>Open Key</source>
<translation type="unfinished">開關鍵</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="234"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="194"/>
<source>Keyring files</source>
<translation type="unfinished">鑰匙圈文件</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="242"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="202"/>
<source>Cannot open this file. Please make sure that this is a regular file and it&apos;s readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="249"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="209"/>
<source>The target file is too large for a keyring.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="255"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="215"/>
<source>File Open Failed</source>
<translation type="unfinished">文件打開失敗</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="256"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="216"/>
<source>Failed to open file: </source>
<translation type="unfinished">開啟檔案失敗原因 : </translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="307"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="267"/>
<source>Processing</source>
<translation type="unfinished">加工</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="327"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="287"/>
<source>Failed to execute command.</source>
<translation type="unfinished">無法執行命令。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="335"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="295"/>
<source>Succeed in executing command.</source>
<translation type="unfinished">成功執行命令。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="337"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="297"/>
<source>Warning</source>
<translation type="unfinished">警告</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="338"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="298"/>
<source>Finished executing command.</source>
<translation type="unfinished">命令執行完畢。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="359"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="319"/>
<source>Default Keyserver Not Found</source>
<translation type="unfinished">未找到預設金鑰伺服器</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="360"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="320"/>
<source>Cannot read default keyserver from your settings, please set a default keyserver first</source>
<translation type="unfinished">無法從您的設定值中讀取預設金鑰伺服器,請先設定值預設金鑰伺服器</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="456"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="416"/>
<source>Key Not Found</source>
<translation type="unfinished">未找到金鑰</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="462"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="422"/>
<source>Key Server Not Found</source>
<translation type="unfinished">未找到金鑰伺服器</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="465"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="425"/>
<source>Connection Error</source>
<translation type="unfinished">連線錯誤</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="404"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="476"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="364"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="436"/>
<source>The key has been updated</source>
<translation type="unfinished">金鑰已更新</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="406"/>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="478"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="366"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="438"/>
<source>No need to update the key</source>
<translation type="unfinished">無需更新金鑰</translation>
</message>
@@ -1239,68 +1247,63 @@ Description: %3</source>
</message>
<message>
<location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="52"/>
- <source>Enable to use longer key expiration date.</source>
- <translation type="unfinished">啟用以使用更長的金鑰到期日期。</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Import files dropped on the Key List without confirmation.</source>
<translation type="unfinished">未經確認,導入放在金鑰列表中的文件。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="54"/>
<source>Disable loading of all modules (including integrated modules)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="56"/>
<source>Language</source>
<translation type="unfinished">語</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>NOTE</source>
<translation type="unfinished">筆記</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="60"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="58"/>
<source>: </source>
<translation type="unfinished">: </translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="59"/>
<source>GpgFrontend will restart automatically if you change the language!</source>
<translation type="unfinished">如果您更改語言,GpgFrontend 將自動重啟!</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="61"/>
<source>Data</source>
<translation type="unfinished">數據</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="65"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="83"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="63"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="81"/>
<source>Clear All Log (Total Size: %1)</source>
<translation type="unfinished">清除所有日誌(總大小:%1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="68"/>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="97"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="66"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="95"/>
<source>Clear All Data Objects (Total Size: %1)</source>
<translation type="unfinished">清除所有數據對象(總大小:%1)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="71"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="69"/>
<source>Reveal in File Explorer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="90"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="88"/>
<source>Confirm</source>
<translation type="unfinished">確認</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="91"/>
+ <location filename="../../../../src/ui/dialog/settings/SettingsGeneral.cpp" line="89"/>
<source>Are you sure you want to clear all data objects?
This will result in loss of all cached form positions, statuses, key servers, etc.</source>
<translation type="unfinished">您確定要清除所有數據對象嗎?這將導致所有緩存的表單位置、狀態、金鑰伺服器等丟失。</translation>
@@ -1766,46 +1769,46 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="63"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="70"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="575"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="581"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="578"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="584"/>
<source>Custom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="71"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="524"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="527"/>
<source>3 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="72"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="529"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="532"/>
<source>6 Months</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="73"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="537"/>
<source>1 Year</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="74"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="135"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="140"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="539"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="144"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="542"/>
<source>2 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="75"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="544"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="547"/>
<source>5 Years</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="76"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="549"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="552"/>
<source>10 Years</source>
<translation type="unfinished"></translation>
</message>
@@ -1813,20 +1816,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="77"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="100"/>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="109"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="555"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="558"/>
<source>Non Expired</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="81"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="284"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="586"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="290"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="589"/>
<source>Primary Key Only</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="82"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="332"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="338"/>
<source>Primary Key With Subkey</source>
<translation type="unfinished"></translation>
</message>
@@ -1924,58 +1927,58 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="130"/>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="255"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="261"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="142"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="146"/>
<source>Generate Key</source>
<translation type="unfinished">生成金鑰</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="152"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="156"/>
<source>Name must contain at least five characters.</source>
<translation type="unfinished">名稱必須至少包含五個字符。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="157"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="161"/>
<source>Please give a valid email address.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="162"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="166"/>
<source>Please give a valid primary key algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="171"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="175"/>
<source>Time to primary key expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="178"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="182"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="186"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="190"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="614"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="617"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="615"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="618"/>
<source>Unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="627"/>
+ <location filename="../../../../src/ui/dialog/key_generate/KeyGenerateDialog.cpp" line="630"/>
<source>Generating</source>
<translation type="unfinished">生成</translation>
</message>
@@ -3909,22 +3912,17 @@ Note: For verification, you can find more information here: https://keys.openpgp
<translation type="unfinished">無法更新金鑰對的過期日期。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="134"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="124"/>
<source>Modified Expiration Date (Local Time)</source>
<translation type="unfinished">修改到期日期(當地時間)</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="135"/>
- <source>Tips: For the sake of security, the key is valid for up to two years. If you are an expert user, please unlock it for a longer time in the settings.</source>
- <translation type="unfinished">溫馨提示:為安全起見,金鑰有效期最長為兩年。如果您是專家用戶,請在設定值中解鎖更長的時間。</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="139"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="125"/>
<source>No Expiration</source>
<translation type="unfinished">無有效期</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="140"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp" line="126"/>
<source>Modified Expiration Date</source>
<translation type="unfinished">修改到期日</translation>
</message>
@@ -5742,12 +5740,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<context>
<name>GpgFrontend::UI::SubkeyGenerateDialog</name>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="79"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
<source>Tipps: if the key pair has a passphrase, the subkey&apos;s passphrase must be equal to it.</source>
<translation type="unfinished">提示:如果金鑰對有密碼,則子金鑰的密碼必須與其相等。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="82"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="85"/>
<source>Generate New Subkey</source>
<translation type="unfinished">生成新子金鑰</translation>
</message>
@@ -5797,27 +5795,27 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="180"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="183"/>
<source>Please give a valid subkey algorithm.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="189"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="192"/>
<source>Time to subkey expiration must not be less than 120 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="201"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="204"/>
<source>Generating</source>
<translation type="unfinished">生成</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="212"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="215"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="213"/>
+ <location filename="../../../../src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp" line="216"/>
<source>Unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
@@ -6277,17 +6275,12 @@ If the issue persists, consider seeking technical support or consulting the docu
<translation type="unfinished">如果此過程太慢,請在 gnupg 組態檔案中適當設定金鑰伺服器位址(取決於您所在國家或地區的網絡情況)。</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="67"/>
- <source>Show Verify Details</source>
- <translation type="unfinished">顯示驗證詳細信息</translation>
- </message>
- <message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="75"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="64"/>
<source>Public key not found locally</source>
<translation type="unfinished">本地未找到公鑰</translation>
</message>
<message>
- <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="76"/>
+ <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="65"/>
<source>There is no target public key content in local for GpgFrontend to gather enough information about this Signature. Do you want to import the public key from Keyserver now?</source>
<translation type="unfinished">本地沒有目標公鑰內容供 GpgFrontend 收集有關此簽名的足夠信息。現在要從 Keyserver 導入公鑰嗎?</translation>
</message>
diff --git a/src/core/model/GpgKeyGenerateInfo.cpp b/src/core/model/GpgKeyGenerateInfo.cpp
index a8dcbd19..b1dcaa7a 100644
--- a/src/core/model/GpgKeyGenerateInfo.cpp
+++ b/src/core/model/GpgKeyGenerateInfo.cpp
@@ -35,8 +35,8 @@
namespace GpgFrontend {
-const KeyAlgo KeyGenerateInfo::kNoneAlgo = {"none", "None", "None",
- 0, 0, "0.0.0"};
+const KeyAlgo KeyGenerateInfo::kNoneAlgo = {
+ "none", KeyGenerateInfo::tr("None"), "None", 0, 0, "0.0.0"};
const QContainer<KeyAlgo> KeyGenerateInfo::kPrimaryKeyAlgos = {
kNoneAlgo,
diff --git a/src/core/model/GpgKeyGenerateInfo.h b/src/core/model/GpgKeyGenerateInfo.h
index 98902418..2956a00d 100644
--- a/src/core/model/GpgKeyGenerateInfo.h
+++ b/src/core/model/GpgKeyGenerateInfo.h
@@ -76,7 +76,8 @@ class GPGFRONTEND_CORE_EXPORT KeyAlgo {
QString supported_version_;
};
-class GPGFRONTEND_CORE_EXPORT KeyGenerateInfo {
+class GPGFRONTEND_CORE_EXPORT KeyGenerateInfo : public QObject {
+ Q_OBJECT
public:
static const KeyAlgo kNoneAlgo;
static const QContainer<KeyAlgo> kPrimaryKeyAlgos;
diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp
index 379c2a2d..6ff044f0 100644
--- a/src/ui/UserInterfaceUtils.cpp
+++ b/src/ui/UserInterfaceUtils.cpp
@@ -51,23 +51,12 @@
#include "ui/dialog/controller/GnuPGControllerDialog.h"
#include "ui/dialog/import_export/KeyServerImportDialog.h"
#include "ui/struct/settings_object/KeyServerSO.h"
-#include "ui/widgets/TextEdit.h"
namespace GpgFrontend::UI {
QScopedPointer<CommonUtils> CommonUtils::instance =
QScopedPointer<CommonUtils>(nullptr);
-void show_verify_details(QWidget *parent, int channel,
- InfoBoardWidget *info_board, GpgError error,
- const GpgVerifyResult &verify_result) {
- // take out result
- info_board->ResetOptionActionsMenu();
- info_board->AddOptionalAction(
- QCoreApplication::tr("Show Verify Details"),
- [=]() { VerifyDetailsDialog(parent, channel, error, verify_result); });
-}
-
void ImportUnknownKeyFromKeyserver(
QWidget *parent, int channel, const GpgVerifyResultAnalyse &verify_result) {
QMessageBox::StandardButton reply;
@@ -91,35 +80,6 @@ void ImportUnknownKeyFromKeyserver(
}
}
-void process_operation(QWidget *parent, const QString &waiting_title,
- const Thread::Task::TaskRunnable func,
- const Thread::Task::TaskCallback callback,
- DataObjectPtr data_object) {
- auto *dialog = new WaitingDialog(waiting_title, parent);
-
- auto *process_task = new Thread::Task(std::move(func), waiting_title,
- data_object, std::move(callback));
-
- QApplication::connect(process_task, &Thread::Task::SignalTaskEnd, dialog,
- &QDialog::close);
- QApplication::connect(process_task, &Thread::Task::SignalTaskEnd, dialog,
- &QDialog::deleteLater);
-
- // a looper to wait for the operation
- QEventLoop looper;
- QApplication::connect(process_task, &Thread::Task::SignalTaskEnd, &looper,
- &QEventLoop::quit);
-
- // post process task to task runner
- Thread::TaskRunnerGetter::GetInstance()
- .GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_GPG)
- ->PostTask(process_task);
-
- // block until task finished
- // this is to keep reference vaild until task finished
- looper.exec();
-}
-
auto CommonUtils::GetInstance() -> CommonUtils * {
if (!instance) {
instance.reset(new CommonUtils());
diff --git a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
index 53ff3b1d..ab3a5ac8 100644
--- a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
+++ b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
@@ -252,6 +252,8 @@ void KeyGenerateDialog::refresh_widgets_state() {
ui_->pExpireCheckBox->setChecked(gen_key_info_->IsNonExpired());
ui_->pExpireCheckBox->blockSignals(false);
+ ui_->generateButton->setDisabled(false);
+
if (gen_subkey_info_ == nullptr) {
ui_->sTab->setDisabled(true);
@@ -460,11 +462,7 @@ void KeyGenerateDialog::sync_gen_key_algo_info() {
supported_primary_key_algos_);
- ui_->generateButton->setDisabled(!found);
-
- if (found) {
- gen_key_info_->SetAlgo(algo);
- }
+ if (found) gen_key_info_->SetAlgo(found ? algo : KeyGenerateInfo::kNoneAlgo);
}
void KeyGenerateDialog::sync_gen_subkey_algo_info() {
@@ -472,8 +470,9 @@ void KeyGenerateDialog::sync_gen_subkey_algo_info() {
auto [s_found, algo] = GetAlgoByName(ui_->sAlgoComboBox->currentText(),
supported_subkey_algos_);
- ui_->generateButton->setDisabled(!s_found);
- if (s_found) gen_subkey_info_->SetAlgo(algo);
+ if (s_found) {
+ gen_subkey_info_->SetAlgo(s_found ? algo : KeyGenerateInfo::kNoneAlgo);
+ }
}
}
diff --git a/src/ui/function/GpgOperaHelper.cpp b/src/ui/function/GpgOperaHelper.cpp
index 161db70e..e94befdb 100644
--- a/src/ui/function/GpgOperaHelper.cpp
+++ b/src/ui/function/GpgOperaHelper.cpp
@@ -536,7 +536,8 @@ auto GpgOperaHelper::BuildOperasDecryptVerify(
void GpgOperaHelper::WaitForOpera(QWidget* parent, const QString& title,
const OperaWaitingCb& opera) {
QEventLoop looper;
- QPointer<WaitingDialog> const dialog = new WaitingDialog(title, parent);
+ QPointer<WaitingDialog> const dialog =
+ new WaitingDialog(title, false, parent);
connect(dialog, &QDialog::finished, &looper, &QEventLoop::quit);
connect(dialog, &QDialog::finished, dialog, &QDialog::deleteLater);
dialog->show();