aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md35
m---------modules0
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.de_DE.ts60
-rw-r--r--resource/lfs/locale/ts/GpgFrontend.zh_CN.ts74
-rw-r--r--src/ui/dialog/keypair_details/KeyPairOperaTab.cpp6
5 files changed, 103 insertions, 72 deletions
diff --git a/README.md b/README.md
index 57cddc6e..67851e15 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ GpgFrontend is **PERMANENTLY FREE** of charge. However, you can support us by
- [Developer Document](#developer-document)
- [Language Support](#language-support)
- [Supported Languages](#supported-languages)
+ - [Modules](#modules)
- [Contact](#contact)
- [Contributing \& Bugs Report](#contributing--bugs-report)
- [Project Maintainer](#project-maintainer)
@@ -42,7 +43,10 @@ GpgFrontend is **PERMANENTLY FREE** of charge. However, you can support us by
## User Manual
GpgFrontend provides documentations on its main features. If you want to know how to install, please
-read the [User Manual](https://www.gpgfrontend.bktus.com/#/quick-start) instead of README.
+read the [User Manual](https://www.gpgfrontend.bktus.com/overview/glance) instead of README.
+
+The code for the user manual is maintained in [this
+repository](https://github.com/saturneric/GpgFrontend-Manual.git).
## Developer Document
@@ -51,11 +55,14 @@ latest develop code. [Developer Document](https://doxygen.gpgfrontend.bktus.com)
will help you understand the source code and get involved more quickly in the
process of contributing to open source.
+The code for the developer documentations is maintained in [this
+repository](https://github.com/saturneric/GpgFrontend-Doxygen.git).
+
## Language Support
If you find an error in any of the translations or need to add a new one, we
welcome you to [join our translation
-work](https://www.gpgfrontend.bktus.com/#/contribute/translate-interface).
+work](https://www.gpgfrontend.bktus.com/appendix/translate-interface).
### Supported Languages
@@ -69,16 +76,32 @@ GpgFrontend currently supports an array of languages including:
Contributors: [SHOW](TRANSLATORS)
+## Modules
+
+GpgFrontend supports extensive module development, allowing users to customize
+their experience. Modules can encapsulate functionality, enabling users to
+enable or disable features as needed. Users can refer to existing module code
+for guidance and are encouraged to contribute to the [Module
+Repository](https://github.com/saturneric/GpgFrontend-Modules.git) to reach a
+broader audience.
+
+As the development is still in its infancy, there are not enough modules and
+many API interfaces have not been stabilized. So the discussion is open for the
+development of new modules and the introduction of API interfaces.
+
## Contact
-Please refer to [HERE](https://www.gpgfrontend.bktus.com/contact) for my contact details.
+Please refer to [HERE](https://www.gpgfrontend.bktus.com/overview/contact) for my contact details.
### Contributing & Bugs Report
-Feel free to dive in! [Open an issue](https://github.com/saturneric/GpgFrontend/issues/new) or submit PRs if you prefer
-to use GitHub. For anonymous users, Git patches can be delivered by [mail](mailto:[email protected]).
+Feel free to dive in! [Open an
+issue](https://github.com/saturneric/GpgFrontend/issues/new) or submit PRs if
+you prefer to use GitHub. For anonymous users, Git patches can be delivered by
+[mail](mailto:[email protected]). If you don't have a GitHub account or prefer not
+to register, you are welcome to communicate with me via email at
-[Contributing Guide](https://www.gpgfrontend.bktus.com/#/contribute/contribute)
+[Contributing Guide](https://www.gpgfrontend.bktus.com/appendix/contribute)
### Project Maintainer
diff --git a/modules b/modules
-Subproject efe066a18f1e6ec36c7a1ebcac80e11a7c1e46d
+Subproject 0bad8ba3e6b7574cba25ad11bf425f15700657e
diff --git a/resource/lfs/locale/ts/GpgFrontend.de_DE.ts b/resource/lfs/locale/ts/GpgFrontend.de_DE.ts
index 34fadd80..07450b89 100644
--- a/resource/lfs/locale/ts/GpgFrontend.de_DE.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.de_DE.ts
@@ -2777,7 +2777,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="102"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="562"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="558"/>
<source>Import A Paper Key</source>
<translation type="unfinished">Importieren eines Papierschlüssels</translation>
</message>
@@ -2825,7 +2825,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="231"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="277"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="320"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="509"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="505"/>
<source>Export Key To File</source>
<translation type="unfinished">Schlüssel in Datei exportieren</translation>
</message>
@@ -2833,7 +2833,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="232"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="278"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="321"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="510"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="506"/>
<source>Key Files</source>
<translation type="unfinished">Schlüsseldateien</translation>
</message>
@@ -2841,7 +2841,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="237"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="283"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="326"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="533"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="529"/>
<source>Export Error</source>
<translation type="unfinished">Exportfehler</translation>
</message>
@@ -2849,7 +2849,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="238"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="284"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="327"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="530"/>
<source>Couldn&apos;t open %1 for writing</source>
<translation type="unfinished">%1 konnte nicht zum Schreiben geöffnet werden</translation>
</message>
@@ -2861,21 +2861,21 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="247"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="294"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="478"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="474"/>
<source>You are about to export your</source>
<translation type="unfinished">Sie sind dabei, Ihre . zu exportieren</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="248"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="295"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="479"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="475"/>
<source> PRIVATE KEY </source>
<translation type="unfinished"> PRIVATEN SCHLÜSSEL </translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="249"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="296"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="480"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="476"/>
<source>This is NOT your Public Key, so DON&apos;T give it away.</source>
<translation type="unfinished">Dies ist NICHT Ihr öffentlicher Schlüssel, also geben Sie ihn NICHT weiter.</translation>
</message>
@@ -2896,7 +2896,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="297"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="486"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="482"/>
<source>Do you REALLY want to export your PRIVATE KEY?</source>
<translation type="unfinished">Möchten Sie WIRKLICH Ihren PRIVATEN SCHLÜSSEL exportieren?</translation>
</message>
@@ -2990,20 +2990,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="441"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="450"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="463"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="525"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="571"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="579"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="587"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="605"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="459"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="522"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="567"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="575"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="583"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="601"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="442"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="464"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="572"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="588"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="460"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="568"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="584"/>
<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>
@@ -3013,33 +3013,37 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation type="unfinished">Die Zieldatei ist zu groß für ein Schlüsselwiderrufszertifikat.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="477"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="473"/>
<source>Exporting private key as a Paper key</source>
<translation type="unfinished">Privaten Schlüssel als Papierschlüssel exportieren</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="481"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="477"/>
<source>A PaperKey is a human-readable printout of your private key, which can be used to recover your key if you lose access to your digital copy. </source>
<translation type="unfinished">Ein PaperKey ist ein von Menschen lesbarer Ausdruck Ihres privaten Schlüssels, mit dem Sie Ihren Schlüssel wiederherstellen können, wenn Sie den Zugriff auf Ihre digitale Kopie verlieren. </translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="485"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="481"/>
<source>Keep it in a safe place.</source>
<translation type="unfinished">Bewahren Sie es an einem sicheren Ort auf.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="526"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="606"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="523"/>
+ <source>An error occurred trying to generate Paper Key.</source>
+ <translation type="unfinished">Beim Versuch, einen Papierschlüssel zu erzeugen, ist ein Fehler aufgetreten.</translation>
+ </message>
+ <message>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="602"/>
<source>An error occurred trying to recover the Paper Key back to the private key.</source>
<translation type="unfinished">Beim Versuch, den Papierschlüssel in den privaten Schlüssel zurückzuverwandeln, ist ein Fehler aufgetreten.</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="563"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="559"/>
<source>Paper Key File</source>
<translation type="unfinished">Papier-Schlüsseldatei</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="580"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="576"/>
<source>The target file is too large for a paper key keyring.</source>
<translation type="unfinished">Die Zieldatei ist zu groß für einen Papierschlüsselanhänger.</translation>
</message>
@@ -5938,17 +5942,17 @@ Fals Daten und Signatur in einer Datei COMBINIERT sind, LASSEN SIE DIES LEER: </
<translation type="unfinished">Sourcecode Version: </translation>
</message>
<message>
- <location filename="../../../../src/core/GpgCoreInit.cpp" line="286"/>
+ <location filename="../../../../src/core/GpgCoreInit.cpp" line="283"/>
<source>GpgME initiation failed</source>
<translation>GpgME-Initiation fehlgeschlagen</translation>
</message>
<message>
- <location filename="../../../../src/core/GpgCoreInit.cpp" line="381"/>
+ <location filename="../../../../src/core/GpgCoreInit.cpp" line="378"/>
<source>GpgME Context initiation failed</source>
<translation>GpgME-Kontext-Initiation fehlgeschlagen</translation>
</message>
<message>
- <location filename="../../../../src/core/GpgCoreInit.cpp" line="390"/>
+ <location filename="../../../../src/core/GpgCoreInit.cpp" line="387"/>
<source>Gpg Key Database initiation failed</source>
<translation type="unfinished">Initiierung der Gpg-Schlüsseldatenbank fehlgeschlagen</translation>
</message>
diff --git a/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts b/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts
index 77f7aeb9..c5f18144 100644
--- a/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts
+++ b/resource/lfs/locale/ts/GpgFrontend.zh_CN.ts
@@ -2769,9 +2769,9 @@ This will result in loss of all cached form positions, statuses, key servers, et
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="102"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="562"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="558"/>
<source>Import A Paper Key</source>
- <translation type="unfinished">导入纸质密钥</translation>
+ <translation type="unfinished">导入纸密钥</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="112"/>
@@ -2806,7 +2806,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="184"/>
<source>Export Secret Key As A Paper Key</source>
- <translation type="unfinished">将私钥导出为纸质密钥</translation>
+ <translation type="unfinished">将私钥导出为纸密钥</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="204"/>
@@ -2817,7 +2817,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="231"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="277"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="320"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="509"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="505"/>
<source>Export Key To File</source>
<translation>将密钥导出到文件</translation>
</message>
@@ -2825,7 +2825,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="232"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="278"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="321"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="510"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="506"/>
<source>Key Files</source>
<translation>密钥文件</translation>
</message>
@@ -2833,7 +2833,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="237"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="283"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="326"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="533"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="529"/>
<source>Export Error</source>
<translation>导出错误</translation>
</message>
@@ -2841,7 +2841,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="238"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="284"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="327"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="534"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="530"/>
<source>Couldn&apos;t open %1 for writing</source>
<translation>无法打开 %1 进行写入</translation>
</message>
@@ -2853,21 +2853,21 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="247"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="294"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="478"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="474"/>
<source>You are about to export your</source>
<translation>您即将导出您的</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="248"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="295"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="479"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="475"/>
<source> PRIVATE KEY </source>
<translation> 私钥 </translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="249"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="296"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="480"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="476"/>
<source>This is NOT your Public Key, so DON&apos;T give it away.</source>
<translation>这不是你的公钥,所以不要把它给别人。</translation>
</message>
@@ -2888,7 +2888,7 @@ This will result in loss of all cached form positions, statuses, key servers, et
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="297"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="486"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="482"/>
<source>Do you REALLY want to export your PRIVATE KEY?</source>
<translation>你真的想导出你的私钥吗?</translation>
</message>
@@ -2982,20 +2982,20 @@ This will result in loss of all cached form positions, statuses, key servers, et
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="441"/>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="450"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="463"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="525"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="571"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="579"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="587"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="605"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="459"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="522"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="567"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="575"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="583"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="601"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
<location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="442"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="464"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="572"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="588"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="460"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="568"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="584"/>
<source>Cannot open this file. Please make sure that this is a regular file and it&apos;s readable.</source>
<translation>无法打开此文件。请确保这是一个普通文件,并且有读取权限。</translation>
</message>
@@ -3005,35 +3005,39 @@ This will result in loss of all cached form positions, statuses, key servers, et
<translation>目标文件对于一个密钥吊销证书来说太大了。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="477"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="473"/>
<source>Exporting private key as a Paper key</source>
- <translation type="unfinished">将私钥导出为纸质密钥</translation>
+ <translation type="unfinished">将私钥导出为纸密钥</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="481"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="477"/>
<source>A PaperKey is a human-readable printout of your private key, which can be used to recover your key if you lose access to your digital copy. </source>
- <translation type="unfinished">纸质密钥是私人密钥的人工可读打印件,如果丢失了密钥的数字版本,可以用它来恢复密钥。</translation>
+ <translation type="unfinished">纸密钥是私人密钥的人工可读打印件,如果丢失了密钥的数字版本,可以用它来恢复密钥。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="485"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="481"/>
<source>Keep it in a safe place.</source>
<translation type="unfinished">请妥善保管。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="526"/>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="606"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="523"/>
+ <source>An error occurred trying to generate Paper Key.</source>
+ <translation type="unfinished">尝试生成纸密钥时发生错误。</translation>
+ </message>
+ <message>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="602"/>
<source>An error occurred trying to recover the Paper Key back to the private key.</source>
- <translation type="unfinished">用纸质密钥恢复私钥时发生了错误。</translation>
+ <translation type="unfinished">用纸密钥恢复私钥时发生了错误。</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="563"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="559"/>
<source>Paper Key File</source>
- <translation type="unfinished">纸质密钥文件</translation>
+ <translation type="unfinished">纸密钥文件</translation>
</message>
<message>
- <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="580"/>
+ <location filename="../../../../src/ui/dialog/keypair_details/KeyPairOperaTab.cpp" line="576"/>
<source>The target file is too large for a paper key keyring.</source>
- <translation type="unfinished">目标文件对于一个纸质密钥文件来说太大了。</translation>
+ <translation type="unfinished">目标文件对于一个纸密钥文件来说太大了。</translation>
</message>
</context>
<context>
@@ -6004,17 +6008,17 @@ If Data And Signature is COMBINED within a single file, KEEP THIS EMPTY: </sourc
<translation type="unfinished">成功</translation>
</message>
<message>
- <location filename="../../../../src/core/GpgCoreInit.cpp" line="286"/>
+ <location filename="../../../../src/core/GpgCoreInit.cpp" line="283"/>
<source>GpgME initiation failed</source>
<translation type="unfinished">GpgME初始化失败</translation>
</message>
<message>
- <location filename="../../../../src/core/GpgCoreInit.cpp" line="381"/>
+ <location filename="../../../../src/core/GpgCoreInit.cpp" line="378"/>
<source>GpgME Context initiation failed</source>
<translation type="unfinished">GpgME上下文初始化失败</translation>
</message>
<message>
- <location filename="../../../../src/core/GpgCoreInit.cpp" line="390"/>
+ <location filename="../../../../src/core/GpgCoreInit.cpp" line="387"/>
<source>Gpg Key Database initiation failed</source>
<translation type="unfinished">Gpg密钥数据库初始化失败</translation>
</message>
diff --git a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
index 38649355..08564bec 100644
--- a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
@@ -518,9 +518,9 @@ void KeyPairOperaTab::slot_export_paper_key() {
qCDebug(ui) << "REQUEST_TRANS_KEY_2_PAPER_KEY callback: " << i << ei;
if (p["ret"] != "0" || p["paper_key"].isEmpty()) {
- QMessageBox::critical(this, tr("Error"),
- tr("An error occurred trying to recover the "
- "Paper Key back to the private key."));
+ QMessageBox::critical(
+ this, tr("Error"),
+ tr("An error occurred trying to generate Paper Key."));
return;
}