Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-17 13:30:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged revision 7443 from branches v0.5.5

Browse source 
Added patch from Henry:
- Added translation for password input
- Fixed utf8 issue in ProfileManager

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-07 19:37:04 +00:00
parent 1164344976
commit eb22610145
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -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" : tr("Please enter your PGP password for key:") + 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);