From 2785094c97dc5ad9bd414b837aa859753090ac20 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 3 Jul 2014 21:03:28 +0000 Subject: [PATCH] patch from HM to make password question translated git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7424 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/authgpg.cc | 2 +- retroshare-gui/src/gui/notifyqt.cpp | 2 +- retroshare-gui/src/lang/retroshare_de.ts | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc index 0cb77c204..9f6d014d4 100644 --- a/libretroshare/src/pqi/authgpg.cc +++ b/libretroshare/src/pqi/authgpg.cc @@ -93,7 +93,7 @@ std::string pgp_pwd_callback(void * /*hook*/, const char *uid_hint, const char * fprintf(stderr, "pgp_pwd_callback() called.\n"); #endif std::string password; - RsServer::notify()->askForPassword(std::string("Please enter your PGP password for key:\n ")+uid_hint+" :", prev_was_bad, password) ; + RsServer::notify()->askForPassword(std::string("\n ")+uid_hint+" :", prev_was_bad, password) ; return password ; } diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index 85f307fe7..baf75466f 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -271,7 +271,7 @@ bool NotifyQt::askForPassword(const std::string& key_details, bool prev_is_bad, QInputDialog dialog; dialog.setWindowTitle(tr("PGP key passphrase")); - dialog.setLabelText((prev_is_bad?tr("Wrong password !") + "\n\n" : QString()) + QString::fromUtf8(key_details.c_str())); + dialog.setLabelText(prev_is_bad?tr("Wrong password !") + "\n\n" : tr("Please enter your PGP password for key:") + QString::fromUtf8(key_details.c_str())); dialog.setTextEchoMode(QLineEdit::Password); dialog.setWindowIcon(QIcon(":/images/rstray3.png")); dialog.setModal(true); diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index ff7564a23..f3095aba5 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -10505,6 +10505,10 @@ Welche Ereignisse angezeigt werden sollen kannst du durch klicken auf <b>O Encrypted message Verschlüsselte Nachr. + + Please enter your PGP password for key: + Bitte gib dein Passwort ein für Schlüssel: + OnlineToaster