From 904e473fedbd3b18f925d984a04c9c03b55045a2 Mon Sep 17 00:00:00 2001 From: nils Date: Tue, 12 Oct 2010 18:49:57 +0000 Subject: corrected bug for statusbar icon (icon was shown, if attachment folder didn't exist) git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@384 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- context.cpp | 10 +++--- gpg4usb.pro | 1 + gpgwin.cpp | 4 +-- release/ts/gpg4usb_de.ts | 81 +++++++++++++++++++++++++++++++-------------- release/ts/gpg4usb_en.ts | 81 +++++++++++++++++++++++++++++++-------------- release/ts/gpg4usb_es.ts | 81 +++++++++++++++++++++++++++++++-------------- release/ts/gpg4usb_fr.ts | 81 +++++++++++++++++++++++++++++++-------------- release/ts/gpg4usb_pt_BR.ts | 81 +++++++++++++++++++++++++++++++-------------- release/ts/gpg4usb_ru.ts | 81 +++++++++++++++++++++++++++++++-------------- 9 files changed, 350 insertions(+), 151 deletions(-) diff --git a/context.cpp b/context.cpp index b2dfef9..323a18e 100644 --- a/context.cpp +++ b/context.cpp @@ -243,7 +243,7 @@ bool Context::encrypt(QStringList *uidList, const QByteArray &inBuffer, QByteArr outBuffer->resize(0); if (uidList->count() == 0) { - QMessageBox::critical(0, "No Key Selected", "No Key Selected"); + QMessageBox::critical(0, tr("No Key Selected"), tr("No Key Selected")); return false; } @@ -311,7 +311,7 @@ bool Context::decrypt(const QByteArray &inBuffer, QByteArray *outBuffer) if (!err) { result = gpgme_op_decrypt_result(mCtx); if (result->unsupported_algorithm) { - QMessageBox::critical(0, "Unsupported algorithm", result->unsupported_algorithm); + QMessageBox::critical(0, tr("Unsupported algorithm"), result->unsupported_algorithm); } else { err = readToBuffer(out, outBuffer); checkErr(err); @@ -321,7 +321,7 @@ bool Context::decrypt(const QByteArray &inBuffer, QByteArray *outBuffer) } } if (err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) { - QMessageBox::critical(0, "Error decrypting:", gpgme_strerror(err)); + QMessageBox::critical(0, tr("Error decrypting:"), gpgme_strerror(err)); } //if (err != GPG_ERR_NO_ERROR) @@ -391,7 +391,7 @@ gpgme_error_t Context::passphrase(const char *uid_hint, bool result; if (last_was_bad) { - passwordDialogMessage += "Wrong password.

\n\n"; + passwordDialogMessage += ""+tr("Wrong password")+".

\n\n"; clearPasswordCache(); } @@ -403,7 +403,7 @@ gpgme_error_t Context::passphrase(const char *uid_hint, } if (mPasswordCache.isEmpty()) { - QString password = QInputDialog::getText(0, "Enter Password", + QString password = QInputDialog::getText(0, tr("Enter Password"), passwordDialogMessage, QLineEdit::Password, "", &result, Qt::Window); diff --git a/gpg4usb.pro b/gpg4usb.pro index 891aa43..d7ad867 100644 --- a/gpg4usb.pro +++ b/gpg4usb.pro @@ -48,5 +48,6 @@ TRANSLATIONS = release/ts/gpg4usb_en.ts \ release/ts/gpg4usb_de.ts \ release/ts/gpg4usb_ru.ts \ release/ts/gpg4usb_fr.ts \ + release/ts/gpg4usb_it.ts \ release/ts/gpg4usb_pt_BR.ts \ release/ts/gpg4usb_es.ts diff --git a/gpgwin.cpp b/gpgwin.cpp index 51e33fd..5b6d59d 100644 --- a/gpgwin.cpp +++ b/gpgwin.cpp @@ -69,7 +69,7 @@ GpgWin::GpgWin() loadFile(args[1]); } } - +qDebug() << QLibraryInfo::location(QLibraryInfo::TranslationsPath); } void GpgWin::restoreSettings() @@ -625,7 +625,7 @@ void GpgWin::checkAttachmentFolder() { QString attachmentDir = qApp->applicationDirPath() + "/attachments/"; // filenum minus . and .. - uint filenum = QDir(attachmentDir).count() - 2 ; + int filenum = QDir(attachmentDir).count() - 2 ; if(filenum > 0) { QString statusText; if(filenum == 1) { diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts index f2a597f..9039676 100644 --- a/release/ts/gpg4usb_de.ts +++ b/release/ts/gpg4usb_de.ts @@ -159,6 +159,34 @@ Kann Datei nicht schreiben %1: %2. + + GpgME::Context + + + No Key Selected + + + + + Unsupported algorithm + + + + + Error decrypting: + + + + + Wrong password + + + + + Enter Password + + + GpgWin @@ -339,7 +367,7 @@ - + &File &Datei @@ -354,7 +382,7 @@ &Hilfe - + File Datei @@ -455,67 +483,72 @@ Schlüssel - - + + Ready Fertig - + + Files have been saved to attachment subdirectory + + + + Encrypt for: Verschlüssele für: - + Attached files: Angehängte Dateien: - - + + Application Anwendung - + Cannot read file %1: %2. Kann Datei nicht lesen %1: %2. - + File loaded Datei geladen - + %1[*] - %2 - + The document has been modified. Do you want to save your changes? Die Datei würde verändert. Möchten Sie die Änderung speichern? - + Cannot write file %1: %2. Kann Datei nicht lesen %1: %2. - + Saved '%1' %1 gespeichert - + <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> <center>Diese Anwendung ermöglicht einfaches<br>Ver- und Entschlüsseln von Texten und Dateien.<br>Sie steht unter der GPL v2.0<br><br><b>Entwickler:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Übersetzung:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>Falls Sie irgendwelche Fragen und/oder <br>Vorschläge haben, kontaktieren Sie uns über<br>gpg4usb at cpunk.de</a><br><br>oder treffen sie uns einfach in unserem XMPP-Channel:<br>gpg4usb at conference.jabber.ccc.de</center> - + Open Key Öffne Datei @@ -524,19 +557,19 @@ Do you want to save your changes? <center>Diese Anwendung erlaubt das einfache<br> Ver-und Entschlüsseln von Texten und Dateien.<br>Die Anwendung ist lizensiert unter der GPL v2.0<br><br><b>Entwickler:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Übersetzung:</b><br>Kirill (ru), Alessandro (pt)<br><br>Falls sie Fragen oder Anregungen haben,<br> kontaktieren sie uns unter gpg4usb at cpunk.de</a><br><br>oder treffen sie uns in unserem XMPP-Channel:<br>gpg4usb at conference.jabber.ccc.de</center> - + couldn't open file: Konnte Datei nicht öffnen: - + &Editor &Editor - + &Clipboard &Zwischenablage @@ -547,7 +580,7 @@ Do you want to save your changes? - + Import Key Schlüsselimport @@ -562,7 +595,7 @@ Do you want to save your changes? Crypt - + About Über @@ -571,17 +604,17 @@ Do you want to save your changes? <center>Diese Anwendung ermöglicht einfaches<br>Ver- und Entschlüsseln von Texten und Dateien.<br>Sie steht unter der GPL v2.0<br><br><b>Entwickler:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Übersetzung:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>Falls Sie irgendwelche Fragen und/oder <br>Vorschläge haben, kontaktieren Sie uns über<br>gpg4usb at cpunk.de</a><br><br>oder treffen sie uns einfach in unserem XMPP-Channel:<br>gpg4usb at conference.jabber.ccc.de</center> - + Key Files Schlüssel Dateien - + All Files Alle Dateien - + Import Key From... Impoertiere neuen Schlüssel aus... diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts index 9bb65c3..7d66a0b 100644 --- a/release/ts/gpg4usb_en.ts +++ b/release/ts/gpg4usb_en.ts @@ -122,6 +122,34 @@ + + GpgME::Context + + + No Key Selected + + + + + Unsupported algorithm + + + + + Error decrypting: + + + + + Wrong password + + + + + Enter Password + + + GpgWin @@ -307,7 +335,7 @@ - + &File @@ -322,7 +350,7 @@ - + File @@ -367,89 +395,94 @@ - - + + Ready - + + Files have been saved to attachment subdirectory + + + + Encrypt for: - + Attached files: - - + + Application - + Cannot read file %1: %2. - + File loaded - + %1[*] - %2 - + The document has been modified. Do you want to save your changes? - + Cannot write file %1: %2. - + Saved '%1' - + Open Key - + Key Files - + All Files - + couldn't open file: - + &Editor - + &Clipboard @@ -460,7 +493,7 @@ Do you want to save your changes? - + Import Key @@ -485,17 +518,17 @@ Do you want to save your changes? - + About - + <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> - + Import Key From... diff --git a/release/ts/gpg4usb_es.ts b/release/ts/gpg4usb_es.ts index d9b458d..c3ede13 100644 --- a/release/ts/gpg4usb_es.ts +++ b/release/ts/gpg4usb_es.ts @@ -128,6 +128,34 @@ + + GpgME::Context + + + No Key Selected + + + + + Unsupported algorithm + + + + + Error decrypting: + + + + + Wrong password + + + + + Enter Password + + + GpgWin @@ -323,7 +351,7 @@ - + &File &Archivo @@ -334,7 +362,7 @@ - + &Editor &Editor @@ -345,7 +373,7 @@ - + &Clipboard &Portapapeles @@ -366,7 +394,7 @@ - + Import Key Importar Llave @@ -451,75 +479,80 @@ Editar - - + + Ready Listo - + + Files have been saved to attachment subdirectory + + + + Encrypt for: Cifrar para: - + Attached files: Archivos Adjuntos: - - + + Application Programa - + Cannot read file %1: %2. No puedo leer archivo %1: %2. - + File loaded Archivo cargado - + %1[*] - %2 %1[*] - %2 - + The document has been modified. Do you want to save your changes? El documento ha sido modificado. Quiere usted guardar los cambios? - + File Archivo - + Cannot write file %1: %2. No puedo escribir archivo %1: %2. - + Saved '%1' Guardado '%1' - + About Acerca de' - + <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> duplicate entry <center>Este Programa le permite hacer un facil<br>cifrado/descifrado de sus mensajes de texto o archivos.<br>Esta licenciado bajo el GPL v2.0<br><br><b>Programadores:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Traduccion:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato13 (es)<br><br>Si usted tiene alguna pregunta y/ o <br>sugerencia, contacte con nosotros en<br>gpg4usb en cpunk.de</a><br><br>o puede encontrarnos en nuestro xmpp-channel:<br>gpg4usb en conference.jabber.ccc.de</center> @@ -529,27 +562,27 @@ Quiere usted guardar los cambios? <center>Este Programa le permite hacer un facil<br>cifrado/descifrado de sus mensajes de texto o archivos.<br>Esta licenciado bajo el GPL v2.0<br><br><b>Programadores:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Traduccion:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato13 (es)<br><br>Si usted tiene alguna pregunta y/ o <br>sugerencia, contacte con nosotros en<br>gpg4usb en cpunk.de</a><br><br>o puede encontrarnos en nuestro xmpp-channel:<br>gpg4usb en conference.jabber.ccc.de</center> - + Open Key Abrir Llave - + Key Files Archivos de Llaves - + All Files Todos Archivos - + couldn't open file: no se pudo abrir el archivo: - + Import Key From... Importar Llave Desde... diff --git a/release/ts/gpg4usb_fr.ts b/release/ts/gpg4usb_fr.ts index 89adf07..ab3b8be 100644 --- a/release/ts/gpg4usb_fr.ts +++ b/release/ts/gpg4usb_fr.ts @@ -134,6 +134,34 @@ Fichier non-enregistrable %1: %2. + + GpgME::Context + + + No Key Selected + + + + + Unsupported algorithm + + + + + Error decrypting: + + + + + Wrong password + + + + + Enter Password + + + GpgWin @@ -289,7 +317,7 @@ - + &File &Fichier @@ -301,7 +329,7 @@ - + &Editor &Editeur @@ -312,7 +340,7 @@ - + &Clipboard &Presse papiers @@ -333,7 +361,7 @@ - + Import Key Importer cles @@ -368,12 +396,17 @@ - + + Files have been saved to attachment subdirectory + + + + Attached files: - + <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> @@ -429,62 +462,62 @@ &Aide - - + + Ready - + Encrypt for: - - + + Application - + Cannot read file %1: %2. - + File loaded - + %1[*] - %2 - + The document has been modified. Do you want to save your changes? Le document a ete modifie. Voulez-vous enregistrer les modifications? - + File Fichier - + Cannot write file %1: %2. Fichier protege en ecriture %1: %2. - + Saved '%1' Fichiers enregistres '%1' - + About A propos @@ -493,27 +526,27 @@ Do you want to save your changes? <center>Cette application vous permet de crypter ou decrypter<br> simplement votre texte-message ou fichier.<br> Logiciel libre v2.0<br> <b>Developpeurs:</b> Bene, Heimer, Juergen, Nils, Ubbo<br><br><b> Traduction:</b><br>Kirill (ru), Axel (fr)<br><br> Si vous avez questions ou propositions, <br>contactez nous sur notre email <br>gpgusb at cpunk.de</a> ou par xmpp-chat <br>gpg4usb at conference.jabber.ccc.de</center> - + Open Key - + Key Files Fichiers des cles - + All Files - + couldn't open file: Fichier non-ouvrable: - + Import Key From... diff --git a/release/ts/gpg4usb_pt_BR.ts b/release/ts/gpg4usb_pt_BR.ts index 6859774..8112dac 100644 --- a/release/ts/gpg4usb_pt_BR.ts +++ b/release/ts/gpg4usb_pt_BR.ts @@ -132,6 +132,34 @@ %2. + + GpgME::Context + + + No Key Selected + + + + + Unsupported algorithm + + + + + Error decrypting: + + + + + Wrong password + + + + + Enter Password + + + GpgWin @@ -348,7 +376,7 @@ - + &File &Arquivo @@ -363,7 +391,7 @@ A&juda - + File Arquivo @@ -433,60 +461,65 @@ Chave - - + + Ready Pronto - + + Files have been saved to attachment subdirectory + + + + Encrypt for: Encriptar para: - + Attached files: Arquivos anexos: - - + + Application Aplicação - + Cannot read file %1: %2. Não leu o arquivo %1: %2. - + File loaded Arquivo carregado - + %1[*] - %2 %1[*] - %2 - + The document has been modified. Do you want to save your changes? O documento foi alterado. Deseja salvar as alterações? - + Cannot write file %1: %2. Não escreveu o arquivo %1: %2. - + Saved '%1' i used inverse order because its more natural speak in this way '%1' salvo @@ -496,34 +529,34 @@ Deseja salvar as alterações? <center> Este aplicativo permite a encriptação/decriptação<br>simplificada das suas mensagens de texto ou arquivos.<br>E é liberado sob licença GPL-V2.0<br><br>Desenvolvedores:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Tradução:</b><br>Krill(ru)<br>Alessandro Benevenuto (pt-br)<br><br>Caso tenha dúvidas e/ou sugestões, entre em<br>contatoatravés de gpg4usb at cpunk.de</a><br><br>ou no canal xmpp<br>gpg4usb at conference.jabber.ccc.de</center> - + Open Key Abrir a Chave - + Key Files Arquivos de Chaves - + All Files Todos os Arquivos - + couldn't open file: Não pode abrir o arquivo: - + &Editor &Editor - + &Clipboard Área de &Transferência @@ -534,7 +567,7 @@ Deseja salvar as alterações? - + Import Key Importar Chave @@ -549,17 +582,17 @@ Deseja salvar as alterações? Encriptar - + About Sobre - + <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> <center>Esse programa serve para encriptar e<br>decriptar mensagens de texto ou arquivos.<br>E é liberado sob a licença GPL V2.0<br><br><b>Desenvolvedores:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Tradução:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>Caso tenha duvidas e/ou sugestões,<br>envie uma mensagem para<br>gpg4usb at cpunk.de</a><br><br>ou nos encontre no nosso canal xmppl:<br>gpg4usb at conference.jabber.ccc.de</center> - + Import Key From... Importar Chave de... diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts index 06cb360..4b0ed6a 100644 --- a/release/ts/gpg4usb_ru.ts +++ b/release/ts/gpg4usb_ru.ts @@ -136,6 +136,34 @@ %2. + + GpgME::Context + + + No Key Selected + + + + + Unsupported algorithm + + + + + Error decrypting: + + + + + Wrong password + + + + + Enter Password + + + GpgWin @@ -296,7 +324,7 @@ - + &File Ф&айл @@ -311,7 +339,7 @@ &Справка - + File Файл @@ -391,87 +419,92 @@ Ключ - - + + Ready Готово - + + Files have been saved to attachment subdirectory + + + + Encrypt for: Зашифровать для: - + Attached files: Прикреплённые файлы: - - + + Application Приложение - + Cannot read file %1: %2. Не удалось прочесть файл %1: %2. - + File loaded Файл загружен - + %1[*] - %2 - + The document has been modified. Do you want to save your changes? Документ был редактирован. Сохранить изменения? - + Cannot write file %1: %2. Не удалось записать файл %1: %2. - + Saved '%1' "%1" сохранён - + <center>This Application allows you to do simple<br>encryption/decryption of your text-message or file.<br>It's licensed under the GPL v2.0<br><br><b>Developer:</b><br>Bene, Heimer, Juergen, Nils, Ubbo<br><br><b>Translation:</b><br>Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)<br><br>If you have any questions and/or<br>suggestions, contact us at<br>gpg4usb at cpunk.de</a><br><br>or feel free to meet us in our xmpp-channel:<br>gpg4usb at conference.jabber.ccc.de</center> - + Open Key Открыть ключ - + couldn't open file: Не удалось открыть файл: - + &Editor Окна &редактора - + &Clipboard &Буфера Обмена @@ -482,7 +515,7 @@ Do you want to save your changes? - + Import Key Импорт ключа @@ -497,22 +530,22 @@ Do you want to save your changes? Шифрование - + About О программе - + Key Files Файлы ключей - + All Files Все файлы - + Import Key From... Импорт ключа из... -- cgit v1.2.3