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

Moved loadCertificate from main, StartDialog and GenCertDialog to Rshare.

Browse source 
Switched StartDialog from QMainWindow to QDialog.
Updated english translation file.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-11-01 01:07:36 +00:00
parent aadb408533
commit afa3248429
11 changed files with 551 additions and 694 deletions
Download patch file Download diff file Expand all files Collapse all files

88
retroshare-gui/src/lang/retroshare_en.ts
View file

@ -5025,30 +5025,10 @@ anonymous, you can use a fake email.</source>
Fill in your GPG password when asked, to sign your new key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Trusted Friend</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Certificates (*.pqi *.pem)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Multiple instances</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Another RetroShare using the same profile is already running on your system. Please close that instance first</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate ID Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to Load your new Certificate!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[Optional] Visible to your friends, and friends of friends.</source>
<translation type="unfinished"></translation>
@ -5161,10 +5141,6 @@ and use the import button to load it</source>
<source>Your identity was imported successfully:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An unexpected error occurred when Retroshare tried to acquire the single instance lock</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RetroShare uses gpg keys for identity management.</source>
<translation type="unfinished"></translation>
@ -5177,6 +5153,10 @@ and use the import button to load it</source>
<source>You can use an existing identity (i.e. a gpg key pair), from the list below, or create a new one with this form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to Generate your new Certificate, maybe PGP password is wrong!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GeneralPage</name>
@ -5530,6 +5510,14 @@ p, li { white-space: pre-wrap; }
<source>Private Key Available</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Description</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GuiExprElement</name>
@ -7222,6 +7210,34 @@ Do you want to save message ?</source>
<source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Subject</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search From</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Tags</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Attachments</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MessengerWindow</name>
@ -10504,34 +10520,10 @@ p, li { white-space: pre-wrap; }
<source>Remember Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Multiple instances</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Login Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maybe password is wrong</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Another RetroShare using the same profile is already running on your system. Please close that instance first, or choose another profile
lock file:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An unexpected error occurred when Retroshare tried to acquire the single instance lock
lock file:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Login</source>
<translation type="unfinished"></translation>