From 0b1aa3ebe241fc68593541a985298efae43950a3 Mon Sep 17 00:00:00 2001 From: nils Date: Mon, 5 Mar 2012 21:42:16 +0000 Subject: added missing tr in key management git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@834 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- keymgmt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keymgmt.cpp') diff --git a/keymgmt.cpp b/keymgmt.cpp index 690de89..ae8fd46 100755 --- a/keymgmt.cpp +++ b/keymgmt.cpp @@ -142,8 +142,8 @@ void KeyMgmt::createToolBars() toolButton->setMenu(importKeyMenu); toolButton->setPopupMode(QToolButton::InstantPopup); toolButton->setIcon(QIcon(":key_import.png")); - toolButton->setToolTip("Import key"); - toolButton->setText("Import key from"); + toolButton->setToolTip(tr("Import key")); + toolButton->setText(tr("Import key from"); toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); keyToolBar->addWidget(toolButton); -- cgit From 7a55988515a9b4c1f227833f268b6e8d8cfb189d Mon Sep 17 00:00:00 2001 From: nils Date: Mon, 5 Mar 2012 21:42:20 +0000 Subject: added a missing break and updated translation files git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@835 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- keymgmt.cpp | 2 +- release/ts/gpg4usb_de.qm | Bin 47596 -> 47682 bytes release/ts/gpg4usb_de.ts | 10 ++++++++++ release/ts/gpg4usb_en.ts | 10 ++++++++++ release/ts/gpg4usb_es.ts | 8 ++++++++ release/ts/gpg4usb_my.ts | 10 ++++++++++ release/ts/gpg4usb_pt_BR.qm | Bin 45412 -> 45488 bytes release/ts/gpg4usb_pt_BR.ts | 10 ++++++++++ release/ts/gpg4usb_ru.qm | Bin 43927 -> 43997 bytes release/ts/gpg4usb_ru.ts | 10 ++++++++++ release/ts/gpg4usb_vi.ts | 10 ++++++++++ 11 files changed, 69 insertions(+), 1 deletion(-) (limited to 'keymgmt.cpp') diff --git a/keymgmt.cpp b/keymgmt.cpp index ae8fd46..2469e0e 100755 --- a/keymgmt.cpp +++ b/keymgmt.cpp @@ -143,7 +143,7 @@ void KeyMgmt::createToolBars() toolButton->setPopupMode(QToolButton::InstantPopup); toolButton->setIcon(QIcon(":key_import.png")); toolButton->setToolTip(tr("Import key")); - toolButton->setText(tr("Import key from"); + toolButton->setText(tr("Import key from")); toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); keyToolBar->addWidget(toolButton); diff --git a/release/ts/gpg4usb_de.qm b/release/ts/gpg4usb_de.qm index 35247ce..b52d248 100644 Binary files a/release/ts/gpg4usb_de.qm and b/release/ts/gpg4usb_de.qm differ diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts index 34109bc..f658031 100644 --- a/release/ts/gpg4usb_de.ts +++ b/release/ts/gpg4usb_de.ts @@ -1525,6 +1525,16 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...) Key Schlüssel + + + Import key + Importiere Schlüssel + + + + Import key from + + key(s) exported diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts index c9003d4..7457869 100644 --- a/release/ts/gpg4usb_en.ts +++ b/release/ts/gpg4usb_en.ts @@ -960,6 +960,16 @@ Weak -> Strong Show Details for this Key + + + Import key + + + + + Import key from + + key(s) exported diff --git a/release/ts/gpg4usb_es.ts b/release/ts/gpg4usb_es.ts index 17abed6..d2589f3 100644 --- a/release/ts/gpg4usb_es.ts +++ b/release/ts/gpg4usb_es.ts @@ -2395,6 +2395,14 @@ Para acelerar el proceso no use en su computadora key(s) exported + + Import key + + + + Import key from + + KeyServerImportDialog diff --git a/release/ts/gpg4usb_my.ts b/release/ts/gpg4usb_my.ts index 0931dd7..3dc697d 100644 --- a/release/ts/gpg4usb_my.ts +++ b/release/ts/gpg4usb_my.ts @@ -1374,6 +1374,16 @@ Weak -> Strong Show Details for this Key ဒီကီးရဲ့ အသေးစိတ်ကို ဖေါ်ပြရန် + + + Import key + + + + + Import key from + + Keyring files diff --git a/release/ts/gpg4usb_pt_BR.qm b/release/ts/gpg4usb_pt_BR.qm index 1c8593b..be29842 100644 Binary files a/release/ts/gpg4usb_pt_BR.qm and b/release/ts/gpg4usb_pt_BR.qm differ diff --git a/release/ts/gpg4usb_pt_BR.ts b/release/ts/gpg4usb_pt_BR.ts index bd0f429..6eeff59 100644 --- a/release/ts/gpg4usb_pt_BR.ts +++ b/release/ts/gpg4usb_pt_BR.ts @@ -1544,6 +1544,16 @@ gpg4usb tentará importar a(s) chave(s). Key Chave + + + Import key + Importar chave + + + + Import key from + + key(s) exported diff --git a/release/ts/gpg4usb_ru.qm b/release/ts/gpg4usb_ru.qm index e361b3a..ee51037 100644 Binary files a/release/ts/gpg4usb_ru.qm and b/release/ts/gpg4usb_ru.qm differ diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts index e91dadd..ea73c97 100644 --- a/release/ts/gpg4usb_ru.ts +++ b/release/ts/gpg4usb_ru.ts @@ -1445,6 +1445,16 @@ gpg4usb попробует импортировать ключ(и).Key Ключ + + + Import key + Импорт ключа + + + + Import key from + + key(s) exported diff --git a/release/ts/gpg4usb_vi.ts b/release/ts/gpg4usb_vi.ts index 25d1a59..5d5c82b 100644 --- a/release/ts/gpg4usb_vi.ts +++ b/release/ts/gpg4usb_vi.ts @@ -1353,6 +1353,16 @@ Yếu -> Mạnh Show Details for this Key Hiển thị thông tin cho Khóa đang chọn + + + Import key + + + + + Import key from + + key(s) exported -- cgit From a02312344eb9d951b73c493144435e3bf891e670 Mon Sep 17 00:00:00 2001 From: ubbo Date: Sat, 31 Mar 2012 16:57:07 +0000 Subject: fix some issues with utf8 strings in keys git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@873 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- keydetailsdialog.cpp | 2 +- keymgmt.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keymgmt.cpp') diff --git a/keydetailsdialog.cpp b/keydetailsdialog.cpp index dd0723f..5a66122 100644 --- a/keydetailsdialog.cpp +++ b/keydetailsdialog.cpp @@ -195,7 +195,7 @@ void KeyDetailsDialog::exportPrivateKey() QByteArray *keyArray = new QByteArray(); mCtx->exportSecretKey(*keyid, keyArray); gpgme_key_t key = mCtx->getKeyDetails(*keyid); - QString fileString = QString(key->uids->name) + " " + QString(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub_sec.asc"; + QString fileString = QString::fromUtf8(key->uids->name) + " " + QString::fromUtf8(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub_sec.asc"; QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), fileString, tr("Key Files") + " (*.asc *.txt);;All Files (*)"); QFile file(fileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { diff --git a/keymgmt.cpp b/keymgmt.cpp index 2469e0e..e8b7d94 100755 --- a/keymgmt.cpp +++ b/keymgmt.cpp @@ -212,9 +212,9 @@ void KeyMgmt::deleteKeysWithWarning(QStringList *uidList) } QString keynames; foreach (QString uid, *uidList) { - keynames.append(mCtx->getKeyDetails(uid)->uids->name); + keynames.append(QString::fromUtf8(mCtx->getKeyDetails(uid)->uids->name)); keynames.append(" <"); - keynames.append(mCtx->getKeyDetails(uid)->uids->email); + keynames.append(QString::fromUtf8(mCtx->getKeyDetails(uid)->uids->email)); keynames.append(">
"); } @@ -247,7 +247,7 @@ void KeyMgmt::exportKeyToFile() return; } gpgme_key_t key = mCtx->getKeyDetails(mKeyList->getChecked()->first()); - QString fileString = QString(key->uids->name) + " " + QString(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub.asc"; + QString fileString = QString::fromUtf8(key->uids->name) + " " + QString::fromUtf8(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub.asc"; QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), fileString, tr("Key Files") + " (*.asc *.txt);;All Files (*)"); QFile file(fileName); -- cgit