diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index 0e9a0d27f..9abe6fed0 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -347,7 +347,7 @@ - Your personnal invites + Your personal invites diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index b208f4bd6..68074708f 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -1586,6 +1586,58 @@ Double click lobbies to enter and chat. Chat + + Distant chat + + + + <html><head/><body><p align="justify">Retroshare allows you to anonymously chat to nearby people beyond your friends in the network, using encrypted tunnels. In your personal invites list you keep chat links for people to contact you. In the &quot;collected contacts&quot; list, you keep such chat links that people sent you to contact them.</p></body></html> + + + + Your personal invites + + + + Collected contacts + + + + Open secured chat tunnel + + + + Delete this invite + + + + Can't open distant chat + + + + Cannot open distant chat. Error code= + + + + Cannot remove distant chat invite. + + + + Create a chat invitation + + + + Copy link to clipboard + + + + Private chat invite from + + + + Private chat invite to + + ChatStyle @@ -1758,10 +1810,6 @@ Double click lobbies to enter and chat. is Busy and may not reply - - Paste/Create private chat or Message link... - - CirclesDialog @@ -3626,30 +3674,6 @@ p, li { white-space: pre-wrap; } CreateMsgLinkDialog - - Dialog - - - - Valid until: - - - - Type: - - - - Usable by: - - - - Copy to clipboard - - - - Create new - - Invite type: @@ -3658,10 +3682,6 @@ p, li { white-space: pre-wrap; } Private chat - - Public message - - Validity time : @@ -3690,26 +3710,6 @@ p, li { white-space: pre-wrap; } Create! - - Information - - - - Private chat invite - - - - Public message invite - - - - Private chat invite to - - - - Public message link - - Private chat invite creation failed @@ -3722,10 +3722,6 @@ p, li { white-space: pre-wrap; } Private chat invite created - - Your new chat invite has been copied to clipboard. You can now paste it as a Retroshare link. - - Messenging invite creation failed @@ -3743,11 +3739,15 @@ p, li { white-space: pre-wrap; } - Usable only by : + Create distant chat invite - Usable to contact : + <html><head/><body><p align="justify">To create a private chat invite for a non-friend person, select his key below and a validity time for your invite, then press &quot;Create&quot;. The invite will contain the information required to open a tunnel to chat with you. </p><p align="justify">The invite is encrypted, and does not reveal your identity. Only the selected peer can decrypt the link, and use it to contact you.</p></body></html> + + + + Your new chat invite has been created. You can now copy/paste it as a Retroshare link. @@ -9061,10 +9061,6 @@ Right-click and select 'make friend' to be able to connect. yourself - - Create a distant chat invitation... - - Data inconsistency in the keyring. This is most probably a bug. Please contact the developers. @@ -9858,6 +9854,25 @@ malicious behavior of crafted plugins. + + PopupDistantChatDialog + + Distant chat terminated + + + + The person you're talking to has deleted the secured chat tunnel. You may remove the chat window now. + + + + Closing this window will end the conversation, notify the peer and remove the encrypted tunnel. + + + + Kill the tunnel? + + + PostedCreatePostDialog @@ -10106,18 +10121,6 @@ p, li { white-space: pre-wrap; } Profile Manager - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select an identity from the list below to be used on another computer, and press &quot;Export selected identity&quot;</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">To use it on a different computer, select the identity manager in the login window. From there you can import the identity file and create a new location for that identity. </p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">When keeping the same identity for your new location, your friends will automatically accept you.</p></body></html> - - Identities @@ -10198,6 +10201,18 @@ and use the import button to load it Certificates (*.pqi *.pem) + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Select an identity from the list below to be used on another computer, and press &quot;Export selected identity&quot;</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">To use it on a different computer, select the identity manager in the login window. From there you can import the identity file and create a new location for that identity. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">When keeping the same identity for your new location, your friends will automatically accept you.</span></p></body></html> + + ProfileWidget @@ -10656,15 +10671,19 @@ Reported error is: %2 - Tunnel is broken + Distant peer has closed the chat - Tunnel established + Tunnel is pending... - Tunnel is working + Secured tunnel established! + + + + Secured tunnel is working