diff options
| author | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-04-02 20:47:43 +0000 |
|---|---|---|
| committer | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-04-02 20:47:43 +0000 |
| commit | 0ee455edb62a254fb1b7e6faa9448121215ed219 (patch) | |
| tree | a5db01f238642a6c861cf1070c20a01fb4ba16c3 /gpgcontext.cpp | |
| parent | add arabic translation files (diff) | |
| download | gpg4usb-0ee455edb62a254fb1b7e6faa9448121215ed219.tar.gz gpg4usb-0ee455edb62a254fb1b7e6faa9448121215ed219.zip | |
merge with 0.3.2
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@877 34ebc366-c3a9-4b3c-9f84-69acf7962910
Diffstat (limited to 'gpgcontext.cpp')
| -rw-r--r-- | gpgcontext.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 3762e58..bc4e1ef 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -254,8 +254,8 @@ GpgKeyList GpgContext::listKeys() gpgkey.revoked = (key->revoked != 0); if (key->uids) { - gpgkey.name = key->uids->name; - gpgkey.email = key->uids->email; + gpgkey.name = QString::fromUtf8(key->uids->name); + gpgkey.email = QString::fromUtf8(key->uids->email); } keys.append(gpgkey); gpgme_key_unref(key); @@ -465,7 +465,7 @@ gpgme_error_t GpgContext::passphrase(const char *uid_hint, { gpgme_error_t returnValue = GPG_ERR_CANCELED; QString passwordDialogMessage; - QString gpgHint = uid_hint; + QString gpgHint = QString::fromUtf8(uid_hint); bool result; #ifdef _WIN32 DWORD written; @@ -481,7 +481,7 @@ gpgme_error_t GpgContext::passphrase(const char *uid_hint, if (!gpgHint.isEmpty()) { // remove UID, leave only username & email gpgHint.remove(0, gpgHint.indexOf(" ")); - passwordDialogMessage += "<b>Enter Password for</b><br>\n" + gpgHint + "\n"; + passwordDialogMessage += "<b>"+tr("Enter Password for")+"</b><br>" + gpgHint + "<br>"; } if (mPasswordCache.isEmpty()) { @@ -769,7 +769,6 @@ GpgKey GpgContext::getKeyByFpr(QString fpr) { return GpgKey(); } - /** * note: privkey status is not returned */ |