diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc
index e1594d391..9a93e48cf 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(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 7801780f1..7f5e7d926 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -254,7 +254,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 ? QString("%1\n\n").arg(tr("Wrong password !")) : QString()) + QString("%1:\n %2").arg(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/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp
index dfa956d2e..c60715caf 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp
@@ -166,7 +166,7 @@ void ProfileManager::importIdentity()
RsInit::GetPGPLoginDetails(gpg_id, name, email);
std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl;
- QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id)+"\n\n"+tr("You can use it now to create a new location.")) ;
+ QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromUtf8(name.c_str())+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id)+"\n\n"+tr("You can use it now to create a new location.")) ;
}
fillIdentities();
diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index 93dde5de2..0df908488 100644
Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ
diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index 5ea1d4365..e7e3af248 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -10519,6 +10519,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
diff --git a/retroshare-nogui/src/notifytxt.cc b/retroshare-nogui/src/notifytxt.cc
index 2fa56596a..1ee651caa 100644
--- a/retroshare-nogui/src/notifytxt.cc
+++ b/retroshare-nogui/src/notifytxt.cc
@@ -103,7 +103,8 @@ bool NotifyTxt::askForPluginConfirmation(const std::string& plugin_file_name, co
bool NotifyTxt::askForPassword(const std::string& question, bool prev_is_bad, std::string& password)
{
- char *passwd = getpass(question.c_str()) ;
+ std::string question1="Please enter your PGP password for key:\n " + question + " :";
+ char *passwd = getpass(question1.c_str()) ;
password = passwd;
return !password.empty();