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

Added patch from Henry

Browse source 
- renamed own/your to my
- renamed gpg to pgp
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-11-28 19:58:14 +00:00
parent 163b1286f9
commit 224ece5795
21 changed files with 157 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/main.cpp
View file

@ -123,7 +123,7 @@ int main(int argc, char *argv[])
LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
QMessageBox msgBox;
msgBox.setText(QObject::tr("This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although GPG keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software."));
msgBox.setText(QObject::tr("This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software."));
msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Ok);
@ -162,7 +162,7 @@ int main(int argc, char *argv[])
{
case RS_INIT_AUTH_FAILED:
std::cerr << "RsInit::InitRetroShare AuthGPG::InitAuth failed" << std::endl;
mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of gpg."));
mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of PGP."));
break;
default:
/* Unexpected return code */