diff options
Diffstat (limited to '')
50 files changed, 978 insertions, 1188 deletions
@@ -1,22 +1,38 @@ # GPG Frontend -GPGFrontend is a modern, easy-to-use, compact, cross-platform, and installation-free gpg front-end tool. It visualizes -most of the common operations of gpg commands. It aims to allow ordinary users to quickly use gpg and make professional -users more convenient. Visit gpg. GPGFrontend supports some new features of OpenPGP. +GPGFrontend is a modern, easy-to-use, compact, cross-platform, and installation-free gpg front-end tool. By using +GPGFrontend, you can quickly encrypt and decrypt text or files. Or at the same time as the above operations, you can add +your own signature to let others know that this document or this paragraph of text was issued by you. -Before use, you only need to install gnupg in advance to make GPGFrontend run on Windows, Linux and macOS. +Furthermore, it visualizes most of the common operations of gpg commands. It aims to allow ordinary users to quickly use +gpg and make professional users more convenient. GPGFrontend supports some new features of OpenPGP. + +# Features +- No need to install. +- GPGFrontend can run on Windows, Linux and macOS. +- Just double-click, and then you can use it freely. +- Before use, you only need to install gnupg. A tool of a few MB. +- GPGFrontend supports multiple languages. + +How to Use it +--------- + +0. Install gnupg. To check if it is installed, you can enter gpg on the command line. +1. Unzip gpgfrontend.zip. The compressed package can be downloaded in Release. +2. Start GpgFrontend with gpgfrontend.exe or gpgfrontend (depending on your os). Purpose ----- -The GPGFrontend project is inherited from a relatively mature but not maintained gpg4usb project. It inherits the -stable, easy-to-use, compact, and installation-free features of gpg4usb, and plans to support some new features -of OpenPGP based on it and continue to improve the ease of use of the software, so that the gpg tool can be used by more -and more people use. +The GPGFrontend project inherit from a relatively mature but not maintained gpg4usb project. It inherits the stable, +easy-to-use, compact, and installation-free features of gpg4usb, and plans to support some new features of OpenPGP based +on it and continue to improve it. -My personal strength is always limited. GPGFrontend welcomes volunteers to join. You can use the GitHub platform to file -an issue, or submit a pull request. +GPGFrontend will add more functions in the future to improve the ease of use of GPG in end-to-end transmission. At the +same time, the addition of new functions does not affect the old basic functions. My personal strength is always +limited. GPGFrontend welcomes volunteers to join. You can use the GitHub platform to file an issue, or submit a pull +request. -The GPGFrontend project is as open source as gpg4usb, and it also insists on using open source codes and libraries. +The GPGFrontend project is as open source, and it also insists on using open source codes and libraries. Obtaining @@ -24,13 +40,6 @@ Obtaining You can get the available binary files of the project and the compressed package of its dependent resources in the release, and double-click to use it after decompression. -How to Use it ---------- - -0. Install gnupg. To check if it is installed, you can enter gpg on the command line. -1. Unzip gpgfrontend.zip. The compressed package can be downloaded in Release. -2. Start GpgFrontend with gpgfrontend.exe or gpgfrontend (depending on your os). - How to Build it --------- diff --git a/include/GpgFrontend.h b/include/GpgFrontend.h index e7d8c269..fcad90af 100644 --- a/include/GpgFrontend.h +++ b/include/GpgFrontend.h @@ -7,6 +7,7 @@ #include <clocale> #include <cerrno> #include <utility> +#include <list> #include <QtCore> #include <QtWidgets> @@ -17,15 +18,15 @@ #define PROJECT_NAME "GPGFrontend" #define BUILD_VERSION "1.0.0_Windows-10.0.19042_AMD64_Debug" -#define GIT_VERSION "develop_8842a0fa57dbc31e5ef8524323fb22dd88dbd039" +#define GIT_VERSION "develop_55316c75051e1b488f05a57c4d4a7695bb178322" #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define BUILD_TIMESTAMP "2021-06-18 17:03:56" +#define BUILD_TIMESTAMP "2021-06-19 18:07:40" #define GIT_BRANCH_NAME "develop" -#define GIT_COMMIT_HASH "8842a0fa57dbc31e5ef8524323fb22dd88dbd039" +#define GIT_COMMIT_HASH "55316c75051e1b488f05a57c4d4a7695bb178322" #endif //GPGFRONTEND_H_IN diff --git a/include/GpgFrontend.h.in b/include/GpgFrontend.h.in index 6cf6c7af..cec3be69 100644 --- a/include/GpgFrontend.h.in +++ b/include/GpgFrontend.h.in @@ -7,6 +7,7 @@ #include <clocale> #include <cerrno> #include <utility> +#include <list> #include <QtCore> #include <QtWidgets> diff --git a/include/MainWindow.h b/include/MainWindow.h index 14f91dbc..48d77d25 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -180,31 +180,11 @@ private slots: void slotOpenSettingsDialog(); /** - * @details Open online-tutorial in default browser. - */ - static void slotOpenTutorial(); - - /** - * @details Open integrated help in new tab. - */ - void slotOpenHelp(); - - /** - * @details Open integrated help in new tab with the specified page. - */ - void slotOpenHelp(const QString& page); - - /** * @details Show a warn message in status bar, if there are files in attachment folder. */ void slotCheckAttachmentFolder(); /** - * @details Open online translation tutorial in default browser. - */ - static void slotOpenTranslate(); - - /** * @details Replace double linebreaks by single linebreaks in currently active tab. */ void slotCleanDoubleLinebreaks(); @@ -302,7 +282,6 @@ private: QDockWidget *keylistDock; /** Encrypt Dock*/ QDockWidget *attachmentDock; /** Attachment Dock */ QDockWidget *infoBoardDock; - [[maybe_unused]] QDialog *genkeyDialog; /** Dialog for key generation */ QAction *newTabAct; /** Action to create new tab */ QAction *switchTabUpAct; /** Action to switch tab up*/ @@ -341,9 +320,6 @@ private: QAction *fileSignAct; /** Action to open dialog for signing file */ QAction *fileVerifyAct; /** Action to open dialog for verifying file */ QAction *openSettingsAct; /** Action to open settings dialog */ - QAction *openTranslateAct; /** Action to open translate doc*/ - QAction *openTutorialAct; /** Action to open tutorial */ - QAction *openHelpAct; /** Action to open tutorial */ QAction *showKeyDetailsAct; /** Action to open key-details dialog */ QAction *refreshKeysFromKeyserverAct; /** Action to refresh a key from keyserver */ QAction *uploadKeyToServerAct; /** Action to append selected keys to edit */ diff --git a/include/Mime.h b/include/Mime.h index 63c00e2f..c86ac630 100644 --- a/include/Mime.h +++ b/include/Mime.h @@ -64,7 +64,7 @@ public: return ""; } - [[maybe_unused]] QHash<QString, QString> getParams(const QString &key) { + QHash<QString, QString> getParams(const QString &key) { foreach(HeadElem tmp, headElems) { //qDebug() << "gv: " << tmp.name << ":" << tmp.value; if (tmp.name == key) @@ -107,7 +107,7 @@ class Mime { public: explicit Mime(QByteArray *message); // Constructor ~Mime(); // Destructor - [[maybe_unused]] static bool isMultipart(QByteArray *message); + static bool isMultipart(QByteArray *message); static bool isMime(const QByteArray *message); @@ -124,10 +124,7 @@ public: static void quotedPrintableDecode(const QByteArray &in, QByteArray &out); private: - [[maybe_unused]] QByteArray *mMessage; - [[maybe_unused]] QByteArray *mBoundary; QList<MimePart> mPartList; - }; #endif // __MIME_H__ diff --git a/include/gpg/GpgConstants.h b/include/gpg/GpgConstants.h index 6db7721f..64286ca4 100644 --- a/include/gpg/GpgConstants.h +++ b/include/gpg/GpgConstants.h @@ -22,8 +22,8 @@ * */ -#ifndef GPGCONSTANTS_H -#define GPGCONSTANTS_H +#ifndef GPG_CONSTANTS_H +#define GPG_CONSTANTS_H class QString; @@ -39,4 +39,4 @@ public: static const char *PGP_SIGNATURE_END; }; -#endif // GPGCONSTANTS_H +#endif // CONSTANTS_H diff --git a/include/gpg/GpgContext.h b/include/gpg/GpgContext.h index fb2762f3..eed7afe2 100644 --- a/include/gpg/GpgContext.h +++ b/include/gpg/GpgContext.h @@ -31,7 +31,7 @@ #include "GpgGenKeyInfo.h" #include "GpgKey.h" -using GpgKeyList = QLinkedList<GpgKey>; +using GpgKeyList = std::list<GpgKey>; class GpgImportedKey { public: @@ -39,7 +39,7 @@ public: int importStatus; }; -typedef QLinkedList<GpgImportedKey> GpgImportedKeyList; +typedef std::list<GpgImportedKey> GpgImportedKeyList; class GpgImportInformation { public: diff --git a/include/ui/EditorPage.h b/include/ui/EditorPage.h index 53d4625c..a06d6cd6 100644 --- a/include/ui/EditorPage.h +++ b/include/ui/EditorPage.h @@ -92,10 +92,7 @@ public: private: QTextEdit *textPage; /** The textedit of the tab */ QVBoxLayout *mainLayout; /** The layout for the tab */ - [[maybe_unused]] QWidget *notificationWidget{}; /** The notification widget shown at the buttom of the tab */ - [[maybe_unused]] QMenu *verifyMenu{}; /** The menu in the notifiaction widget */ QString fullFilePath; /** The path to the file handled in the tab */ - [[maybe_unused]] QLabel *verifyLabel{}; /** The label of the verify-notification widget */ bool signMarked{}; /** true, if the signed header is marked, false if not */ private slots: diff --git a/include/ui/FindWidget.h b/include/ui/FindWidget.h index ad98682c..2e9c67b0 100644 --- a/include/ui/FindWidget.h +++ b/include/ui/FindWidget.h @@ -52,7 +52,6 @@ private: QTextEdit *mTextpage; /** Textedit associated to the notification */ QLineEdit *findEdit; /** Label holding the text shown in infoBoard */ - [[maybe_unused]] QTextCharFormat cursorFormat; private slots: diff --git a/include/ui/KeyMgmt.h b/include/ui/KeyMgmt.h index c11280af..864413db 100755 --- a/include/ui/KeyMgmt.h +++ b/include/ui/KeyMgmt.h @@ -96,7 +96,6 @@ private: QAction *generateKeyDialogAct{}; QAction *closeAct{}; QAction *showKeyDetailsAct{}; - [[maybe_unused]] QMessageBox msgbox; KeyServerImportDialog *importDialog{}; protected: diff --git a/include/ui/KeyServerImportDialog.h b/include/ui/KeyServerImportDialog.h index f514368b..74ae864e 100644 --- a/include/ui/KeyServerImportDialog.h +++ b/include/ui/KeyServerImportDialog.h @@ -59,8 +59,10 @@ private: QPushButton *createButton(const QString &text, const char *member); - static QComboBox *createComboBox(); + QComboBox *createComboBox(); + QString appPath; + QSettings settings; GpgME::GpgContext *mCtx; KeyList *mKeyList; QLineEdit *searchLineEdit; @@ -73,7 +75,6 @@ private: QPushButton *importButton; QPushButton *searchButton; QTableWidget *keysTable{}; - [[maybe_unused]] QUrl url; QNetworkAccessManager *qnam{}; }; diff --git a/include/ui/QuitDialog.h b/include/ui/QuitDialog.h index 308a41fe..8d69cfd2 100755 --- a/include/ui/QuitDialog.h +++ b/include/ui/QuitDialog.h @@ -39,8 +39,6 @@ private slots: void slotMyDiscard(); private: - [[maybe_unused]] QAction *closeAct{}; - [[maybe_unused]] QLabel *nameLabel{}; bool discarded; QTableWidget *mFileList; }; diff --git a/include/ui/SettingsDialog.h b/include/ui/SettingsDialog.h index d2139a2e..5cb526f9 100755 --- a/include/ui/SettingsDialog.h +++ b/include/ui/SettingsDialog.h @@ -43,7 +43,6 @@ private: QSettings settings; QCheckBox *rememberPasswordCheckBox; - [[maybe_unused]] QCheckBox *importConfirmationcheckBox{}; QCheckBox *saveCheckedKeysCheckBox; QCheckBox *importConfirmationCheckBox; QComboBox *langSelectBox; diff --git a/include/ui/keygen/KeygenThread.h b/include/ui/keygen/KeygenThread.h index fad67e01..30478050 100644 --- a/include/ui/keygen/KeygenThread.h +++ b/include/ui/keygen/KeygenThread.h @@ -39,7 +39,6 @@ signals: private: GenKeyInfo *keyGenParams; GpgME::GpgContext *mCtx; - [[maybe_unused]] bool abort; QMutex mutex; protected: diff --git a/include/ui/keygen/SubkeyGenerateThread.h b/include/ui/keygen/SubkeyGenerateThread.h index 2441faa4..b442acea 100644 --- a/include/ui/keygen/SubkeyGenerateThread.h +++ b/include/ui/keygen/SubkeyGenerateThread.h @@ -41,8 +41,6 @@ private: const GpgKey mKey; GenKeyInfo *keyGenParams; GpgME::GpgContext *mCtx; - [[maybe_unused]] bool abort; - QMutex mutex; protected: diff --git a/include/ui/widgets/InfoBoardWidget.h b/include/ui/widgets/InfoBoardWidget.h index 4fdbdf9f..88c7cb04 100644 --- a/include/ui/widgets/InfoBoardWidget.h +++ b/include/ui/widgets/InfoBoardWidget.h @@ -97,8 +97,6 @@ private: KeyList *mKeyList; /** Table holding the keys */ QTextEdit *mTextPage{ nullptr }; /** Textedit associated to the notification */ QHBoxLayout *actionButtonLayout; - [[maybe_unused]] QVector<QString> verifyDetailStringVector; /** Vector containing the text for labels in verifydetaildialog */ - [[maybe_unused]] QVector<InfoBoardStatus> verifyDetailStatusVector; /** Vector containing the status for labels in verifydetaildialog */ }; diff --git a/resource/ts/gpg4usb_ar.ts b/resource/ts/gpg4usb_ar.ts index e47c5a7c..fade0b80 100644 --- a/resource/ts/gpg4usb_ar.ts +++ b/resource/ts/gpg4usb_ar.ts @@ -1631,58 +1631,58 @@ Weak -> Strong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">لا مفاتيح مُختارة</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1785,127 +1785,121 @@ Weak -> Strong</source> <translation>يظهر صفحة معلومات عن الأداة</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>المساعدة المُرفقة</translation> + <translation type="vanished">المساعدة المُرفقة</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>افتح المساعدة المُرفقة</translation> + <translation type="vanished">افتح المساعدة المُرفقة</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>المساعدة على ال&خطّ</translation> + <translation type="vanished">المساعدة على ال&خطّ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>يفتح المساعدة على الخط</translation> + <translation type="vanished">يفتح المساعدة على الخط</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>ترجِم gpg4usb</translation> + <translation type="vanished">ترجِم gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>ساهم بترجمة gpg4usb</translation> + <translation type="vanished">ساهم بترجمة gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>شغِّل المُر&شد</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>شغِّل المُرشد</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>ألحِق بالنصّ المفاتيح المختارة</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>يلحق بالنصّ في المحرر المفاتيح المختارة</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>انسخ عنوان البريد</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>ينسخ عنوان البريد الإلكتروني إلى حافظة القصاصات</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>أظهر بيانات المفتاح</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>أظهر بيانات هذا المفتاح</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>أزّل ترويسة PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>أضِف ترويسة PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&ملف</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&حرّر</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&عمِّ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>الم&فاتيح</translation> </message> @@ -1914,37 +1908,37 @@ Weak -> Strong</source> <translation type="vanished">ا&ستورد مفتاحا من...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>الاستغانو&غرافيا</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>&عرض</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>م&ساعدة</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>ملف</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>عمّ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>مفتاح</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>حرّر</translation> </message> @@ -1953,29 +1947,29 @@ Weak -> Strong</source> <translation type="vanished">تحرير خاص</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translatorcomment>This is the tool tip. It shouldn't have ellipsis</translatorcomment> <translation>يستورد مفتاحا</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translatorcomment>This is the button's label. It should have "from" appended to it to be more intuitive</translatorcomment> <translation>استورد مفتاحا من...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>يعمِّي أو يظهِّر ملفات</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>ملف...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>جاهز</translation> </message> @@ -1984,7 +1978,7 @@ Weak -> Strong</source> <translation type="vanished">عمّ لأجل:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>ملفات مُرفقة:</translation> </message> @@ -2030,17 +2024,17 @@ Alessandro (pt_br) و Kirill (ru) و Phol (es) و Viriato (es) و Serse (it) و <translation type="vanished"> و GPGME </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>يوجد ملف غير معمّى في دليل المُرفقات</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>توجد</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation>ملفات غير مُعمّاة في دليل المرفقات</translation> </message> diff --git a/resource/ts/gpg4usb_de.ts b/resource/ts/gpg4usb_de.ts index 2e94fa9c..13375e3c 100644 --- a/resource/ts/gpg4usb_de.ts +++ b/resource/ts/gpg4usb_de.ts @@ -1159,53 +1159,53 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Kein Schlüssel ausgewählt</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1308,117 +1308,111 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation> <translation>Zeige die Information über die Anwendung</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>Integrierte Hilfe</translation> + <translation type="vanished">Integrierte Hilfe</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>Öffne die integrierte Hilfe</translation> + <translation type="vanished">Öffne die integrierte Hilfe</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>Online &Hilfe</translation> + <translation type="vanished">Online &Hilfe</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>Öffne die Online Hilfe</translation> + <translation type="vanished">Öffne die Online Hilfe</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>Übersetze gpg4usb</translation> + <translation type="vanished">Übersetze gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>Übersetze gpg4usb selbst</translation> + <translation type="vanished">Übersetze gpg4usb selbst</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>Öffne &Assistenten</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>Öffne Assistenten für erste Schritte</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>Hänge die ausgewählten Schlüssel an den Text an</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>Hänge den gewählten Schhlüssel an den Text im Editor an</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>Kopiere EMail-Adresse</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>Kopiere die ausgewählten EMail-Adresse in die Zwischenablage</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>Eigenschaften anzeigen</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>Details zu diesem Schlüssel anzeigen</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&Bearbeiten</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&Crypt</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>Sch&lüssel</translation> </message> @@ -1427,7 +1421,7 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation> <translation type="vanished">&Importiere Schlüssel aus...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&Steganografie</translation> </message> @@ -1440,47 +1434,47 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation> <translation type="vanished"><center>Diese Anwendung erlaubt es, auf einfache <br>Art Texte und Dateien zu ver- und entschlüsseln. <br>Sie steht unter der GPL v3.0<br><br><b>Entwickler:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Übersetzung:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>Falls sie Fragen und/oder Vorschläge haben,<br>schauen Sie auf unsere<br><a href="http://gpg4usb.cpunk.de/contact.php">Kontaktseite</a> <br>oder senden Sie eine Email an unsere Mailingliste<br>unter <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>Entferne PGP Header</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>Füge PGP Header hinzu</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>&Ansicht</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>Crypt</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>Schlüssel</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> @@ -1489,27 +1483,27 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation> <translation type="vanished">Spezial Bearbeiten</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>Importiere Schlüssel aus...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>Importiere Schlüssel</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>Verschlüssele oder entschlüssele Datei</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>Datei..</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>Fertig</translation> </message> @@ -1518,7 +1512,7 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation> <translation type="vanished">Verschlüssele für:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>Angehängte Dateien:</translation> </message> @@ -1539,17 +1533,17 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation> <translation type="vanished"> und GPGME </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>Es gibt unverschlüsselte Dateien im Attachment Ordner</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>Es gibt</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation>unverschlüsselte Dateien im Attachment Ordner</translation> </message> diff --git a/resource/ts/gpg4usb_el.ts b/resource/ts/gpg4usb_el.ts index 50c3168d..eceb408a 100644 --- a/resource/ts/gpg4usb_el.ts +++ b/resource/ts/gpg4usb_el.ts @@ -1164,53 +1164,53 @@ Weak -> Strong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Δεν επιλέχθηκε κλειδί</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1313,117 +1313,111 @@ Weak -> Strong</source> <translation>Εμφάνιση του διαλόγου μνείας για την εφαρμογή</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>Ενσωματωμένη βοήθεια</translation> + <translation type="vanished">Ενσωματωμένη βοήθεια</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>Άνοιγμα ενσωματωμένης βοήθειας</translation> + <translation type="vanished">Άνοιγμα ενσωματωμένης βοήθειας</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>Διαδικτυακά &βοηθήματα εκμάθησης</translation> + <translation type="vanished">Διαδικτυακά &βοηθήματα εκμάθησης</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>Άνοιγμα των διαδικτυακών βοηθημάτων εκμάθησης</translation> + <translation type="vanished">Άνοιγμα των διαδικτυακών βοηθημάτων εκμάθησης</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>Μεταφράστε το gpg4usb</translation> + <translation type="vanished">Μεταφράστε το gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>Μεταφράστε οι ίδιοι το gpg4usb</translation> + <translation type="vanished">Μεταφράστε οι ίδιοι το gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>&Άνοιγμα βοηθού ρυθμίσεων</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>Άνοιγμα του βοηθού ρυθμίσεων</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>Επισύναψη των επιλεγμένων κλειδιών σε κείμενο</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>Επισύναψη των επιλεγμένων κλειδιών σε κείμενο του συντάκτη</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>Αντιγραφή διεύθυνσης ηλ. ταχυδρομείου</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>Αντιγραφή των επιλεγμένων διευθύνσεων ηλ. ταχυδρομείου στην προσωρινή μνήμη</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>Εμφάνιση των λεπτομερειών κλειδιών</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>Εμφάνιστη των λεπτομερειών για το κλειδί αυτό</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&Αρχείο</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&Επεξεργασία</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&Κρυπτεία</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>&Κλειδιά</translation> </message> @@ -1432,7 +1426,7 @@ Weak -> Strong</source> <translation type="vanished">Ε&ισαγωγή κλειδιού από...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&Στεγανογραφία</translation> </message> @@ -1445,47 +1439,47 @@ Weak -> Strong</source> <translation type="vanished"><center>Η εφαρμογή αυτή επιτρέπει την απλή κρυπτογράφηση<br> και αποκρυπτογράφηση μηνυμάτων κειμένου ή αρχείων. .<br>Αδειοδοτείται υπό την άδεια GPL v3 <br><br><b>Ανάπτυξη:</b><br>Bene, Heimer, Juergen, Nils, Ubbo <br><br><b>Μετάφραση:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br> Αν έχετε ερωτήσεις ή προτάσεις, ρίξτε μια ματιά<br/><a href="http://gpg4usb.cpunk.de/contact.php"> στην σελίδα των επαφών μας</a> ή στείλτε μας ένα μήνυμα<br/> στην λίστα ταχυδρομείου <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>Διαγραφή της κεφαλίδας PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>Προσθήκη κεφαλίδας PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>&Προβολή</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>&Βοήθεια</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>Αρχείο</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>Κρύπτη</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>Κλειδή</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>Επεξεργασία</translation> </message> @@ -1494,27 +1488,27 @@ Weak -> Strong</source> <translation type="vanished">Ειδική επεξεργασία</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>Εισαγωγή κλειδιού από...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>Εισαγωγή κλειδιού</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>Κρυπτογράφηση ή αποκρυπτογράφηση αρχείου</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>Αρχείο..</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>Έτοιμο</translation> </message> @@ -1523,7 +1517,7 @@ Weak -> Strong</source> <translation type="vanished">Κρυπτογράφηση για:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>Επισυναπτόμενα αρχεία:</translation> </message> @@ -1544,17 +1538,17 @@ Weak -> Strong</source> <translation type="vanished"> και GPGME </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>Στον κατάλογο επισυναπτομένων υπάρχει ένα αποκρυπτογραφημένο αρχείο</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>Υπάρχουν </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation>αποκρυπτογραφημένα αρχεία στον κατάλογο επισυναπτομένων</translation> </message> diff --git a/resource/ts/gpg4usb_en.ts b/resource/ts/gpg4usb_en.ts index 3a254c74..9308768d 100644 --- a/resource/ts/gpg4usb_en.ts +++ b/resource/ts/gpg4usb_en.ts @@ -224,53 +224,53 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -366,211 +366,181 @@ </message> <message> <location filename="../../src/MainWindow.cpp" line="364"/> - <source>Integrated Help</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="365"/> - <source>Open integrated Help</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="368"/> - <source>Online &Tutorials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="369"/> - <source>Open Online Tutorials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="372"/> - <source>Translate gpg4usb</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="373"/> - <source>Translate gpg4usb yourself</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="376"/> <source>Open &Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpg4usb_es.ts b/resource/ts/gpg4usb_es.ts index c4665ba9..17dd1d4c 100644 --- a/resource/ts/gpg4usb_es.ts +++ b/resource/ts/gpg4usb_es.ts @@ -1156,27 +1156,27 @@ gpg4usb intentara ahora importar la(s) llave(s).</translation> </message> <message> <source>Integrated Help</source> - <translation>Ayuda Integrada</translation> + <translation type="vanished">Ayuda Integrada</translation> </message> <message> <source>Open integrated Help</source> - <translation>Abrir Ayuda integrada</translation> + <translation type="vanished">Abrir Ayuda integrada</translation> </message> <message> <source>Online &Tutorials</source> - <translation>&Tutoriales en línea</translation> + <translation type="vanished">&Tutoriales en línea</translation> </message> <message> <source>Open Online Tutorials</source> - <translation>Abrir Tutoriales en línea</translation> + <translation type="vanished">Abrir Tutoriales en línea</translation> </message> <message> <source>Translate gpg4usb</source> - <translation>Traducir gpg4usb</translation> + <translation type="vanished">Traducir gpg4usb</translation> </message> <message> <source>Translate gpg4usb yourself</source> - <translation>Traduzca usted mismo gpg4usb</translation> + <translation type="vanished">Traduzca usted mismo gpg4usb</translation> </message> <message> <source>Open &Wizard</source> diff --git a/resource/ts/gpg4usb_fr.ts b/resource/ts/gpg4usb_fr.ts index ce063d68..71ac7339 100644 --- a/resource/ts/gpg4usb_fr.ts +++ b/resource/ts/gpg4usb_fr.ts @@ -1163,53 +1163,53 @@ gpg4usb va essayer d'importer les clefs.</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Aucune clef selectionnée</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1312,117 +1312,111 @@ gpg4usb va essayer d'importer les clefs.</translation> <translation>Afficher la fenêtre A Propos de</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>Aide &intégrée</translation> + <translation type="vanished">Aide &intégrée</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>Ouvrir l'aide intégrée</translation> + <translation type="vanished">Ouvrir l'aide intégrée</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>Tutoriaux en &ligne</translation> + <translation type="vanished">Tutoriaux en &ligne</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>Ouvrir tutoriaux en ligne</translation> + <translation type="vanished">Ouvrir tutoriaux en ligne</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>Traduire &gpg4usb</translation> + <translation type="vanished">Traduire &gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>Traduire gpg4usb vous-même</translation> + <translation type="vanished">Traduire gpg4usb vous-même</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>&Ouvrir l'assistant</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>Ouvrir l'assistant</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>Ajouter la clef sélectionnée au texte</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>Ajouter les clefs sélectionnées aux texte dans l'éditeur</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>Copier adresse email</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>Copier l'adresse mail dans le presse-papiers</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>Afficher propriétés de la clef</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>Afficher les propriétés de cette clef</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&Edition</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&Chiffrage</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>C&lefs</translation> </message> @@ -1431,7 +1425,7 @@ gpg4usb va essayer d'importer les clefs.</translation> <translation type="vanished">&Importer des clefs de...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&Stéganographie</translation> </message> @@ -1444,47 +1438,47 @@ gpg4usb va essayer d'importer les clefs.</translation> <translation type="vanished"><center>Cette application permet le chiffrage et le<br>déchiffrage simples de messages ou de fichiers.<br>Il est sous licence GPL v3<br><br><b>Développeurs:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Traductions:</b><br/>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es), Pierre Fauque (fr)<br><br>Si vous avez des questions ou des suggestions,<br/>jetez un oeil à notre <a href="http://gpg4usb.cpunk.de/contact.php">page de contact</a><br/>ou<br/>envoyez un mail à notre<br/> mailing list à <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>Supprimer en-tête PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>Ajouter en-tête PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>Affic&her</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>&Aide</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>Fichier</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>Chiffrage</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>Clef</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>Edition</translation> </message> @@ -1493,27 +1487,27 @@ gpg4usb va essayer d'importer les clefs.</translation> <translation type="vanished">Edition spéciale</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>Importer clef de...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>Importer clef</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>Chiffrer ou déchiffrer fichier</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>Fichier..</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>Prêt</translation> </message> @@ -1522,7 +1516,7 @@ gpg4usb va essayer d'importer les clefs.</translation> <translation type="vanished">Chiffrer pour</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>Fichiers joints:</translation> </message> @@ -1535,17 +1529,17 @@ gpg4usb va essayer d'importer les clefs.</translation> <translation type="vanished"> et GPGME </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>Il y a un fichier non chiffré dans le dossier pièces jointes</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>Il y a </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation> fichiers non chiffrés dans le dossier pièces jointes</translation> </message> diff --git a/resource/ts/gpg4usb_he.ts b/resource/ts/gpg4usb_he.ts index 3eb95e13..81bce16e 100644 --- a/resource/ts/gpg4usb_he.ts +++ b/resource/ts/gpg4usb_he.ts @@ -1162,53 +1162,53 @@ Weak -> Strong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">לא נבחר מפתח</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1311,117 +1311,111 @@ Weak -> Strong</source> <translation>להציג את חלון האודות של היישום</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>עזרה מובנית</translation> + <translation type="vanished">עזרה מובנית</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>לפתוח את העזרה המובנת</translation> + <translation type="vanished">לפתוח את העזרה המובנת</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>מדריכים &מקוונים</translation> + <translation type="vanished">מדריכים &מקוונים</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>לפתוח את המדריכין המקוונים</translation> + <translation type="vanished">לפתוח את המדריכין המקוונים</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>תרגום gpg4usb</translation> + <translation type="vanished">תרגום gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>תרגם את gpg4usb</translation> + <translation type="vanished">תרגם את gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>פתיחת &אשף</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>לפתוח את האשף</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>לצרף את המפתח/ות שנבחרו לטקסט</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>לצרף את המפתחות שנבחרו לטקסט שבעורך</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>להעתיק כתובת דוא"ל</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>העתקת כתובות דוא"ל שנבחרו ללוח ההדבקה</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>הצגת נתוני מפתח</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>להציג פרטים אודות מפתח זה</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&קובץ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&עריכה</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&הצפנה</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>&מפתחות</translation> </message> @@ -1430,7 +1424,7 @@ Weak -> Strong</source> <translation type="vanished">&יבוא מפתח מ...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&סטגנוגרפיה</translation> </message> @@ -1443,47 +1437,47 @@ Weak -> Strong</source> <translation type="vanished"><center>תוכנה זו מאפשרת הצפנה ופענוח <br>פשוטים של הודעות טקסט וקבצים.<br>היא מופצת תחת רישיון GPL v3<br><br><b>מפתחים:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>תרגום:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es) <br><br>אם יש לך הצעות או שאלות ממולץ להציץ<br/>בדף <a href="http://gpg4usb.cpunk.de/contact.php">יצירת הקשר</a> שלנו או לשלוח מייל <br/> לרשימת התפוצה שלנו <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>הסרת כותרת PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>הוספת כותרת PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>&צפייה</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>&עזרה</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>קובץ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>הצפנה</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>מפתח</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>עריכה</translation> </message> @@ -1492,27 +1486,27 @@ Weak -> Strong</source> <translation type="vanished">עריכה מיוחדת</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>יבוא מפתח מ...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>יבוא מפתח</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>הצפנת או פענוח קובץ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>קובץ..</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>מוכן</translation> </message> @@ -1521,7 +1515,7 @@ Weak -> Strong</source> <translation type="vanished">להצפין עבור:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>קבצים מצורפים:</translation> </message> @@ -1542,17 +1536,17 @@ Weak -> Strong</source> <translation type="vanished"> ו- GPGME </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>יש קובץ לא מוצפן בספריית הקבצים המצורפים</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>יש </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation> קבצים לא מוצפנים בספריית הקבצים המצורפים</translation> </message> diff --git a/resource/ts/gpg4usb_ja.ts b/resource/ts/gpg4usb_ja.ts index bdfce013..bf1a882d 100644 --- a/resource/ts/gpg4usb_ja.ts +++ b/resource/ts/gpg4usb_ja.ts @@ -1080,53 +1080,53 @@ Weak -> Strong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">鍵が選択されていません</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1229,117 +1229,111 @@ Weak -> Strong</source> <translation>アプリケーションのアバウトボックスを表示する</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>総合ヘルプ</translation> + <translation type="vanished">総合ヘルプ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>総合ヘルプを開く</translation> + <translation type="vanished">総合ヘルプを開く</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>オンラインチュートリアル</translation> + <translation type="vanished">オンラインチュートリアル</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>オンラインチュートリアルを開く</translation> + <translation type="vanished">オンラインチュートリアルを開く</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>gpg4usbを翻訳する</translation> + <translation type="vanished">gpg4usbを翻訳する</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>gpg4usbをあなたが翻訳する</translation> + <translation type="vanished">gpg4usbをあなたが翻訳する</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>ウィザードを開く</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>ウィザードを開く</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>選択された鍵をテキストに書き足す</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>選択された鍵をエディタに追加添付する</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>メールアドレをコピー</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>メッセージをコピー</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>鍵の詳細を表示する</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>この鍵の詳細を表示する</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>ファイル</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>エディット</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>暗号</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>鍵</translation> </message> @@ -1348,7 +1342,7 @@ Weak -> Strong</source> <translation type="vanished">鍵をインポートする</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>ステガノグラフィー</translation> </message> @@ -1357,47 +1351,47 @@ Weak -> Strong</source> <translation type="vanished">アバウト</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>PGPヘッダーを取り除く</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>PGPヘッダーを追加</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>表示</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>ヘルプ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>ファイル</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>暗号</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>鍵</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>エディット</translation> </message> @@ -1406,27 +1400,27 @@ Weak -> Strong</source> <translation type="vanished">特別なエディット</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>鍵をインポートする</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>鍵をインポート</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>ファイルを暗号化または復号化する</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>ファイル</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>準備完了</translation> </message> @@ -1435,7 +1429,7 @@ Weak -> Strong</source> <translation type="vanished">誰に対して暗号化するか</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>添付ファイル</translation> </message> @@ -1444,17 +1438,17 @@ Weak -> Strong</source> <translation type="vanished">とGPGME</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>添付フォルダーに暗号化されていないファイルがひとつある</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>そこにある</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation>添付されたフォルダの暗号化されていないファイル</translation> </message> diff --git a/resource/ts/gpg4usb_my.ts b/resource/ts/gpg4usb_my.ts index f559630f..2d6a16ea 100644 --- a/resource/ts/gpg4usb_my.ts +++ b/resource/ts/gpg4usb_my.ts @@ -755,53 +755,53 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">ကီး ရွေးချယ်မထားပါ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -904,117 +904,95 @@ <translation type="unfinished">ဒီလုပ်ငန်းသုံး ဆော့ဗ်ဝဲရဲ့ အကြောင်းအရာ ဇယားကို ဖေါ်ပြရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> - <source>Integrated Help</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="365"/> - <source>Open integrated Help</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="368"/> - <source>Online &Tutorials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="369"/> - <source>Open Online Tutorials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation type="unfinished">gpg4usb ကို ဘာသာပြန်ဆိုရန်</translation> + <translation type="obsolete">gpg4usb ကို ဘာသာပြန်ဆိုရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation type="unfinished">gpg4usb ကို ကိုယ်တိုင် ဘာသာပြန်ဆိုရန်</translation> + <translation type="obsolete">gpg4usb ကို ကိုယ်တိုင် ဘာသာပြန်ဆိုရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation type="unfinished">ရွေးချယ်ထားတဲ့ ကီး(များ)ကို စာသားနဲ့ ပူးတွဲပေးရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation type="unfinished">ရွေးချယ်ထားတဲ့ ကီးများကို အယ်ဒီတာထဲမှာ စာသားနဲ့ ပူးတွဲပေးရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation type="unfinished">အီးမေးလ် လိပ်စာကို ကော်ပီကူးရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation type="unfinished">အီးမေးလ် လိပ်စာကို clipboard မှာ ကော်ပီကူးရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation type="unfinished">ကီးအသေးစိတ်ကို ဖေါ်ပြရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation type="unfinished">ဒီကီးရဲ့ အသေးစိတ်ကို ဖေါ်ပြရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation type="unfinished">ဖိုင်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation type="unfinished">တည်းဖြတ်ရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation type="unfinished">စာဝှက်ရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation type="unfinished">ကီး</translation> </message> @@ -1023,7 +1001,7 @@ <translation type="obsolete">ကီးကို တင်သွင်းလာမဲ့ နေရာ...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation type="unfinished"></translation> </message> @@ -1032,72 +1010,72 @@ <translation type="obsolete">အကြောင်းအရာ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation type="unfinished">ကြည့်ရှုရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation type="unfinished">အကူအညီ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation type="unfinished">စာဝှက်ရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation type="unfinished">ကီး</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation type="unfinished">တည်းဖြတ်ရန်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation type="unfinished">အဆင်သင့်</translation> </message> @@ -1106,22 +1084,22 @@ <translation type="obsolete">စာဝှက်မဲ့အချက် -</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation type="unfinished">ပူးတွဲထားတဲ့ ဖိုင်များ -</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation type="unfinished">ပူးတွဲထားတဲ့ ဖိုင်ထဲမှာ စာဝှက်မထားတဲ့ ဖိုင်တခု ရှိတယ်</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpg4usb_pl.ts b/resource/ts/gpg4usb_pl.ts index 4630d615..52549573 100644 --- a/resource/ts/gpg4usb_pl.ts +++ b/resource/ts/gpg4usb_pl.ts @@ -1155,53 +1155,53 @@ gpg4usb będzie teraz próbować importować klucz(e).</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Nie wybrano klucza</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1304,117 +1304,111 @@ gpg4usb będzie teraz próbować importować klucz(e).</translation> <translation>Pokaż okno o programie</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>Zintegrowana pomoc</translation> + <translation type="vanished">Zintegrowana pomoc</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>Otwórz zintegrowana pomoc</translation> + <translation type="vanished">Otwórz zintegrowana pomoc</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>Pomoc techniczna &online</translation> + <translation type="vanished">Pomoc techniczna &online</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>Otwórz przewodniki online</translation> + <translation type="vanished">Otwórz przewodniki online</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>Tłumacz gpg4usb</translation> + <translation type="vanished">Tłumacz gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>Tłumacz gpg4usb samodzielnie</translation> + <translation type="vanished">Tłumacz gpg4usb samodzielnie</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>Otwórz &kreatora</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>Otwórz kreatora</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>Dołącz wybrany klucz(e) do tekstu</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>Dołącz wybrany klucz(e) do tekstu w edytorze</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>kopiuj email</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>Kopiuje zaznaczony e-mail do schowka</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>Pokaż szczegócza klucza</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>Wyświetlanie szczegółów dla tego klucza</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&Plik</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&Edycja</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&Szyfracja</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>&Klucz</translation> </message> @@ -1423,7 +1417,7 @@ gpg4usb będzie teraz próbować importować klucz(e).</translation> <translation type="vanished">&Importuj klucz z...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&Steganografia</translation> </message> @@ -1432,47 +1426,47 @@ gpg4usb będzie teraz próbować importować klucz(e).</translation> <translation type="vanished"><center>Aplikacja ta umożliwia proste szyfrowanie <br>i deszyfrowanie wiadomości tekstowych lub plików.<br>Jest oparta na licencji GPL v3<br><br><b>Twórca:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Tłumaczenie:</b><br> Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>Jeśli masz jakieś pytania lub propozycje odwiedź<br/> naszą stronę <a href="http://gpg4usb.cpunk.de/contact.php">Strona domowa</a> lub wyślij e-mail do naszej<br/> Listy dyskusyjnej na <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>Usuń nagłówek PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>Dodaj nagłówek PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>&Widok</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>&Pomoc</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>Plik</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>Klucz</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>Edycja</translation> </message> @@ -1481,27 +1475,27 @@ gpg4usb będzie teraz próbować importować klucz(e).</translation> <translation type="vanished">Specjalna edycja</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>Importuj klucz z ...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>Importuj klucz</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>Szyfrowanie i deszyfrowanie plików</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>Plik...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>Gotowy</translation> </message> @@ -1510,7 +1504,7 @@ gpg4usb będzie teraz próbować importować klucz(e).</translation> <translation type="vanished">Szyfruj dla:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>Dołączone pliki:</translation> </message> @@ -1523,17 +1517,17 @@ gpg4usb będzie teraz próbować importować klucz(e).</translation> <translation type="obsolete"><center>Aplikacja ta umożliwia proste szyfrowanie <br>i deszyfrowanie wiadomości tekstowych lub plików.<br>Jest oparta na licencji GPL v3<br><br><b>Twórca:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Tłumaczenie:</b><br> Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>Jeśli masz jakieś pytania lub propozycje odwiedź<br/> naszą stronę <a href="http://gpg4usb.cpunk.de/contact.php">Strona domowa</a> lub wyślij e-mail do naszej<br/> Listy dyskusyjnej na <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>Tam jest jeden plik w folderze niezaszyfrowanych załączników</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>Istnieją</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation>niezaszyfrowane pliki w folderze załączników</translation> </message> diff --git a/resource/ts/gpg4usb_pt_BR.ts b/resource/ts/gpg4usb_pt_BR.ts index cb90473a..92448a42 100644 --- a/resource/ts/gpg4usb_pt_BR.ts +++ b/resource/ts/gpg4usb_pt_BR.ts @@ -1155,123 +1155,119 @@ gpg4usb tentará importar a(s) chave(s).</translation> <translation>Gerenciar &Chaves</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>Ajuda Integrada</translation> + <translation type="vanished">Ajuda Integrada</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>Abrir Ajuda Integrada</translation> + <translation type="vanished">Abrir Ajuda Integrada</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>&Tutoriais Online</translation> + <translation type="vanished">&Tutoriais Online</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>Abrir Tutoriais Online</translation> + <translation type="vanished">Abrir Tutoriais Online</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>Importar chaves de...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>Importar chave </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>Encriptar ou decriptar Arquivo</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>Arquivo.. </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Chave não selecionada</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1400,72 +1396,70 @@ gpg4usb tentará importar a(s) chave(s).</translation> <translation>Exibe a janela 'sobre'</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>Traduzir gpg4usb</translation> + <translation type="vanished">Traduzir gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>Traduza o gpg4usb você mesmo</translation> + <translation type="vanished">Traduza o gpg4usb você mesmo</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>Abrir o &Auxiliar</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>Abrir o Auxiliar</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>Anexar Chave(s) Selecionada(s) ao Texto</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>Anexar Chave(s) Selecionada(s) ao Texto no Editor</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>Copiar o endereço de EMail</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>Copiar o endereço de EMail selecionado para a área de transferência</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>Exibir detalhes da chave</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>Exibir Detalhes da Chave</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&Arquivo</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>E&ditar</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&Encriptar</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>&Chaves</translation> </message> @@ -1474,47 +1468,47 @@ gpg4usb tentará importar a(s) chave(s).</translation> <translation type="vanished">&Importar Chave de...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&Esteganografia</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>Remover cabeçalho PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>Incluir cabeçalho PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>E&xibir</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>A&juda</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>Arquivo</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>Encriptar</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>Chave</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>Editar</translation> </message> @@ -1523,7 +1517,7 @@ gpg4usb tentará importar a(s) chave(s).</translation> <translation type="vanished">Edição especial</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>Pronto</translation> </message> @@ -1532,7 +1526,7 @@ gpg4usb tentará importar a(s) chave(s).</translation> <translation type="vanished">Encriptar para:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>Arquivos anexos:</translation> </message> @@ -1545,17 +1539,17 @@ gpg4usb tentará importar a(s) chave(s).</translation> <translation type="vanished"><center>Esse programa permite a encriptação e a<br>decriptação de mensagens de texto ou arquivos.<br>Distribuido sob a licença GPL v3<br><br><b>Desenvolvedores:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Tradução:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>Caso tenha dúvidas ou sugestões acesse nossa<br/><a href="http://gpg4usb.cpunk.de/contact.php">página de contato</a> ou envie um email para nossa<br/> lista de email em <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>Há um arquivo não decriptado na pasta de anexos</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>Existem </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation> arquivos não decriptados na pasta de anexos</translation> </message> diff --git a/resource/ts/gpg4usb_ru.ts b/resource/ts/gpg4usb_ru.ts index a740d79f..bee8f370 100644 --- a/resource/ts/gpg4usb_ru.ts +++ b/resource/ts/gpg4usb_ru.ts @@ -1165,53 +1165,53 @@ gpg4usb попробует импортировать ключ(и).</translation <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Не выбран Ключ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1314,117 +1314,111 @@ gpg4usb попробует импортировать ключ(и).</translation <translation>Показать инфо о программе</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>Встроенная справка</translation> + <translation type="vanished">Встроенная справка</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>Открыть встроенную справку</translation> + <translation type="vanished">Открыть встроенную справку</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>Онлайн-&руководство</translation> + <translation type="vanished">Онлайн-&руководство</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>Открыть онлайн-руководство</translation> + <translation type="vanished">Открыть онлайн-руководство</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>Перевести gpg4usb</translation> + <translation type="vanished">Перевести gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>Самостоятельно перевести gpg4usb</translation> + <translation type="vanished">Самостоятельно перевести gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>Открыть &Мастер</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>Открыть Мастер</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>Добавить выбранн. ключ(и) к тексту</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>Добавить выбранный ключ к тексту в редакторе</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>Копировать адрес eMail</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>Копировать выбранный адрес eMail в Буфер Обмена</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>Показать свойства ключа</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>Показать детали для этого ключа</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>Ф&айл</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&Шифрование</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>&Ключи</translation> </message> @@ -1433,7 +1427,7 @@ gpg4usb попробует импортировать ключ(и).</translation <translation type="vanished">&Импорт ключа из...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&Стеганография</translation> </message> @@ -1446,47 +1440,47 @@ gpg4usb попробует импортировать ключ(и).</translation <translation type="vanished"><center>This application allows simple encryption <br>and decryption of text messages or files.<br>It's licensed under the GPL v3<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>If you have any questions or suggestions have a look<br/>at our <a href="http://gpg4usb.cpunk.de/contact.php">contact page</a> or send a mail to our<br/> mailing list at <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>Удалить заголовки PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>Вставить заголовки PGP</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>&Вид</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>&Справка</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>Шифрование</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>Ключ</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>Правка</translation> </message> @@ -1495,27 +1489,27 @@ gpg4usb попробует импортировать ключ(и).</translation <translation type="vanished">Особая правка</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>Импорт ключа из...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>Импорт ключа</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>Зашифровать или расшифровать файл</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>Файл..</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>Готово</translation> </message> @@ -1524,7 +1518,7 @@ gpg4usb попробует импортировать ключ(и).</translation <translation type="vanished"> Зашифровать для:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>Прикреплённые файлы:</translation> </message> @@ -1537,17 +1531,17 @@ gpg4usb попробует импортировать ключ(и).</translation <translation type="obsolete"><center>This application allows simple encryption <br>and decryption of text messages or files.<br>It's licensed under the GPL v3<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>If you have any questions or suggestions have a look<br/>at our <a href="http://gpg4usb.cpunk.de/contact.php">contact page</a> or send a mail to our<br/> mailing list at <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>Имеется один незашифрованный файл в папке вложений</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>Имеются</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation>незашифрованные файлы в папке вложений</translation> </message> diff --git a/resource/ts/gpg4usb_sv.ts b/resource/ts/gpg4usb_sv.ts index c114fa52..bf7ad050 100644 --- a/resource/ts/gpg4usb_sv.ts +++ b/resource/ts/gpg4usb_sv.ts @@ -1163,53 +1163,53 @@ Svag -> Stark</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Ingen nyckel vald</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1312,117 +1312,111 @@ Svag -> Stark</translation> <translation>Visa programmets Om-fönster</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>Hjälp</translation> + <translation type="vanished">Hjälp</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>Öppna hjälpfilen</translation> + <translation type="vanished">Öppna hjälpfilen</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>Online-&hjälp</translation> + <translation type="vanished">Online-&hjälp</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>Öppna hjälp i webbläsaren</translation> + <translation type="vanished">Öppna hjälp i webbläsaren</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>Översätt gpg4usb</translation> + <translation type="vanished">Översätt gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>Översätt gpg4usb själv</translation> + <translation type="vanished">Översätt gpg4usb själv</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>Öppna &startguiden</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>Öppna startguiden</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>Bifoga markerade nycklar till text</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>Bifoga de markerade nycklarna till texten</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>Kopiera e-postadress</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>Kopiera markerad e-postadress till Urklipp</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>Visa nyckeldetaljer</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>Visa detaljerad info för denna nyckel</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>&Arkiv</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>&Redigera</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>&Kryptering</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>&Nycklar</translation> </message> @@ -1431,7 +1425,7 @@ Svag -> Stark</translation> <translation type="vanished">&Importera nyckel från...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>&Steganografi</translation> </message> @@ -1444,47 +1438,47 @@ Svag -> Stark</translation> <translation type="vanished"><center>Detta program tillhandahåller enkel kryptering <br>och dekryptering av textmeddelanden och filer.<br>Det är licencierat under GPL v3<br><br><b>Utvecklarer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Översättning:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>Har du några frågor eller förslag, kan du använda vår<br/><a href="http://gpg4usb.cpunk.de/contact.php">kontaktsida</a> eller skicka e-post till vår<br/> e-postlista. <a href="mailto:[email protected]">[email protected]</a>.</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>Ta bort PGP-huvud</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>Lägg till PGP-huvud</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>&Visa</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>&Hjälp</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>Arkiv</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>Kryptering</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>Nycklar</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>Redigera</translation> </message> @@ -1493,27 +1487,27 @@ Svag -> Stark</translation> <translation type="vanished">Specialredigering</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>Importera nyckel från...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>Importera nyckel</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>Kryptera eller dekryptera fil</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>Fil</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>Klar</translation> </message> @@ -1522,7 +1516,7 @@ Svag -> Stark</translation> <translation type="vanished">Nyckellista</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>Bifogade filer:</translation> </message> @@ -1543,17 +1537,17 @@ Svag -> Stark</translation> <translation type="vanished"> och GPGME</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>Det finns en okrypterad fil i bilagemappen</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>Det finns </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation> okrypterade filer i bilagemappen</translation> </message> diff --git a/resource/ts/gpg4usb_vi.ts b/resource/ts/gpg4usb_vi.ts index 15c6c140..e2915e9d 100644 --- a/resource/ts/gpg4usb_vi.ts +++ b/resource/ts/gpg4usb_vi.ts @@ -814,53 +814,53 @@ Yếu -> Mạnh</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">Không có Khóa được chọn</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -963,117 +963,95 @@ Yếu -> Mạnh</translation> <translation type="unfinished">Hiện hộp Thông tin Ứng dụng</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> - <source>Integrated Help</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="365"/> - <source>Open integrated Help</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="368"/> - <source>Online &Tutorials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="369"/> - <source>Open Online Tutorials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation type="unfinished">Chuyển ngữ cho gpg4usb</translation> + <translation type="obsolete">Chuyển ngữ cho gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation type="unfinished">Bạn hãy dịch gpg4usb sang ngôn ngữ khác</translation> + <translation type="obsolete">Bạn hãy dịch gpg4usb sang ngôn ngữ khác</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation type="unfinished">Nối tiếp Khóa Được Chọn vào Văn bản</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation type="unfinished">Nối tiếp Khóa Được Chọn Vào Văn bản trong Trình Soạn Thảo</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation type="unfinished">Chép Địa chỉ EMail</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation type="unfinished">Chép Địa chỉ Email được chọn vào clipboard</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation type="unfinished">Hiển thị thông tin Khóa</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation type="unfinished">Hiển thị thông tin cho Khóa đang chọn</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation type="unfinished">&Tệp</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation type="unfinished">&Soạn thảo</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation type="unfinished">&Mã hóa</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation type="unfinished">&Khóa mã hóa</translation> </message> @@ -1082,7 +1060,7 @@ Yếu -> Mạnh</translation> <translation type="obsolete">&Nhập Khóa từ...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation type="unfinished"></translation> </message> @@ -1091,72 +1069,72 @@ Yếu -> Mạnh</translation> <translation type="vanished">Thông tin</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation type="unfinished">&Hiển thị</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation type="unfinished">&Trợ giúp</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation type="unfinished">Tệp</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation type="unfinished">Mã hóa</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation type="unfinished">Khóa</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation type="unfinished">Soạn thảo</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation type="unfinished">Sẵn sàng</translation> </message> @@ -1165,7 +1143,7 @@ Yếu -> Mạnh</translation> <translation type="obsolete">Mã hóa cho:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation type="unfinished">Các tệp đính kèm:</translation> </message> @@ -1174,17 +1152,17 @@ Yếu -> Mạnh</translation> <translation type="obsolete">Thông tin</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation type="unfinished">Có một tệp không được mã hóa trong phần đính kèm</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation type="unfinished">Có</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation type="unfinished">các tệp không được mã hóa trong phần đính kèm</translation> </message> diff --git a/resource/ts/gpg4usb_zh.ts b/resource/ts/gpg4usb_zh.ts index acbdb321..918a42e0 100644 --- a/resource/ts/gpg4usb_zh.ts +++ b/resource/ts/gpg4usb_zh.ts @@ -1137,53 +1137,53 @@ gpg4usb将尝试导入密钥.</translation> <translation type="unfinished">管理密钥</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">没有选择密钥</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1294,72 +1294,68 @@ gpg4usb将尝试导入密钥.</translation> <translation type="unfinished">显示关于对话框</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation type="unfinished">内置帮助</translation> + <translation type="obsolete">内置帮助</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation type="unfinished">打开内置帮助</translation> + <translation type="obsolete">打开内置帮助</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation type="unfinished">在线教程</translation> + <translation type="obsolete">在线教程</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation type="unfinished">打开在线教程</translation> + <translation type="obsolete">打开在线教程</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation type="unfinished">文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation type="unfinished">编辑</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation type="unfinished">帮助</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation type="unfinished">用所选密钥为文字加密</translation> </message> @@ -1384,62 +1380,60 @@ gpg4usb将尝试导入密钥.</translation> <translation type="unfinished">打新文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation type="unfinished">翻译本软件</translation> + <translation type="obsolete">翻译本软件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation type="unfinished">帮助我们翻译gpg4usb</translation> + <translation type="obsolete">帮助我们翻译gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation type="unfinished">打开向导</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation type="unfinished">打开向导</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation type="unfinished">用所选密钥加密编辑器中的文字</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation type="unfinished">复制电邮地址</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation type="unfinished">将选定的电邮地址复制到剪切板</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation type="unfinished">显示密钥内容</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation type="unfinished">显示此密钥的内容</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation type="unfinished">删除PGP头</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation type="unfinished">添加PGP头</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation type="unfinished">密钥</translation> </message> @@ -1448,17 +1442,17 @@ gpg4usb将尝试导入密钥.</translation> <translation type="obsolete">导入密钥...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation type="unfinished">速记式加密</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation type="unfinished">查看</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation type="unfinished">文件</translation> </message> @@ -1467,27 +1461,27 @@ gpg4usb将尝试导入密钥.</translation> <translation type="obsolete">特殊修改</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation type="unfinished">导入密钥</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation type="unfinished">导入密钥</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation type="unfinished">加密或解密文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation type="unfinished">文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation type="unfinished">准备</translation> </message> @@ -1496,7 +1490,7 @@ gpg4usb将尝试导入密钥.</translation> <translation type="obsolete">加密用途</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation type="unfinished">附加文件</translation> </message> @@ -1505,17 +1499,17 @@ gpg4usb将尝试导入密钥.</translation> <translation type="obsolete"><center>本程序可对文字信息或是文件进行加密或是解密.<br>本程序遵循GPL v3授权协议.<br><br><b>开发人员:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>软件本地化:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(简体中文), Viriato (es)<br><br>如果你有任何建议或是问题请浏览<br/> <a href="http://gpg4usb.cpunk.de/contact.php">联系方式</a> 或是发电子邮件给我们<br/> <a href="mailto:[email protected]">[email protected]</a>.<br>中文版问题可联系<br/><a href="mailto:[email protected]">[email protected]</a></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation type="unfinished">在附件中有一个未加密文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation type="unfinished">在附件中</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation type="unfinished">有多个未加密的文件</translation> </message> @@ -1525,22 +1519,22 @@ gpg4usb将尝试导入密钥.</translation> <translation type="unfinished">编辑器</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation type="unfinished">加密</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation type="unfinished">加密</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation type="unfinished">密钥</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation type="unfinished">编辑</translation> </message> diff --git a/resource/ts/gpg4usb_zh_tw.ts b/resource/ts/gpg4usb_zh_tw.ts index 4c12bc5b..885f25bd 100644 --- a/resource/ts/gpg4usb_zh_tw.ts +++ b/resource/ts/gpg4usb_zh_tw.ts @@ -1164,53 +1164,53 @@ Weak -> Strong</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="568"/> + <location filename="../../src/MainWindow.cpp" line="552"/> <source>Special Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="617"/> + <location filename="../../src/MainWindow.cpp" line="601"/> <source>Key ToolBox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="625"/> + <location filename="../../src/MainWindow.cpp" line="609"/> <source>Information Board</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="758"/> - <location filename="../../src/MainWindow.cpp" line="805"/> - <location filename="../../src/MainWindow.cpp" line="1108"/> + <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="773"/> + <location filename="../../src/MainWindow.cpp" line="1076"/> <source>No Key Selected</source> <translation type="unfinished">未選擇任何金鑰</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="765"/> - <location filename="../../src/MainWindow.cpp" line="812"/> - <location filename="../../src/MainWindow.cpp" line="1115"/> + <location filename="../../src/MainWindow.cpp" line="733"/> + <location filename="../../src/MainWindow.cpp" line="780"/> + <location filename="../../src/MainWindow.cpp" line="1083"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="766"/> + <location filename="../../src/MainWindow.cpp" line="734"/> <source>The selected key contains a key that does not actually have a encrypt function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="767"/> - <location filename="../../src/MainWindow.cpp" line="814"/> - <location filename="../../src/MainWindow.cpp" line="1117"/> + <location filename="../../src/MainWindow.cpp" line="735"/> + <location filename="../../src/MainWindow.cpp" line="782"/> + <location filename="../../src/MainWindow.cpp" line="1085"/> <source><br/>For example the Following Key: <br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="813"/> + <location filename="../../src/MainWindow.cpp" line="781"/> <source>The selected key contains a key that does not actually have a signature function.<br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="1116"/> + <location filename="../../src/MainWindow.cpp" line="1084"/> <source>The selected key cannot be used for signing and encryption at the same time.<br/></source> <translation type="unfinished"></translation> </message> @@ -1313,117 +1313,111 @@ Weak -> Strong</source> <translation>顯示應用程式的「關於」對話方塊</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="364"/> <source>Integrated Help</source> - <translation>內建說明文件</translation> + <translation type="vanished">內建說明文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open integrated Help</source> - <translation>開啟內建說明文件</translation> + <translation type="vanished">開啟內建說明文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="368"/> <source>Online &Tutorials</source> - <translation>線上教學文件 (&T)</translation> + <translation type="vanished">線上教學文件 (&T)</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="369"/> <source>Open Online Tutorials</source> - <translation>開啟線上教學文件</translation> + <translation type="vanished">開啟線上教學文件</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="372"/> <source>Translate gpg4usb</source> - <translation>翻譯 gpg4usb</translation> + <translation type="vanished">翻譯 gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="373"/> <source>Translate gpg4usb yourself</source> - <translation>自行翻譯 gpg4usb</translation> + <translation type="vanished">自行翻譯 gpg4usb</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="376"/> + <location filename="../../src/MainWindow.cpp" line="364"/> <source>Open &Wizard</source> <translation>開啟精靈 (&W)</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="377"/> + <location filename="../../src/MainWindow.cpp" line="365"/> <source>Open the wizard</source> <translation>開啟精靈</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="382"/> + <location filename="../../src/MainWindow.cpp" line="370"/> <source>Append Selected Key(s) To Text</source> <translation>將所選的金鑰附加至文字後</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="383"/> + <location filename="../../src/MainWindow.cpp" line="371"/> <source>Append The Selected Keys To Text in Editor</source> <translation>在編輯器中，將所選的金鑰附加至文字後</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="386"/> + <location filename="../../src/MainWindow.cpp" line="374"/> <source>Copy EMail-address</source> <translation>複製電子郵件地址</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="387"/> + <location filename="../../src/MainWindow.cpp" line="375"/> <source>Copy selected EMailaddress to clipboard</source> <translation>將所選的電子郵件地址複製到剪貼簿</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="391"/> + <location filename="../../src/MainWindow.cpp" line="379"/> <source>Show Keydetails</source> <translation>顯示金鑰詳細資訊</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="392"/> + <location filename="../../src/MainWindow.cpp" line="380"/> <source>Show Details for this Key</source> <translation>顯示此金鑰的詳細資訊</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="395"/> + <location filename="../../src/MainWindow.cpp" line="383"/> <source>Refresh key from keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="396"/> + <location filename="../../src/MainWindow.cpp" line="384"/> <source>Refresh key from default keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="399"/> + <location filename="../../src/MainWindow.cpp" line="387"/> <source>Upload Key(s) To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="400"/> + <location filename="../../src/MainWindow.cpp" line="388"/> <source>Upload The Selected Keys To Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="458"/> + <location filename="../../src/MainWindow.cpp" line="446"/> <source>&File</source> <translation>檔案 (&F)</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="470"/> + <location filename="../../src/MainWindow.cpp" line="458"/> <source>&Edit</source> <translation>編輯 (&E)</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="488"/> + <location filename="../../src/MainWindow.cpp" line="476"/> <source>&File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="494"/> + <location filename="../../src/MainWindow.cpp" line="482"/> <source>&Crypt</source> <translation>編密 (&C)</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="505"/> + <location filename="../../src/MainWindow.cpp" line="493"/> <source>&Keys</source> <translation>金鑰 (&K)</translation> </message> @@ -1432,7 +1426,7 @@ Weak -> Strong</source> <translation type="vanished">匯入金鑰自 (&I)...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="515"/> + <location filename="../../src/MainWindow.cpp" line="503"/> <source>&Steganography</source> <translation>資訊偽裝 (&S)</translation> </message> @@ -1445,47 +1439,47 @@ Weak -> Strong</source> <translation type="vanished"><center>本應用程式讓你能夠輕鬆地對文字訊息和檔案<br>予以加密和解密。<br>本程式係採用 GPL v3 授權<br><br><b>開發者:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>正體中文翻譯:</b><br>Ahmad (ar), Alessandro (pt_br), Åke (sv),<br/>Elad (he), George (el), Jedi Lin (zh_tw),<br/>Kirill (ru), Marek Bogacz (pl), Phol (es),<br/>Russell (my), Serse (it), Tom (vi),<br/>Toughworm(zh), Viriato (es)<br><br>如果你有任何疑問或建議事項，請至我們的<br/><a href="http://gpg4usb.cpunk.de/contact.php">聯絡頁面</a>或寫信至我們的郵遞論壇: <br/><a href="mailto:[email protected]">[email protected]</a><br/>繁體中文翻譯方面的建議或更正事項，請直接<br/>與 Jedi 聯繫: <a href="mailto:[email protected]">[email protected]</a></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="414"/> + <location filename="../../src/MainWindow.cpp" line="402"/> <source>Remove PGP Header</source> <translation>移除 PGP 標頭</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="417"/> + <location filename="../../src/MainWindow.cpp" line="405"/> <source>Add PGP Header</source> <translation>加上 PGP 標頭</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="506"/> + <location filename="../../src/MainWindow.cpp" line="494"/> <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="524"/> + <location filename="../../src/MainWindow.cpp" line="512"/> <source>&View</source> <translation>檢視 (&V)</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="526"/> + <location filename="../../src/MainWindow.cpp" line="514"/> <source>&Help</source> <translation>說明 (&H)</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="538"/> + <location filename="../../src/MainWindow.cpp" line="522"/> <source>File</source> <translation>檔案</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="546"/> + <location filename="../../src/MainWindow.cpp" line="530"/> <source>Crypt</source> <translation>編密</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="556"/> + <location filename="../../src/MainWindow.cpp" line="540"/> <source>Key</source> <translation>金鑰</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="561"/> + <location filename="../../src/MainWindow.cpp" line="545"/> <source>Edit</source> <translation>編輯</translation> </message> @@ -1494,27 +1488,27 @@ Weak -> Strong</source> <translation type="vanished">特殊編輯</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="580"/> + <location filename="../../src/MainWindow.cpp" line="564"/> <source>Import key from...</source> <translation>匯入金鑰自...</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="581"/> + <location filename="../../src/MainWindow.cpp" line="565"/> <source>Import key</source> <translation>匯入金鑰</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="589"/> + <location filename="../../src/MainWindow.cpp" line="573"/> <source>Encrypt or decrypt File</source> <translation>檔案加密或解密</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="590"/> + <location filename="../../src/MainWindow.cpp" line="574"/> <source>File..</source> <translation>檔案..</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="610"/> + <location filename="../../src/MainWindow.cpp" line="594"/> <source>Ready</source> <translation>就緒</translation> </message> @@ -1523,7 +1517,7 @@ Weak -> Strong</source> <translation type="vanished">加密對象:</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="645"/> + <location filename="../../src/MainWindow.cpp" line="629"/> <source>Attached files:</source> <translation>附加檔案:</translation> </message> @@ -1544,17 +1538,17 @@ Weak -> Strong</source> <translation type="vanished"> 及 GPGME </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="724"/> + <location filename="../../src/MainWindow.cpp" line="692"/> <source>There is one unencrypted file in attachment folder</source> <translation>在附加檔案資料夾內有個未加密的檔案</translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source>There are </source> <translation>在附加檔案資料夾內有 </translation> </message> <message> - <location filename="../../src/MainWindow.cpp" line="726"/> + <location filename="../../src/MainWindow.cpp" line="694"/> <source> unencrypted files in attachment folder</source> <translation> 個未加密的檔案</translation> </message> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8d0750b7..37807770 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,13 +27,16 @@ file(COPY ${CMAKE_SOURCE_DIR}/resource/css DESTINATION ${EXECUTABLE_OUTPUT_PATH} file(COPY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) file(COPY ${CMAKE_SOURCE_DIR}/resource/help DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) file(COPY ${CMAKE_SOURCE_DIR}/resource/conf DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/lib/ DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/gpgme/ DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/bearer DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/iconengines DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/imageformats DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/printsupport DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/platforms DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) +if(MINGW) + message(STATUS "Copying Dependent DLL For Windows Runtime Env") + file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/lib/ DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) + file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/gpgme/ DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) + file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/bearer DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) + file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/iconengines DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) + file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/imageformats DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) + file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/printsupport DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) + file(COPY ${CMAKE_SOURCE_DIR}/resource/utils/platforms DESTINATION ${EXECUTABLE_OUTPUT_PATH}/ FOLLOW_SYMLINK_CHAIN) +endif() set(RESOURCE_FILES ${CMAKE_SOURCE_DIR}/gpgfrontend.qrc ${APP_ICON_RESOURCE_WINDOWS} ${QON_QM_FILES}) add_custom_target(resources ALL DEPENDS ${RESOURCE_FILES}) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index caec9f30..e2e610a2 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -361,18 +361,6 @@ void MainWindow::createActions() { aboutAct->setToolTip(tr("Show the application's About box")); connect(aboutAct, SIGNAL(triggered()), this, SLOT(slotAbout())); - openHelpAct = new QAction(tr("Integrated Help"), this); - openHelpAct->setToolTip(tr("Open integrated Help")); - connect(openHelpAct, SIGNAL(triggered()), this, SLOT(slotOpenHelp())); - - openTutorialAct = new QAction(tr("Online &Tutorials"), this); - openTutorialAct->setToolTip(tr("Open Online Tutorials")); - connect(openTutorialAct, SIGNAL(triggered()), this, SLOT(slotOpenTutorial())); - - openTranslateAct = new QAction(tr("Translate gpg4usb"), this); - openTranslateAct->setToolTip(tr("Translate gpg4usb yourself")); - connect(openTranslateAct, SIGNAL(triggered()), this, SLOT(slotOpenTranslate())); - startWizardAct = new QAction(tr("Open &Wizard"), this); startWizardAct->setToolTip(tr("Open the wizard")); connect(startWizardAct, SIGNAL(triggered()), this, SLOT(slotStartWizard())); @@ -524,12 +512,8 @@ void MainWindow::createMenus() { viewMenu = menuBar()->addMenu(tr("&View")); helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(openHelpAct); helpMenu->addAction(startWizardAct); helpMenu->addSeparator(); - helpMenu->addAction(openTutorialAct); - helpMenu->addAction(openTranslateAct); - helpMenu->addSeparator(); helpMenu->addAction(aboutAct); } @@ -682,22 +666,6 @@ void MainWindow::slotAbout() { new AboutDialog(this); } -void MainWindow::slotOpenTranslate() { - QDesktopServices::openUrl(QUrl("http://gpg4usb.cpunk.de/docu_translate.html")); -} - -void MainWindow::slotOpenTutorial() { - QDesktopServices::openUrl(QUrl("http://gpg4usb.cpunk.de/docu.html")); -} - -void MainWindow::slotOpenHelp() { - slotOpenHelp("docu.html"); -} - -void MainWindow::slotOpenHelp(const QString &page) { - edit->slotNewHelpTab("help", "file:" + qApp->applicationDirPath() + "/help/" + page); -} - void MainWindow::slotSetStatusBarText(const QString &text) { statusBar()->showMessage(text, 20000); } diff --git a/src/Mime.cpp b/src/Mime.cpp index 20dae922..8e4c8d72 100644 --- a/src/Mime.cpp +++ b/src/Mime.cpp @@ -140,7 +140,7 @@ Header Mime::getHeader(const QByteArray *message) { return parseHeader(&header); } -[[maybe_unused]] bool Mime::isMultipart(QByteArray *message) { +bool Mime::isMultipart(QByteArray *message) { return message->startsWith("Content-Type: multipart/mixed;"); } diff --git a/src/gpg/GpgContext.cpp b/src/gpg/GpgContext.cpp index d0cf30d5..962ebaf4 100644 --- a/src/gpg/GpgContext.cpp +++ b/src/gpg/GpgContext.cpp @@ -23,17 +23,16 @@ */ #include "gpg/GpgContext.h" -#include "ui/keygen/KeygenThread.h" #include <unistd.h> /* contains read/write */ #include <Mime.h> #ifdef _WIN32 - #include <windows.h> - #endif +#define INT2VOIDP(i) (void*)(uintptr_t)(i) + namespace GpgME { /** Constructor @@ -163,7 +162,7 @@ namespace GpgME { GpgImportedKey key; key.importStatus = static_cast<int>(status->status); key.fpr = status->fpr; - importInformation->importedKeys.append(key); + importInformation->importedKeys.emplace_back(key); status = status->next; } checkErr(err); @@ -294,7 +293,7 @@ namespace GpgME { qDebug() << "Append Key" << key->subkeys->keyid; - keys.append(GpgKey(key)); + keys.emplace_back(key); keys_map.insert(keys.back().id, &keys.back()); gpgme_key_unref(key); } @@ -553,7 +552,7 @@ namespace GpgME { #ifdef _WIN32 DWORD written; - HANDLE hd = (HANDLE) fd; + auto hd = INT2VOIDP(fd); #endif if (last_was_bad) { diff --git a/src/gpg/result_analyse/DecryptResultAnalyse.cpp b/src/gpg/result_analyse/DecryptResultAnalyse.cpp index d0f3ae99..7eda4027 100644 --- a/src/gpg/result_analyse/DecryptResultAnalyse.cpp +++ b/src/gpg/result_analyse/DecryptResultAnalyse.cpp @@ -7,33 +7,33 @@ DecryptResultAnalyse::DecryptResultAnalyse(GpgME::GpgContext *ctx, gpgme_error_t error, gpgme_decrypt_result_t result) : mCtx(ctx) { - stream << "Decrypt Report: " << endl << "-----" << endl; + stream << "Decrypt Report: " << Qt::endl << "-----" << Qt::endl; if (gpgme_err_code(error) == GPG_ERR_NO_ERROR) { - stream << "Status: Success" << endl; + stream << "Status: Success" << Qt::endl; } else { setStatus(-1); - stream << "Status: " << gpgme_strerror(error) << endl; + stream << "Status: " << gpgme_strerror(error) << Qt::endl; if (result != nullptr && result->unsupported_algorithm != nullptr) - stream << "Unsupported algo: " << result->unsupported_algorithm << endl; + stream << "Unsupported algo: " << result->unsupported_algorithm << Qt::endl; } if(result != nullptr) { if (result->file_name != nullptr) - stream << "File name: " << result->file_name << endl; - stream << endl; + stream << "File name: " << result->file_name << Qt::endl; + stream << Qt::endl; auto reci = result->recipients; if (reci != nullptr) - stream << "Recipient(s): " << endl; + stream << "Recipient(s): " << Qt::endl; while (reci != nullptr) { printReci(stream, reci); reci = reci->next; } } - stream << "-----" << endl << endl; + stream << "-----" << Qt::endl << Qt::endl; } @@ -52,8 +52,8 @@ bool DecryptResultAnalyse::printReci(QTextStream &stream, gpgme_recipient_t reci setStatus(0); keyFound = false; } - stream << endl; + stream << Qt::endl; - stream << "Public algo: " << gpgme_pubkey_algo_name(reci->pubkey_algo) << endl << endl; + stream << "Public algo: " << gpgme_pubkey_algo_name(reci->pubkey_algo) << Qt::endl << Qt::endl; return keyFound; } diff --git a/src/gpg/result_analyse/EncryptResultAnalyse.cpp b/src/gpg/result_analyse/EncryptResultAnalyse.cpp index 8cdd7750..dfcad1ac 100644 --- a/src/gpg/result_analyse/EncryptResultAnalyse.cpp +++ b/src/gpg/result_analyse/EncryptResultAnalyse.cpp @@ -6,28 +6,28 @@ EncryptResultAnalyse::EncryptResultAnalyse(gpgme_error_t error, gpgme_encrypt_result_t result) { - stream << "# Encrypt Report: " << endl << "-----" << endl; + stream << "# Encrypt Report: " << Qt::endl << "-----" << Qt::endl; if(gpgme_err_code(error) == GPG_ERR_NO_ERROR) { - stream << "Status: Encrypt Success" << endl; + stream << "Status: Encrypt Success" << Qt::endl; } else { - stream << "Status:" << gpgme_strerror(error) << endl; + stream << "Status:" << gpgme_strerror(error) << Qt::endl; setStatus(-1); if (result != nullptr) { - stream << "Invalid Recipients: " << endl; + stream << "Invalid Recipients: " << Qt::endl; auto inv_reci = result->invalid_recipients; while (inv_reci != nullptr) { - stream << "Fingerprint: " << inv_reci->fpr << endl; - stream << "Reason: " << gpgme_strerror(inv_reci->reason) << endl; - stream << endl; + stream << "Fingerprint: " << inv_reci->fpr << Qt::endl; + stream << "Reason: " << gpgme_strerror(inv_reci->reason) << Qt::endl; + stream << Qt::endl; inv_reci = inv_reci->next; } } } - stream << "-----" << endl; - stream << endl; + stream << "-----" << Qt::endl; + stream << Qt::endl; } diff --git a/src/gpg/result_analyse/SignResultAnalyse.cpp b/src/gpg/result_analyse/SignResultAnalyse.cpp index 15d6ddf5..fac598d5 100644 --- a/src/gpg/result_analyse/SignResultAnalyse.cpp +++ b/src/gpg/result_analyse/SignResultAnalyse.cpp @@ -26,9 +26,9 @@ SignResultAnalyse::SignResultAnalyse(gpgme_error_t error, gpgme_sign_result_t result) { - stream << "# Sign Report: " << endl - << "-----" << endl; - stream << "Status: " << gpgme_strerror(error) << endl << endl; + stream << "# Sign Report: " << Qt::endl + << "-----" << Qt::endl; + stream << "Status: " << gpgme_strerror(error) << Qt::endl << Qt::endl; if(gpg_err_code(error) != GPG_ERR_NO_ERROR) { setStatus(-1); @@ -39,7 +39,7 @@ SignResultAnalyse::SignResultAnalyse(gpgme_error_t error, gpgme_sign_result_t re auto new_sign = result->signatures; while (new_sign != nullptr) { - stream << "> A New Signature: " << endl; + stream << "> A New Signature: " << Qt::endl; stream << "Sign mode: "; if (new_sign->type == GPGME_SIG_MODE_NORMAL) @@ -49,13 +49,13 @@ SignResultAnalyse::SignResultAnalyse(gpgme_error_t error, gpgme_sign_result_t re else if (new_sign->type == GPGME_SIG_MODE_DETACH) stream << "Detach"; - stream << endl; + stream << Qt::endl; - stream << "Public key algo: " << gpgme_pubkey_algo_name(new_sign->pubkey_algo) << endl; - stream << "Hash algo: " << gpgme_hash_algo_name(new_sign->hash_algo) << endl; - stream << "Date of signature: " << QDateTime::fromTime_t(new_sign->timestamp).toString() << endl; + stream << "Public key algo: " << gpgme_pubkey_algo_name(new_sign->pubkey_algo) << Qt::endl; + stream << "Hash algo: " << gpgme_hash_algo_name(new_sign->hash_algo) << Qt::endl; + stream << "Date of signature: " << QDateTime::fromTime_t(new_sign->timestamp).toString() << Qt::endl; - stream << endl; + stream << Qt::endl; new_sign = new_sign->next; } @@ -63,19 +63,19 @@ SignResultAnalyse::SignResultAnalyse(gpgme_error_t error, gpgme_sign_result_t re auto invalid_signer = result->invalid_signers; if (invalid_signer != nullptr) - stream << "Invalid Signers: " << endl; + stream << "Invalid Signers: " << Qt::endl; while (invalid_signer != nullptr) { setStatus(0); - stream << "Fingerprint: " << invalid_signer->fpr << endl; - stream << "Reason: " << gpgme_strerror(invalid_signer->reason) << endl; - stream << endl; + stream << "Fingerprint: " << invalid_signer->fpr << Qt::endl; + stream << "Reason: " << gpgme_strerror(invalid_signer->reason) << Qt::endl; + stream << Qt::endl; invalid_signer = invalid_signer->next; } } - stream << "-----" << endl << endl; + stream << "-----" << Qt::endl << Qt::endl; } diff --git a/src/gpg/result_analyse/VerifyResultAnalyse.cpp b/src/gpg/result_analyse/VerifyResultAnalyse.cpp index 898d62e1..79442c9a 100644 --- a/src/gpg/result_analyse/VerifyResultAnalyse.cpp +++ b/src/gpg/result_analyse/VerifyResultAnalyse.cpp @@ -8,23 +8,23 @@ VerifyResultAnalyse::VerifyResultAnalyse(GpgME::GpgContext *ctx, gpgme_error_t error, gpgme_verify_result_t result) : mCtx(ctx) { - stream << "# Verify Report: " << endl << "-----" << endl; - stream << "Status: " << gpgme_strerror(error) << endl; + stream << "# Verify Report: " << Qt::endl << "-----" << Qt::endl; + stream << "Status: " << gpgme_strerror(error) << Qt::endl; if(result != nullptr) { auto sign = result->signatures; if (sign == nullptr) { - stream << "> Not Signature Found" << endl; + stream << "> Not Signature Found" << Qt::endl; setStatus(-1); return; } - stream << "> It was Signed ON " << QDateTime::fromTime_t(sign->timestamp).toString() << endl; + stream << "> It was Signed ON " << QDateTime::fromTime_t(sign->timestamp).toString() << Qt::endl; - stream << endl << "> It Contains:" << endl; + stream << Qt::endl << "> It Contains:" << Qt::endl; bool canContinue = true; @@ -32,7 +32,7 @@ VerifyResultAnalyse::VerifyResultAnalyse(GpgME::GpgContext *ctx, gpgme_error_t e switch (gpg_err_code(sign->status)) { case GPG_ERR_BAD_SIGNATURE: - stream << QApplication::tr("One or More Bad Signatures.") << endl; + stream << QApplication::tr("One or More Bad Signatures.") << Qt::endl; canContinue = false; setStatus(-1); break; @@ -61,9 +61,9 @@ VerifyResultAnalyse::VerifyResultAnalyse(GpgME::GpgContext *ctx, gpgme_error_t e } if (sign->summary & GPGME_SIGSUM_VALID) { - stream << QApplication::tr("Signature Fully Valid.") << endl; + stream << QApplication::tr("Signature Fully Valid.") << Qt::endl; } else { - stream << QApplication::tr("Signature NOT Fully Valid.") << endl; + stream << QApplication::tr("Signature NOT Fully Valid.") << Qt::endl; } if (!(sign->status & GPGME_SIGSUM_KEY_MISSING)) { @@ -71,7 +71,7 @@ VerifyResultAnalyse::VerifyResultAnalyse(GpgME::GpgContext *ctx, gpgme_error_t e setStatus(0); } } else { - stream << QApplication::tr("Key is NOT present with ID 0x") << QString(sign->fpr) << endl; + stream << QApplication::tr("Key is NOT present with ID 0x") << QString(sign->fpr) << Qt::endl; } setStatus(1); @@ -114,13 +114,13 @@ VerifyResultAnalyse::VerifyResultAnalyse(GpgME::GpgContext *ctx, gpgme_error_t e GpgME::GpgContext::beautifyFingerprint(QString(sign->fpr)); setStatus(-1); } - stream << endl; + stream << Qt::endl; sign = sign->next; } } - stream << "-----" << endl; - stream << endl; + stream << "-----" << Qt::endl; + stream << Qt::endl; } bool VerifyResultAnalyse::printSigner(QTextStream &stream, gpgme_signature_t sign) { @@ -136,7 +136,7 @@ bool VerifyResultAnalyse::printSigner(QTextStream &stream, gpgme_signature_t sig if (!key.email.isEmpty()) { stream << "<" << key.email << ">"; } - stream << endl; + stream << Qt::endl; return keyFound; }
\ No newline at end of file diff --git a/src/ui/KeyServerImportDialog.cpp b/src/ui/KeyServerImportDialog.cpp index 789e194d..88ec1c11 100644 --- a/src/ui/KeyServerImportDialog.cpp +++ b/src/ui/KeyServerImportDialog.cpp @@ -27,9 +27,8 @@ #include <utility> KeyServerImportDialog::KeyServerImportDialog(GpgME::GpgContext *ctx, KeyList *keyList, QWidget *parent) - : QDialog(parent) { - mCtx = ctx; - mKeyList = keyList; + : QDialog(parent), appPath(qApp->applicationDirPath()), + settings(appPath + "/conf/gpgfrontend.ini", QSettings::IniFormat), mCtx(ctx), mKeyList(keyList) { // Buttons closeButton = createButton(tr("&Close"), SLOT(close())); importButton = createButton(tr("&Import"), SLOT(slotImport())); @@ -87,7 +86,6 @@ QComboBox *KeyServerImportDialog::createComboBox() { comboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); // Read keylist from ini-file and fill it into combobox - QSettings settings; comboBox->addItems(settings.value("keyserver/keyServerList").toStringList()); // set default keyserver in combobox @@ -180,13 +178,11 @@ void KeyServerImportDialog::slotSearchFinished() { auto line_buff = reply->readLine().trimmed(); QString decoded = QString::fromUtf8(line_buff.constData(), line_buff.size()); QStringList line = decoded.split(":"); - //TODO: have a look at two following pub lines if (line[0] == "pub") { strikeout = false; QString flags = line[line.size() - 1]; - keysTable->setRowCount(row + 1); // flags can be "d" for disabled, "r" for revoked @@ -211,16 +207,16 @@ void KeyServerImportDialog::slotSearchFinished() { uid->setText(line2[1]); keysTable->setItem(row, 0, uid); } - auto *creationdate = new QTableWidgetItem( + auto *creation_date = new QTableWidgetItem( QDateTime::fromTime_t(line[4].toInt()).toString("dd. MMM. yyyy")); - keysTable->setItem(row, 1, creationdate); + keysTable->setItem(row, 1, creation_date); auto *keyid = new QTableWidgetItem(line[1]); keysTable->setItem(row, 2, keyid); if (strikeout) { QFont strike = uid->font(); strike.setStrikeOut(true); uid->setFont(strike); - creationdate->setFont(strike); + creation_date->setFont(strike); keyid->setFont(strike); } row++; @@ -255,7 +251,6 @@ void KeyServerImportDialog::slotImport() { } void KeyServerImportDialog::slotImport(QStringList keyIds) { - QSettings settings; QString keyserver = settings.value("keyserver/defaultKeyServer").toString();; slotImport(std::move(keyIds), QUrl(keyserver)); } @@ -288,7 +283,6 @@ void KeyServerImportDialog::slotImportFinished() { setMessage(tr("Key imported"), false); // Add keyserver to list in config-file, if it isn't contained - QSettings settings; QStringList keyServerList = settings.value("keyserver/keyServerList").toStringList(); if (!keyServerList.contains(keyServerComboBox->currentText())) { keyServerList.append(keyServerComboBox->currentText()); diff --git a/src/ui/QuitDialog.cpp b/src/ui/QuitDialog.cpp index 8472902e..5ebedc20 100755 --- a/src/ui/QuitDialog.cpp +++ b/src/ui/QuitDialog.cpp @@ -26,7 +26,7 @@ QuitDialog::QuitDialog(QWidget *parent, const QHash<int, QString>& unsavedDocs) : QDialog(parent) { - setWindowTitle(tr("Unsaved files")); + setWindowTitle(tr("Unsaved Files")); setModal(true); discarded = false; @@ -46,9 +46,9 @@ QuitDialog::QuitDialog(QWidget *parent, const QHash<int, QString>& unsavedDocs) mFileList->setFocusPolicy(Qt::NoFocus); mFileList->horizontalHeader()->setStretchLastSection(true); // fill the table - i.toBack(); //jump to the end of list to fill the table backwards - while (i.hasPrevious()) { - i.previous(); + i.toFront(); //jump to the end of list to fill the table backwards + while (i.hasNext()) { + i.next(); mFileList->setRowCount(mFileList->rowCount() + 1); // checkbox in front of filename @@ -69,14 +69,15 @@ QuitDialog::QuitDialog(QWidget *parent, const QHash<int, QString>& unsavedDocs) /* * Warnbox with icon and text */ - auto *pixmap = new QPixmap(":error.png"); - auto *warnicon = new QLabel(); - warnicon->setPixmap(*pixmap); - auto *warnlabel = new QLabel( + auto pixmap = QPixmap(":error.png"); + pixmap = pixmap.scaled(50, 50, Qt::KeepAspectRatio, Qt::SmoothTransformation); + auto *warn_icon = new QLabel(); + warn_icon->setPixmap(pixmap); + auto *warn_label = new QLabel( tr("<h3>%1 files contain unsaved information.<br/>Save the changes before closing?</h3>").arg(row)); auto *warnBoxLayout = new QHBoxLayout(); - warnBoxLayout->addWidget(warnicon); - warnBoxLayout->addWidget(warnlabel); + warnBoxLayout->addWidget(warn_icon); + warnBoxLayout->addWidget(warn_label); warnBoxLayout->setAlignment(Qt::AlignLeft); auto *warnBox = new QWidget(this); warnBox->setLayout(warnBoxLayout); @@ -85,7 +86,7 @@ QuitDialog::QuitDialog(QWidget *parent, const QHash<int, QString>& unsavedDocs) * Two labels on top and under the filelist */ auto *checkLabel = new QLabel(tr("Check the files you want to save:")); - auto *notelabel = new QLabel(tr("<b>Note:</b> If you don't save these files, all changes are lost.<br/>")); + auto *note_label = new QLabel(tr("<b>Note:</b> If you don't save these files, all changes are lost.<br/>")); /* * Buttonbox @@ -104,7 +105,7 @@ QuitDialog::QuitDialog(QWidget *parent, const QHash<int, QString>& unsavedDocs) vbox->addWidget(warnBox); vbox->addWidget(checkLabel); vbox->addWidget(mFileList); - vbox->addWidget(notelabel); + vbox->addWidget(note_label); vbox->addWidget(buttonBox); this->setLayout(vbox); } diff --git a/src/ui/SettingsDialog.cpp b/src/ui/SettingsDialog.cpp index 7d9547b2..5501dedd 100755 --- a/src/ui/SettingsDialog.cpp +++ b/src/ui/SettingsDialog.cpp @@ -317,7 +317,7 @@ void GeneralTab::slotOwnKeyIdChanged() { // add line with hidden-encrypt-to, if a key is chosen if (!ownKeyId.isEmpty()) { QByteArray string("recipient "); - string.append(ownKeyId); + string.append(ownKeyId.toUtf8()); string.append("\n"); gpgConfTempFile.write(string); } diff --git a/src/ui/VerifyDetailsDialog.cpp b/src/ui/VerifyDetailsDialog.cpp index 9c6ad014..e1403e14 100644 --- a/src/ui/VerifyDetailsDialog.cpp +++ b/src/ui/VerifyDetailsDialog.cpp @@ -67,10 +67,10 @@ void VerifyDetailsDialog::slotRefresh() { mVboxLayout->addWidget(new QLabel(tr("Error Validating signature"))); } else if (mInputSignature != nullptr) { mVboxLayout->addWidget(new QLabel( - tr("File was signed on %1 <br/> It Contains:<br/>").arg(timestamp.toString(Qt::SystemLocaleLongDate)))); + tr("File was signed on %1 <br/> It Contains:<br/>").arg(QLocale::system().toString(timestamp)))); } else { mVboxLayout->addWidget(new QLabel(tr("Signed on %1 <br/> It Contains:<br/>").arg( - timestamp.toString(Qt::SystemLocaleLongDate)))); + QLocale::system().toString(timestamp)))); } // Add informationbox for every single key while (sign) { diff --git a/src/ui/keygen/KeygenDialog.cpp b/src/ui/keygen/KeygenDialog.cpp index 347ebedc..b9fdae3f 100644 --- a/src/ui/keygen/KeygenDialog.cpp +++ b/src/ui/keygen/KeygenDialog.cpp @@ -127,7 +127,7 @@ void KeyGenDialog::slotKeyGenAccept() { */ errorLabel->setAutoFillBackground(true); QPalette error = errorLabel->palette(); - error.setColor(QPalette::Background, "#ff8080"); + error.setColor(QPalette::Window, "#ff8080"); errorLabel->setPalette(error); errorLabel->setText(errorString); diff --git a/src/ui/keygen/KeygenThread.cpp b/src/ui/keygen/KeygenThread.cpp index 5922138d..d7b9d840 100644 --- a/src/ui/keygen/KeygenThread.cpp +++ b/src/ui/keygen/KeygenThread.cpp @@ -24,8 +24,8 @@ #include "ui/keygen/KeygenThread.h" -KeyGenThread::KeyGenThread(GenKeyInfo* keyGenParams, GpgME::GpgContext *ctx): -mCtx(ctx), keyGenParams(keyGenParams), abort(false), QThread(nullptr) { +KeyGenThread::KeyGenThread(GenKeyInfo* keyGenParams, GpgME::GpgContext *ctx) +: mCtx(ctx), keyGenParams(keyGenParams), QThread(nullptr) { connect(this, &KeyGenThread::finished, this, &KeyGenThread::deleteLater); } diff --git a/src/ui/keygen/SubkeyGenerateDialog.cpp b/src/ui/keygen/SubkeyGenerateDialog.cpp index ae0c2bca..c545381f 100644 --- a/src/ui/keygen/SubkeyGenerateDialog.cpp +++ b/src/ui/keygen/SubkeyGenerateDialog.cpp @@ -258,7 +258,7 @@ void SubkeyGenerateDialog::slotKeyGenAccept() { */ errorLabel->setAutoFillBackground(true); QPalette error = errorLabel->palette(); - error.setColor(QPalette::Background, "#ff8080"); + error.setColor(QPalette::Window, "#ff8080"); errorLabel->setPalette(error); errorLabel->setText(errorString); diff --git a/src/ui/keygen/SubkeyGenerateThread.cpp b/src/ui/keygen/SubkeyGenerateThread.cpp index 1ef141f0..4f19ac1f 100644 --- a/src/ui/keygen/SubkeyGenerateThread.cpp +++ b/src/ui/keygen/SubkeyGenerateThread.cpp @@ -27,8 +27,7 @@ #include <utility> SubkeyGenerateThread::SubkeyGenerateThread(GpgKey key, GenKeyInfo *keyGenParams, GpgME::GpgContext *ctx) - : mKey(std::move(key)), keyGenParams(keyGenParams) , mCtx(ctx), abort( - false) { + : mKey(std::move(key)), keyGenParams(keyGenParams) , mCtx(ctx) { connect(this, &SubkeyGenerateThread::finished, this, &SubkeyGenerateThread::deleteLater); } diff --git a/src/ui/keypair_details/KeyNewUIDDialog.cpp b/src/ui/keypair_details/KeyNewUIDDialog.cpp index 7605bfae..e12af750 100644 --- a/src/ui/keypair_details/KeyNewUIDDialog.cpp +++ b/src/ui/keypair_details/KeyNewUIDDialog.cpp @@ -89,7 +89,7 @@ void KeyNewUIDDialog::slotCreateNewUID() { */ errorLabel->setAutoFillBackground(true); QPalette error = errorLabel->palette(); - error.setColor(QPalette::Background, "#ff8080"); + error.setColor(QPalette::Window, "#ff8080"); errorLabel->setPalette(error); errorLabel->setText(errorString); diff --git a/src/ui/widgets/InfoBoardWidget.cpp b/src/ui/widgets/InfoBoardWidget.cpp index 0e85e72f..bfd0c643 100644 --- a/src/ui/widgets/InfoBoardWidget.cpp +++ b/src/ui/widgets/InfoBoardWidget.cpp @@ -86,7 +86,7 @@ void InfoBoardWidget::setInfoBoard(const QString &text, InfoBoardStatus verifyLa QPalette status = infoBoard->palette(); status.setColor(QPalette::Text, color); infoBoard->setPalette(status); - infoBoard->setFont(QFont("Times", 12)); + infoBoard->setFont(QFont("Times", 10)); } void InfoBoardWidget::slotRefresh(const QString &text, InfoBoardStatus status) { |